[PATCH 1/2] Remove EFI memmap quirk for UV

[PATCH 1/2] Remove EFI memmap quirk for UV

[Alex Thorlton]

Commit a5d90c923bcf ("x86/efi: Quirk out SGI UV") added a quirk to
efi_apply_memmap_quirks to force SGI UV systems to fall back to the old
EFI memmap mechanism.  We have a BIOS fix for this issue now, so we no
longer need this quirk in the kernel.  This commit removes the quirk
from the function in question.

Signed-off-by: Alex Thorlton <athorlton@sgi.com>
Acked-by: Mike Travis <travis@sgi.com>
Acked-by: Russ Anderson <rja@sgi.com>
Cc: Matt Fleming <matt.fleming@intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Hedi Berriche <hedi@sgi.com>
Cc: Dimitri Sivanich <sivanich@sgi.com>
Cc: x86@kernel.org
Cc: linux-efi@vger.kernel.org

---
 arch/x86/platform/efi/quirks.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/arch/x86/platform/efi/quirks.c b/arch/x86/platform/efi/quirks.c
index 1c7380d..96b417c 100644
--- a/arch/x86/platform/efi/quirks.c
+++ b/arch/x86/platform/efi/quirks.c
@@ -259,12 +259,6 @@ void __init efi_apply_memmap_quirks(void)
 		pr_info("efi: Setup done, disabling due to 32/64-bit mismatch\n");
 		efi_unmap_memmap();
 	}
