* [PATCH V3] PCI: rcar: Clean up the macros
@ 2018-04-08 18:04 Marek Vasut
2018-04-08 18:18 ` Randy Dunlap
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Marek Vasut @ 2018-04-08 18:04 UTC (permalink / raw)
To: linux-pci
Cc: Marek Vasut, Geert Uytterhoeven, Phil Edworthy, Simon Horman,
Wolfram Sang, linux-renesas-soc
This patch replaces the (1 << n) with BIT(n) and cleans up whitespace,
no functional change.
Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: Phil Edworthy <phil.edworthy@renesas.com>
Cc: Simon Horman <horms+renesas@verge.net.au>
Cc: Wolfram Sang <wsa@the-dreams.de>
Cc: linux-renesas-soc@vger.kernel.org
Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
---
V2: Reword the commit message
V3: Add bitops.h
---
drivers/pci/host/pcie-rcar.c | 53 ++++++++++++++++++++++----------------------
1 file changed, 27 insertions(+), 26 deletions(-)
diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c
index 25f68305322c..e403c5206b24 100644
--- a/drivers/pci/host/pcie-rcar.c
+++ b/drivers/pci/host/pcie-rcar.c
@@ -11,6 +11,7 @@
* Author: Phil Edworthy <phil.edworthy@renesas.com>
*/
+#include <linux/bitops.h>
#include <linux/clk.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
@@ -30,9 +31,9 @@
#define PCIECAR 0x000010
#define PCIECCTLR 0x000018
-#define CONFIG_SEND_ENABLE (1 << 31)
+#define CONFIG_SEND_ENABLE BIT(31)
#define TYPE0 (0 << 8)
-#define TYPE1 (1 << 8)
+#define TYPE1 BIT(8)
#define PCIECDR 0x000020
#define PCIEMSR 0x000028
#define PCIEINTXR 0x000400
@@ -44,7 +45,7 @@
#define PCIETSTR 0x02004
#define DATA_LINK_ACTIVE 1
#define PCIEERRFR 0x02020
-#define UNSUPPORTED_REQUEST (1 << 4)
+#define UNSUPPORTED_REQUEST BIT(4)
#define PCIEMSIFR 0x02044
#define PCIEMSIALR 0x02048
#define MSIFE 1
@@ -57,17 +58,17 @@
/* local address reg & mask */
#define PCIELAR(x) (0x02200 + ((x) * 0x20))
#define PCIELAMR(x) (0x02208 + ((x) * 0x20))
-#define LAM_PREFETCH (1 << 3)
-#define LAM_64BIT (1 << 2)
-#define LAR_ENABLE (1 << 1)
+#define LAM_PREFETCH BIT(3)
+#define LAM_64BIT BIT(2)
+#define LAR_ENABLE BIT(1)
/* PCIe address reg & mask */
#define PCIEPALR(x) (0x03400 + ((x) * 0x20))
#define PCIEPAUR(x) (0x03404 + ((x) * 0x20))
#define PCIEPAMR(x) (0x03408 + ((x) * 0x20))
#define PCIEPTCTLR(x) (0x0340c + ((x) * 0x20))
-#define PAR_ENABLE (1 << 31)
-#define IO_SPACE (1 << 8)
+#define PAR_ENABLE BIT(31)
+#define IO_SPACE BIT(8)
/* Configuration */
#define PCICONF(x) (0x010000 + ((x) * 0x4))
@@ -79,23 +80,23 @@
#define IDSETR1 0x011004
#define TLCTLR 0x011048
#define MACSR 0x011054
-#define SPCHGFIN (1 << 4)
-#define SPCHGFAIL (1 << 6)
-#define SPCHGSUC (1 << 7)
+#define SPCHGFIN BIT(4)
+#define SPCHGFAIL BIT(6)
+#define SPCHGSUC BIT(7)
#define LINK_SPEED (0xf << 16)
#define LINK_SPEED_2_5GTS (1 << 16)
#define LINK_SPEED_5_0GTS (2 << 16)
#define MACCTLR 0x011058
-#define SPEED_CHANGE (1 << 24)
-#define SCRAMBLE_DISABLE (1 << 27)
+#define SPEED_CHANGE BIT(24)
+#define SCRAMBLE_DISABLE BIT(27)
#define MACS2R 0x011078
#define MACCGSPSETR 0x011084
-#define SPCNGRSN (1 << 31)
+#define SPCNGRSN BIT(31)
/* R-Car H1 PHY */
#define H1_PCIEPHYADRR 0x04000c
-#define WRITE_CMD (1 << 16)
-#define PHY_ACK (1 << 24)
+#define WRITE_CMD BIT(16)
+#define PHY_ACK BIT(24)
#define RATE_POS 12
#define LANE_POS 8
#define ADR_POS 0
@@ -107,19 +108,19 @@
#define GEN2_PCIEPHYDATA 0x784
#define GEN2_PCIEPHYCTRL 0x78c
-#define INT_PCI_MSI_NR 32
+#define INT_PCI_MSI_NR 32
-#define RCONF(x) (PCICONF(0)+(x))
-#define RPMCAP(x) (PMCAP(0)+(x))
-#define REXPCAP(x) (EXPCAP(0)+(x))
-#define RVCCAP(x) (VCCAP(0)+(x))
+#define RCONF(x) (PCICONF(0) + (x))
+#define RPMCAP(x) (PMCAP(0) + (x))
+#define REXPCAP(x) (EXPCAP(0) + (x))
+#define RVCCAP(x) (VCCAP(0) + (x))
-#define PCIE_CONF_BUS(b) (((b) & 0xff) << 24)
-#define PCIE_CONF_DEV(d) (((d) & 0x1f) << 19)
-#define PCIE_CONF_FUNC(f) (((f) & 0x7) << 16)
+#define PCIE_CONF_BUS(b) (((b) & 0xff) << 24)
+#define PCIE_CONF_DEV(d) (((d) & 0x1f) << 19)
+#define PCIE_CONF_FUNC(f) (((f) & 0x7) << 16)
-#define RCAR_PCI_MAX_RESOURCES 4
-#define MAX_NR_INBOUND_MAPS 6
+#define RCAR_PCI_MAX_RESOURCES 4
+#define MAX_NR_INBOUND_MAPS 6
struct rcar_msi {
DECLARE_BITMAP(used, INT_PCI_MSI_NR);
--
2.16.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH V3] PCI: rcar: Clean up the macros
2018-04-08 18:04 [PATCH V3] PCI: rcar: Clean up the macros Marek Vasut
@ 2018-04-08 18:18 ` Randy Dunlap
2018-04-09 8:08 ` Geert Uytterhoeven
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Randy Dunlap @ 2018-04-08 18:18 UTC (permalink / raw)
To: Marek Vasut, linux-pci
Cc: Marek Vasut, Geert Uytterhoeven, Phil Edworthy, Simon Horman,
Wolfram Sang, linux-renesas-soc
On 04/08/2018 11:04 AM, Marek Vasut wrote:
> This patch replaces the (1 << n) with BIT(n) and cleans up whitespace,
> no functional change.
>
> Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
> Cc: Geert Uytterhoeven <geert+renesas@glider.be>
> Cc: Phil Edworthy <phil.edworthy@renesas.com>
> Cc: Simon Horman <horms+renesas@verge.net.au>
> Cc: Wolfram Sang <wsa@the-dreams.de>
> Cc: linux-renesas-soc@vger.kernel.org
> Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Thanks.
> ---
> V2: Reword the commit message
> V3: Add bitops.h
> ---
> drivers/pci/host/pcie-rcar.c | 53 ++++++++++++++++++++++----------------------
> 1 file changed, 27 insertions(+), 26 deletions(-)
>
> diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c
> index 25f68305322c..e403c5206b24 100644
> --- a/drivers/pci/host/pcie-rcar.c
> +++ b/drivers/pci/host/pcie-rcar.c
> @@ -11,6 +11,7 @@
> * Author: Phil Edworthy <phil.edworthy@renesas.com>
> */
>
> +#include <linux/bitops.h>
> #include <linux/clk.h>
> #include <linux/delay.h>
> #include <linux/interrupt.h>
> @@ -30,9 +31,9 @@
>
> #define PCIECAR 0x000010
> #define PCIECCTLR 0x000018
> -#define CONFIG_SEND_ENABLE (1 << 31)
> +#define CONFIG_SEND_ENABLE BIT(31)
> #define TYPE0 (0 << 8)
> -#define TYPE1 (1 << 8)
> +#define TYPE1 BIT(8)
> #define PCIECDR 0x000020
> #define PCIEMSR 0x000028
> #define PCIEINTXR 0x000400
> @@ -44,7 +45,7 @@
> #define PCIETSTR 0x02004
> #define DATA_LINK_ACTIVE 1
> #define PCIEERRFR 0x02020
> -#define UNSUPPORTED_REQUEST (1 << 4)
> +#define UNSUPPORTED_REQUEST BIT(4)
> #define PCIEMSIFR 0x02044
> #define PCIEMSIALR 0x02048
> #define MSIFE 1
> @@ -57,17 +58,17 @@
> /* local address reg & mask */
> #define PCIELAR(x) (0x02200 + ((x) * 0x20))
> #define PCIELAMR(x) (0x02208 + ((x) * 0x20))
> -#define LAM_PREFETCH (1 << 3)
> -#define LAM_64BIT (1 << 2)
> -#define LAR_ENABLE (1 << 1)
> +#define LAM_PREFETCH BIT(3)
> +#define LAM_64BIT BIT(2)
> +#define LAR_ENABLE BIT(1)
>
> /* PCIe address reg & mask */
> #define PCIEPALR(x) (0x03400 + ((x) * 0x20))
> #define PCIEPAUR(x) (0x03404 + ((x) * 0x20))
> #define PCIEPAMR(x) (0x03408 + ((x) * 0x20))
> #define PCIEPTCTLR(x) (0x0340c + ((x) * 0x20))
> -#define PAR_ENABLE (1 << 31)
> -#define IO_SPACE (1 << 8)
> +#define PAR_ENABLE BIT(31)
> +#define IO_SPACE BIT(8)
>
> /* Configuration */
> #define PCICONF(x) (0x010000 + ((x) * 0x4))
> @@ -79,23 +80,23 @@
> #define IDSETR1 0x011004
> #define TLCTLR 0x011048
> #define MACSR 0x011054
> -#define SPCHGFIN (1 << 4)
> -#define SPCHGFAIL (1 << 6)
> -#define SPCHGSUC (1 << 7)
> +#define SPCHGFIN BIT(4)
> +#define SPCHGFAIL BIT(6)
> +#define SPCHGSUC BIT(7)
> #define LINK_SPEED (0xf << 16)
> #define LINK_SPEED_2_5GTS (1 << 16)
> #define LINK_SPEED_5_0GTS (2 << 16)
> #define MACCTLR 0x011058
> -#define SPEED_CHANGE (1 << 24)
> -#define SCRAMBLE_DISABLE (1 << 27)
> +#define SPEED_CHANGE BIT(24)
> +#define SCRAMBLE_DISABLE BIT(27)
> #define MACS2R 0x011078
> #define MACCGSPSETR 0x011084
> -#define SPCNGRSN (1 << 31)
> +#define SPCNGRSN BIT(31)
>
> /* R-Car H1 PHY */
> #define H1_PCIEPHYADRR 0x04000c
> -#define WRITE_CMD (1 << 16)
> -#define PHY_ACK (1 << 24)
> +#define WRITE_CMD BIT(16)
> +#define PHY_ACK BIT(24)
> #define RATE_POS 12
> #define LANE_POS 8
> #define ADR_POS 0
> @@ -107,19 +108,19 @@
> #define GEN2_PCIEPHYDATA 0x784
> #define GEN2_PCIEPHYCTRL 0x78c
>
> -#define INT_PCI_MSI_NR 32
> +#define INT_PCI_MSI_NR 32
>
> -#define RCONF(x) (PCICONF(0)+(x))
> -#define RPMCAP(x) (PMCAP(0)+(x))
> -#define REXPCAP(x) (EXPCAP(0)+(x))
> -#define RVCCAP(x) (VCCAP(0)+(x))
> +#define RCONF(x) (PCICONF(0) + (x))
> +#define RPMCAP(x) (PMCAP(0) + (x))
> +#define REXPCAP(x) (EXPCAP(0) + (x))
> +#define RVCCAP(x) (VCCAP(0) + (x))
>
> -#define PCIE_CONF_BUS(b) (((b) & 0xff) << 24)
> -#define PCIE_CONF_DEV(d) (((d) & 0x1f) << 19)
> -#define PCIE_CONF_FUNC(f) (((f) & 0x7) << 16)
> +#define PCIE_CONF_BUS(b) (((b) & 0xff) << 24)
> +#define PCIE_CONF_DEV(d) (((d) & 0x1f) << 19)
> +#define PCIE_CONF_FUNC(f) (((f) & 0x7) << 16)
>
> -#define RCAR_PCI_MAX_RESOURCES 4
> -#define MAX_NR_INBOUND_MAPS 6
> +#define RCAR_PCI_MAX_RESOURCES 4
> +#define MAX_NR_INBOUND_MAPS 6
>
> struct rcar_msi {
> DECLARE_BITMAP(used, INT_PCI_MSI_NR);
>
--
~Randy
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH V3] PCI: rcar: Clean up the macros
2018-04-08 18:04 [PATCH V3] PCI: rcar: Clean up the macros Marek Vasut
2018-04-08 18:18 ` Randy Dunlap
@ 2018-04-09 8:08 ` Geert Uytterhoeven
2018-04-09 11:24 ` Simon Horman
2018-05-01 5:53 ` Simon Horman
3 siblings, 0 replies; 6+ messages in thread
From: Geert Uytterhoeven @ 2018-04-09 8:08 UTC (permalink / raw)
To: Marek Vasut
Cc: linux-pci, Marek Vasut, Geert Uytterhoeven, Phil Edworthy,
Simon Horman, Wolfram Sang, Linux-Renesas
On Sun, Apr 8, 2018 at 8:04 PM, Marek Vasut <marek.vasut@gmail.com> wrote:
> This patch replaces the (1 << n) with BIT(n) and cleans up whitespace,
> no functional change.
>
> Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH V3] PCI: rcar: Clean up the macros
2018-04-08 18:04 [PATCH V3] PCI: rcar: Clean up the macros Marek Vasut
2018-04-08 18:18 ` Randy Dunlap
2018-04-09 8:08 ` Geert Uytterhoeven
@ 2018-04-09 11:24 ` Simon Horman
2018-05-01 5:53 ` Simon Horman
3 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2018-04-09 11:24 UTC (permalink / raw)
To: Marek Vasut
Cc: linux-pci, Marek Vasut, Geert Uytterhoeven, Phil Edworthy,
Wolfram Sang, linux-renesas-soc
On Sun, Apr 08, 2018 at 08:04:31PM +0200, Marek Vasut wrote:
> This patch replaces the (1 << n) with BIT(n) and cleans up whitespace,
> no functional change.
>
> Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
> Cc: Geert Uytterhoeven <geert+renesas@glider.be>
> Cc: Phil Edworthy <phil.edworthy@renesas.com>
> Cc: Simon Horman <horms+renesas@verge.net.au>
> Cc: Wolfram Sang <wsa@the-dreams.de>
> Cc: linux-renesas-soc@vger.kernel.org
> Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH V3] PCI: rcar: Clean up the macros
2018-04-08 18:04 [PATCH V3] PCI: rcar: Clean up the macros Marek Vasut
` (2 preceding siblings ...)
2018-04-09 11:24 ` Simon Horman
@ 2018-05-01 5:53 ` Simon Horman
2018-05-01 10:53 ` Lorenzo Pieralisi
3 siblings, 1 reply; 6+ messages in thread
From: Simon Horman @ 2018-05-01 5:53 UTC (permalink / raw)
To: Lorenzo Pieralisi, Marek Vasut
Cc: linux-pci, Marek Vasut, Geert Uytterhoeven, Phil Edworthy,
Wolfram Sang, linux-renesas-soc
On Sun, Apr 08, 2018 at 08:04:31PM +0200, Marek Vasut wrote:
> This patch replaces the (1 << n) with BIT(n) and cleans up whitespace,
> no functional change.
>
> Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
> Cc: Geert Uytterhoeven <geert+renesas@glider.be>
> Cc: Phil Edworthy <phil.edworthy@renesas.com>
> Cc: Simon Horman <horms+renesas@verge.net.au>
> Cc: Wolfram Sang <wsa@the-dreams.de>
> Cc: linux-renesas-soc@vger.kernel.org
> Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Marek, thanks for your patch.
Lorenzo, this seems pretty well baked.
Could you consider applying it?
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH V3] PCI: rcar: Clean up the macros
2018-05-01 5:53 ` Simon Horman
@ 2018-05-01 10:53 ` Lorenzo Pieralisi
0 siblings, 0 replies; 6+ messages in thread
From: Lorenzo Pieralisi @ 2018-05-01 10:53 UTC (permalink / raw)
To: Simon Horman
Cc: Marek Vasut, linux-pci, Marek Vasut, Geert Uytterhoeven,
Phil Edworthy, Wolfram Sang, linux-renesas-soc
On Tue, May 01, 2018 at 07:53:19AM +0200, Simon Horman wrote:
> On Sun, Apr 08, 2018 at 08:04:31PM +0200, Marek Vasut wrote:
> > This patch replaces the (1 << n) with BIT(n) and cleans up whitespace,
> > no functional change.
> >
> > Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
> > Cc: Geert Uytterhoeven <geert+renesas@glider.be>
> > Cc: Phil Edworthy <phil.edworthy@renesas.com>
> > Cc: Simon Horman <horms+renesas@verge.net.au>
> > Cc: Wolfram Sang <wsa@the-dreams.de>
> > Cc: linux-renesas-soc@vger.kernel.org
> > Reviewed-by: Niklas S??derlund <niklas.soderlund+renesas@ragnatech.se>
>
> Marek, thanks for your patch.
>
> Lorenzo, this seems pretty well baked.
> Could you consider applying it?
>
> Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
Applied to pci/rcar for v4.18, thanks.
Lorenzo
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-05-01 10:53 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-04-08 18:04 [PATCH V3] PCI: rcar: Clean up the macros Marek Vasut
2018-04-08 18:18 ` Randy Dunlap
2018-04-09 8:08 ` Geert Uytterhoeven
2018-04-09 11:24 ` Simon Horman
2018-05-01 5:53 ` Simon Horman
2018-05-01 10:53 ` Lorenzo Pieralisi
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.