Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f036ae48 authored by Yijing Wang's avatar Yijing Wang Committed by Alex Shi
Browse files

PCI: designware: Save MSI controller in pci_sys_data 



Save MSI controller in pci_sys_data instead of assigning MSI controller
pointer to every PCI bus in .add_bus().

[bhelgaas: use dw_pcie_msi_chip, not dw_pcie_msi_controller]
Signed-off-by: default avatarYijing Wang <wangyijing@huawei.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
(cherry picked from commit 0815f957e1a4a676ddf88657a6d8b9eca15640ad)

Signed-off-by: default avatarAlex Shi <alex.shi@linaro.org>
parent 64b9adaf

drivers/pci/host/pcie-designware.c

+5 −11
Original line number Diff line number Diff line
@@ -501,6 +501,11 @@ int dw_pcie_host_init(struct pcie_port *pp) 
	val |= PORT_LOGIC_SPEED_CHANGE;

	dw_pcie_wr_own_conf(pp, PCIE_LINK_WIDTH_SPEED_CONTROL, 4, val);



#ifdef CONFIG_PCI_MSI

	dw_pcie_msi_chip.dev = pp->dev;

	dw_pci.msi_ctrl = &dw_pcie_msi_chip;

#endif



	dw_pci.nr_controllers = 1;

	dw_pci.private_data = (void **)&pp;
@@ -750,21 +755,10 @@ static int dw_pcie_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) 
	return irq;

}



static void dw_pcie_add_bus(struct pci_bus *bus)

{

	if (IS_ENABLED(CONFIG_PCI_MSI)) {

		struct pcie_port *pp = sys_to_pcie(bus->sysdata);



		dw_pcie_msi_chip.dev = pp->dev;

		bus->msi = &dw_pcie_msi_chip;

	}

}



static struct hw_pci dw_pci = {

	.setup		= dw_pcie_setup,

	.scan		= dw_pcie_scan_bus,

	.map_irq	= dw_pcie_map_irq,

	.add_bus	= dw_pcie_add_bus,

};



void dw_pcie_setup_rc(struct pcie_port *pp)