Message ID | 1379699036-7380-1-git-send-email-yinghai@kernel.org (mailing list archive) |
---|---|
State | Not Applicable, archived |
Headers | show |
On Fri, Sep 20, 2013 at 10:43 AM, Yinghai Lu <yinghai@kernel.org> wrote: > If the hw support intel_pstate and acpi_cpufreq, intel_pstate will > get loaded first. > > acpi_cpufreq_init will call acpi_cpufreq_early_init() > and that will allocate perf data and init those perf data in ACPI core, > (that will cover all cpus). But later it will free them as > cpufreq_register_driver(acpi_cpufreq) will fail as init_pstate is > already registered > > Use cpufreq_get_current_driver() to check if we can skip the > acpi_cpufreq loading. > > -v2: update changelog and separate second part to another patch, according > to Viresh. > > Signed-off-by: Yinghai Lu <yinghai@kernel.org> > > --- > drivers/cpufreq/acpi-cpufreq.c | 4 ++++ > 1 file changed, 4 insertions(+) > > Index: linux-2.6/drivers/cpufreq/acpi-cpufreq.c > =================================================================== > --- linux-2.6.orig/drivers/cpufreq/acpi-cpufreq.c > +++ linux-2.6/drivers/cpufreq/acpi-cpufreq.c > @@ -986,6 +986,10 @@ static int __init acpi_cpufreq_init(void > { > int ret; > > + /* don't keep reloading if cpufreq_driver exists */ > + if (cpufreq_get_current_driver()) > + return 0; > + > if (acpi_disabled) > return 0; > only this one is needed, other one cpufreq: fix racing between acpi_cpufreq_loading is not needed. Thanks Yinghai -- 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
On Fri, Sep 20, 2013 at 10:43 AM, Yinghai Lu <yinghai@kernel.org> wrote: > If the hw support intel_pstate and acpi_cpufreq, intel_pstate will > get loaded first. > > acpi_cpufreq_init will call acpi_cpufreq_early_init() > and that will allocate perf data and init those perf data in ACPI core, > (that will cover all cpus). But later it will free them as > cpufreq_register_driver(acpi_cpufreq) will fail as init_pstate is > already registered > > Use cpufreq_get_current_driver() to check if we can skip the > acpi_cpufreq loading. > > -v2: update changelog and separate second part to another patch, according > to Viresh. > > Signed-off-by: Yinghai Lu <yinghai@kernel.org> > > --- > drivers/cpufreq/acpi-cpufreq.c | 4 ++++ > 1 file changed, 4 insertions(+) > > Index: linux-2.6/drivers/cpufreq/acpi-cpufreq.c > =================================================================== > --- linux-2.6.orig/drivers/cpufreq/acpi-cpufreq.c > +++ linux-2.6/drivers/cpufreq/acpi-cpufreq.c > @@ -986,6 +986,10 @@ static int __init acpi_cpufreq_init(void > { > int ret; > > + /* don't keep reloading if cpufreq_driver exists */ > + if (cpufreq_get_current_driver()) > + return 0; > + > if (acpi_disabled) > return 0; > Rafael, can you put this one in acpi tree? Thanks Yinghai -- 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
On 26 September 2013 10:47, Yinghai Lu <yinghai@kernel.org> wrote:
> can you put this one in acpi tree?
Its already applied in Rafael's linux-next branch.. Do you want something
else?
--
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
On Wed, Sep 25, 2013 at 10:40 PM, Viresh Kumar <viresh.kumar@linaro.org> wrote: > On 26 September 2013 10:47, Yinghai Lu <yinghai@kernel.org> wrote: >> can you put this one in acpi tree? > > Its already applied in Rafael's linux-next branch.. Do you want something > else? sorry, I missed that. I still had that in local patches directory, but looks like quilt is not smart enough and did not report that patch is already applied. Thanks Yinghai -- 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
Index: linux-2.6/drivers/cpufreq/acpi-cpufreq.c =================================================================== --- linux-2.6.orig/drivers/cpufreq/acpi-cpufreq.c +++ linux-2.6/drivers/cpufreq/acpi-cpufreq.c @@ -986,6 +986,10 @@ static int __init acpi_cpufreq_init(void { int ret; + /* don't keep reloading if cpufreq_driver exists */ + if (cpufreq_get_current_driver()) + return 0; + if (acpi_disabled) return 0;
If the hw support intel_pstate and acpi_cpufreq, intel_pstate will get loaded first. acpi_cpufreq_init will call acpi_cpufreq_early_init() and that will allocate perf data and init those perf data in ACPI core, (that will cover all cpus). But later it will free them as cpufreq_register_driver(acpi_cpufreq) will fail as init_pstate is already registered Use cpufreq_get_current_driver() to check if we can skip the acpi_cpufreq loading. -v2: update changelog and separate second part to another patch, according to Viresh. Signed-off-by: Yinghai Lu <yinghai@kernel.org> --- drivers/cpufreq/acpi-cpufreq.c | 4 ++++ 1 file changed, 4 insertions(+) -- 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