SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

udev-builtin-net_id: add NAMING_DEVICETREE_PORT_ALIASES to check of_node of netdevs before their parents

Browse Source 
The net_id builtin only checked the of_node of a netdev's parent device,
not that of the netdev itself. While it is common that netdevs don't have
an OF node assigned themselves, as they are derived from some parent
device, this is not always the case. In particular when a single
controller provides multiple ports that can be referenced indiviually in
the Device Tree (both for aliases/MAC address assignment and phandle
references), the correct of_node will be that of the netdev itself, not
that of the parent, so it needs to be checked, too.

A new naming scheme flag NAMING_DEVICETREE_PORT_ALIASES is added to
allow selecting the new behavior.
This commit is contained in:
Matthias Schiffer
2024-08-15 18:20:49 +02:00
committed by Luca Boccassi
parent 98b86d294a
commit 24c2e04e9a
3 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/udev/udev-builtin-net_id.c
+17 -8
View File
@@ -822,7 +822,6 @@ static int names_platform(sd_device *dev, const char *prefix, EventMode mode) {
static int names_devicetree(sd_device *dev, const char *prefix, EventMode mode) {
_cleanup_(sd_device_unrefp) sd_device *aliases_dev = NULL, *ofnode_dev = NULL, *devicetree_dev = NULL;
const char *ofnode_path, *ofnode_syspath, *devicetree_syspath;
sd_device *parent;
int r;
assert(dev);
@@ -835,14 +834,24 @@ static int names_devicetree(sd_device *dev, const char *prefix, EventMode mode)
if (!streq(prefix, "en"))
return -EOPNOTSUPP;
/* check if our direct parent has an of_node */
r = sd_device_get_parent(dev, &parent);
if (r < 0)
return log_device_debug_errno(dev, r, "Failed to get parent device: %m");
/* check if the device itself has an of_node */
if (naming_scheme_has(NAMING_DEVICETREE_PORT_ALIASES)) {
r = sd_device_new_child(&ofnode_dev, dev, "of_node");
if (r < 0)
log_device_debug_errno(dev, r, "Failed to get device of_node, ignoring: %m");
}
if (!ofnode_dev) {
sd_device *parent;
r = sd_device_new_child(&ofnode_dev, parent, "of_node");
if (r < 0)
return log_device_debug_errno(parent, r, "Failed to get 'of_node' child device: %m");
/* check if our direct parent has an of_node as a fallback */
r = sd_device_get_parent(dev, &parent);
if (r < 0)
return log_device_debug_errno(dev, r, "Failed to get parent device: %m");
r = sd_device_new_child(&ofnode_dev, parent, "of_node");
if (r < 0)
return log_device_debug_errno(parent, r, "Failed to get device of_node: %m");
}
r = sd_device_get_syspath(ofnode_dev, &ofnode_syspath);
if (r < 0)