Skip to contentSkip to conversation

x86, efi: Fix a build warning

PATCH Applied Borislav Petkov 3 participants 10 messages Apr 24, 2013 – Apr 25, 2013 x86

lore
Share & tools
lore

Borislav Petkov

author maintainer
#0 lore raw

PATCH 1/1 x86, efi: Fix a build warning

From: Borislav Petkov <[email protected]>

Fix this:

arch/x86/boot/compressed/eboot.c: In function ‘setup_efi_vars’:
arch/x86/boot/compressed/eboot.c:269:2: warning: passing argument 1 of ‘efi_call_phys’ makes pointer from integer without a cast [enabled by default] In file included from arch/x86/boot/compressed/eboot.c:12:0:
/w/kernel/linux/arch/x86/include/asm/efi.h:8:33: note: expected ‘void *’ but argument is of type ‘long unsigned int’

after cc5a080c5d40 ("efi: Pass boot services variable info to runtime code").

Cc Matthew Garrett <[email protected]>
Cc Matt Fleming <[email protected]>
---
 arch/x86/boot/compressed/eboot.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/boot/compressed/eboot.c +1 -1
index 8615f7581820..41de115a55b7 100644
@@ -266,7 +266,7 @@ static efi_status_t setup_efi_vars(struct boot_params *params)
 	while (data && data->next)
 		data = (struct setup_data *)(unsigned long)data->next;
 
