Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

scsi: ipr: Use sgl_alloc_order() and sgl_free_order()

Browse source 
Use the sgl_alloc_order() and sgl_free_order() functions instead of open
coding these functions.

Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
Acked-by: Brian King <brking@linux.vnet.ibm.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Cc: Martin K. Petersen <martin.petersen@oracle.com>
Cc: linux-scsi@vger.kernel.org
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Bart Van Assche 2018-02-12 08:58:17 -08:00 • committed by Martin K. Petersen
parent b22ee87d84
commit f95dc1bb32
3 changed files with 10 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/scsi/Kconfig
View file

@ -1059,6 +1059,7 @@ config SCSI_IPR
depends on PCI && SCSI && ATA depends on PCI && SCSI && ATA
select FW_LOADER select FW_LOADER
select IRQ_POLL select IRQ_POLL
select SGL_ALLOC
---help--- ---help---
This driver supports the IBM Power Linux family RAID adapters. This driver supports the IBM Power Linux family RAID adapters.
This includes IBM pSeries 5712, 5703, 5709, and 570A, as well This includes IBM pSeries 5712, 5703, 5709, and 570A, as well

49
drivers/scsi/ipr.c
View file

@ -3816,10 +3816,8 @@ static struct device_attribute ipr_iopoll_weight_attr = {
**/ **/
static struct ipr_sglist *ipr_alloc_ucode_buffer(int buf_len) static struct ipr_sglist *ipr_alloc_ucode_buffer(int buf_len)
{ {
int sg_size, order, bsize_elem, num_elem, i, j; int sg_size, order;
struct ipr_sglist *sglist; struct ipr_sglist *sglist;
struct scatterlist *scatterlist;
struct page *page;
/* Get the minimum size per scatter/gather element */ /* Get the minimum size per scatter/gather element */
sg_size = buf_len / (IPR_MAX_SGLIST - 1); sg_size = buf_len / (IPR_MAX_SGLIST - 1);
@ -3827,45 +3825,18 @@ static struct ipr_sglist *ipr_alloc_ucode_buffer(int buf_len)
/* Get the actual size per element */ /* Get the actual size per element */
order = get_order(sg_size); order = get_order(sg_size);
/* Determine the actual number of bytes per element */
bsize_elem = PAGE_SIZE * (1 << order);
/* Determine the actual number of sg entries needed */
if (buf_len % bsize_elem)
num_elem = (buf_len / bsize_elem) + 1;
else
num_elem = buf_len / bsize_elem;
/* Allocate a scatter/gather list for the DMA */ /* Allocate a scatter/gather list for the DMA */
sglist = kzalloc(sizeof(struct ipr_sglist) + sglist = kzalloc(sizeof(struct ipr_sglist), GFP_KERNEL);
(sizeof(struct scatterlist) * (num_elem - 1)),
GFP_KERNEL);
if (sglist == NULL) { if (sglist == NULL) {
ipr_trace; ipr_trace;
return NULL; return NULL;
} }
scatterlist = sglist->scatterlist;
sg_init_table(scatterlist, num_elem);
sglist->order = order; sglist->order = order;
sglist->num_sg = num_elem; sglist->scatterlist = sgl_alloc_order(buf_len, order, false, GFP_KERNEL,
&sglist->num_sg);
/* Allocate a bunch of sg elements */ if (!sglist->scatterlist) {
for (i = 0; i < num_elem; i++) { kfree(sglist);
page = alloc_pages(GFP_KERNEL, order); return NULL;
if (!page) {
ipr_trace;
/* Free up what we already allocated */
for (j = i - 1; j >= 0; j--)
__free_pages(sg_page(&scatterlist[j]), order);
kfree(sglist);
return NULL;
}
sg_set_page(&scatterlist[i], page, 0, 0);
} }
return sglist; return sglist;
@ -3883,11 +3854,7 @@ static struct ipr_sglist *ipr_alloc_ucode_buffer(int buf_len)
**/ **/
static void ipr_free_ucode_buffer(struct ipr_sglist *sglist) static void ipr_free_ucode_buffer(struct ipr_sglist *sglist)
{ {
int i; sgl_free_order(sglist->scatterlist, sglist->order);
for (i = 0; i < sglist->num_sg; i++)
__free_pages(sg_page(&sglist->scatterlist[i]), sglist->order);
kfree(sglist); kfree(sglist);
} }

2
drivers/scsi/ipr.h
View file

@ -1454,7 +1454,7 @@ struct ipr_sglist {
u32 num_sg; u32 num_sg;
u32 num_dma_sg; u32 num_dma_sg;
u32 buffer_len; u32 buffer_len;
struct scatterlist scatterlist[1]; struct scatterlist *scatterlist;
}; };
enum ipr_sdt_state { enum ipr_sdt_state {