Merge tag 'remove-dma_zalloc_coherent-5.0' of git://git.infradead.org/users/hch/dma-mapping

66c56cfa · Linus Torvalds <[email protected]> · 2019-01-12 10:52:40 -08:00

Pull dma_zalloc_coherent() removal from Christoph Hellwig:
 "We've always had a weird situation around dma_zalloc_coherent. To
  safely support mapping the allocations to userspace major
  architectures like x86 and arm have always zeroed allocations from
  dma_alloc_coherent, but a couple other architectures were missing that
  zeroing either always or in corner cases.

  Then later we grew anothe dma_zalloc_coherent interface to explicitly
  request zeroing, but that just added __GFP_ZERO to the allocation
  flags, which for some allocators that didn't end up using the page
  allocator ended up being a no-op and still not zeroing the
  allocations.

  So for this merge window I fixed up all remaining architectures to
  zero the memory in dma_alloc_coherent, and made dma_zalloc_coherent a
  no-op wrapper around dma_alloc_coherent, which fixes all of the above
  issues.

  dma_zalloc_coherent is now pointless and can go away, and Luis helped
  me writing a cocchinelle script and patch series to kill it, which I
  think we should apply now just after -rc1 to finally settle these
  issue"

* tag 'remove-dma_zalloc_coherent-5.0' of git://git.infradead.org/users/hch/dma-mapping:
  dma-mapping: remove dma_zalloc_coherent()
  cross-tree: phase out dma_zalloc_coherent() on headers
  cross-tree: phase out dma_zalloc_coherent()

Commit: 66c56cfa64d9dbb9efa8a06c1aece77e8d57ea19
Parents: 47334889 · dfd32cad

Merge commit. Changes below are compared with the first parent: 47334889.

Changes

179 files changed · +923 −975

