diff mbox

[10/25] scsi: hisi_sas: add misc HBA initialization

Message ID 1444663237-238302-11-git-send-email-john.garry@huawei.com (mailing list archive)
State Superseded, archived
Headers show

Commit Message

John Garry Oct. 12, 2015, 3:20 p.m. UTC 
This includes:
- host port structure initialisation
- host device structure initialisation
- wq initialisation
- host structure timer init
- DMA mask configuration
- call to scan host

Signed-off-by: John Garry <john.garry@huawei.com>
---
 drivers/scsi/hisi_sas/hisi_sas.h      | 56 +++++++++++++++++++++++++++++++++++
 drivers/scsi/hisi_sas/hisi_sas_init.c | 35 ++++++++++++++++++++++
 drivers/scsi/hisi_sas/hisi_sas_main.c | 31 +++++++++++++++++++
 3 files changed, 122 insertions(+)

Comments

kernel test robot Oct. 12, 2015, 9:44 p.m. UTC | #1 
Hi John,

[auto build test WARNING on scsi/for-next -- if it's inappropriate base, please suggest rules for selecting the more suitable base]

url:    https://github.com/0day-ci/linux/commits/John-Garry/HiSilicon-SAS-driver/20151012-231929
reproduce:
        # apt-get install sparse
        make ARCH=x86_64 allmodconfig
        make C=1 CF=-D__CHECK_ENDIAN__


sparse warnings: (new ones prefixed by >>)

   drivers/scsi/hisi_sas/hisi_sas_init.c:228:5: sparse: symbol 'hisi_sas_ioremap' was not declared. Should it be static?
>> drivers/scsi/hisi_sas/hisi_sas_init.c:318:47: sparse: incorrect type in assignment (different base types)
   drivers/scsi/hisi_sas/hisi_sas_init.c:318:47:    expected unsigned long long [unsigned] [usertype] dev_sas_addr
   drivers/scsi/hisi_sas/hisi_sas_init.c:318:47:    got restricted __be64 [usertype] <noident>

vim +318 drivers/scsi/hisi_sas/hisi_sas_init.c

307b867d John Garry 2015-10-12  222  				  hisi_hba->sata_breakpoint_dma);
ac2334d3 John Garry 2015-10-12  223  
ac2334d3 John Garry 2015-10-12  224  	if (hisi_hba->wq)
ac2334d3 John Garry 2015-10-12  225  		destroy_workqueue(hisi_hba->wq);
307b867d John Garry 2015-10-12  226  }
307b867d John Garry 2015-10-12  227  
2b5563f7 John Garry 2015-10-12 @228  int hisi_sas_ioremap(struct hisi_hba *hisi_hba)
2b5563f7 John Garry 2015-10-12  229  {
2b5563f7 John Garry 2015-10-12  230  	struct platform_device *pdev = hisi_hba->pdev;
2b5563f7 John Garry 2015-10-12  231  	struct device *dev = &pdev->dev;
2b5563f7 John Garry 2015-10-12  232  	struct resource *res;
2b5563f7 John Garry 2015-10-12  233  
2b5563f7 John Garry 2015-10-12  234  	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
2b5563f7 John Garry 2015-10-12  235  	hisi_hba->regs = devm_ioremap(dev,
2b5563f7 John Garry 2015-10-12  236  				      res->start,
2b5563f7 John Garry 2015-10-12  237  				      resource_size(res));
2b5563f7 John Garry 2015-10-12  238  	if (!hisi_hba->regs)
2b5563f7 John Garry 2015-10-12  239  		return -ENOMEM;
2b5563f7 John Garry 2015-10-12  240  
2b5563f7 John Garry 2015-10-12  241  	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
2b5563f7 John Garry 2015-10-12  242  	hisi_hba->ctrl_regs = devm_ioremap(dev,
2b5563f7 John Garry 2015-10-12  243  					   res->start,
2b5563f7 John Garry 2015-10-12  244  					   resource_size(res));
2b5563f7 John Garry 2015-10-12  245  	if (!hisi_hba->ctrl_regs)
2b5563f7 John Garry 2015-10-12  246  		return -ENOMEM;
2b5563f7 John Garry 2015-10-12  247  
2b5563f7 John Garry 2015-10-12  248  	return 0;
2b5563f7 John Garry 2015-10-12  249  }
28e5387c John Garry 2015-10-12  250  
28e5387c John Garry 2015-10-12  251  static const struct of_device_id sas_of_match[] = {
28e5387c John Garry 2015-10-12  252  	{ .compatible = "hisilicon,sas-controller-v1",},
28e5387c John Garry 2015-10-12  253  	{},
28e5387c John Garry 2015-10-12  254  };
28e5387c John Garry 2015-10-12  255  MODULE_DEVICE_TABLE(of, sas_of_match);
b94d2f2e John Garry 2015-10-12  256  
b94d2f2e John Garry 2015-10-12  257  static struct hisi_hba *hisi_sas_hba_alloc(
b94d2f2e John Garry 2015-10-12  258  			struct platform_device *pdev,
b94d2f2e John Garry 2015-10-12  259  			struct Scsi_Host *shost,
b94d2f2e John Garry 2015-10-12  260  			struct device_node *np)
b94d2f2e John Garry 2015-10-12  261  {
b94d2f2e John Garry 2015-10-12  262  	int interrupt_count, interrupt_cells;
b94d2f2e John Garry 2015-10-12  263  	struct hisi_hba *hisi_hba;
b94d2f2e John Garry 2015-10-12  264  
b94d2f2e John Garry 2015-10-12  265  	hisi_hba = devm_kzalloc(&pdev->dev, sizeof(*hisi_hba), GFP_KERNEL);
b94d2f2e John Garry 2015-10-12  266  	if (!hisi_hba)
b94d2f2e John Garry 2015-10-12  267  		goto err_out;
b94d2f2e John Garry 2015-10-12  268  
b94d2f2e John Garry 2015-10-12  269  	hisi_hba->pdev = pdev;
307b867d John Garry 2015-10-12  270  
ac2334d3 John Garry 2015-10-12  271  	init_timer(&hisi_hba->timer);
ac2334d3 John Garry 2015-10-12  272  
307b867d John Garry 2015-10-12  273  	if (of_property_read_u32(np, "phy-count", &hisi_hba->n_phy))
307b867d John Garry 2015-10-12  274  		goto err_out;
307b867d John Garry 2015-10-12  275  
307b867d John Garry 2015-10-12  276  	if (of_property_read_u32(np, "queue-count", &hisi_hba->queue_count))
307b867d John Garry 2015-10-12  277  		goto err_out;
307b867d John Garry 2015-10-12  278  
307b867d John Garry 2015-10-12  279  	if (of_property_read_u32(np, "controller-id", &hisi_hba->id))
307b867d John Garry 2015-10-12  280  		goto err_out;
307b867d John Garry 2015-10-12  281  
307b867d John Garry 2015-10-12  282  	interrupt_count = of_property_count_u32_elems(np, "interrupts");
307b867d John Garry 2015-10-12  283  	if (interrupt_count < 0)
307b867d John Garry 2015-10-12  284  		goto err_out;
307b867d John Garry 2015-10-12  285  
307b867d John Garry 2015-10-12  286  	if (of_property_read_u32(np, "#interrupt-cells", &interrupt_cells))
307b867d John Garry 2015-10-12  287  		goto err_out;
307b867d John Garry 2015-10-12  288  
307b867d John Garry 2015-10-12  289  	hisi_hba->int_names = devm_kcalloc(&pdev->dev,
307b867d John Garry 2015-10-12  290  					   interrupt_count / interrupt_cells,
307b867d John Garry 2015-10-12  291  					   HISI_SAS_NAME_LEN,
307b867d John Garry 2015-10-12  292  					   GFP_KERNEL);
307b867d John Garry 2015-10-12  293  	if (!hisi_hba->int_names)
307b867d John Garry 2015-10-12  294  		goto err_out;
307b867d John Garry 2015-10-12  295  
b94d2f2e John Garry 2015-10-12  296  	hisi_hba->shost = shost;
b94d2f2e John Garry 2015-10-12  297  
2b5563f7 John Garry 2015-10-12  298  	if (hisi_sas_ioremap(hisi_hba))
2b5563f7 John Garry 2015-10-12  299  		goto err_out;
2b5563f7 John Garry 2015-10-12  300  
307b867d John Garry 2015-10-12  301  	if (hisi_sas_alloc(hisi_hba, shost)) {
307b867d John Garry 2015-10-12  302  		hisi_sas_free(hisi_hba);
307b867d John Garry 2015-10-12  303  		goto err_out;
307b867d John Garry 2015-10-12  304  	}
307b867d John Garry 2015-10-12  305  
b94d2f2e John Garry 2015-10-12  306  	return hisi_hba;
b94d2f2e John Garry 2015-10-12  307  err_out:
b94d2f2e John Garry 2015-10-12  308  	dev_err(&pdev->dev, "hba alloc failed\n");
b94d2f2e John Garry 2015-10-12  309  	return NULL;
b94d2f2e John Garry 2015-10-12  310  }
b94d2f2e John Garry 2015-10-12  311  
f6486930 John Garry 2015-10-12  312  static void hisi_sas_init_add(struct hisi_hba *hisi_hba)
f6486930 John Garry 2015-10-12  313  {
f6486930 John Garry 2015-10-12  314  	u8 i;
f6486930 John Garry 2015-10-12  315  
f6486930 John Garry 2015-10-12  316  	/* Huawei IEEE id (001882) */
f6486930 John Garry 2015-10-12  317  	for (i = 0; i < hisi_hba->n_phy; i++)
f6486930 John Garry 2015-10-12 @318  		hisi_hba->phy[i].dev_sas_addr =
f6486930 John Garry 2015-10-12  319  			cpu_to_be64(0x5001882016072015ULL);
f6486930 John Garry 2015-10-12  320  
f6486930 John Garry 2015-10-12  321  	memcpy(hisi_hba->sas_addr, &hisi_hba->phy[0].dev_sas_addr,

:::::: The code at line 318 was first introduced by commit
:::::: f6486930094e8da780099095ad77e86b3b766008 scsi: hisi_sas: add phy SAS ADDR initialization

:::::: TO: John Garry <john.garry@huawei.com>
:::::: CC: 0day robot <fengguang.wu@intel.com>

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/scsi/hisi_sas/hisi_sas.h b/drivers/scsi/hisi_sas/hisi_sas.h
index 6c5d22a..1a26f27 100644
--- a/drivers/scsi/hisi_sas/hisi_sas.h
+++ b/drivers/scsi/hisi_sas/hisi_sas.h
@@ -35,13 +35,36 @@ 
 
 #define HISI_SAS_NAME_LEN 32
 
+
+enum dev_status {
+	HISI_SAS_DEV_NORMAL,
+	HISI_SAS_DEV_EH,
+};
+
 struct hisi_sas_phy {
+	struct hisi_hba	*hisi_hba;
 	struct hisi_sas_port	*port;
 	struct asd_sas_phy	sas_phy;
+	struct sas_identify	identify;
+	struct timer_list	timer;
+	u64		port_id; /* from hw */
+	u64		dev_sas_addr;
+	u64		phy_type;
+	u64		frame_rcvd_size;
+	u8		frame_rcvd[32];
+	u8		phy_attached;
+	u8		reserved[3];
+	u64		phy_event;
+	int		eye_diag_done;
+	enum sas_linkrate	minimum_linkrate;
+	enum sas_linkrate	maximum_linkrate;
 };
 
 struct hisi_sas_port {
 	struct asd_sas_port	sas_port;
+	u8	port_attached;
+	u8	id; /* from hw */
+	struct list_head	list;
 };
 
 struct hisi_sas_cq {
@@ -49,6 +72,18 @@  struct hisi_sas_cq {
 	int	id;
 };
 
+struct hisi_sas_device {
+	enum sas_device_type	dev_type;
+	struct hisi_hba		*hisi_hba;
+	struct domain_device	*sas_device;
+	u64 attached_phy;
+	u64 device_id;
+	u64 running_req;
+	struct hisi_sas_itct *itct;
+	u8 dev_status;
+	u64 reserved;
+};
+
 struct hisi_sas_slot {
 	struct list_head entry;
 	struct sas_task *task;
@@ -68,6 +103,19 @@  struct hisi_sas_slot {
 	struct hisi_sas_sge_page *sge_page;
 	dma_addr_t sge_page_dma;
 };
+
+enum hisi_sas_wq_event {
+	PHYUP,
+};
+
+struct hisi_sas_wq {
+	struct work_struct	work_struct;
+	struct hisi_hba *hisi_hba;
+	int phy_no;
+	int event;
+	int data;
+};
+
 struct hisi_hba {
 	spinlock_t	lock;
 
@@ -88,6 +136,10 @@  struct hisi_hba {
 
 	int	n_phy;
 
+
+	struct timer_list timer;
+	struct workqueue_struct *wq;
+
 	int slot_index_count;
 	unsigned long *slot_index_tags;
 
@@ -103,6 +155,8 @@  struct hisi_hba {
 	int	id;
 	int	queue_count;
 	char	*int_names;
+
+	struct hisi_sas_device	devices[HISI_SAS_MAX_DEVICES];
 	struct dma_pool *command_table_pool;
 	struct dma_pool *status_buffer_pool;
 	struct hisi_sas_itct *itct;
@@ -267,4 +321,6 @@  union hisi_sas_command_table {
 };
 
 void hisi_sas_slot_index_init(struct hisi_hba *hisi_hba);
+void hisi_sas_phy_init(struct hisi_hba *hisi_hba, int i);
+void hisi_sas_wq_process(struct work_struct *work);
 #endif
diff --git a/drivers/scsi/hisi_sas/hisi_sas_init.c b/drivers/scsi/hisi_sas/hisi_sas_init.c
index c295c39..558e0e7 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_init.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_init.c
@@ -41,6 +41,20 @@  static int hisi_sas_alloc(struct hisi_hba *hisi_hba, struct Scsi_Host *shost)
 	char name[32];
 	struct device *dev = &hisi_hba->pdev->dev;
 
+	spin_lock_init(&hisi_hba->lock);
+	for (i = 0; i < hisi_hba->n_phy; i++) {
+		hisi_sas_phy_init(hisi_hba, i);
+		hisi_hba->port[i].port_attached = 0;
+		hisi_hba->port[i].id = -1;
+		INIT_LIST_HEAD(&hisi_hba->port[i].list);
+	}
+
+	for (i = 0; i < HISI_SAS_MAX_DEVICES; i++) {
+		hisi_hba->devices[i].dev_type = SAS_PHY_UNUSED;
+		hisi_hba->devices[i].device_id = i;
+		hisi_hba->devices[i].dev_status = HISI_SAS_DEV_NORMAL;
+	}
+
 	for (i = 0; i < hisi_hba->queue_count; i++) {
 		struct hisi_sas_cq *cq = &hisi_hba->cq[i];
 
@@ -139,6 +153,13 @@  static int hisi_sas_alloc(struct hisi_hba *hisi_hba, struct Scsi_Host *shost)
 
 	hisi_sas_slot_index_init(hisi_hba);
 
+	sprintf(name, "%s%d", "hisi_sas", hisi_hba->id);
+	hisi_hba->wq = create_singlethread_workqueue(name);
+	if (!hisi_hba->wq) {
+		dev_err(dev, "sas_alloc: failed to create workqueue\n");
+		goto err_out;
+	}
+
 	return 0;
 err_out:
 	return -ENOMEM;
@@ -199,6 +220,9 @@  static void hisi_sas_free(struct hisi_hba *hisi_hba)
 		dma_free_coherent(dev, s,
 				  hisi_hba->sata_breakpoint,
 				  hisi_hba->sata_breakpoint_dma);
+
+	if (hisi_hba->wq)
+		destroy_workqueue(hisi_hba->wq);
 }
 
 int hisi_sas_ioremap(struct hisi_hba *hisi_hba)
@@ -244,6 +268,8 @@  static struct hisi_hba *hisi_sas_hba_alloc(
 
 	hisi_hba->pdev = pdev;
 
+	init_timer(&hisi_hba->timer);
+
 	if (of_property_read_u32(np, "phy-count", &hisi_hba->n_phy))
 		goto err_out;
 
@@ -320,6 +346,13 @@  static int hisi_sas_probe(struct platform_device *pdev)
 	sha = SHOST_TO_SAS_HA(shost) = &hisi_hba->sha;
 	platform_set_drvdata(pdev, sha);
 
+	if (dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64)) &&
+	    dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32))) {
+		dev_err(dev, "No usable DMA addressing method\n");
+		rc = -EIO;
+		goto err_out_ha;
+	}
+
 	phy_nr = port_nr = hisi_hba->n_phy;
 
 	arr_phy = devm_kcalloc(dev, phy_nr, sizeof(void *), GFP_KERNEL);
@@ -362,6 +395,8 @@  static int hisi_sas_probe(struct platform_device *pdev)
 	if (rc)
 		goto err_out_register_ha;
 
+	scsi_scan_host(shost);
+
 	return 0;
 
 err_out_register_ha:
diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c
index 721412e..882ff79 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
@@ -26,3 +26,34 @@  void hisi_sas_slot_index_init(struct hisi_hba *hisi_hba)
 	for (i = 0; i < hisi_hba->slot_index_count; ++i)
 		hisi_sas_slot_index_clear(hisi_hba, i);
 }
+
+void hisi_sas_wq_process(struct work_struct *work)
+{
+	struct hisi_sas_wq *wq =
+		container_of(work, struct hisi_sas_wq, work_struct);
+
+	kfree(wq);
+}
+
+void hisi_sas_phy_init(struct hisi_hba *hisi_hba, int phy_no)
+{
+	struct hisi_sas_phy *phy = &hisi_hba->phy[phy_no];
+	struct asd_sas_phy *sas_phy = &phy->sas_phy;
+
+	phy->hisi_hba = hisi_hba;
+	phy->port = NULL;
+	init_timer(&phy->timer);
+	sas_phy->enabled = (phy_no < hisi_hba->n_phy) ? 1 : 0;
+	sas_phy->class = SAS;
+	sas_phy->iproto = SAS_PROTOCOL_ALL;
+	sas_phy->tproto = 0;
+	sas_phy->type = PHY_TYPE_PHYSICAL;
+	sas_phy->role = PHY_ROLE_INITIATOR;
+	sas_phy->oob_mode = OOB_NOT_CONNECTED;
+	sas_phy->linkrate = SAS_LINK_RATE_UNKNOWN;
+	sas_phy->id = phy_no;
+	sas_phy->sas_addr = &hisi_hba->sas_addr[0];
+	sas_phy->frame_rcvd = &phy->frame_rcvd[0];
+	sas_phy->ha = (struct sas_ha_struct *)hisi_hba->shost->hostdata;
+	sas_phy->lldd_phy = phy;
+}