From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
To: Bjorn Helgaas <bhelgaas@google.com>, linux-pci@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org,
"Nadav Haklai" <nadavh@marvell.com>,
"Victor Gu" <xigu@marvell.com>,
"Gregory Clement" <gregory.clement@bootlin.com>,
"Miquèl Raynal" <miquel.raynal@bootlin.com>,
"Maxime Chevallier" <maxime.chevallier@bootlin.com>,
"Antoine Tenart" <antoine.tenart@bootlin.com>,
"Thomas Petazzoni" <thomas.petazzoni@free-electrons.com>,
stable@vger.kernel.org
Subject: [PATCH v3 1/6] PCI: aardvark: introduce an advk_pcie_valid_device() helper
Date: Tue, 27 Mar 2018 16:08:07 +0200 [thread overview]
Message-ID: <20180327140819.23501-2-thomas.petazzoni@bootlin.com> (raw)
In-Reply-To: <20180327140819.23501-1-thomas.petazzoni@bootlin.com>
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
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@free-electrons.com>
---
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..ccd0304a0c21 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 int 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
next prev parent reply other threads:[~2018-03-27 14:09 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-27 14:08 [PATCH v3 0/6] PCI: aardvark: misc fixes and improvements Thomas Petazzoni
2018-03-27 14:08 ` Thomas Petazzoni [this message]
2018-03-27 14:08 ` [PATCH v3 2/6] PCI: aardvark: fix logic in advk_pcie_valid_device() Thomas Petazzoni
2018-03-27 14:08 ` [PATCH v3 3/6] PCI: aardvark: set PIO_ADDR_LS correctly in advk_pcie_rd_conf() Thomas Petazzoni
2018-03-27 14:08 ` [PATCH v3 4/6] PCI: aardvark: use isr1 instead of isr0 interrupt in legacy irq mode Thomas Petazzoni
2018-03-27 14:08 ` [PATCH v3 5/6] PCI: aardvark: fix PCIe max read request size setting Thomas Petazzoni
2018-03-27 14:08 ` [PATCH v3 6/6] PCI: aardvark: remove PCIe outbound window configuration Thomas Petazzoni
2018-03-27 14:08 ` [PATCH v3 0/6] PCI: aardvark: misc fixes and improvements Thomas Petazzoni
2018-03-27 19:50 ` Bjorn Helgaas
2018-03-27 14:08 ` [PATCH v3 1/6] PCI: aardvark: introduce an advk_pcie_valid_device() helper Thomas Petazzoni
2018-03-27 19:53 ` Bjorn Helgaas
2018-03-27 14:08 ` [PATCH v3 2/6] PCI: aardvark: fix logic in advk_pcie_valid_device() Thomas Petazzoni
2018-03-27 14:08 ` [PATCH v3 3/6] PCI: aardvark: set PIO_ADDR_LS correctly in advk_pcie_rd_conf() Thomas Petazzoni
2018-03-27 14:08 ` [PATCH v3 4/6] PCI: aardvark: use isr1 instead of isr0 interrupt in legacy irq mode Thomas Petazzoni
2018-03-27 14:08 ` [PATCH v3 5/6] PCI: aardvark: fix PCIe max read request size setting Thomas Petazzoni
2018-03-27 14:08 ` [PATCH v3 6/6] PCI: aardvark: remove PCIe outbound window configuration Thomas Petazzoni
2018-03-27 14:20 ` [PATCH v3 0/6] PCI: aardvark: misc fixes and improvements Thomas Petazzoni
2018-03-27 19:57 ` Bjorn Helgaas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180327140819.23501-2-thomas.petazzoni@bootlin.com \
--to=thomas.petazzoni@bootlin.com \
--cc=antoine.tenart@bootlin.com \
--cc=bhelgaas@google.com \
--cc=gregory.clement@bootlin.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-pci@vger.kernel.org \
--cc=maxime.chevallier@bootlin.com \
--cc=miquel.raynal@bootlin.com \
--cc=nadavh@marvell.com \
--cc=stable@vger.kernel.org \
--cc=thomas.petazzoni@free-electrons.com \
--cc=xigu@marvell.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).