of: Convert to using %pOFn for node name printf

In preparation to remove the node name pointer from struct device_node, convert printf users to use the %pOFn format specifier.

Cc Frank Rowand <[email protected]>

Cc Andrew Lunn <[email protected]>

Cc Florian Fainelli <[email protected]>

Cc [email protected]

Cc [email protected]

Signed-off-by Rob Herring <[email protected]>

---
 drivers/of/device.c   |  4 ++--
 drivers/of/of_mdio.c  | 12 ++++++------
 drivers/of/of_numa.c  |  4 ++--
 drivers/of/overlay.c  |  4 ++--
 drivers/of/platform.c |  8 ++++----
 drivers/of/unittest.c | 12 ++++++------
 6 files changed, 22 insertions(+), 22 deletions(-)

drivers/of/device.c +0 -0

index 5957cd4fa262..daa075d87317 100644

Quoted 23 lines · Rob Herring

In preparation to remove the node name pointer from struct device_node, convert printf users to use the %pOFn format specifier.

Cc Frank Rowand <[email protected]>

Cc Andrew Lunn <[email protected]>

Cc Florian Fainelli <[email protected]>

Cc [email protected]

Cc [email protected]

Signed-off-by Rob Herring <[email protected]>

---
 drivers/of/device.c   |  4 ++--
 drivers/of/of_mdio.c  | 12 ++++++------
 drivers/of/of_numa.c  |  4 ++--
 drivers/of/overlay.c  |  4 ++--
 drivers/of/platform.c |  8 ++++----
 drivers/of/unittest.c | 12 ++++++------
 6 files changed, 22 insertions(+), 22 deletions(-)

drivers/of/device.c +0 -0

index 5957cd4fa262..daa075d87317 100644

