| Message ID | 20210902174155.7365-2-nchatrad@amd.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/3] x86/amd_nb: Add support for HSMP mailbox access | expand |
On Thu, Sep 02, 2021 at 11:11:54PM +0530, Naveen Krishna Chatradhi wrote: > From: suma hegde <suma.hegde@amd.com> > > Commit id "b00647c46c9d7f6ee1ff6aaf335906101755e614", > adds reporting current and voltage to k10temp.c > > The commit id "0a4e668b5d52eed8026f5d717196b02b55fb2dc6", > removed reporting current and voltage from k10temp.c > > The curr and in(voltage) entries are not removed from > "k10temp_info" structure. Removing those residue entries. > while at it, update k10temp driver documentation > > Signed-off-by: suma hegde <suma.hegde@amd.com> > Cc: Guenter Roeck <linux@roeck-us.net> Applied. > --- > This is an unrelated change, should we submit this seperately or drop this for now? > Guess the above answers your question. Thanks, Guenter > Documentation/hwmon/k10temp.rst | 17 ----------------- > drivers/hwmon/k10temp.c | 6 ------ > 2 files changed, 23 deletions(-) > > diff --git a/Documentation/hwmon/k10temp.rst b/Documentation/hwmon/k10temp.rst > index 8557e26281c3..91b99adc6c48 100644 > --- a/Documentation/hwmon/k10temp.rst > +++ b/Documentation/hwmon/k10temp.rst > @@ -132,20 +132,3 @@ On Family 17h and Family 18h CPUs, additional temperature sensors may report > Core Complex Die (CCD) temperatures. Up to 8 such temperatures are reported > as temp{3..10}_input, labeled Tccd{1..8}. Actual support depends on the CPU > variant. > - > -Various Family 17h and 18h CPUs report voltage and current telemetry > -information. The following attributes may be reported. > - > -Attribute Label Description > -=============== ======= ================ > -in0_input Vcore Core voltage > -in1_input Vsoc SoC voltage > -curr1_input Icore Core current > -curr2_input Isoc SoC current > -=============== ======= ================ > - > -Current values are raw (unscaled) as reported by the CPU. Core current is > -reported as multiples of 1A / LSB. SoC is reported as multiples of 0.25A > -/ LSB. The real current is board specific. Reported currents should be seen > -as rough guidance, and should be scaled using sensors3.conf as appropriate > -for a given board. > diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c > index 38bc35ac8135..3618a924e78e 100644 > --- a/drivers/hwmon/k10temp.c > +++ b/drivers/hwmon/k10temp.c > @@ -362,12 +362,6 @@ static const struct hwmon_channel_info *k10temp_info[] = { > HWMON_T_INPUT | HWMON_T_LABEL, > HWMON_T_INPUT | HWMON_T_LABEL, > HWMON_T_INPUT | HWMON_T_LABEL), > - HWMON_CHANNEL_INFO(in, > - HWMON_I_INPUT | HWMON_I_LABEL, > - HWMON_I_INPUT | HWMON_I_LABEL), > - HWMON_CHANNEL_INFO(curr, > - HWMON_C_INPUT | HWMON_C_LABEL, > - HWMON_C_INPUT | HWMON_C_LABEL), > NULL > }; >
diff --git a/Documentation/hwmon/k10temp.rst b/Documentation/hwmon/k10temp.rst index 8557e26281c3..91b99adc6c48 100644 --- a/Documentation/hwmon/k10temp.rst +++ b/Documentation/hwmon/k10temp.rst @@ -132,20 +132,3 @@ On Family 17h and Family 18h CPUs, additional temperature sensors may report Core Complex Die (CCD) temperatures. Up to 8 such temperatures are reported as temp{3..10}_input, labeled Tccd{1..8}. Actual support depends on the CPU variant. - -Various Family 17h and 18h CPUs report voltage and current telemetry -information. The following attributes may be reported. - -Attribute Label Description -=============== ======= ================ -in0_input Vcore Core voltage -in1_input Vsoc SoC voltage -curr1_input Icore Core current -curr2_input Isoc SoC current -=============== ======= ================ - -Current values are raw (unscaled) as reported by the CPU. Core current is -reported as multiples of 1A / LSB. SoC is reported as multiples of 0.25A -/ LSB. The real current is board specific. Reported currents should be seen -as rough guidance, and should be scaled using sensors3.conf as appropriate -for a given board. diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c index 38bc35ac8135..3618a924e78e 100644 --- a/drivers/hwmon/k10temp.c +++ b/drivers/hwmon/k10temp.c @@ -362,12 +362,6 @@ static const struct hwmon_channel_info *k10temp_info[] = { HWMON_T_INPUT | HWMON_T_LABEL, HWMON_T_INPUT | HWMON_T_LABEL, HWMON_T_INPUT | HWMON_T_LABEL), - HWMON_CHANNEL_INFO(in, - HWMON_I_INPUT | HWMON_I_LABEL, - HWMON_I_INPUT | HWMON_I_LABEL), - HWMON_CHANNEL_INFO(curr, - HWMON_C_INPUT | HWMON_C_LABEL, - HWMON_C_INPUT | HWMON_C_LABEL), NULL };