From nobody Sat Feb 7 17:19:41 2026 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5E2BB3358DF for ; Fri, 9 Jan 2026 10:15:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767953718; cv=none; b=iNoI3t76u+FHkFg0eqB0Wcc5eyvDbAc4fI1L6NpziqrRTC1aqArbnCFdvAkvm3OAIGaU/hLGAUFY4gIyRUeAf7yeL2TSYDEb5d+4EeCjyqVcOkLWkaI4pSBybEZEh9HxB5pDAL9N/RVbLr3rVUKO1HHSPDK98ejemkoLjT2vY/I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767953718; c=relaxed/simple; bh=pMtwfbUJq76AR+TVReYLsL2lZ8fFtnfZ1WIqDgsZpJ8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=bIE+bD0RPhan0A97LB7rtNVWZ+HSIwNUtprb1X1GX7QrBJYFXS1MfAX1zTbxoTvdsSd3FH7IDVaM9Q+ix8gc2/ZMOYBvSZ3NPyEkBETREyQei81CS4bKcqoTopSiytOYHFOMF52k9iaVka6Qfz9NV9fhkQC4xIQH+8ibmeoLfsM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=perenite.com; spf=pass smtp.mailfrom=perenite.com; dkim=pass (2048-bit key) header.d=perenite-com.20230601.gappssmtp.com header.i=@perenite-com.20230601.gappssmtp.com header.b=cm/YjqNS; arc=none smtp.client-ip=209.85.128.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=perenite.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=perenite.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=perenite-com.20230601.gappssmtp.com header.i=@perenite-com.20230601.gappssmtp.com header.b="cm/YjqNS" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-4775e891b5eso19351945e9.2 for ; Fri, 09 Jan 2026 02:15:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=perenite-com.20230601.gappssmtp.com; s=20230601; t=1767953715; x=1768558515; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=N8QNXkiirNoatIlS4pVluyk9bNvPV2KQdVexmCeWJQ8=; b=cm/YjqNSbzQFDs0eh/A9TfNcnjqUYMk4y7YpEQCyRGBm/Ms7Hx7uEjUkRcvMnBIvNm SeKkW58Cogve2RYkfeug78gMz45JhIDGQRQymPvLGE/wcWlpb4KIxTmkvQy79hyb7osF UenHokjeCShL6fOhOG3rAk0mpddFY2O8X+MgcFraXXQJMYAW2C19qFTj3Lxc1itkMtAA dwmaOQ0QyGqfS11DFTVKcmOPWwM27yJwEisSC+V0WUiFoTZO2FcHDaSI11TetzQxx/xA WSr4gIoj8vHhcTNxTFb3jQiIK2ppKY6wrJHhcpTHwb54bXMBMAHkKvrvvX/PtE3Nex+o CDKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767953715; x=1768558515; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=N8QNXkiirNoatIlS4pVluyk9bNvPV2KQdVexmCeWJQ8=; b=a3WoqC2KYj+JiZJ0UrFwhRL5H5oEol8WTHx+lIN6RelLNm0OS/kOOomomp2pa1Nlbb DcBIIlUj3G7rT4kcdKqgGZHvO479gQGh3DsPaBwjTASkSW2nrAWiffBcIHp3NP9/NA5B obr3+nbYPMY4+lgt0AS5pFvtBrKy6zwO7KzmmgUlkiqGkBA7WSjG3vyVooLZCLizNGqz eLjwxR3jje5UvllTFW7ZMZrzz+kRN5pfxYx2b3zPz3CCW6PWWAnFOmK94QEe3vfK3VA3 SnAeXnlvU/ggyaSu3bDD9JW/cBjm3NuVgmu2tiRn/fJOad57YIhwNGa9Fr7OO8ovj1gm wPYw== X-Forwarded-Encrypted: i=1; AJvYcCVscDrtf+GBRjcCt7oq17Unz2HXlOpEUypVcGgC8nVs0eknyog3I44MeyrAyVimJuX8P7gxCS3eGnrd6WE=@vger.kernel.org X-Gm-Message-State: AOJu0YzbLwtMm0yyTvnntmaN1vg0ekorHug4Mb5A+MYNNgk9yOoOaVps t2tutMXfRcahw1eWkLbbHRq8XE7hQgUYv5N1J2uEEcPg2eHlwKk+fV/9cqr/LXOFPQ== X-Gm-Gg: AY/fxX4Ky3/zWFUBEIcWImsdMe4g/QSsGGTSL7CGbYo7ph3wOuSIPWrAmgAzFxkIc5t BIh6OPC8VoYvunIXSADkOL8c1TOT/3/NtE9CPSzPG/Aq7yiImMwQJGof6y4k5v0r+RBqa+VzESP xBiMJZxMVzU9NFII5sLxroKJ9/wGdKPBjOnsusJp3WqqC5omn1uLhbqzz8jCrAo3VLQYX+5AIyS TstceHWgoSYDTtcB5CA450DAnGunKgnMYvC93K/QT8s17skG16oUP8YYZeHylRco1Y2sU3SXFIo EsqNUwYrfBg5v6v/hBcFtayu9FXGLcsm6HksmXu2EDLlRBk6vFgEJ3cj2lss3OSR+x0GCpEyehx vW3zi1+7kMho08Vq7ajBPIebBIOTJ20L7//IgTaO+SV+1/Doq/RWkj7xsjyOpOSZsVSPgzulRM3 OQ9UPZ55aTlMrdoZLrhBjzXZ32JgEY X-Google-Smtp-Source: AGHT+IGls522NzUZDA4HDfsFe0rrgJNe6t3m4gc2fbplejDX06fyifOJbSg0hQzDtjNonJPwxuP9Vg== X-Received: by 2002:a05:600c:1392:b0:477:6d96:b3c8 with SMTP id 5b1f17b1804b1-47d84b34673mr109204885e9.23.1767953714079; Fri, 09 Jan 2026 02:15:14 -0800 (PST) Received: from mac.net ([2001:861:8b92:2c50:6cf2:f0aa:7bc6:15fc]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47d7f695956sm205125565e9.6.2026.01.09.02.15.12 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 09 Jan 2026 02:15:13 -0800 (PST) From: "benoit.masson" To: Jean Delvare Cc: Guenter Roeck , linux-hwmon@vger.kernel.org (open list:IT87 HARDWARE MONITORING DRIVER), linux-kernel@vger.kernel.org (open list), "benoit.masson" Subject: [PATCH V2] hwmon: it87: describe per-chip temperature resources Date: Fri, 9 Jan 2026 11:15:04 +0100 Message-ID: <20260109101504.47515-1-yahoo@perenite.com> X-Mailer: git-send-email 2.50.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Signed-off-by: benoit.masson --- drivers/hwmon/it87.c | 51 +++++++++++++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 13 deletions(-) diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c index e233aafa8856..ec5b1668dd7b 100644 --- a/drivers/hwmon/it87.c +++ b/drivers/hwmon/it87.c @@ -54,6 +54,7 @@ #include #include #include +#include #include #include #include @@ -279,8 +280,9 @@ static const u8 IT87_REG_AUTO_BASE[] =3D { 0x60, 0x68, = 0x70, 0x78, 0xa0, 0xa8 }; #define NUM_VIN ARRAY_SIZE(IT87_REG_VIN) #define NUM_VIN_LIMIT 8 #define NUM_TEMP 6 -#define NUM_TEMP_OFFSET ARRAY_SIZE(IT87_REG_TEMP_OFFSET) -#define NUM_TEMP_LIMIT 3 +#define IT87_TEMP_OFFSET_MAX ARRAY_SIZE(IT87_REG_TEMP_OFFSET) +#define IT87_TEMP_LIMIT_DEFAULT 3 +#define IT87_TEMP_MAP_DEFAULT 3 #define NUM_FAN ARRAY_SIZE(IT87_REG_FAN) #define NUM_FAN_DIV 3 #define NUM_PWM ARRAY_SIZE(IT87_REG_PWM) @@ -290,6 +292,9 @@ struct it87_devices { const char *name; const char * const model; u32 features; + u8 num_temp_limit; + u8 num_temp_offset; + u8 num_temp_map; u8 peci_mask; u8 old_peci_mask; u8 smbus_bitmap; /* SMBus enable bits in extra config register */ @@ -578,6 +583,9 @@ struct it87_data { int sioaddr; enum chips type; u32 features; + u8 num_temp_limit; + u8 num_temp_offset; + u8 num_temp_map; u8 peci_mask; u8 old_peci_mask; =20 @@ -926,12 +934,13 @@ static struct it87_data *it87_update_device(struct de= vice *dev) data->temp[i][0] =3D it87_read_value(data, IT87_REG_TEMP(i)); =20 - if (has_temp_offset(data) && i < NUM_TEMP_OFFSET) + if (has_temp_offset(data) && + i < data->num_temp_offset) data->temp[i][3] =3D it87_read_value(data, IT87_REG_TEMP_OFFSET[i]); =20 - if (i >=3D NUM_TEMP_LIMIT) + if (i >=3D data->num_temp_limit) continue; =20 data->temp[i][1] =3D @@ -1679,16 +1688,18 @@ static ssize_t show_pwm_temp_map(struct device *dev, struct sensor_device_attribute *sensor_attr =3D to_sensor_dev_attr(attr); struct it87_data *data =3D it87_update_device(dev); int nr =3D sensor_attr->index; + u8 num_map; int map; =20 if (IS_ERR(data)) return PTR_ERR(data); =20 + num_map =3D data->num_temp_map ?: IT87_TEMP_MAP_DEFAULT; map =3D data->pwm_temp_map[nr]; - if (map >=3D 3) + if (map >=3D num_map) map =3D 0; /* Should never happen */ - if (nr >=3D 3) /* pwm channels 3..6 map to temp4..6 */ - map +=3D 3; + if (nr >=3D num_map) /* pwm channels 3..6 map to temp4..6 */ + map +=3D num_map; =20 return sprintf(buf, "%d\n", (int)BIT(map)); } @@ -1700,6 +1711,7 @@ static ssize_t set_pwm_temp_map(struct device *dev, struct sensor_device_attribute *sensor_attr =3D to_sensor_dev_attr(attr); struct it87_data *data =3D dev_get_drvdata(dev); int nr =3D sensor_attr->index; + u8 num_map =3D data->num_temp_map ?: IT87_TEMP_MAP_DEFAULT; long val; int err; u8 reg; @@ -1707,8 +1719,8 @@ static ssize_t set_pwm_temp_map(struct device *dev, if (kstrtol(buf, 10, &val) < 0) return -EINVAL; =20 - if (nr >=3D 3) - val -=3D 3; + if (nr >=3D num_map) + val -=3D num_map; =20 switch (val) { case BIT(0): @@ -3206,7 +3218,7 @@ static void it87_check_limit_regs(struct it87_data *d= ata) if (reg =3D=3D 0xff) it87_write_value(data, IT87_REG_VIN_MIN(i), 0); } - for (i =3D 0; i < NUM_TEMP_LIMIT; i++) { + for (i =3D 0; i < data->num_temp_limit; i++) { reg =3D it87_read_value(data, IT87_REG_TEMP_HIGH(i)); if (reg =3D=3D 0xff) it87_write_value(data, IT87_REG_TEMP_HIGH(i), 127); @@ -3399,6 +3411,7 @@ static int it87_probe(struct platform_device *pdev) struct resource *res; struct device *dev =3D &pdev->dev; struct it87_sio_data *sio_data =3D dev_get_platdata(dev); + const struct it87_devices *chip; int enable_pwm_interface; struct device *hwmon_dev; int err; @@ -3421,9 +3434,21 @@ static int it87_probe(struct platform_device *pdev) data->type =3D sio_data->type; data->smbus_bitmap =3D sio_data->smbus_bitmap; data->ec_special_config =3D sio_data->ec_special_config; - data->features =3D it87_devices[sio_data->type].features; - data->peci_mask =3D it87_devices[sio_data->type].peci_mask; - data->old_peci_mask =3D it87_devices[sio_data->type].old_peci_mask; + chip =3D &it87_devices[sio_data->type]; + data->features =3D chip->features; + data->peci_mask =3D chip->peci_mask; + data->old_peci_mask =3D chip->old_peci_mask; + data->num_temp_limit =3D chip->num_temp_limit ? + chip->num_temp_limit : IT87_TEMP_LIMIT_DEFAULT; + if (chip->num_temp_offset) + data->num_temp_offset =3D min(chip->num_temp_offset, + (u8)IT87_TEMP_OFFSET_MAX); + else if (has_temp_offset(data)) + data->num_temp_offset =3D IT87_TEMP_OFFSET_MAX; + else + data->num_temp_offset =3D 0; + data->num_temp_map =3D chip->num_temp_map ? + chip->num_temp_map : IT87_TEMP_MAP_DEFAULT; /* * IT8705F Datasheet 0.4.1, 3h =3D=3D Version G. * IT8712F Datasheet 0.9.1, section 8.3.5 indicates 8h =3D=3D Version J. --=20 2.50.1 (Apple Git-155)