Merge "mhi: controller: qcom: always set 64bit dma mask" (dcf1748d) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/bus/mhi/controllers/mhi_arch_qcom.c

+1 −20

Original line number	Diff line number	Diff line
		@@ -364,25 +364,6 @@ static struct dma_iommu_mapping *mhi_arch_create_iommu_mapping(
		return arm_iommu_create_mapping(&pci_bus_type, base, size);
		}

		static int mhi_arch_dma_mask(struct mhi_controller *mhi_cntrl)
		{
		struct mhi_dev *mhi_dev = mhi_controller_get_devdata(mhi_cntrl);
		u32 smmu_cfg = mhi_dev->smmu_cfg;
		int mask = 0;

		if (!smmu_cfg) {
		mask = 64;
		} else {
		unsigned long size = mhi_dev->iova_stop + 1;

		/* for S1 bypass, iova not used set to max */
		mask = (smmu_cfg & MHI_SMMU_S1_BYPASS) ?
		64 : find_last_bit(&size, 64);
		}

		return dma_set_mask_and_coherent(mhi_cntrl->dev, DMA_BIT_MASK(mask));
		}

		int mhi_arch_iommu_init(struct mhi_controller *mhi_cntrl)
		{
		struct mhi_dev *mhi_dev = mhi_controller_get_devdata(mhi_cntrl);
		@@ -456,7 +437,7 @@ int mhi_arch_iommu_init(struct mhi_controller *mhi_cntrl)

		mhi_cntrl->dev = &mhi_dev->pci_dev->dev;

		ret = mhi_arch_dma_mask(mhi_cntrl);
		ret = dma_set_mask_and_coherent(mhi_cntrl->dev, DMA_BIT_MASK(64));
		if (ret) {
		MHI_ERR("Error setting dma mask, ret:%d\n", ret);
		goto release_device;