[PATCH 1/2] ACPI: Reorder IPMI driver before any other ACPI drivers

[PATCH 1/2] ACPI: Reorder IPMI driver before any other ACPI drivers

[Matthew Garrett]

Drivers may make calls that require the ACPI IPMI driver to have been
initialised already, so make sure that it appears earlier in the build
order.

Signed-off-by: Matthew Garrett <mjg@redhat.com>
---
 drivers/acpi/Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 47199e2..82422fe 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -47,6 +47,10 @@ acpi-y				+= video_detect.o
 endif
 
 # These are (potentially) separate modules
+
+# IPMI may be used by other drivers, so it has to initialise before them
+obj-$(CONFIG_ACPI_IPMI)		+= acpi_ipmi.o
+
 obj-$(CONFIG_ACPI_AC) 		+= ac.o
 obj-$(CONFIG_ACPI_BUTTON)	+= button.o
 obj-$(CONFIG_ACPI_FAN)		+= fan.o
@@ -70,6 +74,5 @@ processor-y			+= processor_idle.o processor_thermal.o
 processor-$(CONFIG_CPU_FREQ)	+= processor_perflib.o
 
 obj-$(CONFIG_ACPI_PROCESSOR_AGGREGATOR) += acpi_pad.o
-obj-$(CONFIG_ACPI_IPMI)		+= acpi_ipmi.o
 
 obj-$(CONFIG_ACPI_APEI)		+= apei/
-- 
1.7.11.4

[PATCH 2/2] IPMI: Change link order

[Matthew Garrett]

IPMI must be initialised before ACPI in order to ensure that any IPMI
services are available before ACPI driver initialisation attempts to use
any IPMI operation regions.

Signed-off-by: Matthew Garrett <mjg@redhat.com>
---
 drivers/Makefile      | 4 ++++
 drivers/char/Makefile | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/Makefile b/drivers/Makefile
index 5b42184..c2b527a 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -14,6 +14,10 @@ obj-$(CONFIG_PARISC)		+= parisc/
 obj-$(CONFIG_RAPIDIO)		+= rapidio/
 obj-y				+= video/
 obj-y				+= idle/
+
+# IPMI must come before ACPI in order to provide IPMI opregion support
+obj-$(CONFIG_IPMI_HANDLER)	+= char/ipmi
+
 obj-$(CONFIG_ACPI)		+= acpi/
 obj-$(CONFIG_SFI)		+= sfi/
 # PnP must come after ACPI since it will eventually need to check if acpi
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index d0b27a3..7ff1d0d 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -52,7 +52,6 @@ obj-$(CONFIG_TELCLOCK)		+= tlclk.o
 obj-$(CONFIG_MWAVE)		+= mwave/
 obj-$(CONFIG_AGP)		+= agp/
 obj-$(CONFIG_PCMCIA)		+= pcmcia/
-obj-$(CONFIG_IPMI_HANDLER)	+= ipmi/
 
 obj-$(CONFIG_HANGCHECK_TIMER)	+= hangcheck-timer.o
 obj-$(CONFIG_TCG_TPM)		+= tpm/
-- 
1.7.11.4

Re: [PATCH 1/2] ACPI: Reorder IPMI driver before any other ACPI drivers

[Corey Minyard]

On 09/20/2012 04:46 PM, Matthew Garrett wrote:
> Drivers may make calls that require the ACPI IPMI driver to have been
> initialised already, so make sure that it appears earlier in the build
> order.

The IPMI driver uses the ACPI namespace as an option to know the address 
and characteristics of the device.  Does that still work?

-corey

>
> Signed-off-by: Matthew Garrett <mjg@redhat.com>
> ---
>   drivers/acpi/Makefile | 5 ++++-
>   1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
> index 47199e2..82422fe 100644
> --- a/drivers/acpi/Makefile
> +++ b/drivers/acpi/Makefile
> @@ -47,6 +47,10 @@ acpi-y				+= video_detect.o
>   endif
>   
>   # These are (potentially) separate modules
> +
> +# IPMI may be used by other drivers, so it has to initialise before them
> +obj-$(CONFIG_ACPI_IPMI)		+= acpi_ipmi.o
> +
>   obj-$(CONFIG_ACPI_AC) 		+= ac.o
>   obj-$(CONFIG_ACPI_BUTTON)	+= button.o
>   obj-$(CONFIG_ACPI_FAN)		+= fan.o
> @@ -70,6 +74,5 @@ processor-y			+= processor_idle.o processor_thermal.o
>   processor-$(CONFIG_CPU_FREQ)	+= processor_perflib.o
>   
>   obj-$(CONFIG_ACPI_PROCESSOR_AGGREGATOR) += acpi_pad.o
> -obj-$(CONFIG_ACPI_IPMI)		+= acpi_ipmi.o
>   
>   obj-$(CONFIG_ACPI_APEI)		+= apei/

Re: [PATCH 1/2] ACPI: Reorder IPMI driver before any other ACPI drivers

[Matthew Garrett]

On Thu, Sep 20, 2012 at 08:19:48PM -0500, Corey Minyard wrote:
> On 09/20/2012 04:46 PM, Matthew Garrett wrote:
> >Drivers may make calls that require the ACPI IPMI driver to have been
> >initialised already, so make sure that it appears earlier in the build
> >order.
> 
> The IPMI driver uses the ACPI namespace as an option to know the
> address and characteristics of the device.  Does that still work?

Yes, the ACPI interpreter is initialised earlier than the IPMI driver 
discovery.

-- 
Matthew Garrett | mjg59@srcf.ucam.org

Re: [PATCH 1/2] ACPI: Reorder IPMI driver before any other ACPI drivers

[Corey Minyard]

On 09/20/2012 08:26 PM, Matthew Garrett wrote:
> On Thu, Sep 20, 2012 at 08:19:48PM -0500, Corey Minyard wrote:
>> On 09/20/2012 04:46 PM, Matthew Garrett wrote:
>>> Drivers may make calls that require the ACPI IPMI driver to have been
>>> initialised already, so make sure that it appears earlier in the build
>>> order.
>> The IPMI driver uses the ACPI namespace as an option to know the
>> address and characteristics of the device.  Does that still work?
> Yes, the ACPI interpreter is initialised earlier than the IPMI driver
> discovery.
>
Cool, I'm good with these, then.

Thanks,

-corey