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

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

hisi_sas: add v2 hw ACPI support 



Add support in v2 hw driver for ACPI.

A check on whether an ACPI handle is available for the device is used to
decide on whether to use ACPI reset handler or syscon for hw reset.

Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarWei Xu <xuwei5@hisilicon.com>
Reviewed-by: default avatarZhangfei Gao <zhangfei.gao@linaro.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 84b342c0

drivers/scsi/hisi_sas/hisi_sas_v2_hw.c

+43 −25
Original line number Diff line number Diff line
@@ -721,6 +721,15 @@ static int reset_hw_v2_hw(struct hisi_hba *hisi_hba) 
			return -EIO;

	}



	if (ACPI_HANDLE(dev)) {

		acpi_status s;



		s = acpi_evaluate_object(ACPI_HANDLE(dev), "_RST", NULL, NULL);

		if (ACPI_FAILURE(s)) {

			dev_err(dev, "Reset failed\n");

			return -EIO;

		}

	} else if (hisi_hba->ctrl) {

		/* reset and disable clock*/

		regmap_write(hisi_hba->ctrl, hisi_hba->ctrl_reset_reg,

				reset_val);
@@ -745,6 +754,8 @@ static int reset_hw_v2_hw(struct hisi_hba *hisi_hba) 
			dev_err(dev, "SAS de-reset fail.\n");

			return -EIO;

		}

	} else

		dev_warn(dev, "no reset method\n");



	return 0;

}
@@ -752,13 +763,12 @@ static int reset_hw_v2_hw(struct hisi_hba *hisi_hba) 
static void init_reg_v2_hw(struct hisi_hba *hisi_hba)

{

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

	struct device_node *np = dev->of_node;

	int i;



	/* Global registers init */



	/* Deal with am-max-transmissions quirk */

	if (of_get_property(np, "hip06-sas-v2-quirk-amt", NULL)) {

	if (device_property_present(dev, "hip06-sas-v2-quirk-amt")) {

		hisi_sas_write32(hisi_hba, AM_CFG_MAX_TRANS, 0x2020);

		hisi_sas_write32(hisi_hba, AM_CFG_SINGLE_PORT_MAX_TRANS,

				 0x2020);
@@ -2260,12 +2270,20 @@ static const struct of_device_id sas_v2_of_match[] = { 
};

MODULE_DEVICE_TABLE(of, sas_v2_of_match);



static const struct acpi_device_id sas_v2_acpi_match[] = {

	{ "HISI0162", 0 },

	{ }

};



MODULE_DEVICE_TABLE(acpi, sas_v2_acpi_match);



static struct platform_driver hisi_sas_v2_driver = {

	.probe = hisi_sas_v2_probe,

	.remove = hisi_sas_v2_remove,

	.driver = {

		.name = DRV_NAME,

		.of_match_table = sas_v2_of_match,

		.acpi_match_table = ACPI_PTR(sas_v2_acpi_match),

	},

};