1 files changed, 25 insertions, 7 deletions

diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
index de8eebd6f67c..1acf605a646d 100644
--- a/arch/x86/boot/compressed/eboot.c
+++ b/arch/x86/boot/compressed/eboot.c
@@ -330,8 +330,10 @@ __setup_efi_pci32(efi_pci_io_protocol_32 *pci, struct pci_setup_rom **__rom)
         size = pci->romsize + sizeof(*rom);
 
         status = efi_call_early(allocate_pool, EFI_LOADER_DATA, size, &rom);
-        if (status != EFI_SUCCESS)
+        if (status != EFI_SUCCESS) {
+                efi_printk(sys_table, "Failed to alloc mem for rom\n");
                 return status;
+        }
 
         memset(rom, 0, sizeof(*rom));
 
@@ -344,14 +346,18 @@ __setup_efi_pci32(efi_pci_io_protocol_32 *pci, struct pci_setup_rom **__rom)
         status = efi_early->call(pci->pci.read, pci, EfiPciIoWidthUint16,
                                  PCI_VENDOR_ID, 1, &(rom->vendor));
 
-        if (status != EFI_SUCCESS)
+        if (status != EFI_SUCCESS) {
+                efi_printk(sys_table, "Failed to read rom->vendor\n");
                 goto free_struct;
+        }
 
         status = efi_early->call(pci->pci.read, pci, EfiPciIoWidthUint16,
                                  PCI_DEVICE_ID, 1, &(rom->devid));
 
-        if (status != EFI_SUCCESS)
+        if (status != EFI_SUCCESS) {
+                efi_printk(sys_table, "Failed to read rom->devid\n");
                 goto free_struct;
+        }
 
         status = efi_early->call(pci->get_location, pci, &(rom->segment),
                                  &(rom->bus), &(rom->device), &(rom->function));
@@ -432,8 +438,10 @@ __setup_efi_pci64(efi_pci_io_protocol_64 *pci, struct pci_setup_rom **__rom)
         size = pci->romsize + sizeof(*rom);
 
         status = efi_call_early(allocate_pool, EFI_LOADER_DATA, size, &rom);
-        if (status != EFI_SUCCESS)
+        if (status != EFI_SUCCESS) {
+                efi_printk(sys_table, "Failed to alloc mem for rom\n");
                 return status;
+        }
 
         rom->data.type = SETUP_PCI;
         rom->data.len = size - sizeof(struct setup_data);
@@ -444,14 +452,18 @@ __setup_efi_pci64(efi_pci_io_protocol_64 *pci, struct pci_setup_rom **__rom)
         status = efi_early->call(pci->pci.read, pci, EfiPciIoWidthUint16,
                                  PCI_VENDOR_ID, 1, &(rom->vendor));
 
-        if (status != EFI_SUCCESS)
+        if (status != EFI_SUCCESS) {
+                efi_printk(sys_table, "Failed to read rom->vendor\n");
                 goto free_struct;
+        }
 
         status = efi_early->call(pci->pci.read, pci, EfiPciIoWidthUint16,
                                  PCI_DEVICE_ID, 1, &(rom->devid));
 
-        if (status != EFI_SUCCESS)
+        if (status != EFI_SUCCESS) {
+                efi_printk(sys_table, "Failed to read rom->devid\n");
                 goto free_struct;
+        }
 
         status = efi_early->call(pci->get_location, pci, &(rom->segment),
                                  &(rom->bus), &(rom->device), &(rom->function));
@@ -538,8 +550,10 @@ static void setup_efi_pci(struct boot_params *params)
                                         EFI_LOADER_DATA,
                                         size, (void **)&pci_handle);
 
-                if (status != EFI_SUCCESS)
+                if (status != EFI_SUCCESS) {
+                        efi_printk(sys_table, "Failed to alloc mem for pci_handle\n");
                         return;
+                }
 
                 status = efi_call_early(locate_handle,
                                         EFI_LOCATE_BY_PROTOCOL, &pci_proto,
@@ -1105,6 +1119,10 @@ struct boot_params *make_boot_params(struct efi_config *c)
 
         memset(sdt, 0, sizeof(*sdt));
 
+        status = efi_parse_options(cmdline_ptr);
+        if (status != EFI_SUCCESS)
+                goto fail2;
+
         status = handle_cmdline_files(sys_table, image,
                                       (char *)(unsigned long)hdr->cmd_line_ptr,
                                       "initrd=", hdr->initrd_addr_max,