Commit 01d4e3a2 authored by Xiang Chen's avatar Xiang Chen Committed by Martin K. Petersen
Browse files

scsi: hisi_sas: Some misc tidy-up 



Do some minor tidy-up.

Signed-off-by: default avatarXiang Chen <chenxiang66@hisilicon.com>
Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 246ea3c0

drivers/scsi/hisi_sas/hisi_sas_main.c

+5 −8
Original line number Diff line number Diff line
@@ -1739,7 +1739,7 @@ static int hisi_sas_abort_task_set(struct domain_device *device, u8 *lun) 
	struct hisi_hba *hisi_hba = dev_to_hisi_hba(device);

	struct device *dev = hisi_hba->dev;

	struct hisi_sas_tmf_task tmf_task;

	int rc = TMF_RESP_FUNC_FAILED;

	int rc;



	rc = hisi_sas_internal_task_abort(hisi_hba, device,

					  HISI_SAS_INT_ABT_DEV, 0);
@@ -2532,22 +2532,19 @@ int hisi_sas_get_fw_info(struct hisi_hba *hisi_hba) 


		if (device_property_read_u32(dev, "ctrl-reset-reg",

					     &hisi_hba->ctrl_reset_reg)) {

			dev_err(dev,

				"could not get property ctrl-reset-reg\n");

			dev_err(dev, "could not get property ctrl-reset-reg\n");

			return -ENOENT;

		}



		if (device_property_read_u32(dev, "ctrl-reset-sts-reg",

					     &hisi_hba->ctrl_reset_sts_reg)) {

			dev_err(dev,

				"could not get property ctrl-reset-sts-reg\n");

			dev_err(dev, "could not get property ctrl-reset-sts-reg\n");

			return -ENOENT;

		}



		if (device_property_read_u32(dev, "ctrl-clock-ena-reg",

					     &hisi_hba->ctrl_clock_ena_reg)) {

			dev_err(dev,

				"could not get property ctrl-clock-ena-reg\n");

			dev_err(dev, "could not get property ctrl-clock-ena-reg\n");

			return -ENOENT;

		}

	}

drivers/scsi/hisi_sas/hisi_sas_v1_hw.c

+3 −6
Original line number Diff line number Diff line
@@ -1690,8 +1690,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba) 
		for (j = 0; j < HISI_SAS_PHY_INT_NR; j++, idx++) {

			irq = platform_get_irq(pdev, idx);

			if (!irq) {

				dev_err(dev,

					"irq init: fail map phy interrupt %d\n",

				dev_err(dev, "irq init: fail map phy interrupt %d\n",

					idx);

				return -ENOENT;

			}
@@ -1699,8 +1698,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba) 
			rc = devm_request_irq(dev, irq, phy_interrupts[j], 0,

					      DRV_NAME " phy", phy);

			if (rc) {

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

					"phy interrupt %d, rc=%d\n",

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

					irq, rc);

				return -ENOENT;

			}
@@ -1737,8 +1735,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba) 
		rc = devm_request_irq(dev, irq, fatal_interrupts[i], 0,

				      DRV_NAME " fatal", hisi_hba);

		if (rc) {

			dev_err(dev,

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

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

				irq, rc);

			return -ENOENT;

		}

drivers/scsi/hisi_sas/hisi_sas_v2_hw.c

