Re: arcmsr + archttp64 calls dma_free_coherent() with irqs disabled - dmesg filled with warnings

[Daniel Drake]

Joshua Hoblitt wrote:
I've got a few compilation errors on head.  Before I try it, is it
possible to backport the 76d78300a6eb8b7f08e47703b7e68a659ffc2053 change
to 2.6.24.y?

Please just try this patch instead, it's what I am planning to submit to 
-stable and add to Gentoo if you report success.

Daniel

From: Nick Cheng <[EMAIL PROTECTED]>

Partial backport of 76d78300 ("arcmsr: updates (1.20.00.15)") by
Daniel Drake <[EMAIL PROTECTED]>. Removes pci_alloc_consistent usage, which
should not be used when IRQs are disabled for portability reasons. Fixes a
spew of dma_alloc_coherent irqs_disabled() warnings.

diff --git a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c
index f4a202e..4f9ff32 100644
--- a/drivers/scsi/arcmsr/arcmsr_hba.c
+++ b/drivers/scsi/arcmsr/arcmsr_hba.c
@@ -1380,12 +1388,13 @@ static int arcmsr_iop_message_xfer(struct 
AdapterControlBlock *acb, \
 
        case ARCMSR_MESSAGE_READ_RQBUFFER: {
                unsigned long *ver_addr;
-               dma_addr_t buf_handle;
                uint8_t *pQbuffer, *ptmpQbuffer;
                int32_t allxfer_len = 0;
+               void *tmp;
 
-               ver_addr = pci_alloc_consistent(acb->pdev, 1032, &buf_handle);
-               if (!ver_addr) {
+               tmp = kmalloc(1032, GFP_KERNEL|GFP_DMA);
+               ver_addr = (unsigned long *)tmp;
+               if (!tmp) {
                        retvalue = ARCMSR_MESSAGE_FAIL;
                        goto message_out;
                }
@@ -1421,18 +1430,19 @@ static int arcmsr_iop_message_xfer(struct 
AdapterControlBlock *acb, \
                memcpy(pcmdmessagefld->messagedatabuffer, (uint8_t *)ver_addr, 
allxfer_len);
                pcmdmessagefld->cmdmessage.Length = allxfer_len;
                pcmdmessagefld->cmdmessage.ReturnCode = 
ARCMSR_MESSAGE_RETURNCODE_OK;
-               pci_free_consistent(acb->pdev, 1032, ver_addr, buf_handle);
+               kfree(tmp);
                }
                break;
 
        case ARCMSR_MESSAGE_WRITE_WQBUFFER: {
                unsigned long *ver_addr;
-               dma_addr_t buf_handle;
                int32_t my_empty_len, user_len, wqbuf_firstindex, 
wqbuf_lastindex;
                uint8_t *pQbuffer, *ptmpuserbuffer;
+               void *tmp;
 
-               ver_addr = pci_alloc_consistent(acb->pdev, 1032, &buf_handle);
-               if (!ver_addr) {
+               tmp = kmalloc(1032, GFP_KERNEL|GFP_DMA);
+               ver_addr = (unsigned long *)tmp;
+               if (!tmp) {
                        retvalue = ARCMSR_MESSAGE_FAIL;
                        goto message_out;
                }
@@ -1482,7 +1492,7 @@ static int arcmsr_iop_message_xfer(struct 
AdapterControlBlock *acb, \
                                retvalue = ARCMSR_MESSAGE_FAIL;
                        }
                        }
-                       pci_free_consistent(acb->pdev, 1032, ver_addr, 
buf_handle);
+                       kfree(tmp);
                }
                break;