Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 290084c2 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Ingo Molnar
Browse files

efi/x86: Merge 32-bit and 64-bit UGA draw protocol setup routines 



The two versions of setup_uga##() are mostly identical, with the
exception of the size of EFI_HANDLE. So let's merge the two, and
pull the implementation into the calling function setup_uga().

Note that the 32-bit version was only mixed-mode safe by accident:
it only calls the get_mode() method of the UGA draw protocol, which
happens to be the first member, and so truncating the 64-bit void* at
offset 0 to 32 bits happens to produce the correct value. But let's
not rely on that, and use the proper API instead.

Tested-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Lukas Wunner <lukas@wunner.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-efi@vger.kernel.org
Link: http://lkml.kernel.org/r/20180720014726.24031-5-ard.biesheuvel@linaro.org


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

arch/x86/boot/compressed/eboot.c

+26 −85
Original line number Diff line number Diff line
@@ -318,81 +318,54 @@ static void setup_quirks(struct boot_params *boot_params) 
	}

}



/*

 * See if we have Universal Graphics Adapter (UGA) protocol

 */

static efi_status_t

setup_uga32(void **uga_handle, unsigned long size, u32 *width, u32 *height)

setup_uga(struct screen_info *si, efi_guid_t *uga_proto, unsigned long size)

{

	efi_status_t status;

	u32 width, height;

	void **uga_handle = NULL;

	efi_uga_draw_protocol_t *uga = NULL, *first_uga;

	efi_guid_t uga_proto = EFI_UGA_PROTOCOL_GUID;

	unsigned long nr_ugas;

	u32 *handles = (u32 *)uga_handle;

	efi_status_t status = EFI_INVALID_PARAMETER;

	int i;



	first_uga = NULL;

	nr_ugas = size / sizeof(u32);

	for (i = 0; i < nr_ugas; i++) {

		efi_guid_t pciio_proto = EFI_PCI_IO_PROTOCOL_GUID;

		u32 w, h, depth, refresh;

		void *pciio;

		u32 handle = handles[i];



		status = efi_call_early(handle_protocol, handle,

					&uga_proto, (void **)&uga);

	status = efi_call_early(allocate_pool, EFI_LOADER_DATA,

				size, (void **)&uga_handle);

	if (status != EFI_SUCCESS)

			continue;



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



		status = efi_early->call((unsigned long)uga->get_mode, uga,

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

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

			*width = w;

			*height = h;



			/*

			 * Once we've found a UGA supporting PCIIO,

			 * don't bother looking any further.

			 */

			if (pciio)

				break;



			first_uga = uga;

		}

	}



		return status;

}



static efi_status_t

setup_uga64(void **uga_handle, unsigned long size, u32 *width, u32 *height)

{

	efi_uga_draw_protocol_t *uga = NULL, *first_uga;

	efi_guid_t uga_proto = EFI_UGA_PROTOCOL_GUID;

	unsigned long nr_ugas;

	u64 *handles = (u64 *)uga_handle;

	efi_status_t status = EFI_INVALID_PARAMETER;

	int i;

	status = efi_call_early(locate_handle,

				EFI_LOCATE_BY_PROTOCOL,

				uga_proto, NULL, &size, uga_handle);

	if (status != EFI_SUCCESS)

		goto free_handle;



	height = 0;

	width = 0;



	first_uga = NULL;

	nr_ugas = size / sizeof(u64);

	nr_ugas = size / (efi_is_64bit() ? sizeof(u64) : sizeof(u32));

	for (i = 0; i < nr_ugas; i++) {

		efi_guid_t pciio_proto = EFI_PCI_IO_PROTOCOL_GUID;

		u32 w, h, depth, refresh;

		void *pciio;

		u64 handle = handles[i];

		unsigned long handle = efi_is_64bit() ? ((u64 *)uga_handle)[i]

						      : ((u32 *)uga_handle)[i];



		status = efi_call_early(handle_protocol, handle,

					&uga_proto, (void **)&uga);

					uga_proto, (void **)&uga);

		if (status != EFI_SUCCESS)

			continue;



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



		status = efi_early->call((unsigned long)uga->get_mode, uga,

		status = efi_call_proto(efi_uga_draw_protocol, get_mode, uga,

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

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

			*width = w;

			*height = h;

			width = w;

			height = h;



			/*

			 * Once we've found a UGA supporting PCIIO,
@@ -405,38 +378,6 @@ setup_uga64(void **uga_handle, unsigned long size, u32 *width, u32 *height) 
		}

	}



	return status;

}



/*

 * See if we have Universal Graphics Adapter (UGA) protocol

 */

static efi_status_t

setup_uga(struct screen_info *si, efi_guid_t *uga_proto, unsigned long size)

{

	efi_status_t status;

	u32 width, height;

	void **uga_handle = NULL;



	status = efi_call_early(allocate_pool, EFI_LOADER_DATA,

				size, (void **)&uga_handle);

	if (status != EFI_SUCCESS)

		return status;



	status = efi_call_early(locate_handle,

				EFI_LOCATE_BY_PROTOCOL,

				uga_proto, NULL, &size, uga_handle);

	if (status != EFI_SUCCESS)

		goto free_handle;



	height = 0;

	width = 0;



	if (efi_early->is64)

		status = setup_uga64(uga_handle, size, &width, &height);

	else

		status = setup_uga32(uga_handle, size, &width, &height);



	if (!width && !height)

		goto free_handle;