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

Commit d357e84d authored by Sreekanth Reddy's avatar Sreekanth Reddy Committed by Martin K. Petersen
Browse files

mpt3sas: Define 'hba_mpi_version_belonged' IOC variable 



1. Use 'hba_mpi_version_belonged' IOC varable to uniquely identify each
individual generation driver functionality at runtime.

2. Declare global variable 'driver_name' and use this variable while
reserving PCI regions and while allocating the IRQs.

Signed-off-by: default avatarSreekanth Reddy <Sreekanth.Reddy@avagotech.com>
Acked-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 09ec55ed

drivers/scsi/mpt2sas/mpt2sas_module.c

+1 −0
Original line number Diff line number Diff line
@@ -196,6 +196,7 @@ _mpt2sas_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	if (!shost)

		return -ENODEV;



	sprintf(driver_name, "%s", MPT2SAS_DRIVER_NAME);

	rv = scsih_probe(pdev, shost);

	return rv;

}

drivers/scsi/mpt3sas/mpt3sas_base.c

+4 −4
Original line number Diff line number Diff line
@@ -1643,10 +1643,10 @@ _base_request_irq(struct MPT3SAS_ADAPTER *ioc, u8 index, u32 vector) 
	atomic_set(&reply_q->busy, 0);

	if (ioc->msix_enable)

		snprintf(reply_q->name, MPT_NAME_LENGTH, "%s%d-msix%d",

		    MPT3SAS_DRIVER_NAME, ioc->id, index);

		    driver_name, ioc->id, index);

	else

		snprintf(reply_q->name, MPT_NAME_LENGTH, "%s%d",

		    MPT3SAS_DRIVER_NAME, ioc->id);

		    driver_name, ioc->id);

	r = request_irq(vector, _base_interrupt, IRQF_SHARED, reply_q->name,

	    reply_q);

	if (r) {
@@ -1872,7 +1872,7 @@ mpt3sas_base_map_resources(struct MPT3SAS_ADAPTER *ioc) 




	if (pci_request_selected_regions(pdev, ioc->bars,

	    MPT3SAS_DRIVER_NAME)) {

	    driver_name)) {

		pr_warn(MPT3SAS_FMT "pci_request_selected_regions: failed\n",

			ioc->name);

		ioc->bars = 0;
@@ -4021,7 +4021,7 @@ _base_send_ioc_init(struct MPT3SAS_ADAPTER *ioc, int sleep_flag) 
	mpi_request.WhoInit = MPI2_WHOINIT_HOST_DRIVER;

	mpi_request.VF_ID = 0; /* TODO */

	mpi_request.VP_ID = 0;

	mpi_request.MsgVersion = cpu_to_le16(MPI25_VERSION);

	mpi_request.MsgVersion = cpu_to_le16(ioc->hba_mpi_version_belonged);

	mpi_request.HeaderVersion = cpu_to_le16(MPI2_HEADER_VERSION);



	if (_base_is_controller_msix_enabled(ioc))

drivers/scsi/mpt3sas/mpt3sas_base.h

+3 −0
Original line number Diff line number Diff line
@@ -870,6 +870,7 @@ struct MPT3SAS_ADAPTER { 
	MPT_BUILD_SG    build_sg;

	MPT_BUILD_ZERO_LEN_SGE build_zero_len_sge;

	u16             sge_size_ieee;

	u16		hba_mpi_version_belonged;



	/* function ptr for MPI sg elements only */

	MPT_BUILD_SG    build_sg_mpi;
@@ -1023,6 +1024,8 @@ typedef u8 (*MPT_CALLBACK)(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8 msix_index, 


/* base shared API */

extern struct list_head mpt3sas_ioc_list;

extern char    driver_name[MPT_NAME_LENGTH];



void mpt3sas_base_start_watchdog(struct MPT3SAS_ADAPTER *ioc);

void mpt3sas_base_stop_watchdog(struct MPT3SAS_ADAPTER *ioc);

drivers/scsi/mpt3sas/mpt3sas_ctl.c

+15 −3
Original line number Diff line number Diff line
@@ -1023,7 +1023,6 @@ _ctl_getiocinfo(struct MPT3SAS_ADAPTER *ioc, void __user *arg) 
	    __func__));



	memset(&karg, 0 , sizeof(karg));

	karg.adapter_type = MPT3_IOCTL_INTERFACE_SAS3;

	if (ioc->pfacts)

		karg.port_number = ioc->pfacts[0].PortNumber;

	karg.hw_rev = ioc->pdev->revision;
@@ -1035,8 +1034,21 @@ _ctl_getiocinfo(struct MPT3SAS_ADAPTER *ioc, void __user *arg) 
	karg.pci_information.u.bits.function = PCI_FUNC(ioc->pdev->devfn);

	karg.pci_information.segment_id = pci_domain_nr(ioc->pdev->bus);

	karg.firmware_version = ioc->facts.FWVersion.Word;

	strcpy(karg.driver_version, MPT3SAS_DRIVER_NAME);

	strcpy(karg.driver_version, driver_name);

	strcat(karg.driver_version, "-");

	switch  (ioc->hba_mpi_version_belonged) {

	case MPI2_VERSION:

		karg.adapter_type = MPT2_IOCTL_INTERFACE_SAS2;

		strcat(karg.driver_version, MPT2SAS_DRIVER_VERSION);

		break;

	case MPI25_VERSION:

		karg.adapter_type = MPT3_IOCTL_INTERFACE_SAS3;

		strcat(karg.driver_version, MPT3SAS_DRIVER_VERSION);

		break;

	}

	if (ioc->hba_mpi_version_belonged == MPI2_VERSION)

		strcat(karg.driver_version, MPT2SAS_DRIVER_VERSION);

	else

		strcat(karg.driver_version, MPT3SAS_DRIVER_VERSION);

	karg.bios_version = le32_to_cpu(ioc->bios_pg3.BiosVersion);

drivers/scsi/mpt3sas/mpt3sas_module.c

+1 −0
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ _mpt3sas_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	if (!shost)

		return -ENODEV;



	sprintf(driver_name, "%s", MPT3SAS_DRIVER_NAME);

	rv = scsih_probe(pdev, shost);

	return rv;

}