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

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

scsi: hisi_sas: add initialisation for v3 pci-based controller 



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: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarXiang Chen <chenxiang66@hisilicon.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 92f61e3b

drivers/scsi/hisi_sas/hisi_sas.h

+6 −0
Original line number Diff line number Diff line
@@ -366,6 +366,12 @@ union hisi_sas_command_table { 
	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,

drivers/scsi/hisi_sas/hisi_sas_main.c

+12 −6
Original line number Diff line number Diff line
@@ -1476,9 +1476,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,
@@ -1498,6 +1499,8 @@ static struct scsi_host_template hisi_sas_sht = { 
	.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,
@@ -1545,7 +1548,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;
@@ -1664,8 +1667,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;
@@ -1720,6 +1724,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)

{
@@ -1805,7 +1810,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;
@@ -1847,7 +1852,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;
@@ -1856,6 +1861,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)

drivers/scsi/hisi_sas/hisi_sas_v3_hw.c

+154 −0
Original line number Diff line number Diff line
@@ -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 {