From 778306b543497b1f84e9c5263ae9f324078c4e0d Mon Sep 17 00:00:00 2001 From: Will McVicker Date: Mon, 8 Aug 2022 20:41:01 +0000 Subject: [PATCH] Revert "ANDROID: PCI: dwc: revert dwc 32-bit DMA mask for MSI address requirement" This reverts commit 8f9f701b5c5abcdb4c13912a372983204f83980b. The proper fix was merged upstream in [1] and will come via the 5.20-rc1. [1] https://lore.kernel.org/lkml/20220525223316.388490-1-willmcvicker@google.com/T/ Signed-off-by: Will McVicker Change-Id: Iab788d4e32fd0fc42faff3c282c351f709f0f510 --- drivers/pci/controller/dwc/pcie-designware-host.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c index 854970d5bc6b..ef3f33d6a3b7 100644 --- a/drivers/pci/controller/dwc/pcie-designware-host.c +++ b/drivers/pci/controller/dwc/pcie-designware-host.c @@ -389,6 +389,10 @@ int dw_pcie_host_init(struct pcie_port *pp) dw_chained_msi_isr, pp); + ret = dma_set_mask(pci->dev, DMA_BIT_MASK(32)); + if (ret) + dev_warn(pci->dev, "Failed to set DMA mask to 32-bit. Devices with only 32-bit MSI support may not work properly\n"); + pp->msi_data = dma_map_single_attrs(pci->dev, &pp->msi_msg, sizeof(pp->msi_msg), DMA_FROM_DEVICE,