diff options
author | 2020-04-21 09:36:03 -0700 | |
---|---|---|
committer | 2020-04-21 09:36:03 -0700 | |
commit | 175ae3ad59ab3459652bd2ae3bbc1785aeba1bf3 (patch) | |
tree | c7fd682de61e3c2a6cc3ba0e8881b99fafdf969c /drivers/pci/controller/dwc/pci-keystone.c | |
parent | ARM: dts: OMAP3: disable RNG on N950/N9 (diff) | |
parent | ARM: dts: dra7: Fix bus_dma_limit for PCIe (diff) | |
download | wireguard-linux-175ae3ad59ab3459652bd2ae3bbc1785aeba1bf3.tar.xz wireguard-linux-175ae3ad59ab3459652bd2ae3bbc1785aeba1bf3.zip |
Merge branch 'fixes-v5.7' into fixes
Diffstat (limited to 'drivers/pci/controller/dwc/pci-keystone.c')
-rw-r--r-- | drivers/pci/controller/dwc/pci-keystone.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/controller/dwc/pci-keystone.c index c8c702c494a2..790679fdfa48 100644 --- a/drivers/pci/controller/dwc/pci-keystone.c +++ b/drivers/pci/controller/dwc/pci-keystone.c @@ -959,6 +959,9 @@ static int ks_pcie_am654_raise_irq(struct dw_pcie_ep *ep, u8 func_no, case PCI_EPC_IRQ_MSI: dw_pcie_ep_raise_msi_irq(ep, func_no, interrupt_num); break; + case PCI_EPC_IRQ_MSIX: + dw_pcie_ep_raise_msix_irq(ep, func_no, interrupt_num); + break; default: dev_err(pci->dev, "UNKNOWN IRQ type\n"); return -EINVAL; @@ -970,7 +973,7 @@ static int ks_pcie_am654_raise_irq(struct dw_pcie_ep *ep, u8 func_no, static const struct pci_epc_features ks_pcie_am654_epc_features = { .linkup_notifier = false, .msi_capable = true, - .msix_capable = false, + .msix_capable = true, .reserved_bar = 1 << BAR_0 | 1 << BAR_1, .bar_fixed_64bit = 1 << BAR_0, .bar_fixed_size[2] = SZ_1M, |