lkml.org 
[lkml]   [2017]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 10/23] scsi: hisi_sas: add initialisation for v3 pci-based controller
    Date
    Add the code to initialise the controller which is based on pci
    device in hisi_sas_v3_hw.c

    The core controller routines are still in hisi_sas_main.c; some
    common initialisation functions are also exported from
    hisi_sas_main.c

    For pci-based controller, the device properties, like
    phy count and sas address are read from the firmware,
    same as platform device-based controller.

    Signed-off-by: John Garry <john.garry@huawei.com>
    Signed-off-by: Xiang Chen <chenxiang66@hisilicon.com>
    ---
    drivers/scsi/hisi_sas/hisi_sas.h | 6 ++
    drivers/scsi/hisi_sas/hisi_sas_main.c | 18 ++--
    drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 154 +++++++++++++++++++++++++++++++++
    3 files changed, 172 insertions(+), 6 deletions(-)

    diff --git a/drivers/scsi/hisi_sas/hisi_sas.h b/drivers/scsi/hisi_sas/hisi_sas.h
    index c1f6669..e89f6ae 100644
    --- a/drivers/scsi/hisi_sas/hisi_sas.h
    +++ b/drivers/scsi/hisi_sas/hisi_sas.h
    @@ -366,6 +366,12 @@ struct hisi_sas_command_table_ssp {
    struct hisi_sas_command_table_stp stp;
    };

    +extern struct scsi_transport_template *hisi_sas_stt;
    +extern struct scsi_host_template *hisi_sas_sht;
    +
    +extern void hisi_sas_init_add(struct hisi_hba *hisi_hba);
    +extern int hisi_sas_alloc(struct hisi_hba *hisi_hba, struct Scsi_Host *shost);
    +extern void hisi_sas_free(struct hisi_hba *hisi_hba);
    extern u8 hisi_sas_get_ata_protocol(u8 cmd, int direction);
    extern struct hisi_sas_port *to_hisi_sas_port(struct asd_sas_port *sas_port);
    extern void hisi_sas_sata_done(struct sas_task *task,
    diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c
    index 1a6adf7..92b7068 100644
    --- a/drivers/scsi/hisi_sas/hisi_sas_main.c
    +++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
    @@ -1472,9 +1472,10 @@ void hisi_sas_rescan_topology(struct hisi_hba *hisi_hba, u32 old_state,
    }
    EXPORT_SYMBOL_GPL(hisi_sas_rescan_topology);

    -static struct scsi_transport_template *hisi_sas_stt;
    +struct scsi_transport_template *hisi_sas_stt;
    +EXPORT_SYMBOL_GPL(hisi_sas_stt);

    -static struct scsi_host_template hisi_sas_sht = {
    +static struct scsi_host_template _hisi_sas_sht = {
    .module = THIS_MODULE,
    .name = DRV_NAME,
    .queuecommand = sas_queuecommand,
    @@ -1494,6 +1495,8 @@ void hisi_sas_rescan_topology(struct hisi_hba *hisi_hba, u32 old_state,
    .target_destroy = sas_target_destroy,
    .ioctl = sas_ioctl,
    };
    +struct scsi_host_template *hisi_sas_sht = &_hisi_sas_sht;
    +EXPORT_SYMBOL_GPL(hisi_sas_sht);

    static struct sas_domain_function_template hisi_sas_transport_ops = {
    .lldd_dev_found = hisi_sas_dev_found,
    @@ -1541,7 +1544,7 @@ void hisi_sas_init_mem(struct hisi_hba *hisi_hba)
    }
    EXPORT_SYMBOL_GPL(hisi_sas_init_mem);

    -static int hisi_sas_alloc(struct hisi_hba *hisi_hba, struct Scsi_Host *shost)
    +int hisi_sas_alloc(struct hisi_hba *hisi_hba, struct Scsi_Host *shost)
    {
    struct device *dev = hisi_hba->dev;
    int i, s, max_command_entries = hisi_hba->hw->max_command_entries;
    @@ -1660,8 +1663,9 @@ static int hisi_sas_alloc(struct hisi_hba *hisi_hba, struct Scsi_Host *shost)
    err_out:
    return -ENOMEM;
    }
    +EXPORT_SYMBOL_GPL(hisi_sas_alloc);

    -static void hisi_sas_free(struct hisi_hba *hisi_hba)
    +void hisi_sas_free(struct hisi_hba *hisi_hba)
    {
    struct device *dev = hisi_hba->dev;
    int i, s, max_command_entries = hisi_hba->hw->max_command_entries;
    @@ -1716,6 +1720,7 @@ static void hisi_sas_free(struct hisi_hba *hisi_hba)
    if (hisi_hba->wq)
    destroy_workqueue(hisi_hba->wq);
    }
    +EXPORT_SYMBOL_GPL(hisi_sas_free);

    static void hisi_sas_rst_work_handler(struct work_struct *work)
    {
    @@ -1801,7 +1806,7 @@ static struct Scsi_Host *hisi_sas_shost_alloc(struct platform_device *pdev,
    struct hisi_hba *hisi_hba;
    struct device *dev = &pdev->dev;

    - shost = scsi_host_alloc(&hisi_sas_sht, sizeof(*hisi_hba));
    + shost = scsi_host_alloc(hisi_sas_sht, sizeof(*hisi_hba));
    if (!shost) {
    dev_err(dev, "scsi host alloc failed\n");
    return NULL;
    @@ -1843,7 +1848,7 @@ static struct Scsi_Host *hisi_sas_shost_alloc(struct platform_device *pdev,
    return NULL;
    }

    -static void hisi_sas_init_add(struct hisi_hba *hisi_hba)
    +void hisi_sas_init_add(struct hisi_hba *hisi_hba)
    {
    int i;

    @@ -1852,6 +1857,7 @@ static void hisi_sas_init_add(struct hisi_hba *hisi_hba)
    hisi_hba->sas_addr,
    SAS_ADDR_SIZE);
    }
    +EXPORT_SYMBOL_GPL(hisi_sas_init_add);

    int hisi_sas_probe(struct platform_device *pdev,
    const struct hisi_sas_hw *hw)
    diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
    index cf72577..e9a9fb0 100644
    --- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
    +++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
    @@ -11,14 +11,168 @@
    #include "hisi_sas.h"
    #define DRV_NAME "hisi_sas_v3_hw"

    +static const struct hisi_sas_hw hisi_sas_v3_hw = {
    +};
    +
    +static struct Scsi_Host *
    +hisi_sas_shost_alloc_pci(struct pci_dev *pdev)
    +{
    + struct Scsi_Host *shost;
    + struct hisi_hba *hisi_hba;
    + struct device *dev = &pdev->dev;
    +
    + shost = scsi_host_alloc(hisi_sas_sht, sizeof(*hisi_hba));
    + if (!shost)
    + goto err_out;
    + hisi_hba = shost_priv(shost);
    +
    + hisi_hba->hw = &hisi_sas_v3_hw;
    + hisi_hba->pci_dev = pdev;
    + hisi_hba->dev = dev;
    + hisi_hba->shost = shost;
    + SHOST_TO_SAS_HA(shost) = &hisi_hba->sha;
    +
    + init_timer(&hisi_hba->timer);
    +
    + if (hisi_sas_get_fw_info(hisi_hba) < 0)
    + goto err_out;
    +
    + if (hisi_sas_alloc(hisi_hba, shost)) {
    + hisi_sas_free(hisi_hba);
    + goto err_out;
    + }
    +
    + return shost;
    +err_out:
    + dev_err(dev, "shost alloc failed\n");
    + return NULL;
    +}
    +
    static int
    hisi_sas_v3_probe(struct pci_dev *pdev, const struct pci_device_id *id)
    {
    + struct Scsi_Host *shost;
    + struct hisi_hba *hisi_hba;
    + struct device *dev = &pdev->dev;
    + struct asd_sas_phy **arr_phy;
    + struct asd_sas_port **arr_port;
    + struct sas_ha_struct *sha;
    + int rc, phy_nr, port_nr, i;
    +
    + rc = pci_enable_device(pdev);
    + if (rc)
    + goto err_out;
    +
    + pci_set_master(pdev);
    +
    + rc = pci_request_regions(pdev, DRV_NAME);
    + if (rc)
    + goto err_out_disable_device;
    +
    + if ((pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) != 0) ||
    + (pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64)) != 0)) {
    + if ((pci_set_dma_mask(pdev, DMA_BIT_MASK(32)) != 0) ||
    + (pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)) != 0)) {
    + dev_err(dev, "No usable DMA addressing method\n");
    + rc = -EIO;
    + goto err_out_regions;
    + }
    + }
    +
    + shost = hisi_sas_shost_alloc_pci(pdev);
    + if (!shost) {
    + rc = -ENOMEM;
    + goto err_out_regions;
    + }
    +
    + sha = SHOST_TO_SAS_HA(shost);
    + hisi_hba = shost_priv(shost);
    + dev_set_drvdata(dev, sha);
    +
    + hisi_hba->regs = pcim_iomap(pdev, 5, 0);
    + if (!hisi_hba->regs) {
    + dev_err(dev, "cannot map register.\n");
    + rc = -ENOMEM;
    + goto err_out_ha;
    + }
    +
    + phy_nr = port_nr = hisi_hba->n_phy;
    +
    + arr_phy = devm_kcalloc(dev, phy_nr, sizeof(void *), GFP_KERNEL);
    + arr_port = devm_kcalloc(dev, port_nr, sizeof(void *), GFP_KERNEL);
    + if (!arr_phy || !arr_port) {
    + rc = -ENOMEM;
    + goto err_out_ha;
    + }
    +
    + sha->sas_phy = arr_phy;
    + sha->sas_port = arr_port;
    + sha->core.shost = shost;
    + sha->lldd_ha = hisi_hba;
    +
    + shost->transportt = hisi_sas_stt;
    + shost->max_id = HISI_SAS_MAX_DEVICES;
    + shost->max_lun = ~0;
    + shost->max_channel = 1;
    + shost->max_cmd_len = 16;
    + shost->sg_tablesize = min_t(u16, SG_ALL, HISI_SAS_SGE_PAGE_CNT);
    + shost->can_queue = hisi_hba->hw->max_command_entries;
    + shost->cmd_per_lun = hisi_hba->hw->max_command_entries;
    +
    + sha->sas_ha_name = DRV_NAME;
    + sha->dev = dev;
    + sha->lldd_module = THIS_MODULE;
    + sha->sas_addr = &hisi_hba->sas_addr[0];
    + sha->num_phys = hisi_hba->n_phy;
    + sha->core.shost = hisi_hba->shost;
    +
    + for (i = 0; i < hisi_hba->n_phy; i++) {
    + sha->sas_phy[i] = &hisi_hba->phy[i].sas_phy;
    + sha->sas_port[i] = &hisi_hba->port[i].sas_port;
    + }
    +
    + hisi_sas_init_add(hisi_hba);
    +
    + rc = scsi_add_host(shost, dev);
    + if (rc)
    + goto err_out_ha;
    +
    + rc = sas_register_ha(sha);
    + if (rc)
    + goto err_out_register_ha;
    +
    + rc = hisi_hba->hw->hw_init(hisi_hba);
    + if (rc)
    + goto err_out_register_ha;
    +
    + scsi_scan_host(shost);
    +
    return 0;
    +
    +err_out_register_ha:
    + scsi_remove_host(shost);
    +err_out_ha:
    + kfree(shost);
    +err_out_regions:
    + pci_release_regions(pdev);
    +err_out_disable_device:
    + pci_disable_device(pdev);
    +err_out:
    + return rc;
    }

    static void hisi_sas_v3_remove(struct pci_dev *pdev)
    {
    + struct device *dev = &pdev->dev;
    + struct sas_ha_struct *sha = dev_get_drvdata(dev);
    + struct hisi_hba *hisi_hba = sha->lldd_ha;
    +
    + sas_unregister_ha(sha);
    + sas_remove_host(sha->core.shost);
    +
    + hisi_sas_free(hisi_hba);
    + pci_release_regions(pdev);
    + pci_disable_device(pdev);
    }

    enum {
    --
    1.9.1
    \
     
     \ /
      Last update: 2017-06-12 01:07    [W:6.755 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site