[PATCH 07/25] scsi: hisi_sas: add ioremap for device HW

John Garry
2015-10-12T15:11:49Z

This includes registers for core SAS controllers
and also SAS control registers.

Signed-off-by: John Garry <john.garry@huawei.com>
---
drivers/scsi/hisi_sas/hisi_sas.h | 2 ++
drivers/scsi/hisi_sas/hisi_sas_init.c | 25 +++++++++++++++++++++++++
2 files changed, 27 insertions(+)

diff --git a/drivers/scsi/hisi_sas/hisi_sas.h b/drivers/scsi/hisi_sas/hisi_sas.h
index 929c513..5f72d98 100644
--- a/drivers/scsi/hisi_sas/hisi_sas.h
+++ b/drivers/scsi/hisi_sas/hisi_sas.h
@@ -69,6 +69,8 @@ struct hisi_hba {

struct platform_device *pdev;

+ void __iomem *regs;
+ void __iomem *ctrl_regs;

u8 sas_addr[SAS_ADDR_SIZE];

diff --git a/drivers/scsi/hisi_sas/hisi_sas_init.c b/drivers/scsi/hisi_sas/hisi_sas_init.c
index 38b9ed2..8f1e856 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_init.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_init.c
@@ -195,6 +195,28 @@ static void hisi_sas_free(struct hisi_hba *hisi_hba)
hisi_hba->sata_breakpoint_dma);
}

+int hisi_sas_ioremap(struct hisi_hba *hisi_hba)
+{
+ struct platform_device *pdev = hisi_hba->pdev;
+ struct device *dev = &pdev->dev;
+ struct resource *res;
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ hisi_hba->regs = devm_ioremap(dev,
+ res->start,
+ resource_size(res));
+ if (!hisi_hba->regs)
+ return -ENOMEM;
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+ hisi_hba->ctrl_regs = devm_ioremap(dev,
+ res->start,
+ resource_size(res));
+ if (!hisi_hba->ctrl_regs)
+ return -ENOMEM;
+
+ return 0;
+}

static const struct of_device_id sas_of_match[] = {
{ .compatible = "hisilicon,sas-controller-v1",},
@@ -241,6 +263,9 @@ static struct hisi_hba *hisi_sas_hba_alloc(

hisi_hba->shost = shost;

+ if (hisi_sas_ioremap(hisi_hba))
+ goto err_out;
+
if (hisi_sas_alloc(hisi_hba, shost)) {
hisi_sas_free(hisi_hba);
goto err_out;
--
1.9.1