diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c
index 110cd9f7f6eb..b73c43f1049d 100644
--- a/drivers/pci/controller/dwc/pcie-designware-host.c
+++ b/drivers/pci/controller/dwc/pcie-designware-host.c
@@ -373,9 +373,22 @@ int dw_pcie_host_init(struct pcie_port *pp)
 			msi_vaddr = dmam_alloc_coherent(dev, sizeof(u64), &pp->msi_data,
 							GFP_KERNEL);
 			if (!msi_vaddr) {
-				dev_err(dev, "Failed to alloc and map MSI data\n");
-				ret = -ENOMEM;
-				goto err_free_msi;
+				u16 msi_capabilities;
+
+				/* Retry the allocation with a 64-bit mask if supported. */
+				msi_capabilities = dw_pcie_msi_capabilities(pci);
+				if ((msi_capabilities & PCI_MSI_FLAGS_ENABLE) &&
+				    (msi_capabilities & PCI_MSI_FLAGS_64BIT)) {
+					dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64));
+					msi_vaddr = dmam_alloc_coherent(dev, sizeof(u64),
+									&pp->msi_data,
+									GFP_KERNEL);
+				}
+				if (!msi_vaddr) {
+					dev_err(dev, "Failed to alloc and map MSI data\n");
+					ret = -ENOMEM;
+					goto err_free_msi;
+				}
 			}
 		}
 	}
diff --git a/drivers/pci/controller/dwc/pcie-designware.c b/drivers/pci/controller/dwc/pcie-designware.c
index d92c8a25094f..161ab9d3f304 100644
--- a/drivers/pci/controller/dwc/pcie-designware.c
+++ b/drivers/pci/controller/dwc/pcie-designware.c
@@ -55,6 +55,14 @@ u8 dw_pcie_find_capability(struct dw_pcie *pci, u8 cap)
 }
 EXPORT_SYMBOL_GPL(dw_pcie_find_capability);
 
+u16 dw_pcie_msi_capabilities(struct dw_pcie *pci)
+{
+	u8 offset;
+
+	offset = dw_pcie_find_capability(pci, PCI_CAP_ID_MSI);
+	return dw_pcie_readw_dbi(pci, offset + PCI_MSI_FLAGS);
+}
+
 static u16 dw_pcie_find_next_ext_capability(struct dw_pcie *pci, u16 start,
 					    u8 cap)
 {
diff --git a/drivers/pci/controller/dwc/pcie-designware.h b/drivers/pci/controller/dwc/pcie-designware.h
index 5742f3d1d1f1..18fd16d60252 100644
--- a/drivers/pci/controller/dwc/pcie-designware.h
+++ b/drivers/pci/controller/dwc/pcie-designware.h
@@ -283,6 +283,7 @@ struct dw_pcie {
 
 u8 dw_pcie_find_capability(struct dw_pcie *pci, u8 cap);
 u16 dw_pcie_find_ext_capability(struct dw_pcie *pci, u8 cap);
+u16 dw_pcie_msi_capabilities(struct dw_pcie *pci);
 
 int dw_pcie_read(void __iomem *addr, int size, u32 *val);
 int dw_pcie_write(void __iomem *addr, int size, u32 val);