x86, efi: remove attribute check from setup_efi_pci
authorMaarten Lankhorst <maarten.lankhorst@canonical.com>
Tue, 29 Jan 2013 16:52:24 +0000 (17:52 +0100)
committerMatt Fleming <matt.fleming@intel.com>
Tue, 29 Jan 2013 17:52:06 +0000 (17:52 +0000)
It looks like the original commit that copied the rom contents from
efi always copied the rom, and the fixup in setup_efi_pci from commit
886d751a2ea99a160 ("x86, efi: correct precedence of operators in
setup_efi_pci") broke that.

This resulted in macbook pro's no longer finding the rom images, and
thus not being able to use the radeon card any more.

The solution is to just remove the check for now, and always copy the
rom if available.

Reported-by: Vitaly Budovski <vbudovski+news@gmail.com>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Seth Forshee <seth.forshee@canonical.com>
Acked-by: Matthew Garrett <mjg59@srcf.ucam.org>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Sasha Levin <sasha.levin@oracle.com>
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>

index 3f3d36f5a8008215c3d6190fff90c8b22558175c..b0098ba4f23b1038039fdf7aea2b88d1026488c1 100644 (file)
@@ -302,9 +302,6 @@ static efi_status_t setup_efi_pci(struct boot_params *params)
                if (status != EFI_SUCCESS)
-               if (!(attributes & EFI_PCI_IO_ATTRIBUTE_EMBEDDED_ROM))
-                       continue;
                if (!pci->romimage || !pci->romsize)