diff mbox series

PCI: brcmstb: Sort enums, pcie_offsets[], pcie_cfg_data, .compatible strings

Message ID 20240902205456.227409-1-helgaas@kernel.org (mailing list archive)
State Accepted
Commit 2a0091f9419cb6dbbada3a4c8d9e86117b80ead4
Delegated to: Bjorn Helgaas
Headers show
Series PCI: brcmstb: Sort enums, pcie_offsets[], pcie_cfg_data, .compatible strings | expand

Commit Message

Bjorn Helgaas Sept. 2, 2024, 8:54 p.m. UTC 
From: Bjorn Helgaas <bhelgaas@google.com>

Sort enum pcie_soc_base values.

Rename pcie_offsets_bmips_7425[] to pcie_offsets_bcm7425[] to match BCM7425
pcie_soc_base enum, bcm7425_cfg, and "brcm,bcm7425-pcie" .compatible
string.

Rename pcie_offset_bcm7278[] to pcie_offsets_bcm7278[] to match other
"pcie_offsets" names.

Rename pcie_offset_bcm7712[] to pcie_offsets_bcm7712[] to match other
"pcie_offsets" names.

Sort pcie_offsets_*[] by SoC name, move them all together, indent values
for easy reading.

Sort pcie_cfg_data structs by SoC name.

Sort .compatible strings by SoC name.

No functional change intended.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
This is based on Jim's v6 series at
https://lore.kernel.org/r/20240815225731.40276-1-james.quinlan@broadcom.com
as applied at
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=1ae791a877e7

 drivers/pci/controller/pcie-brcmstb.c | 114 +++++++++++++-------------
 1 file changed, 57 insertions(+), 57 deletions(-)

Comments

Florian Fainelli Sept. 3, 2024, 5:45 p.m. UTC | #1 
On 9/2/24 13:54, 'Bjorn Helgaas' via BCM-KERNEL-FEEDBACK-LIST,PDL wrote:
> From: Bjorn Helgaas <bhelgaas@google.com>
> 
> Sort enum pcie_soc_base values.
> 
> Rename pcie_offsets_bmips_7425[] to pcie_offsets_bcm7425[] to match BCM7425
> pcie_soc_base enum, bcm7425_cfg, and "brcm,bcm7425-pcie" .compatible
> string.
> 
> Rename pcie_offset_bcm7278[] to pcie_offsets_bcm7278[] to match other
> "pcie_offsets" names.
> 
> Rename pcie_offset_bcm7712[] to pcie_offsets_bcm7712[] to match other
> "pcie_offsets" names.
> 
> Sort pcie_offsets_*[] by SoC name, move them all together, indent values
> for easy reading.
> 
> Sort pcie_cfg_data structs by SoC name.
> 
> Sort .compatible strings by SoC name.
> 
> No functional change intended.
> 
> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>

There was some appeal in preserving the enumeration in the order in 
which the chips have been produced, like 7425, 7435 etc.. but I see we 
probably got some parts of the timeline wrong at some point anyway.

Should we push a bit further an accept a little bit of duplication and 
simply embed the array of register offsets directly into the 
pcie_cfg_data structure, rather than a pointer to to an array?
Bjorn Helgaas Sept. 10, 2024, 11:07 p.m. UTC | #2 
On Mon, Sep 02, 2024 at 03:54:56PM -0500, Bjorn Helgaas wrote:
> From: Bjorn Helgaas <bhelgaas@google.com>
> 
> Sort enum pcie_soc_base values.
> 
> Rename pcie_offsets_bmips_7425[] to pcie_offsets_bcm7425[] to match BCM7425
> pcie_soc_base enum, bcm7425_cfg, and "brcm,bcm7425-pcie" .compatible
> string.
> 
> Rename pcie_offset_bcm7278[] to pcie_offsets_bcm7278[] to match other
> "pcie_offsets" names.
> 
> Rename pcie_offset_bcm7712[] to pcie_offsets_bcm7712[] to match other
> "pcie_offsets" names.
> 
> Sort pcie_offsets_*[] by SoC name, move them all together, indent values
> for easy reading.
> 
> Sort pcie_cfg_data structs by SoC name.
> 
> Sort .compatible strings by SoC name.
> 
> No functional change intended.
> 
> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