-	status = efi_call_phys4(sys_table->runtime->query_variable_info,
+	status = efi_call_phys4((void *)sys_table->runtime->query_variable_info,
 				EFI_VARIABLE_NON_VOLATILE |
 				EFI_VARIABLE_BOOTSERVICE_ACCESS |
 				EFI_VARIABLE_RUNTIME_ACCESS, &store_size,
Signature · 1 line
1.8.2.135.g7b592fa
Applied
#1 lore raw
Quoted 12 lines · Borislav Petkov

From: Borislav Petkov <[email protected]>

Fix this:

arch/x86/boot/compressed/eboot.c: In function ‘setup_efi_vars’:
arch/x86/boot/compressed/eboot.c:269:2: warning: passing argument 1 of ‘efi_call_phys’ makes pointer from integer without a cast [enabled by default] In file included from arch/x86/boot/compressed/eboot.c:12:0:
/w/kernel/linux/arch/x86/include/asm/efi.h:8:33: note: expected ‘void *’ but argument is of type ‘long unsigned int’

after cc5a080c5d40 ("efi: Pass boot services variable info to runtime code").

Quoted 6 lines
Cc Matthew Garrett <[email protected]>
Cc Matt Fleming <[email protected]>
---
 arch/x86/boot/compressed/eboot.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Thanks, applied!

#2 lore raw
In reply to Borislav Petkov
Quoted 24 lines · Borislav Petkov

From: Borislav Petkov <[email protected]>

Fix this:

arch/x86/boot/compressed/eboot.c: In function ???setup_efi_vars???:
arch/x86/boot/compressed/eboot.c:269:2: warning: passing argument 1 of ???efi_call_phys??? makes pointer from integer without a cast [enabled by default] In file included from arch/x86/boot/compressed/eboot.c:12:0:
/w/kernel/linux/arch/x86/include/asm/efi.h:8:33: note: expected ???void *??? but argument is of type ???long unsigned int???

after cc5a080c5d40 ("efi: Pass boot services variable info to runtime code").

Cc Matthew Garrett <[email protected]>
Cc Matt Fleming <[email protected]>
---
 arch/x86/boot/compressed/eboot.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/boot/compressed/eboot.c +0 -0
index 8615f7581820..41de115a55b7 100644

arch/x86/boot/compressed/eboot.c static efi_status_t setup_efi_vars(struct boot_params *params) · line 272

Quoted 8 lines
arch/x86/boot/compressed/eboot.c +1 -1
@@ -266,7 +266,7 @@ static efi_status_t setup_efi_vars(struct boot_params *params)
 	while (data && data->next)
 		data = (struct setup_data *)(unsigned long)data->next;
 
-	status = efi_call_phys4(sys_table->runtime->query_variable_info,
+	status = efi_call_phys4((void *)sys_table->runtime->query_variable_info,
 				EFI_VARIABLE_NON_VOLATILE |
 				EFI_VARIABLE_BOOTSERVICE_ACCESS |
 				EFI_VARIABLE_RUNTIME_ACCESS, &store_size,

Why isn't the query_variale_info field changed to void * instead? That way no cast would be needed.

Thanks,

Ingo

#3 lore raw
Quoted 30 lines · Ingo Molnar
Quoted 27 lines · Borislav Petkov

From: Borislav Petkov <[email protected]>

Fix this:

arch/x86/boot/compressed/eboot.c: In function ???setup_efi_vars???:
arch/x86/boot/compressed/eboot.c:269:2: warning: passing argument 1 of ???efi_call_phys??? makes pointer from integer without a cast [enabled by default] In file included from arch/x86/boot/compressed/eboot.c:12:0:
/w/kernel/linux/arch/x86/include/asm/efi.h:8:33: note: expected ???void *??? but argument is of type ???long unsigned int???

after cc5a080c5d40 ("efi: Pass boot services variable info to runtime code").

Cc Matthew Garrett <[email protected]>
Cc Matt Fleming <[email protected]>
---
 arch/x86/boot/compressed/eboot.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/boot/compressed/eboot.c +0 -0
index 8615f7581820..41de115a55b7 100644
@@ -266,7 +266,7 @@ static efi_status_t setup_efi_vars(struct boot_params *params)
 	while (data && data->next)
 		data = (struct setup_data *)(unsigned long)data->next;
 
Quoted 8 lines

arch/x86/boot/compressed/eboot.c static efi_status_t setup_efi_vars(struct boot_params *params) · line 272

Quoted 5 lines
arch/x86/boot/compressed/eboot.c +1 -1
-	status = efi_call_phys4(sys_table->runtime->query_variable_info,
+	status = efi_call_phys4((void *)sys_table->runtime->query_variable_info,
 				EFI_VARIABLE_NON_VOLATILE |
 				EFI_VARIABLE_BOOTSERVICE_ACCESS |
 				EFI_VARIABLE_RUNTIME_ACCESS, &store_size,

Why isn't the query_variale_info field changed to void * instead? That way no cast would be needed.

We could either change all fields in efi_system_table or the efi_call_phys* prototypes. x86-64 already casts to (void *) when calling efi_call0(), etc, though I'm not entirely sure why void * is needed.

author maintainer
#4 lore raw
Quoted 4 lines · Matt Fleming

We could either change all fields in efi_system_table or the efi_call_phys* prototypes. x86-64 already casts to (void *) when calling efi_call0(), etc, though I'm not entirely sure why void * is needed.

Well, sizeof(void *) == sizeof(unsigned long) for both bitness so size shouldn't be the reason.

Signature · 5 lines
Regards/Gruss,
    Boris.

Sent from a fat crate under my desk. Formatting is fine.
--
#5 lore raw
In reply to Matt Fleming
Quoted 40 lines · Matt Fleming
Quoted 30 lines · Ingo Molnar
Quoted 27 lines · Borislav Petkov

From: Borislav Petkov <[email protected]>

Fix this:

arch/x86/boot/compressed/eboot.c: In function ???setup_efi_vars???:
arch/x86/boot/compressed/eboot.c:269:2: warning: passing argument 1 of ???efi_call_phys??? makes pointer from integer without a cast [enabled by default] In file included from arch/x86/boot/compressed/eboot.c:12:0:
/w/kernel/linux/arch/x86/include/asm/efi.h:8:33: note: expected ???void *??? but argument is of type ???long unsigned int???

after cc5a080c5d40 ("efi: Pass boot services variable info to runtime code").

Cc Matthew Garrett <[email protected]>
Cc Matt Fleming <[email protected]>
---
 arch/x86/boot/compressed/eboot.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/boot/compressed/eboot.c +0 -0
index 8615f7581820..41de115a55b7 100644
@@ -266,7 +266,7 @@ static efi_status_t setup_efi_vars(struct boot_params *params)
 	while (data && data->next)
 		data = (struct setup_data *)(unsigned long)data->next;
 
Quoted 8 lines

arch/x86/boot/compressed/eboot.c static efi_status_t setup_efi_vars(struct boot_params *params) · line 272

Quoted 5 lines
arch/x86/boot/compressed/eboot.c +1 -1
-	status = efi_call_phys4(sys_table->runtime->query_variable_info,
+	status = efi_call_phys4((void *)sys_table->runtime->query_variable_info,
 				EFI_VARIABLE_NON_VOLATILE |
 				EFI_VARIABLE_BOOTSERVICE_ACCESS |
 				EFI_VARIABLE_RUNTIME_ACCESS, &store_size,

Why isn't the query_variale_info field changed to void * instead? That way no cast would be needed.

Quoted 3 lines

We could either change all fields in efi_system_table or the efi_call_phys* prototypes. x86-64 already casts to (void *) when calling efi_call0(), etc, though I'm not entirely sure why void * is needed.

It's a basic cleanliness and robustness issue: we generally avoid type casts in the kernel, because type casts override compile-time type checks and are easy to get wrong. They are also ugly.

So in generaly we try to use the right type for the data structure, which matches its usage (and standardize functions/methods around that type) - then no cast is needed.

Thanks,

Ingo

#6 lore raw
Quoted 7 lines · Ingo Molnar

It's a basic cleanliness and robustness issue: we generally avoid type casts in the kernel, because type casts override compile-time type checks and are easy to get wrong. They are also ugly.

So in generaly we try to use the right type for the data structure, which matches its usage (and standardize functions/methods around that type) - then no cast is needed.

Yeah, I'm not advocating using casts, I was just saying "Oh, x86-64 avoids requiring the caller of efi_call_phys* to perform the cast by doing it in the definition of efi_call*. That's why this is only affecting 32-bit."

Cleaning this up would be nice. I think at this point, I'll apply Borislav's patch, and fix all this casting after v3.9 is released, since instead of just changing query_variable_info, we might as well change everything in efi_runtime_service_t so that it's consistent.

#7 lore raw
Quoted 14 lines · Matt Fleming
Quoted 7 lines · Ingo Molnar

It's a basic cleanliness and robustness issue: we generally avoid type casts in the kernel, because type casts override compile-time type checks and are easy to get wrong. They are also ugly.

So in generaly we try to use the right type for the data structure, which matches its usage (and standardize functions/methods around that type) - then no cast is needed.

Yeah, I'm not advocating using casts, I was just saying "Oh, x86-64 avoids requiring the caller of efi_call_phys* to perform the cast by doing it in the definition of efi_call*. That's why this is only affecting 32-bit."

Quoted 4 lines

Cleaning this up would be nice. I think at this point, I'll apply Borislav's patch, and fix all this casting after v3.9 is released, since instead of just changing query_variable_info, we might as well change everything in efi_runtime_service_t so that it's consistent.

Sounds fine to me.

Thanks,

Ingo

author maintainer
#8 lore raw
In reply to Matt Fleming
Quoted 9 lines · Matt Fleming

Yeah, I'm not advocating using casts, I was just saying "Oh, x86-64 avoids requiring the caller of efi_call_phys* to perform the cast by doing it in the definition of efi_call*. That's why this is only affecting 32-bit."

Cleaning this up would be nice. I think at this point, I'll apply Borislav's patch, and fix all this casting after v3.9 is released, since instead of just changing query_variable_info, we might as well change everything in efi_runtime_service_t so that it's consistent.

I wonder - if efi_runtime_service_t contained only void * like efi_boot_services_t then we could drop all the casts too, right? Even in the efi_call* macro calls too...

If you want me, I can take care of it after the merge window :)

Signature · 5 lines
Regards/Gruss,
    Boris.

Sent from a fat crate under my desk. Formatting is fine.
--
#9 lore raw
Quoted 3 lines · Borislav Petkov

I wonder - if efi_runtime_service_t contained only void * like efi_boot_services_t then we could drop all the casts too, right? Even in the efi_call* macro calls too...

Yeah, that's what I figured.

Quoted 1 line

If you want me, I can take care of it after the merge window :)

That would be very helpful, thank you!