From 2a73ec2f11e5dde5754260d0ce99778f35ec92cc Mon Sep 17 00:00:00 2001

From: Jan Synacek <jsynacek@redhat.com>

Date: Wed, 17 Jan 2018 10:08:08 +0100

Subject: [PATCH] udev: net_id add support for platform bus (ACPI, mostly

 arm64) devices

(cherry picked from commit c20e6de897b2378bc3f936e1e265d2d2e2450a73)

Note: There is RHEL-only code in the patch. After some discussion,

we only want to rename Hisilicon Network Subsystem (HNS) devices.

Resolves: #1529633

---

 src/udev/udev-builtin-net_id.c | 72 ++++++++++++++++++++++++++++++++++

 1 file changed, 72 insertions(+)

diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c

index 19e1f2631a..69cee5a723 100644

--- a/src/udev/udev-builtin-net_id.c

+++ b/src/udev/udev-builtin-net_id.c

@@ -42,6 +42,7 @@

  *                                         -- PCI geographical location

  *   [P<domain>]p<bus>s<slot>[f<function>][u<port>][..][c<config>][i<interface>]

  *                                         -- USB port number chain

+ *   a<vendor><model>i<instance>           -- Platform bus ACPI instance id

  *

  * All multi-function PCI devices will carry the [f<function>] number in the

  * device name, including the function 0 device.

@@ -100,6 +101,7 @@

 #include "udev.h"

 #include "fileio.h"

+#include "def.h"

 #define ONBOARD_INDEX_MAX (16*1024-1)

@@ -110,6 +112,7 @@ enum netname_type{

         NET_BCMA,

         NET_VIRTIO,

         NET_CCWGROUP,

+        NET_PLATFORM,

 };

 struct netnames {

@@ -127,6 +130,7 @@ struct netnames {

         char usb_ports[IFNAMSIZ];

         char bcma_core[IFNAMSIZ];

         char ccw_group[IFNAMSIZ];

+        char platform_path[IFNAMSIZ];

 };

 /* retrieve on-board index number and label from firmware */

@@ -288,6 +292,64 @@ out:

         return err;

 }

+#define _PLATFORM_TEST "/sys/devices/platform/vvvvPPPP"

+#define _PLATFORM_PATTERN4 "/sys/devices/platform/%4s%4x:%2x/net/eth%u"

+#define _PLATFORM_PATTERN3 "/sys/devices/platform/%3s%4x:%2x/net/eth%u"

+

+static int names_platform(struct udev_device *dev, struct netnames *names, bool test) {

+        struct udev_device *parent;

+        char vendor[5];

+        unsigned model, instance, ethid;

+        const char *syspath, *pattern, *validchars;

+

+        /* check if our direct parent is a platform device with no other bus in-between */

+        parent = udev_device_get_parent(dev);

+        if (!parent)

+                return -ENOENT;

+

+        if (!streq_ptr("platform", udev_device_get_subsystem(parent)))

+                 return -ENOENT;

+

+        syspath = udev_device_get_syspath(dev);

+

+        /* syspath is too short, to have a valid ACPI instance */

+        if (strlen(syspath) < sizeof _PLATFORM_TEST)

+                return -EINVAL;

+

+        /* Vendor ID can be either PNP ID (3 chars A-Z) or ACPI ID (4 chars A-Z and numerals) */

+        if (syspath[sizeof _PLATFORM_TEST - 1] == ':') {

+                pattern = _PLATFORM_PATTERN4;

+                validchars = UPPERCASE_LETTERS DIGITS;

+        } else {

+                pattern = _PLATFORM_PATTERN3;

+                validchars = UPPERCASE_LETTERS;

+        }

+

+        /* RHEL-only! */

+        /* We only want to rename HNS cards */

+        if (!startswith(syspath, "/sys/devices/platform/HISI"))

+                return -ENOENT;

+

+        /* Platform devices are named after ACPI table match, and instance id

+         * eg. "/sys/devices/platform/HISI00C2:00");

+         * The Vendor (3 or 4 char), followed by hexdecimal model number : instance id.

+         */

+#pragma GCC diagnostic push

+#pragma GCC diagnostic ignored "-Wformat-nonliteral"

+        if (sscanf(syspath, pattern, vendor, &model, &instance, &ethid) != 4)

+                return -EINVAL;

+#pragma GCC diagnostic pop

+

+        if (!in_charset(vendor, validchars))

+                return -ENOENT;

+

+        ascii_strlower(vendor);

+

+        xsprintf(names->platform_path, "a%s%xi%u", vendor, model, instance);

+        names->type = NET_PLATFORM;

+        return 0;

+}

+

 static int names_pci(struct udev_device *dev, struct netnames *names) {

         struct udev_device *parent;

         static int do_virtio = -1;

@@ -555,6 +617,16 @@ static int builtin_net_id(struct udev_device *dev, int argc, char *argv[], bool

                 goto out;

         }

+        /* get ACPI path names for ARM64 platform devices */

+        err = names_platform(dev, &names, test);

+        if (err >= 0 && names.type == NET_PLATFORM) {

+                char str[IFNAMSIZ];

+

+                if (snprintf(str, sizeof(str), "%s%s", prefix, names.platform_path) < (int)sizeof(str))

+                        udev_builtin_add_property(dev, test, "ID_NET_NAME_PATH", str);

+                goto out;

+        }

+

         /* get PCI based path names, we compose only PCI based paths */

         err = names_pci(dev, &names);

         if (err < 0)