Attachment 158935 Details for Bug 247767 – re-diff of upstream patch for RHEL4

[patch] re-diff of upstream patch for RHEL4

megaraid_sas-dma_alloc_coherent.patch (text/plain), 1.33 KB, created by Bryn M. Reeves on 2007-07-11 11:29:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bryn M. Reeves

Created: 2007-07-11 11:29:13 UTC

Size: 1.33 KB

patch

obsolete

>--- ./drivers/scsi/megaraid/megaraid_sas.c.dma_alloc_coherent	2007-07-11 12:09:50.000000000 +0100
>+++ ./drivers/scsi/megaraid/megaraid_sas.c	2007-07-11 12:10:06.000000000 +0100
>@@ -2748,9 +2748,9 @@
> 	 * For each user buffer, create a mirror buffer and copy in
> 	 */
> 	for (i = 0; i < ioc->sge_count; i++) {
>-		kbuff_arr[i] = pci_alloc_consistent(instance->pdev,
>+		kbuff_arr[i] = dma_alloc_coherent(&instance->pdev->dev,
> 						    ioc->sgl[i].iov_len,
>-						    &buf_handle);
>+						    &buf_handle, GFP_KERNEL);
> 		if (!kbuff_arr[i]) {
> 			printk(KERN_DEBUG "megasas: Failed to alloc "
> 			       "kernel SGL buffer for IOCTL \n");
>@@ -2777,8 +2777,8 @@
> 	}
> 
> 	if (ioc->sense_len) {
>-		sense = pci_alloc_consistent(instance->pdev, ioc->sense_len,
>-					     &sense_handle);
>+		sense = dma_alloc_coherent(&instance->pdev->dev, ioc->sense_len,
>+					     &sense_handle, GFP_KERNEL);
> 		if (!sense) {
> 			error = -ENOMEM;
> 			goto out;
>@@ -2837,12 +2837,12 @@
> 
>       out:
> 	if (sense) {
>-		pci_free_consistent(instance->pdev, ioc->sense_len,
>+		dma_free_coherent(&instance->pdev->dev, ioc->sense_len,
> 				    sense, sense_handle);
> 	}
> 
> 	for (i = 0; i < ioc->sge_count && kbuff_arr[i]; i++) {
>-		pci_free_consistent(instance->pdev,
>+		dma_free_coherent(&instance->pdev->dev,
> 				    kern_sge32[i].length,
> 				    kbuff_arr[i], kern_sge32[i].phys_addr);
> 	}

Actions: View | Diff

Attachments on bug 247767: 158935