diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2022-06-15 10:23:25 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2022-06-15 10:23:25 -0500 |
commit | 909299c0202941dd79d446548987346f88225596 (patch) | |
tree | e9d1e93900d3c580d44aa9ec35e7e6dcbc72693c | |
parent | 8b2ded518b18dd1e7aad216b0a9ee412e1305660 (diff) | |
parent | 27235cd867cf7cd17e8d2384430dc54703419ffc (diff) | |
download | linux-next-909299c0202941dd79d446548987346f88225596.tar.gz |
Merge branch 'pci/ctrl/dwc'
- Allocate a 32-bit DMA-able page to be MSI target instead of using a
driver data structure that may not be addressable with 32-bit address
(Will McVicker)
* pci/ctrl/dwc:
PCI: dwc: Fix MSI msi_msg DMA mapping
-rw-r--r-- | drivers/pci/controller/dwc/pcie-designware-host.c | 14 | ||||
-rw-r--r-- | drivers/pci/controller/dwc/pcie-designware.h | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c index 9979302532b7..1e3972c487b5 100644 --- a/drivers/pci/controller/dwc/pcie-designware-host.c +++ b/drivers/pci/controller/dwc/pcie-designware-host.c @@ -267,8 +267,9 @@ static void dw_pcie_free_msi(struct pcie_port *pp) struct dw_pcie *pci = to_dw_pcie_from_pp(pp); struct device *dev = pci->dev; - dma_unmap_single_attrs(dev, pp->msi_data, sizeof(pp->msi_msg), - DMA_FROM_DEVICE, DMA_ATTR_SKIP_CPU_SYNC); + dma_unmap_page(dev, pp->msi_data, PAGE_SIZE, DMA_FROM_DEVICE); + if (pp->msi_page) + __free_page(pp->msi_page); } } @@ -392,13 +393,14 @@ int dw_pcie_host_init(struct pcie_port *pp) 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, - DMA_ATTR_SKIP_CPU_SYNC); + pp->msi_page = alloc_page(GFP_DMA32); + pp->msi_data = dma_map_page(pci->dev, pp->msi_page, 0, + PAGE_SIZE, DMA_FROM_DEVICE); ret = dma_mapping_error(pci->dev, pp->msi_data); if (ret) { dev_err(pci->dev, "Failed to map MSI data\n"); + __free_page(pp->msi_page); + pp->msi_page = NULL; pp->msi_data = 0; goto err_free_msi; } diff --git a/drivers/pci/controller/dwc/pcie-designware.h b/drivers/pci/controller/dwc/pcie-designware.h index 7d6e9b7576be..b5f528536358 100644 --- a/drivers/pci/controller/dwc/pcie-designware.h +++ b/drivers/pci/controller/dwc/pcie-designware.h @@ -190,8 +190,8 @@ struct pcie_port { int msi_irq; struct irq_domain *irq_domain; struct irq_domain *msi_domain; - u16 msi_msg; dma_addr_t msi_data; + struct page *msi_page; struct irq_chip *msi_irq_chip; u32 num_vectors; u32 irq_mask[MAX_MSI_CTRLS]; |