Skip to contentSkip to conversation

scsi: mpt3sas: Add support for ATTO ExpressSAS H12xx GT devices

PATCH Superseded Bradley Grove 2 participants 3 messages Jul 26, 2022 – Jul 27, 2022

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 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   | 165 +++++++++++++++++++++++++-
 drivers/scsi/mpt3sas/mpt3sas_base.h   |  35 ++++++
 drivers/scsi/mpt3sas/mpt3sas_config.c | 124 +++++++++++++++++++
 drivers/scsi/mpt3sas/mpt3sas_scsih.c  |   6 +
 5 files changed, 325 insertions(+), 6 deletions(-)
drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h +1 -0
index d00431f553e1..4d0be5ab98c1 100644
@@ -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 +159 -6

183 lines not on this page · raw message

drivers/scsi/mpt3sas/mpt3sas_base.h +35 -0
index e584cf0ffc23..c752fec5db0d 100644
@@ -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
index b519f4b59d30..57fc606a3ef8 100644
@@ -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
#1 lore raw

PATCH 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
index 84c87c2c3e7e..1c99338a71a4 100644
@@ -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
#2 lore raw
In reply to Bradley Grove
I love your patch! Perhaps something to improve:

Hi Bradley,

I love your patch! Perhaps something to improve:

[auto build test WARNING on jejb-scsi/for-next]
[also build test WARNING on mkp-scsi/for-next linus/master v5.19-rc8 next-20220726] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]

url:    https://github.com/intel-lab-lkp/linux/commits/Bradley-Grove/scsi-mpt3sas-Add-support-for-ATTO-ExpressSAS-H12xx-GT-devices/20220727-020431
base:   https://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git for-next
config: arm64-randconfig-s032-20220724 (https://download.01.org/0day-ci/archive/20220727/[email protected]/config)
compiler: aarch64-linux-gcc (GCC) 12.1.0

reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# apt-get install sparse
# sparse version: v0.6.4-39-gce1a6720-dirty
# https://github.com/intel-lab-lkp/linux/commit/7174cbb8a0179d86947dea7c91c71788ebdf3aa1
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Bradley-Grove/scsi-mpt3sas-Add-support-for-ATTO-ExpressSAS-H12xx-GT-devices/20220727-020431
git checkout 7174cbb8a0179d86947dea7c91c71788ebdf3aa1
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' O=build_dir ARCH=arm64 SHELL=/bin/bash drivers/scsi/mpt3sas/

If you fix the issue, kindly add following tag where applicable

sparse warnings: (new ones prefixed by >>)

>> drivers/scsi/mpt3sas/mpt3sas_base.c:5505:21: sparse: sparse: cast to restricted __be64
>> drivers/scsi/mpt3sas/mpt3sas_base.c:5553:52: sparse: sparse: incorrect type in assignment (different base types) @@     expected restricted __le64 [usertype] ReassignmentWWID @@     got unsigned long long @@
   drivers/scsi/mpt3sas/mpt3sas_base.c:5553:52: sparse:     expected restricted __le64 [usertype] ReassignmentWWID
   drivers/scsi/mpt3sas/mpt3sas_base.c:5553:52: sparse:     got unsigned long long
>> drivers/scsi/mpt3sas/mpt3sas_base.c:5554:58: sparse: sparse: incorrect type in assignment (different base types) @@     expected restricted __le64 [usertype] ReassignmentDeviceName @@     got unsigned long long @@

drivers/scsi/mpt3sas/mpt3sas_base.c:5554:58: sparse: expected restricted __le64 [usertype] ReassignmentDeviceName
drivers/scsi/mpt3sas/mpt3sas_base.c:5554:58: sparse: got unsigned long long

vim +5505 drivers/scsi/mpt3sas/mpt3sas_base.c

5477
5478 /**
5479 * mpt3sas_atto_get_sas_addr - get the ATTO SAS address from mfg page 1
5480 *
5481 * @ioc : per adapter object
5482 * @*sas_addr : return sas address
5483 * Return: 0 for success, non-zero for failure.
5484 */
5485 static int
5486 mpt3sas_atto_get_sas_addr(struct MPT3SAS_ADAPTER *ioc, u64 *sas_addr)
5487 {
5488 Mpi2ManufacturingPage1_t mfg_pg1;
5489 Mpi2ConfigReply_t mpi_reply;
5490 struct ATTO_SAS_NVRAM *nvram;
5491 int r;
5492
5493 r = mpt3sas_config_get_manufacturing_pg1(ioc, &mpi_reply, &mfg_pg1);
5494 if (r) {
5495 ioc_err(ioc, "Failed to read manufacturing page 1\n");
5496 return r;
5497 }
5498
5499 /* validate nvram */
5500 nvram = (struct ATTO_SAS_NVRAM *) mfg_pg1.VPD;
5501 r = mpt3sas_atto_validate_nvram(ioc, nvram);
5502 if (r)
5503 return r;
5504

> 5505		*sas_addr = be64_to_cpu(*((u64 *)nvram->SasAddr));
  5506		return r;
  5507	}
  5508	
  5509	/**
  5510	 * mpt3sas_atto_init - perform initializaion for ATTO branded
  5511	 *					adapter.
  5512	 * @ioc : per adapter object
  5513	 *
  5514	 * Return: 0 for success, non-zero for failure.
  5515	 */
  5516	static int
  5517	mpt3sas_atto_init(struct MPT3SAS_ADAPTER *ioc)
  5518	{
  5519		int sz = 0;
  5520		Mpi2BiosPage4_t *bios_pg4 = NULL;
  5521		Mpi2ConfigReply_t mpi_reply;
  5522		int r;
  5523		int ix;
  5524		u64 sas_addr;
  5525	
  5526		r = mpt3sas_atto_get_sas_addr(ioc, &sas_addr);
  5527		if (r)
  5528			return r;
  5529	
  5530		/* get header first to get size */
  5531		r = mpt3sas_config_get_bios_pg4(ioc, &mpi_reply, NULL, 0);
  5532		if (r) {
  5533			ioc_err(ioc, "Failed to read ATTO bios page 4 header.\n");
  5534			return r;
  5535		}
  5536	
  5537		sz = mpi_reply.Header.PageLength * sizeof(u32);
  5538		bios_pg4 = kzalloc(sz, GFP_KERNEL);
  5539		if (!bios_pg4) {
  5540			ioc_err(ioc, "Failed to allocate memory for ATTO bios page.\n");
  5541			return -ENOMEM;
  5542		}
  5543	
  5544		/* read bios page 4 */
  5545		r = mpt3sas_config_get_bios_pg4(ioc, &mpi_reply, bios_pg4, sz);
  5546		if (r) {
  5547			ioc_err(ioc, "Failed to read ATTO bios page 4\n");
  5548			goto out;
  5549		}
  5550	
  5551		/* Update bios page 4 with the ATTO WWID */
  5552		for (ix = 0; ix < bios_pg4->NumPhys; ix++) {
> 5553			bios_pg4->Phy[ix].ReassignmentWWID = sas_addr + ix;
> 5554			bios_pg4->Phy[ix].ReassignmentDeviceName =

5555 sas_addr + ATTO_SAS_ADDR_DEVNAME_BIAS;
5556 }
5557 r = mpt3sas_config_set_bios_pg4(ioc, &mpi_reply, bios_pg4, sz);
5558
5559 out:
5560 kfree(bios_pg4);
5561 return r;
5562 }
5563

Signature · 2 lines
0-DAY CI Kernel Test Service
https://01.org/lkp