Skip to content

Commit

Permalink
[SCSI] ibmvfc: Fix command timeouts due to cached CRQ access
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Brian King authored and James Bottomley committed Dec 29, 2008
1 parent 4081b77 commit 5919ce2
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions drivers/scsi/ibmvscsi/ibmvfc.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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)));

Expand Down

0 comments on commit 5919ce2

Please sign in to comment.