+18 −24
Original line number Diff line number Diff line
@@ -2423,9 +2423,7 @@ slot_complete_v2_hw(struct hisi_hba *hisi_hba, struct hisi_sas_slot *slot) 
			slot_err_v2_hw(hisi_hba, task, slot, 2);



		if (ts->stat != SAS_DATA_UNDERRUN)

			dev_info(dev, "erroneous completion iptt=%d task=%p dev id=%d "

				"CQ hdr: 0x%x 0x%x 0x%x 0x%x "

				"Error info: 0x%x 0x%x 0x%x 0x%x\n",

			dev_info(dev, "erroneous completion iptt=%d task=%p dev id=%d CQ hdr: 0x%x 0x%x 0x%x 0x%x Error info: 0x%x 0x%x 0x%x 0x%x\n",

				 slot->idx, task, sas_dev->device_id,

				 complete_hdr->dw0, complete_hdr->dw1,

				 complete_hdr->act, complete_hdr->dw3,
@@ -3036,7 +3034,7 @@ static const struct hisi_sas_hw_error axi_error[] = { 
	{ .msk = BIT(5), .msg = "SATA_AXI_R_ERR" },

	{ .msk = BIT(6), .msg = "DQE_AXI_R_ERR" },

	{ .msk = BIT(7), .msg = "CQE_AXI_W_ERR" },

	{},

	{}

};



static const struct hisi_sas_hw_error fifo_error[] = {
@@ -3045,7 +3043,7 @@ static const struct hisi_sas_hw_error fifo_error[] = { 
	{ .msk = BIT(10), .msg = "GETDQE_FIFO" },

	{ .msk = BIT(11), .msg = "CMDP_FIFO" },

	{ .msk = BIT(12), .msg = "AWTCTRL_FIFO" },

	{},

	{}

};



static const struct hisi_sas_hw_error fatal_axi_errors[] = {
@@ -3349,8 +3347,7 @@ static int interrupt_init_v2_hw(struct hisi_hba *hisi_hba) 
		rc = devm_request_irq(dev, irq, phy_interrupts[i], 0,

				      DRV_NAME " phy", hisi_hba);

		if (rc) {

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

				"phy interrupt %d, rc=%d\n",

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

				irq, rc);

			rc = -ENOENT;

			goto free_phy_int_irqs;
@@ -3364,8 +3361,7 @@ static int interrupt_init_v2_hw(struct hisi_hba *hisi_hba) 
		rc = devm_request_irq(dev, irq, sata_int_v2_hw, 0,

				      DRV_NAME " sata", phy);

		if (rc) {

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

				"sata interrupt %d, rc=%d\n",

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

				irq, rc);

			rc = -ENOENT;

			goto free_sata_int_irqs;
@@ -3377,8 +3373,7 @@ static int interrupt_init_v2_hw(struct hisi_hba *hisi_hba) 
		rc = devm_request_irq(dev, irq, fatal_interrupts[fatal_no], 0,

				      DRV_NAME " fatal", hisi_hba);

		if (rc) {

			dev_err(dev,

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

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

				irq, rc);

			rc = -ENOENT;

			goto free_fatal_int_irqs;
@@ -3393,8 +3388,7 @@ static int interrupt_init_v2_hw(struct hisi_hba *hisi_hba) 
		rc = devm_request_irq(dev, irq, cq_interrupt_v2_hw, 0,

				      DRV_NAME " cq", cq);

		if (rc) {

			dev_err(dev,

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

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

				irq, rc);

			rc = -ENOENT;

			goto free_cq_int_irqs;

drivers/scsi/hisi_sas/hisi_sas_v3_hw.c

+12 −15
Original line number Diff line number Diff line
@@ -1950,7 +1950,7 @@ static const struct hisi_sas_hw_error axi_error[] = { 
	{ .msk = BIT(5), .msg = "SATA_AXI_R_ERR" },

	{ .msk = BIT(6), .msg = "DQE_AXI_R_ERR" },

	{ .msk = BIT(7), .msg = "CQE_AXI_W_ERR" },

	{},

	{}

};



static const struct hisi_sas_hw_error fifo_error[] = {
@@ -1959,7 +1959,7 @@ static const struct hisi_sas_hw_error fifo_error[] = { 
	{ .msk = BIT(10), .msg = "GETDQE_FIFO" },

	{ .msk = BIT(11), .msg = "CMDP_FIFO" },

	{ .msk = BIT(12), .msg = "AWTCTRL_FIFO" },

	{},

	{}

};



static const struct hisi_sas_hw_error fatal_axi_error[] = {
@@ -2207,9 +2207,7 @@ slot_complete_v3_hw(struct hisi_hba *hisi_hba, struct hisi_sas_slot *slot) 


		slot_err_v3_hw(hisi_hba, task, slot);

		if (ts->stat != SAS_DATA_UNDERRUN)

			dev_info(dev, "erroneous completion iptt=%d task=%p dev id=%d "

				"CQ hdr: 0x%x 0x%x 0x%x 0x%x "

				"Error info: 0x%x 0x%x 0x%x 0x%x\n",

			dev_info(dev, "erroneous completion iptt=%d task=%p dev id=%d CQ hdr: 0x%x 0x%x 0x%x 0x%x Error info: 0x%x 0x%x 0x%x 0x%x\n",

				 slot->idx, task, sas_dev->device_id,

				 dw0, dw1, complete_hdr->act, dw3,

				 error_info[0], error_info[1],
@@ -2446,8 +2444,7 @@ static int interrupt_init_v3_hw(struct hisi_hba *hisi_hba) 
				      cq_interrupt_v3_hw, irqflags,

				      DRV_NAME " cq", cq);

		if (rc) {

			dev_err(dev,

				"could not request cq%d interrupt, rc=%d\n",

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

				i, rc);

			rc = -ENOENT;

			goto free_cq_irqs;
@@ -3042,7 +3039,7 @@ hisi_sas_v3_probe(struct pci_dev *pdev, const struct pci_device_id *id) 


	hisi_hba->regs = pcim_iomap(pdev, 5, 0);

	if (!hisi_hba->regs) {

		dev_err(dev, "cannot map register.\n");

		dev_err(dev, "cannot map register\n");

		rc = -ENOMEM;

		goto err_out_ha;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE