[PATCH] fix setup_efi_pci()

[PATCH] fix setup_efi_pci()

[Jan Beulich]

This fixes three issues:
- missing parentheses around a flag test
- wrong memory type used for allocation intended to persist post-boot
- four similar build warnings on 32-bit (casts between different size
  pointers and integers)

Signed-off-by: Jan Beulich <jbeulich@suse.com>

---
 arch/x86/boot/compressed/eboot.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

--- 3.8-rc3/arch/x86/boot/compressed/eboot.c
+++ 3.8-rc3-x86-EFI-PCI-ROMs/arch/x86/boot/compressed/eboot.c
@@ -256,10 +256,10 @@ static efi_status_t setup_efi_pci(struct
 	int i;
 	struct setup_data *data;
 
-	data = (struct setup_data *)params->hdr.setup_data;
+	data = (struct setup_data *)(unsigned long)params->hdr.setup_data;
 
 	while (data && data->next)
-		data = (struct setup_data *)data->next;
+		data = (struct setup_data *)(unsigned long)data->next;
 
 	status = efi_call_phys5(sys_table->boottime->locate_handle,
 				EFI_LOCATE_BY_PROTOCOL, &pci_proto,
@@ -302,7 +302,7 @@ static efi_status_t setup_efi_pci(struct
 		if (status != EFI_SUCCESS)
 			continue;
 
-		if (!attributes & EFI_PCI_IO_ATTRIBUTE_EMBEDDED_ROM)
+		if (!(attributes & EFI_PCI_IO_ATTRIBUTE_EMBEDDED_ROM))
 			continue;
 
 		if (!pci->romimage || !pci->romsize)
@@ -311,7 +311,7 @@ static efi_status_t setup_efi_pci(struct
 		size = pci->romsize + sizeof(*rom);
 
 		status = efi_call_phys3(sys_table->boottime->allocate_pool,
-				EFI_LOADER_DATA, size, &rom);
+					EFI_RUNTIME_SERVICES_DATA, size, &rom);
 
 		if (status != EFI_SUCCESS)
 			continue;
@@ -345,9 +345,9 @@ static efi_status_t setup_efi_pci(struct
 		memcpy(rom->romdata, pci->romimage, pci->romsize);
 
 		if (data)
-			data->next = (uint64_t)rom;
+			data->next = (unsigned long)rom;
 		else
-			params->hdr.setup_data = (uint64_t)rom;
+			params->hdr.setup_data = (unsigned long)rom;
 
 		data = (struct setup_data *)rom;
 

Re: [PATCH] fix setup_efi_pci()

[Matt Fleming]

On Mon, 2013-01-14 at 08:59 +0000, Jan Beulich wrote:
> This fixes three issues:
> - missing parentheses around a flag test
> - wrong memory type used for allocation intended to persist post-boot
> - four similar build warnings on 32-bit (casts between different size
>   pointers and integers)
> 
> Signed-off-by: Jan Beulich <jbeulich@suse.com>
> 
> ---
>  arch/x86/boot/compressed/eboot.c |   12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)

Jan, could you resubmit items 2 and 3 as separate patches please? Item 1
on your list has already been fixed in Linus' tree,

commit 886d751a2ea99a160f2d0a472231566d9cb0cf58
Author: Sasha Levin <sasha.levin@oracle.com>
Date:   Thu Dec 20 14:11:33 2012 -0500

    x86, efi: correct precedence of operators in setup_efi_pci
    
    With the current code, the condition in the if() doesn't make much sense due
    precedence of operators.
    
    Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
    Link: http://lkml.kernel.org/r/1356030701-16284-25-git-send-email-sasha.levi
    Cc: Matt Fleming <matt.fleming@intel.com>
    Cc: Matthew Garrett <mjg@redhat.com>
    Cc: Bjorn Helgaas <bhelgaas@google.com>
    Cc: Seth Forshee <seth.forshee@canonical.com>
    Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

-- 
Matt Fleming, Intel Open Source Technology Center

Re: [PATCH] fix setup_efi_pci()

[Jan Beulich]

>>> On 17.01.13 at 13:29, Matt Fleming <matt@console-pimps.org> wrote:
> On Mon, 2013-01-14 at 08:59 +0000, Jan Beulich wrote:
>> This fixes three issues:
>> - missing parentheses around a flag test
>> - wrong memory type used for allocation intended to persist post-boot
>> - four similar build warnings on 32-bit (casts between different size
>>   pointers and integers)
>> 
>> Signed-off-by: Jan Beulich <jbeulich@suse.com>
>> 
>> ---
>>  arch/x86/boot/compressed/eboot.c |   12 ++++++------
>>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> Jan, could you resubmit items 2 and 3 as separate patches please?

Sure, will do (probably only after rc4 though).

> Item 1 on your list has already been fixed in Linus' tree,

Yet I know I checked the tree right before sending...

Jan

> commit 886d751a2ea99a160f2d0a472231566d9cb0cf58
> Author: Sasha Levin <sasha.levin@oracle.com>
> Date:   Thu Dec 20 14:11:33 2012 -0500
> 
>     x86, efi: correct precedence of operators in setup_efi_pci
>     
>     With the current code, the condition in the if() doesn't make much sense 
> due
>     precedence of operators.
>     
>     Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
>     Link: 
> http://lkml.kernel.org/r/1356030701-16284-25-git-send-email-sasha.levi 
>     Cc: Matt Fleming <matt.fleming@intel.com>
>     Cc: Matthew Garrett <mjg@redhat.com>
>     Cc: Bjorn Helgaas <bhelgaas@google.com>
>     Cc: Seth Forshee <seth.forshee@canonical.com>
>     Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
> 
> -- 
> Matt Fleming, Intel Open Source Technology Center