Skip to contentSkip to conversation

slimbus: generate MODULE_ALIAS() from MODULE_DEVICE_TABLE()

PATCH Applied Masahiro Yamada 2 participants 3 messages Jun 6, 2024 – Aug 1, 2024 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 slimbus: generate MODULE_ALIAS() from MODULE_DEVICE_TABLE()

Commit 9e663f4811c6 ("slimbus: core: add support to uevent") added the MODALIAS=slim:* uevent variable, but modpost does not generate the corresponding MODULE_ALIAS().

To support automatic module loading, slimbus drivers still need to manually add MODULE_ALIAS("slim:<manf_id>:<prod_code>:*"), as seen in sound/soc/codecs/wcd9335.c.

To automate this, make modpost generate the proper MODULE_ALIAS() from MODULE_DEVICE_TABLE(slim, ).

---

 scripts/mod/devicetable-offsets.c |  4 ++++
 scripts/mod/file2alias.c          | 11 +++++++++++
 2 files changed, 15 insertions(+)
scripts/mod/devicetable-offsets.c +4 -0
index 518200813d4e..9c7b404defbd 100644
@@ -153,6 +153,10 @@ int main(void)
 	DEVID_FIELD(i3c_device_id, part_id);
 	DEVID_FIELD(i3c_device_id, extra_info);
 
+	DEVID(slim_device_id);
+	DEVID_FIELD(slim_device_id, manf_id);
+	DEVID_FIELD(slim_device_id, prod_code);
+
 	DEVID(spi_device_id);
 	DEVID_FIELD(spi_device_id, name);
 
scripts/mod/file2alias.c +11 -0
index 5d1c61fa5a55..99dce93a4188 100644
@@ -960,6 +960,16 @@ static int do_i3c_entry(const char *filename, void *symval,
 	return 1;
 }
 
+static int do_slim_entry(const char *filename, void *symval, char *alias)
+{
+	DEF_FIELD(symval, slim_device_id, manf_id);
+	DEF_FIELD(symval, slim_device_id, prod_code);
+
+	sprintf(alias, "slim:%x:%x:*", manf_id, prod_code);
+
+	return 1;
+}
+
 /* Looks like: spi:S */
 static int do_spi_entry(const char *filename, void *symval,
 			char *alias)
@@ -1555,6 +1565,7 @@ static const struct devtable devtable[] = {
 	{"rpmsg", SIZE_rpmsg_device_id, do_rpmsg_entry},
 	{"i2c", SIZE_i2c_device_id, do_i2c_entry},
 	{"i3c", SIZE_i3c_device_id, do_i3c_entry},
+	{"slim", SIZE_slim_device_id, do_slim_entry},
 	{"spi", SIZE_spi_device_id, do_spi_entry},
 	{"dmi", SIZE_dmi_system_id, do_dmi_entry},
 	{"platform", SIZE_platform_device_id, do_platform_entry},
Signature · 1 line
2.43.0
#1 lore raw

Hi Srinivas,

Any comments?

Quoted 66 lines · Masahiro Yamada

Commit 9e663f4811c6 ("slimbus: core: add support to uevent") added the MODALIAS=slim:* uevent variable, but modpost does not generate the corresponding MODULE_ALIAS().

To support automatic module loading, slimbus drivers still need to manually add MODULE_ALIAS("slim:<manf_id>:<prod_code>:*"), as seen in sound/soc/codecs/wcd9335.c.

To automate this, make modpost generate the proper MODULE_ALIAS() from MODULE_DEVICE_TABLE(slim, ).

---

 scripts/mod/devicetable-offsets.c |  4 ++++
 scripts/mod/file2alias.c          | 11 +++++++++++
 2 files changed, 15 insertions(+)
scripts/mod/devicetable-offsets.c +4 -0
index 518200813d4e..9c7b404defbd 100644
@@ -153,6 +153,10 @@ int main(void)
        DEVID_FIELD(i3c_device_id, part_id);
        DEVID_FIELD(i3c_device_id, extra_info);
 
+       DEVID(slim_device_id);
+       DEVID_FIELD(slim_device_id, manf_id);
+       DEVID_FIELD(slim_device_id, prod_code);
+
        DEVID(spi_device_id);
        DEVID_FIELD(spi_device_id, name);
 
scripts/mod/file2alias.c +11 -1
index 5d1c61fa5a55..99dce93a4188 100644
@@ -960,6 +960,16 @@ static int do_i3c_entry(const char *filename, void *symval,
        return 1;
 }
 
+static int do_slim_entry(const char *filename, void *symval, char *alias)
+{
+       DEF_FIELD(symval, slim_device_id, manf_id);
+       DEF_FIELD(symval, slim_device_id, prod_code);
+
+       sprintf(alias, "slim:%x:%x:*", manf_id, prod_code);
+
+       return 1;
+}
+
 /* Looks like: spi:S */
 static int do_spi_entry(const char *filename, void *symval,
                        char *alias)
@@ -1555,6 +1565,7 @@ static const struct devtable devtable[] = {
        {"rpmsg", SIZE_rpmsg_device_id, do_rpmsg_entry},
        {"i2c", SIZE_i2c_device_id, do_i2c_entry},
        {"i3c", SIZE_i3c_device_id, do_i3c_entry},
+       {"slim", SIZE_slim_device_id, do_slim_entry},
        {"spi", SIZE_spi_device_id, do_spi_entry},
        {"dmi", SIZE_dmi_system_id, do_dmi_entry},
        {"platform", SIZE_platform_device_id, do_platform_entry},
--

2.43.0

Signature · 2 lines
Best Regards
Masahiro Yamada
#2 lore raw
In reply to Masahiro Yamada
Quoted 9 lines · Masahiro Yamada

Commit 9e663f4811c6 ("slimbus: core: add support to uevent") added the MODALIAS=slim:* uevent variable, but modpost does not generate the corresponding MODULE_ALIAS().

To support automatic module loading, slimbus drivers still need to manually add MODULE_ALIAS("slim:<manf_id>:<prod_code>:*"), as seen in sound/soc/codecs/wcd9335.c.

[...]

Applied, thanks!

[1/1] slimbus: generate MODULE_ALIAS() from MODULE_DEVICE_TABLE()

      commit: 9b6e704955fa8db55d11f2e7be5d723c8186ffc6

Best regards,

Signature · 1 line
Srinivas Kandagatla <[email protected]>