Skip to contentSkip to conversation

gpio: dwapb: clarify usage of the register file version

PATCH In review Andy Shevchenko 3 participants 5 messages Nov 30, 2021 – Dec 1, 2021

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

PATCH 1/1 gpio: dwapb: clarify usage of the register file version

First of all, it's obvious that different versions can't be provided simultaneously. Hence, versions can't be bit masks.

Second, due to above we have to mask out the version field in the flags and only that can be evaluated against the certain version.

Clarify all above by:
- introducing GPIO_REG_OFFSET_V1 and GPIO_REG_OFFSET_MASK
- replacing conditional to mask out bits and compare to a version

Luckily there is no functional change (at least intended), so no need to backport this.

---
 drivers/gpio/gpio-dwapb.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/gpio/gpio-dwapb.c +6 -4
index f98fa33e1679..ec0767d7800d 100644
@@ -53,7 +53,9 @@
 #define GPIO_SWPORT_DR_STRIDE	0x0c /* register stride 3*32 bits */
 #define GPIO_SWPORT_DDR_STRIDE	0x0c /* register stride 3*32 bits */
 
+#define GPIO_REG_OFFSET_V1	0
 #define GPIO_REG_OFFSET_V2	1
+#define GPIO_REG_OFFSET_MASK	BIT(0)
 
 #define GPIO_INTMASK_V2		0x44
 #define GPIO_INTTYPE_LEVEL_V2	0x34