drivers/of/device.c static ssize_t of_device_get_modalias(struct device *dev, char *str, ssize_t len · line 225

Quoted 8 lines

drivers/of/device.c +1 -1

@@ -219,7 +219,7 @@ static ssize_t of_device_get_modalias(struct device *dev, char *str, ssize_t len
              return -ENODEV;
 
      /* Name & Type */
-     csize = snprintf(str, len, "of:N%sT%s", dev->of_node->name,
+     csize = snprintf(str, len, "of:N%pOFnT%s", dev->of_node,
                       dev->of_node->type);
      tsize = csize;
      len -= csize;

This seems to cause the modalias to be improperly constructed. As a consequence, automatic module loading at boot time is now broken. I think the reason why this fails is because vsnprintf() will skip all alpha-numeric characters after a call to pointer(). Presumably this is meant to be a generic way of skipping whatever specifiers we throw at it.

Unfortunately for the case of OF modaliases, this means that the 'T' character gets eaten, so we end up with something like this:

        # udevadm info /sys/bus/platform/devices/54200000.dc
        [...]
        E: MODALIAS=of:Ndc<NULL>Cnvidia,tegra124-dc
        [...]

instead of this:

        # udevadm info /sys/bus/platform/devices/54200000.dc
        [...]
        E: MODALIAS=of:NdcT<NULL>Cnvidia,tegra124-dc
        [...]

Everything is back to normal if I revert this patch. However, since that's obviously not what we want, I think perhaps what we need is a way for pointer() (and its implementations) to report back how many characters in the format string it consumed so that we can support these kinds of back-to-back strings.

If nobody else has the time I can look into coding up a fix, but in the meantime it might be best to back this one out until we can handle the OF modalias format string.

Quoted 23 lines · Rob Herring

In preparation to remove the node name pointer from struct device_node, convert printf users to use the %pOFn format specifier.

Cc Frank Rowand <[email protected]>

Cc Andrew Lunn <[email protected]>

Cc Florian Fainelli <[email protected]>

Cc [email protected]

Cc [email protected]

Signed-off-by Rob Herring <[email protected]>

---
 drivers/of/device.c   |  4 ++--
 drivers/of/of_mdio.c  | 12 ++++++------
 drivers/of/of_numa.c  |  4 ++--
 drivers/of/overlay.c  |  4 ++--
 drivers/of/platform.c |  8 ++++----
 drivers/of/unittest.c | 12 ++++++------
 6 files changed, 22 insertions(+), 22 deletions(-)

drivers/of/device.c +0 -0

index 5957cd4fa262..daa075d87317 100644

drivers/of/device.c static ssize_t of_device_get_modalias(struct device *dev, char *str, ssize_t len · line 225

Quoted 8 lines

drivers/of/device.c +1 -1

@@ -219,7 +219,7 @@ static ssize_t of_device_get_modalias(struct device *dev, char *str, ssize_t len
 		return -ENODEV;
 
 	/* Name & Type */
-	csize = snprintf(str, len, "of:N%sT%s", dev->of_node->name,
+	csize = snprintf(str, len, "of:N%pOFnT%s", dev->of_node,
 			 dev->of_node->type);
 	tsize = csize;
 	len -= csize;

This seems to cause the modalias to be improperly constructed. As a consequence, automatic module loading at boot time is now broken. I think the reason why this fails is because vsnprintf() will skip all alpha-numeric characters after a call to pointer(). Presumably this is meant to be a generic way of skipping whatever specifiers we throw at it.

Unfortunately for the case of OF modaliases, this means that the 'T' character gets eaten, so we end up with something like this:

	# udevadm info /sys/bus/platform/devices/54200000.dc
	[...]
	E: MODALIAS=of:Ndc<NULL>Cnvidia,tegra124-dc
	[...]

instead of this:

	# udevadm info /sys/bus/platform/devices/54200000.dc
	[...]
	E: MODALIAS=of:NdcT<NULL>Cnvidia,tegra124-dc
	[...]

Everything is back to normal if I revert this patch. However, since that's obviously not what we want, I think perhaps what we need is a way for pointer() (and its implementations) to report back how many characters in the format string it consumed so that we can support these kinds of back-to-back strings.

If nobody else has the time I can look into coding up a fix, but in the meantime it might be best to back this one out until we can handle the OF modalias format string.

Quoted 61 lines · Thierry Reding

Quoted 23 lines · Rob Herring

In preparation to remove the node name pointer from struct device_node, convert printf users to use the %pOFn format specifier.

Cc Frank Rowand <[email protected]>

Cc Andrew Lunn <[email protected]>

Cc Florian Fainelli <[email protected]>

Cc [email protected]

Cc [email protected]

Signed-off-by Rob Herring <[email protected]>

---
 drivers/of/device.c   |  4 ++--
 drivers/of/of_mdio.c  | 12 ++++++------
 drivers/of/of_numa.c  |  4 ++--
 drivers/of/overlay.c  |  4 ++--
 drivers/of/platform.c |  8 ++++----
 drivers/of/unittest.c | 12 ++++++------
 6 files changed, 22 insertions(+), 22 deletions(-)

drivers/of/device.c +0 -0

index 5957cd4fa262..daa075d87317 100644

drivers/of/device.c static ssize_t of_device_get_modalias(struct device *dev, char *str, ssize_t len · line 225

Quoted 8 lines

drivers/of/device.c +1 -1

@@ -219,7 +219,7 @@ static ssize_t of_device_get_modalias(struct device *dev, char *str, ssize_t len
 		return -ENODEV;
 
 	/* Name & Type */
-	csize = snprintf(str, len, "of:N%sT%s", dev->of_node->name,
+	csize = snprintf(str, len, "of:N%pOFnT%s", dev->of_node,
 			 dev->of_node->type);
 	tsize = csize;
 	len -= csize;

This seems to cause the modalias to be improperly constructed. As a consequence, automatic module loading at boot time is now broken. I think the reason why this fails is because vsnprintf() will skip all alpha-numeric characters after a call to pointer(). Presumably this is meant to be a generic way of skipping whatever specifiers we throw at it.

Unfortunately for the case of OF modaliases, this means that the 'T' character gets eaten, so we end up with something like this:

	# udevadm info /sys/bus/platform/devices/54200000.dc
	[...]
	E: MODALIAS=of:Ndc<NULL>Cnvidia,tegra124-dc
	[...]

instead of this:

	# udevadm info /sys/bus/platform/devices/54200000.dc
	[...]
	E: MODALIAS=of:NdcT<NULL>Cnvidia,tegra124-dc
	[...]

Everything is back to normal if I revert this patch. However, since that's obviously not what we want, I think perhaps what we need is a way for pointer() (and its implementations) to report back how many characters in the format string it consumed so that we can support these kinds of back-to-back strings.

Quoted 3 lines

If nobody else has the time I can look into coding up a fix, but in the meantime it might be best to back this one out until we can handle the OF modalias format string.

Or just use 2 consecutive snprintf calls

	csize = snprintf(str, len, "of:N%pOFn", dev->of_node);
	csize += snprintf(str + csize, len - csize, "T%s",
			  dev->of_node->type);

This is the DT portion of converting node name printf's to use the %pOFn format specifier rather than device_node.name. Patches for other subsystems are independent and have been sent separately.

Rob

Rob Herring (4):
of/unittest: remove use of node name pointer in overlay high level
test
of/unittest: add printf tests for node name
of: Convert to using %pOFn instead of device_node.name
vsprintf: print OF node name using full_name

 drivers/of/device.c   |  4 ++--
 drivers/of/of_mdio.c  | 12 ++++++------
 drivers/of/of_numa.c  |  4 ++--
 drivers/of/overlay.c  |  4 ++--
 drivers/of/platform.c |  8 ++++----
 drivers/of/unittest.c | 26 ++++++++++++++++----------
 lib/vsprintf.c        |  9 +++++++--
 7 files changed, 39 insertions(+), 28 deletions(-)