[PATCH v5 07/16] PCI: rzg3s-host: Make SYSC register offsets SoC-specific
From: John Madieu <john.madieu.xa@bp.renesas.com>
Date: 2026-02-10 11:32:53
Also in:
linux-clk, linux-pci, linux-renesas-soc
Subsystem:
pci native host bridge and endpoint drivers, pci subsystem, pcie driver for renesas rz/g3s series, the rest · Maintainers:
Lorenzo Pieralisi, Krzysztof Wilczyński, Manivannan Sadhasivam, Bjorn Helgaas, Claudiu Beznea, Linus Torvalds
In preparation for adding RZ/G3E support, move the RST_RSM_B register offset and mask into a SoC-specific data structure. Compared with RZ/G3S, the RZ/G3E SYSC controls different functionalities for the PCIe controller. Make SYSC operations conditional on the presence of register offset information, allowing the driver to handle SoCs that don't use the RST_RSM_B signal. Reviewed-by: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com> Signed-off-by: John Madieu <john.madieu.xa@bp.renesas.com> --- Changes: v5: Collected Rb tag from Claudiu v4: No changes v3: No changes v2: Address Claudiu's styling comment drivers/pci/controller/pcie-rzg3s-host.c | 92 +++++++++++++++++------- 1 file changed, 66 insertions(+), 26 deletions(-)
diff --git a/drivers/pci/controller/pcie-rzg3s-host.c b/drivers/pci/controller/pcie-rzg3s-host.c
index 8ccf55d019cf..8f80484bb85e 100644
--- a/drivers/pci/controller/pcie-rzg3s-host.c
+++ b/drivers/pci/controller/pcie-rzg3s-host.c@@ -159,10 +159,6 @@ #define RZG3S_PCI_CFG_PCIEC 0x60 -/* System controller registers */ -#define RZG3S_SYS_PCIE_RST_RSM_B 0xd74 -#define RZG3S_SYS_PCIE_RST_RSM_B_MASK BIT(0) - /* Maximum number of windows */ #define RZG3S_MAX_WINDOWS 8
@@ -174,6 +170,34 @@ /* Timeouts experimentally determined */ #define RZG3S_REQ_ISSUE_TIMEOUT_US 2500 +/** + * struct rzg3s_sysc_function - System Controller register function descriptor + * @offset: Register offset from the System Controller base address + * @mask: Bit mask for the function within the register + */ +struct rzg3s_sysc_function { + u32 offset; + u32 mask; +}; + +/** + * struct rzg3s_sysc_info - RZ/G3S System Controller function info + * @rst_rsm_b: Reset RSM_B function descriptor + */ +struct rzg3s_sysc_info { + struct rzg3s_sysc_function rst_rsm_b; +}; + +/** + * struct rzg3s_sysc - RZ/G3S System Controller descriptor + * @regmap: System controller regmap + * @info: System controller info + */ +struct rzg3s_sysc { + struct regmap *regmap; + const struct rzg3s_sysc_info *info; +}; + /** * struct rzg3s_pcie_msi - RZ/G3S PCIe MSI data structure * @domain: IRQ domain
@@ -203,6 +227,7 @@ struct rzg3s_pcie_host; * power-on * @cfg_resets: array with the resets that need to be de-asserted after * configuration + * @sysc_info: SYSC functionalities * @num_power_resets: number of power resets * @num_cfg_resets: number of configuration resets */
@@ -210,6 +235,7 @@ struct rzg3s_pcie_soc_data { int (*init_phy)(struct rzg3s_pcie_host *host); const char * const *power_resets; const char * const *cfg_resets; + struct rzg3s_sysc_info sysc_info; u8 num_power_resets; u8 num_cfg_resets; };
@@ -233,7 +259,7 @@ struct rzg3s_pcie_port { * @dev: struct device * @power_resets: reset control signals that should be set after power up * @cfg_resets: reset control signals that should be set after configuration - * @sysc: SYSC regmap + * @sysc: SYSC descriptor * @intx_domain: INTx IRQ domain * @data: SoC specific data * @msi: MSI data structure
@@ -248,7 +274,7 @@ struct rzg3s_pcie_host { struct device *dev; struct reset_control_bulk_data *power_resets; struct reset_control_bulk_data *cfg_resets; - struct regmap *sysc; + struct rzg3s_sysc *sysc; struct irq_domain *intx_domain; const struct rzg3s_pcie_soc_data *data; struct rzg3s_pcie_msi msi;
@@ -1521,6 +1547,7 @@ static int rzg3s_pcie_probe(struct platform_device *pdev) struct device_node *sysc_np __free(device_node) = of_parse_phandle(np, "renesas,sysc", 0); struct rzg3s_pcie_host *host; + struct rzg3s_sysc *sysc; int ret; bridge = devm_pci_alloc_host_bridge(dev, sizeof(*host));
@@ -1532,6 +1559,13 @@ static int rzg3s_pcie_probe(struct platform_device *pdev) host->data = device_get_match_data(dev); platform_set_drvdata(pdev, host); + host->sysc = devm_kzalloc(dev, sizeof(*host->sysc), GFP_KERNEL); + if (!host->sysc) + return -ENOMEM; + + sysc = host->sysc; + sysc->info = &host->data->sysc_info; + host->axi = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(host->axi)) return PTR_ERR(host->axi);
@@ -1545,15 +1579,15 @@ static int rzg3s_pcie_probe(struct platform_device *pdev) if (ret) return ret; - host->sysc = syscon_node_to_regmap(sysc_np); - if (IS_ERR(host->sysc)) { - ret = PTR_ERR(host->sysc); + sysc->regmap = syscon_node_to_regmap(sysc_np); + if (IS_ERR(sysc->regmap)) { + ret = PTR_ERR(sysc->regmap); goto port_refclk_put; } - ret = regmap_update_bits(host->sysc, RZG3S_SYS_PCIE_RST_RSM_B, - RZG3S_SYS_PCIE_RST_RSM_B_MASK, - FIELD_PREP(RZG3S_SYS_PCIE_RST_RSM_B_MASK, 1)); + ret = regmap_update_bits(sysc->regmap, sysc->info->rst_rsm_b.offset, + sysc->info->rst_rsm_b.mask, + field_prep(sysc->info->rst_rsm_b.mask, 1)); if (ret) goto port_refclk_put;
@@ -1605,9 +1639,9 @@ static int rzg3s_pcie_probe(struct platform_device *pdev) * SYSC RST_RSM_B signal need to be asserted before turning off the * power to the PHY. */ - regmap_update_bits(host->sysc, RZG3S_SYS_PCIE_RST_RSM_B, - RZG3S_SYS_PCIE_RST_RSM_B_MASK, - FIELD_PREP(RZG3S_SYS_PCIE_RST_RSM_B_MASK, 0)); + regmap_update_bits(sysc->regmap, sysc->info->rst_rsm_b.offset, + sysc->info->rst_rsm_b.mask, + field_prep(sysc->info->rst_rsm_b.mask, 0)); port_refclk_put: clk_put(host->port.refclk);
@@ -1619,7 +1653,7 @@ static int rzg3s_pcie_suspend_noirq(struct device *dev) struct rzg3s_pcie_host *host = dev_get_drvdata(dev); const struct rzg3s_pcie_soc_data *data = host->data; struct rzg3s_pcie_port *port = &host->port; - struct regmap *sysc = host->sysc; + struct rzg3s_sysc *sysc = host->sysc; int ret; ret = pm_runtime_put_sync(dev);
@@ -1638,9 +1672,9 @@ static int rzg3s_pcie_suspend_noirq(struct device *dev) if (ret) goto power_resets_restore; - ret = regmap_update_bits(sysc, RZG3S_SYS_PCIE_RST_RSM_B, - RZG3S_SYS_PCIE_RST_RSM_B_MASK, - FIELD_PREP(RZG3S_SYS_PCIE_RST_RSM_B_MASK, 0)); + ret = regmap_update_bits(sysc->regmap, sysc->info->rst_rsm_b.offset, + sysc->info->rst_rsm_b.mask, + field_prep(sysc->info->rst_rsm_b.mask, 0)); if (ret) goto cfg_resets_restore;
@@ -1663,12 +1697,12 @@ static int rzg3s_pcie_resume_noirq(struct device *dev) { struct rzg3s_pcie_host *host = dev_get_drvdata(dev); const struct rzg3s_pcie_soc_data *data = host->data; - struct regmap *sysc = host->sysc; + struct rzg3s_sysc *sysc = host->sysc; int ret; - ret = regmap_update_bits(sysc, RZG3S_SYS_PCIE_RST_RSM_B, - RZG3S_SYS_PCIE_RST_RSM_B_MASK, - FIELD_PREP(RZG3S_SYS_PCIE_RST_RSM_B_MASK, 1)); + ret = regmap_update_bits(sysc->regmap, sysc->info->rst_rsm_b.offset, + sysc->info->rst_rsm_b.mask, + field_prep(sysc->info->rst_rsm_b.mask, 1)); if (ret) return ret;
@@ -1697,9 +1731,9 @@ static int rzg3s_pcie_resume_noirq(struct device *dev) reset_control_bulk_assert(data->num_power_resets, host->power_resets); assert_rst_rsm_b: - regmap_update_bits(sysc, RZG3S_SYS_PCIE_RST_RSM_B, - RZG3S_SYS_PCIE_RST_RSM_B_MASK, - FIELD_PREP(RZG3S_SYS_PCIE_RST_RSM_B_MASK, 0)); + regmap_update_bits(sysc->regmap, sysc->info->rst_rsm_b.offset, + sysc->info->rst_rsm_b.mask, + field_prep(sysc->info->rst_rsm_b.mask, 0)); return ret; }
@@ -1722,6 +1756,12 @@ static const struct rzg3s_pcie_soc_data rzg3s_soc_data = { .cfg_resets = rzg3s_soc_cfg_resets, .num_cfg_resets = ARRAY_SIZE(rzg3s_soc_cfg_resets), .init_phy = rzg3s_soc_pcie_init_phy, + .sysc_info = { + .rst_rsm_b = { + .offset = 0xd74, + .mask = BIT(0), + }, + }, }; static const struct of_device_id rzg3s_pcie_of_match[] = {
--
2.25.1