Re: [PATCH v2] efi: libstub: add support for the apple_set_os protocol

From: Ard Biesheuvel
Date: Mon Jul 01 2024 - 01:38:58 EST


On Mon, 1 Jul 2024 at 07:35, Lukas Wunner <lukas@xxxxxxxxx> wrote:
>
> On Sun, Jun 30, 2024 at 07:24:54PM +0000, Aditya Garg wrote:
> > @@ -335,9 +359,12 @@ static const efi_char16_t apple[] = L"Apple";
> >
> > static void setup_quirks(struct boot_params *boot_params)
> > {
> > - if (IS_ENABLED(CONFIG_APPLE_PROPERTIES) &&
> > - !memcmp(efistub_fw_vendor(), apple, sizeof(apple)))
> > - retrieve_apple_device_properties(boot_params);
> > + if (!memcmp(efistub_fw_vendor(), apple, sizeof(apple))) {
> > + if (IS_ENABLED(CONFIG_APPLE_PROPERTIES)) {
> > + retrieve_apple_device_properties(boot_params);
> > + }
> > + apple_set_os();
> > + }
>
> Nit: Unnecessary curly braces around retrieve_apple_device_properties().
>
> (And I'd appreciate a blank line between it and the apple_set_os() call.

Indeed. I can fix that up when applying.

Any thoughts on whether this should depend on CONFIG_APPLE_GMUX or not?