[PATCH v3 1/2] modpost: file2alias: make mdio alias configure match mdio uevent

From: Yinbo Zhu
Date: Tue Nov 30 2021 - 03:22:49 EST


The do_mdio_entry was responsible for generating a phy alias configure
that according to the phy driver's mdio_device_id, before apply this
patch, which alias configure is like "alias mdio:000000010100000100001
1011101????", it doesn't match the phy_id of mdio_uevent, because of
the phy_id was a hexadecimal digit and the mido uevent is consisit of
phy_id with the char 'p', the uevent string is different from alias.
Add this patch that mdio alias configure will can match mdio uevent.

Signed-off-by: Yinbo Zhu <zhuyinbo@xxxxxxxxxxx>
---
Change in v3:
Rework the patch commit log information.

include/linux/mod_devicetable.h | 2 ++
scripts/mod/file2alias.c | 17 +----------------
2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index ae2e75d..7bd23bf 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -595,6 +595,8 @@ struct platform_device_id {
kernel_ulong_t driver_data;
};

+#define MDIO_ANY_ID (~0)
+
#define MDIO_NAME_SIZE 32
#define MDIO_MODULE_PREFIX "mdio:"

diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 49aba86..63f3149 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -1027,24 +1027,9 @@ static int do_platform_entry(const char *filename,
static int do_mdio_entry(const char *filename,
void *symval, char *alias)
{
- int i;
DEF_FIELD(symval, mdio_device_id, phy_id);
- DEF_FIELD(symval, mdio_device_id, phy_id_mask);
-
alias += sprintf(alias, MDIO_MODULE_PREFIX);
-
- for (i = 0; i < 32; i++) {
- if (!((phy_id_mask >> (31-i)) & 1))
- *(alias++) = '?';
- else if ((phy_id >> (31-i)) & 1)
- *(alias++) = '1';
- else
- *(alias++) = '0';
- }
-
- /* Terminate the string */
- *alias = 0;
-
+ ADD(alias, "p", phy_id != MDIO_ANY_ID, phy_id);
return 1;
}

--
1.8.3.1