cciss: Add IRQF_SHARED back in for the non-MSI(X) interrupt handler
PATCH 1/2 cciss: Add IRQF_SHARED back in for the non-MSI(X) interrupt handler
From: Stephen M. Cameron <[email protected]>
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.
--- drivers/block/cciss.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/block/cciss.c +2 -2
@@ -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);
PATCH 2/2 cciss: fix flush cache transfer length
From: Stephen M. Cameron <[email protected]>
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.
--- drivers/block/cciss.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
drivers/block/cciss.c +2 -0
@@ -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 ;
Jens Axboe
maintainerQuoted 6 lines · Stephen M. Cameron
From: Stephen M. Cameron <[email protected]>
IRQF_SHAREDis 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.
Signature · 1 line
Jens Axboe