* [PATCH 1/2] cciss: Add IRQF_SHARED back in for the non-MSI(X) interrupt handler
@ 2011-11-28 16:14 Stephen M. Cameron
2011-11-28 16:14 ` [PATCH 2/2] cciss: fix flush cache transfer length Stephen M. Cameron
2011-11-28 19:12 ` [PATCH 1/2] cciss: Add IRQF_SHARED back in for the non-MSI(X) interrupt handler Jens Axboe
0 siblings, 2 replies; 3+ messages in thread
From: Stephen M. Cameron @ 2011-11-28 16:14 UTC (permalink / raw)
To: axboe; +Cc: stephenmcameron, akpm, mikem, linux-kernel, thenzl
From: Stephen M. Cameron <scameron@beardog.cce.hp.com>
IRQF_SHARED is required for older controllers that don't support MSI(X)
and which may end up sharing an interrupt.
Also remove deprecated IRQF_DISABLED.
Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
---
drivers/block/cciss.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 8004ac3..6f22ed0 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -4880,7 +4880,7 @@ static int cciss_request_irq(ctlr_info_t *h,
{
if (h->msix_vector || h->msi_vector) {
if (!request_irq(h->intr[h->intr_mode], msixhandler,
- IRQF_DISABLED, h->devname, h))
+ 0, h->devname, h))
return 0;
dev_err(&h->pdev->dev, "Unable to get msi irq %d"
" for %s\n", h->intr[h->intr_mode],
@@ -4889,7 +4889,7 @@ static int cciss_request_irq(ctlr_info_t *h,
}
if (!request_irq(h->intr[h->intr_mode], intxhandler,
- IRQF_DISABLED, h->devname, h))
+ IRQF_SHARED, h->devname, h))
return 0;
dev_err(&h->pdev->dev, "Unable to get irq %d for %s\n",
h->intr[h->intr_mode], h->devname);
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] cciss: fix flush cache transfer length
2011-11-28 16:14 [PATCH 1/2] cciss: Add IRQF_SHARED back in for the non-MSI(X) interrupt handler Stephen M. Cameron
@ 2011-11-28 16:14 ` Stephen M. Cameron
2011-11-28 19:12 ` [PATCH 1/2] cciss: Add IRQF_SHARED back in for the non-MSI(X) interrupt handler Jens Axboe
1 sibling, 0 replies; 3+ messages in thread
From: Stephen M. Cameron @ 2011-11-28 16:14 UTC (permalink / raw)
To: axboe; +Cc: stephenmcameron, akpm, mikem, linux-kernel, thenzl
From: Stephen M. Cameron <scameron@beardog.cce.hp.com>
We weren't filling in the transfer length of the
flush cache command (it transfers 4 bytes of zeroes).
Firmware didn't seem to be bothered by this, but it
should be fixed.
Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
---
drivers/block/cciss.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 6f22ed0..587cce5 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -2601,6 +2601,8 @@ static int fill_cmd(ctlr_info_t *h, CommandList_struct *c, __u8 cmd, void *buff,
c->Request.Timeout = 0;
c->Request.CDB[0] = BMIC_WRITE;
c->Request.CDB[6] = BMIC_CACHE_FLUSH;
+ c->Request.CDB[7] = (size >> 8) & 0xFF;
+ c->Request.CDB[8] = size & 0xFF;
break;
case TEST_UNIT_READY:
c->Request.CDBLen = 6;
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] cciss: Add IRQF_SHARED back in for the non-MSI(X) interrupt handler
2011-11-28 16:14 [PATCH 1/2] cciss: Add IRQF_SHARED back in for the non-MSI(X) interrupt handler Stephen M. Cameron
2011-11-28 16:14 ` [PATCH 2/2] cciss: fix flush cache transfer length Stephen M. Cameron
@ 2011-11-28 19:12 ` Jens Axboe
1 sibling, 0 replies; 3+ messages in thread
From: Jens Axboe @ 2011-11-28 19:12 UTC (permalink / raw)
To: Stephen M. Cameron; +Cc: stephenmcameron, akpm, mikem, linux-kernel, thenzl
On 2011-11-28 17:14, Stephen M. Cameron wrote:
> From: Stephen M. Cameron <scameron@beardog.cce.hp.com>
>
> IRQF_SHARED is required for older controllers that don't support MSI(X)
> and which may end up sharing an interrupt.
>
> Also remove deprecated IRQF_DISABLED.
Thanks Stephen, applied this one and 2/2 as well.
--
Jens Axboe
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-11-28 19:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-11-28 16:14 [PATCH 1/2] cciss: Add IRQF_SHARED back in for the non-MSI(X) interrupt handler Stephen M. Cameron
2011-11-28 16:14 ` [PATCH 2/2] cciss: fix flush cache transfer length Stephen M. Cameron
2011-11-28 19:12 ` [PATCH 1/2] cciss: Add IRQF_SHARED back in for the non-MSI(X) interrupt handler Jens Axboe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).