Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20230823215159.29082-1-mikel@mikelr.com>
In-Reply-To: <20230823215159.29082-1-mikel@mikelr.com>
From:   Ard Biesheuvel <ardb@kernel.org>
Date:   Thu, 24 Aug 2023 11:36:26 +0200
Message-ID: <CAMj1kXGVMcMqQwaFizX+T+YUKrFcVfPgWhU3GuPfdH=CbFV4sg@mail.gmail.com>
Subject: Re: [PATCH] x86/efistub: Fix PCI ROM preservation in mixed mode
To:     Mikel Rychliski <mikel@mikelr.com>
Cc:     Ingo Molnar <mingo@kernel.org>, linux-efi@vger.kernel.org,
        linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Wed, 23 Aug 2023 at 23:53, Mikel Rychliski <mikel@mikelr.com> wrote:
>
> preserve_pci_rom_image() was accessing the romsize field in
> efi_pci_io_protocol_t directly instead of using the efi_table_attr()
> helper. This prevents the ROM image from being saved correctly during a
> mixed mode boot.
>
> Fixes: 2c3625cb9fa2 ("efi/x86: Fold __setup_efi_pci32() and __setup_efi_pci64() into one function")
> Signed-off-by: Mikel Rychliski <mikel@mikelr.com>

Thanks, I've queued this up as a fix.


> ---
>  drivers/firmware/efi/libstub/x86-stub.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/firmware/efi/libstub/x86-stub.c b/drivers/firmware/efi/libstub/x86-stub.c
> index e976288728e9..2fee52ed335d 100644
> --- a/drivers/firmware/efi/libstub/x86-stub.c
> +++ b/drivers/firmware/efi/libstub/x86-stub.c
> @@ -72,7 +72,7 @@ preserve_pci_rom_image(efi_pci_io_protocol_t *pci, struct pci_setup_rom **__rom)
>         rom->data.type  = SETUP_PCI;
>         rom->data.len   = size - sizeof(struct setup_data);
>         rom->data.next  = 0;
> -       rom->pcilen     = pci->romsize;
> +       rom->pcilen     = romsize;
>         *__rom = rom;
>
>         status = efi_call_proto(pci, pci.read, EfiPciIoWidthUint16,
> --
> 2.35.3
>