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

Commit 419c49fb authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drivers: crypto: Fix compilation errors"

parents 9c7152a7 03c5ed6b

arch/arm/configs/vendor/sdxprairie-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -266,6 +266,7 @@ CONFIG_RTC_CLASS=y 
CONFIG_DMADEVICES=y

CONFIG_UIO=y

CONFIG_STAGING=y

CONFIG_ION=y

CONFIG_SPS=y

CONFIG_SPS_SUPPORT_NDP_BAM=y

CONFIG_USB_BAM=y

arch/arm/configs/vendor/sdxprairie_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -257,6 +257,7 @@ CONFIG_RTC_CLASS=y 
CONFIG_DMADEVICES=y

CONFIG_UIO=y

CONFIG_STAGING=y

CONFIG_ION=y

CONFIG_SPS=y

CONFIG_SPS_SUPPORT_NDP_BAM=y

CONFIG_GSI_REGISTER_VERSION_2=y

drivers/crypto/msm/qce50.c

+1 −1
Original line number Diff line number Diff line
@@ -6013,7 +6013,7 @@ static int qce_smmu_init(struct qce_device *pce_dev) 
		dev->dma_parms = devm_kzalloc(dev,

				sizeof(*dev->dma_parms), GFP_KERNEL);

	dma_set_max_seg_size(dev, DMA_BIT_MASK(32));

	dma_set_seg_boundary(dev, DMA_BIT_MASK(64));

	dma_set_seg_boundary(dev, (unsigned long)DMA_BIT_MASK(64));



	pce_dev->smmu_mapping = mapping;

	return ret;

drivers/crypto/msm/qcedev_smmu.c

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ static int qcedev_setup_context_bank(struct context_bank_info *cb, 
		dev->dma_parms = devm_kzalloc(dev,

				sizeof(*dev->dma_parms), GFP_KERNEL);

	dma_set_max_seg_size(dev, DMA_BIT_MASK(32));

	dma_set_seg_boundary(dev, DMA_BIT_MASK(64));

	dma_set_seg_boundary(dev, (unsigned long)DMA_BIT_MASK(64));



	rc = arm_iommu_attach_device(cb->dev, cb->mapping);

	if (rc) {