-
-	/*
-	 * UV doesn't support the new EFI pagetable mapping yet.
-	 */
-	if (is_uv_system())
-		set_bit(EFI_OLD_MEMMAP, &efi.flags);
 }
 
 /*
-- 
1.8.5.6

[PATCH 1/2] Remove EFI memmap quirk for UV

[Alex Thorlton]

Commit a5d90c923bcf ("x86/efi: Quirk out SGI UV") added a quirk to
efi_apply_memmap_quirks to force SGI UV systems to fall back to the old
EFI memmap mechanism.  We have a BIOS fix for this issue now, so we no
longer need this quirk in the kernel.  This commit removes the quirk
from the function in question.

Signed-off-by: Alex Thorlton <athorlton-sJ/iWh9BUns@public.gmane.org>
Acked-by: Mike Travis <travis-sJ/iWh9BUns@public.gmane.org>
Acked-by: Russ Anderson <rja-sJ/iWh9BUns@public.gmane.org>
Cc: Matt Fleming <matt.fleming-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
Cc: Thomas Gleixner <tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
Cc: Ingo Molnar <mingo-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
Cc: "H. Peter Anvin" <hpa-YMNOUZJC4hwAvxtiuMwx3w@public.gmane.org>
Cc: Hedi Berriche <hedi-sJ/iWh9BUns@public.gmane.org>
Cc: Dimitri Sivanich <sivanich-sJ/iWh9BUns@public.gmane.org>
Cc: x86-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org
Cc: linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org

---
 arch/x86/platform/efi/quirks.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/arch/x86/platform/efi/quirks.c b/arch/x86/platform/efi/quirks.c
index 1c7380d..96b417c 100644
--- a/arch/x86/platform/efi/quirks.c
+++ b/arch/x86/platform/efi/quirks.c
@@ -259,12 +259,6 @@ void __init efi_apply_memmap_quirks(void)
 		pr_info("efi: Setup done, disabling due to 32/64-bit mismatch\n");
 		efi_unmap_memmap();
 	}
-
-	/*
-	 * UV doesn't support the new EFI pagetable mapping yet.
-	 */
-	if (is_uv_system())
-		set_bit(EFI_OLD_MEMMAP, &efi.flags);
 }
 
 /*
-- 
1.8.5.6

[PATCH 2/2] Remove extra mapping code for UV MMRs

[Alex Thorlton]

These MMRs get mapped in correctly using the new EFI memmap scheme on
recent BIOSes, so we no longer need to set up these extra mappings for
them.

Signed-off-by: Alex Thorlton <athorlton@sgi.com>
Acked-by: Mike Travis <travis@sgi.com>
Acked-by: Russ Anderson <rja@sgi.com>
Cc: Matt Fleming <matt.fleming@intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Hedi Berriche <hedi@sgi.com>
Cc: Dimitri Sivanich <sivanich@sgi.com>
Cc: x86@kernel.org
Cc: linux-efi@vger.kernel.org

---
 arch/x86/kernel/apic/x2apic_uv_x.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
index c8d9295..e8db45d 100644
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -712,12 +712,6 @@ static __init void map_mmioh_high(int min_pnode, int max_pnode)
 	}
 }
 
-static __init void map_low_mmrs(void)
-{
-	init_extra_mapping_uc(UV_GLOBAL_MMR32_BASE, UV_GLOBAL_MMR32_SIZE);
-	init_extra_mapping_uc(UV_LOCAL_MMR_BASE, UV_LOCAL_MMR_SIZE);
-}
-
 static __init void uv_rtc_init(void)
 {
 	long status;
@@ -890,7 +884,6 @@ void __init uv_system_init(void)
 		return;
 	}
 	pr_info("UV: Found %s hub\n", hub);
-	map_low_mmrs();
 
 	m_n_config.v = uv_read_local_mmr(UVH_RH_GAM_CONFIG_MMR );
 	m_val = m_n_config.s.m_skt;
-- 
1.8.5.6

[PATCH 2/2] Remove extra mapping code for UV MMRs

[Alex Thorlton]

These MMRs get mapped in correctly using the new EFI memmap scheme on
recent BIOSes, so we no longer need to set up these extra mappings for
them.

Signed-off-by: Alex Thorlton <athorlton-sJ/iWh9BUns@public.gmane.org>
Acked-by: Mike Travis <travis-sJ/iWh9BUns@public.gmane.org>
Acked-by: Russ Anderson <rja-sJ/iWh9BUns@public.gmane.org>
Cc: Matt Fleming <matt.fleming-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
Cc: Thomas Gleixner <tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
Cc: Ingo Molnar <mingo-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
Cc: "H. Peter Anvin" <hpa-YMNOUZJC4hwAvxtiuMwx3w@public.gmane.org>
Cc: Hedi Berriche <hedi-sJ/iWh9BUns@public.gmane.org>
Cc: Dimitri Sivanich <sivanich-sJ/iWh9BUns@public.gmane.org>
Cc: x86-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org
Cc: linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org

---
 arch/x86/kernel/apic/x2apic_uv_x.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
index c8d9295..e8db45d 100644
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -712,12 +712,6 @@ static __init void map_mmioh_high(int min_pnode, int max_pnode)
 	}
 }
 
-static __init void map_low_mmrs(void)
-{
-	init_extra_mapping_uc(UV_GLOBAL_MMR32_BASE, UV_GLOBAL_MMR32_SIZE);
-	init_extra_mapping_uc(UV_LOCAL_MMR_BASE, UV_LOCAL_MMR_SIZE);
-}
-
 static __init void uv_rtc_init(void)
 {
 	long status;
@@ -890,7 +884,6 @@ void __init uv_system_init(void)
 		return;
 	}
 	pr_info("UV: Found %s hub\n", hub);
-	map_low_mmrs();
 
 	m_n_config.v = uv_read_local_mmr(UVH_RH_GAM_CONFIG_MMR );
 	m_val = m_n_config.s.m_skt;
-- 
1.8.5.6

Re: [PATCH 1/2] Remove EFI memmap quirk for UV

[Thomas Gleixner]

On Mon, 16 Nov 2015, Alex Thorlton wrote:

CC'ing Matt under his correct e-mail address.

> Commit a5d90c923bcf ("x86/efi: Quirk out SGI UV") added a quirk to
> efi_apply_memmap_quirks to force SGI UV systems to fall back to the old
> EFI memmap mechanism.  We have a BIOS fix for this issue now, so we no
> longer need this quirk in the kernel.  This commit removes the quirk
> from the function in question.
> 
> Signed-off-by: Alex Thorlton <athorlton@sgi.com>
> Acked-by: Mike Travis <travis@sgi.com>
> Acked-by: Russ Anderson <rja@sgi.com>
> Cc: Matt Fleming <matt.fleming@intel.com>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: "H. Peter Anvin" <hpa@zytor.com>
> Cc: Hedi Berriche <hedi@sgi.com>
> Cc: Dimitri Sivanich <sivanich@sgi.com>
> Cc: x86@kernel.org
> Cc: linux-efi@vger.kernel.org
> 
> ---
>  arch/x86/platform/efi/quirks.c | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/arch/x86/platform/efi/quirks.c b/arch/x86/platform/efi/quirks.c
> index 1c7380d..96b417c 100644
> --- a/arch/x86/platform/efi/quirks.c
> +++ b/arch/x86/platform/efi/quirks.c
> @@ -259,12 +259,6 @@ void __init efi_apply_memmap_quirks(void)
>  		pr_info("efi: Setup done, disabling due to 32/64-bit mismatch\n");
>  		efi_unmap_memmap();
>  	}
> -
> -	/*
> -	 * UV doesn't support the new EFI pagetable mapping yet.
> -	 */
> -	if (is_uv_system())
> -		set_bit(EFI_OLD_MEMMAP, &efi.flags);
>  }
>  
>  /*
> -- 
> 1.8.5.6
> 
> 

Re: [PATCH 1/2] Remove EFI memmap quirk for UV

[Thomas Gleixner]

On Mon, 16 Nov 2015, Alex Thorlton wrote:

CC'ing Matt under his correct e-mail address.

> Commit a5d90c923bcf ("x86/efi: Quirk out SGI UV") added a quirk to
> efi_apply_memmap_quirks to force SGI UV systems to fall back to the old
> EFI memmap mechanism.  We have a BIOS fix for this issue now, so we no
> longer need this quirk in the kernel.  This commit removes the quirk
> from the function in question.
> 
> Signed-off-by: Alex Thorlton <athorlton-sJ/iWh9BUns@public.gmane.org>
> Acked-by: Mike Travis <travis-sJ/iWh9BUns@public.gmane.org>
> Acked-by: Russ Anderson <rja-sJ/iWh9BUns@public.gmane.org>
> Cc: Matt Fleming <matt.fleming-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
> Cc: Thomas Gleixner <tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
> Cc: Ingo Molnar <mingo-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> Cc: "H. Peter Anvin" <hpa-YMNOUZJC4hwAvxtiuMwx3w@public.gmane.org>
> Cc: Hedi Berriche <hedi-sJ/iWh9BUns@public.gmane.org>
> Cc: Dimitri Sivanich <sivanich-sJ/iWh9BUns@public.gmane.org>
> Cc: x86-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org
> Cc: linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> 
> ---
>  arch/x86/platform/efi/quirks.c | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/arch/x86/platform/efi/quirks.c b/arch/x86/platform/efi/quirks.c
> index 1c7380d..96b417c 100644
> --- a/arch/x86/platform/efi/quirks.c
> +++ b/arch/x86/platform/efi/quirks.c
> @@ -259,12 +259,6 @@ void __init efi_apply_memmap_quirks(void)
>  		pr_info("efi: Setup done, disabling due to 32/64-bit mismatch\n");
>  		efi_unmap_memmap();
>  	}
> -
> -	/*
> -	 * UV doesn't support the new EFI pagetable mapping yet.
> -	 */
> -	if (is_uv_system())
> -		set_bit(EFI_OLD_MEMMAP, &efi.flags);
>  }
>  
>  /*
> -- 
> 1.8.5.6
> 
> 

Re: [PATCH 1/2] Remove EFI memmap quirk for UV

[Matt Fleming]

On Mon, 16 Nov, at 07:02:48PM, Thomas Gleixner wrote:
> On Mon, 16 Nov 2015, Alex Thorlton wrote:
> 
> CC'ing Matt under his correct e-mail address.
> 
> > Commit a5d90c923bcf ("x86/efi: Quirk out SGI UV") added a quirk to
> > efi_apply_memmap_quirks to force SGI UV systems to fall back to the old
> > EFI memmap mechanism.  We have a BIOS fix for this issue now, so we no
> > longer need this quirk in the kernel.  This commit removes the quirk
> > from the function in question.
> > 
> > Signed-off-by: Alex Thorlton <athorlton@sgi.com>
> > Acked-by: Mike Travis <travis@sgi.com>
> > Acked-by: Russ Anderson <rja@sgi.com>
> > Cc: Matt Fleming <matt.fleming@intel.com>
> > Cc: Thomas Gleixner <tglx@linutronix.de>
> > Cc: Ingo Molnar <mingo@redhat.com>
> > Cc: "H. Peter Anvin" <hpa@zytor.com>
> > Cc: Hedi Berriche <hedi@sgi.com>
> > Cc: Dimitri Sivanich <sivanich@sgi.com>
> > Cc: x86@kernel.org
> > Cc: linux-efi@vger.kernel.org
> > 
> > ---
> >  arch/x86/platform/efi/quirks.c | 6 ------
> >  1 file changed, 6 deletions(-)
> > 
> > diff --git a/arch/x86/platform/efi/quirks.c b/arch/x86/platform/efi/quirks.c
> > index 1c7380d..96b417c 100644
> > --- a/arch/x86/platform/efi/quirks.c
> > +++ b/arch/x86/platform/efi/quirks.c
> > @@ -259,12 +259,6 @@ void __init efi_apply_memmap_quirks(void)
> >  		pr_info("efi: Setup done, disabling due to 32/64-bit mismatch\n");
> >  		efi_unmap_memmap();
> >  	}
> > -
> > -	/*
> > -	 * UV doesn't support the new EFI pagetable mapping yet.
> > -	 */
> > -	if (is_uv_system())
> > -		set_bit(EFI_OLD_MEMMAP, &efi.flags);

Awesome! Thanks Alex.

Can I also close https://bugzilla.kernel.org/show_bug.cgi?id=75021 ?

Re: [PATCH 1/2] Remove EFI memmap quirk for UV

[Alex Thorlton]

On Tue, Nov 17, 2015 at 09:52:08AM +0000, Matt Fleming wrote:
> Awesome! Thanks Alex.
> 
> Can I also close https://bugzilla.kernel.org/show_bug.cgi?id=75021 ?

Yep!  Thanks, Matt!

- Alex

Re: [PATCH 1/2] Remove EFI memmap quirk for UV

[Borislav Petkov]

On Mon, Nov 16, 2015 at 11:59:40AM -0600, Alex Thorlton wrote:
> Commit a5d90c923bcf ("x86/efi: Quirk out SGI UV") added a quirk to
> efi_apply_memmap_quirks to force SGI UV systems to fall back to the old
> EFI memmap mechanism.  We have a BIOS fix for this issue now, so we no
> longer need this quirk in the kernel.

So does that mean that all UV systems out there will get the BIOS update
or at least will have a BIOS update available so that we won't need the
quirk at all?

-- 
Regards/Gruss,
    Boris.

ECO tip #101: Trim your mails when you reply.

Re: [PATCH 1/2] Remove EFI memmap quirk for UV

