Skip to contentSkip to conversation

gpio: tegra186: remove unneeded loop in tegra186_gpio_init_route_mapping()

PATCH Applied Tom Rix 3 participants 3 messages Jan 25, 2023 – Feb 2, 2023

Subsystems (2)
lore
Share & tools
lore

Tom Rix

author
#0 lore raw

PATCH 1/1 gpio: tegra186: remove unneeded loop in tegra186_gpio_init_route_mapping()

Reviewing the j loop over num_irqs_per_bank, in the code previous to the fixes: commit, every j was used. now only when j == 0. If only j == 0 is used, there is no need for the loop.

Fixes 210386804745 ("gpio: tegra186: Support multiple interrupts per bank")
---
 drivers/gpio/gpio-tegra186.c | 40 ++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 22 deletions(-)
drivers/gpio/gpio-tegra186.c +18 -22
index 9941f35af823..14c872b6ad05 100644
@@ -677,7 +677,7 @@ static const struct of_device_id tegra186_pmc_of_match[] = {
 static void tegra186_gpio_init_route_mapping(struct tegra_gpio *gpio)
 {
 	struct device *dev = gpio->gpio.parent;
-	unsigned int i, j;
+	unsigned int i;
 	u32 value;
 
 	for (i = 0; i < gpio->soc->num_ports; i++) {
@@ -699,27 +699,23 @@ static void tegra186_gpio_init_route_mapping(struct tegra_gpio *gpio)
 			 * On Tegra194 and later, each pin can be routed to one or more
 			 * interrupts.
 			 */
-			for (j = 0; j < gpio->num_irqs_per_bank; j++) {
-				dev_dbg(dev, "programming default interrupt routing for port %s\n",
-					port->name);
-
-				offset = TEGRA186_GPIO_INT_ROUTE_MAPPING(p, j);
-
-				/*
-				 * By default we only want to route GPIO pins to IRQ 0. This works
-				 * only under the assumption that we're running as the host kernel
-				 * and hence all GPIO pins are owned by Linux.
-				 *
-				 * For cases where Linux is the guest OS, the hypervisor will have
-				 * to configure the interrupt routing and pass only the valid
-				 * interrupts via device tree.
-				 */
-				if (j == 0) {
-					value = readl(base + offset);
-					value = BIT(port->pins) - 1;
-					writel(value, base + offset);
-				}
-			}
+			dev_dbg(dev, "programming default interrupt routing for port %s\n",
+				port->name);
+
+			offset = TEGRA186_GPIO_INT_ROUTE_MAPPING(p, 0);
+
+			/*
+			 * By default we only want to route GPIO pins to IRQ 0. This works
+			 * only under the assumption that we're running as the host kernel
+			 * and hence all GPIO pins are owned by Linux.
+			 *
+			 * For cases where Linux is the guest OS, the hypervisor will have
+			 * to configure the interrupt routing and pass only the valid
+			 * interrupts via device tree.
+			 */
+			value = readl(base + offset);
+			value = BIT(port->pins) - 1;
+			writel(value, base + offset);
 		}
 	}
 }
Signature · 1 line
2.26.3
Acked-by on v1 1/1
#1 lore raw
Quoted 55 lines · Tom Rix

Reviewing the j loop over num_irqs_per_bank, in the code previous to the fixes: commit, every j was used. now only when j == 0. If only j == 0 is used, there is no need for the loop.

Fixes 210386804745 ("gpio: tegra186: Support multiple interrupts per bank")
---
 drivers/gpio/gpio-tegra186.c | 40 ++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 22 deletions(-)
