* [PATCH 0/4] mpt3sas: Add Atlas and Ambrosia device support.
@ 2019-01-29 12:14 Suganath Prabu S
2019-01-29 12:14 ` [PATCH 1/4] mpt3sas: Rename mpi endpoint device ID macro Suganath Prabu S
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Suganath Prabu S @ 2019-01-29 12:14 UTC (permalink / raw)
To: linux-scsi, linux-kernel
Cc: Sathya.Prakash, sreekanth.reddy, Suganath Prabu S
Posting below patches to include new devices Ambrosia,
Atlas.
* Rename macros for MPI Endpoint device which
is a PCIe switch based on MPI2.
* Added device ID 0x02B1 for NVMe Switch Adapter (Ambrosia).
* Added device ID for the Atlas PCIe Switch management port
(0x00B2). This device is based on MPI2.6 and it exposes
one SES device to accept management commands.
Suganath Prabu S (4):
mpt3sas: Rename mpi endpoint device ID macro.
mpt3sas: Add support for NVMe Switch Adapter
mpt3sas: Add support for ATLAS PCIe switch.
mpt3sas: Update driver version to 27.102.00.00
drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h | 3 ++-
drivers/scsi/mpt3sas/mpt3sas_base.h | 7 +++++--
drivers/scsi/mpt3sas/mpt3sas_scsih.c | 16 +++++++++++++---
3 files changed, 20 insertions(+), 6 deletions(-)
Thanks,
Suganath Prabu
--
1.8.3.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/4] mpt3sas: Rename mpi endpoint device ID macro.
2019-01-29 12:14 [PATCH 0/4] mpt3sas: Add Atlas and Ambrosia device support Suganath Prabu S
@ 2019-01-29 12:14 ` Suganath Prabu S
2019-01-29 12:14 ` [PATCH 2/4] mpt3sas: Add support for NVMe Switch Adapter Suganath Prabu S
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Suganath Prabu S @ 2019-01-29 12:14 UTC (permalink / raw)
To: linux-scsi, linux-kernel
Cc: Sathya.Prakash, sreekanth.reddy, Suganath Prabu S
MPI Endpoint is a PCIe switch based on MPI2,
Renaming device ID macro from
MPI2_MFGPAGE_DEVID_SAS2308_MPI_EP
to MPI2_MFGPAGE_DEVID_SWITCH_MPI_EP
Signed-off-by: Suganath Prabu S <suganath-prabu.subramani@broadcom.com>
---
drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h | 2 +-
drivers/scsi/mpt3sas/mpt3sas_scsih.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h b/drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h
index 398fa6f..a53a758 100644
--- a/drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h
+++ b/drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h
@@ -548,7 +548,7 @@ typedef struct _MPI2_CONFIG_REPLY {
#define MPI2_MFGPAGE_DEVID_SAS2308_1 (0x0086)
#define MPI2_MFGPAGE_DEVID_SAS2308_2 (0x0087)
#define MPI2_MFGPAGE_DEVID_SAS2308_3 (0x006E)
-#define MPI2_MFGPAGE_DEVID_SAS2308_MPI_EP (0x02B0)
+#define MPI2_MFGPAGE_DEVID_SWITCH_MPI_EP (0x02B0)
/*MPI v2.5 SAS products */
#define MPI25_MFGPAGE_DEVID_SAS3004 (0x0096)
diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
index 6be39dc..c3a0f70 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@ -10256,7 +10256,7 @@ _scsih_determine_hba_mpi_version(struct pci_dev *pdev)
case MPI2_MFGPAGE_DEVID_SAS2308_1:
case MPI2_MFGPAGE_DEVID_SAS2308_2:
case MPI2_MFGPAGE_DEVID_SAS2308_3:
- case MPI2_MFGPAGE_DEVID_SAS2308_MPI_EP:
+ case MPI2_MFGPAGE_DEVID_SWITCH_MPI_EP:
return MPI2_VERSION;
case MPI25_MFGPAGE_DEVID_SAS3004:
case MPI25_MFGPAGE_DEVID_SAS3008:
@@ -10343,7 +10343,7 @@ _scsih_probe(struct pci_dev *pdev, const struct pci_device_id *id)
ioc->is_warpdrive = 1;
ioc->hide_ir_msg = 1;
break;
- case MPI2_MFGPAGE_DEVID_SAS2308_MPI_EP:
+ case MPI2_MFGPAGE_DEVID_SWITCH_MPI_EP:
ioc->is_mcpu_endpoint = 1;
break;
default:
@@ -10783,7 +10783,7 @@ static const struct pci_device_id mpt3sas_pci_table[] = {
PCI_ANY_ID, PCI_ANY_ID },
{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2308_3,
PCI_ANY_ID, PCI_ANY_ID },
- { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2308_MPI_EP,
+ { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SWITCH_MPI_EP,
PCI_ANY_ID, PCI_ANY_ID },
/* SSS6200 */
{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SSS6200,
--
1.8.3.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/4] mpt3sas: Add support for NVMe Switch Adapter
2019-01-29 12:14 [PATCH 0/4] mpt3sas: Add Atlas and Ambrosia device support Suganath Prabu S
2019-01-29 12:14 ` [PATCH 1/4] mpt3sas: Rename mpi endpoint device ID macro Suganath Prabu S
@ 2019-01-29 12:14 ` Suganath Prabu S
2019-01-29 12:14 ` [PATCH 3/4] mpt3sas: Add support for ATLAS PCIe switch Suganath Prabu S
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Suganath Prabu S @ 2019-01-29 12:14 UTC (permalink / raw)
To: linux-scsi, linux-kernel
Cc: Sathya.Prakash, sreekanth.reddy, Suganath Prabu S
Added device ID for NVMe Switch Adapter (Ambrosia).
VID: 0x1000
DID: 0x02B1
Signed-off-by: Suganath Prabu S <suganath-prabu.subramani@broadcom.com>
---
drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h | 1 +
drivers/scsi/mpt3sas/mpt3sas_scsih.c | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h b/drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h
index a53a758..a2f4a55 100644
--- a/drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h
+++ b/drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h
@@ -549,6 +549,7 @@ typedef struct _MPI2_CONFIG_REPLY {
#define MPI2_MFGPAGE_DEVID_SAS2308_2 (0x0087)
#define MPI2_MFGPAGE_DEVID_SAS2308_3 (0x006E)
#define MPI2_MFGPAGE_DEVID_SWITCH_MPI_EP (0x02B0)
+#define MPI2_MFGPAGE_DEVID_SWITCH_MPI_EP_1 (0x02B1)
/*MPI v2.5 SAS products */
#define MPI25_MFGPAGE_DEVID_SAS3004 (0x0096)
diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
index c3a0f70..4a73753 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@ -10257,6 +10257,7 @@ _scsih_determine_hba_mpi_version(struct pci_dev *pdev)
case MPI2_MFGPAGE_DEVID_SAS2308_2:
case MPI2_MFGPAGE_DEVID_SAS2308_3:
case MPI2_MFGPAGE_DEVID_SWITCH_MPI_EP:
+ case MPI2_MFGPAGE_DEVID_SWITCH_MPI_EP_1:
return MPI2_VERSION;
case MPI25_MFGPAGE_DEVID_SAS3004:
case MPI25_MFGPAGE_DEVID_SAS3008:
@@ -10344,6 +10345,7 @@ _scsih_probe(struct pci_dev *pdev, const struct pci_device_id *id)
ioc->hide_ir_msg = 1;
break;
case MPI2_MFGPAGE_DEVID_SWITCH_MPI_EP:
+ case MPI2_MFGPAGE_DEVID_SWITCH_MPI_EP_1:
ioc->is_mcpu_endpoint = 1;
break;
default:
@@ -10785,6 +10787,8 @@ static const struct pci_device_id mpt3sas_pci_table[] = {
PCI_ANY_ID, PCI_ANY_ID },
{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SWITCH_MPI_EP,
PCI_ANY_ID, PCI_ANY_ID },
+ { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SWITCH_MPI_EP_1,
+ PCI_ANY_ID, PCI_ANY_ID },
/* SSS6200 */
{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SSS6200,
PCI_ANY_ID, PCI_ANY_ID },
--
1.8.3.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/4] mpt3sas: Add support for ATLAS PCIe switch.
2019-01-29 12:14 [PATCH 0/4] mpt3sas: Add Atlas and Ambrosia device support Suganath Prabu S
2019-01-29 12:14 ` [PATCH 1/4] mpt3sas: Rename mpi endpoint device ID macro Suganath Prabu S
2019-01-29 12:14 ` [PATCH 2/4] mpt3sas: Add support for NVMe Switch Adapter Suganath Prabu S
@ 2019-01-29 12:14 ` Suganath Prabu S
2019-01-29 12:14 ` [PATCH 4/4] mpt3sas: Update driver version to 27.102.00.00 Suganath Prabu S
2019-02-05 3:47 ` [PATCH 0/4] mpt3sas: Add Atlas and Ambrosia device support Martin K. Petersen
4 siblings, 0 replies; 6+ messages in thread
From: Suganath Prabu S @ 2019-01-29 12:14 UTC (permalink / raw)
To: linux-scsi, linux-kernel
Cc: Sathya.Prakash, sreekanth.reddy, Suganath Prabu S
Add Atlas PCIe Switch Management Port device PNPID,
Vendor Id: 0x1000
device Id: 0x00B2
This device is based on MPI 2.6 spec and it exposes one
SES device to accept management commands for the PCIe switch.
Signed-off-by: Suganath Prabu S <suganath-prabu.subramani@broadcom.com>
---
drivers/scsi/mpt3sas/mpt3sas_base.h | 3 +++
drivers/scsi/mpt3sas/mpt3sas_scsih.c | 6 ++++++
2 files changed, 9 insertions(+)
diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.h b/drivers/scsi/mpt3sas/mpt3sas_base.h
index 8003519..db12c1b 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_base.h
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.h
@@ -193,6 +193,9 @@ struct mpt3sas_nvme_cmd {
#define SAS2_PCI_DEVICE_B0_REVISION (0x01)
#define SAS3_PCI_DEVICE_C0_REVISION (0x02)
+/* Atlas PCIe Switch Management Port */
+#define MPI26_ATLAS_PCIe_SWITCH_DEVID (0x00B2)
+
/*
* Intel HBA branding
*/
diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
index 4a73753..8bb5b8f 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@ -10283,6 +10283,7 @@ _scsih_determine_hba_mpi_version(struct pci_dev *pdev)
case MPI26_MFGPAGE_DEVID_SAS3516_1:
case MPI26_MFGPAGE_DEVID_SAS3416:
case MPI26_MFGPAGE_DEVID_SAS3616:
+ case MPI26_ATLAS_PCIe_SWITCH_DEVID:
case MPI26_MFGPAGE_DEVID_CFG_SEC_3916:
case MPI26_MFGPAGE_DEVID_HARD_SEC_3916:
case MPI26_MFGPAGE_DEVID_CFG_SEC_3816:
@@ -10373,6 +10374,7 @@ _scsih_probe(struct pci_dev *pdev, const struct pci_device_id *id)
case MPI26_MFGPAGE_DEVID_SAS3516_1:
case MPI26_MFGPAGE_DEVID_SAS3416:
case MPI26_MFGPAGE_DEVID_SAS3616:
+ case MPI26_ATLAS_PCIe_SWITCH_DEVID:
ioc->is_gen35_ioc = 1;
break;
case MPI26_MFGPAGE_DEVID_CFG_SEC_3816:
@@ -10853,6 +10855,10 @@ static const struct pci_device_id mpt3sas_pci_table[] = {
{ MPI2_MFGPAGE_VENDORID_LSI, MPI26_MFGPAGE_DEVID_HARD_SEC_3916,
PCI_ANY_ID, PCI_ANY_ID },
+ /* Atlas PCIe Switch Management Port */
+ { MPI2_MFGPAGE_VENDORID_LSI, MPI26_ATLAS_PCIe_SWITCH_DEVID,
+ PCI_ANY_ID, PCI_ANY_ID },
+
/* Sea SI 0x00E5 Configurable Secure
* 0x00E6 Hard Secure
*/
--
1.8.3.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 4/4] mpt3sas: Update driver version to 27.102.00.00
2019-01-29 12:14 [PATCH 0/4] mpt3sas: Add Atlas and Ambrosia device support Suganath Prabu S
` (2 preceding siblings ...)
2019-01-29 12:14 ` [PATCH 3/4] mpt3sas: Add support for ATLAS PCIe switch Suganath Prabu S
@ 2019-01-29 12:14 ` Suganath Prabu S
2019-02-05 3:47 ` [PATCH 0/4] mpt3sas: Add Atlas and Ambrosia device support Martin K. Petersen
4 siblings, 0 replies; 6+ messages in thread
From: Suganath Prabu S @ 2019-01-29 12:14 UTC (permalink / raw)
To: linux-scsi, linux-kernel
Cc: Sathya.Prakash, sreekanth.reddy, Suganath Prabu S
Updated driver version to 27.102.00.00 from 27.101.00.00.
Signed-off-by: Suganath Prabu S <suganath-prabu.subramani@broadcom.com>
---
drivers/scsi/mpt3sas/mpt3sas_base.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.h b/drivers/scsi/mpt3sas/mpt3sas_base.h
index db12c1b..19158cb 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_base.h
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.h
@@ -75,9 +75,9 @@
#define MPT3SAS_DRIVER_NAME "mpt3sas"
#define MPT3SAS_AUTHOR "Avago Technologies <MPT-FusionLinux.pdl@avagotech.com>"
#define MPT3SAS_DESCRIPTION "LSI MPT Fusion SAS 3.0 Device Driver"
-#define MPT3SAS_DRIVER_VERSION "27.101.00.00"
+#define MPT3SAS_DRIVER_VERSION "27.102.00.00"
#define MPT3SAS_MAJOR_VERSION 27
-#define MPT3SAS_MINOR_VERSION 101
+#define MPT3SAS_MINOR_VERSION 102
#define MPT3SAS_BUILD_VERSION 0
#define MPT3SAS_RELEASE_VERSION 00
--
1.8.3.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 0/4] mpt3sas: Add Atlas and Ambrosia device support.
2019-01-29 12:14 [PATCH 0/4] mpt3sas: Add Atlas and Ambrosia device support Suganath Prabu S
` (3 preceding siblings ...)
2019-01-29 12:14 ` [PATCH 4/4] mpt3sas: Update driver version to 27.102.00.00 Suganath Prabu S
@ 2019-02-05 3:47 ` Martin K. Petersen
4 siblings, 0 replies; 6+ messages in thread
From: Martin K. Petersen @ 2019-02-05 3:47 UTC (permalink / raw)
To: Suganath Prabu S
Cc: linux-scsi, linux-kernel, Sathya.Prakash, sreekanth.reddy
Suganath,
> Posting below patches to include new devices Ambrosia, Atlas.
Applied to 5.1/scsi-queue, thanks!
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-02-05 3:47 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-29 12:14 [PATCH 0/4] mpt3sas: Add Atlas and Ambrosia device support Suganath Prabu S
2019-01-29 12:14 ` [PATCH 1/4] mpt3sas: Rename mpi endpoint device ID macro Suganath Prabu S
2019-01-29 12:14 ` [PATCH 2/4] mpt3sas: Add support for NVMe Switch Adapter Suganath Prabu S
2019-01-29 12:14 ` [PATCH 3/4] mpt3sas: Add support for ATLAS PCIe switch Suganath Prabu S
2019-01-29 12:14 ` [PATCH 4/4] mpt3sas: Update driver version to 27.102.00.00 Suganath Prabu S
2019-02-05 3:47 ` [PATCH 0/4] mpt3sas: Add Atlas and Ambrosia device support Martin K. Petersen
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.