[Borislav Petkov]

On Mon, Nov 16, 2015 at 11:59:40AM -0600, Alex Thorlton wrote:
> Commit a5d90c923bcf ("x86/efi: Quirk out SGI UV") added a quirk to
> efi_apply_memmap_quirks to force SGI UV systems to fall back to the old
> EFI memmap mechanism.  We have a BIOS fix for this issue now, so we no
> longer need this quirk in the kernel.

So does that mean that all UV systems out there will get the BIOS update
or at least will have a BIOS update available so that we won't need the
quirk at all?

-- 
Regards/Gruss,
    Boris.

ECO tip #101: Trim your mails when you reply.

Re: [PATCH 1/2] Remove EFI memmap quirk for UV

[Alex Thorlton]

On Tue, Nov 17, 2015 at 08:32:59PM +0100, Borislav Petkov wrote:
> On Mon, Nov 16, 2015 at 11:59:40AM -0600, Alex Thorlton wrote:
> > Commit a5d90c923bcf ("x86/efi: Quirk out SGI UV") added a quirk to
> > efi_apply_memmap_quirks to force SGI UV systems to fall back to the old
> > EFI memmap mechanism.  We have a BIOS fix for this issue now, so we no
> > longer need this quirk in the kernel.
> 
> So does that mean that all UV systems out there will get the BIOS update
> or at least will have a BIOS update available so that we won't need the
> quirk at all?

Essentially, yes.  The BIOS fix isn't available on UV1, but that's older
hardware at this point, and the distro kernels that run on it will
still have the quirk.  This change is mainly so that we can get the
un-quirked code pulled in for the next major distro release.

We won't be checking this down into the stable branches.  Mainly just
planning ahead here for future UV and distro releases.

- Alex

Re: [PATCH 1/2] Remove EFI memmap quirk for UV

[Alex Thorlton]

On Tue, Nov 17, 2015 at 08:32:59PM +0100, Borislav Petkov wrote:
> On Mon, Nov 16, 2015 at 11:59:40AM -0600, Alex Thorlton wrote:
> > Commit a5d90c923bcf ("x86/efi: Quirk out SGI UV") added a quirk to
> > efi_apply_memmap_quirks to force SGI UV systems to fall back to the old
> > EFI memmap mechanism.  We have a BIOS fix for this issue now, so we no
> > longer need this quirk in the kernel.
> 
> So does that mean that all UV systems out there will get the BIOS update
> or at least will have a BIOS update available so that we won't need the
> quirk at all?

Essentially, yes.  The BIOS fix isn't available on UV1, but that's older
hardware at this point, and the distro kernels that run on it will
still have the quirk.  This change is mainly so that we can get the
un-quirked code pulled in for the next major distro release.

We won't be checking this down into the stable branches.  Mainly just
planning ahead here for future UV and distro releases.

- Alex

Re: [PATCH 1/2] Remove EFI memmap quirk for UV

[Ingo Molnar]

