Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
MIME-Version: 1.0
In-Reply-To: <1536775208-8064-1-git-send-email-aaron.ma@canonical.com>
References: <1536423828-5693-1-git-send-email-aaron.ma@canonical.com> <1536775208-8064-1-git-send-email-aaron.ma@canonical.com>
From:   Ard Biesheuvel <ard.biesheuvel@linaro.org>
Date:   Wed, 12 Sep 2018 20:39:39 +0200
Message-ID: <CAKv+Gu9D-qSYVxT7zgK5SBUoJfR-XJgGQrco6mfme_e049LA7A@mail.gmail.com>
Subject: Re: [PATCH v2] x86/efi: earlyprintk - Add 64bit efi fb address support
To:     Aaron Ma <aaron.ma@canonical.com>
Cc:     Thomas Gleixner <tglx@linutronix.de>,
        "the arch/x86 maintainers" <x86@kernel.org>,
        linux-efi <linux-efi@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On 12 September 2018 at 20:00, Aaron Ma <aaron.ma@canonical.com> wrote:
> EFI GOP uses 64-bit frame buffer address in some BIOS.
> Add 64bit address support in efi earlyprintk.
>
> V2:
> Fix type of address.
>
> Signed-off-by: Aaron Ma <aaron.ma@canonical.com>

Thanks. Queued in efi/next.

> ---
>  arch/x86/platform/efi/early_printk.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/arch/x86/platform/efi/early_printk.c b/arch/x86/platform/efi/early_printk.c
> index 5fdacb322ceb..7476b3b097e1 100644
> --- a/arch/x86/platform/efi/early_printk.c
> +++ b/arch/x86/platform/efi/early_printk.c
> @@ -26,12 +26,14 @@ static bool early_efi_keep;
>   */
>  static __init int early_efi_map_fb(void)
>  {
> -       unsigned long base, size;
> +       u64 base, size;
>
>         if (!early_efi_keep)
>                 return 0;
>
>         base = boot_params.screen_info.lfb_base;
> +       if (boot_params.screen_info.capabilities & VIDEO_CAPABILITY_64BIT_BASE)
> +               base |= (u64)boot_params.screen_info.ext_lfb_base << 32;
>         size = boot_params.screen_info.lfb_size;
>         efi_fb = ioremap(base, size);
>
> @@ -46,9 +48,11 @@ early_initcall(early_efi_map_fb);
>   */
>  static __ref void *early_efi_map(unsigned long start, unsigned long len)
>  {
> -       unsigned long base;
> +       u64 base;
>
>         base = boot_params.screen_info.lfb_base;
> +       if (boot_params.screen_info.capabilities & VIDEO_CAPABILITY_64BIT_BASE)
> +               base |= (u64)boot_params.screen_info.ext_lfb_base << 32;
>
>         if (efi_fb)
>                 return (efi_fb + start);
> --
> 2.17.1
>