RE: [PATCH v4 11/19] scsi: megaraid: Replace PCI pool old API
>-Original Message- >From: linux-scsi-ow...@vger.kernel.org [mailto:linux-scsi- >ow...@vger.kernel.org] On Behalf Of Romain Perier >Sent: Wednesday, March 01, 2017 9:25 PM >To: Dan Williams; Doug Ledford; Sean Hefty; Hal Rosenstock; >jeffrey.t.kirs...@intel.com; David S. Miller; stas.yakov...@gmail.com; James E.J. >Bottomley; Martin K. Petersen; Felipe Balbi; Greg Kroah-Hartman >Cc: linux-r...@vger.kernel.org; net...@vger.kernel.org; linux- >u...@vger.kernel.org; linux-s...@vger.kernel.org; linux-kernel@vger.kernel.org; >Romain Perier; Peter Senna Tschudin >Subject: [PATCH v4 11/19] scsi: megaraid: Replace PCI pool old API > >The PCI pool API is deprecated. This commits replaces the PCI pool old API by the >appropriated function with the DMA pool API. > >Signed-off-by: Romain Perier>Reviewed-by: Peter Senna Tschudin >--- > drivers/scsi/megaraid/megaraid_mbox.c | 33 +++ > drivers/scsi/megaraid/megaraid_mm.c | 32 +++--- > drivers/scsi/megaraid/megaraid_sas_base.c | 29 +++-- > drivers/scsi/megaraid/megaraid_sas_fusion.c | 66 + > 4 files changed, 77 insertions(+), 83 deletions(-) > >diff --git a/drivers/scsi/megaraid/megaraid_mbox.c >b/drivers/scsi/megaraid/megaraid_mbox.c >index f0987f2..7dfc2e2 100644 >--- a/drivers/scsi/megaraid/megaraid_mbox.c >+++ b/drivers/scsi/megaraid/megaraid_mbox.c >@@ -1153,8 +1153,8 @@ megaraid_mbox_setup_dma_pools(adapter_t >*adapter) > > > // Allocate memory for 16-bytes aligned mailboxes >- raid_dev->mbox_pool_handle = pci_pool_create("megaraid mbox pool", >- adapter->pdev, >+ raid_dev->mbox_pool_handle = dma_pool_create("megaraid mbox >pool", >+ >pdev->dev, > sizeof(mbox64_t) + 16, > 16, 0); > >@@ -1164,7 +1164,7 @@ megaraid_mbox_setup_dma_pools(adapter_t >*adapter) > > mbox_pci_blk = raid_dev->mbox_pool; > for (i = 0; i < MBOX_MAX_SCSI_CMDS; i++) { >- mbox_pci_blk[i].vaddr = pci_pool_alloc( >+ mbox_pci_blk[i].vaddr = dma_pool_alloc( > raid_dev->mbox_pool_handle, > GFP_KERNEL, > _pci_blk[i].dma_addr); >@@ -1181,8 +1181,8 @@ megaraid_mbox_setup_dma_pools(adapter_t >*adapter) >* share common memory pool. Passthru structures piggyback on >memory >* allocted to extended passthru since passthru is smaller of the two >*/ >- raid_dev->epthru_pool_handle = pci_pool_create("megaraid mbox >pthru", >- adapter->pdev, sizeof(mraid_epassthru_t), 128, 0); >+ raid_dev->epthru_pool_handle = dma_pool_create("megaraid mbox >pthru", >+ >pdev->dev, sizeof(mraid_epassthru_t), 128, >0); > > if (raid_dev->epthru_pool_handle == NULL) { > goto fail_setup_dma_pool; >@@ -1190,7 +1190,7 @@ megaraid_mbox_setup_dma_pools(adapter_t >*adapter) > > epthru_pci_blk = raid_dev->epthru_pool; > for (i = 0; i < MBOX_MAX_SCSI_CMDS; i++) { >- epthru_pci_blk[i].vaddr = pci_pool_alloc( >+ epthru_pci_blk[i].vaddr = dma_pool_alloc( > raid_dev->epthru_pool_handle, > GFP_KERNEL, > _pci_blk[i].dma_addr); >@@ -1202,8 +1202,8 @@ megaraid_mbox_setup_dma_pools(adapter_t >*adapter) > > // Allocate memory for each scatter-gather list. Request for 512 bytes > // alignment for each sg list >- raid_dev->sg_pool_handle = pci_pool_create("megaraid mbox sg", >- adapter->pdev, >+ raid_dev->sg_pool_handle = dma_pool_create("megaraid mbox sg", >+ >pdev->dev, > sizeof(mbox_sgl64) * >MBOX_MAX_SG_SIZE, > 512, 0); > >@@ -1213,7 +1213,7 @@ megaraid_mbox_setup_dma_pools(adapter_t >*adapter) > > sg_pci_blk = raid_dev->sg_pool; > for (i = 0; i < MBOX_MAX_SCSI_CMDS; i++) { >- sg_pci_blk[i].vaddr = pci_pool_alloc( >+ sg_pci_blk[i].vaddr = dma_pool_alloc( > raid_dev->sg_pool_handle, > GFP_KERNEL, > _pci_blk[i].dma_addr); >@@ -1249,29 +1249,26 @@ megaraid_mbox_teardown_dma_pools(adapter_t >*adapter) > > sg_pci_blk = raid_dev->sg_pool; > for (i = 0; i < MBOX_MAX_SCSI_CMDS && sg_pci_blk[i].vaddr; i++) { >- pci_pool_free(raid_dev->sg_pool_handle, sg_pci_blk[i].vaddr, >+ dma_pool_free(raid_dev->sg_pool_handle, sg_pci_blk[i].vaddr, > sg_pci_blk[i].dma_addr); > } >- if (raid_dev->sg_pool_handle) >- pci_pool_destroy(raid_dev->sg_pool_handle); >+
RE: [PATCH v4 11/19] scsi: megaraid: Replace PCI pool old API
>-Original Message- >From: linux-scsi-ow...@vger.kernel.org [mailto:linux-scsi- >ow...@vger.kernel.org] On Behalf Of Romain Perier >Sent: Wednesday, March 01, 2017 9:25 PM >To: Dan Williams; Doug Ledford; Sean Hefty; Hal Rosenstock; >jeffrey.t.kirs...@intel.com; David S. Miller; stas.yakov...@gmail.com; James E.J. >Bottomley; Martin K. Petersen; Felipe Balbi; Greg Kroah-Hartman >Cc: linux-r...@vger.kernel.org; net...@vger.kernel.org; linux- >u...@vger.kernel.org; linux-s...@vger.kernel.org; linux-kernel@vger.kernel.org; >Romain Perier; Peter Senna Tschudin >Subject: [PATCH v4 11/19] scsi: megaraid: Replace PCI pool old API > >The PCI pool API is deprecated. This commits replaces the PCI pool old API by the >appropriated function with the DMA pool API. > >Signed-off-by: Romain Perier >Reviewed-by: Peter Senna Tschudin >--- > drivers/scsi/megaraid/megaraid_mbox.c | 33 +++ > drivers/scsi/megaraid/megaraid_mm.c | 32 +++--- > drivers/scsi/megaraid/megaraid_sas_base.c | 29 +++-- > drivers/scsi/megaraid/megaraid_sas_fusion.c | 66 + > 4 files changed, 77 insertions(+), 83 deletions(-) > >diff --git a/drivers/scsi/megaraid/megaraid_mbox.c >b/drivers/scsi/megaraid/megaraid_mbox.c >index f0987f2..7dfc2e2 100644 >--- a/drivers/scsi/megaraid/megaraid_mbox.c >+++ b/drivers/scsi/megaraid/megaraid_mbox.c >@@ -1153,8 +1153,8 @@ megaraid_mbox_setup_dma_pools(adapter_t >*adapter) > > > // Allocate memory for 16-bytes aligned mailboxes >- raid_dev->mbox_pool_handle = pci_pool_create("megaraid mbox pool", >- adapter->pdev, >+ raid_dev->mbox_pool_handle = dma_pool_create("megaraid mbox >pool", >+ >pdev->dev, > sizeof(mbox64_t) + 16, > 16, 0); > >@@ -1164,7 +1164,7 @@ megaraid_mbox_setup_dma_pools(adapter_t >*adapter) > > mbox_pci_blk = raid_dev->mbox_pool; > for (i = 0; i < MBOX_MAX_SCSI_CMDS; i++) { >- mbox_pci_blk[i].vaddr = pci_pool_alloc( >+ mbox_pci_blk[i].vaddr = dma_pool_alloc( > raid_dev->mbox_pool_handle, > GFP_KERNEL, > _pci_blk[i].dma_addr); >@@ -1181,8 +1181,8 @@ megaraid_mbox_setup_dma_pools(adapter_t >*adapter) >* share common memory pool. Passthru structures piggyback on >memory >* allocted to extended passthru since passthru is smaller of the two >*/ >- raid_dev->epthru_pool_handle = pci_pool_create("megaraid mbox >pthru", >- adapter->pdev, sizeof(mraid_epassthru_t), 128, 0); >+ raid_dev->epthru_pool_handle = dma_pool_create("megaraid mbox >pthru", >+ >pdev->dev, sizeof(mraid_epassthru_t), 128, >0); > > if (raid_dev->epthru_pool_handle == NULL) { > goto fail_setup_dma_pool; >@@ -1190,7 +1190,7 @@ megaraid_mbox_setup_dma_pools(adapter_t >*adapter) > > epthru_pci_blk = raid_dev->epthru_pool; > for (i = 0; i < MBOX_MAX_SCSI_CMDS; i++) { >- epthru_pci_blk[i].vaddr = pci_pool_alloc( >+ epthru_pci_blk[i].vaddr = dma_pool_alloc( > raid_dev->epthru_pool_handle, > GFP_KERNEL, > _pci_blk[i].dma_addr); >@@ -1202,8 +1202,8 @@ megaraid_mbox_setup_dma_pools(adapter_t >*adapter) > > // Allocate memory for each scatter-gather list. Request for 512 bytes > // alignment for each sg list >- raid_dev->sg_pool_handle = pci_pool_create("megaraid mbox sg", >- adapter->pdev, >+ raid_dev->sg_pool_handle = dma_pool_create("megaraid mbox sg", >+ >pdev->dev, > sizeof(mbox_sgl64) * >MBOX_MAX_SG_SIZE, > 512, 0); > >@@ -1213,7 +1213,7 @@ megaraid_mbox_setup_dma_pools(adapter_t >*adapter) > > sg_pci_blk = raid_dev->sg_pool; > for (i = 0; i < MBOX_MAX_SCSI_CMDS; i++) { >- sg_pci_blk[i].vaddr = pci_pool_alloc( >+ sg_pci_blk[i].vaddr = dma_pool_alloc( > raid_dev->sg_pool_handle, > GFP_KERNEL, > _pci_blk[i].dma_addr); >@@ -1249,29 +1249,26 @@ megaraid_mbox_teardown_dma_pools(adapter_t >*adapter) > > sg_pci_blk = raid_dev->sg_pool; > for (i = 0; i < MBOX_MAX_SCSI_CMDS && sg_pci_blk[i].vaddr; i++) { >- pci_pool_free(raid_dev->sg_pool_handle, sg_pci_blk[i].vaddr, >+ dma_pool_free(raid_dev->sg_pool_handle, sg_pci_blk[i].vaddr, > sg_pci_blk[i].dma_addr); > } >- if (raid_dev->sg_pool_handle) >- pci_pool_destroy(raid_dev->sg_pool_handle); >+ dma_pool_destroy(raid_dev->sg_pool_handle); > > >