From patchwork Sun Jul 28 14:37:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 13744011 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) (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 0B665FBF0 for ; Sun, 28 Jul 2024 14:37:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722177443; cv=none; b=K58Xc5hG7vlbvJG/QEq4qC/zvGi/0EtwIyuspGkw7qovgaEvmviXKhLIqvgMSfuG5jywqrjcj/jd07qUdRhW1nn/wbFXT/O+AHhTSgLwh02QyD2fi1Dan30EmhbiEFK7RoOKXRjepLQf7OsEhRC22RsQ6b4JcGgyd61olQEaUqY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722177443; c=relaxed/simple; bh=zGK/a2SB57EiF3yNEYfU2LUyA1Ey1YNtte8R9rBGVR0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=DOytr0WtzNS9a45Vxt6uvn4c53eMKErtjEjrOZEPVXyIuKBIWuwuY7iwq0wMUtSJdTJx3LQpDsPfMMmMhLRwCZtiSDpc4pMQy5nnM4UEVLGUKhmDBqKbfj+W4WVu+xRQFIwiiFm8jxNerqHGdrR72b2dr3/OLrIvVVnakvLlDzk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=roeck-us.net; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=MKKPvET8; arc=none smtp.client-ip=209.85.214.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=roeck-us.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="MKKPvET8" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-1fc66fc35f2so13492655ad.0 for ; Sun, 28 Jul 2024 07:37:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722177441; x=1722782241; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=OPQkpIPphZ/YHUYU4wZPqI4h9ZJ1ZAsztINnvCIUwbQ=; b=MKKPvET8FvPsOmyZDJVBBiec6c+FFImXUBdFEaFSRRxRyB0nFiYmnrsG5jrwx/QCwi 2u1ta0Y9anw6do38Ewz0/DTSyIdh04+k2xmjq8Vy5NPoOjDb1kDpVwpa1jgaEzrB+CmQ K0oifJdIccJHkbZ+Ngx8xEgLf0i/wJcDI4GkvcMc06fwK5D5r4euWipEEzJlEdP/ABKO lSvNzNBpNpMV+wDwOjtTz8lrdyZbik6FI/Q7yXN2mmulgKpWr8gNLtI6QhPqCdVNtoZz VDHzNgoUt249QIlv5VBkBga0lucQ3pyzuz1AoJq41B3Zrlt7G4h7TmHuBxngYw4vAwFA rfow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722177441; x=1722782241; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=OPQkpIPphZ/YHUYU4wZPqI4h9ZJ1ZAsztINnvCIUwbQ=; b=a4zInnqcXY1M2ag+MdvivdfVTl8y3DBs4ZRdqauS1/KoB5hH6p32uZG8sqwbZEra60 FC/czg9nlhp2yzsdPANttKAZT+ibi2D9LCEKDmDpBIkkaWoQENXaI/nVeJzcnAUAsFpG uqIlu0WliqUP1MA9QRpnONezjpSUoxGMjd6tmK205tx8ObF3bsW3fwLutA2UmprwX6Vy 3HMvvgiWc/w/M4Cn6oU0v78eSAoIk/T5Rc9ITvO/ln2wTty+NV81vTIUUgrTDe2sdnct ZABvwV8GbFja5AfhAZFEbM3vXXH4Yet23WHX2XyVxYIV2ya6G4MSsd/yT+UQQR0kuzXR UnPQ== X-Gm-Message-State: AOJu0YxeXTIzM0/5M2/OuhFbB/eTT9BkvIjE+NCIY1Kapvrf7MRuHkhj j7dGtDI+gwHoU3pNxRQHDZ28+Ag0rGL1ppJSHYDsPljXAd1m2NayCsvPRA== X-Google-Smtp-Source: AGHT+IHR06uXAD0zF/mnMuvfJoExKf67eKbwvDB1fZwNzUdW47V1wjPJakUWGgaKIZM3v9aUxhBBiw== X-Received: by 2002:a17:902:dacc:b0:1fd:d4c4:362a with SMTP id d9443c01a7336-1ff04b01cccmr80405625ad.24.1722177440676; Sun, 28 Jul 2024 07:37:20 -0700 (PDT) Received: from server.roeck-us.net ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1fed7c85ca8sm65896275ad.49.2024.07.28.07.37.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Jul 2024 07:37:20 -0700 (PDT) Sender: Guenter Roeck From: Guenter Roeck To: Hardware Monitoring Cc: Tzung-Bi Shih , Guenter Roeck Subject: [PATCH v2 1/7] hwmon: (max1619) Clamp temperature range when writing limits Date: Sun, 28 Jul 2024 07:37:09 -0700 Message-Id: <20240728143715.1585816-2-linux@roeck-us.net> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240728143715.1585816-1-linux@roeck-us.net> References: <20240728143715.1585816-1-linux@roeck-us.net> Precedence: bulk X-Mailing-List: linux-hwmon@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Module test code reports underflows when writing sensor limits. temp2_min: Suspected underflow: [min=-77000, read 101000, written -2147483648] temp2_max: Suspected underflow: [min=-77000, read 101000, written -2147483648] temp2_crit: Suspected underflow: [min=-77000, read 101000, written -2147483648] Clamp temperature ranges when writing limits to fix the problem. While at it, use sign_extend32() when reading temperatures to make the code easier to understand. Reviewed-by: Tzung-Bi Shih Signed-off-by: Guenter Roeck --- v2: Added Reviewed-by: tag drivers/hwmon/max1619.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/drivers/hwmon/max1619.c b/drivers/hwmon/max1619.c index a89a519cf5d9..464f4c838394 100644 --- a/drivers/hwmon/max1619.c +++ b/drivers/hwmon/max1619.c @@ -52,16 +52,6 @@ static const unsigned short normal_i2c[] = { * Conversions */ -static int temp_from_reg(int val) -{ - return (val & 0x80 ? val-0x100 : val) * 1000; -} - -static int temp_to_reg(int val) -{ - return (val < 0 ? val+0x100*1000 : val) / 1000; -} - enum temp_index { t_input1 = 0, t_input2, @@ -142,7 +132,7 @@ static ssize_t temp_show(struct device *dev, struct device_attribute *devattr, struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); struct max1619_data *data = max1619_update_device(dev); - return sprintf(buf, "%d\n", temp_from_reg(data->temp[attr->index])); + return sprintf(buf, "%d\n", sign_extend(data->temp[attr->index], 7) * 1000); } static ssize_t temp_store(struct device *dev, @@ -158,7 +148,7 @@ static ssize_t temp_store(struct device *dev, return err; mutex_lock(&data->update_lock); - data->temp[attr->index] = temp_to_reg(val); + data->temp[attr->index] = DIV_ROUND_CLOSEST(clamp_val(val, -128000, 127000), 1000); i2c_smbus_write_byte_data(client, regs_write[attr->index], data->temp[attr->index]); mutex_unlock(&data->update_lock); From patchwork Sun Jul 28 14:37:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 13744012 Received: from mail-oo1-f50.google.com (mail-oo1-f50.google.com [209.85.161.50]) (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 F00A8FBF0 for ; Sun, 28 Jul 2024 14:37:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722177445; cv=none; b=XFcbXsRb1iQgYmCSeFVGE15ft4W0Uh5akTWmAayUG042GAogrtU0I/Dk+m88XRmyQsin0jfwkv9WlisSvHGWO1RszwNdTBTEk/Swi64/l93ZjTfj97MNheCJ7g9TMWEhYa6OfRQyUDbpVLidCN8L0JjklfbKSTyLRf92cP+RfsE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722177445; c=relaxed/simple; bh=arPK8z4osZOJ66+zmf2iDu5FU8JX6t/XcMoQsOaJf7M=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=pJrSOjzLFgY8ptovQBT3bdRQ4v1TbHbs4jvV7LCUE65nrZh24ygyAFo1t0ANDEuAgrbs0x4TXT/ugrp8xpAVCmDX/4hILvlkeZiU5zzyr5BOxL/Qw/uNeveEj1QEQJQiCTGX7U6P7Tjzu4v6Gqe7BgSZkbb7G/fyDI8aF5kQxrs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=roeck-us.net; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=H529uApO; arc=none smtp.client-ip=209.85.161.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=roeck-us.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="H529uApO" Received: by mail-oo1-f50.google.com with SMTP id 006d021491bc7-5d5b850d969so1707746eaf.0 for ; Sun, 28 Jul 2024 07:37:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722177442; x=1722782242; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=wjC7NxrTuEs6NU7ZGsMPtI2pd8QR0ZFJN3vXQzYe3qs=; b=H529uApOd3iG/JpduyE7e+iGqiFeyDeDeY8A0VvDhg+6Ry9lfm12GTnS5Kw4EeL4VM CVmno5OvaXQ0G7rs7phCHSAHnxWbVPJfidInvQ/EKv5UWZntPfsD6/QGJgk8a9WpbZYq WWtmrzLCZx8fLP5NywXwU8Sp1led/JMCUWTfiTAE5nWfEofhpSLPxOQ/cilbed3rUHWJ kWfubdwKPhTLOoFYpAFiYeep5TzL66EbBXRpO1uE6qwrwZLxLNvw6G9kUM1iI8XzYiEb CxepNyB5Bd7yW/Zo2+MCSEBMi17yAArdWdQA1PmghqTsUC/TOF8FvS6tcT6rLA7IBPXH Bp2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722177442; x=1722782242; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=wjC7NxrTuEs6NU7ZGsMPtI2pd8QR0ZFJN3vXQzYe3qs=; b=NQk9t0uyb0FTvxwq966fQypy9VnAASoYoObA5IrW6FcVCxscHKiomjd6wWp+ntUtS0 zTCAFZkWGOlm8IFTcYV+qwnAN8fqI4Ew+HPE6EVFy5YFqpuIYBRTRxfigMYSb06cWV4a smhouCyako3G2xkiUH1lRij93JpNP9ACspliqdMecdaXmebKpIxWR/P7QR9at7ICxiD7 pDrfBB5SRAZPywJ25KbB/rdpgPc4YZVKI1LePAbpxoSDGUgOd2NHxqRHDccgLrxk/4Zp WBXQs/y4/GekWVbqR12G54x8qzPMuP+Gj69Kb1LS5JLtJUR6u/1+NO8x7Y/R6PcZBslk 6EBw== X-Gm-Message-State: AOJu0YwjtVxwhgOKO/jsjgkiMUK/jfzwnP1Sd8DeZLRlysk287VLF843 kjq9UJGDoOFJDHjG/oduUC0WA8vo7vS4V2iasYu7Dm9y2FE9z4TPqAtBdg== X-Google-Smtp-Source: AGHT+IGEk9kmiTEm2GTQcs8kGRQSdh5xbVv55V20rom0jvqDr81nQ0iyOakYXCYU3Tcq42rWqZLBRg== X-Received: by 2002:a05:6358:7245:b0:1aa:c9ba:4336 with SMTP id e5c5f4694b2df-1adb2423087mr577089455d.3.1722177442509; Sun, 28 Jul 2024 07:37:22 -0700 (PDT) Received: from server.roeck-us.net ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7a9f817f5a2sm4841733a12.24.2024.07.28.07.37.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Jul 2024 07:37:21 -0700 (PDT) Sender: Guenter Roeck From: Guenter Roeck To: Hardware Monitoring Cc: Tzung-Bi Shih , Guenter Roeck Subject: [PATCH v2 2/7] hwmon: (max1619) Reorder include files to alphabetic order Date: Sun, 28 Jul 2024 07:37:10 -0700 Message-Id: <20240728143715.1585816-3-linux@roeck-us.net> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240728143715.1585816-1-linux@roeck-us.net> References: <20240728143715.1585816-1-linux@roeck-us.net> Precedence: bulk X-Mailing-List: linux-hwmon@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Simplify maintenance by reordering include files to alphabetic order. Reviewed-by: Tzung-Bi Shih Signed-off-by: Guenter Roeck --- v2: Added Reviewed-by: tag drivers/hwmon/max1619.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/hwmon/max1619.c b/drivers/hwmon/max1619.c index 464f4c838394..8eb7d04bd2f5 100644 --- a/drivers/hwmon/max1619.c +++ b/drivers/hwmon/max1619.c @@ -12,15 +12,15 @@ * http://pdfserv.maxim-ic.com/en/ds/MAX1619.pdf */ -#include -#include -#include -#include -#include +#include #include #include -#include +#include +#include +#include +#include #include +#include #include static const unsigned short normal_i2c[] = { From patchwork Sun Jul 28 14:37:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 13744013 Received: from mail-oi1-f171.google.com (mail-oi1-f171.google.com [209.85.167.171]) (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 8D7E043ABC for ; Sun, 28 Jul 2024 14:37:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722177447; cv=none; b=EIAunkQm5h2An7BbVxjz1p2CjMQIBp/NPX/vKIVgva3jqRi7GDgBsVPks8MN9Ms67SZ33Jzl3gHTNGytKk6+UZ4lb1JTEnJqpf/uYRXlWchCdTy8iwy7KoXcJKpQVZoiJXtq6O46O4BgKOt+KWygSrqp4YFM8iXfMPvW0eiPalc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722177447; c=relaxed/simple; bh=hWCVTIYujH3yiMCaJ+ud5Vu+AQBPJ5D8pUWj7vZZtYg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=MmwkxCUEXmgcEBV/ELNJ6tuIjUp1mbq5H3pbOIazm4KVv+6Uv6VDHGCTMaTAGWlqg0NoXnnTpBmPEY6TUHOjPDbqQYHsbvaXELhbV9afwM3cm6lfUtvgr8mO00B1KC6SrN+0Gl9tVn6dRkzWqoAEaXRa2Q1GWZMoFCLhw4vjAdw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=roeck-us.net; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=U+LmryQx; arc=none smtp.client-ip=209.85.167.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=roeck-us.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="U+LmryQx" Received: by mail-oi1-f171.google.com with SMTP id 5614622812f47-3db1d4dab7fso1546128b6e.1 for ; Sun, 28 Jul 2024 07:37:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722177444; x=1722782244; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=41z9zLCcl8a9skX3iWLTkdfhL2LgJ8bQvmyC7i+go7k=; b=U+LmryQxiNXyEjms2hPaU+IHJJ1emkEUrGDlXgmuHlmc9J3+us9UsC9NrvvfhWqo40 b8tv1IrqP+Lq1uqZqRXjSj4bcfYdfJ+cn9HD10qm9sgjIXVXwY72LXo7fCZuQJYFBgxU G87ZH960I/W0fRytR+cQ0wOS6SnWzj5GsyN+xgd626Bh+4Wx1KcYzxz+mvpf4TFTsyMo I6eDj7+l56ADlmhPgcXkmDRxDY0+BhioVgXUXRqrWXJEQx1tnZthcOczM2qeMzHf56xG Hyc+h3jW2/zgJJboDFeWmYKm1A1zC11OSIASCgVDGDaIP9SWvt9LflhEQTKPuD5qxvM3 zD3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722177444; x=1722782244; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=41z9zLCcl8a9skX3iWLTkdfhL2LgJ8bQvmyC7i+go7k=; b=JS9G2IlVoGpTvb0qABLAoPXWDUshutT12hXvuHoCnFgkxhvWsJll7NavUP5RsdJgpl mDYMaB3h4NOL5IcpIWhRQQeAMj2y5fdEPOqNcbq6i8MyHCoZagph4imN/PJS2uc9RwOu EL/lJNxVxc5Dum7nb9btpjvNRdt7f71ZphcU+iL/6/qxb4g8yoYOI4vFNx6uQE4mJPME 98QEgFLfISRGwGLJliPLoxmGzhXbXdpj3+olunMBbAWyNJ+DnprVWfNZ4uiRQ9HBtBTp WTM0tkiwxdpRWMytFz0N51Wj9fiIQjfPelEhoT57nBPeLzX4wA2Msg+RATd7c/kD7iOl eODw== X-Gm-Message-State: AOJu0YyU07eL8yJC822WSAKaU9f4bYNrfGfOIi6h1Njpjs+QtbGUF8WG tJfgpvsA6VGGZH0xmRc0Eck5MDqWAvHInBGK8fHJMacvaBypw116rmxwTQ== X-Google-Smtp-Source: AGHT+IE9hV1c7gM6Jo6w03p++G+radrcAHfKYUlnqmfvDhATJnXwT+upxgyZmfpJgV6uqbkk+M9rQg== X-Received: by 2002:a05:6808:23c9:b0:3d9:2b24:5b2 with SMTP id 5614622812f47-3db2348e454mr7975006b6e.0.1722177444238; Sun, 28 Jul 2024 07:37:24 -0700 (PDT) Received: from server.roeck-us.net ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1fed7cf1db4sm65881655ad.87.2024.07.28.07.37.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Jul 2024 07:37:23 -0700 (PDT) Sender: Guenter Roeck From: Guenter Roeck To: Hardware Monitoring Cc: Tzung-Bi Shih , Guenter Roeck Subject: [PATCH v2 3/7] hwmon: (max1619) Mask valid alarm bits Date: Sun, 28 Jul 2024 07:37:11 -0700 Message-Id: <20240728143715.1585816-4-linux@roeck-us.net> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240728143715.1585816-1-linux@roeck-us.net> References: <20240728143715.1585816-1-linux@roeck-us.net> Precedence: bulk X-Mailing-List: linux-hwmon@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Bit 0, 5, and 6 in the status register are reserved and, if set, do not indicate an alarm. Bit 7 is the 'busy' bit and also does not indicate an alarm. Mask the non-alarm bits to avoid reporting them to userspace. Cc: Tzung-Bi Shih Signed-off-by: Guenter Roeck Reviewed-by: Tzung-Bi Shih --- v2: Added patch drivers/hwmon/max1619.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/hwmon/max1619.c b/drivers/hwmon/max1619.c index 8eb7d04bd2f5..5edc9bbbe299 100644 --- a/drivers/hwmon/max1619.c +++ b/drivers/hwmon/max1619.c @@ -112,6 +112,7 @@ static struct max1619_data *max1619_update_device(struct device *dev) config = i2c_smbus_read_byte_data(client, MAX1619_REG_R_CONFIG); if (!(config & 0x20)) data->alarms ^= 0x02; + data->alarms &= 0x1e; data->last_updated = jiffies; data->valid = true; From patchwork Sun Jul 28 14:37:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 13744014 Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) (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 3C79843ABC for ; Sun, 28 Jul 2024 14:37:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722177449; cv=none; b=OpI5i78X3b/+/GpsikSntASZ7o1L+J2pi4Hw7NpDv0bLdqr46UoovAjzLv1jbR8yX/DNqkDUs6a4fR+FT+NoJxd6uQ5KOkMhI9NYhetgWgL+mm16L8woiF9K59jz5Eq1TDbbwcsWRVYUJVwK46GvIY92/FxgCFiHkwPxVBkn/rU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722177449; c=relaxed/simple; bh=EFTz+dOOSI8uOVj+eCfmDNLa5DMmbG40/QT22kFMxy8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=HgzVEIVTngzhutz06UL+9KCYTQRHMTHsJlr8pdRYtqJyCEjkwvE94rfy3bUaJ6D0ZxDLMa0klmhlnoxZ+6gj9PMt8A5RdtOZ+2smfTaoS9zBJaIa/uF8BRsh693wtpjMt/Au2DfooJ4KPEnlW2vJx6bRBR83DpqymVHvs4rKdww= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=roeck-us.net; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=F1p2V8+0; arc=none smtp.client-ip=209.85.210.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=roeck-us.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="F1p2V8+0" Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-70d25b5b6b0so1668371b3a.2 for ; Sun, 28 Jul 2024 07:37:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722177446; x=1722782246; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=E0b2oYUg1FqxhgMREHY8uXg2jKw3v7JdGINGUJPG1I8=; b=F1p2V8+0gqvlxsj7+3QpvAaq4Cy94lt4HMTauQYq4SFQQggSOO7wGqiEIkxQoYN2yT vj0D/LmN18WW8SAwIi62HJ2WOrPZWuJCfDSmRtc4CuYpO1Ct8XBe5217p0dRc370O+sY DlCV/q38yz6AVTn6t0Q72i1ccn2AZldJQUe1HXzSrQo90t4BpiM/cPoK3ZnqaBz43Rgk qRHfVw98v3XNuPjH8s64sMp1u6J++ng+iY1wbo1ewUwYI+m8SLCrZ8uz5dnsdsUYmXcy KvQ7gvXXGsoLj8Sg1UiBjTOO7bzW4K6hHmwDPCCTR0Yh4a5BNSrOl3P4xb8svV94NAad lKWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722177446; x=1722782246; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=E0b2oYUg1FqxhgMREHY8uXg2jKw3v7JdGINGUJPG1I8=; b=ZzgljRaK9uhs3zFW6F032waA058SEJe5Ea9OwpdoUUclWO7qEy8poRSOt+gPLgoJcH hb2v8MOM1GihsGZ82ecViwygj3bfxkflu4B4gxw+gEnTEn82TuNuAheQxPr1yfhNgPcS XjdFSOVAAbgPhfDiir/rP/vISftcM/OM5UQ6WoGwW6Huuhf9TZCHZDGSsWYtKoIv7aBR WLkHb55YuekwvIyRrkYP+zBFnUCZXtjhBozwwALCKM3ma3yuyrZ5hezIGdwyc7f1tseh Z4adz/4iTkPbnnFwQxfNx/YOMTUXey74Ya000Qsn+8iQjNZeiKZtUfcLJkB81TxNmQXZ S32Q== X-Gm-Message-State: AOJu0YwCBFQeP1BGyLZ2wM3l19Q0QEOTEeM9wAql52gzPt4h4XUxzTZ3 fiXMzW5HMX+IimV/L8HktpBRo7RmsNg/MSpgkzUBWwDvm9iUKlJ3zEutpw== X-Google-Smtp-Source: AGHT+IFuqJ/viX83IFmGCLHQ+AMKoHo3hl+PWBdvp8i1E3LvpAwXl2WkYg5VWjNykHfHqUpgVgx11w== X-Received: by 2002:a05:6a20:3952:b0:1c4:9886:b511 with SMTP id adf61e73a8af0-1c4a117921cmr4002076637.2.1722177445947; Sun, 28 Jul 2024 07:37:25 -0700 (PDT) Received: from server.roeck-us.net ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1fed7ee4d32sm65525015ad.149.2024.07.28.07.37.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Jul 2024 07:37:25 -0700 (PDT) Sender: Guenter Roeck From: Guenter Roeck To: Hardware Monitoring Cc: Tzung-Bi Shih , Guenter Roeck Subject: [PATCH v2 4/7] hwmon: (max1619) Convert to use regmap Date: Sun, 28 Jul 2024 07:37:12 -0700 Message-Id: <20240728143715.1585816-5-linux@roeck-us.net> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240728143715.1585816-1-linux@roeck-us.net> References: <20240728143715.1585816-1-linux@roeck-us.net> Precedence: bulk X-Mailing-List: linux-hwmon@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Use regmap for local caching, to hide register read/write address differences, and for multi-byte operations. With this change, the driver specific lock is no longer necessary. While at it, check errors seen when initializing the chip and bail out if chip initialization fails. Signed-off-by: Guenter Roeck Reviewed-by: Tzung-Bi Shih --- v2: Split masking of 'alarms' attribute into separate patch Initialize chip to match original code Documentation/hwmon/max1619.rst | 4 - drivers/hwmon/max1619.c | 259 +++++++++++++++++--------------- 2 files changed, 137 insertions(+), 126 deletions(-) diff --git a/Documentation/hwmon/max1619.rst b/Documentation/hwmon/max1619.rst index e25956e70f73..b5fc175ae18d 100644 --- a/Documentation/hwmon/max1619.rst +++ b/Documentation/hwmon/max1619.rst @@ -27,7 +27,3 @@ All temperature values are given in degrees Celsius. Resolution is 1.0 degree for the local temperature and for the remote temperature. Only the external sensor has high and low limits. - -The max1619 driver will not update its values more frequently than every -other second; reading them more often will do no harm, but will return -'old' values. diff --git a/drivers/hwmon/max1619.c b/drivers/hwmon/max1619.c index 5edc9bbbe299..3ecad847e597 100644 --- a/drivers/hwmon/max1619.c +++ b/drivers/hwmon/max1619.c @@ -17,10 +17,8 @@ #include #include #include -#include #include -#include -#include +#include #include static const unsigned short normal_i2c[] = { @@ -30,27 +28,17 @@ static const unsigned short normal_i2c[] = { * The MAX1619 registers */ -#define MAX1619_REG_R_MAN_ID 0xFE -#define MAX1619_REG_R_CHIP_ID 0xFF -#define MAX1619_REG_R_CONFIG 0x03 -#define MAX1619_REG_W_CONFIG 0x09 -#define MAX1619_REG_R_CONVRATE 0x04 -#define MAX1619_REG_W_CONVRATE 0x0A -#define MAX1619_REG_R_STATUS 0x02 -#define MAX1619_REG_R_LOCAL_TEMP 0x00 -#define MAX1619_REG_R_REMOTE_TEMP 0x01 -#define MAX1619_REG_R_REMOTE_HIGH 0x07 -#define MAX1619_REG_W_REMOTE_HIGH 0x0D -#define MAX1619_REG_R_REMOTE_LOW 0x08 -#define MAX1619_REG_W_REMOTE_LOW 0x0E -#define MAX1619_REG_R_REMOTE_CRIT 0x10 -#define MAX1619_REG_W_REMOTE_CRIT 0x12 -#define MAX1619_REG_R_TCRIT_HYST 0x11 -#define MAX1619_REG_W_TCRIT_HYST 0x13 - -/* - * Conversions - */ +#define MAX1619_REG_LOCAL_TEMP 0x00 +#define MAX1619_REG_REMOTE_TEMP 0x01 +#define MAX1619_REG_STATUS 0x02 +#define MAX1619_REG_CONFIG 0x03 +#define MAX1619_REG_CONVRATE 0x04 +#define MAX1619_REG_REMOTE_HIGH 0x07 +#define MAX1619_REG_REMOTE_LOW 0x08 +#define MAX1619_REG_REMOTE_CRIT 0x10 +#define MAX1619_REG_REMOTE_CRIT_HYST 0x11 +#define MAX1619_REG_MAN_ID 0xFE +#define MAX1619_REG_CHIP_ID 0xFF enum temp_index { t_input1 = 0, @@ -66,63 +54,15 @@ enum temp_index { * Client data (each client gets its own) */ -struct max1619_data { - struct i2c_client *client; - struct mutex update_lock; - bool valid; /* false until following fields are valid */ - unsigned long last_updated; /* in jiffies */ - - /* registers values */ - u8 temp[t_num_regs]; /* index with enum temp_index */ - u8 alarms; +static const u8 regs[t_num_regs] = { + [t_input1] = MAX1619_REG_LOCAL_TEMP, + [t_input2] = MAX1619_REG_REMOTE_TEMP, + [t_low2] = MAX1619_REG_REMOTE_LOW, + [t_high2] = MAX1619_REG_REMOTE_HIGH, + [t_crit2] = MAX1619_REG_REMOTE_CRIT, + [t_hyst2] = MAX1619_REG_REMOTE_CRIT_HYST, }; -static const u8 regs_read[t_num_regs] = { - [t_input1] = MAX1619_REG_R_LOCAL_TEMP, - [t_input2] = MAX1619_REG_R_REMOTE_TEMP, - [t_low2] = MAX1619_REG_R_REMOTE_LOW, - [t_high2] = MAX1619_REG_R_REMOTE_HIGH, - [t_crit2] = MAX1619_REG_R_REMOTE_CRIT, - [t_hyst2] = MAX1619_REG_R_TCRIT_HYST, -}; - -static const u8 regs_write[t_num_regs] = { - [t_low2] = MAX1619_REG_W_REMOTE_LOW, - [t_high2] = MAX1619_REG_W_REMOTE_HIGH, - [t_crit2] = MAX1619_REG_W_REMOTE_CRIT, - [t_hyst2] = MAX1619_REG_W_TCRIT_HYST, -}; - -static struct max1619_data *max1619_update_device(struct device *dev) -{ - struct max1619_data *data = dev_get_drvdata(dev); - struct i2c_client *client = data->client; - int config, i; - - mutex_lock(&data->update_lock); - - if (time_after(jiffies, data->last_updated + HZ * 2) || !data->valid) { - dev_dbg(&client->dev, "Updating max1619 data.\n"); - for (i = 0; i < t_num_regs; i++) - data->temp[i] = i2c_smbus_read_byte_data(client, - regs_read[i]); - data->alarms = i2c_smbus_read_byte_data(client, - MAX1619_REG_R_STATUS); - /* If OVERT polarity is low, reverse alarm bit */ - config = i2c_smbus_read_byte_data(client, MAX1619_REG_R_CONFIG); - if (!(config & 0x20)) - data->alarms ^= 0x02; - data->alarms &= 0x1e; - - data->last_updated = jiffies; - data->valid = true; - } - - mutex_unlock(&data->update_lock); - - return data; -} - /* * Sysfs stuff */ @@ -131,9 +71,15 @@ static ssize_t temp_show(struct device *dev, struct device_attribute *devattr, char *buf) { struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); - struct max1619_data *data = max1619_update_device(dev); + struct regmap *regmap = dev_get_drvdata(dev); + u32 temp; + int ret; - return sprintf(buf, "%d\n", sign_extend(data->temp[attr->index], 7) * 1000); + ret = regmap_read(regmap, regs[attr->index], &temp); + if (ret < 0) + return ret; + + return sprintf(buf, "%d\n", sign_extend32(temp, 7) * 1000); } static ssize_t temp_store(struct device *dev, @@ -141,34 +87,61 @@ static ssize_t temp_store(struct device *dev, size_t count) { struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); - struct max1619_data *data = dev_get_drvdata(dev); - struct i2c_client *client = data->client; + struct regmap *regmap = dev_get_drvdata(dev); long val; int err = kstrtol(buf, 10, &val); if (err) return err; - mutex_lock(&data->update_lock); - data->temp[attr->index] = DIV_ROUND_CLOSEST(clamp_val(val, -128000, 127000), 1000); - i2c_smbus_write_byte_data(client, regs_write[attr->index], - data->temp[attr->index]); - mutex_unlock(&data->update_lock); + val = DIV_ROUND_CLOSEST(clamp_val(val, -128000, 127000), 1000); + err = regmap_write(regmap, regs[attr->index], val); + if (err < 0) + return err; return count; } +static int get_alarms(struct regmap *regmap) +{ + static u32 regs[2] = { MAX1619_REG_STATUS, MAX1619_REG_CONFIG }; + u8 regdata[2]; + int ret; + + ret = regmap_multi_reg_read(regmap, regs, regdata, 2); + if (ret) + return ret; + + /* OVERT status bit may be reversed */ + if (!(regdata[1] & 0x20)) + regdata[0] ^= 0x02; + + return regdata[0] & 0x1e; +} + static ssize_t alarms_show(struct device *dev, struct device_attribute *attr, char *buf) { - struct max1619_data *data = max1619_update_device(dev); - return sprintf(buf, "%d\n", data->alarms); + struct regmap *regmap = dev_get_drvdata(dev); + int alarms; + + alarms = get_alarms(regmap); + if (alarms < 0) + return alarms; + + return sprintf(buf, "%d\n", alarms); } static ssize_t alarm_show(struct device *dev, struct device_attribute *attr, char *buf) { int bitnr = to_sensor_dev_attr(attr)->index; - struct max1619_data *data = max1619_update_device(dev); - return sprintf(buf, "%d\n", (data->alarms >> bitnr) & 1); + struct regmap *regmap = dev_get_drvdata(dev); + int alarms; + + alarms = get_alarms(regmap); + if (alarms < 0) + return alarms; + + return sprintf(buf, "%d\n", (alarms >> bitnr) & 1); } static SENSOR_DEVICE_ATTR_RO(temp1_input, temp, t_input1); @@ -212,9 +185,9 @@ static int max1619_detect(struct i2c_client *client, return -ENODEV; /* detection */ - reg_config = i2c_smbus_read_byte_data(client, MAX1619_REG_R_CONFIG); - reg_convrate = i2c_smbus_read_byte_data(client, MAX1619_REG_R_CONVRATE); - reg_status = i2c_smbus_read_byte_data(client, MAX1619_REG_R_STATUS); + reg_config = i2c_smbus_read_byte_data(client, MAX1619_REG_CONFIG); + reg_convrate = i2c_smbus_read_byte_data(client, MAX1619_REG_CONVRATE); + reg_status = i2c_smbus_read_byte_data(client, MAX1619_REG_STATUS); if ((reg_config & 0x03) != 0x00 || reg_convrate > 0x07 || (reg_status & 0x61) != 0x00) { dev_dbg(&adapter->dev, "MAX1619 detection failed at 0x%02x\n", @@ -223,8 +196,8 @@ static int max1619_detect(struct i2c_client *client, } /* identification */ - man_id = i2c_smbus_read_byte_data(client, MAX1619_REG_R_MAN_ID); - chip_id = i2c_smbus_read_byte_data(client, MAX1619_REG_R_CHIP_ID); + man_id = i2c_smbus_read_byte_data(client, MAX1619_REG_MAN_ID); + chip_id = i2c_smbus_read_byte_data(client, MAX1619_REG_CHIP_ID); if (man_id != 0x4D || chip_id != 0x04) { dev_info(&adapter->dev, "Unsupported chip (man_id=0x%02X, chip_id=0x%02X).\n", @@ -237,40 +210,82 @@ static int max1619_detect(struct i2c_client *client, return 0; } -static void max1619_init_client(struct i2c_client *client) +static int max1619_init_chip(struct regmap *regmap) { - u8 config; + int ret; - /* - * Start the conversions. - */ - i2c_smbus_write_byte_data(client, MAX1619_REG_W_CONVRATE, - 5); /* 2 Hz */ - config = i2c_smbus_read_byte_data(client, MAX1619_REG_R_CONFIG); - if (config & 0x40) - i2c_smbus_write_byte_data(client, MAX1619_REG_W_CONFIG, - config & 0xBF); /* run */ + ret = regmap_write(regmap, MAX1619_REG_CONVRATE, 5); /* 2 Hz */ + if (ret) + return ret; + + /* Start conversions */ + return regmap_set_bits(regmap, MAX1619_REG_CONFIG, 0x40); } -static int max1619_probe(struct i2c_client *new_client) +/* regmap */ + +static int max1619_reg_read(void *context, unsigned int reg, unsigned int *val) { - struct max1619_data *data; + int ret; + + ret = i2c_smbus_read_byte_data(context, reg); + if (ret < 0) + return ret; + + *val = ret; + return 0; +} + +static int max1619_reg_write(void *context, unsigned int reg, unsigned int val) +{ + int offset = reg < MAX1619_REG_REMOTE_CRIT ? 6 : 2; + + return i2c_smbus_write_byte_data(context, reg + offset, val); +} + +static bool max1619_regmap_is_volatile(struct device *dev, unsigned int reg) +{ + return reg <= MAX1619_REG_STATUS; +} + +static bool max1619_regmap_is_writeable(struct device *dev, unsigned int reg) +{ + return reg > MAX1619_REG_STATUS && reg <= MAX1619_REG_REMOTE_CRIT_HYST; +} + +static const struct regmap_config max1619_regmap_config = { + .reg_bits = 8, + .val_bits = 8, + .max_register = MAX1619_REG_REMOTE_CRIT_HYST, + .cache_type = REGCACHE_MAPLE, + .volatile_reg = max1619_regmap_is_volatile, + .writeable_reg = max1619_regmap_is_writeable, +}; + +static const struct regmap_bus max1619_regmap_bus = { + .reg_write = max1619_reg_write, + .reg_read = max1619_reg_read, +}; + +static int max1619_probe(struct i2c_client *client) +{ + struct device *dev = &client->dev; struct device *hwmon_dev; + struct regmap *regmap; + int ret; - data = devm_kzalloc(&new_client->dev, sizeof(struct max1619_data), - GFP_KERNEL); - if (!data) - return -ENOMEM; + regmap = devm_regmap_init(dev, &max1619_regmap_bus, client, + &max1619_regmap_config); + if (IS_ERR(regmap)) + return PTR_ERR(regmap); - data->client = new_client; - mutex_init(&data->update_lock); + ret = max1619_init_chip(regmap); + if (ret) + return ret; - /* Initialize the MAX1619 chip */ - max1619_init_client(new_client); - - hwmon_dev = devm_hwmon_device_register_with_groups(&new_client->dev, - new_client->name, - data, + hwmon_dev = devm_hwmon_device_register_with_groups(dev, + client->name, + regmap, max1619_groups); return PTR_ERR_OR_ZERO(hwmon_dev); } From patchwork Sun Jul 28 14:37:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 13744015 Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) (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 6E77743ABC for ; Sun, 28 Jul 2024 14:37:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722177451; cv=none; b=orBMNpRKEsy1wwPiU3GZT6LrFmgiXGfmuNVe+hhZoXp71nIg8W+dn3SUg3h24YIiwz5dHP36jlsWAba4drgKKgyV3gGlXIb1h+yRQEwgmG8JVVBaJwOqcyfeTEGUE2ubggH1WMBuSmNooWXdW3ttq18RP6qald2Q9rpQfQQg/2k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722177451; c=relaxed/simple; bh=3t1IN8yEcQn1mn1s+OHc0cbF2tXJC4mblCgQ5uaAmdk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=nWMyCAU8yYFuERbg7cxheMWruW2N72OqJBynRejvf7xBDN68JFPfPtln/SqupHDoKCE99aCgDtaUNDNzVuliWoh16OSwKJPEWERdO7HS5wMElN2/99HxvsQ0aRJiD4wW4YVM9Oz2uQpWD+lDUFF8x6KTg+mY3OebN9O7tr41DkQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=roeck-us.net; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=UiXuVL8N; arc=none smtp.client-ip=209.85.215.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=roeck-us.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="UiXuVL8N" Received: by mail-pg1-f169.google.com with SMTP id 41be03b00d2f7-7ae3d7222d4so341475a12.3 for ; Sun, 28 Jul 2024 07:37:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722177448; x=1722782248; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=PBZTirNmaR0tG2wilBqgqsHWxoRSq4myU9hllNcUdlk=; b=UiXuVL8NsZG0rfAmqV0c4ehvinun+4swAqEcwnbFzQtf+hciU7bnRJiKVQ/I5hz6an hd8qehWsVO8jE3SbzL8YVHXRMajSloIL2r3ofMEjX8WpejUTHdgVmfgXogn8vAFCgfJV hdEa/ix5PT2gf2rq4gL6S7pFMCN/kmhaqPsamTFvUwvA6BF1q61SMaLpxloVnxYCWPGM Sm1nVj7NcGfLvVS9wGrAlMFdLMjaeRlXk2n/9BzuyMWbVYaU/WPanKmUmp6/d9am0DZ3 cpbERhf2yV41mPO/W6mdU0lgyaoBb7wcYRNQxoiz1TKr9CslieTpkzp+uTC2tw9unPRA xfQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722177448; x=1722782248; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=PBZTirNmaR0tG2wilBqgqsHWxoRSq4myU9hllNcUdlk=; b=ZOmqsPeDGFs20eHKIfxbHWNR17D/3ypOexB4I8xz+53Bnh/Wc9tNXElrhwV018a1RH ZaD55Lnp3E5fbKsjWquJuXYNp3Lw4AxZYNVkLgrFjl9w5UhoryaIu69ZAqjRN+H8tgG1 WISpccDooNSok7ZO8F3RaF8HPF138IPPV9C/WV/3ftDO+2rUt7EYJKOhdir6GbF1/vpx LUV89wWR+a5DL1hdPdZLM1QjuRuKwBuy2sS0HDxi0pkb+TsqQP7/5J+ItRbgLa/ftM0W ITk9plGsGQKSnydU5nF5b64r/diRw4q4tA+c/dcGLDQdlBSb/Hg0MibJwFHwAIzs6X9E twcw== X-Gm-Message-State: AOJu0YzF9x5rdfl1KYYithNohBIFS3+eoFz6EXogONf51f9GSkw10NnD c4jXMtWugJrzdpKhGU91WiSVy6107Sct+BifchCBl0oMyFfhOETmSDkY+g== X-Google-Smtp-Source: AGHT+IFck5qgsKxATruFeqQu2pnGfCbOk+gQZ0i8rTEF+aieFLrJI3FbaiQUYN3ijZin2X2oeshbFA== X-Received: by 2002:a05:6a21:9986:b0:1c4:244c:ebc2 with SMTP id adf61e73a8af0-1c4a1324e22mr6249561637.30.1722177447627; Sun, 28 Jul 2024 07:37:27 -0700 (PDT) Received: from server.roeck-us.net ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-70ead71826bsm5391740b3a.73.2024.07.28.07.37.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Jul 2024 07:37:27 -0700 (PDT) Sender: Guenter Roeck From: Guenter Roeck To: Hardware Monitoring Cc: Tzung-Bi Shih , Guenter Roeck Subject: [PATCH v2 5/7] hwmon: (max1619) Convert to with_info API Date: Sun, 28 Jul 2024 07:37:13 -0700 Message-Id: <20240728143715.1585816-6-linux@roeck-us.net> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240728143715.1585816-1-linux@roeck-us.net> References: <20240728143715.1585816-1-linux@roeck-us.net> Precedence: bulk X-Mailing-List: linux-hwmon@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Convert driver to with_info hwmon API to simplify the code and with it its maintainability. Reviewed-by: Tzung-Bi Shih Signed-off-by: Guenter Roeck --- v2: Added Reviewed-by: tag drivers/hwmon/max1619.c | 269 +++++++++++++++++++++++----------------- 1 file changed, 157 insertions(+), 112 deletions(-) diff --git a/drivers/hwmon/max1619.c b/drivers/hwmon/max1619.c index 3ecad847e597..fd84bcc789fa 100644 --- a/drivers/hwmon/max1619.c +++ b/drivers/hwmon/max1619.c @@ -14,20 +14,14 @@ #include #include -#include #include #include #include #include -#include static const unsigned short normal_i2c[] = { 0x18, 0x19, 0x1a, 0x29, 0x2a, 0x2b, 0x4c, 0x4d, 0x4e, I2C_CLIENT_END }; -/* - * The MAX1619 registers - */ - #define MAX1619_REG_LOCAL_TEMP 0x00 #define MAX1619_REG_REMOTE_TEMP 0x01 #define MAX1619_REG_STATUS 0x02 @@ -40,66 +34,6 @@ static const unsigned short normal_i2c[] = { #define MAX1619_REG_MAN_ID 0xFE #define MAX1619_REG_CHIP_ID 0xFF -enum temp_index { - t_input1 = 0, - t_input2, - t_low2, - t_high2, - t_crit2, - t_hyst2, - t_num_regs -}; - -/* - * Client data (each client gets its own) - */ - -static const u8 regs[t_num_regs] = { - [t_input1] = MAX1619_REG_LOCAL_TEMP, - [t_input2] = MAX1619_REG_REMOTE_TEMP, - [t_low2] = MAX1619_REG_REMOTE_LOW, - [t_high2] = MAX1619_REG_REMOTE_HIGH, - [t_crit2] = MAX1619_REG_REMOTE_CRIT, - [t_hyst2] = MAX1619_REG_REMOTE_CRIT_HYST, -}; - -/* - * Sysfs stuff - */ - -static ssize_t temp_show(struct device *dev, struct device_attribute *devattr, - char *buf) -{ - struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); - struct regmap *regmap = dev_get_drvdata(dev); - u32 temp; - int ret; - - ret = regmap_read(regmap, regs[attr->index], &temp); - if (ret < 0) - return ret; - - return sprintf(buf, "%d\n", sign_extend32(temp, 7) * 1000); -} - -static ssize_t temp_store(struct device *dev, - struct device_attribute *devattr, const char *buf, - size_t count) -{ - struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); - struct regmap *regmap = dev_get_drvdata(dev); - long val; - int err = kstrtol(buf, 10, &val); - if (err) - return err; - - val = DIV_ROUND_CLOSEST(clamp_val(val, -128000, 127000), 1000); - err = regmap_write(regmap, regs[attr->index], val); - if (err < 0) - return err; - return count; -} - static int get_alarms(struct regmap *regmap) { static u32 regs[2] = { MAX1619_REG_STATUS, MAX1619_REG_CONFIG }; @@ -117,62 +51,175 @@ static int get_alarms(struct regmap *regmap) return regdata[0] & 0x1e; } -static ssize_t alarms_show(struct device *dev, struct device_attribute *attr, - char *buf) +static int max1619_temp_read(struct regmap *regmap, u32 attr, int channel, long *val) { - struct regmap *regmap = dev_get_drvdata(dev); - int alarms; + int reg = -1, alarm_bit = 0; + u32 temp; + int ret; - alarms = get_alarms(regmap); - if (alarms < 0) - return alarms; - - return sprintf(buf, "%d\n", alarms); + switch (attr) { + case hwmon_temp_input: + reg = channel ? MAX1619_REG_REMOTE_TEMP : MAX1619_REG_LOCAL_TEMP; + break; + case hwmon_temp_min: + reg = MAX1619_REG_REMOTE_LOW; + break; + case hwmon_temp_max: + reg = MAX1619_REG_REMOTE_HIGH; + break; + case hwmon_temp_crit: + reg = MAX1619_REG_REMOTE_CRIT; + break; + case hwmon_temp_crit_hyst: + reg = MAX1619_REG_REMOTE_CRIT_HYST; + break; + case hwmon_temp_min_alarm: + alarm_bit = 3; + break; + case hwmon_temp_max_alarm: + alarm_bit = 4; + break; + case hwmon_temp_crit_alarm: + alarm_bit = 1; + break; + case hwmon_temp_fault: + alarm_bit = 2; + break; + default: + return -EOPNOTSUPP; + } + if (reg >= 0) { + ret = regmap_read(regmap, reg, &temp); + if (ret < 0) + return ret; + *val = sign_extend32(temp, 7) * 1000; + } else { + ret = get_alarms(regmap); + if (ret < 0) + return ret; + *val = !!(ret & BIT(alarm_bit)); + } + return 0; } -static ssize_t alarm_show(struct device *dev, struct device_attribute *attr, - char *buf) +static int max1619_chip_read(struct regmap *regmap, u32 attr, long *val) { - int bitnr = to_sensor_dev_attr(attr)->index; - struct regmap *regmap = dev_get_drvdata(dev); int alarms; - alarms = get_alarms(regmap); - if (alarms < 0) - return alarms; - - return sprintf(buf, "%d\n", (alarms >> bitnr) & 1); + switch (attr) { + case hwmon_chip_alarms: + alarms = get_alarms(regmap); + if (alarms < 0) + return alarms; + *val = alarms; + break; + default: + return -EOPNOTSUPP; + } + return 0; } -static SENSOR_DEVICE_ATTR_RO(temp1_input, temp, t_input1); -static SENSOR_DEVICE_ATTR_RO(temp2_input, temp, t_input2); -static SENSOR_DEVICE_ATTR_RW(temp2_min, temp, t_low2); -static SENSOR_DEVICE_ATTR_RW(temp2_max, temp, t_high2); -static SENSOR_DEVICE_ATTR_RW(temp2_crit, temp, t_crit2); -static SENSOR_DEVICE_ATTR_RW(temp2_crit_hyst, temp, t_hyst2); +static int max1619_read(struct device *dev, enum hwmon_sensor_types type, + u32 attr, int channel, long *val) +{ + struct regmap *regmap = dev_get_drvdata(dev); -static DEVICE_ATTR_RO(alarms); -static SENSOR_DEVICE_ATTR_RO(temp2_crit_alarm, alarm, 1); -static SENSOR_DEVICE_ATTR_RO(temp2_fault, alarm, 2); -static SENSOR_DEVICE_ATTR_RO(temp2_min_alarm, alarm, 3); -static SENSOR_DEVICE_ATTR_RO(temp2_max_alarm, alarm, 4); + switch (type) { + case hwmon_chip: + return max1619_chip_read(regmap, attr, val); + case hwmon_temp: + return max1619_temp_read(regmap, attr, channel, val); + default: + return -EOPNOTSUPP; + } +} -static struct attribute *max1619_attrs[] = { - &sensor_dev_attr_temp1_input.dev_attr.attr, - &sensor_dev_attr_temp2_input.dev_attr.attr, - &sensor_dev_attr_temp2_min.dev_attr.attr, - &sensor_dev_attr_temp2_max.dev_attr.attr, - &sensor_dev_attr_temp2_crit.dev_attr.attr, - &sensor_dev_attr_temp2_crit_hyst.dev_attr.attr, +static int max1619_write(struct device *dev, enum hwmon_sensor_types type, + u32 attr, int channel, long val) +{ + struct regmap *regmap = dev_get_drvdata(dev); + int reg; - &dev_attr_alarms.attr, - &sensor_dev_attr_temp2_crit_alarm.dev_attr.attr, - &sensor_dev_attr_temp2_fault.dev_attr.attr, - &sensor_dev_attr_temp2_min_alarm.dev_attr.attr, - &sensor_dev_attr_temp2_max_alarm.dev_attr.attr, + if (type != hwmon_temp) + return -EOPNOTSUPP; + + switch (attr) { + case hwmon_temp_min: + reg = MAX1619_REG_REMOTE_LOW; + break; + case hwmon_temp_max: + reg = MAX1619_REG_REMOTE_HIGH; + break; + case hwmon_temp_crit: + reg = MAX1619_REG_REMOTE_CRIT; + break; + case hwmon_temp_crit_hyst: + reg = MAX1619_REG_REMOTE_CRIT_HYST; + break; + default: + return -EOPNOTSUPP; + } + val = DIV_ROUND_CLOSEST(clamp_val(val, -128000, 127000), 1000); + return regmap_write(regmap, reg, val); +} + +static umode_t max1619_is_visible(const void *_data, enum hwmon_sensor_types type, + u32 attr, int channel) +{ + switch (type) { + case hwmon_chip: + switch (attr) { + case hwmon_chip_alarms: + return 0444; + default: + break; + } + break; + case hwmon_temp: + switch (attr) { + case hwmon_temp_input: + return 0444; + case hwmon_temp_min: + case hwmon_temp_max: + case hwmon_temp_crit: + case hwmon_temp_crit_hyst: + return 0644; + case hwmon_temp_min_alarm: + case hwmon_temp_max_alarm: + case hwmon_temp_crit_alarm: + case hwmon_temp_fault: + return 0444; + default: + break; + } + break; + default: + break; + } + return 0; +} + +static const struct hwmon_channel_info * const max1619_info[] = { + HWMON_CHANNEL_INFO(chip, HWMON_C_ALARMS), + HWMON_CHANNEL_INFO(temp, + HWMON_T_INPUT, + HWMON_T_INPUT | HWMON_T_MIN | HWMON_T_MAX | + HWMON_T_CRIT | HWMON_T_CRIT_HYST | + HWMON_T_MIN_ALARM | HWMON_T_MAX_ALARM | + HWMON_T_CRIT_ALARM | HWMON_T_FAULT), NULL }; -ATTRIBUTE_GROUPS(max1619); + +static const struct hwmon_ops max1619_hwmon_ops = { + .is_visible = max1619_is_visible, + .read = max1619_read, + .write = max1619_write, +}; + +static const struct hwmon_chip_info max1619_chip_info = { + .ops = &max1619_hwmon_ops, + .info = max1619_info, +}; /* Return 0 if detection is successful, -ENODEV otherwise */ static int max1619_detect(struct i2c_client *client, @@ -283,10 +330,8 @@ static int max1619_probe(struct i2c_client *client) if (ret) return ret; - hwmon_dev = devm_hwmon_device_register_with_groups(dev, - client->name, - regmap, - max1619_groups); + hwmon_dev = devm_hwmon_device_register_with_info(dev, client->name, + regmap, &max1619_chip_info, NULL); return PTR_ERR_OR_ZERO(hwmon_dev); } From patchwork Sun Jul 28 14:37:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 13744016 Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) (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 9A1C546450 for ; Sun, 28 Jul 2024 14:37:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722177452; cv=none; b=UNwpjJnGzTXXi28u+42nSAmfw9Fal7aoQAZ3SPvRdiRou8VqitEJuv+cfE9+WX7t3qDTRvRy19WXjrHm0sLrxkL9qtaozd9mHwxe2FMpuUyVLkGYLY1lSwOePc/HvCCtnvxPGX8i+lBG4Xud9J+DapFNKO9IRxqsLCqHsjZFr9w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722177452; c=relaxed/simple; bh=vKAXfPU2jmnmfulNz+xXcrRGpqCzdRJX9qJ/BczlgTY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=m8RRoI2XCaDMCjcmAe2tOB7g7GaJt9bYFe15B93u+nTAdFjbskPCe8/8DePQEXC2rIntbAAGnER1YDSkLL9j4hR/FUkDZdIhbGcV74Kzz7n78AGvK4lZ6LrUhQBD+e1ofz9dCORy25YEAULCeKq2jbo/PwSUIj/TKp4UCu7/CbU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=roeck-us.net; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=jY7QXQk2; arc=none smtp.client-ip=209.85.216.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=roeck-us.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="jY7QXQk2" Received: by mail-pj1-f45.google.com with SMTP id 98e67ed59e1d1-2cb5243766dso1839777a91.0 for ; Sun, 28 Jul 2024 07:37:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722177449; x=1722782249; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=UVOSYEX0JAjA7HDHjEzgiZYocwvk6kRsqAgdNKClBQk=; b=jY7QXQk2fNSIs0yfz5s5T7DB3vdQFuk8mJqmS1AE46DalHOzBY2l05E9iIdt66QNAQ ytD30oedyLT8pl8x2mlxMKoNvlfxNUrahPG8Z3gHC5Q9DrPUkcb1aE3He2nQ+3MRixPU QO4bdza7smJL1zBZyVWAaP7Py4WlvnF9J37DGGSBrVLCMazyb8zlnjLZhKIaFpf8pftn zUd4CD5mdFWbC4/DqRlcRhU/A0tgKclJnheZK9quZnQ+wRsLM6McqO5B4vf4PmdZZ/ql N1SOOKYu7XUBBjnykqQDmbepb7Z2etmNazXAaXvrmsUqdMjaOxmfPRATQ7wT96VklBb2 i5Mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722177449; x=1722782249; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=UVOSYEX0JAjA7HDHjEzgiZYocwvk6kRsqAgdNKClBQk=; b=HqHoGIxl+9UONQw6ZHvUbGyiU8g4VaHjTu3c+0+ZEfD3qRZBgeB0LG62S2riZb9+xh PMkptgAXr/l9TLGxi2K5AOET9R/ZO8Ey7MrvIzm3eiJK4kLyjMjXN2WU/BIr2a6us2v9 K0p2BiRbcUs80LWehzij5r9D8CZw06PpXMFzGma7FgLYaFFa1A7Wim+9NnxyDQWGKrY+ qx4bKBWTCmZGgd0ilOtgX59efupHfp+2mGR8zdJraMxks6gSiXoeFa9omXjMrCdtXa2h MHZzcb9Rsi5ReD2+uQY2aek/0nBjZcHa/QgKHwiPz7lETro1l7LafpZXerP9Gpsrzucs lzow== X-Gm-Message-State: AOJu0YzFiFHiAtVCZrkjwe40joqEBVyLbBZOBJicYHNQR60hqb/KAS7c c73dZo7CdINX3HWkiN8JZeiqX6+ASu8KyefFkmnq0WHGMcNx4OvV6JwKkg== X-Google-Smtp-Source: AGHT+IHqlUE0EXUE4PvxkD9a0yMIA6zI70YzmVgvKfPCigEejXw3YYG5In6wYMGOx3XlsrpRwPpB+A== X-Received: by 2002:a17:90b:1e03:b0:2c9:7219:1db0 with SMTP id 98e67ed59e1d1-2cf7e097ee5mr6001904a91.3.1722177449466; Sun, 28 Jul 2024 07:37:29 -0700 (PDT) Received: from server.roeck-us.net ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2cd8cfb9fc4sm5958202a91.0.2024.07.28.07.37.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Jul 2024 07:37:28 -0700 (PDT) Sender: Guenter Roeck From: Guenter Roeck To: Hardware Monitoring Cc: Tzung-Bi Shih , Guenter Roeck Subject: [PATCH v2 6/7] hwmon: (max1619) Add support for update_interval attribute Date: Sun, 28 Jul 2024 07:37:14 -0700 Message-Id: <20240728143715.1585816-7-linux@roeck-us.net> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240728143715.1585816-1-linux@roeck-us.net> References: <20240728143715.1585816-1-linux@roeck-us.net> Precedence: bulk X-Mailing-List: linux-hwmon@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The chip supports reading and writing the conversion rate. Add support for the update_interval sysfs attribute. Reviewed-by: Tzung-Bi Shih Signed-off-by: Guenter Roeck --- v2: Added Reviewed-by: tag drivers/hwmon/max1619.c | 50 ++++++++++++++++++++++++++++++++++------- 1 file changed, 42 insertions(+), 8 deletions(-) diff --git a/drivers/hwmon/max1619.c b/drivers/hwmon/max1619.c index fd84bcc789fa..69d3156fa2ba 100644 --- a/drivers/hwmon/max1619.c +++ b/drivers/hwmon/max1619.c @@ -18,6 +18,7 @@ #include #include #include +#include static const unsigned short normal_i2c[] = { 0x18, 0x19, 0x1a, 0x29, 0x2a, 0x2b, 0x4c, 0x4d, 0x4e, I2C_CLIENT_END }; @@ -102,11 +103,20 @@ static int max1619_temp_read(struct regmap *regmap, u32 attr, int channel, long return 0; } +static u16 update_intervals[] = { 16000, 8000, 4000, 2000, 1000, 500, 250, 125 }; + static int max1619_chip_read(struct regmap *regmap, u32 attr, long *val) { - int alarms; + int alarms, ret; + u32 regval; switch (attr) { + case hwmon_chip_update_interval: + ret = regmap_read(regmap, MAX1619_REG_CONVRATE, ®val); + if (ret < 0) + return ret; + *val = update_intervals[regval & 7]; + break; case hwmon_chip_alarms: alarms = get_alarms(regmap); if (alarms < 0) @@ -134,14 +144,21 @@ static int max1619_read(struct device *dev, enum hwmon_sensor_types type, } } -static int max1619_write(struct device *dev, enum hwmon_sensor_types type, - u32 attr, int channel, long val) +static int max1619_chip_write(struct regmap *regmap, u32 attr, long val) { - struct regmap *regmap = dev_get_drvdata(dev); - int reg; - - if (type != hwmon_temp) + switch (attr) { + case hwmon_chip_update_interval: + val = find_closest_descending(val, update_intervals, ARRAY_SIZE(update_intervals)); + return regmap_write(regmap, MAX1619_REG_CONVRATE, val); + default: return -EOPNOTSUPP; + } +} + +static int max1619_temp_write(struct regmap *regmap, + u32 attr, int channel, long val) +{ + int reg; switch (attr) { case hwmon_temp_min: @@ -163,12 +180,29 @@ static int max1619_write(struct device *dev, enum hwmon_sensor_types type, return regmap_write(regmap, reg, val); } +static int max1619_write(struct device *dev, enum hwmon_sensor_types type, + u32 attr, int channel, long val) +{ + struct regmap *regmap = dev_get_drvdata(dev); + + switch (type) { + case hwmon_chip: + return max1619_chip_write(regmap, attr, val); + case hwmon_temp: + return max1619_temp_write(regmap, attr, channel, val); + default: + return -EOPNOTSUPP; + } +} + static umode_t max1619_is_visible(const void *_data, enum hwmon_sensor_types type, u32 attr, int channel) { switch (type) { case hwmon_chip: switch (attr) { + case hwmon_chip_update_interval: + return 0644; case hwmon_chip_alarms: return 0444; default: @@ -200,7 +234,7 @@ static umode_t max1619_is_visible(const void *_data, enum hwmon_sensor_types typ } static const struct hwmon_channel_info * const max1619_info[] = { - HWMON_CHANNEL_INFO(chip, HWMON_C_ALARMS), + HWMON_CHANNEL_INFO(chip, HWMON_C_ALARMS | HWMON_C_UPDATE_INTERVAL), HWMON_CHANNEL_INFO(temp, HWMON_T_INPUT, HWMON_T_INPUT | HWMON_T_MIN | HWMON_T_MAX | From patchwork Sun Jul 28 14:37:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 13744017 Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) (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 653DA46450 for ; Sun, 28 Jul 2024 14:37:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722177453; cv=none; b=H43x2Mhmz+DGzOLr8/zo7dO+x4AxrmwnHQjlYXnAbsC6R+7FI5RRm/hOXOyGLm/EZQjWZtRv+NjmLfTF1xfgnzqS5OsWxEdmrKMnWi+cr3jVOoJL1wiIB3KdXsfqBmDaovqi44K0v6b2LvG5joMFriCOPCeslaFpQaLOy15xLxk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722177453; c=relaxed/simple; bh=n7dxDWZkvVGcDslpXlD9Aw6nvSeYRJCovMYgIAtELvE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=tVWlZHIyi8Uzl06OXcBAGNNqOcS/RMGjNbWAqy0xg+hrJEkQVEii2x4rHaqY6sBoQjWQkG4EWKim4mlPD2BWtum3wFDzCx7qsMtVXKxibN0f5aVHEwXMQKPPrR5IVObaTOZW3Jyaei3lIc9TnLYRzLxolfhvpqb52K9zU+wzIfE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=roeck-us.net; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=fwH2fznM; arc=none smtp.client-ip=209.85.210.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=roeck-us.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fwH2fznM" Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-70eb0ae23e4so1631321b3a.0 for ; Sun, 28 Jul 2024 07:37:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722177451; x=1722782251; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=ya1VRGoZXIlKGrH/+4sFGocnj0StupJrhjkbuPt1dC4=; b=fwH2fznMSvvli/FdlOCBlFETiCt4bqoUQi3JodlD8osjVRlZm1ZQmXCkQYskikGZyE 3dK+xiJizB4YaBkx3bm4b/1D+b+myYF/aBqI9jMuE+jDajwa/PlL2u8fEMe5IKi0I4+U Nw0DsBfCwNA3bHbY3tX7f6Hg0gh5t4mMrQjRGVMm2DOJuPDk+IM96NRA3EsYp7Ov9ncr 1mY00fVRk+Ys9nFyv/6nw4/5TNE72HGgsBKmmtqgAojM2ZIRmNEfKDwEaXjcCZkIfSd1 JIFXo7hkcO5rNNFF/u4/qEfV7nwY5BvJWKvBH+GOhkBlFPFArdOgdPACTAdesW+QVFfT tiTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722177451; x=1722782251; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ya1VRGoZXIlKGrH/+4sFGocnj0StupJrhjkbuPt1dC4=; b=FSgXstQ1sIs2awBwDEYcVjY8X/1enKsZUpOr/9CrCZCIXbibHkJ94sNAkYAj9n4hSF /ndsOTG+BAhEhnTlcPGKyBPoZ32CVMRzv1hnjTOFO6yD9gx7j/3zb+peF1mgRekZT+hh zr5KxaRrQCcXH4K0K3Z3QUSsN7lfT9voVZ6wfg0mRwBYoTQ2sQHKdiRHil32lxiamKEB ii/jTi/RcT1LzJBf5aCVpptPdqAt6PZWbZ80kmK8yXb/w3kE1s0VpHk7pLbUu8rrkeJe flukgNzznqWYRAbiQXzMn/M173M/RKSd/OrEsBmBRptxeJyJVYk83s+AaWl1Uw5XVRIL 8cQw== X-Gm-Message-State: AOJu0YyQTJSQmYMWllUEyBUbJ2yM2M54VekZD2gxvYMAMe7TvHbE89mV J1a9Qi+5F72ojxRJL4kqdOKb5sabg3o+YqiwrJi6RFM/oBZaGXPiJvcZLg== X-Google-Smtp-Source: AGHT+IGGSGsdX3P40OJXeMwys6NxFnM0NQc2N+1Ykze/oJHkQf77lRQMeZkNqIm/7/Wok45BUCJcOQ== X-Received: by 2002:a05:6a00:17a3:b0:706:3329:5533 with SMTP id d2e1a72fcca58-70eced9bbb1mr3785956b3a.24.1722177451114; Sun, 28 Jul 2024 07:37:31 -0700 (PDT) Received: from server.roeck-us.net ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7a9fa5a0bcesm4869969a12.89.2024.07.28.07.37.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Jul 2024 07:37:30 -0700 (PDT) Sender: Guenter Roeck From: Guenter Roeck To: Hardware Monitoring Cc: Tzung-Bi Shih , Guenter Roeck Subject: [PATCH v2 7/7] hwmon: (max1619) Improve chip detection code Date: Sun, 28 Jul 2024 07:37:15 -0700 Message-Id: <20240728143715.1585816-8-linux@roeck-us.net> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240728143715.1585816-1-linux@roeck-us.net> References: <20240728143715.1585816-1-linux@roeck-us.net> Precedence: bulk X-Mailing-List: linux-hwmon@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Bail out immediately if reading any of the registers used for chip detection fails, or if it returns an unexpected value. Drop all log messages from detection code. Reviewed-by: Tzung-Bi Shih Signed-off-by: Guenter Roeck --- v2: Added Reviewed-by: tag drivers/hwmon/max1619.c | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/drivers/hwmon/max1619.c b/drivers/hwmon/max1619.c index 69d3156fa2ba..26ffb21daa3d 100644 --- a/drivers/hwmon/max1619.c +++ b/drivers/hwmon/max1619.c @@ -260,31 +260,27 @@ static int max1619_detect(struct i2c_client *client, struct i2c_board_info *info) { struct i2c_adapter *adapter = client->adapter; - u8 reg_config, reg_convrate, reg_status, man_id, chip_id; + int regval; if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) return -ENODEV; - /* detection */ - reg_config = i2c_smbus_read_byte_data(client, MAX1619_REG_CONFIG); - reg_convrate = i2c_smbus_read_byte_data(client, MAX1619_REG_CONVRATE); - reg_status = i2c_smbus_read_byte_data(client, MAX1619_REG_STATUS); - if ((reg_config & 0x03) != 0x00 - || reg_convrate > 0x07 || (reg_status & 0x61) != 0x00) { - dev_dbg(&adapter->dev, "MAX1619 detection failed at 0x%02x\n", - client->addr); + regval = i2c_smbus_read_byte_data(client, MAX1619_REG_CONFIG); + if (regval < 0 || (regval & 0x03)) + return -ENODEV; + regval = i2c_smbus_read_byte_data(client, MAX1619_REG_CONVRATE); + if (regval < 0 || regval > 0x07) + return -ENODEV; + regval = i2c_smbus_read_byte_data(client, MAX1619_REG_STATUS); + if (regval < 0 || (regval & 0x61)) return -ENODEV; - } - /* identification */ - man_id = i2c_smbus_read_byte_data(client, MAX1619_REG_MAN_ID); - chip_id = i2c_smbus_read_byte_data(client, MAX1619_REG_CHIP_ID); - if (man_id != 0x4D || chip_id != 0x04) { - dev_info(&adapter->dev, - "Unsupported chip (man_id=0x%02X, chip_id=0x%02X).\n", - man_id, chip_id); + regval = i2c_smbus_read_byte_data(client, MAX1619_REG_MAN_ID); + if (regval != 0x4d) + return -ENODEV; + regval = i2c_smbus_read_byte_data(client, MAX1619_REG_CHIP_ID); + if (regval != 0x04) return -ENODEV; - } strscpy(info->type, "max1619", I2C_NAME_SIZE);