Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c77dca0 authored by John Garry's avatar John Garry Committed by Martin K. Petersen
Browse files

hisi_sas: Remove dependency on of_irq_count 



Originally the driver would use of_irq_count to calculate how much
memory is required for storing the interrupt names, since the number of
interrupt sources for the controller is variable.  Since of_irq_count
cannot be used by the driver, use fixed names.

Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarZhangfei Gao <zhangfei.gao@linaro.org>
Acked-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 16c6c252

drivers/scsi/hisi_sas/hisi_sas.h

+0 −3
Original line number Diff line number Diff line
@@ -38,8 +38,6 @@ 
#define HISI_SAS_MAX_SSP_RESP_SZ (sizeof(struct ssp_frame_hdr) + 1024)

#define HISI_SAS_MAX_SMP_RESP_SZ 1028



#define HISI_SAS_NAME_LEN 32



struct hisi_hba;



enum {
@@ -178,7 +176,6 @@ struct hisi_hba { 


	int	queue_count;

	int	queue;

	char	*int_names;

	struct hisi_sas_slot	*slot_prep;



	struct dma_pool *sge_page_pool;

drivers/scsi/hisi_sas/hisi_sas_main.c

+0 −8
Original line number Diff line number Diff line
@@ -1160,7 +1160,6 @@ static struct Scsi_Host *hisi_sas_shost_alloc(struct platform_device *pdev, 
	struct device *dev = &pdev->dev;

	struct device_node *np = pdev->dev.of_node;

	struct property *sas_addr_prop;

	int num;



	shost = scsi_host_alloc(&hisi_sas_sht, sizeof(*hisi_hba));

	if (!shost)
@@ -1197,13 +1196,6 @@ static struct Scsi_Host *hisi_sas_shost_alloc(struct platform_device *pdev, 
	if (of_property_read_u32(np, "queue-count", &hisi_hba->queue_count))

		goto err_out;



	num = of_irq_count(np);

	hisi_hba->int_names = devm_kcalloc(dev, num,

					   HISI_SAS_NAME_LEN,

					   GFP_KERNEL);

	if (!hisi_hba->int_names)

		goto err_out;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	hisi_hba->regs = devm_ioremap_resource(dev, res);

	if (IS_ERR(hisi_hba->regs))

drivers/scsi/hisi_sas/hisi_sas_v1_hw.c

+5 −29
Original line number Diff line number Diff line
@@ -1660,18 +1660,6 @@ static irqreturn_t fatal_axi_int_v1_hw(int irq, void *p) 
	return IRQ_HANDLED;

}



static const char phy_int_names[HISI_SAS_PHY_INT_NR][32] = {

	{"Bcast"},

	{"Phy Up"},

	{"Abnormal"},

};



static const char cq_int_name[32] = "cq";

static const char fatal_int_name[HISI_SAS_FATAL_INT_NR][32] = {

	"fatal ecc",

	"fatal axi"

};



static irq_handler_t phy_interrupts[HISI_SAS_PHY_INT_NR] = {

	int_bcast_v1_hw,

	int_phyup_v1_hw,
@@ -1687,7 +1675,6 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba) 
{

	struct device *dev = &hisi_hba->pdev->dev;

	struct device_node *np = dev->of_node;

	char *int_names = hisi_hba->int_names;

	int i, j, irq, rc, idx;



	if (!np)
@@ -1706,13 +1693,8 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba) 
				return -ENOENT;

			}



			(void)snprintf(&int_names[idx * HISI_SAS_NAME_LEN],

				       HISI_SAS_NAME_LEN,

				       "%s %s:%d", dev_name(dev),

				       phy_int_names[j], i);

			rc = devm_request_irq(dev, irq, phy_interrupts[j], 0,

					&int_names[idx * HISI_SAS_NAME_LEN],

					phy);

					      DRV_NAME " phy", phy);

			if (rc) {

				dev_err(dev, "irq init: could not request "

					"phy interrupt %d, rc=%d\n",
@@ -1730,12 +1712,9 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba) 
				idx);

			return -ENOENT;

		}

		(void)snprintf(&int_names[idx * HISI_SAS_NAME_LEN],

			       HISI_SAS_NAME_LEN,

			       "%s %s:%d", dev_name(dev), cq_int_name, i);



		rc = devm_request_irq(dev, irq, cq_interrupt_v1_hw, 0,

				      &int_names[idx * HISI_SAS_NAME_LEN],

				      &hisi_hba->cq[i]);

				      DRV_NAME " cq", &hisi_hba->cq[i]);

		if (rc) {

			dev_err(dev, "irq init: could not request cq interrupt %d, rc=%d\n",

				irq, rc);
@@ -1751,12 +1730,9 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba) 
				idx);

			return -ENOENT;

		}

		(void)snprintf(&int_names[idx * HISI_SAS_NAME_LEN],

			       HISI_SAS_NAME_LEN,

			       "%s %s:%d", dev_name(dev), fatal_int_name[i], i);



		rc = devm_request_irq(dev, irq, fatal_interrupts[i], 0,

				      &int_names[idx * HISI_SAS_NAME_LEN],

				      hisi_hba);

				      DRV_NAME " fatal", hisi_hba);

		if (rc) {

			dev_err(dev,

				"irq init: could not request fatal interrupt %d, rc=%d\n",