[SCSI] mpt fusion: RAID device handling and Dual port Raid support is added

1. Handle integrated Raid device(Add/Delete) and error condition and check
   related to Raid device. is_logical_volume will represent logical volume
   device.
2. Raid device dual port support is added. Main functions to support this
   feature are mpt_raid_phys_disk_get_num_paths and mpt_raid_phys_disk_pg1.

Signed-off-by: Kashyap Desai <kadesai@lsi.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

1 files changed, 167 insertions, 0 deletions

diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index 9f6b315624aa..44b931504457 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -5763,6 +5763,161 @@ mpt_raid_phys_disk_pg0(MPT_ADAPTER *ioc, u8 phys_disk_num,
 }
 
 /**
+ *      mpt_raid_phys_disk_get_num_paths - returns number paths associated to this phys_num
+ *      @ioc: Pointer to a Adapter Structure
+ *      @phys_disk_num: io unit unique phys disk num generated by the ioc
+ *
+ *      Return:
+ *      returns number paths
+ **/
+int
+mpt_raid_phys_disk_get_num_paths(MPT_ADAPTER *ioc, u8 phys_disk_num)
+{
+        CONFIGPARMS                     cfg;
+        ConfigPageHeader_t              hdr;
+        dma_addr_t                      dma_handle;
+        pRaidPhysDiskPage1_t            buffer = NULL;
+        int                             rc;
+
+        memset(&cfg, 0 , sizeof(CONFIGPARMS));
+        memset(&hdr, 0 , sizeof(ConfigPageHeader_t));
+
+        hdr.PageVersion = MPI_RAIDPHYSDISKPAGE1_PAGEVERSION;
+        hdr.PageType = MPI_CONFIG_PAGETYPE_RAID_PHYSDISK;
+        hdr.PageNumber = 1;
+        cfg.cfghdr.hdr = &hdr;
+        cfg.physAddr = -1;
+        cfg.action = MPI_CONFIG_ACTION_PAGE_HEADER;
+
+        if (mpt_config(ioc, &cfg) != 0) {
+                rc = 0;
+                goto out;
+        }
+
+        if (!hdr.PageLength) {
+                rc = 0;
+                goto out;
+        }
+
+        buffer = pci_alloc_consistent(ioc->pcidev, hdr.PageLength * 4,
+            &dma_handle);
+
+        if (!buffer) {
+                rc = 0;
+                goto out;
+        }
+
+        cfg.physAddr = dma_handle;
+        cfg.action = MPI_CONFIG_ACTION_PAGE_READ_CURRENT;
+        cfg.pageAddr = phys_disk_num;
+
+        if (mpt_config(ioc, &cfg) != 0) {
+                rc = 0;
+                goto out;
+        }
+
+        rc = buffer->NumPhysDiskPaths;
+ out:
+
+        if (buffer)
+                pci_free_consistent(ioc->pcidev, hdr.PageLength * 4, buffer,
+                    dma_handle);
+
+        return rc;
+}
+EXPORT_SYMBOL(mpt_raid_phys_disk_get_num_paths);
+
+/**
+ *      mpt_raid_phys_disk_pg1 - returns phys disk page 1
+ *      @ioc: Pointer to a Adapter Structure
+ *      @phys_disk_num: io unit unique phys disk num generated by the ioc
+ *      @phys_disk: requested payload data returned
+ *
+ *      Return:
+ *      0 on success
+ *      -EFAULT if read of config page header fails or data pointer not NULL
+ *      -ENOMEM if pci_alloc failed
+ **/
+int
+mpt_raid_phys_disk_pg1(MPT_ADAPTER *ioc, u8 phys_disk_num,
+                RaidPhysDiskPage1_t *phys_disk)
+{
+        CONFIGPARMS                     cfg;
+        ConfigPageHeader_t              hdr;
+        dma_addr_t                      dma_handle;
+        pRaidPhysDiskPage1_t            buffer = NULL;
+        int                             rc;
+        int                             i;
+        __le64                          sas_address;
+
+        memset(&cfg, 0 , sizeof(CONFIGPARMS));
+        memset(&hdr, 0 , sizeof(ConfigPageHeader_t));
+        rc = 0;
+
+        hdr.PageVersion = MPI_RAIDPHYSDISKPAGE1_PAGEVERSION;
+        hdr.PageType = MPI_CONFIG_PAGETYPE_RAID_PHYSDISK;
+        hdr.PageNumber = 1;
+        cfg.cfghdr.hdr = &hdr;
+        cfg.physAddr = -1;
+        cfg.action = MPI_CONFIG_ACTION_PAGE_HEADER;
+
+        if (mpt_config(ioc, &cfg) != 0) {
+                rc = -EFAULT;
+                goto out;
+        }
+
+        if (!hdr.PageLength) {
+                rc = -EFAULT;
+                goto out;
+        }
+
+        buffer = pci_alloc_consistent(ioc->pcidev, hdr.PageLength * 4,
+            &dma_handle);
+
+        if (!buffer) {
+                rc = -ENOMEM;
+                goto out;
+        }
+
+        cfg.physAddr = dma_handle;
+        cfg.action = MPI_CONFIG_ACTION_PAGE_READ_CURRENT;
+        cfg.pageAddr = phys_disk_num;
+
+        if (mpt_config(ioc, &cfg) != 0) {
+                rc = -EFAULT;
+                goto out;
+        }
+
+        phys_disk->NumPhysDiskPaths = buffer->NumPhysDiskPaths;
+        phys_disk->PhysDiskNum = phys_disk_num;
+        for (i = 0; i < phys_disk->NumPhysDiskPaths; i++) {
+                phys_disk->Path[i].PhysDiskID = buffer->Path[i].PhysDiskID;
+                phys_disk->Path[i].PhysDiskBus = buffer->Path[i].PhysDiskBus;
+                phys_disk->Path[i].OwnerIdentifier =
+                                buffer->Path[i].OwnerIdentifier;
+                phys_disk->Path[i].Flags = le16_to_cpu(buffer->Path[i].Flags);
+                memcpy(&sas_address, &buffer->Path[i].WWID, sizeof(__le64));
+                sas_address = le64_to_cpu(sas_address);
+                memcpy(&phys_disk->Path[i].WWID, &sas_address, sizeof(__le64));
+                memcpy(&sas_address,
+                                &buffer->Path[i].OwnerWWID, sizeof(__le64));
+                sas_address = le64_to_cpu(sas_address);
+                memcpy(&phys_disk->Path[i].OwnerWWID,
+                                &sas_address, sizeof(__le64));
+        }
+
+ out:
+
+        if (buffer)
+                pci_free_consistent(ioc->pcidev, hdr.PageLength * 4, buffer,
+                    dma_handle);
+
+        return rc;
+}
+EXPORT_SYMBOL(mpt_raid_phys_disk_pg1);
+
+
+/**
  *      mpt_findImVolumes - Identify IDs of hidden disks and RAID Volumes
  *      @ioc: Pointer to a Adapter Strucutre
  *
@@ -7170,6 +7325,18 @@ mpt_display_event_info(MPT_ADAPTER *ioc, EventNotificationReply_t *pEventReply)
                             "id=%d channel=%d phys_num=%d",
                             id, channel, phys_num);
                         break;
+                case MPI_EVENT_IR2_RC_DUAL_PORT_ADDED:
+                        snprintf(evStr, EVENT_DESCR_STR_SZ,
+                            "IR2: Dual Port Added: "
+                            "id=%d channel=%d phys_num=%d",
+                            id, channel, phys_num);
+                        break;
+                case MPI_EVENT_IR2_RC_DUAL_PORT_REMOVED:
+                        snprintf(evStr, EVENT_DESCR_STR_SZ,
+                            "IR2: Dual Port Removed: "
+                            "id=%d channel=%d phys_num=%d",
+                            id, channel, phys_num);
+                        break;
                 default:
                         ds = "IR2";
                 break;