All of lore.kernel.org
 help / color / mirror / Atom feed
From: Huang Rui <ray.huang@amd.com>
To: Gioh Kim <gi-oh.kim@profitbricks.com>
Cc: linux@roeck-us.net, bp@alien8.de, lm-sensors@lm-sensors.org,
	linux-kernel@vger.kernel.org
Subject: Re: [lm-sensors] [PATCH] hwmon: (fam15h_power) Add bit masking for tdp_limit
Date: Thu, 28 Jan 2016 02:20:49 +0000	[thread overview]
Message-ID: <20160128022048.GA26655@hr-amur2> (raw)
In-Reply-To: <1453892529-17120-1-git-send-email-gi-oh.kim@profitbricks.com>

On Wed, Jan 27, 2016 at 12:02:09PM +0100, Gioh Kim wrote:
> Add bit masking to read ApmTdpLimit precisely
> 
> Signed-off-by: Gioh Kim <gi-oh.kim@profitbricks.com>

Looks good for me too.

Acked-by: Huang Rui <ray.huang@amd.com>

> ---
>  drivers/hwmon/fam15h_power.c | 10 +++++++++-
>  1 file changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/hwmon/fam15h_power.c b/drivers/hwmon/fam15h_power.c
> index f77eb97..4f695d8 100644
> --- a/drivers/hwmon/fam15h_power.c
> +++ b/drivers/hwmon/fam15h_power.c
> @@ -90,7 +90,15 @@ static ssize_t show_power(struct device *dev,
>  	pci_bus_read_config_dword(f4->bus, PCI_DEVFN(PCI_SLOT(f4->devfn), 5),
>  				  REG_TDP_LIMIT3, &val);
>  
> -	tdp_limit = val >> 16;
> +	/*
> +	 * On Carrizo and later platforms, ApmTdpLimit bit field
> +	 * is extended to 16:31 from 16:28.
> +	 */
> +	if (boot_cpu_data.x86 = 0x15 && boot_cpu_data.x86_model >= 0x60)
> +		tdp_limit = val >> 16;
> +	else
> +		tdp_limit = (val >> 16) & 0x1fff;
> +
>  	curr_pwr_watts = ((u64)(tdp_limit +
>  				data->base_tdp)) << running_avg_range;
>  	curr_pwr_watts -= running_avg_capture;
> -- 
> 2.5.0
> 

_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

WARNING: multiple messages have this Message-ID (diff)
From: Huang Rui <ray.huang@amd.com>
To: Gioh Kim <gi-oh.kim@profitbricks.com>
Cc: <linux@roeck-us.net>, <bp@alien8.de>, <lm-sensors@lm-sensors.org>,
	<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] hwmon: (fam15h_power) Add bit masking for tdp_limit
Date: Thu, 28 Jan 2016 10:20:49 +0800	[thread overview]
Message-ID: <20160128022048.GA26655@hr-amur2> (raw)
In-Reply-To: <1453892529-17120-1-git-send-email-gi-oh.kim@profitbricks.com>

On Wed, Jan 27, 2016 at 12:02:09PM +0100, Gioh Kim wrote:
> Add bit masking to read ApmTdpLimit precisely
> 
> Signed-off-by: Gioh Kim <gi-oh.kim@profitbricks.com>

Looks good for me too.

Acked-by: Huang Rui <ray.huang@amd.com>

> ---
>  drivers/hwmon/fam15h_power.c | 10 +++++++++-
>  1 file changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/hwmon/fam15h_power.c b/drivers/hwmon/fam15h_power.c
> index f77eb97..4f695d8 100644
> --- a/drivers/hwmon/fam15h_power.c
> +++ b/drivers/hwmon/fam15h_power.c
> @@ -90,7 +90,15 @@ static ssize_t show_power(struct device *dev,
>  	pci_bus_read_config_dword(f4->bus, PCI_DEVFN(PCI_SLOT(f4->devfn), 5),
>  				  REG_TDP_LIMIT3, &val);
>  
> -	tdp_limit = val >> 16;
> +	/*
> +	 * On Carrizo and later platforms, ApmTdpLimit bit field
> +	 * is extended to 16:31 from 16:28.
> +	 */
> +	if (boot_cpu_data.x86 == 0x15 && boot_cpu_data.x86_model >= 0x60)
> +		tdp_limit = val >> 16;
> +	else
> +		tdp_limit = (val >> 16) & 0x1fff;
> +
>  	curr_pwr_watts = ((u64)(tdp_limit +
>  				data->base_tdp)) << running_avg_range;
>  	curr_pwr_watts -= running_avg_capture;
> -- 
> 2.5.0
> 

  parent reply	other threads:[~2016-01-28  2:20 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-27 11:02 [lm-sensors] [PATCH] hwmon: (fam15h_power) Add bit masking for tdp_limit Gioh Kim
2016-01-27 11:02 ` Gioh Kim
2016-01-27 11:12 ` [lm-sensors] " Borislav Petkov
2016-01-27 11:12   ` Borislav Petkov
2016-01-28  2:25   ` [lm-sensors] " Huang Rui
2016-01-28  2:25     ` Huang Rui
2016-01-28  9:02     ` [lm-sensors] " Gi-Oh Kim
2016-01-28  9:02       ` Gi-Oh Kim
2016-01-28  2:20 ` Huang Rui [this message]
2016-01-28  2:20   ` Huang Rui
2016-01-28  2:51 ` [lm-sensors] " Guenter Roeck
2016-01-28  2:51   ` Guenter Roeck

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160128022048.GA26655@hr-amur2 \
    --to=ray.huang@amd.com \
    --cc=bp@alien8.de \
    --cc=gi-oh.kim@profitbricks.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@roeck-us.net \
    --cc=lm-sensors@lm-sensors.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.