From 5e6429df9c8b3ab9e0a8d18af5248692ebe41871 Mon Sep 17 00:00:00 2001 From: Kevin Barnett Date: Wed, 31 Aug 2016 14:54:53 -0500 Subject: scsi: smartpqi: correct event acknowledgment timeout issue the driver no longer waits for the firmware to consume the event ack IU. Reviewed-by: Scott Teel Reviewed-by: Scott Benesh Reviewed-by: Johannes Thumshirn Reviewed-by: Tomas Henzl Signed-off-by: Kevin Barnett Signed-off-by: Don Brace Signed-off-by: Martin K. Petersen --- drivers/scsi/smartpqi/smartpqi.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'drivers/scsi/smartpqi/smartpqi.h') diff --git a/drivers/scsi/smartpqi/smartpqi.h b/drivers/scsi/smartpqi/smartpqi.h index 5f965adfab32..07b6444d3e0a 100644 --- a/drivers/scsi/smartpqi/smartpqi.h +++ b/drivers/scsi/smartpqi/smartpqi.h @@ -634,13 +634,6 @@ struct pqi_encryption_info { #define RAID_MAP_MAX_ENTRIES 1024 -#define PQI_RESERVED_IO_SLOTS_LUN_RESET 1 -#define PQI_RESERVED_IO_SLOTS_EVENT_ACK 1 -#define PQI_RESERVED_IO_SLOTS_SYNCHRONOUS_REQUESTS 3 -#define PQI_RESERVED_IO_SLOTS \ - (PQI_RESERVED_IO_SLOTS_LUN_RESET + PQI_RESERVED_IO_SLOTS_EVENT_ACK + \ - PQI_RESERVED_IO_SLOTS_SYNCHRONOUS_REQUESTS) - #define PQI_PHYSICAL_DEVICE_BUS 0 #define PQI_RAID_VOLUME_BUS 1 #define PQI_HBA_BUS 2 @@ -884,6 +877,13 @@ struct pqi_event { __le32 additional_event_id; }; +#define PQI_RESERVED_IO_SLOTS_LUN_RESET 1 +#define PQI_RESERVED_IO_SLOTS_EVENT_ACK PQI_NUM_SUPPORTED_EVENTS +#define PQI_RESERVED_IO_SLOTS_SYNCHRONOUS_REQUESTS 3 +#define PQI_RESERVED_IO_SLOTS \ + (PQI_RESERVED_IO_SLOTS_LUN_RESET + PQI_RESERVED_IO_SLOTS_EVENT_ACK + \ + PQI_RESERVED_IO_SLOTS_SYNCHRONOUS_REQUESTS) + struct pqi_ctrl_info { unsigned int ctrl_id; struct pci_dev *pci_dev; -- cgit v1.2.3