drivers/gpio/gpio-tegra186.c +8 -22
index 9941f35af823..14c872b6ad05 100644
@@ -677,7 +677,7 @@ static const struct of_device_id tegra186_pmc_of_match[] = {
 static void tegra186_gpio_init_route_mapping(struct tegra_gpio *gpio)
 {
 	struct device *dev = gpio->gpio.parent;
-	unsigned int i, j;
+	unsigned int i;
 	u32 value;
 
 	for (i = 0; i < gpio->soc->num_ports; i++) {
@@ -699,27 +699,23 @@ static void tegra186_gpio_init_route_mapping(struct tegra_gpio *gpio)
 			 * On Tegra194 and later, each pin can be routed to one or more
 			 * interrupts.
 			 */
-			for (j = 0; j < gpio->num_irqs_per_bank; j++) {
-				dev_dbg(dev, "programming default interrupt routing for port %s\n",
-					port->name);
-
-				offset = TEGRA186_GPIO_INT_ROUTE_MAPPING(p, j);
-
-				/*
-				 * By default we only want to route GPIO pins to IRQ 0. This works
-				 * only under the assumption that we're running as the host kernel
-				 * and hence all GPIO pins are owned by Linux.
-				 *
-				 * For cases where Linux is the guest OS, the hypervisor will have
-				 * to configure the interrupt routing and pass only the valid
-				 * interrupts via device tree.
-				 */
-				if (j == 0) {
-					value = readl(base + offset);
-					value = BIT(port->pins) - 1;
-					writel(value, base + offset);
-				}
-			}
+			dev_dbg(dev, "programming default interrupt routing for port %s\n",
+				port->name);
+
+			offset = TEGRA186_GPIO_INT_ROUTE_MAPPING(p, 0);
+
+			/*
+			 * By default we only want to route GPIO pins to IRQ 0. This works

drivers/gpio/gpio-tegra186.c static void tegra186_gpio_init_route_mapping(struct tegra_gpio *gpio) · line 718

Quoted 10 lines
drivers/gpio/gpio-tegra186.c +10 -0
+			 * only under the assumption that we're running as the host kernel
+			 * and hence all GPIO pins are owned by Linux.
+			 *
+			 * For cases where Linux is the guest OS, the hypervisor will have
+			 * to configure the interrupt routing and pass only the valid
+			 * interrupts via device tree.
+			 */
+			value = readl(base + offset);
+			value = BIT(port->pins) - 1;
+			writel(value, base + offset);

This was supposed to be a placeholder so that a more complex routing could be added later on. Maybe adding "j" to the debug message would have made that a bit clearer.

Anyway, no complex routing has been needed so far, so I don't have a strong objection to this. We can always add it back if we ever need it.

On the other hand, we don't do much in the loop, so leaving it as-is wouldn't be harmful either.

I'll leave it up to Linus and Bartosz to decide. If they want to pick it up:

#2 lore raw
In reply to Tom Rix
Quoted 70 lines · Tom Rix

Reviewing the j loop over num_irqs_per_bank, in the code previous to the fixes: commit, every j was used. now only when j == 0. If only j == 0 is used, there is no need for the loop.

Fixes 210386804745 ("gpio: tegra186: Support multiple interrupts per bank")
---
 drivers/gpio/gpio-tegra186.c | 40 ++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 22 deletions(-)
drivers/gpio/gpio-tegra186.c +18 -23
index 9941f35af823..14c872b6ad05 100644
@@ -677,7 +677,7 @@ static const struct of_device_id tegra186_pmc_of_match[] = {
 static void tegra186_gpio_init_route_mapping(struct tegra_gpio *gpio)
 {
        struct device *dev = gpio->gpio.parent;
-       unsigned int i, j;
+       unsigned int i;
        u32 value;
 
        for (i = 0; i < gpio->soc->num_ports; i++) {
@@ -699,27 +699,23 @@ static void tegra186_gpio_init_route_mapping(struct tegra_gpio *gpio)
                         * On Tegra194 and later, each pin can be routed to one or more
                         * interrupts.
                         */
-                       for (j = 0; j < gpio->num_irqs_per_bank; j++) {
-                               dev_dbg(dev, "programming default interrupt routing for port %s\n",
-                                       port->name);
-
-                               offset = TEGRA186_GPIO_INT_ROUTE_MAPPING(p, j);
-
-                               /*
-                                * By default we only want to route GPIO pins to IRQ 0. This works
-                                * only under the assumption that we're running as the host kernel
-                                * and hence all GPIO pins are owned by Linux.
-                                *
-                                * For cases where Linux is the guest OS, the hypervisor will have
-                                * to configure the interrupt routing and pass only the valid
-                                * interrupts via device tree.
-                                */
-                               if (j == 0) {
-                                       value = readl(base + offset);
-                                       value = BIT(port->pins) - 1;
-                                       writel(value, base + offset);
-                               }
-                       }
+                       dev_dbg(dev, "programming default interrupt routing for port %s\n",
+                               port->name);
+
+                       offset = TEGRA186_GPIO_INT_ROUTE_MAPPING(p, 0);
+
+                       /*
+                        * By default we only want to route GPIO pins to IRQ 0. This works
+                        * only under the assumption that we're running as the host kernel
+                        * and hence all GPIO pins are owned by Linux.
+                        *
+                        * For cases where Linux is the guest OS, the hypervisor will have
+                        * to configure the interrupt routing and pass only the valid
+                        * interrupts via device tree.
+                        */
+                       value = readl(base + offset);
+                       value = BIT(port->pins) - 1;
+                       writel(value, base + offset);
                }
        }
 }
--
Quoted 2 lines

2.26.3

Applied, thanks!

Bart