Commit 47c0fd39 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Ingo Molnar
Browse files

efi/libstub: Drop protocol argument from efi_call_proto() macro 



After refactoring the mixed mode support code, efi_call_proto()
no longer uses its protocol argument in any of its implementation,
so let's remove it altogether.

Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
Cc: Arvind Sankar <nivedita@alum.mit.edu>
Cc: Borislav Petkov <bp@alien8.de>
Cc: James Morse <james.morse@arm.com>
Cc: Matt Fleming <matt@codeblueprint.co.uk>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-efi@vger.kernel.org
Link: https://lkml.kernel.org/r/20191224151025.32482-22-ardb@kernel.org


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 23e60394

arch/arm/include/asm/efi.h

+1 −2
Original line number Diff line number Diff line
@@ -57,8 +57,7 @@ void efi_virtmap_unload(void); 
#define efi_table_attr(table, attr, instance)				\

	instance->attr



#define efi_call_proto(protocol, f, instance, ...)			\

	instance->f(instance, ##__VA_ARGS__)

#define efi_call_proto(inst, func, ...) inst->func(inst, ##__VA_ARGS__)



struct screen_info *alloc_screen_info(void);

void free_screen_info(struct screen_info *si);

arch/arm64/include/asm/efi.h

+1 −2
Original line number Diff line number Diff line
@@ -100,8 +100,7 @@ static inline unsigned long efi_get_max_initrd_addr(unsigned long dram_base, 
#define efi_table_attr(table, attr, instance)				\

	instance->attr



#define efi_call_proto(protocol, f, instance, ...)			\

	instance->f(instance, ##__VA_ARGS__)

#define efi_call_proto(inst, func, ...) inst->func(inst, ##__VA_ARGS__)



#define alloc_screen_info(x...)		&screen_info

arch/x86/boot/compressed/eboot.c

+9 −14
Original line number Diff line number Diff line
@@ -69,27 +69,24 @@ preserve_pci_rom_image(efi_pci_io_protocol_t *pci, struct pci_setup_rom **__rom) 
	rom->pcilen	= pci->romsize;

	*__rom = rom;



	status = efi_call_proto(efi_pci_io_protocol, pci.read, pci,

				EfiPciIoWidthUint16, PCI_VENDOR_ID, 1,

				&rom->vendor);

	status = efi_call_proto(pci, pci.read, EfiPciIoWidthUint16,

				PCI_VENDOR_ID, 1, &rom->vendor);



	if (status != EFI_SUCCESS) {

		efi_printk("Failed to read rom->vendor\n");

		goto free_struct;

	}



	status = efi_call_proto(efi_pci_io_protocol, pci.read, pci,

				EfiPciIoWidthUint16, PCI_DEVICE_ID, 1,

				&rom->devid);

	status = efi_call_proto(pci, pci.read, EfiPciIoWidthUint16,

				PCI_DEVICE_ID, 1, &rom->devid);



	if (status != EFI_SUCCESS) {

		efi_printk("Failed to read rom->devid\n");

		goto free_struct;

	}



	status = efi_call_proto(efi_pci_io_protocol, get_location, pci,

				&rom->segment, &rom->bus, &rom->device,

				&rom->function);

	status = efi_call_proto(pci, get_location, &rom->segment, &rom->bus,

				&rom->device, &rom->function);



	if (status != EFI_SUCCESS)

		goto free_struct;
@@ -191,7 +188,7 @@ static void retrieve_apple_device_properties(struct boot_params *boot_params) 
		return;

	}



	efi_call_proto(apple_properties_protocol, get_all, p, NULL, &size);

	efi_call_proto(p, get_all, NULL, &size);

	if (!size)

		return;
@@ -204,8 +201,7 @@ static void retrieve_apple_device_properties(struct boot_params *boot_params) 
			return;

		}



		status = efi_call_proto(apple_properties_protocol, get_all, p,

					new->data, &size);

		status = efi_call_proto(p, get_all, new->data, &size);



		if (status == EFI_BUFFER_TOO_SMALL)

			efi_call_early(free_pool, new);
@@ -280,8 +276,7 @@ setup_uga(struct screen_info *si, efi_guid_t *uga_proto, unsigned long size) 
		pciio = NULL;

		efi_call_early(handle_protocol, handle, &pciio_proto, &pciio);



		status = efi_call_proto(efi_uga_draw_protocol, get_mode, uga,

					&w, &h, &depth, &refresh);

		status = efi_call_proto(uga, get_mode, &w, &h, &depth, &refresh);

		if (status == EFI_SUCCESS && (!first_uga || pciio)) {

			width = w;

			height = h;

arch/x86/include/asm/efi.h

+3 −3
Original line number Diff line number Diff line
@@ -227,10 +227,10 @@ static inline bool efi_is_native(void) 
	__ret;								\

})



#define efi_call_proto(protocol, f, instance, ...)			\

#define efi_call_proto(inst, func, ...)					\

	(efi_is_native()						\

		? instance->f(instance, ##__VA_ARGS__)			\

		: efi64_thunk(instance->mixed_mode.f, instance,	##__VA_ARGS__))

		? inst->func(inst, ##__VA_ARGS__)			\

		: efi64_thunk(inst->mixed_mode.func, inst, ##__VA_ARGS__))



#define efi_call_early(f, ...)						\

	(efi_is_native()						\

drivers/firmware/efi/libstub/efi-stub-helper.c

+2 −4
Original line number Diff line number Diff line
@@ -953,9 +953,7 @@ void *get_efi_config_table(efi_guid_t guid) 


void efi_char16_printk(efi_char16_t *str)

{

	efi_call_proto(efi_simple_text_output_protocol,

		       output_string,

		       efi_table_attr(efi_system_table, con_out,

	efi_call_proto(efi_table_attr(efi_system_table, con_out,

				      efi_system_table()),

		       str);

		       output_string, str);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE