From: Aleksandr Bezzubikov Date: Tue, 18 Jul 2017 14:12:25 +0000 (+0300) Subject: PCI: shpchp: Enable bridge bus mastering if MSI is enabled X-Git-Tag: v4.14-rc1~87^2~7^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=48b79a14505349a29b3e20f03619ada9b33c4b17;p=thirdparty%2Fkernel%2Flinux.git PCI: shpchp: Enable bridge bus mastering if MSI is enabled An SHPC may generate MSIs to notify software about slot or controller events (SHPC spec r1.0, sec 4.7). A PCI device can only generate an MSI if it has bus mastering enabled. Enable bus mastering if the bridge contains an SHPC that uses MSI for event notifications. Signed-off-by: Aleksandr Bezzubikov [bhelgaas: changelog] Signed-off-by: Bjorn Helgaas Reviewed-by: Marcel Apfelbaum Acked-by: Michael S. Tsirkin Cc: stable@vger.kernel.org --- diff --git a/drivers/pci/hotplug/shpchp_hpc.c b/drivers/pci/hotplug/shpchp_hpc.c index de0ea474fb738..e5824c7b7b6b3 100644 --- a/drivers/pci/hotplug/shpchp_hpc.c +++ b/drivers/pci/hotplug/shpchp_hpc.c @@ -1062,6 +1062,8 @@ int shpc_init(struct controller *ctrl, struct pci_dev *pdev) if (rc) { ctrl_info(ctrl, "Can't get msi for the hotplug controller\n"); ctrl_info(ctrl, "Use INTx for the hotplug controller\n"); + } else { + pci_set_master(pdev); } rc = request_irq(ctrl->pci_dev->irq, shpc_isr, IRQF_SHARED,