[PATCH] powernow-k8: Fixup missing _PSS objects message

[PATCH] powernow-k8: Fixup missing _PSS objects message

[Borislav Petkov]

From: Borislav Petkov <borislav.petkov@amd.com>

_PSS objects can also be missing if Cool'N'Quiet is disabled in the
BIOS. Add that to the FW_BUG message for the user to try before updating
her BIOS. Fix formatting while at it.

Acked-by: Mark Langsdorf <mark.langsdorf@amd.com>
Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
---
 drivers/cpufreq/powernow-k8.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/cpufreq/powernow-k8.c b/drivers/cpufreq/powernow-k8.c
index c0e816468e30..33f17c4a1342 100644
--- a/drivers/cpufreq/powernow-k8.c
+++ b/drivers/cpufreq/powernow-k8.c
@@ -1265,12 +1265,15 @@ static void __cpuinit powernowk8_cpu_init_on_cpu(void *_init_on_cpu)
 	init_on_cpu->rc = 0;
 }
 
+static const char missing_pss_msg[] =
+	KERN_ERR
+	FW_BUG PFX "No compatible ACPI _PSS objects found.\n"
+	FW_BUG PFX "First, make sure Cool'N'Quiet is enabled in the BIOS.\n"
+	FW_BUG PFX "If that doesn't help, try upgrading your BIOS.\n";
+
 /* per CPU init entry point to the driver */
 static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol)
 {
-	static const char ACPI_PSS_BIOS_BUG_MSG[] =
-		KERN_ERR FW_BUG PFX "No compatible ACPI _PSS objects found.\n"
-		FW_BUG PFX "Try again with latest BIOS.\n";
 	struct powernow_k8_data *data;
 	struct init_on_cpu init_on_cpu;
 	int rc;
@@ -1298,7 +1301,7 @@ static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol)
 		 * an UP version, and is deprecated by AMD.
 		 */
 		if (num_online_cpus() != 1) {
-			printk_once(ACPI_PSS_BIOS_BUG_MSG);
+			printk_once(missing_pss_msg);
 			goto err_out;
 		}
 		if (pol->cpu != 0) {
-- 
1.7.11.rc1

Re: [PATCH] powernow-k8: Fixup missing _PSS objects message

[Rafael J. Wysocki]

On Wednesday, July 18, 2012, Borislav Petkov wrote:
> From: Borislav Petkov <borislav.petkov@amd.com>
> 
> _PSS objects can also be missing if Cool'N'Quiet is disabled in the
> BIOS. Add that to the FW_BUG message for the user to try before updating
> her BIOS. Fix formatting while at it.
> 
> Acked-by: Mark Langsdorf <mark.langsdorf@amd.com>
> Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>

I will take this, but it's kind of too late for v3.6.

Thanks,
Rafael


> ---
>  drivers/cpufreq/powernow-k8.c | 11 +++++++----
>  1 file changed, 7 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/cpufreq/powernow-k8.c b/drivers/cpufreq/powernow-k8.c
> index c0e816468e30..33f17c4a1342 100644
> --- a/drivers/cpufreq/powernow-k8.c
> +++ b/drivers/cpufreq/powernow-k8.c
> @@ -1265,12 +1265,15 @@ static void __cpuinit powernowk8_cpu_init_on_cpu(void *_init_on_cpu)
>  	init_on_cpu->rc = 0;
>  }
>  
> +static const char missing_pss_msg[] =
> +	KERN_ERR
> +	FW_BUG PFX "No compatible ACPI _PSS objects found.\n"
> +	FW_BUG PFX "First, make sure Cool'N'Quiet is enabled in the BIOS.\n"
> +	FW_BUG PFX "If that doesn't help, try upgrading your BIOS.\n";
> +
>  /* per CPU init entry point to the driver */
>  static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol)
>  {
> -	static const char ACPI_PSS_BIOS_BUG_MSG[] =
> -		KERN_ERR FW_BUG PFX "No compatible ACPI _PSS objects found.\n"
> -		FW_BUG PFX "Try again with latest BIOS.\n";
>  	struct powernow_k8_data *data;
>  	struct init_on_cpu init_on_cpu;
>  	int rc;
> @@ -1298,7 +1301,7 @@ static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol)
>  		 * an UP version, and is deprecated by AMD.
>  		 */
>  		if (num_online_cpus() != 1) {
> -			printk_once(ACPI_PSS_BIOS_BUG_MSG);
> +			printk_once(missing_pss_msg);
>  			goto err_out;
>  		}
>  		if (pol->cpu != 0) {
> 

Re: [PATCH] powernow-k8: Fixup missing _PSS objects message

[Borislav Petkov]

On Wed, Jul 18, 2012 at 09:50:51PM +0200, Rafael J. Wysocki wrote:
> On Wednesday, July 18, 2012, Borislav Petkov wrote:
> > From: Borislav Petkov <borislav.petkov@amd.com>
> > 
> > _PSS objects can also be missing if Cool'N'Quiet is disabled in the
> > BIOS. Add that to the FW_BUG message for the user to try before updating
> > her BIOS. Fix formatting while at it.
> > 
> > Acked-by: Mark Langsdorf <mark.langsdorf@amd.com>
> > Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
> 
> I will take this, but it's kind of too late for v3.6.

Yeah, sure, whenever. I found it buried in my mbox since 3.2ish. And
since it is not urgent, you don't have to rush it for 3.6 but send it
upstream whenever you like.

Thanks.

-- 
Regards/Gruss,
Boris.

Advanced Micro Devices GmbH
Einsteinring 24, 85609 Dornach
GM: Alberto Bozzo
Reg: Dornach, Landkreis Muenchen
HRB Nr. 43632 WEEE Registernr: 129 19551

Re: [PATCH] powernow-k8: Fixup missing _PSS objects message

[Rafael J. Wysocki]

On Wednesday, July 18, 2012, Borislav Petkov wrote:
> On Wed, Jul 18, 2012 at 09:50:51PM +0200, Rafael J. Wysocki wrote:
> > On Wednesday, July 18, 2012, Borislav Petkov wrote:
> > > From: Borislav Petkov <borislav.petkov@amd.com>
> > > 
> > > _PSS objects can also be missing if Cool'N'Quiet is disabled in the
> > > BIOS. Add that to the FW_BUG message for the user to try before updating
> > > her BIOS. Fix formatting while at it.
> > > 
> > > Acked-by: Mark Langsdorf <mark.langsdorf@amd.com>
> > > Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
> > 
> > I will take this, but it's kind of too late for v3.6.
> 
> Yeah, sure, whenever. I found it buried in my mbox since 3.2ish. And
> since it is not urgent, you don't have to rush it for 3.6 but send it
> upstream whenever you like.

Applied to the linux-next branch of the linux-pm.git tree as v3.7 material.

Thanks,
Rafael