From: <rajinikanth.pandurangan@pmcs.com>
To: jbottomley@parallels.com, linux-scsi@vger.kernel.org
Cc: aacraid@pmc-sierra.com, harry.yang@pmcs.com, rich.bono@pmcs.com,
achim.leubner@pmcs.com, murthy.bhat@pmcs.com,
rajinikanth.pandurangan@pmcs.com
Subject: [PATCH 4/9] [SCSI] aacraid: Enable 64-bit write to controller register
Date: Wed, 13 May 2015 17:12:53 -0700 [thread overview]
Message-ID: <1431562378-8514-5-git-send-email-rajinikanth.pandurangan@pmcs.com> (raw)
In-Reply-To: <1431562378-8514-1-git-send-email-rajinikanth.pandurangan@pmcs.com>
From: Rajinikanth Pandurangan <rajinikanth.pandurangan@pmcs.com>
Description:
If writeq() not supported, then do atomic two 32bit write
Signed-off-by: Rajinikanth Pandurangan <rajinikanth.pandurangan@pmcs.com>
---
drivers/scsi/aacraid/aacraid.h | 12 ++++++++++++
drivers/scsi/aacraid/comminit.c | 1 +
drivers/scsi/aacraid/src.c | 12 ++++++++++--
3 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
index 62b0999..9e69e3e 100644
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
@@ -719,6 +719,9 @@ struct sa_registers {
#define sa_readl(AEP, CSR) readl(&((AEP)->regs.sa->CSR))
#define sa_writew(AEP, CSR, value) writew(value, &((AEP)->regs.sa->CSR))
#define sa_writel(AEP, CSR, value) writel(value, &((AEP)->regs.sa->CSR))
+#if defined(writeq)
+#define sa_writeq(AEP, CSR, value) writeq(value, &((AEP)->regs.sa->CSR))
+#endif
/*
* Rx Message Unit Registers
@@ -844,6 +847,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 +1170,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 45a0a04..4043245 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 ae494c5..109863a 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;
}
--
1.9.3
next prev parent reply other threads:[~2015-05-14 0:14 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-14 0:12 [PATCH 0/9] aacraid: Patchset for aacraid driver version 41010 rajinikanth.pandurangan
2015-05-14 0:12 ` [PATCH 1/9] [SCSI] aacraid: Fix for logical device name and UID not exposed to the OS rajinikanth.pandurangan
2015-05-15 2:55 ` Mahesh Rajashekhara
2015-05-22 13:18 ` Tomas Henzl
2015-05-26 18:06 ` Rajinikanth Pandurangan
2015-05-27 14:41 ` Tomas Henzl
2015-05-14 0:12 ` [PATCH 2/9] [SCSI] aacraid: Add Power Management support rajinikanth.pandurangan
2015-05-15 2:56 ` Mahesh Rajashekhara
2015-05-22 13:36 ` Tomas Henzl
2015-05-27 14:41 ` Tomas Henzl
2015-06-01 15:14 ` James Bottomley
2015-06-01 21:16 ` Rajinikanth Pandurangan
2015-06-01 21:38 ` James Bottomley
2015-05-14 0:12 ` [PATCH 3/9] [SCSI] aacraid: Enable MSI interrupt for series-6 controller rajinikanth.pandurangan
2015-05-15 2:56 ` Mahesh Rajashekhara
2015-05-22 13:40 ` Tomas Henzl
2015-05-22 23:46 ` Rajinikanth Pandurangan
2015-05-24 19:31 ` Tomas Henzl
2015-05-27 14:42 ` Tomas Henzl
2015-05-14 0:12 ` rajinikanth.pandurangan [this message]
2015-05-15 2:57 ` [PATCH 4/9] [SCSI] aacraid: Enable 64-bit write to controller register Mahesh Rajashekhara
2015-05-22 14:02 ` Tomas Henzl
2015-05-22 23:52 ` Rajinikanth Pandurangan
2015-05-24 19:31 ` Tomas Henzl
2015-05-27 14:44 ` Tomas Henzl
2015-05-14 0:12 ` [PATCH 5/9] [SCSI] aacraid: Tune response path if IsFastPath bit set rajinikanth.pandurangan
2015-05-15 2:57 ` Mahesh Rajashekhara
2015-05-27 14:45 ` Tomas Henzl
2015-05-14 0:12 ` [PATCH 6/9] [SCSI] aacraid: Reset irq affinity hints before releasing irq rajinikanth.pandurangan
2015-05-15 2:57 ` Mahesh Rajashekhara
2015-05-27 14:45 ` Tomas Henzl
2015-05-14 0:12 ` [PATCH 7/9] [SCSI] aacraid: Unblock IOCTLs to controller once system resumed from suspend rajinikanth.pandurangan
2015-05-15 2:57 ` Mahesh Rajashekhara
2015-05-27 14:45 ` Tomas Henzl
2015-05-14 0:12 ` [PATCH 8/9] [SCSI] aacraid: Send commit-config to controller firmware rajinikanth.pandurangan
2015-05-15 2:57 ` Mahesh Rajashekhara
2015-05-14 0:12 ` [PATCH 9/9] [SCSI] aacraid: Update driver version rajinikanth.pandurangan
2015-05-15 2:58 ` Mahesh Rajashekhara
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1431562378-8514-5-git-send-email-rajinikanth.pandurangan@pmcs.com \
--to=rajinikanth.pandurangan@pmcs.com \
--cc=aacraid@pmc-sierra.com \
--cc=achim.leubner@pmcs.com \
--cc=harry.yang@pmcs.com \
--cc=jbottomley@parallels.com \
--cc=linux-scsi@vger.kernel.org \
--cc=murthy.bhat@pmcs.com \
--cc=rich.bono@pmcs.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.