I applied this on top of pci/controller/brcmstb for v6.12.  Krzysztof,
if you decide to apply anything else on this branch, feel free to drop
this patch first if it causes conflicts, and I can refresh it.

> ---
> This is based on Jim's v6 series at
> https://lore.kernel.org/r/20240815225731.40276-1-james.quinlan@broadcom.com
> as applied at
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=1ae791a877e7
> 
>  drivers/pci/controller/pcie-brcmstb.c | 114 +++++++++++++-------------
>  1 file changed, 57 insertions(+), 57 deletions(-)
> 
> diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
> index 21e692a57882..07b415fa04ea 100644
> --- a/drivers/pci/controller/pcie-brcmstb.c
> +++ b/drivers/pci/controller/pcie-brcmstb.c
> @@ -220,11 +220,11 @@ enum {
>  
>  enum pcie_soc_base {
>  	GENERIC,
> -	BCM7425,
> -	BCM7435,
> +	BCM2711,
>  	BCM4908,
>  	BCM7278,
> -	BCM2711,
> +	BCM7425,
> +	BCM7435,
>  	BCM7712,
>  };
>  
> @@ -1663,26 +1663,34 @@ static void brcm_pcie_remove(struct platform_device *pdev)
>  }
>  
>  static const int pcie_offsets[] = {
> -	[RGR1_SW_INIT_1] = 0x9210,
> -	[EXT_CFG_INDEX]  = 0x9000,
> -	[EXT_CFG_DATA]   = 0x9004,
> -	[PCIE_HARD_DEBUG] = 0x4204,
> -	[PCIE_INTR2_CPU_BASE] = 0x4300,
> +	[RGR1_SW_INIT_1]	= 0x9210,
> +	[EXT_CFG_INDEX]		= 0x9000,
> +	[EXT_CFG_DATA]		= 0x9004,
> +	[PCIE_HARD_DEBUG]	= 0x4204,
> +	[PCIE_INTR2_CPU_BASE]	= 0x4300,
>  };
>  
> -static const int pcie_offsets_bmips_7425[] = {
> -	[RGR1_SW_INIT_1] = 0x8010,
> -	[EXT_CFG_INDEX]  = 0x8300,
> -	[EXT_CFG_DATA]   = 0x8304,
> -	[PCIE_HARD_DEBUG] = 0x4204,
> -	[PCIE_INTR2_CPU_BASE] = 0x4300,
> +static const int pcie_offsets_bcm7278[] = {
> +	[RGR1_SW_INIT_1]	= 0xc010,
> +	[EXT_CFG_INDEX]		= 0x9000,
> +	[EXT_CFG_DATA]		= 0x9004,
> +	[PCIE_HARD_DEBUG]	= 0x4204,
> +	[PCIE_INTR2_CPU_BASE]	= 0x4300,
>  };
>  
> -static const int pcie_offset_bcm7712[] = {
> -	[EXT_CFG_INDEX]  = 0x9000,
> -	[EXT_CFG_DATA]   = 0x9004,
> -	[PCIE_HARD_DEBUG] = 0x4304,
> -	[PCIE_INTR2_CPU_BASE] = 0x4400,
> +static const int pcie_offsets_bcm7425[] = {
> +	[RGR1_SW_INIT_1]	= 0x8010,
> +	[EXT_CFG_INDEX]		= 0x8300,
> +	[EXT_CFG_DATA]		= 0x8304,
> +	[PCIE_HARD_DEBUG]	= 0x4204,
> +	[PCIE_INTR2_CPU_BASE]	= 0x4300,
> +};
> +
> +static const int pcie_offsets_bcm7712[] = {
> +	[EXT_CFG_INDEX]		= 0x9000,
> +	[EXT_CFG_DATA]		= 0x9004,
> +	[PCIE_HARD_DEBUG]	= 0x4304,
> +	[PCIE_INTR2_CPU_BASE]	= 0x4400,
>  };
>  
>  static const struct pcie_cfg_data generic_cfg = {
> @@ -1693,8 +1701,32 @@ static const struct pcie_cfg_data generic_cfg = {
>  	.num_inbound_wins = 3,
>  };
>  
> +static const struct pcie_cfg_data bcm2711_cfg = {
> +	.offsets	= pcie_offsets,
> +	.soc_base	= BCM2711,
> +	.perst_set	= brcm_pcie_perst_set_generic,
> +	.bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_generic,
> +	.num_inbound_wins = 3,
> +};
> +
> +static const struct pcie_cfg_data bcm4908_cfg = {
> +	.offsets	= pcie_offsets,
> +	.soc_base	= BCM4908,
> +	.perst_set	= brcm_pcie_perst_set_4908,
> +	.bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_generic,
> +	.num_inbound_wins = 3,
> +};
> +
> +static const struct pcie_cfg_data bcm7278_cfg = {
> +	.offsets	= pcie_offsets_bcm7278,
> +	.soc_base	= BCM7278,
> +	.perst_set	= brcm_pcie_perst_set_7278,
> +	.bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_7278,
> +	.num_inbound_wins = 3,
> +};
> +
>  static const struct pcie_cfg_data bcm7425_cfg = {
> -	.offsets	= pcie_offsets_bmips_7425,
> +	.offsets	= pcie_offsets_bcm7425,
>  	.soc_base	= BCM7425,
>  	.perst_set	= brcm_pcie_perst_set_generic,
>  	.bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_generic,
> @@ -1709,40 +1741,8 @@ static const struct pcie_cfg_data bcm7435_cfg = {
>  	.num_inbound_wins = 3,
>  };
>  
> -static const struct pcie_cfg_data bcm4908_cfg = {
> -	.offsets	= pcie_offsets,
> -	.soc_base	= BCM4908,
> -	.perst_set	= brcm_pcie_perst_set_4908,
> -	.bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_generic,
> -	.num_inbound_wins = 3,
> -};
> -
> -static const int pcie_offset_bcm7278[] = {
> -	[RGR1_SW_INIT_1] = 0xc010,
> -	[EXT_CFG_INDEX] = 0x9000,
> -	[EXT_CFG_DATA] = 0x9004,
> -	[PCIE_HARD_DEBUG] = 0x4204,
> -	[PCIE_INTR2_CPU_BASE] = 0x4300,
> -};
> -
> -static const struct pcie_cfg_data bcm7278_cfg = {
> -	.offsets	= pcie_offset_bcm7278,
> -	.soc_base	= BCM7278,
> -	.perst_set	= brcm_pcie_perst_set_7278,
> -	.bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_7278,
> -	.num_inbound_wins = 3,
> -};
> -
> -static const struct pcie_cfg_data bcm2711_cfg = {
> -	.offsets	= pcie_offsets,
> -	.soc_base	= BCM2711,
> -	.perst_set	= brcm_pcie_perst_set_generic,
> -	.bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_generic,
> -	.num_inbound_wins = 3,
> -};
> -
>  static const struct pcie_cfg_data bcm7216_cfg = {
> -	.offsets	= pcie_offset_bcm7278,
> +	.offsets	= pcie_offsets_bcm7278,
>  	.soc_base	= BCM7278,
>  	.perst_set	= brcm_pcie_perst_set_7278,
>  	.bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_7278,
> @@ -1751,7 +1751,7 @@ static const struct pcie_cfg_data bcm7216_cfg = {
>  };
>  
>  static const struct pcie_cfg_data bcm7712_cfg = {
> -	.offsets	= pcie_offset_bcm7712,
> +	.offsets	= pcie_offsets_bcm7712,
>  	.perst_set	= brcm_pcie_perst_set_7278,
>  	.bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_generic,
>  	.soc_base	= BCM7712,
> @@ -1762,11 +1762,11 @@ static const struct of_device_id brcm_pcie_match[] = {
>  	{ .compatible = "brcm,bcm2711-pcie", .data = &bcm2711_cfg },
>  	{ .compatible = "brcm,bcm4908-pcie", .data = &bcm4908_cfg },
>  	{ .compatible = "brcm,bcm7211-pcie", .data = &generic_cfg },
> -	{ .compatible = "brcm,bcm7278-pcie", .data = &bcm7278_cfg },
>  	{ .compatible = "brcm,bcm7216-pcie", .data = &bcm7216_cfg },
> -	{ .compatible = "brcm,bcm7445-pcie", .data = &generic_cfg },
> -	{ .compatible = "brcm,bcm7435-pcie", .data = &bcm7435_cfg },
> +	{ .compatible = "brcm,bcm7278-pcie", .data = &bcm7278_cfg },
>  	{ .compatible = "brcm,bcm7425-pcie", .data = &bcm7425_cfg },
> +	{ .compatible = "brcm,bcm7435-pcie", .data = &bcm7435_cfg },
> +	{ .compatible = "brcm,bcm7445-pcie", .data = &generic_cfg },
>  	{ .compatible = "brcm,bcm7712-pcie", .data = &bcm7712_cfg },
>  	{},
>  };
> -- 
> 2.34.1
>
diff mbox series

Patch

diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
index 21e692a57882..07b415fa04ea 100644
--- a/drivers/pci/controller/pcie-brcmstb.c
+++ b/drivers/pci/controller/pcie-brcmstb.c
@@ -220,11 +220,11 @@  enum {
 
 enum pcie_soc_base {
 	GENERIC,
-	BCM7425,
-	BCM7435,
+	BCM2711,
 	BCM4908,
 	BCM7278,
-	BCM2711,
+	BCM7425,
+	BCM7435,
 	BCM7712,
 };
 
@@ -1663,26 +1663,34 @@  static void brcm_pcie_remove(struct platform_device *pdev)
 }
 
 static const int pcie_offsets[] = {
-	[RGR1_SW_INIT_1] = 0x9210,
-	[EXT_CFG_INDEX]  = 0x9000,
-	[EXT_CFG_DATA]   = 0x9004,
-	[PCIE_HARD_DEBUG] = 0x4204,
-	[PCIE_INTR2_CPU_BASE] = 0x4300,
+	[RGR1_SW_INIT_1]	= 0x9210,
+	[EXT_CFG_INDEX]		= 0x9000,
+	[EXT_CFG_DATA]		= 0x9004,
+	[PCIE_HARD_DEBUG]	= 0x4204,
+	[PCIE_INTR2_CPU_BASE]	= 0x4300,
 };
 
-static const int pcie_offsets_bmips_7425[] = {
-	[RGR1_SW_INIT_1] = 0x8010,
-	[EXT_CFG_INDEX]  = 0x8300,
-	[EXT_CFG_DATA]   = 0x8304,
-	[PCIE_HARD_DEBUG] = 0x4204,
-	[PCIE_INTR2_CPU_BASE] = 0x4300,
+static const int pcie_offsets_bcm7278[] = {
+	[RGR1_SW_INIT_1]	= 0xc010,
+	[EXT_CFG_INDEX]		= 0x9000,
+	[EXT_CFG_DATA]		= 0x9004,
+	[PCIE_HARD_DEBUG]	= 0x4204,
+	[PCIE_INTR2_CPU_BASE]	= 0x4300,
 };
 
-static const int pcie_offset_bcm7712[] = {
-	[EXT_CFG_INDEX]  = 0x9000,
-	[EXT_CFG_DATA]   = 0x9004,
-	[PCIE_HARD_DEBUG] = 0x4304,
-	[PCIE_INTR2_CPU_BASE] = 0x4400,
+static const int pcie_offsets_bcm7425[] = {
+	[RGR1_SW_INIT_1]	= 0x8010,
+	[EXT_CFG_INDEX]		= 0x8300,
+	[EXT_CFG_DATA]		= 0x8304,
+	[PCIE_HARD_DEBUG]	= 0x4204,
+	[PCIE_INTR2_CPU_BASE]	= 0x4300,
+};
+
+static const int pcie_offsets_bcm7712[] = {
+	[EXT_CFG_INDEX]		= 0x9000,
+	[EXT_CFG_DATA]		= 0x9004,
+	[PCIE_HARD_DEBUG]	= 0x4304,
+	[PCIE_INTR2_CPU_BASE]	= 0x4400,
 };
 
 static const struct pcie_cfg_data generic_cfg = {
@@ -1693,8 +1701,32 @@  static const struct pcie_cfg_data generic_cfg = {
 	.num_inbound_wins = 3,
 };
 
+static const struct pcie_cfg_data bcm2711_cfg = {
+	.offsets	= pcie_offsets,
+	.soc_base	= BCM2711,
+	.perst_set	= brcm_pcie_perst_set_generic,
+	.bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_generic,
+	.num_inbound_wins = 3,
+};
+
+static const struct pcie_cfg_data bcm4908_cfg = {
+	.offsets	= pcie_offsets,
+	.soc_base	= BCM4908,
+	.perst_set	= brcm_pcie_perst_set_4908,
+	.bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_generic,
+	.num_inbound_wins = 3,
+};
+
+static const struct pcie_cfg_data bcm7278_cfg = {
+	.offsets	= pcie_offsets_bcm7278,
+	.soc_base	= BCM7278,
+	.perst_set	= brcm_pcie_perst_set_7278,
+	.bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_7278,
+	.num_inbound_wins = 3,
+};
+
 static const struct pcie_cfg_data bcm7425_cfg = {
-	.offsets	= pcie_offsets_bmips_7425,
+	.offsets	= pcie_offsets_bcm7425,
 	.soc_base	= BCM7425,
 	.perst_set	= brcm_pcie_perst_set_generic,
 	.bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_generic,
@@ -1709,40 +1741,8 @@  static const struct pcie_cfg_data bcm7435_cfg = {
 	.num_inbound_wins = 3,
 };
 
-static const struct pcie_cfg_data bcm4908_cfg = {
-	.offsets	= pcie_offsets,
-	.soc_base	= BCM4908,
-	.perst_set	= brcm_pcie_perst_set_4908,
-	.bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_generic,
-	.num_inbound_wins = 3,
-};
-
-static const int pcie_offset_bcm7278[] = {
-	[RGR1_SW_INIT_1] = 0xc010,
-	[EXT_CFG_INDEX] = 0x9000,
-	[EXT_CFG_DATA] = 0x9004,
-	[PCIE_HARD_DEBUG] = 0x4204,
-	[PCIE_INTR2_CPU_BASE] = 0x4300,
-};
-
-static const struct pcie_cfg_data bcm7278_cfg = {
-	.offsets	= pcie_offset_bcm7278,
-	.soc_base	= BCM7278,
-	.perst_set	= brcm_pcie_perst_set_7278,
-	.bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_7278,
-	.num_inbound_wins = 3,
-};
-
-static const struct pcie_cfg_data bcm2711_cfg = {
-	.offsets	= pcie_offsets,
-	.soc_base	= BCM2711,
-	.perst_set	= brcm_pcie_perst_set_generic,
-	.bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_generic,
-	.num_inbound_wins = 3,
-};
-
 static const struct pcie_cfg_data bcm7216_cfg = {
-	.offsets	= pcie_offset_bcm7278,
+	.offsets	= pcie_offsets_bcm7278,
 	.soc_base	= BCM7278,
 	.perst_set	= brcm_pcie_perst_set_7278,
 	.bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_7278,
@@ -1751,7 +1751,7 @@  static const struct pcie_cfg_data bcm7216_cfg = {
 };
 
 static const struct pcie_cfg_data bcm7712_cfg = {
-	.offsets	= pcie_offset_bcm7712,
+	.offsets	= pcie_offsets_bcm7712,
 	.perst_set	= brcm_pcie_perst_set_7278,
 	.bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_generic,
 	.soc_base	= BCM7712,
@@ -1762,11 +1762,11 @@  static const struct of_device_id brcm_pcie_match[] = {
 	{ .compatible = "brcm,bcm2711-pcie", .data = &bcm2711_cfg },
 	{ .compatible = "brcm,bcm4908-pcie", .data = &bcm4908_cfg },
 	{ .compatible = "brcm,bcm7211-pcie", .data = &generic_cfg },
-	{ .compatible = "brcm,bcm7278-pcie", .data = &bcm7278_cfg },
 	{ .compatible = "brcm,bcm7216-pcie", .data = &bcm7216_cfg },
-	{ .compatible = "brcm,bcm7445-pcie", .data = &generic_cfg },
-	{ .compatible = "brcm,bcm7435-pcie", .data = &bcm7435_cfg },
+	{ .compatible = "brcm,bcm7278-pcie", .data = &bcm7278_cfg },
 	{ .compatible = "brcm,bcm7425-pcie", .data = &bcm7425_cfg },
+	{ .compatible = "brcm,bcm7435-pcie", .data = &bcm7435_cfg },
+	{ .compatible = "brcm,bcm7445-pcie", .data = &generic_cfg },
 	{ .compatible = "brcm,bcm7712-pcie", .data = &bcm7712_cfg },
 	{},
 };