From: Bjorn Helgaas <helgaas@kernel.org>
To: Jim Quinlan <jim2101024@gmail.com>
Cc: linux-pci@vger.kernel.org,
"Nicolas Saenz Julienne" <nsaenz@kernel.org>,
"Bjorn Helgaas" <bhelgaas@google.com>,
"Lorenzo Pieralisi" <lorenzo.pieralisi@arm.com>,
"Cyril Brulebois" <kibi@debian.org>,
bcm-kernel-feedback-list@broadcom.com,
james.quinlan@broadcom.com,
"Florian Fainelli" <f.fainelli@gmail.com>,
"Lorenzo Pieralisi" <lpieralisi@kernel.org>,
"Rob Herring" <robh@kernel.org>,
"Krzysztof Wilczyński" <kw@linux.com>,
"moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE"
<linux-rpi-kernel@lists.infradead.org>,
"moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE"
<linux-arm-kernel@lists.infradead.org>,
"open list" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v2 3/6] PCI: brcmstb: Add "refusal mode" to preclude PCIe-induced CPU aborts
Date: Wed, 20 Jul 2022 17:05:58 -0500 [thread overview]
Message-ID: <20220720220558.GA1661469@bhelgaas> (raw)
In-Reply-To: <20220716222454.29914-4-jim2101024@gmail.com>
On Sat, Jul 16, 2022 at 06:24:50PM -0400, Jim Quinlan wrote:
> Our PCIe RC HW has an atypical behavior: if it does not have PCIe link
> established between itself and downstream, any subsequent config space
> access causes a CPU abort. This commit sets a "refusal mode" if the PCIe
> link-up fails, and this has our pci_ops map_bus function returning a NULL
> address, which in turn precludes the access from happening.
>
> Right now, "refusal mode" is window dressing. It will become relevant
> in a future commit when brcm_pcie_start_link() is invoked during
> enumeration instead of before it.
>
> Signed-off-by: Jim Quinlan <jim2101024@gmail.com>
> ---
> drivers/pci/controller/pcie-brcmstb.c | 24 ++++++++++++++++++++++++
> 1 file changed, 24 insertions(+)
>
> diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
> index c026446d5830..72219a4f3964 100644
> --- a/drivers/pci/controller/pcie-brcmstb.c
> +++ b/drivers/pci/controller/pcie-brcmstb.c
> @@ -255,6 +255,7 @@ struct brcm_pcie {
> u32 hw_rev;
> void (*perst_set)(struct brcm_pcie *pcie, u32 val);
> void (*bridge_sw_init_set)(struct brcm_pcie *pcie, u32 val);
> + bool refusal_mode;
> };
>
> static inline bool is_bmips(const struct brcm_pcie *pcie)
> @@ -687,6 +688,19 @@ static void __iomem *brcm_pcie_map_conf(struct pci_bus *bus, unsigned int devfn,
> if (pci_is_root_bus(bus))
> return PCI_SLOT(devfn) ? NULL : base + where;
>
> + if (pcie->refusal_mode) {
> + /*
> + * At this point we do not have PCIe link-up. If there is
> + * a config read or write access besides those targeting
> + * the host bridge, our PCIe HW throws a CPU abort. To
> + * prevent this we return the NULL address. The calling
> + * functions -- pci_generic_config_*() -- will notice this
> + * and not perform the access, and if it is a read access,
> + * 0xffffffff is returned.
> + */
> + return NULL;
> + }
Is this any different from all the other .map_bus() implementations
that return NULL when the link is down?
cdns_pci_map_bus()
dw_pcie_other_conf_map_bus()
nwl_pcie_map_bus() (see nwl_pcie_valid_device())
xilinx_pcie_map_bus() (see xilinx_pcie_valid_device())
If you can implement this the same way, i.e., using
brcm_pcie_link_up(), it would be nice.
> /* For devices, write to the config space index register */
> idx = PCIE_ECAM_OFFSET(bus->number, devfn, 0);
> writel(idx, pcie->base + PCIE_EXT_CFG_INDEX);
> @@ -704,6 +718,11 @@ static void __iomem *brcm_pcie_map_conf32(struct pci_bus *bus, unsigned int devf
> if (pci_is_root_bus(bus))
> return PCI_SLOT(devfn) ? NULL : base + (where & ~0x3);
>
> + if (pcie->refusal_mode) {
> + /* See note above in brcm_pcie_map_conf() */
> + return NULL;
> + }
> +
> /* For devices, write to the config space index register */
> idx = PCIE_ECAM_OFFSET(bus->number, devfn, (where & ~3));
> writel(idx, base + IDX_ADDR(pcie));
> @@ -989,6 +1008,7 @@ static int brcm_pcie_start_link(struct brcm_pcie *pcie)
> dev_err(dev, "link down\n");
> return -ENODEV;
> }
> + pcie->refusal_mode = false;
>
> if (!brcm_pcie_rc_mode(pcie)) {
> dev_err(dev, "PCIe misconfigured; is in EP mode\n");
> @@ -1134,6 +1154,8 @@ static void brcm_pcie_turn_off(struct brcm_pcie *pcie)
> void __iomem *base = pcie->base;
> int tmp;
>
> + pcie->refusal_mode = true;
> +
> if (brcm_pcie_link_up(pcie))
> brcm_pcie_enter_l23(pcie);
> /* Assert fundamental reset */
> @@ -1185,6 +1207,7 @@ static int brcm_pcie_resume(struct device *dev)
> u32 tmp;
> int ret;
>
> + pcie->refusal_mode = true;
> base = pcie->base;
> ret = clk_prepare_enable(pcie->clk);
> if (ret)
> @@ -1361,6 +1384,7 @@ static int brcm_pcie_probe(struct platform_device *pdev)
> pcie->type = data->type;
> pcie->perst_set = data->perst_set;
> pcie->bridge_sw_init_set = data->bridge_sw_init_set;
> + pcie->refusal_mode = true;
>
> pcie->base = devm_platform_ioremap_resource(pdev, 0);
> if (IS_ERR(pcie->base))
> --
> 2.17.1
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-07-20 22:06 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-16 22:24 [PATCH v2 0/6] PCI: brcmstb: Re-submit reverted patchset Jim Quinlan
2022-07-16 22:24 ` [PATCH v2 1/6] PCI: brcmstb: Remove unnecessary forward declarations Jim Quinlan
2022-07-16 22:24 ` [PATCH v2 2/6] PCI: brcmstb: Split brcm_pcie_setup() into two funcs Jim Quinlan
2022-07-18 13:11 ` Pali Rohár
2022-07-18 13:37 ` Jim Quinlan
2022-07-18 17:05 ` Bjorn Helgaas
2022-07-18 18:01 ` Pali Rohár
2022-07-18 18:14 ` Bjorn Helgaas
2022-07-18 18:56 ` Jim Quinlan
2022-07-18 19:23 ` Bjorn Helgaas
2022-07-18 22:40 ` Bjorn Helgaas
2022-07-19 13:08 ` Jim Quinlan
2022-07-19 20:03 ` Bjorn Helgaas
2022-07-20 14:53 ` Jim Quinlan
2022-07-20 16:18 ` Rob Herring
2022-07-20 21:34 ` Florian Fainelli
2022-07-21 14:27 ` Rob Herring
2022-07-18 22:40 ` Bjorn Helgaas
2022-07-20 20:37 ` Bjorn Helgaas
2022-07-21 14:56 ` Jim Quinlan
2022-07-21 16:10 ` Bjorn Helgaas
2022-07-16 22:24 ` [PATCH v2 3/6] PCI: brcmstb: Add "refusal mode" to preclude PCIe-induced CPU aborts Jim Quinlan
2022-07-20 22:05 ` Bjorn Helgaas [this message]
2022-07-21 14:53 ` Jim Quinlan
2022-07-21 15:46 ` Bjorn Helgaas
2022-07-20 22:08 ` Bjorn Helgaas
2022-07-16 22:24 ` [PATCH v2 4/6] PCI: brcmstb: Add mechanism to turn on subdev regulators Jim Quinlan
2022-07-16 22:24 ` [PATCH v2 5/6] PCI: brcmstb: Add control of subdevice voltage regulators Jim Quinlan
2022-07-16 22:24 ` [PATCH v2 6/6] PCI: brcmstb: Do not turn off WOL regulators on suspend Jim Quinlan
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=20220720220558.GA1661469@bhelgaas \
--to=helgaas@kernel.org \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=bhelgaas@google.com \
--cc=f.fainelli@gmail.com \
--cc=james.quinlan@broadcom.com \
--cc=jim2101024@gmail.com \
--cc=kibi@debian.org \
--cc=kw@linux.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-rpi-kernel@lists.infradead.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=lpieralisi@kernel.org \
--cc=nsaenz@kernel.org \
--cc=robh@kernel.org \
/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).