Merge tag 'v5.1-rc2' into next-general

Merge to Linux 5.1-rc2 for subsystems to work with.

3 files changed, 57 insertions, 23 deletions

diff --git a/scripts/mod/devicetable-offsets.c b/scripts/mod/devicetable-offsets.c
index 293004499b4d..054405b90ba4 100644
--- a/scripts/mod/devicetable-offsets.c
+++ b/scripts/mod/devicetable-offsets.c
@@ -225,5 +225,11 @@ int main(void)
         DEVID_FIELD(typec_device_id, svid);
         DEVID_FIELD(typec_device_id, mode);
 
+        DEVID(tee_client_device_id);
+        DEVID_FIELD(tee_client_device_id, uuid);
+
+        DEVID(wmi_device_id);
+        DEVID_FIELD(wmi_device_id, guid_string);
+
         return 0;
 }
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index a37af7d71973..e17a29ae2e97 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -37,6 +37,10 @@ typedef unsigned char	__u8;
 typedef struct {
         __u8 b[16];
 } uuid_le;
+typedef struct {
+        __u8 b[16];
+} uuid_t;
+#define UUID_STRING_LEN         36
 
 /* Big exception to the "don't include kernel headers into userspace, which
  * even potentially has different endianness and word sizes, since
@@ -50,6 +54,9 @@ struct devtable {
         int (*do_entry)(const char *filename, void *symval, char *alias);
 };
 
+/* Size of alias provided to do_entry functions */
+#define ALIAS_SIZE 500
+
 /* Define a variable f that holds the value of field f of struct devid
  * based at address m.
  */
@@ -1287,6 +1294,42 @@ static int do_typec_entry(const char *filename, void *symval, char *alias)
         return 1;
 }
 
+/* Looks like: tee:uuid */
+static int do_tee_entry(const char *filename, void *symval, char *alias)
+{
+        DEF_FIELD(symval, tee_client_device_id, uuid);
+
+        sprintf(alias, "tee:%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
+                uuid.b[0], uuid.b[1], uuid.b[2], uuid.b[3], uuid.b[4],
+                uuid.b[5], uuid.b[6], uuid.b[7], uuid.b[8], uuid.b[9],
+                uuid.b[10], uuid.b[11], uuid.b[12], uuid.b[13], uuid.b[14],
+                uuid.b[15]);
+
+        add_wildcard(alias);
+        return 1;
+}
+
+/* Looks like: wmi:guid */
+static int do_wmi_entry(const char *filename, void *symval, char *alias)
+{
+        int len;
+        DEF_FIELD_ADDR(symval, wmi_device_id, guid_string);
+
+        if (strlen(*guid_string) != UUID_STRING_LEN) {
+                warn("Invalid WMI device id 'wmi:%s' in '%s'\n",
+                                *guid_string, filename);
+                return 0;
+        }
+
+        len = snprintf(alias, ALIAS_SIZE, WMI_MODULE_PREFIX "%s", *guid_string);
+        if (len < 0 || len >= ALIAS_SIZE) {
+                warn("Could not generate all MODULE_ALIAS's in '%s'\n",
+                                filename);
+                return 0;
+        }
+        return 1;
+}
+
 /* Does namelen bytes of name exactly match the symbol? */
 static bool sym_is(const char *name, unsigned namelen, const char *symbol)
 {
@@ -1303,7 +1346,7 @@ static void do_table(void *symval, unsigned long size,
                      struct module *mod)
 {
         unsigned int i;
-        char alias[500];
+        char alias[ALIAS_SIZE];
 
         device_id_check(mod->name, device_id, size, id_size, symval);
         /* Leave last one: it's the terminator. */
@@ -1357,6 +1400,8 @@ static const struct devtable devtable[] = {
         {"fslmc", SIZE_fsl_mc_device_id, do_fsl_mc_entry},
         {"tbsvc", SIZE_tb_service_id, do_tbsvc_entry},
         {"typec", SIZE_typec_device_id, do_typec_entry},
+        {"tee", SIZE_tee_client_device_id, do_tee_entry},
+        {"wmi", SIZE_wmi_device_id, do_wmi_entry},
 };
 
 /* Create MODULE_ALIAS() statements.
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 26bf886bd168..0b0d1080b1c5 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -35,7 +35,6 @@ static int vmlinux_section_warnings = 1;
 static int warn_unresolved = 0;
 /* How a symbol is exported */
 static int sec_mismatch_count = 0;
-static int sec_mismatch_verbose = 1;
 static int sec_mismatch_fatal = 0;
 /* ignore missing files */
 static int ignore_missing_files;
@@ -1406,8 +1405,6 @@ static void report_sec_mismatch(const char *modname,
         char *prl_to;
 
         sec_mismatch_count++;
-        if (!sec_mismatch_verbose)
-                return;
 
         get_pretty_name(from_is_func, &from, &from_p);
         get_pretty_name(to_is_func, &to, &to_p);
@@ -1655,9 +1652,7 @@ static void extable_mismatch_handler(const char* modname, struct elf_info *elf,
 
         sec_mismatch_count++;
 
-        if (sec_mismatch_verbose)
-                report_extable_warnings(modname, elf, mismatch, r, sym,
-                                        fromsec, tosec);
+        report_extable_warnings(modname, elf, mismatch, r, sym, fromsec, tosec);
 
         if (match(tosec, mismatch->bad_tosec))
                 fatal("The relocation at %s+0x%lx references\n"
@@ -2433,7 +2428,7 @@ int main(int argc, char **argv)
         struct ext_sym_list *extsym_iter;
         struct ext_sym_list *extsym_start = NULL;
 
-        while ((opt = getopt(argc, argv, "i:I:e:mnsST:o:awE")) != -1) {
+        while ((opt = getopt(argc, argv, "i:I:e:mnsT:o:awE")) != -1) {
                 switch (opt) {
                 case 'i':
                         kernel_read = optarg;
@@ -2465,9 +2460,6 @@ int main(int argc, char **argv)
                 case 's':
                         vmlinux_section_warnings = 0;
                         break;
-                case 'S':
-                        sec_mismatch_verbose = 0;
-                        break;
                 case 'T':
                         files_source = optarg;
                         break;
@@ -2525,18 +2517,9 @@ int main(int argc, char **argv)
         }
         if (dump_write)
                 write_dump(dump_write);
-        if (sec_mismatch_count) {
-                if (!sec_mismatch_verbose) {
-                        warn("modpost: Found %d section mismatch(es).\n"
-                             "To see full details build your kernel with:\n"
-                             "'make CONFIG_DEBUG_SECTION_MISMATCH=y'\n",
-                             sec_mismatch_count);
-                }
-                if (sec_mismatch_fatal) {
-                        fatal("modpost: Section mismatches detected.\n"
-                              "Set CONFIG_SECTION_MISMATCH_WARN_ONLY=y to allow them.\n");
-                }
-        }
+        if (sec_mismatch_count && sec_mismatch_fatal)
+                fatal("modpost: Section mismatches detected.\n"
+                      "Set CONFIG_SECTION_MISMATCH_WARN_ONLY=y to allow them.\n");
         free(buf.p);
 
         return err;