[PATCH] Add module aliases for acpi-cpufreq

[PATCH] Add module aliases for acpi-cpufreq

[Matthew Garrett]

The acpi core will call request_module("acpi-cpufreq") on subsystem init,
but this will fail if the module isn't available at that stage of boot.
Add some module aliases to ensure that udev can load the module on Intel
and AMD systems with the appropriate feature bits - I /think/ that this
will also work on VIA systems, but haven't verified that.

Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
---
 drivers/cpufreq/acpi-cpufreq.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
index 0d048f6..7b0d49d 100644
--- a/drivers/cpufreq/acpi-cpufreq.c
+++ b/drivers/cpufreq/acpi-cpufreq.c
@@ -1030,4 +1030,11 @@ MODULE_PARM_DESC(acpi_pstate_strict,
 late_initcall(acpi_cpufreq_init);
 module_exit(acpi_cpufreq_exit);
 
+static const struct x86_cpu_id acpi_cpufreq_ids[] = {
+	X86_FEATURE_MATCH(X86_FEATURE_ACPI),
+	X86_FEATURE_MATCH(X86_FEATURE_HW_PSTATE),
+	{}
+};
+MODULE_DEVICE_TABLE(x86cpu, acpi_cpufreq_ids);
+
 MODULE_ALIAS("acpi");
-- 
1.8.0.2

Re: [PATCH] Add module aliases for acpi-cpufreq

[Borislav Petkov]

On Tue, Jan 22, 2013 at 11:42:24AM -0500, Matthew Garrett wrote:
> The acpi core will call request_module("acpi-cpufreq") on subsystem init,
> but this will fail if the module isn't available at that stage of boot.
> Add some module aliases to ensure that udev can load the module on Intel
> and AMD systems with the appropriate feature bits - I /think/ that this
> will also work on VIA systems, but haven't verified that.
> 
> Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>

Let's add some more tags:

Link: http://lkml.kernel.org/r/1448223.sdUJnNSRz4@vostro.rjw.lan
Tested-by: Leonid Isaev <lisaev@umail.iu.edu>
Acked-by: Borislav Petkov <bp@suse.de>

Rafael, this is all yours. :-)

Thanks.

> ---
>  drivers/cpufreq/acpi-cpufreq.c | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
> index 0d048f6..7b0d49d 100644
> --- a/drivers/cpufreq/acpi-cpufreq.c
> +++ b/drivers/cpufreq/acpi-cpufreq.c
> @@ -1030,4 +1030,11 @@ MODULE_PARM_DESC(acpi_pstate_strict,
>  late_initcall(acpi_cpufreq_init);
>  module_exit(acpi_cpufreq_exit);
>  
> +static const struct x86_cpu_id acpi_cpufreq_ids[] = {
> +	X86_FEATURE_MATCH(X86_FEATURE_ACPI),
> +	X86_FEATURE_MATCH(X86_FEATURE_HW_PSTATE),
> +	{}
> +};
> +MODULE_DEVICE_TABLE(x86cpu, acpi_cpufreq_ids);
> +
>  MODULE_ALIAS("acpi");
> -- 
> 1.8.0.2
> 
> 

-- 
Regards/Gruss,
    Boris.

Sent from a fat crate under my desk. Formatting is fine.
--

Re: [PATCH] Add module aliases for acpi-cpufreq

[Rafael J. Wysocki]

On Tuesday, January 22, 2013 06:38:36 PM Borislav Petkov wrote:
> On Tue, Jan 22, 2013 at 11:42:24AM -0500, Matthew Garrett wrote:
> > The acpi core will call request_module("acpi-cpufreq") on subsystem init,
> > but this will fail if the module isn't available at that stage of boot.
> > Add some module aliases to ensure that udev can load the module on Intel
> > and AMD systems with the appropriate feature bits - I /think/ that this
> > will also work on VIA systems, but haven't verified that.
> > 
> > Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
> 
> Let's add some more tags:
> 
> Link: http://lkml.kernel.org/r/1448223.sdUJnNSRz4@vostro.rjw.lan
> Tested-by: Leonid Isaev <lisaev@umail.iu.edu>
> Acked-by: Borislav Petkov <bp@suse.de>
> 
> Rafael, this is all yours. :-)

Thanks!

Do I think correctly that it should go into 3.7.y too?

Rafael


> > ---
> >  drivers/cpufreq/acpi-cpufreq.c | 7 +++++++
> >  1 file changed, 7 insertions(+)
> > 
> > diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
> > index 0d048f6..7b0d49d 100644
> > --- a/drivers/cpufreq/acpi-cpufreq.c
> > +++ b/drivers/cpufreq/acpi-cpufreq.c
> > @@ -1030,4 +1030,11 @@ MODULE_PARM_DESC(acpi_pstate_strict,
> >  late_initcall(acpi_cpufreq_init);
> >  module_exit(acpi_cpufreq_exit);
> >  
> > +static const struct x86_cpu_id acpi_cpufreq_ids[] = {
> > +	X86_FEATURE_MATCH(X86_FEATURE_ACPI),
> > +	X86_FEATURE_MATCH(X86_FEATURE_HW_PSTATE),
> > +	{}
> > +};
> > +MODULE_DEVICE_TABLE(x86cpu, acpi_cpufreq_ids);
> > +
> >  MODULE_ALIAS("acpi");
> 
> 
-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.

Re: [PATCH] Add module aliases for acpi-cpufreq

[Borislav Petkov]

On Tue, Jan 22, 2013 at 10:57:05PM +0100, Rafael J. Wysocki wrote:
> Do I think correctly that it should go into 3.7.y too?

Looks like I missed the most important tag. Good thinking, yes, tag it
for 3.7-stable too pls.

Thanks.

-- 
Regards/Gruss,
    Boris.

Sent from a fat crate under my desk. Formatting is fine.
--