On Fri, Apr 06, 2018 at 04:55:35PM +0200, Thomas Petazzoni wrote:
> In other to mimic other PCIe host controller drivers, introduce an
> advk_pcie_valid_device() helper, used in the configuration read/write
> functions.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@xxxxxxxxxxx>
> ---
> Changes since v4:
> - Move later into the series, so that it doesn't need to be pushed as
> a fix for stable.
> Changes since v3:
> - Make the new helper return a bool instead of int
> Changes since v2:
> - New patch
> ---
> drivers/pci/host/pci-aardvark.c | 13 +++++++++++--
> 1 file changed, 11 insertions(+), 2 deletions(-)
Hi Thomas,
please rebase patch 5 (this patch) and 6 and resend, I will apply them
straight away, sorry for the delay.
Thanks,
Lorenzo
> diff --git a/drivers/pci/host/pci-aardvark.c b/drivers/pci/host/pci-aardvark.c
> index 9abf549631b4..69c4fd50947e 100644
> --- a/drivers/pci/host/pci-aardvark.c
> +++ b/drivers/pci/host/pci-aardvark.c
> @@ -431,6 +431,15 @@ static int advk_pcie_wait_pio(struct advk_pcie *pcie)
> return -ETIMEDOUT;
> }
>
> +static bool advk_pcie_valid_device(struct advk_pcie *pcie, struct pci_bus *bus,
> + int devfn)
> +{
> + if ((bus->number == pcie->root_bus_nr) && PCI_SLOT(devfn) != 0)
> + return false;
> +
> + return true;
> +}
> +
> static int advk_pcie_rd_conf(struct pci_bus *bus, u32 devfn,
> int where, int size, u32 *val)
> {
> @@ -438,7 +447,7 @@ static int advk_pcie_rd_conf(struct pci_bus *bus, u32 devfn,
> u32 reg;
> int ret;
>
> - if ((bus->number == pcie->root_bus_nr) && PCI_SLOT(devfn) != 0) {
> + if (!advk_pcie_valid_device(pcie, bus, devfn)) {
> *val = 0xffffffff;
> return PCIBIOS_DEVICE_NOT_FOUND;
> }
> @@ -492,7 +501,7 @@ static int advk_pcie_wr_conf(struct pci_bus *bus, u32 devfn,
> int offset;
> int ret;
>
> - if ((bus->number == pcie->root_bus_nr) && PCI_SLOT(devfn) != 0)
> + if (!advk_pcie_valid_device(pcie, bus, devfn))
> return PCIBIOS_DEVICE_NOT_FOUND;
>
> if (where % size)
> --
> 2.14.3
>
