scsi: mpt3sas: Add support for ATTO ExpressSAS H12xx GT devices
Subsystems (2)
PATCH v2 1/2 scsi: mpt3sas: Add support for ATTO ExpressSAS H12xx GT devices
Adds ATTO's PCI IDs and modifies the driver to handle the unique NVRAM structure used by ATTO's devices.
--- drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h | 1 + drivers/scsi/mpt3sas/mpt3sas_base.c | 173 +++++++++++++++++++++++++- drivers/scsi/mpt3sas/mpt3sas_base.h | 35 ++++++ drivers/scsi/mpt3sas/mpt3sas_config.c | 124 ++++++++++++++++++ drivers/scsi/mpt3sas/mpt3sas_scsih.c | 6 + 5 files changed, 333 insertions(+), 6 deletions(-)
drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h +1 -0
@@ -534,6 +534,7 @@ typedef struct _MPI2_CONFIG_REPLY {****************************************************************************/ #define MPI2_MFGPAGE_VENDORID_LSI (0x1000) +#define MPI2_MFGPAGE_VENDORID_ATTO (0x117C)/*MPI v2.0 SAS products */ #define MPI2_MFGPAGE_DEVID_SAS2004 (0x0070)
drivers/scsi/mpt3sas/mpt3sas_base.c +167 -6
191 lines not on this page · raw message
drivers/scsi/mpt3sas/mpt3sas_base.h +35 -0
@@ -1652,6 +1652,32 @@ struct mpt3sas_debugfs_buffer {typedef u8 (*MPT_CALLBACK )(struct MPT3SAS_ADAPTER *ioc,u16 smid,u8 msix_index,u32 reply); +/* +* struct ATTO_SAS_NVRAM - ATTO NVRAM settings stored +* in Manufacturing page 1 used to get +* ATTO SasAddr. +*/ +struct ATTO_SAS_NVRAM { +u8 Signature[4 ]; +u8 Version; +#define ATTO_SASNVR_VERSION 0 + +u8 Checksum; +#define ATTO_SASNVR_CKSUM_SEED 0x5A +u8 Pad[10 ]; +u8 SasAddr[8 ]; +#define ATTO_SAS_ADDR_ALIGN 64 +u8 Reserved[232 ]; +}; + +#define ATTO_SAS_ADDR_DEVNAME_BIAS 63 + +union ATTO_SAS_ADDRESS { +U8 b[8 ]; +U16 w[4 ]; +U32 d[2 ]; +U64 q; +};/* base shared API */ extern struct list_head mpt3sas_ioc_list;
@@ -1828,6 +1854,9 @@ int mpt3sas_config_get_number_hba_phys(struct MPT3SAS_ADAPTER *ioc, u8 *num_phys);int mpt3sas_config_get_manufacturing_pg0 (struct MPT3SAS_ADAPTER *ioc,Mpi2ConfigReply_t *mpi_reply,Mpi2ManufacturingPage0_t *config_page); +int mpt3sas_config_get_manufacturing_pg1 (struct MPT3SAS_ADAPTER *ioc, +Mpi2ConfigReply_t *mpi_reply,Mpi2ManufacturingPage1_t *config_page); +int mpt3sas_config_get_manufacturing_pg7 (struct MPT3SAS_ADAPTER *ioc,Mpi2ConfigReply_t *mpi_reply,Mpi2ManufacturingPage7_t *config_page,u16 sz);
@@ -1846,6 +1875,12 @@ int mpt3sas_config_get_bios_pg2(struct MPT3SAS_ADAPTER *ioc, Mpi2ConfigReply_t *mpi_reply, Mpi2BiosPage2_t *config_page);int mpt3sas_config_get_bios_pg3 (struct MPT3SAS_ADAPTER *ioc,Mpi2ConfigReply_t *mpi_reply,Mpi2BiosPage3_t *config_page); +int mpt3sas_config_set_bios_pg4 (struct MPT3SAS_ADAPTER *ioc, +Mpi2ConfigReply_t *mpi_reply,Mpi2BiosPage4_t *config_page, +int sz_config_page); +int mpt3sas_config_get_bios_pg4 (struct MPT3SAS_ADAPTER *ioc, +Mpi2ConfigReply_t *mpi_reply,Mpi2BiosPage4_t *config_page, +int sz_config_page);int mpt3sas_config_get_iounit_pg0 (struct MPT3SAS_ADAPTER *ioc,Mpi2ConfigReply_t *mpi_reply,Mpi2IOUnitPage0_t *config_page); int mpt3sas_config_get_sas_device_pg0(struct MPT3SAS_ADAPTER *ioc,
drivers/scsi/mpt3sas/mpt3sas_config.c +124 -0
140 lines not on this page · raw message
drivers/scsi/mpt3sas/mpt3sas_scsih.c +6 -0
@@ -12732,6 +12732,12 @@ static const struct pci_device_id mpt3sas_pci_table[] = { {MPI2_MFGPAGE_VENDORID_LSI ,MPI26_MFGPAGE_DEVID_HARD_SEC_3816 , PCI_ANY_ID, PCI_ANY_ID }, +/* +* ATTO Branded ExpressSAS H12xx GT +*/ + { MPI2_MFGPAGE_VENDORID_ATTO, MPI26_MFGPAGE_DEVID_HARD_SEC_3816, + PCI_ANY_ID, PCI_ANY_ID }, +/* * Sea SI –> 0x00E4 Invalid, 0x00E7 Tampered */
Signature · 1 line
2.36.0
PATCH v2 2/2 scsi: mpt3sas: Disable MPI2_FUNCTION_FW_DOWNLOAD for ATTO devices
Disable firmware download for ATTO devices where it is not supported.
--- drivers/scsi/mpt3sas/mpt3sas_ctl.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/scsi/mpt3sas/mpt3sas_ctl.c +8 -0
@@ -948,6 +948,14 @@ _ctl_do_mpt_command(struct MPT3SAS_ADAPTER *ioc, struct mpt3_ioctl_command karg,break ; }case MPI2_FUNCTION_FW_DOWNLOAD : + { +if (ioc->pdev->vendor ==MPI2_MFGPAGE_VENDORID_ATTO ) { +ioc_info (ioc,"Firmware download not supported for ATTO HBA.\n" ); + ret = -EPERM ; +break ; + } + fallthrough; + }case MPI2_FUNCTION_FW_UPLOAD : { ioc->build_sg(ioc, psge, data_out_dma, data_out_sz, data_in_dma,
Signature · 1 line
2.36.0
Martin K. Petersen
AppliedBradley,
Quoted 2 lines
Adds ATTO's PCI IDs and modifies the driver to handle the unique NVRAM structure used by ATTO's devices.
Applied to 6.1/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Martin K. Petersen
AppliedQuoted 4 lines · Bradley Grove
Adds ATTO's PCI IDs and modifies the driver to handle the unique NVRAM structure used by ATTO's devices.
Applied to 6.1/scsi-queue, thanks!
[1/2] scsi: mpt3sas: Add support for ATTO ExpressSAS H12xx GT devices
https://git.kernel.org/mkp/scsi/c/91cf186aa1bf [2/2] scsi: mpt3sas: Disable MPI2_FUNCTION_FW_DOWNLOAD for ATTO devices https://git.kernel.org/mkp/scsi/c/f45fadde91ec
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering