[PATCH v5 1/3] ACPI / x86: boot: Split out acpi_generic_reduce_hw_init() and export

[PATCH v5 1/3] ACPI / x86: boot: Split out acpi_generic_reduce_hw_init() and export

[Andy Shevchenko]

This is a preparation patch to allow override the hardware reduced
initialization on ACPI enabled platforms.

No functional change intended.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 arch/x86/include/asm/acpi.h |  4 ++++
 arch/x86/kernel/acpi/boot.c | 22 +++++++++++++---------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h
index 6609dd7289b5..a303d7b7d763 100644
--- a/arch/x86/include/asm/acpi.h
+++ b/arch/x86/include/asm/acpi.h
@@ -140,6 +140,8 @@ static inline u64 acpi_arch_get_root_pointer(void)
 	return x86_init.acpi.get_root_pointer();
 }
 
+void acpi_generic_reduced_hw_init(void);
+
 #else /* !CONFIG_ACPI */
 
 #define acpi_lapic 0
@@ -149,6 +151,8 @@ static inline void acpi_noirq_set(void) { }
 static inline void acpi_disable_pci(void) { }
 static inline void disable_acpi(void) { }
 
+static inline void acpi_generic_reduced_hw_init(void) { }
+
 #endif /* !CONFIG_ACPI */
 
 #define ARCH_HAS_POWER_INIT	1
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 2aa92094b59d..baa084ecffdb 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -1376,17 +1376,21 @@ static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d)
  *
  * We initialize the Hardware-reduced ACPI model here:
  */
+void __init acpi_generic_reduced_hw_init(void)
+{
+	/*
+	 * Override x86_init functions and bypass legacy PIC in
+	 * hardware reduced ACPI mode.
+	 */
+	x86_init.timers.timer_init	= x86_init_noop;
+	x86_init.irqs.pre_vector_init	= x86_init_noop;
+	legacy_pic			= &null_legacy_pic;
+}
+
 static void __init acpi_reduced_hw_init(void)
 {
-	if (acpi_gbl_reduced_hardware) {
-		/*
-		 * Override x86_init functions and bypass legacy pic
-		 * in Hardware-reduced ACPI mode
-		 */
-		x86_init.timers.timer_init	= x86_init_noop;
-		x86_init.irqs.pre_vector_init	= x86_init_noop;
-		legacy_pic			= &null_legacy_pic;
-	}
+	if (acpi_gbl_reduced_hardware)
+		acpi_generic_reduced_hw_init();
 }
 
 /*
-- 
2.15.1

[PATCH v5 2/3] ACPI / x86: boot: Not all platforms require acpi_generic_reduced_hw_init()

[Andy Shevchenko]

Some ACPI hardware reduced platforms need to initialize certain devices
defined by the ACPI hardware specification even though in principle
those devices should not be present in an ACPI hardware reduced platform.

To allow that to happen, make it possible to override the generic
x86_init callbacks and provide a custom legacy_pic value, add a new
->reduced_hw_early_init() callback to struct x86_init_acpi and make
acpi_reduced_hw_init() use it.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---

- address Rafael's comments
- requires patches from Juergen Gross
- supposed to go via tip tree (x86/boot branch)
- tested on ASuS T100ta (HW reduced) and Intel Broxton based platforms

 arch/x86/include/asm/x86_init.h | 2 ++
 arch/x86/kernel/acpi/boot.c     | 2 +-
 arch/x86/kernel/x86_init.c      | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
index 2e2c34d2bb00..5bd45a8f5ae3 100644
--- a/arch/x86/include/asm/x86_init.h
+++ b/arch/x86/include/asm/x86_init.h
@@ -133,9 +133,11 @@ struct x86_hyper_init {
 /**
  * struct x86_init_acpi - x86 ACPI init functions
  * @get_root_pointer:		get RSDP address
+ * @reduced_hw_early_init:	hardware reduced platform early init
  */
 struct x86_init_acpi {
 	u64 (*get_root_pointer)(void);
+	void (*reduced_hw_early_init)(void);
 };
 
 /**
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index baa084ecffdb..7a37d9357bc4 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -1390,7 +1390,7 @@ void __init acpi_generic_reduced_hw_init(void)
 static void __init acpi_reduced_hw_init(void)
 {
 	if (acpi_gbl_reduced_hardware)
-		acpi_generic_reduced_hw_init();
+		x86_init.acpi.reduced_hw_early_init();
 }
 
 /*
diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
index 9e4e994a4836..03452b73e2ea 100644
--- a/arch/x86/kernel/x86_init.c
+++ b/arch/x86/kernel/x86_init.c
@@ -8,6 +8,7 @@
 #include <linux/export.h>
 #include <linux/pci.h>
 
+#include <asm/acpi.h>
 #include <asm/bios_ebda.h>
 #include <asm/paravirt.h>
 #include <asm/pci_x86.h>
@@ -95,6 +96,7 @@ struct x86_init_ops x86_init __initdata = {
 
 	.acpi = {
 		.get_root_pointer	= u64_x86_init_noop,
+		.reduced_hw_early_init	= acpi_generic_reduced_hw_init,
 	},
 };
 
-- 
2.15.1

[PATCH v5 3/3] x86/platform/intel-mid: Add special handling of ACPI HW reduced platforms

[Andy Shevchenko]

When switching to ACPI HW reduced platforms we still want to initialize timers.
Override x86_init.acpi.reduced_hw_init to achieve that.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 arch/x86/platform/intel-mid/intel-mid.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/x86/platform/intel-mid/intel-mid.c b/arch/x86/platform/intel-mid/intel-mid.c
index 2c67bae6bb53..c556f1e8936e 100644
--- a/arch/x86/platform/intel-mid/intel-mid.c
+++ b/arch/x86/platform/intel-mid/intel-mid.c
@@ -199,6 +199,12 @@ void __init x86_intel_mid_early_setup(void)
 
 	legacy_pic = &null_legacy_pic;
 
+	/*
+	 * Do nothing for now as everything needed done in
+	 * x86_intel_mid_early_setup() below.
+	 */
+	x86_init.acpi.reduced_hw_early_init = x86_init_noop;
+
 	pm_power_off = intel_mid_power_off;
 	machine_ops.emergency_restart  = intel_mid_reboot;
 
