Hello Johannes, My comments are inline. Thanks, -Raj P. -----Original Message----- From: Johannes Thumshirn [mailto:jthumshirn@xxxxxxx] Sent: Thursday, June 11, 2015 3:02 AM To: Rajinikanth Pandurangan Cc: jbottomley@xxxxxxxxxxxxx; linux-scsi@xxxxxxxxxxxxxxx; aacraid@xxxxxxxxxxxxxx; Harry Yang; Mahesh Rajashekhara; Rich Bono; Achim Leubner; Murthy Bhat Subject: Re: [Patch V2 4/9] [SCSI] aacraid: Enable 64-bit write to controller register On Wed, Jun 10, 2015 at 06:42:26PM -0700, rajinikanth.pandurangan@xxxxxxxx wrote: > From: Rajinikanth Pandurangan <rajinikanth.pandurangan@xxxxxxxx> > > Description: > If writeq() not supported, then do atomic two 32bit write > > Signed-off-by: Rajinikanth Pandurangan > <rajinikanth.pandurangan@xxxxxxxx> > --- > drivers/scsi/aacraid/aacraid.h | 9 +++++++++ > drivers/scsi/aacraid/comminit.c | 1 + > drivers/scsi/aacraid/src.c | 12 ++++++++++-- > 3 files changed, 20 insertions(+), 2 deletions(-) > > diff --git a/drivers/scsi/aacraid/aacraid.h > b/drivers/scsi/aacraid/aacraid.h index 62b0999..e54f597 100644 > --- a/drivers/scsi/aacraid/aacraid.h > +++ b/drivers/scsi/aacraid/aacraid.h > @@ -844,6 +844,10 @@ struct src_registers { > &((AEP)->regs.src.bar0->CSR)) > #define src_writel(AEP, CSR, value) writel(value, \ > &((AEP)->regs.src.bar0->CSR)) > +#if defined(writeq) > +#define src_writeq(AEP, CSR, value) writeq(value, \ > + &((AEP)->regs.src.bar0->CSR)) > +#endif > > #define SRC_ODR_SHIFT 12 > #define SRC_IDR_SHIFT 9 > @@ -1163,6 +1167,11 @@ struct aac_dev > struct fsa_dev_info *fsa_dev; > struct task_struct *thread; > int cardtype; > + /* > + *This lock will protect the two 32-bit > + *writes to the Inbound Queue > + */ > + spinlock_t iq_lock; > > /* > * The following is the device specific extension. > diff --git a/drivers/scsi/aacraid/comminit.c > b/drivers/scsi/aacraid/comminit.c index e0a76d5..e4ff47e 100644 > --- a/drivers/scsi/aacraid/comminit.c > +++ b/drivers/scsi/aacraid/comminit.c > @@ -424,6 +424,7 @@ struct aac_dev *aac_init_adapter(struct aac_dev *dev) > dev->management_fib_count = 0; > spin_lock_init(&dev->manage_lock); > spin_lock_init(&dev->sync_lock); > + spin_lock_init(&dev->iq_lock); > dev->max_fib_size = sizeof(struct hw_fib); > dev->sg_tablesize = host->sg_tablesize = (dev->max_fib_size > - sizeof(struct aac_fibhdr) > diff --git a/drivers/scsi/aacraid/src.c b/drivers/scsi/aacraid/src.c > index eb07b3d..1409a0b 100644 > --- a/drivers/scsi/aacraid/src.c > +++ b/drivers/scsi/aacraid/src.c > @@ -447,6 +447,10 @@ static int aac_src_deliver_message(struct fib *fib) > u32 fibsize; > dma_addr_t address; > struct aac_fib_xporthdr *pFibX; > +#if !defined(writeq) > + unsigned long flags; > +#endif > + > u16 hdr_size = le16_to_cpu(fib->hw_fib_va->header.Size); > > atomic_inc(&q->numpending); > @@ -511,10 +515,14 @@ static int aac_src_deliver_message(struct fib *fib) > return -EINVAL; > address |= fibsize; > } > - > +#if defined(writeq) > + src_writeq(dev, MUnit.IQ_L, (u64)address); #else > + spin_lock_irqsave(&fib->dev->iq_lock, flags); > src_writel(dev, MUnit.IQ_H, upper_32_bits(address) & 0xffffffff); > src_writel(dev, MUnit.IQ_L, address & 0xffffffff); > - > + spin_unlock_irqrestore(&fib->dev->iq_lock, flags); #endif > return 0; > } Why not make src_writeq() a wrapper over either writeq() or spin_lock_irqsave(); src_writel() x2; spin_unlock_irqrestore(), depending on the presence of writeq? [RajP] Yes, agreed. Will include it in our next submission. > > -- > 1.9.3 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-scsi" > in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo > info at http://vger.kernel.org/majordomo-info.html -- Johannes Thumshirn Storage jthumshirn@xxxxxxx +49 911 74053 689 SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg GF: F. Imendörffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton HRB 21284 (AG Nürnberg) -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
