PCI: imx6: limit DBI register length
Subsystems (4)
PATCH RESEND v8 1/1 PCI: imx6: limit DBI register length
Define the length of the DBI registers and limit config space to its length. This makes sure that the kernel does not access registers beyond that point, avoiding the following abort on a i.MX 6Quad:
# cat /sys/devices/soc0/soc/1ffc000.pcie/pci0000\:00/0000\:00\:00.0/config [ 100.021433] Unhandled fault: imprecise external abort (0x1406) at 0xb6ea7000 ... [ 100.056423] PC is at dw_pcie_read+0x50/0x84 [ 100.060790] LR is at dw_pcie_rd_own_conf+0x44/0x48 ...
---
Changes in v3:
- Rebase on pci/dwc
Changes in v4:
- Rebase on pci/dwc
Changes in v5:
- Rebased ontop of pci/dwc
- Use DBI length of 0x200
Changes in v6:
- Use pci_dev.cfg_size mechanism to limit config space (this made patch 1 of previous versions of this patchset obsolete).
Changes in v7:
- Restrict fixup to Synopsys/0xabcd
- Apply cfg_size limitation only if dbi_length is specified Changes in v8:
- Restrict fixup for Synopsys/0xabcd and class PCI bridge
- Check device driver to be pci-imx6
drivers/pci/controller/dwc/pci-imx6.c | 33 +++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)
drivers/pci/controller/dwc/pci-imx6.c +33 -0
@@ -57,6 +57,7 @@ enum imx6_pcie_variants {struct imx6_pcie_drvdata {enum imx6_pcie_variants variant;u32 flags; +int dbi_length; };struct imx6_pcie {
@@ -1212,6 +1213,7 @@ static const struct imx6_pcie_drvdata drvdata[] = { .variant = IMX6Q, .flags =IMX6_PCIE_FLAG_IMX6_PHY | IMX6_PCIE_FLAG_IMX6_SPEED_CHANGE, + .dbi_length = 0x200, }, [IMX6SX] = { .variant = IMX6SX,
@@ -1254,6 +1256,37 @@ static struct platform_driver imx6_pcie_driver = { .shutdown = imx6_pcie_shutdown, }; +static void imx6_pcie_quirk (struct pci_dev *dev) +{ +struct pci_bus *bus = dev->bus; +struct pcie_port *pp = bus->sysdata; + +/* Bus parent is the PCI bridge, its parent is this platform driver */ +if (!bus->dev.parent || !bus->dev.parent->parent) +return ; + +/* Make sure we only quirk devices associated with this driver */ +if (bus->dev.parent->parent->driver != &imx6_pcie_driver.driver) +return ; + +if (bus->number == pp->root_bus_nr) { +struct dw_pcie *pci =to_dw_pcie_from_pp (pp); +struct imx6_pcie *imx6_pcie =to_imx6_pcie (pci); + +/* +* Limit config length to avoid the kernel reading beyond +* the register set and causing an abort on i.MX 6Quad +*/ +if (imx6_pcie->drvdata->dbi_length) { + dev->cfg_size = imx6_pcie->drvdata->dbi_length; +dev_info (&dev->dev,"Limiting cfg_size to %d\n" , + dev->cfg_size); + } + } +} +DECLARE_PCI_FIXUP_CLASS_HEADER (PCI_VENDOR_ID_SYNOPSYS ,0xabcd , +PCI_CLASS_BRIDGE_PCI ,8 , imx6_pcie_quirk); +static int __init imx6_pcie_init (void ) {#ifdef CONFIG_ARM
Signature · 1 line
2.22.0
Am Freitag, den 26.07.2019, 16:40 +0200 schrieb Stefan Agner:
Quoted 11 lines
Define the length of the DBI registers and limit config space to its length. This makes sure that the kernel does not access registers beyond that point, avoiding the following abort on a i.MX 6Quad:
# cat /sys/devices/soc0/soc/1ffc000.pcie/pci0000\:00/0000\:00\:00.0/config [ 100.021433] Unhandled fault: imprecise external abort (0x1406) at 0xb6ea7000 ... [ 100.056423] PC is at dw_pcie_read+0x50/0x84 [ 100.060790] LR is at dw_pcie_rd_own_conf+0x44/0x48 ...Signed-off-by Stefan Agner <[email protected]>
Quoted 79 lines
---
Changes in v3:
- Rebase on pci/dwc
Changes in v4:
- Rebase on pci/dwc
Changes in v5:
- Rebased ontop of pci/dwc
- Use DBI length of0x200
Changes in v6:
- Use pci_dev.cfg_size mechanism to limit config space (this made patch 1 of previous versions of this patchset obsolete).
Changes in v7:
- Restrict fixup to Synopsys/0xabcd
- Applycfg_sizelimitation only ifdbi_lengthis specified Changes in v8:
- Restrict fixup for Synopsys/0xabcd and class PCI bridge
- Check device driver to be pci-imx6drivers/pci/controller/dwc/pci-imx6.c | 33 +++++++++++++++++++++++++++
1 file changed, 33 insertions(+)drivers/pci/controller/dwc/pci-imx6.c +0
-0@@ -57,6 +57,7 @@ enum imx6_pcie_variants { struct imx6_pcie_drvdata { > enum imx6_pcie_variants variant; > u32 flags; > + int dbi_length; };
structimx6_pcie{drivers/pci/controller/dwc/pci-imx6.c +0
-0@@ -1212,6 +1213,7 @@ static const struct imx6_pcie_drvdata drvdata[] = { > .variant = IMX6Q,Quoted 6 lines
.flags =
IMX6_PCIE_FLAG_IMX6_PHY|IMX6_PCIE_FLAG_IMX6_SPEED_CHANGE,drivers/pci/controller/dwc/pci-imx6.c +1
-0+ .dbi_length = 0x200,},
[IMX6SX] = {
.variant = IMX6SX,drivers/pci/controller/dwc/pci-imx6.c +0
-0@@ -1254,6 +1256,37 @@ static struct platform_driver imx6_pcie_driver = { > .shutdown = imx6_pcie_shutdown, };drivers/pci/controller/dwc/pci-imx6.c +2
-0+static void imx6_pcie_quirk (struct pci_dev *dev) +{drivers/pci/controller/dwc/pci-imx6.c static struct platform_driver imx6_pcie_driver = { · line 1262
Quoted 2 lines
drivers/pci/controller/dwc/pci-imx6.c +2
-0+struct pci_bus *bus = dev->bus; +struct pcie_port *pp = bus->sysdata;+
drivers/pci/controller/dwc/pci-imx6.c static struct platform_driver imx6_pcie_driver = { · line 1266
Quoted 3 lines
drivers/pci/controller/dwc/pci-imx6.c +3
-0+/* Bus parent is the PCI bridge, its parent is this platform driver */ +if (!bus->dev.parent || !bus->dev.parent->parent) +return ;+
drivers/pci/controller/dwc/pci-imx6.c static struct platform_driver imx6_pcie_driver = { · line 1270
Quoted 3 lines
drivers/pci/controller/dwc/pci-imx6.c +3
-0+/* Make sure we only quirk devices associated with this driver */ +if (bus->dev.parent->parent->driver != &imx6_pcie_driver.driver) +return ;+
drivers/pci/controller/dwc/pci-imx6.c static struct platform_driver imx6_pcie_driver = { · line 1274
Quoted 3 lines
drivers/pci/controller/dwc/pci-imx6.c +3
-0+if (bus->number == pp->root_bus_nr) { +struct dw_pcie *pci =to_dw_pcie_from_pp (pp); +struct imx6_pcie *imx6_pcie =to_imx6_pcie (pci);+
Quoted 10 lines
drivers/pci/controller/dwc/pci-imx6.c +10
-0+/* +* Limit config length to avoid the kernel reading beyond +* the register set and causing an abort on i.MX 6Quad +*/ +if (imx6_pcie->drvdata->dbi_length) { + dev->cfg_size = imx6_pcie->drvdata->dbi_length; +dev_info (&dev->dev,"Limiting cfg_size to %d\n" , + dev->cfg_size); + } + }drivers/pci/controller/dwc/pci-imx6.c +2
-0+} +DECLARE_PCI_FIXUP_CLASS_HEADER(PCI_VENDOR_ID_SYNOPSYS, 0xabcd,drivers/pci/controller/dwc/pci-imx6.c static struct platform_driver imx6_pcie_driver = { · line 1288
Quoted 1 line
drivers/pci/controller/dwc/pci-imx6.c +1
-0+ PCI_CLASS_BRIDGE_PCI, 8, imx6_pcie_quirk);+
static int__initimx6_pcie_init(void)
{
#ifdefCONFIG_ARM
Lorenzo Pieralisi
AppliedQuoted 29 lines · Stefan Agner
Define the length of the DBI registers and limit config space to its length. This makes sure that the kernel does not access registers beyond that point, avoiding the following abort on a i.MX 6Quad:
# cat /sys/devices/soc0/soc/1ffc000.pcie/pci0000\:00/0000\:00\:00.0/config [ 100.021433] Unhandled fault: imprecise external abort (0x1406) at 0xb6ea7000 ... [ 100.056423] PC is at dw_pcie_read+0x50/0x84 [ 100.060790] LR is at dw_pcie_rd_own_conf+0x44/0x48 ...Signed-off-by Stefan Agner <[email protected]>---
Changes in v3:
- Rebase on pci/dwc
Changes in v4:
- Rebase on pci/dwc
Changes in v5:
- Rebased ontop of pci/dwc
- Use DBI length of0x200
Changes in v6:
- Use pci_dev.cfg_size mechanism to limit config space (this made patch 1 of previous versions of this patchset obsolete).
Changes in v7:
- Restrict fixup to Synopsys/0xabcd
- Applycfg_sizelimitation only ifdbi_lengthis specified Changes in v8:
- Restrict fixup for Synopsys/0xabcd and class PCI bridge
- Check device driver to be pci-imx6
Quoted 2 lines
drivers/pci/controller/dwc/pci-imx6.c | 33 +++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)
Applied to pci/imx for v5.4.
Thanks,
Lorenzo
Quoted 61 lines
drivers/pci/controller/dwc/pci-imx6.c +33
-0@@ -57,6 +57,7 @@ enum imx6_pcie_variants {struct imx6_pcie_drvdata {enum imx6_pcie_variants variant;u32 flags; +int dbi_length; };struct imx6_pcie {@@ -1212,6 +1213,7 @@ static const struct imx6_pcie_drvdata drvdata[] = { .variant = IMX6Q, .flags =IMX6_PCIE_FLAG_IMX6_PHY | IMX6_PCIE_FLAG_IMX6_SPEED_CHANGE, + .dbi_length = 0x200, }, [IMX6SX] = { .variant = IMX6SX,@@ -1254,6 +1256,37 @@ static struct platform_driver imx6_pcie_driver = { .shutdown = imx6_pcie_shutdown, }; +static void imx6_pcie_quirk (struct pci_dev *dev) +{ +struct pci_bus *bus = dev->bus; +struct pcie_port *pp = bus->sysdata; + +/* Bus parent is the PCI bridge, its parent is this platform driver */ +if (!bus->dev.parent || !bus->dev.parent->parent) +return ; + +/* Make sure we only quirk devices associated with this driver */ +if (bus->dev.parent->parent->driver != &imx6_pcie_driver.driver) +return ; + +if (bus->number == pp->root_bus_nr) { +struct dw_pcie *pci =to_dw_pcie_from_pp (pp); +struct imx6_pcie *imx6_pcie =to_imx6_pcie (pci); + +/* +* Limit config length to avoid the kernel reading beyond +* the register set and causing an abort on i.MX 6Quad +*/ +if (imx6_pcie->drvdata->dbi_length) { + dev->cfg_size = imx6_pcie->drvdata->dbi_length; +dev_info (&dev->dev,"Limiting cfg_size to %d\n" , + dev->cfg_size); + } + } +} +DECLARE_PCI_FIXUP_CLASS_HEADER (PCI_VENDOR_ID_SYNOPSYS ,0xabcd , +PCI_CLASS_BRIDGE_PCI ,8 , imx6_pcie_quirk); +static int __init imx6_pcie_init (void ) {#ifdef CONFIG_ARM Signature · 1 line
2.22.0