| Message ID | 20190729120323.15838-1-colin.king@canonical.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | Zhang Rui |
| Headers | show |
| Series | [V2] drivers: thermal: processor_thermal_device: fix missing bitwise-or operators | expand |
Am 29.07.2019 14:03, schrieb Colin King: > From: Colin Ian King <colin.king@canonical.com> > > The variable val is having the top 8 bits cleared and then the variable is being > re-assinged and setting just the top 8 bits. I believe the intention was bitwise-or > in the top 8 bits. Fix this by replacing the = operators with &= and |= instead. > > Addresses-Coverity: ("Unused value") > Fixes: b0c74b08517e ("drivers: thermal: processor_thermal_device: Export sysfs inteface for TCC offset") > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > > V2: Add in &= operator missing from V1. Doh. > > --- > .../thermal/intel/int340x_thermal/processor_thermal_device.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c b/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c > index 6f6ac6a8e82d..97333fc4be42 100644 > --- a/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c > +++ b/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c > @@ -163,8 +163,8 @@ static int tcc_offset_update(int tcc) > if (err) > return err; > > - val = ~GENMASK_ULL(31, 24); > - val = (tcc & 0xff) << 24; > + val &= ~GENMASK_ULL(31, 24); > + val |= (tcc & 0xff) << 24; > IMHO GENMASK_ULL(31, 24) is a complicated way to say 0xFF000000 In this special case it would be better to use that (or 0xff<<24). just my 2 cents, re, wh > err = wrmsrl_safe(MSR_IA32_TEMPERATURE_TARGET, val); > if (err)
On Mon, 2019-07-29 at 13:03 +0100, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > The variable val is having the top 8 bits cleared and then the > variable is being > re-assinged and setting just the top 8 bits. I believe the intention > was bitwise-or > in the top 8 bits. Fix this by replacing the = operators with &= and > |= instead. > > Addresses-Coverity: ("Unused value") > Fixes: b0c74b08517e ("drivers: thermal: processor_thermal_device: > Export sysfs inteface for TCC offset") > Signed-off-by: Colin Ian King <colin.king@canonical.com> Reviewed-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> > --- > > V2: Add in &= operator missing from V1. Doh. > > --- > .../thermal/intel/int340x_thermal/processor_thermal_device.c | 4 > ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git > a/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c > b/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c > index 6f6ac6a8e82d..97333fc4be42 100644 > --- > a/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c > +++ > b/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c > @@ -163,8 +163,8 @@ static int tcc_offset_update(int tcc) > if (err) > return err; > > - val = ~GENMASK_ULL(31, 24); > - val = (tcc & 0xff) << 24; > + val &= ~GENMASK_ULL(31, 24); > + val |= (tcc & 0xff) << 24; > > err = wrmsrl_safe(MSR_IA32_TEMPERATURE_TARGET, val); > if (err)
On Mon, 2019-07-29 at 14:09 -0700, Srinivas Pandruvada wrote: > On Mon, 2019-07-29 at 13:03 +0100, Colin King wrote: > > From: Colin Ian King <colin.king@canonical.com> > > > > The variable val is having the top 8 bits cleared and then the > > variable is being > > re-assinged and setting just the top 8 bits. I believe the > > intention > > was bitwise-or > > in the top 8 bits. Fix this by replacing the = operators with &= > > and > > > = instead. > > > > Addresses-Coverity: ("Unused value") > > Fixes: b0c74b08517e ("drivers: thermal: processor_thermal_device: > > Export sysfs inteface for TCC offset") > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > > Reviewed-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com > > Hi, Colin, thanks for the fix, as b0c74b08517e ("drivers: thermal: processor_thermal_device: Export sysfs inteface for TCC offset") has not been shipped in upstream yet, I will fold this fix into the original patch directly. thanks, rui > > > --- > > > > V2: Add in &= operator missing from V1. Doh. > > > > --- > > .../thermal/intel/int340x_thermal/processor_thermal_device.c | 4 > > ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git > > a/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c > > b/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c > > index 6f6ac6a8e82d..97333fc4be42 100644 > > --- > > a/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c > > +++ > > b/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c > > @@ -163,8 +163,8 @@ static int tcc_offset_update(int tcc) > > if (err) > > return err; > > > > - val = ~GENMASK_ULL(31, 24); > > - val = (tcc & 0xff) << 24; > > + val &= ~GENMASK_ULL(31, 24); > > + val |= (tcc & 0xff) << 24; > > > > err = wrmsrl_safe(MSR_IA32_TEMPERATURE_TARGET, val); > > if (err) > >
diff --git a/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c b/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c index 6f6ac6a8e82d..97333fc4be42 100644 --- a/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c +++ b/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c @@ -163,8 +163,8 @@ static int tcc_offset_update(int tcc) if (err) return err; - val = ~GENMASK_ULL(31, 24); - val = (tcc & 0xff) << 24; + val &= ~GENMASK_ULL(31, 24); + val |= (tcc & 0xff) << 24; err = wrmsrl_safe(MSR_IA32_TEMPERATURE_TARGET, val); if (err)