@@ -141,7 +143,7 @@ static inline u32 gpio_reg_v2_convert(unsigned int offset)
 
 static inline u32 gpio_reg_convert(struct dwapb_gpio *gpio, unsigned int offset)
 {
-	if (gpio->flags & GPIO_REG_OFFSET_V2)
+	if ((gpio->flags & GPIO_REG_OFFSET_MASK) == GPIO_REG_OFFSET_V2)
 		return gpio_reg_v2_convert(offset);
 
 	return offset;
@@ -668,15 +670,15 @@ static int dwapb_get_clks(struct dwapb_gpio *gpio)
 }
 
 static const struct of_device_id dwapb_of_match[] = {
-	{ .compatible = "snps,dw-apb-gpio", .data = (void *)0},
+	{ .compatible = "snps,dw-apb-gpio", .data = (void *)GPIO_REG_OFFSET_V1},
 	{ .compatible = "apm,xgene-gpio-v2", .data = (void *)GPIO_REG_OFFSET_V2},
 	{ /* Sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, dwapb_of_match);
 
 static const struct acpi_device_id dwapb_acpi_match[] = {
-	{"HISI0181", 0},
-	{"APMC0D07", 0},
+	{"HISI0181", GPIO_REG_OFFSET_V1},
+	{"APMC0D07", GPIO_REG_OFFSET_V1},
 	{"APMC0D81", GPIO_REG_OFFSET_V2},
 	{ }
 };
Signature · 1 line
2.33.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 62 lines · Andy Shevchenko

First of all, it's obvious that different versions can't be provided simultaneously. Hence, versions can't be bit masks.

Second, due to above we have to mask out the version field in the flags and only that can be evaluated against the certain version.

Clarify all above by:
- introducing GPIO_REG_OFFSET_V1 and GPIO_REG_OFFSET_MASK
- replacing conditional to mask out bits and compare to a version

Luckily there is no functional change (at least intended), so no need to backport this.

---
 drivers/gpio/gpio-dwapb.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/gpio/gpio-dwapb.c +6 -5
index f98fa33e1679..ec0767d7800d 100644
@@ -53,7 +53,9 @@
 #define GPIO_SWPORT_DR_STRIDE  0x0c /* register stride 3*32 bits */
 #define GPIO_SWPORT_DDR_STRIDE 0x0c /* register stride 3*32 bits */
 
+#define GPIO_REG_OFFSET_V1     0
 #define GPIO_REG_OFFSET_V2     1
+#define GPIO_REG_OFFSET_MASK   BIT(0)
 
 #define GPIO_INTMASK_V2                0x44
 #define GPIO_INTTYPE_LEVEL_V2  0x34
@@ -141,7 +143,7 @@ static inline u32 gpio_reg_v2_convert(unsigned int offset)
 
 static inline u32 gpio_reg_convert(struct dwapb_gpio *gpio, unsigned int offset)
 {
-       if (gpio->flags & GPIO_REG_OFFSET_V2)
+       if ((gpio->flags & GPIO_REG_OFFSET_MASK) == GPIO_REG_OFFSET_V2)
                return gpio_reg_v2_convert(offset);
 
        return offset;
@@ -668,15 +670,15 @@ static int dwapb_get_clks(struct dwapb_gpio *gpio)
 }
 
 static const struct of_device_id dwapb_of_match[] = {
-       { .compatible = "snps,dw-apb-gpio", .data = (void *)0},
+       { .compatible = "snps,dw-apb-gpio", .data = (void *)GPIO_REG_OFFSET_V1},
        { .compatible = "apm,xgene-gpio-v2", .data = (void *)GPIO_REG_OFFSET_V2},
        { /* Sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, dwapb_of_match);
 
 static const struct acpi_device_id dwapb_acpi_match[] = {
-       {"HISI0181", 0},
-       {"APMC0D07", 0},
+       {"HISI0181", GPIO_REG_OFFSET_V1},
+       {"APMC0D07", GPIO_REG_OFFSET_V1},
        {"APMC0D81", GPIO_REG_OFFSET_V2},
        { }
 };
--
Quoted 2 lines

2.33.0

Please send it with your PR.

Bart

Acked-by on v1 1/1
#3 lore raw
In reply to Andy Shevchenko
Quoted 6 lines · Andy Shevchenko

First of all, it's obvious that different versions can't be provided simultaneously. Hence, versions can't be bit masks.

Second, due to above we have to mask out the version field in the flags and only that can be evaluated against the certain version.

Quoted 6 lines

Clarify all above by:
- introducing GPIO_REG_OFFSET_V1 and GPIO_REG_OFFSET_MASK
- replacing conditional to mask out bits and compare to a version

Luckily there is no functional change (at least intended), so no need to backport this.

Seems reasonable. Thanks.

-Sergey

Quoted 51 lines
---
 drivers/gpio/gpio-dwapb.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/gpio/gpio-dwapb.c +6 -4
index f98fa33e1679..ec0767d7800d 100644
@@ -53,7 +53,9 @@
 #define GPIO_SWPORT_DR_STRIDE	0x0c /* register stride 3*32 bits */
 #define GPIO_SWPORT_DDR_STRIDE	0x0c /* register stride 3*32 bits */
 
+#define GPIO_REG_OFFSET_V1	0
 #define GPIO_REG_OFFSET_V2	1
+#define GPIO_REG_OFFSET_MASK	BIT(0)
 
 #define GPIO_INTMASK_V2		0x44
 #define GPIO_INTTYPE_LEVEL_V2	0x34
@@ -141,7 +143,7 @@ static inline u32 gpio_reg_v2_convert(unsigned int offset)
 
 static inline u32 gpio_reg_convert(struct dwapb_gpio *gpio, unsigned int offset)
 {
-	if (gpio->flags & GPIO_REG_OFFSET_V2)
+	if ((gpio->flags & GPIO_REG_OFFSET_MASK) == GPIO_REG_OFFSET_V2)
 		return gpio_reg_v2_convert(offset);
 
 	return offset;
@@ -668,15 +670,15 @@ static int dwapb_get_clks(struct dwapb_gpio *gpio)
 }
 
 static const struct of_device_id dwapb_of_match[] = {
-	{ .compatible = "snps,dw-apb-gpio", .data = (void *)0},
+	{ .compatible = "snps,dw-apb-gpio", .data = (void *)GPIO_REG_OFFSET_V1},
 	{ .compatible = "apm,xgene-gpio-v2", .data = (void *)GPIO_REG_OFFSET_V2},
 	{ /* Sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, dwapb_of_match);
 
 static const struct acpi_device_id dwapb_acpi_match[] = {
-	{"HISI0181", 0},
-	{"APMC0D07", 0},
+	{"HISI0181", GPIO_REG_OFFSET_V1},
+	{"APMC0D07", GPIO_REG_OFFSET_V1},
 	{"APMC0D81", GPIO_REG_OFFSET_V2},
 	{ }
 };
Signature · 1 line
2.33.0
#4 lore raw
Quoted 11 lines · Serge Semin
Quoted 10 lines · Andy Shevchenko

First of all, it's obvious that different versions can't be provided simultaneously. Hence, versions can't be bit masks.

Second, due to above we have to mask out the version field in the flags and only that can be evaluated against the certain version.

Clarify all above by:
- introducing GPIO_REG_OFFSET_V1 and GPIO_REG_OFFSET_MASK
- replacing conditional to mask out bits and compare to a version

Quoted 5 lines
Quoted 2 lines

Luckily there is no functional change (at least intended), so no need to backport this.

Seems reasonable. Thanks.

Pushed to my review and testing queue, thanks!

Signature · 2 lines
With Best Regards,
Andy Shevchenko