From nobody Sun Feb 8 07:59:48 2026 Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) (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 3640378F20 for ; Fri, 26 Dec 2025 20:30:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766781031; cv=none; b=d7O9Jwuj4OYYJphL2p2aTY8BcQKf8p1gBp21gQ2copBZmaJ150+J9dzOCSmtf9Xzi7XhO7rfBp0dsu0HwBhH3rAWhNBNt8aICTOcGUHUbjzDbhJFhVmyKsbqSpCclHJ6YcsxPQUiVAiaQL9nLv8QGZ0S2WYIN94v1MyJhPk99ao= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766781031; c=relaxed/simple; bh=5fyyHulaV/XeElNbem/+Hoap3j8a3zldwxmTl8Ij3Eo=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=gNDh4EOf3oIxCvZVL1x/R5/u3KwHdn0TbQa5IHJUmzKpQF+Ee0x+NeKQU8XT+hsob233eZJu6xzqo4oyIk/2TDbbF07PtPRDOvIR3D65gVrEEuMzt59EB27AJilBBUu5fNhK/ETpw3Q5vCjRIJ/O0EpTrvYuQbspZaKlMM07VCQ= 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=js5Vjz8U; arc=none smtp.client-ip=209.85.221.48 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="js5Vjz8U" Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-430f2ee2f00so3536569f8f.3 for ; Fri, 26 Dec 2025 12:30:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=perenite-com.20230601.gappssmtp.com; s=20230601; t=1766781027; x=1767385827; 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=JBnZiuQkPl6fpr7C0btMJbF7KW3SNie9ZDSdnI6ur98=; b=js5Vjz8U7QRbiIeixfzxBttaS8Zmw+lxR8a7xLqHW/P1YKJ1i+8zJQnd8DLt6xdQVr hNYUnwuwtyuwQOf7HMNDgNKBS1LeDDqZAumiD8wbw8/XpnIVPxyEaqm7V+WyLbwHICw3 DJN2mjAGAf6qx16SqhwpRkoULZRhO/hs+20q/sVZ+I2rANUoBuI/vDitq1dc2NpJRkqc 4n2JyZu33Tgl+yBw4pGCMmWkrNJmVxYkrFZ4a6rLRMHIxfDAgQAnhDdLaHHiQ0fQR3D2 rIxn9Xw3yDNQ3z8wh+Ewn7tux6h3fEZ9eEPSgmKqkkX7dMMOHF0TXopbQA22SeJcNpS9 A8Mg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766781027; x=1767385827; 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=JBnZiuQkPl6fpr7C0btMJbF7KW3SNie9ZDSdnI6ur98=; b=UiJ2q6syp7tT9tUWIlzgYFl63TT71Py4JGzkAj6utSR6t/nXhsRte/5GSCfEYfh9ap V/OJOu6deTaIpSKg+e7AUUMvDGlh+Gdv5UdMNkGZF/nBPlCMbXzNXCh57281eUnKxKL/ mpOYVwBioj4Ok7ovW7PWrXV/BrBgxrmb/+vglkE86U3ozqXP+NiSe95tkrgCuwS89ngI Zb7zJzf5/mMhXZFeejy0gRCR3L45R74ROwzMKxBVPaHg1y60RdXPPXUwgRbdcp/JR8z+ E80bg0Cxoch381EXokXFLDLPgLzn0ZsZU0pZO1T4XXkJDDlUYN+3GiHkhtC4KDXV7Ucq qD1w== X-Forwarded-Encrypted: i=1; AJvYcCUdPdOpTwIQuOxnT7e99f9ahJRn8b0PFPf1geLpZp9bd9fDZyZr68zN3GlULXFleU1YaoU2szL/WbV4L7E=@vger.kernel.org X-Gm-Message-State: AOJu0Yxi2FqsMFJ135k/Mn0VhoN+MWgEKcnHKXPUU47eboMNZZ+wTfNl hg7pnJj8dYMyS4WKsHtXUgBjqPA+jZAKLM7v337jhGDvm8OeyrbpAYtZDtehdm/Xnw== X-Gm-Gg: AY/fxX7bs/p/Dl1h5nfWbmJOj3NRlZC4gspZ2wpapKNOsHx1EtH2uGaQNruSASwzUie 7h8pNU2G9lyk2QYkghuMrdKeyfJDA8zcBmSaDMQP/gC05OOIgHRH3Y0vcnclZqluMW8TPqZCtnO mz5MY2iEYp+dN3UHxf4lcDhhN85w5qYrqCNP/Nl+e93I6dnfr61k2v8Xj5qe9Bs4mWHj/zSfKT7 NVkIify8Yvoc4xvUb1F9D9dmvexMUv/XHFNWlW8RO5oetITA5W7dxJ7cDLDnSbucfZKVltY81M9 GD0T7CJaoGkkTQtl97KNb7z71O8xT64rV5Z0at3IlzU24c2/BDIfGDgh212fvVEEEoCS++gTSJQ pKlIm47UXvVIQCaSDo6AIsYuIHO+hM6YPPSRDCOFdRIzG5OK0++RjpJOvslbWkdOH0uVW38zOT6 GKUVPJD9+4VS1/YxAXYrO7CtXrWH3V X-Google-Smtp-Source: AGHT+IEFHgzBgCk0QlrzGZJ9+1MGR6S5yBFnY0QU/JQye4ItPwxlUJQCnrNWLvphZzEIbPPBRpA2Bg== X-Received: by 2002:a05:6000:611:b0:431:3ba:1188 with SMTP id ffacd0b85a97d-4324e4c70e5mr24282710f8f.3.1766781027306; Fri, 26 Dec 2025 12:30:27 -0800 (PST) Received: from mac.net ([2001:861:8b92:2c50:e0be:8639:3d60:4c9f]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4324ea1aef7sm47337222f8f.7.2025.12.26.12.30.26 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 26 Dec 2025 12:30:26 -0800 (PST) From: "benoit.masson" To: jdelvare@suse.com, linux@roeck-us.net Cc: linux-hwmon@vger.kernel.org, linux-kernel@vger.kernel.org, "benoit.masson" Subject: [PATCH] hwmon: it87: describe per-chip temperature resources Date: Fri, 26 Dec 2025 21:30:21 +0100 Message-ID: <20251226203021.27244-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 | 50 ++++++++++++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 13 deletions(-) diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c index e233aafa8856..f9eca0bc02bc 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,17 @@ 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 =3D data->num_temp_map ?: IT87_TEMP_MAP_DEFAULT; int map; =20 if (IS_ERR(data)) return PTR_ERR(data); =20 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 +1710,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 +1718,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 +3217,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 +3410,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 +3433,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)