From: Hannes Reinecke <hare@suse.de>
To: Suganath Prabu S <suganath-prabu.subramani@broadcom.com>,
JBottomley@Parallels.com, jejb@kernel.org, hch@infradead.org
Cc: martin.petersen@oracle.com, linux-scsi@vger.kernel.org,
Sathya.Prakash@broadcom.com, kashyap.desai@broadcom.com,
krishnaraddi.mankani@broadcom.com, linux-kernel@vger.kernel.org,
chaitra.basappa@broadcom.com, sreekanth.reddy@broadcom.com
Subject: Re: [PATCH 06/10] mpt3sas: Added Device ID's for SAS35 devices and updated MPI header.
Date: Mon, 24 Oct 2016 16:49:37 +0200 [thread overview]
Message-ID: <e5b9db0c-e751-3e26-20ad-050081a4ce79@suse.de> (raw)
In-Reply-To: <1476966018-10457-7-git-send-email-suganath-prabu.subramani@broadcom.com>
On 10/20/2016 02:20 PM, Suganath Prabu S wrote:
> Added Device ID's for SAS35 devices (Ventura, Crusader, Harpoon &
> Tomcat) and updated mpi header file for the same. Also added
> "is_gen35_ioc" to MPT3SAS_ADAPTER structure for identifying SAS35 adapters.
>
> Signed-off-by: Chaitra P B <chaitra.basappa@broadcom.com>
> Signed-off-by: Sathya Prakash <sathya.prakash@broadcom.com>
> Signed-off-by: Suganath Prabu S <suganath-prabu.subramani@broadcom.com>
> ---
> drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h | 7 +++++++
> drivers/scsi/mpt3sas/mpt3sas_base.h | 1 +
> drivers/scsi/mpt3sas/mpt3sas_ctl.c | 5 ++++-
> drivers/scsi/mpt3sas/mpt3sas_ctl.h | 1 +
> drivers/scsi/mpt3sas/mpt3sas_scsih.c | 31 +++++++++++++++++++++++++++++++
> 5 files changed, 44 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h b/drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h
> index 95356a8..fa61baf 100644
> --- a/drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h
> +++ b/drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h
> @@ -478,6 +478,13 @@ typedef struct _MPI2_CONFIG_REPLY {
> #define MPI26_MFGPAGE_DEVID_SAS3324_3 (0x00C2)
> #define MPI26_MFGPAGE_DEVID_SAS3324_4 (0x00C3)
>
> +#define MPI26_MFGPAGE_DEVID_SAS3516 (0x00AA)
> +#define MPI26_MFGPAGE_DEVID_SAS3516_1 (0x00AB)
> +#define MPI26_MFGPAGE_DEVID_SAS3416 (0x00AC)
> +#define MPI26_MFGPAGE_DEVID_SAS3508 (0x00AD)
> +#define MPI26_MFGPAGE_DEVID_SAS3508_1 (0x00AE)
> +#define MPI26_MFGPAGE_DEVID_SAS3408 (0x00AF)
> +
> /*Manufacturing Page 0 */
>
> typedef struct _MPI2_CONFIG_PAGE_MAN_0 {
> diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.h b/drivers/scsi/mpt3sas/mpt3sas_base.h
> index 6f03a86..3d75c57 100644
> --- a/drivers/scsi/mpt3sas/mpt3sas_base.h
> +++ b/drivers/scsi/mpt3sas/mpt3sas_base.h
> @@ -1191,6 +1191,7 @@ struct MPT3SAS_ADAPTER {
> struct SL_WH_MPI_TRIGGERS_T diag_trigger_mpi;
> void *device_remove_in_progress;
> u16 device_remove_in_progress_sz;
> + u8 is_gen35_ioc;
> };
>
> typedef u8 (*MPT_CALLBACK)(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8 msix_index,
> diff --git a/drivers/scsi/mpt3sas/mpt3sas_ctl.c b/drivers/scsi/mpt3sas/mpt3sas_ctl.c
> index f204ce1..62be7d4 100644
> --- a/drivers/scsi/mpt3sas/mpt3sas_ctl.c
> +++ b/drivers/scsi/mpt3sas/mpt3sas_ctl.c
> @@ -1096,7 +1096,10 @@ _ctl_getiocinfo(struct MPT3SAS_ADAPTER *ioc, void __user *arg)
> break;
> case MPI25_VERSION:
> case MPI26_VERSION:
> - karg.adapter_type = MPT3_IOCTL_INTERFACE_SAS3;
> + if (ioc->is_gen35_ioc)
> + karg.adapter_type = MPT3_IOCTL_INTERFACE_SAS35;
> + else
> + karg.adapter_type = MPT3_IOCTL_INTERFACE_SAS3;
> strcat(karg.driver_version, MPT3SAS_DRIVER_VERSION);
> break;
> }
> diff --git a/drivers/scsi/mpt3sas/mpt3sas_ctl.h b/drivers/scsi/mpt3sas/mpt3sas_ctl.h
> index 8940835..f3e17a8 100644
> --- a/drivers/scsi/mpt3sas/mpt3sas_ctl.h
> +++ b/drivers/scsi/mpt3sas/mpt3sas_ctl.h
> @@ -143,6 +143,7 @@ struct mpt3_ioctl_pci_info {
> #define MPT2_IOCTL_INTERFACE_SAS2 (0x04)
> #define MPT2_IOCTL_INTERFACE_SAS2_SSS6200 (0x05)
> #define MPT3_IOCTL_INTERFACE_SAS3 (0x06)
> +#define MPT3_IOCTL_INTERFACE_SAS35 (0x07)
> #define MPT2_IOCTL_VERSION_LENGTH (32)
>
> /**
> diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
> index 9584d6b..521849d 100644
> --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
> +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
> @@ -8660,6 +8660,12 @@ _scsih_determine_hba_mpi_version(struct pci_dev *pdev)
> case MPI26_MFGPAGE_DEVID_SAS3324_2:
> case MPI26_MFGPAGE_DEVID_SAS3324_3:
> case MPI26_MFGPAGE_DEVID_SAS3324_4:
> + case MPI26_MFGPAGE_DEVID_SAS3508:
> + case MPI26_MFGPAGE_DEVID_SAS3508_1:
> + case MPI26_MFGPAGE_DEVID_SAS3408:
> + case MPI26_MFGPAGE_DEVID_SAS3516:
> + case MPI26_MFGPAGE_DEVID_SAS3516_1:
> + case MPI26_MFGPAGE_DEVID_SAS3416:
> return MPI26_VERSION;
> }
> return 0;
> @@ -8728,6 +8734,18 @@ _scsih_probe(struct pci_dev *pdev, const struct pci_device_id *id)
> ioc->hba_mpi_version_belonged = hba_mpi_version;
> ioc->id = mpt3_ids++;
> sprintf(ioc->driver_name, "%s", MPT3SAS_DRIVER_NAME);
> + switch (pdev->device) {
> + case MPI26_MFGPAGE_DEVID_SAS3508:
> + case MPI26_MFGPAGE_DEVID_SAS3508_1:
> + case MPI26_MFGPAGE_DEVID_SAS3408:
> + case MPI26_MFGPAGE_DEVID_SAS3516:
> + case MPI26_MFGPAGE_DEVID_SAS3516_1:
> + case MPI26_MFGPAGE_DEVID_SAS3416:
> + ioc->is_gen35_ioc = 1;
> + break;
> + default:
> + ioc->is_gen35_ioc = 0;
> + }
> if ((ioc->hba_mpi_version_belonged == MPI25_VERSION &&
> pdev->revision >= SAS3_PCI_DEVICE_C0_REVISION) ||
> (ioc->hba_mpi_version_belonged == MPI26_VERSION))
> @@ -9134,6 +9152,19 @@ static const struct pci_device_id mpt3sas_pci_table[] = {
> PCI_ANY_ID, PCI_ANY_ID },
> { MPI2_MFGPAGE_VENDORID_LSI, MPI26_MFGPAGE_DEVID_SAS3324_4,
> PCI_ANY_ID, PCI_ANY_ID },
> + /* Ventura, Crusader, Harpoon & Tomcat ~ 3516, 3416, 3508 & 3408*/
> + { MPI2_MFGPAGE_VENDORID_LSI, MPI26_MFGPAGE_DEVID_SAS3508,
> + PCI_ANY_ID, PCI_ANY_ID },
> + { MPI2_MFGPAGE_VENDORID_LSI, MPI26_MFGPAGE_DEVID_SAS3508_1,
> + PCI_ANY_ID, PCI_ANY_ID },
> + { MPI2_MFGPAGE_VENDORID_LSI, MPI26_MFGPAGE_DEVID_SAS3408,
> + PCI_ANY_ID, PCI_ANY_ID },
> + { MPI2_MFGPAGE_VENDORID_LSI, MPI26_MFGPAGE_DEVID_SAS3516,
> + PCI_ANY_ID, PCI_ANY_ID },
> + { MPI2_MFGPAGE_VENDORID_LSI, MPI26_MFGPAGE_DEVID_SAS3516_1,
> + PCI_ANY_ID, PCI_ANY_ID },
> + { MPI2_MFGPAGE_VENDORID_LSI, MPI26_MFGPAGE_DEVID_SAS3416,
> + PCI_ANY_ID, PCI_ANY_ID },
> {0} /* Terminating entry */
> };
> MODULE_DEVICE_TABLE(pci, mpt3sas_pci_table);
>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Cheers,
Hannes
--
Dr. Hannes Reinecke Teamlead Storage & Networking
hare@suse.de +49 911 74053 688
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: F. Imendörffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton
HRB 21284 (AG Nürnberg)
next prev parent reply other threads:[~2016-10-24 14:49 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-20 12:20 [PATCH 00/10] mpt3sas driver Enhancements and Suganath Prabu S
2016-10-20 12:20 ` [PATCH 01/10] mpt3sas: Fix for improper info displayed in var log, while blocking or unblocking the device Suganath Prabu S
2016-10-24 14:44 ` Hannes Reinecke
2016-10-25 14:37 ` Tomas Henzl
2016-10-20 12:20 ` [PATCH 02/10] mpt3sas: Fix for incorrect numbers for MSIX vectors enabled when non RDPQ card is enumerated first Suganath Prabu S
2016-10-24 14:44 ` Hannes Reinecke
2016-10-25 14:38 ` Tomas Henzl
2016-10-20 12:20 ` [PATCH 03/10] mpt3sas: Implement device_remove_in_progress check in IOCTL path Suganath Prabu S
2016-10-24 14:47 ` Hannes Reinecke
2016-10-25 9:19 ` Suganath Prabu Subramani
2016-10-25 9:51 ` Hannes Reinecke
2016-10-25 10:36 ` Suganath Prabu Subramani
2016-10-20 12:20 ` [PATCH 04/10] mpt3sas: Removing unused macro "MPT_DEVICE_TLR_ON" Suganath Prabu S
2016-10-24 14:47 ` Hannes Reinecke
2016-10-25 14:38 ` Tomas Henzl
2016-10-20 12:20 ` [PATCH 05/10] mpt3sas: Bump driver version as "14.100.00.00" Suganath Prabu S
2016-10-24 14:48 ` Hannes Reinecke
2016-10-20 12:20 ` [PATCH 06/10] mpt3sas: Added Device ID's for SAS35 devices and updated MPI header Suganath Prabu S
2016-10-24 14:49 ` Hannes Reinecke [this message]
2016-10-25 14:40 ` Tomas Henzl
2016-10-20 12:20 ` [PATCH 07/10] mpt3sas: Increased/Additional MSIX support for SAS35 devices Suganath Prabu S
2016-10-24 14:50 ` Hannes Reinecke
2016-10-25 14:41 ` Tomas Henzl
2016-10-20 12:20 ` [PATCH 08/10] mpt3sas: set EEDP-escape-flags " Suganath Prabu S
2016-10-24 14:51 ` Hannes Reinecke
2016-10-25 14:42 ` Tomas Henzl
2016-10-20 12:20 ` [PATCH 09/10] mpt3sas: Use the new MPI 2.6 32-bit Atomic Request Descriptors " Suganath Prabu S
2016-10-24 14:52 ` Hannes Reinecke
2016-10-25 14:47 ` Tomas Henzl
2016-10-20 12:20 ` [PATCH 10/10] mpt3sas: Fix for Endianness issue Suganath Prabu S
2016-10-24 14:53 ` Hannes Reinecke
2016-10-25 14:48 ` Tomas Henzl
2016-10-25 1:17 ` [PATCH 00/10] mpt3sas driver Enhancements and Martin K. Petersen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e5b9db0c-e751-3e26-20ad-050081a4ce79@suse.de \
--to=hare@suse.de \
--cc=JBottomley@Parallels.com \
--cc=Sathya.Prakash@broadcom.com \
--cc=chaitra.basappa@broadcom.com \
--cc=hch@infradead.org \
--cc=jejb@kernel.org \
--cc=kashyap.desai@broadcom.com \
--cc=krishnaraddi.mankani@broadcom.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=sreekanth.reddy@broadcom.com \
--cc=suganath-prabu.subramani@broadcom.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).