4 files changed, 64 insertions, 0 deletions

diff --git a/drivers/message/fusion/Kconfig b/drivers/message/fusion/Kconfig
index f55cc03a75c9..3c44a2fc4efb 100644
--- a/drivers/message/fusion/Kconfig
+++ b/drivers/message/fusion/Kconfig
@@ -20,6 +20,7 @@ config FUSION_SPI
           LSI53C1020A
           LSI53C1030
           LSI53C1035
+          ATTO UL4D
 
 config FUSION_FC
         tristate "Fusion MPT ScsiHost drivers for FC"
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index 414c109f4cf5..828f0ca7c1b3 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -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 == PCI_VENDOR_ID_ATTO) {
+
+                                /* 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;
diff --git a/drivers/message/fusion/mptbase.h b/drivers/message/fusion/mptbase.h
index 15ff22645844..a8c80805e170 100644
--- a/drivers/message/fusion/mptbase.h
+++ b/drivers/message/fusion/mptbase.h
@@ -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 {
diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c
index 8c98420640a5..25df3bfdcb0b 100644
--- a/drivers/message/fusion/mptspi.c
+++ b/drivers/message/fusion/mptspi.c
@@ -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 },
+        { PCI_VENDOR_ID_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 */