2018-09-08 16:25:30

by Aaron Ma

Subject: [PATCH] x86/efi: earlyprintk - Add 64bit efi fb address support

EFI GOP uses 64-bit frame buffer address in some BIOS.
Add 64bit address support in efi earlyprintk.

Signed-off-by: Aaron Ma <[email protected]>
---
arch/x86/platform/efi/early_printk.c | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/arch/x86/platform/efi/early_printk.c b/arch/x86/platform/efi/early_printk.c
index 5fdacb322ceb..c0ae25f59acd 100644
--- a/arch/x86/platform/efi/early_printk.c
+++ b/arch/x86/platform/efi/early_printk.c
@@ -32,6 +32,8 @@ static __init int early_efi_map_fb(void)
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);

@@ -49,6 +51,8 @@ static __ref void *early_efi_map(unsigned long start, unsigned long len)
unsigned long 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

2018-09-10 07:21:54

by Ingo Molnar

Subject: Re: [PATCH] x86/efi: earlyprintk - Add 64bit efi fb address support

* Aaron Ma <[email protected]> wrote:

> if (efi_fb)
> return (efi_fb + start);

Just noticed this detail unrelated to your patch: return is not a function.

Thanks,

Ingo

2018-09-12 15:00:48

by Ard Biesheuvel

Subject: Re: [PATCH] x86/efi: earlyprintk - Add 64bit efi fb address support

On 8 September 2018 at 18:23, Aaron Ma <[email protected]> wrote:
> EFI GOP uses 64-bit frame buffer address in some BIOS.
> Add 64bit address support in efi earlyprintk.
>
> Signed-off-by: Aaron Ma <[email protected]>
> ---
> arch/x86/platform/efi/early_printk.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/arch/x86/platform/efi/early_printk.c b/arch/x86/platform/efi/early_printk.c
> index 5fdacb322ceb..c0ae25f59acd 100644
> --- a/arch/x86/platform/efi/early_printk.c
> +++ b/arch/x86/platform/efi/early_printk.c
> @@ -32,6 +32,8 @@ static __init int early_efi_map_fb(void)
> 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);
>
> @@ -49,6 +51,8 @@ static __ref void *early_efi_map(unsigned long start, unsigned long len)
> unsigned long 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);

Please fix this in a way that works on 32-bit x86/PAE as well (i.e.,
use a suitable type for base)

2018-09-12 15:12:12

by Aaron Ma

Subject: Re: [PATCH] x86/efi: earlyprintk - Add 64bit efi fb address support

On 09/12/2018 11:00 PM, Ard Biesheuvel wrote:
> On 8 September 2018 at 18:23, Aaron Ma <[email protected]> wrote:
>> EFI GOP uses 64-bit frame buffer address in some BIOS.
>> Add 64bit address support in efi earlyprintk.
>>
>> Signed-off-by: Aaron Ma <[email protected]>
>> ---
>> arch/x86/platform/efi/early_printk.c | 4 ++++
>> 1 file changed, 4 insertions(+)
>>
>> diff --git a/arch/x86/platform/efi/early_printk.c b/arch/x86/platform/efi/early_printk.c
>> index 5fdacb322ceb..c0ae25f59acd 100644
>> --- a/arch/x86/platform/efi/early_printk.c
>> +++ b/arch/x86/platform/efi/early_printk.c
>> @@ -32,6 +32,8 @@ static __init int early_efi_map_fb(void)
>> 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);
>>
>> @@ -49,6 +51,8 @@ static __ref void *early_efi_map(unsigned long start, unsigned long len)
>> unsigned long 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);
> Please fix this in a way that works on 32-bit x86/PAE as well (i.e.,
> use a suitable type for base)
>

Right, I will send a v2 patch.

Thanks,
Aaron

2018-09-12 18:01:29

by Aaron Ma

Subject: [PATCH v2] x86/efi: earlyprintk - Add 64bit efi fb address support

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 <[email protected]>
---
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

2018-09-12 18:40:28

by Ard Biesheuvel

Subject: Re: [PATCH v2] x86/efi: earlyprintk - Add 64bit efi fb address support

On 12 September 2018 at 20:00, Aaron Ma <[email protected]> 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 <[email protected]>

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
>