3 files changed, 28 insertions, 0 deletions

diff --git a/scripts/mod/devicetable-offsets.c b/scripts/mod/devicetable-offsets.c
index 9826b9a6543c..9fad6afe4c41 100644
--- a/scripts/mod/devicetable-offsets.c
+++ b/scripts/mod/devicetable-offsets.c
@@ -203,6 +203,10 @@ int main(void)
         DEVID_FIELD(hda_device_id, rev_id);
         DEVID_FIELD(hda_device_id, api_version);
 
+        DEVID(sdw_device_id);
+        DEVID_FIELD(sdw_device_id, mfg_id);
+        DEVID_FIELD(sdw_device_id, part_id);
+
         DEVID(fsl_mc_device_id);
         DEVID_FIELD(fsl_mc_device_id, vendor);
         DEVID_FIELD(fsl_mc_device_id, obj_type);
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 6ef6e63f96fd..b9beeaa4695b 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -1289,6 +1289,21 @@ static int do_hda_entry(const char *filename, void *symval, char *alias)
 }
 ADD_TO_DEVTABLE("hdaudio", hda_device_id, do_hda_entry);
 
+/* Looks like: sdw:mNpN */
+static int do_sdw_entry(const char *filename, void *symval, char *alias)
+{
+        DEF_FIELD(symval, sdw_device_id, mfg_id);
+        DEF_FIELD(symval, sdw_device_id, part_id);
+
+        strcpy(alias, "sdw:");
+        ADD(alias, "m", mfg_id != 0, mfg_id);
+        ADD(alias, "p", part_id != 0, part_id);
+
+        add_wildcard(alias);
+        return 1;
+}
+ADD_TO_DEVTABLE("sdw", sdw_device_id, do_sdw_entry);
+
 /* Looks like: fsl-mc:vNdN */
 static int do_fsl_mc_entry(const char *filename, void *symval,
                            char *alias)
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 49dfcd556c78..9917f928d0fd 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -2165,6 +2165,14 @@ static void add_intree_flag(struct buffer *b, int is_intree)
                 buf_printf(b, "\nMODULE_INFO(intree, \"Y\");\n");
 }
 
+/* Cannot check for assembler */
+static void add_retpoline(struct buffer *b)
+{
+        buf_printf(b, "\n#ifdef RETPOLINE\n");
+        buf_printf(b, "MODULE_INFO(retpoline, \"Y\");\n");
+        buf_printf(b, "#endif\n");
+}
+
 static void add_staging_flag(struct buffer *b, const char *name)
 {
         static const char *staging_dir = "drivers/staging";
@@ -2506,6 +2514,7 @@ int main(int argc, char **argv)
                 err |= check_modname_len(mod);
                 add_header(&buf, mod);
                 add_intree_flag(&buf, !external_module);
+                add_retpoline(&buf);
                 add_staging_flag(&buf, mod->name);
                 err |= add_versions(&buf, mod);
                 add_depends(&buf, mod, modules);