mpt fusion: Add support for ATTO 4LD: Rebranded LSI 53C1030
Subsystems (2)
PATCH 1/6 mpt fusion: Add support for ATTO 4LD: Rebranded LSI 53C1030
Add support for ATTO UL4D, they are rebranded 53C1030.
The changes are
1. Adding a new PCI vendor ID in pci table
2. The spi_port_page_2 is in different format than that of LSI generic spi_port_page_2 and hence mapping code is added.
---
drivers/message/fusion/Kconfig +1 -0
@@ -20,6 +20,7 @@ config FUSION_SPI LSI53C1020A LSI53C1030 LSI53C1035 + ATTO UL4D config FUSION_FC tristate "Fusion MPT ScsiHost drivers for FC"
drivers/message/fusion/mptbase.c +32 -0
@@ -4888,6 +4888,38 @@ mpt_GetScsiPortSettings(MPT_ADAPTER *ioc, int portnum)/* Nvram data is left with INVALID mark */ rc =1 ; + }else if (ioc->pcidev->vendor ==0x117c ) { + +/* This is an ATTO adapter, read Page2 accordingly +*/ +ATTO_SCSIPortPage2_t *pPP2 = (ATTO_SCSIPortPage2_t *) pbuf; +ATTODeviceInfo_t *pdevice =NULL ; +u16 ATTOFlags; + +/* Save the Port Page 2 data +* (reformat into a 32bit quantity) +*/ +for (ii=0 ; ii <MPT_MAX_SCSI_DEVICES ; ii++) { + pdevice = &pPP2->DeviceSettings[ii]; + ATTOFlags =le16_to_cpu (pdevice->ATTOFlags); + data =0 ; + +/* Translate ATTO device flags to LSI format +*/ +if (ATTOFlags &ATTOFLAG_DISC ) + data |= (MPI_SCSIPORTPAGE2_DEVICE_DISCONNECT_ENABLE ); +if (ATTOFlags &ATTOFLAG_ID_ENB ) + data |= (MPI_SCSIPORTPAGE2_DEVICE_ID_SCAN_ENABLE ); +if (ATTOFlags &ATTOFLAG_LUN_ENB ) + data |= (MPI_SCSIPORTPAGE2_DEVICE_LUN_SCAN_ENABLE ); +if (ATTOFlags &ATTOFLAG_TAGGED ) + data |= (MPI_SCSIPORTPAGE2_DEVICE_TAG_QUEUE_ENABLE ); +if (!(ATTOFlags &ATTOFLAG_WIDE_ENB )) + data |= (MPI_SCSIPORTPAGE2_DEVICE_WIDE_DISABLE ); + + data = (data <<16 ) | (pdevice->Period <<8 ) |10 ; + ioc->spi_data.nvram[ii] = data; + } }else {SCSIPortPage2_t *pPP2 = (SCSIPortPage2_t *) pbuf;MpiDeviceInfo_t *pdevice =NULL ;
drivers/message/fusion/mptbase.h +29 -0
@@ -194,6 +194,35 @@/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ /* +* ATTO UL4D associated structures and defines +*/ +#define ATTOFLAG_DISC 0x0001 +#define ATTOFLAG_TAGGED 0x0002 +#define ATTOFLAG_WIDE_ENB 0x0008 +#define ATTOFLAG_ID_ENB 0x0010 +#define ATTOFLAG_LUN_ENB 0x0060 + +typedef struct _ATTO_DEVICE_INFO +{ +u8 Offset;/* 00h */ +u8 Period;/* 01h */ +u16 ATTOFlags;/* 02h */ +} ATTO_DEVICE_INFO, MPI_POINTER PTR_ATTO_DEVICE_INFO, + ATTODeviceInfo_t, MPI_POINTER pATTODeviceInfo_t; + +typedef struct _ATTO_CONFIG_PAGE_SCSI_PORT_2 +{ +CONFIG_PAGE_HEADER Header;/* 00h */ +u16 PortFlags;/* 04h */ +u16 Unused1;/* 06h */ +u32 Unused2;/* 08h */ +ATTO_DEVICE_INFO DeviceSettings[16 ];/* 0Ch */ +} fATTO_CONFIG_PAGE_SCSI_PORT_2, MPI_POINTER PTR_ATTO_CONFIG_PAGE_SCSI_PORT_2, + ATTO_SCSIPortPage2_t, MPI_POINTER pATTO_SCSIPortPage2_t; + + +/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ +/* * MPT protocol driver defs... */ typedef enum {
drivers/message/fusion/mptspi.c +2 -0
@@ -1190,6 +1190,8 @@ static struct spi_function_template mptspi_transport_functions = {static struct pci_device_id mptspi_pci_table[] = { {PCI_VENDOR_ID_LSI_LOGIC ,MPI_MANUFACTPAGE_DEVID_53C1030 ,PCI_ANY_ID ,PCI_ANY_ID }, + {0x117c /* ATTO */ ,MPI_MANUFACTPAGE_DEVID_53C1030 , +PCI_ANY_ID ,PCI_ANY_ID }, {PCI_VENDOR_ID_LSI_LOGIC ,MPI_MANUFACTPAGE_DEVID_53C1035 ,PCI_ANY_ID ,PCI_ANY_ID }, {0 }/* Terminating entry */
Quoted 8 lines · Sathya
Add support for ATTO UL4D, they are rebranded 53C1030. The changes are
1. Adding a new PCI vendor ID in pci table
2. Thespi_port_page_2is in different format than that of LSI genericspi_port_page_2and hence mapping code is added.Signed-off-by Sathya Prakash <[email protected]>
ACK
drivers/message/fusion/mptspi.c static struct spi_function_template mptspi_transport_functions = { · line 1197
Quoted 10 lines · Sathya
+++
b/drivers/message/fusion/mptspi.cdrivers/message/fusion/mptspi.c +2
-0@@ -1190,6 +1190,8 @@ static struct spi_function_template mptspi_transport_functions = {static struct pci_device_id mptspi_pci_table[] = { {PCI_VENDOR_ID_LSI_LOGIC ,MPI_MANUFACTPAGE_DEVID_53C1030 ,PCI_ANY_ID ,PCI_ANY_ID }, + {0x117c /* ATTO */ ,MPI_MANUFACTPAGE_DEVID_53C1030 , +PCI_ANY_ID ,PCI_ANY_ID }, {PCI_VENDOR_ID_LSI_LOGIC ,MPI_MANUFACTPAGE_DEVID_53C1035 ,PCI_ANY_ID ,PCI_ANY_ID }, {0 }/* Terminating entry */
I'd rather see this patch add PCI_VENDOR_ID_ATTO to include/linux/pci_ids.h
Signature · 3 lines
"Bill, look, we understand that you're interested in selling us this operating system, but compare it to ours. We can't possibly take such a retrograde step."
Quoted 2 lines · Sathya
2. The
spi_port_page_2is in different format than that of LSI genericspi_port_page_2and hence mapping code is added.
Not that we can change it anymore, but what idiot decided to do such a change? An chance LSI could stop licencees from doing such bloody braindamaged things to the firmware in the future?
add a reminder for anyone to never but ATTO hardware as the company is utterly useles..
Quoted 8 lines · Christoph Hellwig
Not that we can change it anymore, but what idiot decided to do such a change? An chance LSI could stop licencees from doing such bloody braindamaged things to the firmware in the future?
add a reminder for anyone to never but ATTO hardware as the company is utterly useles..
I really not sure the significance of that change to spi_device config pages. My guess that atto flags have something significant to some other OS, like windows. I couldn't find anyone from ATTO that would
answer my doubts. There are some customers that want PCI EXPRESS U320
card, and LSI never decided to make anything beyond xscale. There is this express card from ATTO, as well as one from HP, both having the LSI 1030 chip. LSI managment approved this request for this patch, so we pushed forward with supplying this changeset.
I have reposted the patch per Wilcox's request having the ATTO ids, but I just don't see it posted to the forum. I may have to repost.
Eric