On Mon, Aug 16, 2021 at 6:27 AM Krzysztof Hałasa <khalasa@xxxxxxx> wrote: > > DWC PCIe controller imposes limits on the Read Request Size that it can > handle. For i.MX6 family it's fixed at 512 bytes by default. > > If a memory read larger than the limit is requested, the CPU responds > with Completer Abort (CA) (on i.MX6 Unsupported Request (UR) is returned > instead due to a design error). > > The i.MX6 documentation states that the limit can be changed by writing > to the PCIE_PL_MRCCR0 register, however there is a fixed (and > undocumented) maximum (CX_REMOTE_RD_REQ_SIZE constant). Tests indicate > that values larger than 512 bytes don't work, though. > > This patch makes the RTL8111 work on i.MX6. > > Signed-off-by: Krzysztof Hałasa <khalasa@xxxxxxx> > --- > This version drops CONFIG_NEED_PCIE_MAX_MRRS. > > diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c > index 80fc98acf097..225380e75fff 100644 > --- a/drivers/pci/controller/dwc/pci-imx6.c > +++ b/drivers/pci/controller/dwc/pci-imx6.c > @@ -1148,6 +1148,7 @@ static int imx6_pcie_probe(struct platform_device *pdev) > imx6_pcie->vph = NULL; > } > > + max_pcie_mrrs = 512; > platform_set_drvdata(pdev, imx6_pcie); > > ret = imx6_pcie_attach_pd(dev); > diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c > index aacf575c15cf..44815af4ad85 100644 > --- a/drivers/pci/pci.c > +++ b/drivers/pci/pci.c > @@ -112,6 +112,10 @@ enum pcie_bus_config_types pcie_bus_config = PCIE_BUS_PEER2PEER; > enum pcie_bus_config_types pcie_bus_config = PCIE_BUS_DEFAULT; > #endif > > +#ifdef CONFIG_ARM > +u16 max_pcie_mrrs = 4096; // no limit - needed mostly for DWC PCIe > +#endif > + > /* > * The default CLS is used if arch didn't set CLS explicitly and not > * all pci devices agree on the same value. Arch can override either > @@ -5816,6 +5820,11 @@ int pcie_set_readrq(struct pci_dev *dev, int rq) > rq = mps; > } > > +#ifdef CONFIG_ARM > + if (rq > max_pcie_mrrs) > + rq = max_pcie_mrrs; > +#endif My objection wasn't having another kconfig option so much as I don't think we need one at all here unless Bjorn feels otherwise. It's 2 bytes of data and about 3 instructions (load, cmp, store). If we do have a config option, using or basing on the arch is wrong. Has nothing to do with the arch. Are the other platforms needing this arm32 as well? Also, when you do use kconfig options, use IS_ENABLED() whenever possible. Rob
