[SCSI] ibmvfc: Fix command timeouts due to cached CRQ access

The CRQs used by the ibmvfc driver are read and written by both
the client and the server. Therefore, we need to mark them volatile
so that we do not cache their contents when handling an interrupt.
This fixes a problem which can surface as occasional command timeouts.
No commands were actually timing out, but due to accessing cached data
for the CRQ in the interrupt handler, the interrupt was not processing
all command completions as it should.

Signed-off-by: Brian King <brking@linux.vnet.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

diff --git a/drivers/scsi/ibmvscsi/ibmvfc.h b/drivers/scsi/ibmvscsi/ibmvfc.h
index f0c0212a74602524200ed720f1d2648a93db859f..526bca743c814c84f79bac19de38feeb9011b8f4 100644 (file)
--- a/drivers/scsi/ibmvscsi/ibmvfc.h
+++ b/drivers/scsi/ibmvscsi/ibmvfc.h
@@ -523,10 +523,10 @@ enum ibmvfc_async_event {
 };
 
 struct ibmvfc_crq {
-       u8 valid;
-       u8 format;
+       volatile u8 valid;
+       volatile u8 format;
        u8 reserved[6];
-       u64 ioba;
+       volatile u64 ioba;
 }__attribute__((packed, aligned (8)));
 
 struct ibmvfc_crq_queue {
@@ -536,13 +536,13 @@ struct ibmvfc_crq_queue {
 };
 
 struct ibmvfc_async_crq {
-       u8 valid;
+       volatile u8 valid;
        u8 pad[3];
        u32 pad2;
-       u64 event;
-       u64 scsi_id;
-       u64 wwpn;
-       u64 node_name;
+       volatile u64 event;
+       volatile u64 scsi_id;
+       volatile u64 wwpn;
+       volatile u64 node_name;
        u64 reserved;
 }__attribute__((packed, aligned (8)));