* Alex Thorlton <athorlton@sgi.com> wrote:

> On Tue, Nov 17, 2015 at 08:32:59PM +0100, Borislav Petkov wrote:
> > On Mon, Nov 16, 2015 at 11:59:40AM -0600, Alex Thorlton wrote:
> > > Commit a5d90c923bcf ("x86/efi: Quirk out SGI UV") added a quirk to
> > > efi_apply_memmap_quirks to force SGI UV systems to fall back to the old
> > > EFI memmap mechanism.  We have a BIOS fix for this issue now, so we no
> > > longer need this quirk in the kernel.
> > 
> > So does that mean that all UV systems out there will get the BIOS update
> > or at least will have a BIOS update available so that we won't need the
> > quirk at all?
> 
> Essentially, yes.  The BIOS fix isn't available on UV1, but that's older
> hardware at this point, and the distro kernels that run on it will
> still have the quirk.  This change is mainly so that we can get the
> un-quirked code pulled in for the next major distro release.

So how about older UV systems that don't want to upgrade the BIOS for whatever 
reason but wants to upgrade to a new distro will have a non-booting kernel?

Also, what about UV systems that compile their own kernels for whatever reason?

> We won't be checking this down into the stable branches.  Mainly just planning 
> ahead here for future UV and distro releases.

But eventually the new kernel will become the stable kernel, and we'll be breaking 
old systems with old BIOSen, which is not good.

We should at least check the BIOS version via a DMI quirk and panic in some nicely 
informative 'upgrade your BIOS!' way to ease the transition ...

Thanks,

	Ingo

Re: [PATCH 1/2] Remove EFI memmap quirk for UV

[Borislav Petkov]

On Wed, Nov 18, 2015 at 09:00:47AM +0100, Ingo Molnar wrote:
> We should at least check the BIOS version via a DMI quirk and panic in some nicely 
> informative 'upgrade your BIOS!' way to ease the transition ...

Or since we're touching BIOS anyway, maybe stick a bit somewhere which
says "EFI is fixed/quirk not needed anymore" when set and software can
check that bit instead of checking BIOS versions...

-- 
Regards/Gruss,
    Boris.

ECO tip #101: Trim your mails when you reply.

Re: [PATCH 1/2] Remove EFI memmap quirk for UV

[Borislav Petkov]

On Wed, Nov 18, 2015 at 09:00:47AM +0100, Ingo Molnar wrote:
> We should at least check the BIOS version via a DMI quirk and panic in some nicely 
> informative 'upgrade your BIOS!' way to ease the transition ...

Or since we're touching BIOS anyway, maybe stick a bit somewhere which
says "EFI is fixed/quirk not needed anymore" when set and software can
check that bit instead of checking BIOS versions...

-- 
Regards/Gruss,
    Boris.

ECO tip #101: Trim your mails when you reply.

Re: [PATCH 1/2] Remove EFI memmap quirk for UV

[Alex Thorlton]

On Wed, Nov 18, 2015 at 10:23:16AM +0100, Borislav Petkov wrote:
> On Wed, Nov 18, 2015 at 09:00:47AM +0100, Ingo Molnar wrote:
> > We should at least check the BIOS version via a DMI quirk and panic in some nicely 
> > informative 'upgrade your BIOS!' way to ease the transition ...
> 
> Or since we're touching BIOS anyway, maybe stick a bit somewhere which
> says "EFI is fixed/quirk not needed anymore" when set and software can
> check that bit instead of checking BIOS versions...

After talking through this with Russ, we agree that we should fix this
up to play nice on UV1, without users needing to add the memmap quirk to
the command line.  I'll figure out which check we need to make and spin
another version.

Thanks for looking over this, guys!

- Alex

Re: [PATCH 1/2] Remove EFI memmap quirk for UV

[Alex Thorlton]

On Wed, Nov 18, 2015 at 10:23:16AM +0100, Borislav Petkov wrote:
> On Wed, Nov 18, 2015 at 09:00:47AM +0100, Ingo Molnar wrote:
> > We should at least check the BIOS version via a DMI quirk and panic in some nicely 
> > informative 'upgrade your BIOS!' way to ease the transition ...
> 
> Or since we're touching BIOS anyway, maybe stick a bit somewhere which
> says "EFI is fixed/quirk not needed anymore" when set and software can
> check that bit instead of checking BIOS versions...

After talking through this with Russ, we agree that we should fix this
up to play nice on UV1, without users needing to add the memmap quirk to
the command line.  I'll figure out which check we need to make and spin
another version.

Thanks for looking over this, guys!

- Alex