Commit e0ceb8f9 authored by Rob Herring's avatar Rob Herring Committed by Lorenzo Pieralisi
Browse files

PCI: dwc: meson: Use pci_ops for root config space accessors 

Now that DWC drivers can setup their own pci_ops for the root and child
buses, convert the Amlogic meson driver to use the standard pci_ops for
root bus config accesses.

Link: https://lore.kernel.org/r/20200821035420.380495-9-robh@kernel.org


Signed-off-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Yue Wang <yue.wang@Amlogic.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Kevin Hilman <khilman@baylibre.com>
Cc: linux-amlogic@lists.infradead.org
parent 692ccce7

drivers/pci/controller/dwc/pci-meson.c

+10 −13
Original line number Diff line number Diff line
@@ -383,13 +383,12 @@ static void meson_pcie_enable_interrupts(struct meson_pcie *mp) 
		dw_pcie_msi_init(&mp->pci.pp);

}



static int meson_pcie_rd_own_conf(struct pcie_port *pp, int where, int size,

				  u32 *val)

static int meson_pcie_rd_own_conf(struct pci_bus *bus, u32 devfn,

				  int where, int size, u32 *val)

{

	struct dw_pcie *pci = to_dw_pcie_from_pp(pp);

	int ret;



	ret = dw_pcie_read(pci->dbi_base + where, size, val);

	ret = pci_generic_config_read(bus, devfn, where, size, val);

	if (ret != PCIBIOS_SUCCESSFUL)

		return ret;
@@ -410,13 +409,11 @@ static int meson_pcie_rd_own_conf(struct pcie_port *pp, int where, int size, 
	return PCIBIOS_SUCCESSFUL;

}



static int meson_pcie_wr_own_conf(struct pcie_port *pp, int where,

				  int size, u32 val)

{

	struct dw_pcie *pci = to_dw_pcie_from_pp(pp);



	return dw_pcie_write(pci->dbi_base + where, size, val);

}

static struct pci_ops meson_pci_ops = {

	.map_bus = dw_pcie_own_conf_map_bus,

	.read = meson_pcie_rd_own_conf,

	.write = pci_generic_config_write,

};



static int meson_pcie_link_up(struct dw_pcie *pci)

{
@@ -463,6 +460,8 @@ static int meson_pcie_host_init(struct pcie_port *pp) 
	struct meson_pcie *mp = to_meson_pcie(pci);

	int ret;



	pp->bridge->ops = &meson_pci_ops;



	ret = meson_pcie_establish_link(mp);

	if (ret)

		return ret;
@@ -473,8 +472,6 @@ static int meson_pcie_host_init(struct pcie_port *pp) 
}



static const struct dw_pcie_host_ops meson_pcie_host_ops = {

	.rd_own_conf = meson_pcie_rd_own_conf,

	.wr_own_conf = meson_pcie_wr_own_conf,

	.host_init = meson_pcie_host_init,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE