Merge branches 'pm-core', 'pm-qos', 'pm-domains' and 'pm-opp'

[linux.git] / drivers / firmware / efi / libstub / efi-stub-helper.c

diff --git a/drivers/firmware/efi/libstub/efi-stub-helper.c b/drivers/firmware/efi/libstub/efi-stub-helper.c
index 6ee9164251a94cf46ac64f4fac503ba4840886e2..919822b7773d5df20cd6009e3f336d48dfa2e191 100644 (file)
--- a/drivers/firmware/efi/libstub/efi-stub-helper.c
+++ b/drivers/firmware/efi/libstub/efi-stub-helper.c
@@ -413,6 +413,14 @@ efi_status_t efi_parse_options(char *cmdline)
 {
        char *str;
 
+       /*
+        * Currently, the only efi= option we look for is 'nochunk', which
+        * is intended to work around known issues on certain x86 UEFI
+        * versions. So ignore for now on other architectures.
+        */
+       if (!IS_ENABLED(CONFIG_X86))
+               return EFI_SUCCESS;
+
        /*
         * If no EFI parameters were specified on the cmdline we've got
         * nothing to do.
@@ -586,7 +594,8 @@ efi_status_t handle_cmdline_files(efi_system_table_t *sys_table_arg,
                        size = files[j].size;
                        while (size) {
                                unsigned long chunksize;
-                               if (size > __chunk_size)
+
+                               if (IS_ENABLED(CONFIG_X86) && size > __chunk_size)
                                        chunksize = __chunk_size;
                                else
                                        chunksize = size;