Skip to contentSkip to conversation

gpio: tegra186: Support multi-socket devices

PATCH In review Prathamesh Shete 3 participants 5 messages Feb 16 – Feb 17

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

PATCH 1/1 gpio: tegra186: Support multi-socket devices

On Tegra platforms, multiple SoC instances may be present with each defining the same GPIO name. For such devices, this results in duplicate GPIO names.

When the device has a valid NUMA node, prepend the NUMA node ID to the GPIO name prefix. The node ID identifies each socket, ensuring GPIO line names remain distinct across multiple sockets.

---
 drivers/gpio/gpio-tegra186.c | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)
drivers/gpio/gpio-tegra186.c +17 -9
index 9c874f07be75..daf5aaffa28a 100644
@@ -857,7 +857,8 @@ static int tegra186_gpio_probe(struct platform_device *pdev)
 	struct device_node *np;
 	struct resource *res;
 	char **names;
-	int err;
+	char *instance = "";
+	int node, err;
 
 	gpio = devm_kzalloc(&pdev->dev, sizeof(*gpio), GFP_KERNEL);
 	if (!gpio)
@@ -937,17 +938,21 @@ static int tegra186_gpio_probe(struct platform_device *pdev)
 	if (!names)
 		return -ENOMEM;
 
+	node = dev_to_node(&pdev->dev);
+	if (node >= 0) {
+		instance = devm_kasprintf(gpio->gpio.parent, GFP_KERNEL, "%d-", node);
+		if (!instance)
+			return -ENOMEM;
+	}
+
 	for (i = 0, offset = 0; i < gpio->soc->num_ports; i++) {
 		const struct tegra_gpio_port *port = &gpio->soc->ports[i];
 		char *name;
 
 		for (j = 0; j < port->pins; j++) {
-			if (gpio->soc->prefix)
-				name = devm_kasprintf(gpio->gpio.parent, GFP_KERNEL, "%s-P%s.%02x",
-						      gpio->soc->prefix, port->name, j);
-			else
-				name = devm_kasprintf(gpio->gpio.parent, GFP_KERNEL, "P%s.%02x",
-						      port->name, j);
+			name = devm_kasprintf(gpio->gpio.parent, GFP_KERNEL, "%s%sP%s.%02x",
+					      instance ?: "", gpio->soc->prefix ?: "",
+					      port->name, j);
 			if (!name)
 				return -ENOMEM;
 
@@ -1373,6 +1378,9 @@ static const struct tegra_gpio_soc tegra256_main_soc = {
 	.has_vm_support = true,
 };
 
+/* Macro to define GPIO name prefix with separator */
+#define TEGRA_GPIO_PREFIX(_x)	_x "-"
+
 #define TEGRA410_COMPUTE_GPIO_PORT(_name, _bank, _port, _pins)	\
 	TEGRA_GPIO_PORT(TEGRA410_COMPUTE, _name, _bank, _port, _pins)
 
@@ -1388,7 +1396,7 @@ static const struct tegra_gpio_soc tegra410_compute_soc = {
 	.num_ports = ARRAY_SIZE(tegra410_compute_ports),
 	.ports = tegra410_compute_ports,
 	.name = "tegra410-gpio-compute",
-	.prefix = "COMPUTE",
+	.prefix = TEGRA_GPIO_PREFIX("COMPUTE"),
 	.num_irqs_per_bank = 8,
 	.instance = 0,
 };
@@ -1418,7 +1426,7 @@ static const struct tegra_gpio_soc tegra410_system_soc = {
 	.num_ports = ARRAY_SIZE(tegra410_system_ports),
 	.ports = tegra410_system_ports,
 	.name = "tegra410-gpio-system",
-	.prefix = "SYSTEM",
+	.prefix = TEGRA_GPIO_PREFIX("SYSTEM"),
 	.num_irqs_per_bank = 8,
 	.instance = 0,
 };
Signature · 1 line
2.43.0
#1 lore raw
Quoted 28 lines · Prathamesh Shete

On Tegra platforms, multiple SoC instances may be present with each defining the same GPIO name. For such devices, this results in duplicate GPIO names.

When the device has a valid NUMA node, prepend the NUMA node ID to the GPIO name prefix. The node ID identifies each socket, ensuring GPIO line names remain distinct across multiple sockets.

---
 drivers/gpio/gpio-tegra186.c | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)
drivers/gpio/gpio-tegra186.c +2 -1
index 9c874f07be75..daf5aaffa28a 100644
@@ -857,7 +857,8 @@ static int tegra186_gpio_probe(struct platform_device *pdev)
 	struct device_node *np;
 	struct resource *res;
 	char **names;
-	int err;
+	char *instance = "";
+	int node, err;
 
 	gpio = devm_kzalloc(&pdev->dev, sizeof(*gpio), GFP_KERNEL);
 	if (!gpio)

drivers/gpio/gpio-tegra186.c static int tegra186_gpio_probe(struct platform_device *pdev) · line 943

Quoted 6 lines
drivers/gpio/gpio-tegra186.c +3 -0
@@ -937,17 +938,21 @@ static int tegra186_gpio_probe(struct platform_device *pdev)
 	if (!names)
 		return -ENOMEM;
 
+	node = dev_to_node(&pdev->dev);
+	if (node >= 0) {
+		instance = devm_kasprintf(gpio->gpio.parent, GFP_KERNEL, "%d-", node);

I've never noticed it before (and it's not introduced by this patch) but I really dislike the child device registering devres nodes with its parent...

Quoted 7 lines
drivers/gpio/gpio-tegra186.c +4 -0
+		if (!instance)
+			return -ENOMEM;
+	}
+
 	for (i = 0, offset = 0; i < gpio->soc->num_ports; i++) {
 		const struct tegra_gpio_port *port = &gpio->soc->ports[i];
 		char *name;

drivers/gpio/gpio-tegra186.c static int tegra186_gpio_probe(struct platform_device *pdev) · line 954

Quoted 10 lines
drivers/gpio/gpio-tegra186.c +2 -6
 
 		for (j = 0; j < port->pins; j++) {
-			if (gpio->soc->prefix)
-				name = devm_kasprintf(gpio->gpio.parent, GFP_KERNEL, "%s-P%s.%02x",
-						      gpio->soc->prefix, port->name, j);
-			else
-				name = devm_kasprintf(gpio->gpio.parent, GFP_KERNEL, "P%s.%02x",
-						      port->name, j);
+			name = devm_kasprintf(gpio->gpio.parent, GFP_KERNEL, "%s%sP%s.%02x",
+					      instance ?: "", gpio->soc->prefix ?: "",

instance can't be NULL here, can it? Either print it unconditionally or initialize it to NULL.

drivers/gpio/gpio-tegra186.c static const struct tegra_gpio_soc tegra256_main_soc = { · line 1383

Quoted 11 lines
drivers/gpio/gpio-tegra186.c +4 -0
+					      port->name, j);
 			if (!name)
 				return -ENOMEM;
 
@@ -1373,6 +1378,9 @@ static const struct tegra_gpio_soc tegra256_main_soc = {
 	.has_vm_support = true,
 };
 
+/* Macro to define GPIO name prefix with separator */
+#define TEGRA_GPIO_PREFIX(_x)	_x "-"
+

This doesn't look like it belongs to this patch, why are you doing it?

Bart

Quoted 25 lines
drivers/gpio/gpio-tegra186.c +2 -3
 #define TEGRA410_COMPUTE_GPIO_PORT(_name, _bank, _port, _pins)	\
 	TEGRA_GPIO_PORT(TEGRA410_COMPUTE, _name, _bank, _port, _pins)
 
@@ -1388,7 +1396,7 @@ static const struct tegra_gpio_soc tegra410_compute_soc = {
 	.num_ports = ARRAY_SIZE(tegra410_compute_ports),
 	.ports = tegra410_compute_ports,
 	.name = "tegra410-gpio-compute",
-	.prefix = "COMPUTE",
+	.prefix = TEGRA_GPIO_PREFIX("COMPUTE"),
 	.num_irqs_per_bank = 8,
 	.instance = 0,
 };
@@ -1418,7 +1426,7 @@ static const struct tegra_gpio_soc tegra410_system_soc = {
 	.num_ports = ARRAY_SIZE(tegra410_system_ports),
 	.ports = tegra410_system_ports,
 	.name = "tegra410-gpio-system",
-	.prefix = "SYSTEM",
+	.prefix = TEGRA_GPIO_PREFIX("SYSTEM"),
 	.num_irqs_per_bank = 8,
 	.instance = 0,
 };
--

2.43.0

maintainer
#2 lore raw
Quoted 32 lines · Bartosz Golaszewski
Quoted 31 lines · Prathamesh Shete

On Tegra platforms, multiple SoC instances may be present with each defining the same GPIO name. For such devices, this results in duplicate GPIO names.

When the device has a valid NUMA node, prepend the NUMA node ID to the GPIO name prefix. The node ID identifies each socket, ensuring GPIO line names remain distinct across multiple sockets.

---
  drivers/gpio/gpio-tegra186.c | 26 +++++++++++++++++---------
  1 file changed, 17 insertions(+), 9 deletions(-)
drivers/gpio/gpio-tegra186.c +2 -1
index 9c874f07be75..daf5aaffa28a 100644
@@ -857,7 +857,8 @@ static int tegra186_gpio_probe(struct platform_device *pdev)
  	struct device_node *np;
  	struct resource *res;
  	char **names;
-	int err;
+	char *instance = "";
+	int node, err;
 
  	gpio = devm_kzalloc(&pdev->dev, sizeof(*gpio), GFP_KERNEL);
  	if (!gpio)
@@ -937,17 +938,21 @@ static int tegra186_gpio_probe(struct platform_device *pdev)
  	if (!names)
  		return -ENOMEM;
 
Quoted 6 lines

drivers/gpio/gpio-tegra186.c static int tegra186_gpio_probe(struct platform_device *pdev) · line 943

Quoted 3 lines
drivers/gpio/gpio-tegra186.c +3 -0
+	node = dev_to_node(&pdev->dev);
+	if (node >= 0) {
+		instance = devm_kasprintf(gpio->gpio.parent, GFP_KERNEL, "%d-", node);

I've never noticed it before (and it's not introduced by this patch) but I really dislike the child device registering devres nodes with its parent...

While it looks a bit odd, the parent is initialised as ...

gpio->gpio.parent = &pdev->dev

Quoted 9 lines
Quoted 9 lines
drivers/gpio/gpio-tegra186.c +4 -0
+		if (!instance)
+			return -ENOMEM;
+	}
+
  	for (i = 0, offset = 0; i < gpio->soc->num_ports; i++) {
  		const struct tegra_gpio_port *port = &gpio->soc->ports[i];
  		char *name;
 
Quoted 12 lines

drivers/gpio/gpio-tegra186.c static int tegra186_gpio_probe(struct platform_device *pdev) · line 954

Quoted 9 lines
drivers/gpio/gpio-tegra186.c +2 -6
  		for (j = 0; j < port->pins; j++) {
-			if (gpio->soc->prefix)
-				gpio->gpio.parent, GFP_KERNEL, "%s-P%s.%02x",
-						      gpio->soc->prefix, port->name, j);
-			else
-				name = devm_kasprintf(gpio->gpio.parent, GFP_KERNEL, "P%s.%02x",
-						      port->name, j);
+			name = devm_kasprintf(gpio->gpio.parent, GFP_KERNEL, "%s%sP%s.%02x",
+					      instance ?: "", gpio->soc->prefix ?: "",

instance can't be NULL here, can it? Either print it unconditionally or initialize it to NULL.

Probably best to drop 'instance' altogether and just ...

if (node >= 0)

       name = devm_kasprintf(gpio->gpio.parent, GFP_KERNEL,
                             "%d-%sP%s.%02x", node,
                             gpio->soc->prefix ?: "",
                             port->name, j);
 else
       name = devm_kasprintf(gpio->gpio.parent, GFP_KERNEL,
                             "%sP%s.%02x",
                             gpio->soc->prefix ?: "",
                             port->name, j);
Quoted 9 lines
Quoted 9 lines
drivers/gpio/gpio-tegra186.c +1 -0
+					      port->name, j);
  			if (!name)
  				return -ENOMEM;
 
@@ -1373,6 +1378,9 @@ static const struct tegra_gpio_soc tegra256_main_soc = {
  	.has_vm_support = true,
  };
 
Quoted 5 lines

drivers/gpio/gpio-tegra186.c static const struct tegra_gpio_soc tegra256_main_soc = { · line 1383

Quoted 3 lines
drivers/gpio/gpio-tegra186.c +3 -0
+/* Macro to define GPIO name prefix with separator */
+#define TEGRA_GPIO_PREFIX(_x)	_x "-"
+

This doesn't look like it belongs to this patch, why are you doing it

Yes we should split this into two patches; one to simplify the prefix handling and one to handle the socket.

Jon

Signature · 1 line
nvpublic
#3 lore raw
Quoted 42 lines · Jon Hunter
Quoted 32 lines · Bartosz Golaszewski
Quoted 31 lines · Prathamesh Shete

On Tegra platforms, multiple SoC instances may be present with each defining the same GPIO name. For such devices, this results in duplicate GPIO names.

When the device has a valid NUMA node, prepend the NUMA node ID to the GPIO name prefix. The node ID identifies each socket, ensuring GPIO line names remain distinct across multiple sockets.

---
  drivers/gpio/gpio-tegra186.c | 26 +++++++++++++++++---------
  1 file changed, 17 insertions(+), 9 deletions(-)
drivers/gpio/gpio-tegra186.c +2 -1
index 9c874f07be75..daf5aaffa28a 100644
@@ -857,7 +857,8 @@ static int tegra186_gpio_probe(struct platform_device *pdev)
     struct device_node *np;
     struct resource *res;
     char **names;
-    int err;
+    char *instance = "";
+    int node, err;
 
     gpio = devm_kzalloc(&pdev->dev, sizeof(*gpio), GFP_KERNEL);
     if (!gpio)
@@ -937,17 +938,21 @@ static int tegra186_gpio_probe(struct platform_device *pdev)
     if (!names)
             return -ENOMEM;
 
Quoted 6 lines

drivers/gpio/gpio-tegra186.c static int tegra186_gpio_probe(struct platform_device *pdev) · line 943

Quoted 3 lines
drivers/gpio/gpio-tegra186.c +3 -0
+    node = dev_to_node(&pdev->dev);
+    if (node >= 0) {
+            instance = devm_kasprintf(gpio->gpio.parent, GFP_KERNEL, "%d-", node);

I've never noticed it before (and it's not introduced by this patch) but I really dislike the child device registering devres nodes with its parent...

Quoted 4 lines

While it looks a bit odd, the parent is initialised as ...

gpio->gpio.parent = &pdev->dev

Right. Nevermind my comment then.

Bart

maintainer
#4 lore raw
In reply to Bartosz Golaszewski
Quoted 47 lines · Bartosz Golaszewski
Quoted 28 lines · Prathamesh Shete

On Tegra platforms, multiple SoC instances may be present with each defining the same GPIO name. For such devices, this results in duplicate GPIO names.

When the device has a valid NUMA node, prepend the NUMA node ID to the GPIO name prefix. The node ID identifies each socket, ensuring GPIO line names remain distinct across multiple sockets.

---
  drivers/gpio/gpio-tegra186.c | 26 +++++++++++++++++---------
  1 file changed, 17 insertions(+), 9 deletions(-)
drivers/gpio/gpio-tegra186.c +2 -1
index 9c874f07be75..daf5aaffa28a 100644
@@ -857,7 +857,8 @@ static int tegra186_gpio_probe(struct platform_device *pdev)
  	struct device_node *np;
  	struct resource *res;
  	char **names;
-	int err;
+	char *instance = "";
+	int node, err;
 
  	gpio = devm_kzalloc(&pdev->dev, sizeof(*gpio), GFP_KERNEL);
  	if (!gpio)

drivers/gpio/gpio-tegra186.c static int tegra186_gpio_probe(struct platform_device *pdev) · line 943

Quoted 6 lines
drivers/gpio/gpio-tegra186.c +3 -0
@@ -937,17 +938,21 @@ static int tegra186_gpio_probe(struct platform_device *pdev)
  	if (!names)
  		return -ENOMEM;
 
+	node = dev_to_node(&pdev->dev);
+	if (node >= 0) {
+		instance = devm_kasprintf(gpio->gpio.parent, GFP_KERNEL, "%d-", node);

I've never noticed it before (and it's not introduced by this patch) but I really dislike the child device registering devres nodes with its parent...

Quoted 8 lines
drivers/gpio/gpio-tegra186.c +4 -0
+		if (!instance)
+			return -ENOMEM;
+	}
+
  	for (i = 0, offset = 0; i < gpio->soc->num_ports; i++) {
  		const struct tegra_gpio_port *port = &gpio->soc->ports[i];
  		char *name;
 
Quoted 12 lines

drivers/gpio/gpio-tegra186.c static int tegra186_gpio_probe(struct platform_device *pdev) · line 954

Quoted 9 lines
drivers/gpio/gpio-tegra186.c +2 -6
  		for (j = 0; j < port->pins; j++) {
-			if (gpio->soc->prefix)
-				name = devm_kasprintf(gpio->gpio.parent, GFP_KERNEL, "%s-P%s.%02x",
-						      gpio->soc->prefix, port->name, j);
-			else
-				name = devm_kasprintf(gpio->gpio.parent, GFP_KERNEL, "P%s.%02x",
-						      port->name, j);
+			name = devm_kasprintf(gpio->gpio.parent, GFP_KERNEL, "%s%sP%s.%02x",
+					      instance ?: "", gpio->soc->prefix ?: "",

instance can't be NULL here, can it? Either print it unconditionally or initialize it to NULL.

The other alternative here is that we just use 'instance' without the ternary operator because we initialise to "" ...

name = devm_kasprintf(gpio->gpio.parent, GFP_KERNEL, "%s%sP%s.%02x",

                       instance, gpio->soc->prefix ?: "",
                       port->name, j);

Jon

Signature · 1 line
nvpublic