-- 
2.15.1

Re: [PATCH v5 1/3] ACPI / x86: boot: Split out acpi_generic_reduce_hw_init() and export

[Rafael J. Wysocki]

On Tue, Feb 20, 2018 at 7:05 PM, Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:
> This is a preparation patch to allow override the hardware reduced
> initialization on ACPI enabled platforms.
>
> No functional change intended.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

> ---
>  arch/x86/include/asm/acpi.h |  4 ++++
>  arch/x86/kernel/acpi/boot.c | 22 +++++++++++++---------
>  2 files changed, 17 insertions(+), 9 deletions(-)
>
> diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h
> index 6609dd7289b5..a303d7b7d763 100644
> --- a/arch/x86/include/asm/acpi.h
> +++ b/arch/x86/include/asm/acpi.h
> @@ -140,6 +140,8 @@ static inline u64 acpi_arch_get_root_pointer(void)
>         return x86_init.acpi.get_root_pointer();
>  }
>
> +void acpi_generic_reduced_hw_init(void);
> +
>  #else /* !CONFIG_ACPI */
>
>  #define acpi_lapic 0
> @@ -149,6 +151,8 @@ static inline void acpi_noirq_set(void) { }
>  static inline void acpi_disable_pci(void) { }
>  static inline void disable_acpi(void) { }
>
> +static inline void acpi_generic_reduced_hw_init(void) { }
> +
>  #endif /* !CONFIG_ACPI */
>
>  #define ARCH_HAS_POWER_INIT    1
> diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
> index 2aa92094b59d..baa084ecffdb 100644
> --- a/arch/x86/kernel/acpi/boot.c
> +++ b/arch/x86/kernel/acpi/boot.c
> @@ -1376,17 +1376,21 @@ static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d)
>   *
>   * We initialize the Hardware-reduced ACPI model here:
>   */
> +void __init acpi_generic_reduced_hw_init(void)
> +{
> +       /*
> +        * Override x86_init functions and bypass legacy PIC in
> +        * hardware reduced ACPI mode.
> +        */
> +       x86_init.timers.timer_init      = x86_init_noop;
> +       x86_init.irqs.pre_vector_init   = x86_init_noop;
> +       legacy_pic                      = &null_legacy_pic;
> +}
> +
>  static void __init acpi_reduced_hw_init(void)
>  {
> -       if (acpi_gbl_reduced_hardware) {
> -               /*
> -                * Override x86_init functions and bypass legacy pic
> -                * in Hardware-reduced ACPI mode
> -                */
> -               x86_init.timers.timer_init      = x86_init_noop;
> -               x86_init.irqs.pre_vector_init   = x86_init_noop;
> -               legacy_pic                      = &null_legacy_pic;
> -       }
> +       if (acpi_gbl_reduced_hardware)
> +               acpi_generic_reduced_hw_init();
>  }
>
>  /*
> --
> 2.15.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v5 2/3] ACPI / x86: boot: Not all platforms require acpi_generic_reduced_hw_init()

[Rafael J. Wysocki]

On Tue, Feb 20, 2018 at 7:05 PM, Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:
> Some ACPI hardware reduced platforms need to initialize certain devices
> defined by the ACPI hardware specification even though in principle
> those devices should not be present in an ACPI hardware reduced platform.
>
> To allow that to happen, make it possible to override the generic
> x86_init callbacks and provide a custom legacy_pic value, add a new
> ->reduced_hw_early_init() callback to struct x86_init_acpi and make
> acpi_reduced_hw_init() use it.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

> ---
>
> - address Rafael's comments
> - requires patches from Juergen Gross
> - supposed to go via tip tree (x86/boot branch)
> - tested on ASuS T100ta (HW reduced) and Intel Broxton based platforms
>
>  arch/x86/include/asm/x86_init.h | 2 ++
>  arch/x86/kernel/acpi/boot.c     | 2 +-
>  arch/x86/kernel/x86_init.c      | 2 ++
>  3 files changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
> index 2e2c34d2bb00..5bd45a8f5ae3 100644
> --- a/arch/x86/include/asm/x86_init.h
> +++ b/arch/x86/include/asm/x86_init.h
> @@ -133,9 +133,11 @@ struct x86_hyper_init {
>  /**
>   * struct x86_init_acpi - x86 ACPI init functions
>   * @get_root_pointer:          get RSDP address
> + * @reduced_hw_early_init:     hardware reduced platform early init
>   */
>  struct x86_init_acpi {
>         u64 (*get_root_pointer)(void);
> +       void (*reduced_hw_early_init)(void);
>  };
>
>  /**
> diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
> index baa084ecffdb..7a37d9357bc4 100644
> --- a/arch/x86/kernel/acpi/boot.c
> +++ b/arch/x86/kernel/acpi/boot.c
> @@ -1390,7 +1390,7 @@ void __init acpi_generic_reduced_hw_init(void)
>  static void __init acpi_reduced_hw_init(void)
>  {
>         if (acpi_gbl_reduced_hardware)
> -               acpi_generic_reduced_hw_init();
> +               x86_init.acpi.reduced_hw_early_init();
>  }
>
>  /*
> diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
> index 9e4e994a4836..03452b73e2ea 100644
> --- a/arch/x86/kernel/x86_init.c
> +++ b/arch/x86/kernel/x86_init.c
> @@ -8,6 +8,7 @@
>  #include <linux/export.h>
>  #include <linux/pci.h>
>
> +#include <asm/acpi.h>
>  #include <asm/bios_ebda.h>
>  #include <asm/paravirt.h>
>  #include <asm/pci_x86.h>
> @@ -95,6 +96,7 @@ struct x86_init_ops x86_init __initdata = {
>
>         .acpi = {
>                 .get_root_pointer       = u64_x86_init_noop,
> +               .reduced_hw_early_init  = acpi_generic_reduced_hw_init,
>         },
>  };
>
> --
> 2.15.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v5 3/3] x86/platform/intel-mid: Add special handling of ACPI HW reduced platforms

[Rafael J. Wysocki]

On Tue, Feb 20, 2018 at 7:05 PM, Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:
> When switching to ACPI HW reduced platforms we still want to initialize timers.
> Override x86_init.acpi.reduced_hw_init to achieve that.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

> ---
>  arch/x86/platform/intel-mid/intel-mid.c | 6 ++++++
>  1 file changed, 6 insertions(+)
>
> diff --git a/arch/x86/platform/intel-mid/intel-mid.c b/arch/x86/platform/intel-mid/intel-mid.c
> index 2c67bae6bb53..c556f1e8936e 100644
> --- a/arch/x86/platform/intel-mid/intel-mid.c
> +++ b/arch/x86/platform/intel-mid/intel-mid.c
> @@ -199,6 +199,12 @@ void __init x86_intel_mid_early_setup(void)
>
>         legacy_pic = &null_legacy_pic;
>
> +       /*
> +        * Do nothing for now as everything needed done in
> +        * x86_intel_mid_early_setup() below.
> +        */
> +       x86_init.acpi.reduced_hw_early_init = x86_init_noop;
> +
>         pm_power_off = intel_mid_power_off;
>         machine_ops.emergency_restart  = intel_mid_reboot;
>
> --
> 2.15.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v5 1/3] ACPI / x86: boot: Split out acpi_generic_reduce_hw_init() and export

