| Message ID | 20180329083946.25970-2-thomas.petazzoni@bootlin.com |
|---|---|
| State | Superseded |
| Delegated to: | Lorenzo Pieralisi |
| Headers | show |
| Series | PCI: aardvark: misc fixes and improvements | expand |
On Thu, Mar 29, 2018 at 10:39:41AM +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. > > This patch by itself is not a fix, but it is required for a follow-up > patch that is a fix, hence the Fixes tag and the Cc to stable. Should not we just reshuffle patch 1 and 2 instead of sending this patch to stable ? I appreciate the merge window is open and timing is quite tight, it is just to avoid sending churn to stable kernels for not much. Thanks, Lorenzo > Fixes: 8c39d710363c1 ("PCI: aardvark: Add Aardvark PCI host controller driver") > Cc: <stable@vger.kernel.org> > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> > --- > 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(-) > > diff --git a/drivers/pci/host/pci-aardvark.c b/drivers/pci/host/pci-aardvark.c > index b04d37b3c5de..82bff709a4b3 100644 > --- a/drivers/pci/host/pci-aardvark.c > +++ b/drivers/pci/host/pci-aardvark.c > @@ -430,6 +430,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 (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) > { > @@ -437,7 +446,7 @@ static int advk_pcie_rd_conf(struct pci_bus *bus, u32 devfn, > u32 reg; > int ret; > > - if (PCI_SLOT(devfn) != 0) { > + if (!advk_pcie_valid_device(pcie, bus, devfn)) { > *val = 0xffffffff; > return PCIBIOS_DEVICE_NOT_FOUND; > } > @@ -491,7 +500,7 @@ static int advk_pcie_wr_conf(struct pci_bus *bus, u32 devfn, > int offset; > int ret; > > - if (PCI_SLOT(devfn) != 0) > + if (!advk_pcie_valid_device(pcie, bus, devfn)) > return PCIBIOS_DEVICE_NOT_FOUND; > > if (where % size) > -- > 2.14.3 >
Hello, On Wed, 4 Apr 2018 12:28:43 +0100, Lorenzo Pieralisi wrote: > On Thu, Mar 29, 2018 at 10:39:41AM +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. > > > > This patch by itself is not a fix, but it is required for a follow-up > > patch that is a fix, hence the Fixes tag and the Cc to stable. > > Should not we just reshuffle patch 1 and 2 instead of sending this > patch to stable ? I appreciate the merge window is open and timing is > quite tight, it is just to avoid sending churn to stable kernels > for not much. I can certainly do that, but it's actually Bjorn who asked in the first place to introduce the advk_pcie_valid_device() helper. I'll send a new patch series that has these reshuffled. Thanks, Thomas
On Fri, Apr 06, 2018 at 11:21:28AM +0200, Thomas Petazzoni wrote: > Hello, > > On Wed, 4 Apr 2018 12:28:43 +0100, Lorenzo Pieralisi wrote: > > On Thu, Mar 29, 2018 at 10:39:41AM +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. > > > > > > This patch by itself is not a fix, but it is required for a follow-up > > > patch that is a fix, hence the Fixes tag and the Cc to stable. > > > > Should not we just reshuffle patch 1 and 2 instead of sending this > > patch to stable ? I appreciate the merge window is open and timing is > > quite tight, it is just to avoid sending churn to stable kernels > > for not much. > > I can certainly do that, but it's actually Bjorn who asked in the first > place to introduce the advk_pcie_valid_device() helper. I did suggest [1] adding advk_pcie_valid_device() to match other drivers, but I don't care about the order of these patches. If it makes more sense to put the fix first for easier backporting to stable, that's fine with me. [1] https://lkml.kernel.org/r/20180110011136.GB157182@bhelgaas-glaptop.roam.corp.google.com
diff --git a/drivers/pci/host/pci-aardvark.c b/drivers/pci/host/pci-aardvark.c index b04d37b3c5de..82bff709a4b3 100644 --- a/drivers/pci/host/pci-aardvark.c +++ b/drivers/pci/host/pci-aardvark.c @@ -430,6 +430,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 (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) { @@ -437,7 +446,7 @@ static int advk_pcie_rd_conf(struct pci_bus *bus, u32 devfn, u32 reg; int ret; - if (PCI_SLOT(devfn) != 0) { + if (!advk_pcie_valid_device(pcie, bus, devfn)) { *val = 0xffffffff; return PCIBIOS_DEVICE_NOT_FOUND; } @@ -491,7 +500,7 @@ static int advk_pcie_wr_conf(struct pci_bus *bus, u32 devfn, int offset; int ret; - if (PCI_SLOT(devfn) != 0) + if (!advk_pcie_valid_device(pcie, bus, devfn)) return PCIBIOS_DEVICE_NOT_FOUND; if (where % size)
In other to mimic other PCIe host controller drivers, introduce an advk_pcie_valid_device() helper, used in the configuration read/write functions. This patch by itself is not a fix, but it is required for a follow-up patch that is a fix, hence the Fixes tag and the Cc to stable. Fixes: 8c39d710363c1 ("PCI: aardvark: Add Aardvark PCI host controller driver") Cc: <stable@vger.kernel.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> --- 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(-)