scsi: smartpqi: allow for larger raid maps

Reviewed-by: Murthy Bhat <murthy.bhat@microsemi.com>
Reviewed-by: Mahesh Rajashekhara <mahesh.rajashekhara@microsemi.com>
Reviewed-by: Dave Carroll <david.carroll@microsemi.com>
Reviewed-by: Scott Teel <scott.teel@microsemi.com>
Reviewed-by: Kevin Barnett <kevin.barnett@microsemi.com>
Signed-off-by: Ajish Koshy <ajish.koshy@microsemi.com>
Signed-off-by: Don Brace <don.brace@microsemi.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c
index 8c848e136d33499b0f9793f169981328b384f04c..d6fb49496796fb51fefaf1cbb440e15ca2fff243 100644 (file)
--- a/drivers/scsi/smartpqi/smartpqi_init.c
+++ b/drivers/scsi/smartpqi/smartpqi_init.c
@@ -1115,8 +1115,6 @@ static int pqi_validate_raid_map(struct pqi_ctrl_info *ctrl_info,
        char *err_msg;
        u32 raid_map_size;
        u32 r5or6_blocks_per_row;
-       unsigned int num_phys_disks;
-       unsigned int num_raid_map_entries;
 
        raid_map_size = get_unaligned_le32(&raid_map->structure_size);
 
@@ -1125,22 +1123,6 @@ static int pqi_validate_raid_map(struct pqi_ctrl_info *ctrl_info,
                goto bad_raid_map;
        }
 
-       if (raid_map_size > sizeof(*raid_map)) {
-               err_msg = "RAID map too large";
-               goto bad_raid_map;
-       }
-
-       num_phys_disks = get_unaligned_le16(&raid_map->layout_map_count) *
-               (get_unaligned_le16(&raid_map->data_disks_per_row) +
-               get_unaligned_le16(&raid_map->metadata_disks_per_row));
-       num_raid_map_entries = num_phys_disks *
-               get_unaligned_le16(&raid_map->row_cnt);
-
-       if (num_raid_map_entries > RAID_MAP_MAX_ENTRIES) {
-               err_msg = "invalid number of map entries in RAID map";
-               goto bad_raid_map;
-       }
-
        if (device->raid_level == SA_RAID_1) {
                if (get_unaligned_le16(&raid_map->layout_map_count) != 2) {
                        err_msg = "invalid RAID-1 map";
@@ -1179,27 +1161,45 @@ static int pqi_get_raid_map(struct pqi_ctrl_info *ctrl_info,
        struct pqi_scsi_dev *device)
 {
        int rc;
-       enum dma_data_direction dir;
-       struct pqi_raid_path_request request;
+       u32 raid_map_size;
        struct raid_map *raid_map;
 
        raid_map = kmalloc(sizeof(*raid_map), GFP_KERNEL);
        if (!raid_map)
                return -ENOMEM;
 
-       rc = pqi_build_raid_path_request(ctrl_info, &request,
-               CISS_GET_RAID_MAP, device->scsi3addr, raid_map,
-               sizeof(*raid_map), 0, &dir);
+       rc = pqi_send_scsi_raid_request(ctrl_info, CISS_GET_RAID_MAP,
+               device->scsi3addr, raid_map, sizeof(*raid_map),
+               0, NULL, NO_TIMEOUT);
+
        if (rc)
                goto error;
 
-       rc = pqi_submit_raid_request_synchronous(ctrl_info, &request.header, 0,
-               NULL, NO_TIMEOUT);
+       raid_map_size = get_unaligned_le32(&raid_map->structure_size);
 
-       pqi_pci_unmap(ctrl_info->pci_dev, request.sg_descriptors, 1, dir);
+       if (raid_map_size > sizeof(*raid_map)) {
 
-       if (rc)
-               goto error;
+               kfree(raid_map);
+
+               raid_map = kmalloc(raid_map_size, GFP_KERNEL);
+               if (!raid_map)
+                       return -ENOMEM;
+
+               rc = pqi_send_scsi_raid_request(ctrl_info, CISS_GET_RAID_MAP,
+                       device->scsi3addr, raid_map, raid_map_size,
+                       0, NULL, NO_TIMEOUT);
+               if (rc)
+                       goto error;
+
+               if (get_unaligned_le32(&raid_map->structure_size)
+                       != raid_map_size) {
+                       dev_warn(&ctrl_info->pci_dev->dev,
+                               "Requested %d bytes, received %d bytes",
+                               raid_map_size,
+                               get_unaligned_le32(&raid_map->structure_size));
+                       goto error;
+               }
+       }
 
        rc = pqi_validate_raid_map(ctrl_info, device, raid_map);
        if (rc)
@@ -2459,9 +2459,6 @@ static int pqi_raid_bypass_submit_scsi_cmd(struct pqi_ctrl_info *ctrl_info,
                        (map_row * total_disks_per_row) + first_column;
        }
 
-       if (unlikely(map_index >= RAID_MAP_MAX_ENTRIES))
-               return PQI_RAID_BYPASS_INELIGIBLE;
-
        aio_handle = raid_map->disk_data[map_index].aio_handle;
        disk_block = get_unaligned_le64(&raid_map->disk_starting_blk) +
                first_row * strip_size +