[Andy Shevchenko]

On Tue, 2018-02-20 at 19:42 +0100, Rafael J. Wysocki wrote:
> On Tue, Feb 20, 2018 at 7:05 PM, Andy Shevchenko
> <andriy.shevchenko@linux.intel.com> wrote:
> > This is a preparation patch to allow override the hardware reduced
> > initialization on ACPI enabled platforms.
> > 
> > No functional change intended.
> > 
> > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> 
> Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

Thanks, Rafael!

Ingo, can it be applied?

> 
> > ---
> >  arch/x86/include/asm/acpi.h |  4 ++++
> >  arch/x86/kernel/acpi/boot.c | 22 +++++++++++++---------
> >  2 files changed, 17 insertions(+), 9 deletions(-)
> > 
> > diff --git a/arch/x86/include/asm/acpi.h
> > b/arch/x86/include/asm/acpi.h
> > index 6609dd7289b5..a303d7b7d763 100644
> > --- a/arch/x86/include/asm/acpi.h
> > +++ b/arch/x86/include/asm/acpi.h
> > @@ -140,6 +140,8 @@ static inline u64
> > acpi_arch_get_root_pointer(void)
> >         return x86_init.acpi.get_root_pointer();
> >  }
> > 
> > +void acpi_generic_reduced_hw_init(void);
> > +
> >  #else /* !CONFIG_ACPI */
> > 
> >  #define acpi_lapic 0
> > @@ -149,6 +151,8 @@ static inline void acpi_noirq_set(void) { }
> >  static inline void acpi_disable_pci(void) { }
> >  static inline void disable_acpi(void) { }
> > 
> > +static inline void acpi_generic_reduced_hw_init(void) { }
> > +
> >  #endif /* !CONFIG_ACPI */
> > 
> >  #define ARCH_HAS_POWER_INIT    1
> > diff --git a/arch/x86/kernel/acpi/boot.c
> > b/arch/x86/kernel/acpi/boot.c
> > index 2aa92094b59d..baa084ecffdb 100644
> > --- a/arch/x86/kernel/acpi/boot.c
> > +++ b/arch/x86/kernel/acpi/boot.c
> > @@ -1376,17 +1376,21 @@ static int __init
> > dmi_ignore_irq0_timer_override(const struct dmi_system_id *d)
> >   *
> >   * We initialize the Hardware-reduced ACPI model here:
> >   */
> > +void __init acpi_generic_reduced_hw_init(void)
> > +{
> > +       /*
> > +        * Override x86_init functions and bypass legacy PIC in
> > +        * hardware reduced ACPI mode.
> > +        */
> > +       x86_init.timers.timer_init      = x86_init_noop;
> > +       x86_init.irqs.pre_vector_init   = x86_init_noop;
> > +       legacy_pic                      = &null_legacy_pic;
> > +}
> > +
> >  static void __init acpi_reduced_hw_init(void)
> >  {
> > -       if (acpi_gbl_reduced_hardware) {
> > -               /*
> > -                * Override x86_init functions and bypass legacy pic
> > -                * in Hardware-reduced ACPI mode
> > -                */
> > -               x86_init.timers.timer_init      = x86_init_noop;
> > -               x86_init.irqs.pre_vector_init   = x86_init_noop;
> > -               legacy_pic                      = &null_legacy_pic;
> > -       }
> > +       if (acpi_gbl_reduced_hardware)
> > +               acpi_generic_reduced_hw_init();
> >  }
> > 
> >  /*
> > --
> > 2.15.1
> > 
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-
> > acpi" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html

-- 
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy

Re: [PATCH v5 1/3] ACPI / x86: boot: Split out acpi_generic_reduce_hw_init() and export

[Andy Shevchenko]

On Fri, 2018-02-23 at 12:51 +0200, Andy Shevchenko wrote:
> On Tue, 2018-02-20 at 19:42 +0100, Rafael J. Wysocki wrote:
> > On Tue, Feb 20, 2018 at 7:05 PM, Andy Shevchenko
> > <andriy.shevchenko@linux.intel.com> wrote:
> > > This is a preparation patch to allow override the hardware reduced
> > > initialization on ACPI enabled platforms.
> > > 
> > > No functional change intended.
> > > 
> > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> > 
> > Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> 
> Thanks, Rafael!
> 
> Ingo, can it be applied?

Hmm... It seems Ingo is busy with something else.

-- 
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy

Re: [PATCH v5 1/3] ACPI / x86: boot: Split out acpi_generic_reduce_hw_init() and export

[Ingo Molnar]

* Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote:

> On Fri, 2018-02-23 at 12:51 +0200, Andy Shevchenko wrote:
> > On Tue, 2018-02-20 at 19:42 +0100, Rafael J. Wysocki wrote:
> > > On Tue, Feb 20, 2018 at 7:05 PM, Andy Shevchenko
> > > <andriy.shevchenko@linux.intel.com> wrote:
> > > > This is a preparation patch to allow override the hardware reduced
> > > > initialization on ACPI enabled platforms.
> > > > 
> > > > No functional change intended.
> > > > 
> > > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> > > 
> > > Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> > 
> > Thanks, Rafael!
> > 
> > Ingo, can it be applied?
> 
> Hmm... It seems Ingo is busy with something else.

Sorry, it all looks good to me:

  Acked-by: Ingo Molnar <mingo@kernel.org>

Thanks,

	Ingo

Re: [PATCH v5 1/3] ACPI / x86: boot: Split out acpi_generic_reduce_hw_init() and export

[Rafael J. Wysocki]

On Mon, Mar 12, 2018 at 12:01 PM, Ingo Molnar <mingo@kernel.org> wrote:
>
> * Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote:
>
>> On Fri, 2018-02-23 at 12:51 +0200, Andy Shevchenko wrote:
>> > On Tue, 2018-02-20 at 19:42 +0100, Rafael J. Wysocki wrote:
>> > > On Tue, Feb 20, 2018 at 7:05 PM, Andy Shevchenko
>> > > <andriy.shevchenko@linux.intel.com> wrote:
>> > > > This is a preparation patch to allow override the hardware reduced
>> > > > initialization on ACPI enabled platforms.
>> > > >
>> > > > No functional change intended.
>> > > >
>> > > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
>> > >
>> > > Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
>> >
>> > Thanks, Rafael!
>> >
>> > Ingo, can it be applied?
>>
>> Hmm... It seems Ingo is busy with something else.
>
> Sorry, it all looks good to me:
>
>   Acked-by: Ingo Molnar <mingo@kernel.org>

It depends on some material in -tip AFAICS, so can you apply it, please?

Re: [PATCH v5 1/3] ACPI / x86: boot: Split out acpi_generic_reduce_hw_init() and export

[Ingo Molnar]

* Rafael J. Wysocki <rafael@kernel.org> wrote:

> On Mon, Mar 12, 2018 at 12:01 PM, Ingo Molnar <mingo@kernel.org> wrote:
> >
> > * Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote:
> >
> >> On Fri, 2018-02-23 at 12:51 +0200, Andy Shevchenko wrote:
> >> > On Tue, 2018-02-20 at 19:42 +0100, Rafael J. Wysocki wrote:
> >> > > On Tue, Feb 20, 2018 at 7:05 PM, Andy Shevchenko
> >> > > <andriy.shevchenko@linux.intel.com> wrote:
> >> > > > This is a preparation patch to allow override the hardware reduced
> >> > > > initialization on ACPI enabled platforms.
> >> > > >
> >> > > > No functional change intended.
> >> > > >
> >> > > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> >> > >
> >> > > Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> >> >
> >> > Thanks, Rafael!
> >> >
> >> > Ingo, can it be applied?
> >>
> >> Hmm... It seems Ingo is busy with something else.
> >
> > Sorry, it all looks good to me:
> >
> >   Acked-by: Ingo Molnar <mingo@kernel.org>
> 
> It depends on some material in -tip AFAICS, so can you apply it, please?

Sure, done!

Once they have passed testing it will live in tip:x86/mm, that's where the 
dependent x86/boot commits ended up in this development cycle.

Thanks,

	Ingo

Re: [PATCH v5 1/3] ACPI / x86: boot: Split out acpi_generic_reduce_hw_init() and export

[Rafael J. Wysocki]

On Mon, Mar 12, 2018 at 12:33 PM, Ingo Molnar <mingo@kernel.org> wrote:
>
> * Rafael J. Wysocki <rafael@kernel.org> wrote:
>
>> On Mon, Mar 12, 2018 at 12:01 PM, Ingo Molnar <mingo@kernel.org> wrote:
>> >
>> > * Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote:
>> >
>> >> On Fri, 2018-02-23 at 12:51 +0200, Andy Shevchenko wrote:
>> >> > On Tue, 2018-02-20 at 19:42 +0100, Rafael J. Wysocki wrote:
>> >> > > On Tue, Feb 20, 2018 at 7:05 PM, Andy Shevchenko
>> >> > > <andriy.shevchenko@linux.intel.com> wrote:
>> >> > > > This is a preparation patch to allow override the hardware reduced
>> >> > > > initialization on ACPI enabled platforms.
>> >> > > >
>> >> > > > No functional change intended.
>> >> > > >
>> >> > > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
>> >> > >
>> >> > > Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
>> >> >
>> >> > Thanks, Rafael!
>> >> >
>> >> > Ingo, can it be applied?
>> >>
>> >> Hmm... It seems Ingo is busy with something else.
>> >
>> > Sorry, it all looks good to me:
>> >
>> >   Acked-by: Ingo Molnar <mingo@kernel.org>
>>
>> It depends on some material in -tip AFAICS, so can you apply it, please?
>
> Sure, done!
>
> Once they have passed testing it will live in tip:x86/mm, that's where the
> dependent x86/boot commits ended up in this development cycle.

Thanks!

[tip:x86/mm] ACPI, x86/boot: Split out acpi_generic_reduce_hw_init() and export

[tip-bot for Andy Shevchenko]

Commit-ID:  50beba07a0e42ebd4454adc97515a2a2a969645b
Gitweb:     https://git.kernel.org/tip/50beba07a0e42ebd4454adc97515a2a2a969645b
Author:     Andy Shevchenko <andriy.shevchenko@linux.intel.com>
AuthorDate: Tue, 20 Feb 2018 20:05:04 +0200
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Mon, 12 Mar 2018 12:32:57 +0100

ACPI, x86/boot: Split out acpi_generic_reduce_hw_init() and export

This is a preparation patch to allow override the hardware reduced
initialization on ACPI enabled platforms.

No functional change intended.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Eric Biederman <ebiederm@xmission.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rafael J . Wysocki <rafael.j.wysocki@intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-acpi@vger.kernel.org
Link: http://lkml.kernel.org/r/20180220180506.65523-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/include/asm/acpi.h |  4 ++++
 arch/x86/kernel/acpi/boot.c | 22 +++++++++++++---------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h
index 6609dd7289b5..a303d7b7d763 100644
--- a/arch/x86/include/asm/acpi.h
+++ b/arch/x86/include/asm/acpi.h
@@ -140,6 +140,8 @@ static inline u64 acpi_arch_get_root_pointer(void)
 	return x86_init.acpi.get_root_pointer();
 }
 
+void acpi_generic_reduced_hw_init(void);
+
 #else /* !CONFIG_ACPI */
 
 #define acpi_lapic 0
