From: Daniil Gnusarev <gnusarevda@basealt.ru> To: devel-kernel@lists.altlinux.org Subject: [d-kernel] [PATCH 30/39] pci: baikal-pcie: driver compatibility with SDK earlier than 5.7 Date: Mon, 14 Oct 2024 18:02:11 +0400 Message-ID: <20241014140221.535985-31-gnusarevda@basealt.ru> (raw) In-Reply-To: <20241014140221.535985-1-gnusarevda@basealt.ru> In earlier SDKs before version 5.7, there is no "gpr" parameter in devicetree for PCIe devices. Instead, the specified "lrcu" is used with the required offset. Signed-off-by: Daniil Gnusarev <gnusarevda@basealt.ru> --- drivers/pci/controller/dwc/pcie-baikal-core.c | 50 +++++++++++-------- 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/drivers/pci/controller/dwc/pcie-baikal-core.c b/drivers/pci/controller/dwc/pcie-baikal-core.c index 8e23af9950494..19cb589e48db6 100644 --- a/drivers/pci/controller/dwc/pcie-baikal-core.c +++ b/drivers/pci/controller/dwc/pcie-baikal-core.c @@ -121,6 +121,8 @@ static bool baikal_pcie_link_wait_training_done(struct dw_pcie *pci) #define BM1000_PCIE_HOT_RST BIT(12) #define BM1000_PCIE_ADB_PWRDWN BIT(13) +#define BM1000_PCIE_GPR_OFFSET 0x50000 + #define BM1000_PCIE_GPR_STATUS_BASE 0x04 #define BM1000_PCIE_GPR_STATUS(x) (((x) * 0x20) + BM1000_PCIE_GPR_STATUS_BASE) @@ -143,6 +145,7 @@ struct bm1000_pcie { struct dw_pcie *pci; unsigned int num; struct regmap *gpr; + uintptr_t gpr_offset; union { struct gpio_desc *reset_gpio; struct { @@ -160,9 +163,9 @@ void bm1000_pcie_phy_enable(struct dw_pcie *pci) struct bm1000_pcie *bm = dev_get_drvdata(pci->dev); u32 reg; - regmap_read(bm->gpr, BM1000_PCIE_GPR_GENCTL(bm->num), ®); + regmap_read(bm->gpr, bm->gpr_offset + BM1000_PCIE_GPR_GENCTL(bm->num), ®); reg |= BM1000_PCIE_PHY_MGMT_ENABLE | BM1000_PCIE_DBI2_MODE; - regmap_write(bm->gpr, BM1000_PCIE_GPR_GENCTL(bm->num), reg); + regmap_write(bm->gpr, bm->gpr_offset + BM1000_PCIE_GPR_GENCTL(bm->num), reg); } void bm1000_pcie_phy_disable(struct dw_pcie *pci) @@ -170,9 +173,9 @@ void bm1000_pcie_phy_disable(struct dw_pcie *pci) struct bm1000_pcie *bm = dev_get_drvdata(pci->dev); u32 reg; - regmap_read(bm->gpr, BM1000_PCIE_GPR_GENCTL(bm->num), ®); + regmap_read(bm->gpr, bm->gpr_offset + BM1000_PCIE_GPR_GENCTL(bm->num), ®); reg &= ~(BM1000_PCIE_PHY_MGMT_ENABLE | BM1000_PCIE_DBI2_MODE); - regmap_write(bm->gpr, BM1000_PCIE_GPR_GENCTL(bm->num), reg); + regmap_write(bm->gpr, bm->gpr_offset + BM1000_PCIE_GPR_GENCTL(bm->num), reg); } static int bm1000_get_resources(struct platform_device *pdev, @@ -184,10 +187,16 @@ static int bm1000_get_resources(struct platform_device *pdev, struct resource *res; bm->pci = pci; + bm->gpr_offset = 0; bm->gpr = syscon_regmap_lookup_by_compatible("baikal,bm1000-pcie-gpr"); if (IS_ERR(bm->gpr)) { - dev_err(dev, "failed to find PCIe GPR registers\n"); - return PTR_ERR(bm->gpr); + dev_warn(dev, "failed to find PCIe GPR registers, trying LCRU\n"); + bm->gpr = syscon_regmap_lookup_by_phandle(dev->of_node, "baikal,pcie-lcru"); + if (IS_ERR(bm->gpr)) { + dev_err(dev, "failed to find PCIe LCRU registers\n"); + return PTR_ERR(bm->gpr); + } + bm->gpr_offset = BM1000_PCIE_GPR_OFFSET; } res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dbi"); @@ -223,11 +232,11 @@ static int bm1000_pcie_link_up(struct dw_pcie *pci) struct bm1000_pcie *bm = dev_get_drvdata(pci->dev); u32 reg; - regmap_read(bm->gpr, BM1000_PCIE_GPR_GENCTL(bm->num), ®); + regmap_read(bm->gpr, bm->gpr_offset + BM1000_PCIE_GPR_GENCTL(bm->num), ®); if (!(reg & BM1000_PCIE_LTSSM_ENABLE)) return 0; - regmap_read(bm->gpr, BM1000_PCIE_GPR_STATUS(bm->num), ®); + regmap_read(bm->gpr, bm->gpr_offset + BM1000_PCIE_GPR_STATUS(bm->num), ®); return (reg & BAIKAL_PCIE_LTSSM_MASK) == BAIKAL_PCIE_LTSSM_STATE_L0; } @@ -236,9 +245,9 @@ static int bm1000_pcie_start_link(struct dw_pcie *pci) struct bm1000_pcie *bm = dev_get_drvdata(pci->dev); u32 reg; - regmap_read(bm->gpr, BM1000_PCIE_GPR_GENCTL(bm->num), ®); + regmap_read(bm->gpr, bm->gpr_offset + BM1000_PCIE_GPR_GENCTL(bm->num), ®); reg |= BM1000_PCIE_LTSSM_ENABLE; - regmap_write(bm->gpr, BM1000_PCIE_GPR_GENCTL(bm->num), reg); + regmap_write(bm->gpr, bm->gpr_offset + BM1000_PCIE_GPR_GENCTL(bm->num), reg); return 0; } @@ -453,9 +462,9 @@ static int bm1000_pcie_host_init(struct dw_pcie_rp *pp) /* If link is not established yet, reset the RC */ if (!linkup) { /* Disable link training */ - regmap_read(bm->gpr, BM1000_PCIE_GPR_GENCTL(bm->num), ®); + regmap_read(bm->gpr, bm->gpr_offset + BM1000_PCIE_GPR_GENCTL(bm->num), ®); reg &= ~BM1000_PCIE_LTSSM_ENABLE; - regmap_write(bm->gpr, BM1000_PCIE_GPR_GENCTL(bm->num), reg); + regmap_write(bm->gpr, bm->gpr_offset + BM1000_PCIE_GPR_GENCTL(bm->num), reg); /* Assert PERST pin */ if (acpi_disabled) { @@ -479,7 +488,7 @@ static int bm1000_pcie_host_init(struct dw_pcie_rp *pp) } /* Reset the RC */ - regmap_read(bm->gpr, BM1000_PCIE_GPR_RESET(bm->num), ®); + regmap_read(bm->gpr, bm->gpr_offset + BM1000_PCIE_GPR_RESET(bm->num), ®); reg |= BM1000_PCIE_NONSTICKY_RST | BM1000_PCIE_STICKY_RST | BM1000_PCIE_PWR_RST | @@ -494,7 +503,7 @@ static int bm1000_pcie_host_init(struct dw_pcie_rp *pp) reg |= BM1000_PCIE_PIPE_RST; } - regmap_write(bm->gpr, BM1000_PCIE_GPR_RESET(bm->num), reg); + regmap_write(bm->gpr, bm->gpr_offset + BM1000_PCIE_GPR_RESET(bm->num), reg); if (!acpi_disabled && bm->num == 2 && bm->gpio[1].is_set) { /* Assert PRSNT pin */ @@ -510,12 +519,12 @@ static int bm1000_pcie_host_init(struct dw_pcie_rp *pp) bm1000_pcie_set_gpio(bm->gpio[0].num, bm->gpio[0].polarity); /* Deassert PHY reset */ - regmap_read(bm->gpr, BM1000_PCIE_GPR_RESET(bm->num), ®); + regmap_read(bm->gpr, bm->gpr_offset + BM1000_PCIE_GPR_RESET(bm->num), ®); reg &= ~BM1000_PCIE_PHY_RST; - regmap_write(bm->gpr, BM1000_PCIE_GPR_RESET(bm->num), reg); + regmap_write(bm->gpr, bm->gpr_offset + BM1000_PCIE_GPR_RESET(bm->num), reg); /* Deassert all software controlled resets */ - regmap_read(bm->gpr, BM1000_PCIE_GPR_RESET(bm->num), ®); + regmap_read(bm->gpr, bm->gpr_offset + BM1000_PCIE_GPR_RESET(bm->num), ®); reg &= ~(BM1000_PCIE_ADB_PWRDWN | BM1000_PCIE_HOT_RST | BM1000_PCIE_NONSTICKY_RST | @@ -531,7 +540,7 @@ static int bm1000_pcie_host_init(struct dw_pcie_rp *pp) reg &= ~BM1000_PCIE_PIPE_RST; } - regmap_write(bm->gpr, BM1000_PCIE_GPR_RESET(bm->num), reg); + regmap_write(bm->gpr, bm->gpr_offset + BM1000_PCIE_GPR_RESET(bm->num), reg); } /* Enable error reporting */ @@ -567,11 +576,11 @@ static int bm1000_pcie_host_init(struct dw_pcie_rp *pp) dw_pcie_writew_dbi(pci, exp_cap_off + PCI_EXP_LNKCTL2, reg); } - regmap_read(bm->gpr, BM1000_PCIE_GPR_MSI_TRANS_CTL2, ®); + regmap_read(bm->gpr, bm->gpr_offset + BM1000_PCIE_GPR_MSI_TRANS_CTL2, ®); reg &= ~BM1000_PCIE_MSI_TRANS_RCNUM_MASK(bm->num); reg |= BM1000_PCIE_MSI_TRANS_RCNUM(bm->num); reg |= BM1000_PCIE_MSI_TRANS_EN(bm->num); - regmap_write(bm->gpr, BM1000_PCIE_GPR_MSI_TRANS_CTL2, reg); + regmap_write(bm->gpr, bm->gpr_offset + BM1000_PCIE_GPR_MSI_TRANS_CTL2, reg); /* RX/TX equalizers fine tune */ bm1000_pcie_tune(pci); @@ -1124,6 +1133,7 @@ static int bm1000_get_acpi_data(struct device *dev, struct bm1000_pcie *bm, struct acpi_device *adev = to_acpi_device(dev), *res_dev; int ret; + bm->gpr_offset = 0; bm->gpr = bm1000_pcie_get_gpr_acpi(bm); if (IS_ERR_OR_NULL(bm->gpr)) { dev_err(dev, "No PCIe GPR specified\n"); -- 2.42.2
next prev parent reply other threads:[~2024-10-14 14:02 UTC|newest] Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top 2024-10-14 14:01 [d-kernel] [PATCH 00/39] Support Baikal-M in un-def in p11 Daniil Gnusarev 2024-10-14 14:01 ` [d-kernel] [PATCH 01/39] Baikal Electronics SoC family Daniil Gnusarev 2024-10-14 14:01 ` [d-kernel] [PATCH 02/39] Clk: Add clock drivers for Baikal BE-M1000 with new firmware Daniil Gnusarev 2024-10-14 14:01 ` [d-kernel] [PATCH 03/39] USB: Add support for Baikal USB PHY Daniil Gnusarev 2024-10-14 14:01 ` [d-kernel] [PATCH 04/39] PCI: Add support for PCIe controller for Baikal BE-M1000 Daniil Gnusarev 2024-10-14 14:01 ` [d-kernel] [PATCH 05/39] AHCI SATA: Add support " Daniil Gnusarev 2024-10-14 14:01 ` [d-kernel] [PATCH 06/39] UART: Add support for UART " Daniil Gnusarev 2024-10-14 14:01 ` [d-kernel] [PATCH 07/39] cpufreq-dt: don't load on Baikal-M SoC Daniil Gnusarev 2024-10-14 14:01 ` [d-kernel] [PATCH 08/39] Sound: add support for Baikal BE-M1000 I2S Daniil Gnusarev 2024-10-14 14:01 ` [d-kernel] [PATCH 09/39] sound: baikal-i2s: paper over RX overrun warnings on Baikal-M Daniil Gnusarev 2024-10-14 14:01 ` [d-kernel] [PATCH 10/39] net: stmmac: support of Baikal-BE1000 SoCs GMAC Daniil Gnusarev 2024-10-14 14:01 ` [d-kernel] [PATCH 11/39] net: fwnode_get_phy_id: consider all compatible strings Daniil Gnusarev 2024-10-14 14:01 ` [d-kernel] [PATCH 12/39] hwmon: bt1-pvt: access registers via pvt_{readl, writel} helpers Daniil Gnusarev 2024-10-14 14:01 ` [d-kernel] [PATCH 13/39] hwmon: bt1-pvt: define pvt_readl/pvt_writel for Baikal-M SoC Daniil Gnusarev 2024-10-14 14:01 ` [d-kernel] [PATCH 14/39] hwmon: bt1-pvt: adjusted probing " Daniil Gnusarev 2024-10-14 14:01 ` [d-kernel] [PATCH 15/39] hwmon: bt1-pvt: added compatible baikal, pvt Daniil Gnusarev 2024-10-14 14:01 ` [d-kernel] [PATCH 16/39] PVT: support register addressing with new firmware Daniil Gnusarev 2024-10-14 14:01 ` [d-kernel] [PATCH 17/39] drm: add Baikal-M SoC video display unit driver Daniil Gnusarev 2024-10-14 14:01 ` [d-kernel] [PATCH 18/39] drm/bridge: dw-hdmi: support ahb audio hw revision 0x2a Daniil Gnusarev 2024-10-14 14:02 ` [d-kernel] [PATCH 19/39] dt-bindings: dw-hdmi: added ahb-audio-regshift Daniil Gnusarev 2024-10-14 14:02 ` [d-kernel] [PATCH 20/39] drm/bridge: dw-hdmi: force ahb audio register offset for Baikal-M Daniil Gnusarev 2024-10-14 14:02 ` [d-kernel] [PATCH 21/39] drm/panfrost: forcibly set dma-coherent on Baikal-M Daniil Gnusarev 2024-10-14 14:02 ` [d-kernel] [PATCH 22/39] drm/panfrost: disable devfreq " Daniil Gnusarev 2024-10-14 14:02 ` [d-kernel] [PATCH 23/39] bmc: add board management controller driver Daniil Gnusarev 2024-10-14 14:02 ` [d-kernel] [PATCH 24/39] pm: disable all sleep states on Baikal-M based boards Daniil Gnusarev 2024-10-14 14:02 ` [d-kernel] [PATCH 25/39] sound: dwc-i2s: paper over RX overrun warnings on Baikal-M Daniil Gnusarev 2024-10-14 14:02 ` [d-kernel] [PATCH 26/39] sound: dwc-i2s: request all IRQs specified in device tree Daniil Gnusarev 2024-10-14 14:02 ` [d-kernel] [PATCH 27/39] usb: dwc3: of-simple: added compatible string for Baikal-M SoC Daniil Gnusarev 2024-10-14 14:02 ` [d-kernel] [PATCH 28/39] serial: 8250_dw: verify clock rate in dw8250_set_termios Daniil Gnusarev 2024-10-14 14:02 ` [d-kernel] [PATCH 29/39] clk: use "cmu-id" if there is no "reg" in devicetree Daniil Gnusarev 2024-10-14 14:02 ` Daniil Gnusarev [this message] 2024-10-14 14:02 ` [d-kernel] [PATCH 31/39] pci: baikal-pcie: driver compatibility with SDK versions 5.4 Daniil Gnusarev 2024-10-14 14:02 ` [d-kernel] [PATCH 32/39] dw-pcie: refuse to load on Baikal-M with recent firmware Daniil Gnusarev 2024-10-14 14:02 ` [d-kernel] [PATCH 33/39] drm: baikal-vdu: driver compatibility with SDK earlier than 5.9 Daniil Gnusarev 2024-10-14 14:02 ` [d-kernel] [PATCH 34/39] input: new driver - serdev-serio Daniil Gnusarev 2024-10-14 14:02 ` [d-kernel] [PATCH 35/39] input: added TF307 serio PS/2 emulator driver Daniil Gnusarev 2024-10-14 14:02 ` [d-kernel] [PATCH 36/39] input: tp_serio: catch up API changes Daniil Gnusarev 2024-10-14 14:02 ` [d-kernel] [PATCH 37/39] drm: baikal-m: add vblank events, fix mode switching Daniil Gnusarev 2024-10-14 14:02 ` [d-kernel] [PATCH 38/39] drm: baikal-vdu: disable backlight driver loading Daniil Gnusarev 2024-10-14 14:02 ` [d-kernel] [PATCH 39/39] config-aarch64: enable more configs for baikal-m support Daniil Gnusarev 2024-10-14 14:28 ` [d-kernel] [PATCH 00/39] Support Baikal-M in un-def in p11 Vitaly Chikunov
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=20241014140221.535985-31-gnusarevda@basealt.ru \ --to=gnusarevda@basealt.ru \ --cc=devel-kernel@lists.altlinux.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
ALT Linux kernel packages development This inbox may be cloned and mirrored by anyone: git clone --mirror http://lore.altlinux.org/devel-kernel/0 devel-kernel/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 devel-kernel devel-kernel/ http://lore.altlinux.org/devel-kernel \ devel-kernel@altlinux.org devel-kernel@altlinux.ru devel-kernel@altlinux.com public-inbox-index devel-kernel Example config snippet for mirrors. Newsgroup available over NNTP: nntp://lore.altlinux.org/org.altlinux.lists.devel-kernel AGPL code for this site: git clone https://public-inbox.org/public-inbox.git