Skip to contentSkip to conversation

PCI: rcar: avoid defines prefixed with CONFIG

PATCH Applied Lukas Bulwahn 4 participants 7 messages Jan 13, 2023 – Mar 10, 2023

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 PCI: rcar: avoid defines prefixed with CONFIG

Defines prefixed with "CONFIG" should be limited to proper Kconfig options, that are introduced in a Kconfig file.

Here, a definition for a bitmask to configure the SEND_ENABLE mode is named CONFIG_SEND_ENABLE.

Rename this local definition to CONFIGURE_SEND_ENABLE to avoid defines prefixed with "CONFIG".

No functional change.

---
 drivers/pci/controller/pcie-rcar-host.c | 4 ++--
 drivers/pci/controller/pcie-rcar.h      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/pci/controller/pcie-rcar-host.c +2 -2
index e4faf90feaf5..52fdafe5c877 100644
@@ -219,9 +219,9 @@ static int rcar_pcie_config_access(struct rcar_pcie_host *host,
 
 	/* Enable the configuration access */
 	if (pci_is_root_bus(bus->parent))
-		rcar_pci_write_reg(pcie, CONFIG_SEND_ENABLE | TYPE0, PCIECCTLR);
+		rcar_pci_write_reg(pcie, CONFIGURE_SEND_ENABLE | TYPE0, PCIECCTLR);
 	else
-		rcar_pci_write_reg(pcie, CONFIG_SEND_ENABLE | TYPE1, PCIECCTLR);
+		rcar_pci_write_reg(pcie, CONFIGURE_SEND_ENABLE | TYPE1, PCIECCTLR);
 
 	/* Check for errors */
 	if (rcar_pci_read_reg(pcie, PCIEERRFR) & UNSUPPORTED_REQUEST)
drivers/pci/controller/pcie-rcar.h +1 -1
index 9bb125db85c6..a09f58ab04ca 100644
@@ -11,7 +11,7 @@
 
 #define PCIECAR			0x000010
 #define PCIECCTLR		0x000018
-#define  CONFIG_SEND_ENABLE	BIT(31)
+#define  CONFIGURE_SEND_ENABLE	BIT(31)
 #define  TYPE0			(0 << 8)
 #define  TYPE1			BIT(8)
 #define PCIECDR			0x000020
Signature · 1 line
2.17.1
#1 lore raw

Hi Lukas,

Quoted 6 lines · Lukas Bulwahn

Defines prefixed with "CONFIG" should be limited to proper Kconfig options, that are introduced in a Kconfig file.

Here, a definition for a bitmask to configure the SEND_ENABLE mode is named CONFIG_SEND_ENABLE.

Quoted 6 lines

Rename this local definition to CONFIGURE_SEND_ENABLE to avoid defines prefixed with "CONFIG".

No functional change.

Thanks for your patch!

drivers/pci/controller/pcie-rcar.h line 14

Quoted 8 lines
drivers/pci/controller/pcie-rcar.h +1 -1
@@ -11,7 +11,7 @@
 
 #define PCIECAR                        0x000010
 #define PCIECCTLR              0x000018
-#define  CONFIG_SEND_ENABLE    BIT(31)
+#define  CONFIGURE_SEND_ENABLE BIT(31)

The R-Car Gen3 rev. 2.30 Hardware User's Manual calls the bit "CCIE".

Hence if I would have written the driver, I would have used

    #define PCIECCTLR_CCIE     BIT(31)   /* Configuration Send Enable */

drivers/pci/controller/pcie-rcar.h line 17

Quoted 3 lines
drivers/pci/controller/pcie-rcar.h +0 -0
 #define  TYPE0                 (0 << 8)
 #define  TYPE1                 BIT(8)
 #define PCIECDR                        0x000020

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

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

Reviewed-by
#2 lore raw
Quoted 27 lines · Geert Uytterhoeven
Quoted 6 lines · Lukas Bulwahn

Defines prefixed with "CONFIG" should be limited to proper Kconfig options, that are introduced in a Kconfig file.

Here, a definition for a bitmask to configure the SEND_ENABLE mode is named CONFIG_SEND_ENABLE.

Quoted 6 lines

Rename this local definition to CONFIGURE_SEND_ENABLE to avoid defines prefixed with "CONFIG".

No functional change.

Thanks for your patch!

drivers/pci/controller/pcie-rcar.h line 14

Quoted 8 lines
drivers/pci/controller/pcie-rcar.h +1 -1
@@ -11,7 +11,7 @@
 
 #define PCIECAR                        0x000010
 #define PCIECCTLR              0x000018
-#define  CONFIG_SEND_ENABLE    BIT(31)
+#define  CONFIGURE_SEND_ENABLE BIT(31)

The R-Car Gen3 rev. 2.30 Hardware User's Manual calls the bit "CCIE".

Quoted 3 lines

Hence if I would have written the driver, I would have used

    #define PCIECCTLR_CCIE     BIT(31)   /* Configuration Send Enable */

Regardless:

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

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

#3 lore raw
In reply to Geert Uytterhoeven
Quoted 29 lines · Geert Uytterhoeven

Hi Lukas,

Quoted 6 lines · Lukas Bulwahn

Defines prefixed with "CONFIG" should be limited to proper Kconfig options, that are introduced in a Kconfig file.

Here, a definition for a bitmask to configure the SEND_ENABLE mode is named CONFIG_SEND_ENABLE.

Quoted 6 lines

Rename this local definition to CONFIGURE_SEND_ENABLE to avoid defines prefixed with "CONFIG".

No functional change.

Thanks for your patch!

drivers/pci/controller/pcie-rcar.h line 14

Quoted 8 lines
drivers/pci/controller/pcie-rcar.h +1 -1
@@ -11,7 +11,7 @@
 
 #define PCIECAR                        0x000010
 #define PCIECCTLR              0x000018
-#define  CONFIG_SEND_ENABLE    BIT(31)
+#define  CONFIGURE_SEND_ENABLE BIT(31)

The R-Car Gen3 rev. 2.30 Hardware User's Manual calls the bit "CCIE".

Quoted 3 lines

Hence if I would have written the driver, I would have used

    #define PCIECCTLR_CCIE     BIT(31)   /* Configuration Send Enable */

Should I change it when I merge it ? That makes sense actually.

Thanks,
Lorenzo

Quoted 14 lines

drivers/pci/controller/pcie-rcar.h line 17

Quoted 3 lines
drivers/pci/controller/pcie-rcar.h +0 -0
 #define  TYPE0                 (0 << 8)
 #define  TYPE1                 BIT(8)
 #define PCIECDR                        0x000020

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

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

#4 lore raw
Quoted 30 lines · Lorenzo Pieralisi
Quoted 29 lines · Geert Uytterhoeven

Hi Lukas,

Quoted 6 lines · Lukas Bulwahn

Defines prefixed with "CONFIG" should be limited to proper Kconfig options, that are introduced in a Kconfig file.

Here, a definition for a bitmask to configure the SEND_ENABLE mode is named CONFIG_SEND_ENABLE.

Quoted 6 lines

Rename this local definition to CONFIGURE_SEND_ENABLE to avoid defines prefixed with "CONFIG".

No functional change.

Thanks for your patch!

drivers/pci/controller/pcie-rcar.h line 14

Quoted 8 lines
drivers/pci/controller/pcie-rcar.h +1 -1
@@ -11,7 +11,7 @@
 
 #define PCIECAR                        0x000010
 #define PCIECCTLR              0x000018
-#define  CONFIG_SEND_ENABLE    BIT(31)
+#define  CONFIGURE_SEND_ENABLE BIT(31)

The R-Car Gen3 rev. 2.30 Hardware User's Manual calls the bit "CCIE".

Quoted 5 lines
Quoted 3 lines

Hence if I would have written the driver, I would have used

    #define PCIECCTLR_CCIE     BIT(31)   /* Configuration Send Enable */

Should I change it when I merge it ? That makes sense actually.

If I don't hear from anybody I will make the change above and merge it.

Thanks,
Lorenzo

Quoted 18 lines

Thanks,
Lorenzo

Quoted 14 lines

drivers/pci/controller/pcie-rcar.h line 17

Quoted 3 lines
drivers/pci/controller/pcie-rcar.h +0 -0
 #define  TYPE0                 (0 << 8)
 #define  TYPE1                 BIT(8)
 #define PCIECDR                        0x000020

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

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

#5 lore raw
In reply to Lukas Bulwahn

Hi Lukas,

Quoted 10 lines · Lukas Bulwahn

Defines prefixed with "CONFIG" should be limited to proper Kconfig options, that are introduced in a Kconfig file.

Here, a definition for a bitmask to configure the SEND_ENABLE mode is named CONFIG_SEND_ENABLE.

Rename this local definition to CONFIGURE_SEND_ENABLE to avoid defines prefixed with "CONFIG".

No functional change.

If you update this patch, please capitalize the subject to match:

  $ git log --oneline drivers/pci/controller/pcie-rcar-host.c
  6e36203bc14c ("PCI: rcar: Use PCI_SET_ERROR_RESPONSE after read which triggered an exception")
  84b576146294 ("PCI: rcar: Finish transition to L1 state in rcar_pcie_config_access()")
  d2a14b54989e ("PCI: rcar: Check if device is runtime suspended instead of __clk_is_enabled()")
  a115b1bd3af0 ("PCI: rcar: Add L1 link state fix into data abort hook")
  83ed8d4fa656 ("PCI: rcar: Convert to MSI domains")

Bjorn

maintainer Applied
#6 lore raw
In reply to Lukas Bulwahn
Quoted 10 lines · Lukas Bulwahn

Defines prefixed with "CONFIG" should be limited to proper Kconfig options, that are introduced in a Kconfig file.

Here, a definition for a bitmask to configure the SEND_ENABLE mode is named CONFIG_SEND_ENABLE.

Rename this local definition to CONFIGURE_SEND_ENABLE to avoid defines prefixed with "CONFIG".

[...]

Applied to pci/rcar, thanks!

[1/1] PCI: rcar: avoid defines prefixed with CONFIG

      https://git.kernel.org/pci/pci/c/727de4c08768

Thanks,
Lorenzo