Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c831a4a0 authored by Raghava Aditya Renukunta's avatar Raghava Aditya Renukunta Committed by Martin K. Petersen
Browse files

scsi: aacraid: Remove __GFP_DMA for raw srb memory 



The raw srb commands do not requires memory that in the ZONE_DMA memory
space. For 32bit srb commands use GFP_DMA32 to limit the memory to 32bit
memory range (4GB).

Signed-off-by: default avatarRaghava Aditya Renukunta <RaghavaAditya.Renukunta@microsemi.com>
Reviewed-by: default avatarDave Carroll <david.carroll@microsemi.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 32c1431e

drivers/scsi/aacraid/commctrl.c

+7 −8
Original line number Diff line number Diff line
@@ -668,7 +668,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg) 
				goto cleanup;

			}



			p = kmalloc(sg_count[i], GFP_KERNEL|__GFP_DMA);

			p = kmalloc(sg_count[i], GFP_KERNEL);

			if (!p) {

				rcode = -ENOMEM;

				goto cleanup;
@@ -732,8 +732,8 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg) 
					rcode = -EINVAL;

					goto cleanup;

				}

				/* Does this really need to be GFP_DMA? */

				p = kmalloc(sg_count[i], GFP_KERNEL|__GFP_DMA);



				p = kmalloc(sg_count[i], GFP_KERNEL);

				if(!p) {

					dprintk((KERN_DEBUG"aacraid: Could not allocate SG buffer - size = %d buffer number %d of %d\n",

					  sg_count[i], i, upsg->count));
@@ -788,8 +788,8 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg) 
					rcode = -EINVAL;

					goto cleanup;

				}

				/* Does this really need to be GFP_DMA? */

				p = kmalloc(sg_count[i], GFP_KERNEL|__GFP_DMA);



				p = kmalloc(sg_count[i], GFP_KERNEL);

				if(!p) {

					dprintk((KERN_DEBUG "aacraid: Could not allocate SG buffer - size = %d buffer number %d of %d\n",

						sg_count[i], i, usg->count));
@@ -845,8 +845,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg) 
					rcode = -EINVAL;

					goto cleanup;

				}

				/* Does this really need to be GFP_DMA? */

				p = kmalloc(sg_count[i], GFP_KERNEL|__GFP_DMA);

				p = kmalloc(sg_count[i], GFP_KERNEL|GFP_DMA32);

				if (!p) {

					dprintk((KERN_DEBUG"aacraid: Could not allocate SG buffer - size = %d buffer number %d of %d\n",

						sg_count[i], i, usg->count));
@@ -887,7 +886,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg) 
					rcode = -EINVAL;

					goto cleanup;

				}

				p = kmalloc(sg_count[i], GFP_KERNEL);

				p = kmalloc(sg_count[i], GFP_KERNEL|GFP_DMA32);

				if (!p) {

					dprintk((KERN_DEBUG"aacraid: Could not allocate SG buffer - size = %d buffer number %d of %d\n",

					  sg_count[i], i, upsg->count));