averello/linux-stable-mirror
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2026-09-22 09:34:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

iio: chemical: scd30: Cleanup initializations and fix sign-extension bug

Browse Source 
commit 60d877910a upstream.

Include linux/bitfield.h for FIELD_GET().

Create new macros for bit manipulation in combination with manual bit
manipulation being replaced with FIELD_GET().

The current variable declaration and initializations are barely readable
and use comma separations across multiple lines. Refactor the
initializations so that mantissa and exp have separate declarations and
sign gets initialized later.

In addition (and due to the nature of the cleanup), fix a sign-extension
bug where, float32 would get bitwise anded with ~BIT(31)
(which is 0xFFFFFFFF7FFFFFFF) which corrupted the exponent.

Fixes: 64b3d8b1b0 ("iio: chemical: scd30: add core driver")
Reported-by: sashiko <sashiko-bot@kernel.org>
Closes: https://sashiko.dev/#/patchset/20260524020309.18618-1-m32285159%40gmail.com
Signed-off-by: Maxwell Doose <m32285159@gmail.com>
Cc: <Stable@vger.kernel.org>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Maxwell Doose
2026-07-24 16:02:40 +02:00
committed by Greg Kroah-Hartman
parent 030fb84816
commit b131f0011d
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/iio/chemical/scd30_core.c
+15 -4
View File
@@ -4,6 +4,8 @@
*
* Copyright (c) 2020 Tomasz Duszynski <tomasz.duszynski@octakon.com>
*/
#include <linux/bitfield.h>
#include <linux/bits.h>
#include <linux/cleanup.h>
#include <linux/completion.h>
@@ -43,6 +45,11 @@
#define SCD30_TEMP_OFFSET_MAX 655360
#define SCD30_EXTRA_TIMEOUT_PER_S 250
/* Floating point arithmetic macros */
#define SCD30_FLOAT_MANTISSA_MSK GENMASK(22, 0)
#define SCD30_FLOAT_EXP_MSK GENMASK(30, 23)
#define SCD30_FLOAT_SIGN_MSK BIT(31)
enum {
SCD30_CONC,
SCD30_TEMP,
@@ -89,10 +96,14 @@ static int scd30_reset(struct scd30_state *state)
/* simplified float to fixed point conversion with a scaling factor of 0.01 */
static int scd30_float_to_fp(int float32)
{
int fraction, shift,
mantissa = float32 & GENMASK(22, 0),
sign = (float32 & BIT(31)) ? -1 : 1,
exp = (float32 & ~BIT(31)) >> 23;
int fraction, shift, sign;
int mantissa = FIELD_GET(SCD30_FLOAT_MANTISSA_MSK, float32);
int exp = FIELD_GET(SCD30_FLOAT_EXP_MSK, float32);
if (float32 & SCD30_FLOAT_SIGN_MSK)
sign = -1;
else
sign = 1;
/* special case 0 */
if (!exp && !mantissa)