| Message ID | 20240401023942.134704-1-yoshihiro.shimoda.uh@renesas.com |
|---|---|
| Headers | show |
| Series | PCI: dwc: rcar-gen4: Add R-Car V4H support | expand |
Hi Shimoda-san, On Mon, Apr 1, 2024 at 4:40 AM Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> wrote: > This driver previously supported r8a779f0 (R-Car S4-8). Add support > for r8a779g0 (R-Car V4H). > > To support r8a779g0, it requires specific firmware. > > Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Thanks for your patch! > --- a/drivers/pci/controller/dwc/pcie-rcar-gen4.c > +++ b/drivers/pci/controller/dwc/pcie-rcar-gen4.c > +static int rcar_gen4_pcie_update_phy_firmware(struct rcar_gen4_pcie *rcar) > +{ > + const u32 check_addr[] = { 0x00101018, 0x00101118, 0x00101021, 0x00101121}; > + struct dw_pcie *dw = &rcar->dw; > + const struct firmware *fw; > + unsigned int i, timeout; > + u32 data; > + int ret; > + > + ret = request_firmware(&fw, RCAR_GEN4_PCIE_FIRMWARE_NAME, dw->dev); > + if (ret) { > + dev_err(dw->dev, "%s: Requesting firmware failed\n", __func__); > + return ret; > + } > + > + for (i = 0; i < (fw->size / 2); i++) { > + data = fw->data[i * 2] | fw->data[(i * 2) + 1] << 8; > + timeout = 100; > +retry_data: > + dw_pcie_writel_dbi(dw, PRTLGC89, RCAR_GEN4_PCIE_FIRMWARE_BASE_ADDR + i); > + dw_pcie_writel_dbi(dw, PRTLGC90, data); > + if (rcar_gen4_pcie_reg_check_bit(rcar, PRTLGC89, BIT(30)) < 0) { If you would invert the logic here, you could "break" here, ... > + if (!(--timeout)) { > + ret = -ETIMEDOUT; > + goto exit; > + } > + usleep_range(100, 200); > + goto retry_data; ... and convert "retry_data: ... goto retry_data" into "do { ... } while (1)", avoiding the goto. > + } > + } > + > + rcar_gen4_pcie_phy_reg_update_bits(rcar, RCAR_GEN4_PCIE_PHY_0f8, BIT(17), BIT(17)); > + > + for (i = 0; i < ARRAY_SIZE(check_addr); i++) { > + timeout = 100; > +retry_check: > + dw_pcie_writel_dbi(dw, PRTLGC89, check_addr[i]); > + ret = rcar_gen4_pcie_reg_check_bit(rcar, PRTLGC89, BIT(30)); > + ret |= rcar_gen4_pcie_reg_check_bit(rcar, PRTLGC90, BIT(0)); > + if (ret < 0) { > + if (!(--timeout)) { > + ret = -ETIMEDOUT; > + goto exit; > + } > + usleep_range(100, 200); > + goto retry_check; Likewise. > + } > + } > + > + ret = 0; > +exit: > + release_firmware(fw); > + > + return ret; > +} Gr{oetje,eeting}s, Geert
Hi Geert-san, > From: Geert Uytterhoeven, Sent: Tuesday, April 2, 2024 4:53 PM > > Hi Shimoda-san, > > On Mon, Apr 1, 2024 at 4:40 AM Yoshihiro Shimoda > <yoshihiro.shimoda.uh@renesas.com> wrote: > > This driver previously supported r8a779f0 (R-Car S4-8). Add support > > for r8a779g0 (R-Car V4H). > > > > To support r8a779g0, it requires specific firmware. > > > > Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> > > Thanks for your patch! Thank you for your review! > > --- a/drivers/pci/controller/dwc/pcie-rcar-gen4.c > > +++ b/drivers/pci/controller/dwc/pcie-rcar-gen4.c > > > +static int rcar_gen4_pcie_update_phy_firmware(struct rcar_gen4_pcie *rcar) > > +{ > > + const u32 check_addr[] = { 0x00101018, 0x00101118, 0x00101021, 0x00101121}; > > + struct dw_pcie *dw = &rcar->dw; > > + const struct firmware *fw; > > + unsigned int i, timeout; > > + u32 data; > > + int ret; > > + > > + ret = request_firmware(&fw, RCAR_GEN4_PCIE_FIRMWARE_NAME, dw->dev); > > + if (ret) { > > + dev_err(dw->dev, "%s: Requesting firmware failed\n", __func__); > > + return ret; > > + } > > + > > + for (i = 0; i < (fw->size / 2); i++) { > > + data = fw->data[i * 2] | fw->data[(i * 2) + 1] << 8; > > + timeout = 100; > > +retry_data: > > + dw_pcie_writel_dbi(dw, PRTLGC89, RCAR_GEN4_PCIE_FIRMWARE_BASE_ADDR + i); > > + dw_pcie_writel_dbi(dw, PRTLGC90, data); > > + if (rcar_gen4_pcie_reg_check_bit(rcar, PRTLGC89, BIT(30)) < 0) { > > If you would invert the logic here, you could "break" here, ... > > > + if (!(--timeout)) { > > + ret = -ETIMEDOUT; > > + goto exit; > > + } > > + usleep_range(100, 200); > > + goto retry_data; > > ... and convert "retry_data: ... goto retry_data" into "do { ... } while (1)", > avoiding the goto. Thank you for your suggestion. I'll fix it. > > + } > > + } > > + > > + rcar_gen4_pcie_phy_reg_update_bits(rcar, RCAR_GEN4_PCIE_PHY_0f8, BIT(17), BIT(17)); > > + > > + for (i = 0; i < ARRAY_SIZE(check_addr); i++) { > > + timeout = 100; > > +retry_check: > > + dw_pcie_writel_dbi(dw, PRTLGC89, check_addr[i]); > > + ret = rcar_gen4_pcie_reg_check_bit(rcar, PRTLGC89, BIT(30)); > > + ret |= rcar_gen4_pcie_reg_check_bit(rcar, PRTLGC90, BIT(0)); > > + if (ret < 0) { > > + if (!(--timeout)) { > > + ret = -ETIMEDOUT; > > + goto exit; > > + } > > + usleep_range(100, 200); > > + goto retry_check; > > Likewise. I'll fix it. Best regards, Yoshihiro Shimoda > > + } > > + } > > + > > + ret = 0; > > +exit: > > + release_firmware(fw); > > + > > + return ret; > > +} > > Gr{oetje,eeting}s, > > Geert > > -- > Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org > > In personal conversations with technical people, I call myself a hacker. But > when I'm talking to journalists I just say "programmer" or something like that. > -- Linus Torvalds
The pcie-rcar-gen4 driver can reuse other R-Car Gen4 support like r8a779g0 (R-Car V4H) and r8a779h0 (R-Car V4M). However, some initializing settings differ between R-Car S4-8 (r8a779f0) and others. The R-Car S4-8 will be minority about the setting way. So, R-Car V4H will be majority and this is generic initialization way as "renesas,rcar-gen4-pcie{-ep}" compatible. For now, I tested both R-Car S4-8 and R-Car V4H on this driver. I'll support one more other SoC (R-Car V4M) in the future. Changes from v2: https://lore.kernel.org/linux-pci/20240326024540.2336155-1-yoshihiro.shimoda.uh@renesas.com/ - Add a new patch which just add a platdata in patch 4/7. - Modify the subjects in patch [56]/7. - Modify the description and code about Bjorn's comment in patch [56]/7. - Add missing MODULE_FIRMWARE(9 in patch 6/7. - Document a policy aboud adding pci_device_id instead of adding r8a779g0's id in patch 7/7. Changes from v1: https://lore.kernel.org/linux-pci/20240229120719.2553638-1-yoshihiro.shimoda.uh@renesas.com/ - Based on v6.9-rc1. - Add Acked-by and/or Reviewed-by in patch [126/6]. Yoshihiro Shimoda (7): dt-bindings: PCI: rcar-gen4-pci-host: Add R-Car V4H compatible dt-bindings: PCI: rcar-gen4-pci-ep: Add R-Car V4H compatible PCI: dwc: Add PCIE_PORT_{FORCE,LANE_SKEW} macros PCI: dwc: rcar-gen4: Add rcar_gen4_pcie_platdata PCI: dwc: rcar-gen4: Add .ltssm_enable() for other SoC support PCI: dwc: rcar-gen4: Add support for r8a779g0 misc: pci_endpoint_test: Document a policy about adding pci_device_id .../bindings/pci/rcar-gen4-pci-ep.yaml | 4 +- .../bindings/pci/rcar-gen4-pci-host.yaml | 4 +- drivers/misc/pci_endpoint_test.c | 1 + drivers/pci/controller/dwc/pcie-designware.h | 6 + drivers/pci/controller/dwc/pcie-rcar-gen4.c | 272 +++++++++++++++++- 5 files changed, 270 insertions(+), 17 deletions(-)