File	Status	Add	Del	Content
arch/mips/lantiq/xway/dma.c	modified	+3	−3	View file
arch/powerpc/platforms/pasemi/dma_lib.c	modified	+1	−1	View file
arch/powerpc/sysdev/fsl_rmu.c	modified	+4	−3	View file
drivers/ata/sata_fsl.c	modified	+2	−2	View file
drivers/atm/he.c	modified	+19	−20	View file
drivers/atm/idt77252.c	modified	+8	−8	View file
drivers/block/skd_main.c	modified	+2	−2	View file
drivers/crypto/amcc/crypto4xx_core.c	modified	+3	−3	View file
drivers/crypto/cavium/cpt/cptpf_main.c	modified	+2	−2	View file
drivers/crypto/cavium/cpt/cptvf_main.c	modified	+4	−3	View file
drivers/crypto/cavium/nitrox/nitrox_lib.c	modified	+3	−3	View file
drivers/crypto/ccp/ccp-dev-v5.c	modified	+3	−3	View file
drivers/crypto/hisilicon/sec/sec_algs.c	modified	+2	−2	View file
drivers/crypto/hisilicon/sec/sec_drv.c	modified	+6	−9	View file
drivers/crypto/ixp4xx_crypto.c	modified	+3	−3	View file
drivers/crypto/mediatek/mtk-platform.c	modified	+8	−8	View file
drivers/crypto/qat/qat_common/adf_admin.c	modified	+6	−6	View file
drivers/crypto/qat/qat_common/qat_algs.c	modified	+12	−12	View file
drivers/crypto/qat/qat_common/qat_asym_algs.c	modified	+34	−34	View file
drivers/dma/imx-sdma.c	modified	+4	−4	View file
drivers/dma/mediatek/mtk-hsdma.c	modified	+2	−2	View file
drivers/dma/mxs-dma.c	modified	+3	−3	View file
drivers/dma/xgene-dma.c	modified	+2	−2	View file
drivers/dma/xilinx/xilinx_dma.c	modified	+7	−7	View file
drivers/dma/xilinx/zynqmp_dma.c	modified	+3	−3	View file
drivers/gpu/drm/drm_pci.c	modified	+3	−2	View file
drivers/infiniband/hw/bnxt_re/qplib_rcfw.c	modified	+2	−2	View file
drivers/infiniband/hw/bnxt_re/qplib_res.c	modified	+4	−4	View file
drivers/infiniband/hw/cxgb3/cxio_hal.c	modified	+3	−3	View file
drivers/infiniband/hw/cxgb4/qp.c	modified	+2	−3	View file
drivers/infiniband/hw/hfi1/init.c	modified	+15	−14	View file
drivers/infiniband/hw/hfi1/pio.c	modified	+4	−5	View file
drivers/infiniband/hw/hfi1/sdma.c	modified	+9	−18	View file
drivers/infiniband/hw/hns/hns_roce_alloc.c	modified	+6	−5	View file
drivers/infiniband/hw/hns/hns_roce_hw_v2.c	modified	+5	−5	View file
drivers/infiniband/hw/i40iw/i40iw_utils.c	modified	+2	−2	View file
drivers/infiniband/hw/mthca/mthca_memfree.c	modified	+3	−2	View file
drivers/infiniband/hw/ocrdma/ocrdma_hw.c	modified	+7	−7	View file
drivers/infiniband/hw/ocrdma/ocrdma_stats.c	modified	+2	−2	View file
drivers/infiniband/hw/ocrdma/ocrdma_verbs.c	modified	+3	−3	View file
drivers/infiniband/hw/qedr/verbs.c	modified	+2	−2	View file
drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c	modified	+2	−2	View file
drivers/input/touchscreen/raspberrypi-ts.c	modified	+2	−2	View file
drivers/iommu/mtk_iommu_v1.c	modified	+2	−3	View file
drivers/media/pci/intel/ipu3/ipu3-cio2.c	modified	+2	−2	View file
drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c	modified	+1	−1	View file
drivers/misc/genwqe/card_utils.c	modified	+2	−2	View file
drivers/mmc/host/sdhci.c	modified	+3	−2	View file
drivers/net/ethernet/aeroflex/greth.c	modified	+6	−6	View file
drivers/net/ethernet/alacritech/slicoss.c	modified	+6	−6	View file
drivers/net/ethernet/amazon/ena/ena_com.c	modified	+31	−30	View file
drivers/net/ethernet/apm/xgene-v2/main.c	modified	+4	−4	View file
drivers/net/ethernet/atheros/alx/main.c	modified	+3	−4	View file
drivers/net/ethernet/atheros/atl1c/atl1c_main.c	modified	+2	−2	View file
drivers/net/ethernet/broadcom/bcm63xx_enet.c	modified	+4	−4	View file
drivers/net/ethernet/broadcom/bcmsysport.c	modified	+2	−2	View file
drivers/net/ethernet/broadcom/bgmac.c	modified	+6	−6	View file
drivers/net/ethernet/broadcom/bnx2.c	modified	+2	−2	View file
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h	modified	+1	−1	View file
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h	modified	+1	−1	View file
drivers/net/ethernet/broadcom/bnxt/bnxt.c	modified	+8	−8	View file
drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c	modified	+2	−2	View file
drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c	modified	+2	−2	View file
drivers/net/ethernet/broadcom/tg3.c	modified	+11	−11	View file
drivers/net/ethernet/cavium/thunder/nicvf_queues.c	modified	+1	−1	View file
drivers/net/ethernet/chelsio/cxgb3/sge.c	modified	+1	−1	View file
drivers/net/ethernet/chelsio/cxgb4/sge.c	modified	+1	−1	View file
drivers/net/ethernet/chelsio/cxgb4vf/sge.c	modified	+1	−1	View file
drivers/net/ethernet/emulex/benet/be_cmds.c	modified	+34	−34	View file
drivers/net/ethernet/emulex/benet/be_ethtool.c	modified	+9	−9	View file
drivers/net/ethernet/emulex/benet/be_main.c	modified	+9	−9	View file
drivers/net/ethernet/faraday/ftgmac100.c	modified	+6	−8	View file
drivers/net/ethernet/faraday/ftmac100.c	modified	+3	−4	View file
drivers/net/ethernet/hisilicon/hix5hd2_gmac.c	modified	+2	−2	View file
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c	modified	+2	−3	View file
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c	modified	+2	−3	View file
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c	modified	+2	−3	View file
drivers/net/ethernet/huawei/hinic/hinic_hw_api_cmd.c	modified	+8	−8	View file
drivers/net/ethernet/huawei/hinic/hinic_hw_eqs.c	modified	+4	−4	View file
drivers/net/ethernet/huawei/hinic/hinic_hw_io.c	modified	+3	−3	View file
drivers/net/ethernet/huawei/hinic/hinic_hw_qp.c	modified	+5	−5	View file
drivers/net/ethernet/huawei/hinic/hinic_hw_wq.c	modified	+4	−4	View file
drivers/net/ethernet/ibm/emac/mal.c	modified	+2	−2	View file
drivers/net/ethernet/intel/e1000/e1000_ethtool.c	modified	+4	−4	View file
drivers/net/ethernet/intel/e1000e/netdev.c	modified	+2	−2	View file
drivers/net/ethernet/intel/i40e/i40e_main.c	modified	+2	−2	View file
drivers/net/ethernet/intel/ixgb/ixgb_main.c	modified	+4	−4	View file
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c	modified	+3	−3	View file
drivers/net/ethernet/marvell/octeontx2/af/common.h	modified	+1	−1	View file
drivers/net/ethernet/marvell/pxa168_eth.c	modified	+9	−9	View file
drivers/net/ethernet/mediatek/mtk_eth_soc.c	modified	+9	−9	View file
drivers/net/ethernet/mellanox/mlx4/alloc.c	modified	+4	−4	View file
drivers/net/ethernet/mellanox/mlx5/core/alloc.c	modified	+2	−2	View file
drivers/net/ethernet/mellanox/mlx5/core/cmd.c	modified	+5	−5	View file
drivers/net/ethernet/myricom/myri10ge/myri10ge.c	modified	+3	−3	View file
drivers/net/ethernet/netronome/nfp/nfp_net_common.c	modified	+6	−6	View file
drivers/net/ethernet/ni/nixge.c	modified	+6	−6	View file
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c	modified	+6	−6	View file
drivers/net/ethernet/pasemi/pasemi_mac.c	modified	+3	−3	View file
drivers/net/ethernet/qlogic/qed/qed_cxt.c	modified	+8	−8	View file
drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c	modified	+14	−14	View file
drivers/net/ethernet/qualcomm/emac/emac-mac.c	modified	+1	−1	View file
drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c	modified	+6	−6	View file
drivers/net/ethernet/sfc/falcon/nic.c	modified	+2	−2	View file
drivers/net/ethernet/sfc/nic.c	modified	+2	−2	View file
drivers/net/ethernet/sgi/meth.c	modified	+2	−2	View file
drivers/net/ethernet/socionext/netsec.c	modified	+2	−2	View file
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	modified	+16	−24	View file
drivers/net/ethernet/tundra/tsi108_eth.c	modified	+4	−4	View file
drivers/net/ethernet/xilinx/ll_temac_main.c	modified	+6	−6	View file
drivers/net/ethernet/xilinx/xilinx_axienet_main.c	modified	+6	−6	View file
drivers/net/fddi/defxx.c	modified	+3	−3	View file
drivers/net/fddi/skfp/skfddi.c	modified	+4	−4	View file
drivers/net/vmxnet3/vmxnet3_drv.c	modified	+4	−4	View file
drivers/net/wan/fsl_ucc_hdlc.c	modified	+3	−4	View file
drivers/net/wireless/ath/ath10k/ce.c	modified	+3	−4	View file
drivers/net/wireless/ath/ath10k/mac.c	modified	+4	−4	View file
drivers/net/wireless/ath/ath10k/pci.c	modified	+1	−2	View file
drivers/net/wireless/ath/ath10k/wmi.c	modified	+1	−1	View file
drivers/net/wireless/ath/wcn36xx/dxe.c	modified	+8	−9	View file
drivers/net/wireless/ath/wil6210/txrx_edma.c	modified	+4	−4	View file
drivers/net/wireless/broadcom/b43/dma.c	modified	+3	−3	View file
drivers/net/wireless/broadcom/b43legacy/dma.c	modified	+3	−3	View file
drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c	modified	+8	−8	View file
drivers/net/wireless/intel/iwlwifi/pcie/rx.c	modified	+15	−24	View file
drivers/net/wireless/ralink/rt2x00/rt2x00mmio.c	modified	+3	−3	View file
drivers/ntb/hw/mscc/ntb_hw_switchtec.c	modified	+4	−4	View file
drivers/nvme/host/pci.c	modified	+4	−4	View file
drivers/pci/controller/pcie-iproc-msi.c	modified	+3	−3	View file
drivers/pci/switch/switchtec.c	modified	+4	−4	View file
drivers/rapidio/devices/tsi721.c	modified	+11	−11	View file
drivers/rapidio/devices/tsi721_dma.c	modified	+4	−4	View file
drivers/s390/net/ism_drv.c	modified	+7	−8	View file
drivers/scsi/3w-sas.c	modified	+3	−2	View file
drivers/scsi/a100u2w.c	modified	+4	−4	View file
drivers/scsi/arcmsr/arcmsr_hba.c	modified	+12	−6	View file
drivers/scsi/be2iscsi/be_main.c	modified	+2	−2	View file
drivers/scsi/be2iscsi/be_mgmt.c	modified	+5	−6	View file
drivers/scsi/bfa/bfad_bsg.c	modified	+3	−3	View file
drivers/scsi/bnx2fc/bnx2fc_hwi.c	modified	+24	−25	View file
drivers/scsi/bnx2fc/bnx2fc_tgt.c	modified	+22	−22	View file
drivers/scsi/bnx2i/bnx2i_hwi.c	modified	+4	−4	View file
drivers/scsi/csiostor/csio_wr.c	modified	+2	−2	View file
drivers/scsi/lpfc/lpfc_bsg.c	modified	+2	−2	View file
drivers/scsi/lpfc/lpfc_init.c	modified	+7	−7	View file
drivers/scsi/lpfc/lpfc_mbox.c	modified	+3	−3	View file
drivers/scsi/lpfc/lpfc_sli.c	modified	+7	−8	View file
drivers/scsi/megaraid/megaraid_mbox.c	modified	+8	−7	View file
drivers/scsi/megaraid/megaraid_sas_base.c	modified	+13	−13	View file
drivers/scsi/megaraid/megaraid_sas_fusion.c	modified	+3	−2	View file
drivers/scsi/mesh.c	modified	+3	−2	View file
drivers/scsi/mvumi.c	modified	+5	−4	View file
drivers/scsi/pm8001/pm8001_sas.c	modified	+2	−2	View file
drivers/scsi/qedf/qedf_main.c	modified	+17	−12	View file
drivers/scsi/qedi/qedi_main.c	modified	+19	−20	View file
drivers/scsi/qla2xxx/qla_attr.c	modified	+2	−2	View file
drivers/scsi/qla2xxx/qla_bsg.c	modified	+2	−2	View file
drivers/scsi/qla2xxx/qla_gs.c	modified	+8	−6	View file
drivers/scsi/qla2xxx/qla_init.c	modified	+4	−4	View file
drivers/scsi/qla4xxx/ql4_init.c	modified	+2	−2	View file
drivers/scsi/qla4xxx/ql4_mbx.c	modified	+9	−9	View file
drivers/scsi/qla4xxx/ql4_nx.c	modified	+2	−2	View file
drivers/scsi/qla4xxx/ql4_os.c	modified	+5	−5	View file
drivers/scsi/smartpqi/smartpqi_init.c	modified	+16	−16	View file
drivers/soc/fsl/qbman/dpaa_sys.c	modified	+1	−1	View file
drivers/spi/spi-pic32-sqi.c	modified	+3	−3	View file
drivers/staging/mt7621-eth/mtk_eth_soc.c	modified	+1	−2	View file
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c	modified	+2	−4	View file
drivers/staging/vt6655/device_main.c	modified	+6	−13	View file
drivers/usb/gadget/udc/bdc/bdc_core.c	modified	+6	−7	View file
drivers/usb/host/uhci-hcd.c	modified	+3	−3	View file
drivers/usb/host/xhci-mem.c	modified	+4	−4	View file
drivers/video/fbdev/da8xx-fb.c	modified	+3	−3	View file
include/linux/dma-mapping.h	modified	+0	−9	View file
include/linux/pci-dma-compat.h	modified	+1	−1	View file
scripts/coccinelle/api/alloc/alloc_cast.cocci	modified	+4	−4	View file
scripts/coccinelle/api/alloc/zalloc-simple.cocci	modified	+1	−10	View file
sound/aoa/soundbus/i2sbus/core.c	modified	+2	−2	View file
sound/sparc/dbri.c	modified	+2	−2	View file

