Commit: fb5933318d51d7ecf9ef35a6a4504a2c337f00c4 - system-coremmmm (git)

system/corennnnn

Commit MetaInfo

• Revision: fb5933318d51d7ecf9ef35a6a4504a2c337f00c4 (tree)
• Time: 2016-09-29 12:32:06
• Author: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Log Message

Merge remote-tracking branch 'x86/marshmallow-x86' into cm-13.0-x86

Conflicts:
init/devices.cpp
init/init.cpp

Change Summary

• modified: init/Android.mk
• modified: init/devices.cpp
• modified: init/init.cpp

Incremental Difference

--- a/init/Android.mk
+++ b/init/Android.mk
@@ -38,6 +38,7 @@ include $(BUILD_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_CPPFLAGS := $(init_cflags)
+LOCAL_CPPFLAGS += -DTARGET_PRODUCT=\"$(PRODUCT_RELEASE_NAME)\"
 LOCAL_SRC_FILES:= \
     bootchart.cpp \
     builtins.cpp \

--- a/init/devices.cpp
+++ b/init/devices.cpp
@@ -115,6 +115,7 @@ struct module_alias_node {
 
 struct module_blacklist_node {
     char *name;
+    bool deferred;
     struct listnode list;
 };
 
@@ -852,7 +853,7 @@ static void handle_generic_device_event(struct uevent *uevent)
              uevent->major, uevent->minor, links);
 }
 
-static int is_module_blacklisted(const char *name)
+static int is_module_blacklisted_or_deferred(const char *name, bool need_deferred)
 {
     struct listnode *blklst_node;
     struct module_blacklist_node *blacklist;
@@ -867,7 +868,7 @@ static int is_module_blacklisted(const char *name)
                                  list);
         if (!strcmp(name, blacklist->name)) {
             INFO("modules %s is blacklisted\n", name);
-            ret = 1;
+            ret = blacklist->deferred ? (need_deferred ? 2 : 0) : 1;
             goto out;
         }
     }
@@ -876,7 +877,7 @@ out:
     return ret;
 }
 
-static int load_module_by_device_modalias(const char *id)
+static int load_module_by_device_modalias(const char *id, bool need_deferred)
 {
     struct listnode *alias_node;
     struct module_alias_node *alias;
@@ -889,8 +890,9 @@ static int load_module_by_device_modalias(const char *id)
             if (fnmatch(alias->pattern, id, 0) == 0) {
                 INFO("trying to load module %s due to uevents\n", alias->name);
 
-                if (!is_module_blacklisted(alias->name)) {
-                    if (insmod_by_dep(alias->name, "", NULL, 0, NULL)) {
+                ret = is_module_blacklisted_or_deferred(alias->name, need_deferred);
+                if (ret == 0) {
+                    if ((ret = insmod_by_dep(alias->name, "", NULL, 0, NULL))) {
                         /* cannot load module. try another one since
                          * there may be another match.
                          */
@@ -899,8 +901,9 @@ static int load_module_by_device_modalias(const char *id)
                     } else {
                         /* loading was successful */
                         INFO("loaded module %s due to uevents\n", alias->name);
-                        ret = 0;
                     }
+                } else {
+                    NOTICE("blacklisted module %s: %d\n", alias->name, ret);
                 }
             }
         }
@@ -924,7 +927,7 @@ static void handle_deferred_module_loading()
 
             if (alias && alias->pattern) {
                 INFO("deferred loading of module for %s\n", alias->pattern);
-                load_module_by_device_modalias(alias->pattern);
+                load_module_by_device_modalias(alias->pattern, false);
                 free(alias->pattern);
                 list_remove(node);
                 free(alias);
@@ -942,7 +945,12 @@ int module_probe(const char *modalias)
             return -1;
     }
 
-    return modalias ? load_module_by_device_modalias(modalias) : -1;
+    return modalias ? load_module_by_device_modalias(modalias, false) : -1;
+}
+
+static int is_booting(void)
+{
+    return access("/dev/.booting", F_OK) == 0;
 }
 
 static void handle_module_loading(const char *modalias)
@@ -955,13 +963,13 @@ static void handle_module_loading(const char *modalias)
     if (list_empty(&modules_aliases_map)) {
         if (read_modules_aliases() == 0) {
             read_modules_blacklist();
-            handle_deferred_module_loading();
         }
     }
 
     if (!modalias) return;
 
-    if (list_empty(&modules_aliases_map)) {
+    if (list_empty(&modules_aliases_map) ||
+            load_module_by_device_modalias(modalias, is_booting()) == 2) {
         /* if module alias mapping is empty,
          * queue it for loading later
          */
@@ -978,8 +986,6 @@ static void handle_module_loading(const char *modalias)
         } else {
             ERROR("failed to allocate memory to store device id for deferred module loading.\n");
         }
-    } else {
-        load_module_by_device_modalias(modalias);
     }
 
 }
@@ -1045,11 +1051,6 @@ static int load_firmware(int fw_fd, gzFile gz_fd, int loading_fd, int data_fd)
     return ret;
 }
 
-static int is_booting(void)
-{
-    return access("/dev/.booting", F_OK) == 0;
-}
-
 gzFile fw_gzopen(const char *fname, const char *mode)
 {
     char *file1 = NULL;
@@ -1190,6 +1191,7 @@ static void parse_line_module_alias(struct parse_state *state, int nargs, char *
 static void parse_line_module_blacklist(struct parse_state *state, int nargs, char **args)
 {
     struct module_blacklist_node *node;
+    bool deferred;
 
     if (!args ||
         (nargs != 2) ||
@@ -1198,8 +1200,13 @@ static void parse_line_module_blacklist(struct parse_state *state, int nargs, ch
         return;
     }
 
-    /* this line does not being with "blacklist" */
-    if (strncmp(args[0], "blacklist", 9)) return;
+    /* this line should be with "blacklist" or "deferred" */
+    if (!strncmp(args[0], "blacklist", 9))
+        deferred = false;
+    else if (!strncmp(args[0], "deferred", 8))
+        deferred = true;
+    else
+        return;
 
     node = (module_blacklist_node *) calloc(1, sizeof(*node));
     if (!node) return;
@@ -1209,6 +1216,7 @@ static void parse_line_module_blacklist(struct parse_state *state, int nargs, ch
         free(node);
         return;
     }
+    node->deferred = deferred;
 
     list_add_tail(&modules_blacklist, &node->list);
 }
@@ -1406,6 +1414,7 @@ void device_init(bool child)
     coldboot("/sys/class");
     coldboot("/sys/block");
     coldboot("/sys/devices");
+    handle_deferred_module_loading();
     close(open(COLDBOOT_DONE, O_WRONLY|O_CREAT|O_CLOEXEC, 0000));
     NOTICE("Coldboot took %.2fs.\n", t.duration());
 }

--- a/init/init.cpp
+++ b/init/init.cpp
@@ -818,7 +818,7 @@ static void export_kernel_boot_props() {
         { "ro.boot.mode",       "ro.bootmode",   "unknown", },
         { "ro.boot.baseband",   "ro.baseband",   "unknown", },
         { "ro.boot.bootloader", "ro.bootloader", "unknown", },
-        { "ro.boot.hardware",   "ro.hardware",   "unknown", },
+        { "ro.boot.hardware",   "ro.hardware",   TARGET_PRODUCT, },
 #ifndef IGNORE_RO_BOOT_REVISION
         { "ro.boot.revision",   "ro.revision",   "0", },
 #endif