@@ -149,6 +151,8 @@ static inline void acpi_noirq_set(void) { }
 static inline void acpi_disable_pci(void) { }
 static inline void disable_acpi(void) { }
 
+static inline void acpi_generic_reduced_hw_init(void) { }
+
 #endif /* !CONFIG_ACPI */
 
 #define ARCH_HAS_POWER_INIT	1
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 2aa92094b59d..baa084ecffdb 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -1376,17 +1376,21 @@ static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d)
  *
  * We initialize the Hardware-reduced ACPI model here:
  */
+void __init acpi_generic_reduced_hw_init(void)
+{
+	/*
+	 * Override x86_init functions and bypass legacy PIC in
+	 * hardware reduced ACPI mode.
+	 */
+	x86_init.timers.timer_init	= x86_init_noop;
+	x86_init.irqs.pre_vector_init	= x86_init_noop;
+	legacy_pic			= &null_legacy_pic;
+}
+
 static void __init acpi_reduced_hw_init(void)
 {
-	if (acpi_gbl_reduced_hardware) {
-		/*
-		 * Override x86_init functions and bypass legacy pic
-		 * in Hardware-reduced ACPI mode
-		 */
-		x86_init.timers.timer_init	= x86_init_noop;
-		x86_init.irqs.pre_vector_init	= x86_init_noop;
-		legacy_pic			= &null_legacy_pic;
-	}
+	if (acpi_gbl_reduced_hardware)
+		acpi_generic_reduced_hw_init();
 }
 
 /*

[tip:x86/mm] ACPI, x86/boot: Introduce the ->reduced_hw_early_init() ACPI callback

[tip-bot for Andy Shevchenko]

Commit-ID:  81b53e5ff21e09b42525cfa08f2b0af2b8c5f465
Gitweb:     https://git.kernel.org/tip/81b53e5ff21e09b42525cfa08f2b0af2b8c5f465
Author:     Andy Shevchenko <andriy.shevchenko@linux.intel.com>
AuthorDate: Tue, 20 Feb 2018 20:05:05 +0200
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Mon, 12 Mar 2018 12:32:57 +0100

ACPI, x86/boot: Introduce the ->reduced_hw_early_init() ACPI callback

Some ACPI hardware reduced platforms need to initialize certain devices
defined by the ACPI hardware specification even though in principle
those devices should not be present in an ACPI hardware reduced platform.

To allow that to happen, make it possible to override the generic
x86_init callbacks and provide a custom legacy_pic value, add a new
->reduced_hw_early_init() callback to struct x86_init_acpi and make
acpi_reduced_hw_init() use it.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Eric Biederman <ebiederm@xmission.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rafael J . Wysocki <rafael.j.wysocki@intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-acpi@vger.kernel.org
Link: http://lkml.kernel.org/r/20180220180506.65523-2-andriy.shevchenko@linux.intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/include/asm/x86_init.h | 2 ++
 arch/x86/kernel/acpi/boot.c     | 2 +-
 arch/x86/kernel/x86_init.c      | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
index 2e2c34d2bb00..5bd45a8f5ae3 100644
--- a/arch/x86/include/asm/x86_init.h
+++ b/arch/x86/include/asm/x86_init.h
@@ -133,9 +133,11 @@ struct x86_hyper_init {
 /**
  * struct x86_init_acpi - x86 ACPI init functions
  * @get_root_pointer:		get RSDP address
+ * @reduced_hw_early_init:	hardware reduced platform early init
  */
 struct x86_init_acpi {
 	u64 (*get_root_pointer)(void);
+	void (*reduced_hw_early_init)(void);
 };
 
 /**
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index baa084ecffdb..7a37d9357bc4 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -1390,7 +1390,7 @@ void __init acpi_generic_reduced_hw_init(void)
 static void __init acpi_reduced_hw_init(void)
 {
 	if (acpi_gbl_reduced_hardware)
-		acpi_generic_reduced_hw_init();
+		x86_init.acpi.reduced_hw_early_init();
 }
 
 /*
diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
index b8cff22a8785..ac67ccffeef0 100644
--- a/arch/x86/kernel/x86_init.c
+++ b/arch/x86/kernel/x86_init.c
@@ -8,6 +8,7 @@
 #include <linux/export.h>
 #include <linux/pci.h>
 
+#include <asm/acpi.h>
 #include <asm/bios_ebda.h>
 #include <asm/paravirt.h>
 #include <asm/pci_x86.h>
@@ -95,6 +96,7 @@ struct x86_init_ops x86_init __initdata = {
 
 	.acpi = {
 		.get_root_pointer	= u64_x86_init_noop,
+		.reduced_hw_early_init	= acpi_generic_reduced_hw_init,
 	},
 };
 

[tip:x86/mm] x86/platform/intel-mid: Add special handling for ACPI HW reduced platforms

[tip-bot for Andy Shevchenko]

Commit-ID:  02428742639bc3300c8c527b054d0ec0bdf5571d
Gitweb:     https://git.kernel.org/tip/02428742639bc3300c8c527b054d0ec0bdf5571d
Author:     Andy Shevchenko <andriy.shevchenko@linux.intel.com>
AuthorDate: Tue, 20 Feb 2018 20:05:06 +0200
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Mon, 12 Mar 2018 12:32:57 +0100

x86/platform/intel-mid: Add special handling for ACPI HW reduced platforms

When switching to ACPI HW reduced platforms we still want to initialize timers.
Override x86_init.acpi.reduced_hw_init to achieve that.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Eric Biederman <ebiederm@xmission.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rafael J . Wysocki <rafael.j.wysocki@intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-acpi@vger.kernel.org
Link: http://lkml.kernel.org/r/20180220180506.65523-3-andriy.shevchenko@linux.intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/platform/intel-mid/intel-mid.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/x86/platform/intel-mid/intel-mid.c b/arch/x86/platform/intel-mid/intel-mid.c
index 2c67bae6bb53..c556f1e8936e 100644
--- a/arch/x86/platform/intel-mid/intel-mid.c
+++ b/arch/x86/platform/intel-mid/intel-mid.c
@@ -199,6 +199,12 @@ void __init x86_intel_mid_early_setup(void)
 
 	legacy_pic = &null_legacy_pic;
 
+	/*
+	 * Do nothing for now as everything needed done in
+	 * x86_intel_mid_early_setup() below.
+	 */
+	x86_init.acpi.reduced_hw_early_init = x86_init_noop;
+
 	pm_power_off = intel_mid_power_off;
 	machine_ops.emergency_restart  = intel_mid_reboot;