Commit 90534e68 authored by Ard Biesheuvel's avatar Ard Biesheuvel
Browse files

efi/libstub: Simplify PCI I/O handle buffer traversal 



Use LocateHandleBuffer() and a __free() cleanup helper to simplify the
PCI I/O handle buffer traversal code.

Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
parent b52587c5

drivers/firmware/efi/libstub/pci.c

+7 −26
Original line number Diff line number Diff line
@@ -16,36 +16,20 @@ 
void efi_pci_disable_bridge_busmaster(void)

{

	efi_guid_t pci_proto = EFI_PCI_IO_PROTOCOL_GUID;

	unsigned long pci_handle_size = 0;

	efi_handle_t *pci_handle = NULL;

	efi_handle_t *pci_handle __free(efi_pool) = NULL;

	unsigned long pci_handle_num;

	efi_handle_t handle;

	efi_status_t status;

	u16 class, command;



	status = efi_bs_call(locate_handle, EFI_LOCATE_BY_PROTOCOL, &pci_proto,

			     NULL, &pci_handle_size, NULL);



	if (status != EFI_BUFFER_TOO_SMALL) {

		if (status != EFI_SUCCESS && status != EFI_NOT_FOUND)

			efi_err("Failed to locate PCI I/O handles'\n");

		return;

	}



	status = efi_bs_call(allocate_pool, EFI_LOADER_DATA, pci_handle_size,

			     (void **)&pci_handle);

	status = efi_bs_call(locate_handle_buffer, EFI_LOCATE_BY_PROTOCOL,

			     &pci_proto, NULL, &pci_handle_num, &pci_handle);

	if (status != EFI_SUCCESS) {

		efi_err("Failed to allocate memory for 'pci_handle'\n");

		efi_err("Failed to locate PCI I/O handles\n");

		return;

	}



	status = efi_bs_call(locate_handle, EFI_LOCATE_BY_PROTOCOL, &pci_proto,

			     NULL, &pci_handle_size, pci_handle);

	if (status != EFI_SUCCESS) {

		efi_err("Failed to locate PCI I/O handles'\n");

		goto free_handle;

	}



	for_each_efi_handle(handle, pci_handle, efi_get_handle_num(pci_handle_size)) {

	for_each_efi_handle(handle, pci_handle, pci_handle_num) {

		efi_pci_io_protocol_t *pci;

		unsigned long segment_nr, bus_nr, device_nr, func_nr;
@@ -81,7 +65,7 @@ void efi_pci_disable_bridge_busmaster(void) 
		efi_bs_call(disconnect_controller, handle, NULL, NULL);

	}



	for_each_efi_handle(handle, pci_handle, efi_get_handle_num(pci_handle_size)) {

	for_each_efi_handle(handle, pci_handle, pci_handle_num) {

		efi_pci_io_protocol_t *pci;



		status = efi_bs_call(handle_protocol, handle, &pci_proto,
@@ -107,7 +91,4 @@ void efi_pci_disable_bridge_busmaster(void) 
		if (status != EFI_SUCCESS)

			efi_err("Failed to disable PCI busmastering\n");

	}



free_handle:

	efi_bs_call(free_pool, pci_handle);

}

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

+6 −23
Original line number Diff line number Diff line
@@ -119,37 +119,23 @@ preserve_pci_rom_image(efi_pci_io_protocol_t *pci, struct pci_setup_rom **__rom) 
static void setup_efi_pci(struct boot_params *params)

{

	efi_status_t status;

	void **pci_handle = NULL;

	efi_handle_t *pci_handle __free(efi_pool) = NULL;

	efi_guid_t pci_proto = EFI_PCI_IO_PROTOCOL_GUID;

	unsigned long size = 0;

	struct setup_data *data;

	unsigned long num;

	efi_handle_t h;



	status = efi_bs_call(locate_handle, EFI_LOCATE_BY_PROTOCOL,

			     &pci_proto, NULL, &size, pci_handle);



	if (status == EFI_BUFFER_TOO_SMALL) {

		status = efi_bs_call(allocate_pool, EFI_LOADER_DATA, size,

				     (void **)&pci_handle);



		if (status != EFI_SUCCESS) {

			efi_err("Failed to allocate memory for 'pci_handle'\n");

			return;

		}



		status = efi_bs_call(locate_handle, EFI_LOCATE_BY_PROTOCOL,

				     &pci_proto, NULL, &size, pci_handle);

	}



	status = efi_bs_call(locate_handle_buffer, EFI_LOCATE_BY_PROTOCOL,

			     &pci_proto, NULL, &num, &pci_handle);

	if (status != EFI_SUCCESS)

		goto free_handle;

		return;



	data = (struct setup_data *)(unsigned long)params->hdr.setup_data;



	while (data && data->next)

		data = (struct setup_data *)(unsigned long)data->next;



	for_each_efi_handle(h, pci_handle, efi_get_handle_num(size)) {

	for_each_efi_handle(h, pci_handle, num) {

		efi_pci_io_protocol_t *pci = NULL;

		struct pci_setup_rom *rom;
@@ -169,9 +155,6 @@ static void setup_efi_pci(struct boot_params *params) 


		data = (struct setup_data *)rom;

	}



free_handle:

	efi_bs_call(free_pool, pci_handle);

}



static void retrieve_apple_device_properties(struct boot_params *boot_params)