Only the first 600 diff lines are shown. Download the complete patch.

arch/mips/lantiq/xway/dma.c

View file

diff --git a/arch/mips/lantiq/xway/dma.c b/arch/mips/lantiq/xway/dma.c
index 982859f..5e6a1a4 100644
--- a/arch/mips/lantiq/xway/dma.c
+++ b/arch/mips/lantiq/xway/dma.c
@@ -129,9 +129,9 @@ ltq_dma_alloc(struct ltq_dma_channel *ch)
 	unsigned long flags;
 
 	ch->desc = 0;
-	ch->desc_base = dma_zalloc_coherent(ch->dev,
-				LTQ_DESC_NUM * LTQ_DESC_SIZE,
-				&ch->phys, GFP_ATOMIC);
+	ch->desc_base = dma_alloc_coherent(ch->dev,
+					   LTQ_DESC_NUM * LTQ_DESC_SIZE,
+					   &ch->phys, GFP_ATOMIC);
 
 	spin_lock_irqsave(&ltq_dma_lock, flags);
 	ltq_dma_w32(ch->nr, LTQ_DMA_CS);

arch/powerpc/platforms/pasemi/dma_lib.c

View file

diff --git a/arch/powerpc/platforms/pasemi/dma_lib.c b/arch/powerpc/platforms/pasemi/dma_lib.c
index d18d164..bdf9b71 100644
--- a/arch/powerpc/platforms/pasemi/dma_lib.c
+++ b/arch/powerpc/platforms/pasemi/dma_lib.c
@@ -255,7 +255,7 @@ int pasemi_dma_alloc_ring(struct pasemi_dmachan *chan, int ring_size)
 
 	chan->ring_size = ring_size;
 
-	chan->ring_virt = dma_zalloc_coherent(&dma_pdev->dev,
+	chan->ring_virt = dma_alloc_coherent(&dma_pdev->dev,
 					     ring_size * sizeof(u64),
 					     &chan->ring_dma, GFP_KERNEL);
 

arch/powerpc/sysdev/fsl_rmu.c

View file

diff --git a/arch/powerpc/sysdev/fsl_rmu.c b/arch/powerpc/sysdev/fsl_rmu.c
index 8b0ebf3..ebed46f 100644
--- a/arch/powerpc/sysdev/fsl_rmu.c
+++ b/arch/powerpc/sysdev/fsl_rmu.c
@@ -756,9 +756,10 @@ fsl_open_outb_mbox(struct rio_mport *mport, void *dev_id, int mbox, int entries)
 	}
 
 	/* Initialize outbound message descriptor ring */
-	rmu->msg_tx_ring.virt = dma_zalloc_coherent(priv->dev,
-				rmu->msg_tx_ring.size * RIO_MSG_DESC_SIZE,
-				&rmu->msg_tx_ring.phys, GFP_KERNEL);
+	rmu->msg_tx_ring.virt = dma_alloc_coherent(priv->dev,
+						   rmu->msg_tx_ring.size * RIO_MSG_DESC_SIZE,
+						   &rmu->msg_tx_ring.phys,
+						   GFP_KERNEL);
 	if (!rmu->msg_tx_ring.virt) {
 		rc = -ENOMEM;
 		goto out_dma;

drivers/ata/sata_fsl.c

View file

diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c
index 4dc528b..9c1247d 100644
--- a/drivers/ata/sata_fsl.c
+++ b/drivers/ata/sata_fsl.c
@@ -729,8 +729,8 @@ static int sata_fsl_port_start(struct ata_port *ap)
 	if (!pp)
 		return -ENOMEM;
 
-	mem = dma_zalloc_coherent(dev, SATA_FSL_PORT_PRIV_DMA_SZ, &mem_dma,
-				  GFP_KERNEL);
+	mem = dma_alloc_coherent(dev, SATA_FSL_PORT_PRIV_DMA_SZ, &mem_dma,
+				 GFP_KERNEL);
 	if (!mem) {
 		kfree(pp);
 		return -ENOMEM;

drivers/atm/he.c

View file

diff --git a/drivers/atm/he.c b/drivers/atm/he.c
index 29f102d..2e9d1cf 100644
--- a/drivers/atm/he.c
+++ b/drivers/atm/he.c
@@ -533,9 +533,10 @@ static void he_init_tx_lbfp(struct he_dev *he_dev)
 
 static int he_init_tpdrq(struct he_dev *he_dev)
 {
-	he_dev->tpdrq_base = dma_zalloc_coherent(&he_dev->pci_dev->dev,
-						 CONFIG_TPDRQ_SIZE * sizeof(struct he_tpdrq),
-						 &he_dev->tpdrq_phys, GFP_KERNEL);
+	he_dev->tpdrq_base = dma_alloc_coherent(&he_dev->pci_dev->dev,
+						CONFIG_TPDRQ_SIZE * sizeof(struct he_tpdrq),
+						&he_dev->tpdrq_phys,
+						GFP_KERNEL);
 	if (he_dev->tpdrq_base == NULL) {
 		hprintk("failed to alloc tpdrq\n");
 		return -ENOMEM;
@@ -805,9 +806,9 @@ static int he_init_group(struct he_dev *he_dev, int group)
 		goto out_free_rbpl_virt;
 	}
 
-	he_dev->rbpl_base = dma_zalloc_coherent(&he_dev->pci_dev->dev,
-						CONFIG_RBPL_SIZE * sizeof(struct he_rbp),
-						&he_dev->rbpl_phys, GFP_KERNEL);
+	he_dev->rbpl_base = dma_alloc_coherent(&he_dev->pci_dev->dev,
+					       CONFIG_RBPL_SIZE * sizeof(struct he_rbp),
+					       &he_dev->rbpl_phys, GFP_KERNEL);
 	if (he_dev->rbpl_base == NULL) {
 		hprintk("failed to alloc rbpl_base\n");
 		goto out_destroy_rbpl_pool;
@@ -844,9 +845,9 @@ static int he_init_group(struct he_dev *he_dev, int group)
 
 	/* rx buffer ready queue */
 
-	he_dev->rbrq_base = dma_zalloc_coherent(&he_dev->pci_dev->dev,
-						CONFIG_RBRQ_SIZE * sizeof(struct he_rbrq),
-						&he_dev->rbrq_phys, GFP_KERNEL);
+	he_dev->rbrq_base = dma_alloc_coherent(&he_dev->pci_dev->dev,
+					       CONFIG_RBRQ_SIZE * sizeof(struct he_rbrq),
+					       &he_dev->rbrq_phys, GFP_KERNEL);
 	if (he_dev->rbrq_base == NULL) {
 		hprintk("failed to allocate rbrq\n");
 		goto out_free_rbpl;
@@ -868,9 +869,9 @@ static int he_init_group(struct he_dev *he_dev, int group)
 
 	/* tx buffer ready queue */
 
-	he_dev->tbrq_base = dma_zalloc_coherent(&he_dev->pci_dev->dev,
-						CONFIG_TBRQ_SIZE * sizeof(struct he_tbrq),
-						&he_dev->tbrq_phys, GFP_KERNEL);
+	he_dev->tbrq_base = dma_alloc_coherent(&he_dev->pci_dev->dev,
+					       CONFIG_TBRQ_SIZE * sizeof(struct he_tbrq),
+					       &he_dev->tbrq_phys, GFP_KERNEL);
 	if (he_dev->tbrq_base == NULL) {
 		hprintk("failed to allocate tbrq\n");
 		goto out_free_rbpq_base;
@@ -913,11 +914,9 @@ static int he_init_irq(struct he_dev *he_dev)
 	/* 2.9.3.5  tail offset for each interrupt queue is located after the
 		    end of the interrupt queue */
 
-	he_dev->irq_base = dma_zalloc_coherent(&he_dev->pci_dev->dev,
-					       (CONFIG_IRQ_SIZE + 1)
-					       * sizeof(struct he_irq),
-					       &he_dev->irq_phys,
-					       GFP_KERNEL);
+	he_dev->irq_base = dma_alloc_coherent(&he_dev->pci_dev->dev,
+					      (CONFIG_IRQ_SIZE + 1) * sizeof(struct he_irq),
+					      &he_dev->irq_phys, GFP_KERNEL);
 	if (he_dev->irq_base == NULL) {
 		hprintk("failed to allocate irq\n");
 		return -ENOMEM;
@@ -1464,9 +1463,9 @@ static int he_start(struct atm_dev *dev)
 
 	/* host status page */
 
-	he_dev->hsp = dma_zalloc_coherent(&he_dev->pci_dev->dev,
-					  sizeof(struct he_hsp),
-					  &he_dev->hsp_phys, GFP_KERNEL);
+	he_dev->hsp = dma_alloc_coherent(&he_dev->pci_dev->dev,
+					 sizeof(struct he_hsp),
+					 &he_dev->hsp_phys, GFP_KERNEL);
 	if (he_dev->hsp == NULL) {
 		hprintk("failed to allocate host status page\n");
 		return -ENOMEM;

drivers/atm/idt77252.c

View file

diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
index 6e73714..43a1457 100644
--- a/drivers/atm/idt77252.c
+++ b/drivers/atm/idt77252.c
@@ -641,8 +641,8 @@ alloc_scq(struct idt77252_dev *card, int class)
 	scq = kzalloc(sizeof(struct scq_info), GFP_KERNEL);
 	if (!scq)
 		return NULL;
-	scq->base = dma_zalloc_coherent(&card->pcidev->dev, SCQ_SIZE,
-					&scq->paddr, GFP_KERNEL);
+	scq->base = dma_alloc_coherent(&card->pcidev->dev, SCQ_SIZE,
+				       &scq->paddr, GFP_KERNEL);
 	if (scq->base == NULL) {
 		kfree(scq);
 		return NULL;
@@ -971,8 +971,8 @@ init_rsq(struct idt77252_dev *card)
 {
 	struct rsq_entry *rsqe;
 
-	card->rsq.base = dma_zalloc_coherent(&card->pcidev->dev, RSQSIZE,
-					     &card->rsq.paddr, GFP_KERNEL);
+	card->rsq.base = dma_alloc_coherent(&card->pcidev->dev, RSQSIZE,
+					    &card->rsq.paddr, GFP_KERNEL);
 	if (card->rsq.base == NULL) {
 		printk("%s: can't allocate RSQ.\n", card->name);
 		return -1;
@@ -3390,10 +3390,10 @@ static int init_card(struct atm_dev *dev)
 	writel(0, SAR_REG_GP);
 
 	/* Initialize RAW Cell Handle Register  */
-	card->raw_cell_hnd = dma_zalloc_coherent(&card->pcidev->dev,
-						 2 * sizeof(u32),
-						 &card->raw_cell_paddr,
-						 GFP_KERNEL);
+	card->raw_cell_hnd = dma_alloc_coherent(&card->pcidev->dev,
+						2 * sizeof(u32),
+						&card->raw_cell_paddr,
+						GFP_KERNEL);
 	if (!card->raw_cell_hnd) {
 		printk("%s: memory allocation failure.\n", card->name);
 		deinit_card(card);

drivers/block/skd_main.c

View file

diff --git a/drivers/block/skd_main.c b/drivers/block/skd_main.c
index a10d573..ab893a7 100644
--- a/drivers/block/skd_main.c
+++ b/drivers/block/skd_main.c
@@ -2641,8 +2641,8 @@ static int skd_cons_skcomp(struct skd_device *skdev)
 		"comp pci_alloc, total bytes %zd entries %d\n",
 		SKD_SKCOMP_SIZE, SKD_N_COMPLETION_ENTRY);
 
-	skcomp = dma_zalloc_coherent(&skdev->pdev->dev, SKD_SKCOMP_SIZE,
-				     &skdev->cq_dma_address, GFP_KERNEL);
+	skcomp = dma_alloc_coherent(&skdev->pdev->dev, SKD_SKCOMP_SIZE,
+				    &skdev->cq_dma_address, GFP_KERNEL);
 
 	if (skcomp == NULL) {
 		rc = -ENOMEM;

drivers/crypto/amcc/crypto4xx_core.c

View file

diff --git a/drivers/crypto/amcc/crypto4xx_core.c b/drivers/crypto/amcc/crypto4xx_core.c
index 63cb695..acf7988 100644
--- a/drivers/crypto/amcc/crypto4xx_core.c
+++ b/drivers/crypto/amcc/crypto4xx_core.c
@@ -283,9 +283,9 @@ static u32 crypto4xx_put_pd_to_pdr(struct crypto4xx_device *dev, u32 idx)
  */
 static u32 crypto4xx_build_gdr(struct crypto4xx_device *dev)
 {
-	dev->gdr = dma_zalloc_coherent(dev->core_dev->device,
-				       sizeof(struct ce_gd) * PPC4XX_NUM_GD,
-				       &dev->gdr_pa, GFP_ATOMIC);
+	dev->gdr = dma_alloc_coherent(dev->core_dev->device,
+				      sizeof(struct ce_gd) * PPC4XX_NUM_GD,
+				      &dev->gdr_pa, GFP_ATOMIC);
 	if (!dev->gdr)
 		return -ENOMEM;
 

drivers/crypto/cavium/cpt/cptpf_main.c

View file

diff --git a/drivers/crypto/cavium/cpt/cptpf_main.c b/drivers/crypto/cavium/cpt/cptpf_main.c
index 06ad85a..a876535 100644
--- a/drivers/crypto/cavium/cpt/cptpf_main.c
+++ b/drivers/crypto/cavium/cpt/cptpf_main.c
@@ -278,8 +278,8 @@ static int cpt_ucode_load_fw(struct cpt_device *cpt, const u8 *fw, bool is_ae)
 	mcode->num_cores = is_ae ? 6 : 10;
 
 	/*  Allocate DMAable space */
-	mcode->code = dma_zalloc_coherent(&cpt->pdev->dev, mcode->code_size,
-					  &mcode->phys_base, GFP_KERNEL);
+	mcode->code = dma_alloc_coherent(&cpt->pdev->dev, mcode->code_size,
+					 &mcode->phys_base, GFP_KERNEL);
 	if (!mcode->code) {
 		dev_err(dev, "Unable to allocate space for microcode");
 		ret = -ENOMEM;

drivers/crypto/cavium/cpt/cptvf_main.c

View file

diff --git a/drivers/crypto/cavium/cpt/cptvf_main.c b/drivers/crypto/cavium/cpt/cptvf_main.c
index 5c796ed..2ca431e 100644
--- a/drivers/crypto/cavium/cpt/cptvf_main.c
+++ b/drivers/crypto/cavium/cpt/cptvf_main.c
@@ -236,9 +236,10 @@ static int alloc_command_queues(struct cpt_vf *cptvf,
 
 			c_size = (rem_q_size > qcsize_bytes) ? qcsize_bytes :
 					rem_q_size;
-			curr->head = (u8 *)dma_zalloc_coherent(&pdev->dev,
-					  c_size + CPT_NEXT_CHUNK_PTR_SIZE,
-					  &curr->dma_addr, GFP_KERNEL);
+			curr->head = (u8 *)dma_alloc_coherent(&pdev->dev,
+							      c_size + CPT_NEXT_CHUNK_PTR_SIZE,
+							      &curr->dma_addr,
+							      GFP_KERNEL);
 			if (!curr->head) {
 				dev_err(&pdev->dev, "Command Q (%d) chunk (%d) allocation failed\n",
 					i, queue->nchunks);

drivers/crypto/cavium/nitrox/nitrox_lib.c

View file

diff --git a/drivers/crypto/cavium/nitrox/nitrox_lib.c b/drivers/crypto/cavium/nitrox/nitrox_lib.c
index 9138bae..4ace9bc 100644
--- a/drivers/crypto/cavium/nitrox/nitrox_lib.c
+++ b/drivers/crypto/cavium/nitrox/nitrox_lib.c
@@ -25,9 +25,9 @@ static int nitrox_cmdq_init(struct nitrox_cmdq *cmdq, int align_bytes)
 	struct nitrox_device *ndev = cmdq->ndev;
 
 	cmdq->qsize = (ndev->qlen * cmdq->instr_size) + align_bytes;
-	cmdq->unalign_base = dma_zalloc_coherent(DEV(ndev), cmdq->qsize,
-						 &cmdq->unalign_dma,
-						 GFP_KERNEL);
+	cmdq->unalign_base = dma_alloc_coherent(DEV(ndev), cmdq->qsize,
+						&cmdq->unalign_dma,
+						GFP_KERNEL);
 	if (!cmdq->unalign_base)
 		return -ENOMEM;
 

drivers/crypto/ccp/ccp-dev-v5.c

View file

diff --git a/drivers/crypto/ccp/ccp-dev-v5.c b/drivers/crypto/ccp/ccp-dev-v5.c
index 44a4d27..c9bfd4f 100644
--- a/drivers/crypto/ccp/ccp-dev-v5.c
+++ b/drivers/crypto/ccp/ccp-dev-v5.c
@@ -822,9 +822,9 @@ static int ccp5_init(struct ccp_device *ccp)
 		/* Page alignment satisfies our needs for N <= 128 */
 		BUILD_BUG_ON(COMMANDS_PER_QUEUE > 128);
 		cmd_q->qsize = Q_SIZE(Q_DESC_SIZE);
-		cmd_q->qbase = dma_zalloc_coherent(dev, cmd_q->qsize,
-						   &cmd_q->qbase_dma,
-						   GFP_KERNEL);
+		cmd_q->qbase = dma_alloc_coherent(dev, cmd_q->qsize,
+						  &cmd_q->qbase_dma,
+						  GFP_KERNEL);
 		if (!cmd_q->qbase) {
 			dev_err(dev, "unable to allocate command queue\n");
 			ret = -ENOMEM;

drivers/crypto/hisilicon/sec/sec_algs.c

View file

diff --git a/drivers/crypto/hisilicon/sec/sec_algs.c b/drivers/crypto/hisilicon/sec/sec_algs.c
index cdc4f9a..adc0cd8 100644
--- a/drivers/crypto/hisilicon/sec/sec_algs.c
+++ b/drivers/crypto/hisilicon/sec/sec_algs.c
@@ -241,8 +241,8 @@ static int sec_alg_skcipher_setkey(struct crypto_skcipher *tfm,
 		memset(ctx->key, 0, SEC_MAX_CIPHER_KEY);
 	} else {
 		/* new key */
-		ctx->key = dma_zalloc_coherent(dev, SEC_MAX_CIPHER_KEY,
-					       &ctx->pkey, GFP_KERNEL);
+		ctx->key = dma_alloc_coherent(dev, SEC_MAX_CIPHER_KEY,
+					      &ctx->pkey, GFP_KERNEL);
 		if (!ctx->key) {
 			mutex_unlock(&ctx->lock);
 			return -ENOMEM;

drivers/crypto/hisilicon/sec/sec_drv.c

View file

diff --git a/drivers/crypto/hisilicon/sec/sec_drv.c b/drivers/crypto/hisilicon/sec/sec_drv.c
index c1ee4e7..91ee2bb 100644
--- a/drivers/crypto/hisilicon/sec/sec_drv.c
+++ b/drivers/crypto/hisilicon/sec/sec_drv.c
@@ -1082,9 +1082,8 @@ static int sec_queue_res_cfg(struct sec_queue *queue)
 	struct sec_queue_ring_db *ring_db = &queue->ring_db;
 	int ret;
 
-	ring_cmd->vaddr = dma_zalloc_coherent(dev, SEC_Q_CMD_SIZE,
-					      &ring_cmd->paddr,
-					      GFP_KERNEL);
+	ring_cmd->vaddr = dma_alloc_coherent(dev, SEC_Q_CMD_SIZE,
+					     &ring_cmd->paddr, GFP_KERNEL);
 	if (!ring_cmd->vaddr)
 		return -ENOMEM;
 
@@ -1092,17 +1091,15 @@ static int sec_queue_res_cfg(struct sec_queue *queue)
 	mutex_init(&ring_cmd->lock);
 	ring_cmd->callback = sec_alg_callback;
 
-	ring_cq->vaddr = dma_zalloc_coherent(dev, SEC_Q_CQ_SIZE,
-					     &ring_cq->paddr,
-					     GFP_KERNEL);
+	ring_cq->vaddr = dma_alloc_coherent(dev, SEC_Q_CQ_SIZE,
+					    &ring_cq->paddr, GFP_KERNEL);
 	if (!ring_cq->vaddr) {
 		ret = -ENOMEM;
 		goto err_free_ring_cmd;
 	}
 
-	ring_db->vaddr = dma_zalloc_coherent(dev, SEC_Q_DB_SIZE,
-					     &ring_db->paddr,
-					     GFP_KERNEL);
+	ring_db->vaddr = dma_alloc_coherent(dev, SEC_Q_DB_SIZE,
+					    &ring_db->paddr, GFP_KERNEL);
 	if (!ring_db->vaddr) {
 		ret = -ENOMEM;
 		goto err_free_ring_cq;

drivers/crypto/ixp4xx_crypto.c

View file

diff --git a/drivers/crypto/ixp4xx_crypto.c b/drivers/crypto/ixp4xx_crypto.c
index 19fba99..1b0d156 100644
--- a/drivers/crypto/ixp4xx_crypto.c
+++ b/drivers/crypto/ixp4xx_crypto.c
@@ -260,9 +260,9 @@ static int setup_crypt_desc(void)
 {
 	struct device *dev = &pdev->dev;
 	BUILD_BUG_ON(sizeof(struct crypt_ctl) != 64);
-	crypt_virt = dma_zalloc_coherent(dev,
-					 NPE_QLEN * sizeof(struct crypt_ctl),
-					 &crypt_phys, GFP_ATOMIC);
+	crypt_virt = dma_alloc_coherent(dev,
+					NPE_QLEN * sizeof(struct crypt_ctl),
+					&crypt_phys, GFP_ATOMIC);
 	if (!crypt_virt)
 		return -ENOMEM;
 	return 0;

drivers/crypto/mediatek/mtk-platform.c

View file

diff --git a/drivers/crypto/mediatek/mtk-platform.c b/drivers/crypto/mediatek/mtk-platform.c
index ee0404e..5660e5e 100644
--- a/drivers/crypto/mediatek/mtk-platform.c
+++ b/drivers/crypto/mediatek/mtk-platform.c
@@ -453,17 +453,17 @@ static int mtk_desc_ring_alloc(struct mtk_cryp *cryp)
 		if (!ring[i])
 			goto err_cleanup;
 
-		ring[i]->cmd_base = dma_zalloc_coherent(cryp->dev,
-					   MTK_DESC_RING_SZ,
-					   &ring[i]->cmd_dma,
-					   GFP_KERNEL);
+		ring[i]->cmd_base = dma_alloc_coherent(cryp->dev,
+						       MTK_DESC_RING_SZ,
+						       &ring[i]->cmd_dma,
+						       GFP_KERNEL);
 		if (!ring[i]->cmd_base)
 			goto err_cleanup;
 
-		ring[i]->res_base = dma_zalloc_coherent(cryp->dev,
-					   MTK_DESC_RING_SZ,
-					   &ring[i]->res_dma,
-					   GFP_KERNEL);
+		ring[i]->res_base = dma_alloc_coherent(cryp->dev,
+						       MTK_DESC_RING_SZ,
+						       &ring[i]->res_dma,
+						       GFP_KERNEL);
 		if (!ring[i]->res_base)
 			goto err_cleanup;
 

drivers/crypto/qat/qat_common/adf_admin.c

View file

diff --git a/drivers/crypto/qat/qat_common/adf_admin.c b/drivers/crypto/qat/qat_common/adf_admin.c
index 3744b22..d28cba3 100644
--- a/drivers/crypto/qat/qat_common/adf_admin.c
+++ b/drivers/crypto/qat/qat_common/adf_admin.c
@@ -244,18 +244,18 @@ int adf_init_admin_comms(struct adf_accel_dev *accel_dev)
 			     dev_to_node(&GET_DEV(accel_dev)));
 	if (!admin)
 		return -ENOMEM;
-	admin->virt_addr = dma_zalloc_coherent(&GET_DEV(accel_dev), PAGE_SIZE,
-					       &admin->phy_addr, GFP_KERNEL);
+	admin->virt_addr = dma_alloc_coherent(&GET_DEV(accel_dev), PAGE_SIZE,
+					      &admin->phy_addr, GFP_KERNEL);
 	if (!admin->virt_addr) {
 		dev_err(&GET_DEV(accel_dev), "Failed to allocate dma buff\n");
 		kfree(admin);
 		return -ENOMEM;
 	}
 
-	admin->virt_tbl_addr = dma_zalloc_coherent(&GET_DEV(accel_dev),
-						   PAGE_SIZE,
-						   &admin->const_tbl_addr,
-						   GFP_KERNEL);
+	admin->virt_tbl_addr = dma_alloc_coherent(&GET_DEV(accel_dev),
+						  PAGE_SIZE,
+						  &admin->const_tbl_addr,
+						  GFP_KERNEL);
 	if (!admin->virt_tbl_addr) {
 		dev_err(&GET_DEV(accel_dev), "Failed to allocate const_tbl\n");
 		dma_free_coherent(&GET_DEV(accel_dev), PAGE_SIZE,

drivers/crypto/qat/qat_common/qat_algs.c

View file

diff --git a/drivers/crypto/qat/qat_common/qat_algs.c b/drivers/crypto/qat/qat_common/qat_algs.c
index d269829..975c751 100644
--- a/drivers/crypto/qat/qat_common/qat_algs.c
+++ b/drivers/crypto/qat/qat_common/qat_algs.c
@@ -601,15 +601,15 @@ static int qat_alg_aead_setkey(struct crypto_aead *tfm, const uint8_t *key,
 
 		dev = &GET_DEV(inst->accel_dev);
 		ctx->inst = inst;
-		ctx->enc_cd = dma_zalloc_coherent(dev, sizeof(*ctx->enc_cd),
-						  &ctx->enc_cd_paddr,
-						  GFP_ATOMIC);
+		ctx->enc_cd = dma_alloc_coherent(dev, sizeof(*ctx->enc_cd),
+						 &ctx->enc_cd_paddr,
+						 GFP_ATOMIC);
 		if (!ctx->enc_cd) {
 			return -ENOMEM;
 		}
-		ctx->dec_cd = dma_zalloc_coherent(dev, sizeof(*ctx->dec_cd),
-						  &ctx->dec_cd_paddr,
-						  GFP_ATOMIC);
+		ctx->dec_cd = dma_alloc_coherent(dev, sizeof(*ctx->dec_cd),
+						 &ctx->dec_cd_paddr,
+						 GFP_ATOMIC);
 		if (!ctx->dec_cd) {
 			goto out_free_enc;
 		}
@@ -933,16 +933,16 @@ static int qat_alg_ablkcipher_setkey(struct crypto_ablkcipher *tfm,
 
 		dev = &GET_DEV(inst->accel_dev);
 		ctx->inst = inst;
-		ctx->enc_cd = dma_zalloc_coherent(dev, sizeof(*ctx->enc_cd),
-						  &ctx->enc_cd_paddr,
-						  GFP_ATOMIC);
+		ctx->enc_cd = dma_alloc_coherent(dev, sizeof(*ctx->enc_cd),
+						 &ctx->enc_cd_paddr,
+						 GFP_ATOMIC);
 		if (!ctx->enc_cd) {
 			spin_unlock(&ctx->lock);
 			return -ENOMEM;
 		}
-		ctx->dec_cd = dma_zalloc_coherent(dev, sizeof(*ctx->dec_cd),
-						  &ctx->dec_cd_paddr,
-						  GFP_ATOMIC);
+		ctx->dec_cd = dma_alloc_coherent(dev, sizeof(*ctx->dec_cd),
+						 &ctx->dec_cd_paddr,
+						 GFP_ATOMIC);
 		if (!ctx->dec_cd) {
 			spin_unlock(&ctx->lock);
 			goto out_free_enc;

drivers/crypto/qat/qat_common/qat_asym_algs.c

View file

diff --git a/drivers/crypto/qat/qat_common/qat_asym_algs.c b/drivers/crypto/qat/qat_common/qat_asym_algs.c
index 320e785..c9f3247 100644
--- a/drivers/crypto/qat/qat_common/qat_asym_algs.c
+++ b/drivers/crypto/qat/qat_common/qat_asym_algs.c
@@ -332,10 +332,10 @@ static int qat_dh_compute_value(struct kpp_request *req)
 		} else {
 			int shift = ctx->p_size - req->src_len;
 
-			qat_req->src_align = dma_zalloc_coherent(dev,
-								 ctx->p_size,
-								 &qat_req->in.dh.in.b,
-								 GFP_KERNEL);
+			qat_req->src_align = dma_alloc_coherent(dev,
+								ctx->p_size,
+								&qat_req->in.dh.in.b,
+								GFP_KERNEL);
 			if (unlikely(!qat_req->src_align))
 				return ret;
 
@@ -360,9 +360,9 @@ static int qat_dh_compute_value(struct kpp_request *req)
 			goto unmap_src;
 
 	} else {
-		qat_req->dst_align = dma_zalloc_coherent(dev, ctx->p_size,
-							 &qat_req->out.dh.r,
-							 GFP_KERNEL);
+		qat_req->dst_align = dma_alloc_coherent(dev, ctx->p_size,
+							&qat_req->out.dh.r,
+							GFP_KERNEL);
 		if (unlikely(!qat_req->dst_align))
 			goto unmap_src;
 	}
@@ -447,7 +447,7 @@ static int qat_dh_set_params(struct qat_dh_ctx *ctx, struct dh *params)
 		return -EINVAL;
 
 	ctx->p_size = params->p_size;
-	ctx->p = dma_zalloc_coherent(dev, ctx->p_size, &ctx->dma_p, GFP_KERNEL);
+	ctx->p = dma_alloc_coherent(dev, ctx->p_size, &ctx->dma_p, GFP_KERNEL);
 	if (!ctx->p)
 		return -ENOMEM;
 	memcpy(ctx->p, params->p, ctx->p_size);
@@ -458,7 +458,7 @@ static int qat_dh_set_params(struct qat_dh_ctx *ctx, struct dh *params)
 		return 0;
 	}
 
-	ctx->g = dma_zalloc_coherent(dev, ctx->p_size, &ctx->dma_g, GFP_KERNEL);
+	ctx->g = dma_alloc_coherent(dev, ctx->p_size, &ctx->dma_g, GFP_KERNEL);
 	if (!ctx->g)
 		return -ENOMEM;
 	memcpy(ctx->g + (ctx->p_size - params->g_size), params->g,
@@ -503,8 +503,8 @@ static int qat_dh_set_secret(struct crypto_kpp *tfm, const void *buf,
 	if (ret < 0)
 		goto err_clear_ctx;
 
-	ctx->xa = dma_zalloc_coherent(dev, ctx->p_size, &ctx->dma_xa,
-				      GFP_KERNEL);
+	ctx->xa = dma_alloc_coherent(dev, ctx->p_size, &ctx->dma_xa,
+				     GFP_KERNEL);
 	if (!ctx->xa) {
 		ret = -ENOMEM;
 		goto err_clear_ctx;
@@ -737,9 +737,9 @@ static int qat_rsa_enc(struct akcipher_request *req)
 	} else {
 		int shift = ctx->key_sz - req->src_len;
 
-		qat_req->src_align = dma_zalloc_coherent(dev, ctx->key_sz,
-							 &qat_req->in.rsa.enc.m,
-							 GFP_KERNEL);
+		qat_req->src_align = dma_alloc_coherent(dev, ctx->key_sz,
+							&qat_req->in.rsa.enc.m,
+							GFP_KERNEL);
 		if (unlikely(!qat_req->src_align))
 			return ret;
 
@@ -756,9 +756,9 @@ static int qat_rsa_enc(struct akcipher_request *req)
 			goto unmap_src;
 
 	} else {
-		qat_req->dst_align = dma_zalloc_coherent(dev, ctx->key_sz,
-							 &qat_req->out.rsa.enc.c,
-							 GFP_KERNEL);
+		qat_req->dst_align = dma_alloc_coherent(dev, ctx->key_sz,
+							&qat_req->out.rsa.enc.c,
+							GFP_KERNEL);
 		if (unlikely(!qat_req->dst_align))
 			goto unmap_src;
 
@@ -881,9 +881,9 @@ static int qat_rsa_dec(struct akcipher_request *req)
 	} else {
 		int shift = ctx->key_sz - req->src_len;
 
-		qat_req->src_align = dma_zalloc_coherent(dev, ctx->key_sz,
-							 &qat_req->in.rsa.dec.c,
-							 GFP_KERNEL);
+		qat_req->src_align = dma_alloc_coherent(dev, ctx->key_sz,
+							&qat_req->in.rsa.dec.c,
+							GFP_KERNEL);
 		if (unlikely(!qat_req->src_align))
 			return ret;
 
@@ -900,9 +900,9 @@ static int qat_rsa_dec(struct akcipher_request *req)
 			goto unmap_src;
 
 	} else {
-		qat_req->dst_align = dma_zalloc_coherent(dev, ctx->key_sz,
-							 &qat_req->out.rsa.dec.m,
-							 GFP_KERNEL);
+		qat_req->dst_align = dma_alloc_coherent(dev, ctx->key_sz,
+							&qat_req->out.rsa.dec.m,
+							GFP_KERNEL);
 		if (unlikely(!qat_req->dst_align))
 			goto unmap_src;
 
@@ -989,7 +989,7 @@ static int qat_rsa_set_n(struct qat_rsa_ctx *ctx, const char *value,
 		goto err;
 
 	ret = -ENOMEM;
-	ctx->n = dma_zalloc_coherent(dev, ctx->key_sz, &ctx->dma_n, GFP_KERNEL);
+	ctx->n = dma_alloc_coherent(dev, ctx->key_sz, &ctx->dma_n, GFP_KERNEL);
 	if (!ctx->n)
 		goto err;
 
@@ -1018,7 +1018,7 @@ static int qat_rsa_set_e(struct qat_rsa_ctx *ctx, const char *value,
 		return -EINVAL;
 	}
 
-	ctx->e = dma_zalloc_coherent(dev, ctx->key_sz, &ctx->dma_e, GFP_KERNEL);
+	ctx->e = dma_alloc_coherent(dev, ctx->key_sz, &ctx->dma_e, GFP_KERNEL);
 	if (!ctx->e)
 		return -ENOMEM;
 
@@ -1044,7 +1044,7 @@ static int qat_rsa_set_d(struct qat_rsa_ctx *ctx, const char *value,
 		goto err;
 