From patchwork Tue Nov 22 11:32:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naresh Solanki X-Patchwork-Id: 24313 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2150153wrr; Tue, 22 Nov 2022 03:45:48 -0800 (PST) X-Google-Smtp-Source: AA0mqf4rWuAOV/Bly6UteVwMqDnleAysDYR9CRghIIFw+Iw4KkuvZTrunaflqxb1Gvb7uGOtPZDE X-Received: by 2002:a17:90a:1bc2:b0:218:8bdb:de3f with SMTP id r2-20020a17090a1bc200b002188bdbde3fmr18626493pjr.225.1669117548413; Tue, 22 Nov 2022 03:45:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669117548; cv=none; d=google.com; s=arc-20160816; b=ctXsDA8t3JY5xtI1NFTbMkE1g1qH67598uFIpuqbZyb2B3xsEfwhDc1wNqLmSN/JYV 1TygIXJgms3kQAHao/A0sokGT3tpnixTmwrntA1qiefNRoOl8dq21E4AdOUHKUETO8I2 SrS+IoMManpecfqncuPcmj3shrogtbH4yXRIxny9NihixgKyhoXMiURuKKxaMpWWTABO PlNgzZ0+WMmvz5e2SShNdjpAZiVRBGMp3lBW/qMOg/zHArbj6WVt6iT02DU+NsGGa8RW IYKgHiBtNGEPGjEgsYymYd0Bwr2+59QEB4DsFz1DV+D0QUa6MWRbyN1cqA8DxqXgKSO4 xLMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=EdIBdMp3AF8wTlK3ZbNuetiQCTdvpib+4RwLHSff3bA=; b=Ua1FNeq4IlEfGH070X1THFHWp3esbNyNO3DhyZ+Nd6JtCeDdjsN2OlvTGIW+kxvHME NwR3uL78WsDMTUOtCRDfPXqzAQ2kL7Bvzx6aMZ0eQNNn6vNKGNFcymKErPQpBT686plF /wu+9lT1wk28OKosVtMTtoCYtwEULonpV3kjQTQYAPkxeOtgQG7NbSQDXcjgNszz9z5/ J17KNXgaU0Ikw3Cfyxk/25nkQcVTVJN7F8GM6VWQmlYbyxxjMYFjJplnRjrmBvaGVtPO 6EOPEBeCnnfPaOIum6xYKSlyfxczsmOlrOCDJS4GUdJ7PqrHzx5uOH94Q2xeFBxNh8XS 1FjA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@9elements.com header.s=google header.b=Ko3D6qq0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=9elements.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k190-20020a6384c7000000b00476f440f891si14681864pgd.844.2022.11.22.03.45.34; Tue, 22 Nov 2022 03:45:48 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@9elements.com header.s=google header.b=Ko3D6qq0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=9elements.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232972AbiKVLid (ORCPT + 99 others); Tue, 22 Nov 2022 06:38:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54200 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232429AbiKVLiM (ORCPT ); Tue, 22 Nov 2022 06:38:12 -0500 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9C87E5ADEB for ; Tue, 22 Nov 2022 03:33:12 -0800 (PST) Received: by mail-wr1-x429.google.com with SMTP id z4so9668689wrr.3 for ; Tue, 22 Nov 2022 03:33:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=EdIBdMp3AF8wTlK3ZbNuetiQCTdvpib+4RwLHSff3bA=; b=Ko3D6qq0X/Q9S/oaND9aZ47sWgBSPYistB0gEGIxAs/CITTsPTijNT5eFpmpcZh4eA pIM9Bk8JxxtYD+gOVdVVLbdzHy89VYPtXmir/Uyg+4Wpv37+9mF2Eyr52kQIgDM6UCSk Suk0CAcq3wf/QwbLXtmZixKOrsTBNBugslp13Ntbds/78RoMSDpm+UQOaDJz2M0smEYx GIibFqnzGWZ/lEXt88+mz4wFbB4L0ypw0M0BIptL/B2OfZHMHwvKaOYerEsTqq2gwLh2 Yx/xDiZOE4prNsky7/lWH+Zvny4jLbOVuFgs+56VeNO8NNuOWWE0B53D8v9NlqDXd4UU Y9pA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=EdIBdMp3AF8wTlK3ZbNuetiQCTdvpib+4RwLHSff3bA=; b=LtByyQILceC1oyTPvnXODRMHpxrBYhGmRJPvz1F0illqAAxB/8epX/QNlsmRRwqdH1 b7LY14txT1R3UX5KqyFyA92rBqjeqaxsdT4B6kAhY5NV+w0wvdwuyfUeXMbt+7GtY8sc duH10t2gu4I0WOZ+m3vU9BNoRSYsjszlckZYYHWctCg0WgEbp8ciJ54Zjz2e9ouQA41H q8gXSfouR9/rWGr4IUAHXEPDui4eiliFjJds0AjhgFUoKYb9zT0DtZ0Lao2V8skne8ti XDVMfRpsuhz8EffNRGByZqavO5vLoW2CdY4mzfkGzfYufa6dVBJjF1hxduOZt1rLEsfj 3bbg== X-Gm-Message-State: ANoB5pmHrrOgKDdRJmVtDwhmWRN20CqH9b3FOg6+qy/3rvTTL2PRi5Dg fVgmctooRv7d9vsUC1IC7WVJXQ== X-Received: by 2002:adf:fec7:0:b0:236:8d39:6f84 with SMTP id q7-20020adffec7000000b002368d396f84mr13166871wrs.152.1669116791291; Tue, 22 Nov 2022 03:33:11 -0800 (PST) Received: from stroh80.sec.9e.network (ip-078-094-000-051.um19.pools.vodafone-ip.de. [78.94.0.51]) by smtp.gmail.com with ESMTPSA id x11-20020a5d60cb000000b00241bc4880fesm12914086wrt.111.2022.11.22.03.33.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 03:33:10 -0800 (PST) From: Naresh Solanki X-Google-Original-From: Naresh Solanki To: Guenter Roeck , linux-hwmon@vger.kernel.org, Jean Delvare Cc: broonie@kernel.org, Naresh Solanki , linux-kernel@vger.kernel.org Subject: [PATCH 1/3] hwmon: (pmbus/core): Update regulator flag map Date: Tue, 22 Nov 2022 12:32:55 +0100 Message-Id: <20221122113257.3213700-1-Naresh.Solanki@9elements.com> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,UPPERCASE_50_75 autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750196602412194045?= X-GMAIL-MSGID: =?utf-8?q?1750196602412194045?= Add regulator flag map for PMBUS status byte & status input. Signed-off-by: Naresh Solanki --- drivers/hwmon/pmbus/pmbus_core.c | 52 +++++++++++++++++--------------- 1 file changed, 28 insertions(+), 24 deletions(-) base-commit: 2c71b3246ec3246522e8cb7c8191dc7a5d62cc70 diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c index 20ca26e19db7..08f96e2b4837 100644 --- a/drivers/hwmon/pmbus/pmbus_core.c +++ b/drivers/hwmon/pmbus/pmbus_core.c @@ -2756,26 +2756,47 @@ static const struct pmbus_regulator_status_category pmbus_regulator_flag_map[] = .reg = PMBUS_STATUS_VOUT, .bits = (const struct pmbus_regulator_status_assoc[]) { { PB_VOLTAGE_UV_WARNING, REGULATOR_ERROR_UNDER_VOLTAGE_WARN }, - { PB_VOLTAGE_UV_FAULT, REGULATOR_ERROR_UNDER_VOLTAGE }, + { PB_VOLTAGE_UV_FAULT, REGULATOR_ERROR_UNDER_VOLTAGE }, { PB_VOLTAGE_OV_WARNING, REGULATOR_ERROR_OVER_VOLTAGE_WARN }, - { PB_VOLTAGE_OV_FAULT, REGULATOR_ERROR_REGULATION_OUT }, + { PB_VOLTAGE_OV_FAULT, REGULATOR_ERROR_REGULATION_OUT }, { }, }, }, { .func = PMBUS_HAVE_STATUS_IOUT, .reg = PMBUS_STATUS_IOUT, .bits = (const struct pmbus_regulator_status_assoc[]) { - { PB_IOUT_OC_WARNING, REGULATOR_ERROR_OVER_CURRENT_WARN }, - { PB_IOUT_OC_FAULT, REGULATOR_ERROR_OVER_CURRENT }, - { PB_IOUT_OC_LV_FAULT, REGULATOR_ERROR_OVER_CURRENT }, + { PB_IOUT_OC_WARNING, REGULATOR_ERROR_OVER_CURRENT_WARN }, + { PB_IOUT_OC_FAULT, REGULATOR_ERROR_OVER_CURRENT }, + { PB_IOUT_OC_LV_FAULT, REGULATOR_ERROR_OVER_CURRENT }, + { PB_POUT_OP_FAULT, REGULATOR_ERROR_OVER_CURRENT }, { }, }, }, { .func = PMBUS_HAVE_STATUS_TEMP, .reg = PMBUS_STATUS_TEMPERATURE, .bits = (const struct pmbus_regulator_status_assoc[]) { - { PB_TEMP_OT_WARNING, REGULATOR_ERROR_OVER_TEMP_WARN }, - { PB_TEMP_OT_FAULT, REGULATOR_ERROR_OVER_TEMP }, + { PB_TEMP_OT_WARNING, REGULATOR_ERROR_OVER_TEMP_WARN }, + { PB_TEMP_OT_FAULT, REGULATOR_ERROR_OVER_TEMP }, + { }, + }, + }, { + .func = -1, + .reg = PMBUS_STATUS_BYTE, + .bits = (const struct pmbus_regulator_status_assoc[]) { + { PB_STATUS_IOUT_OC, REGULATOR_ERROR_OVER_CURRENT }, + { PB_STATUS_VOUT_OV, REGULATOR_ERROR_REGULATION_OUT }, + { PB_STATUS_VIN_UV, REGULATOR_ERROR_UNDER_VOLTAGE }, + { PB_STATUS_NONE_ABOVE, REGULATOR_ERROR_FAIL }, + { }, + }, + }, { + .func = PMBUS_HAVE_STATUS_INPUT, + .reg = PMBUS_STATUS_INPUT, + .bits = (const struct pmbus_regulator_status_assoc[]) { + { PB_IIN_OC_FAULT, REGULATOR_ERROR_OVER_CURRENT }, + { PB_VOLTAGE_OV_FAULT, REGULATOR_ERROR_OVER_VOLTAGE_WARN }, + { PB_VOLTAGE_OV_WARNING, REGULATOR_ERROR_OVER_VOLTAGE_WARN }, + { PB_VOLTAGE_UV_FAULT, REGULATOR_ERROR_UNDER_VOLTAGE }, { }, }, }, @@ -2834,23 +2855,6 @@ static int pmbus_regulator_get_error_flags(struct regulator_dev *rdev, unsigned if (status & PB_STATUS_POWER_GOOD_N) *flags |= REGULATOR_ERROR_REGULATION_OUT; } - /* - * Unlike most other status bits, PB_STATUS_{IOUT_OC,VOUT_OV} are - * defined strictly as fault indicators (not warnings). - */ - if (status & PB_STATUS_IOUT_OC) - *flags |= REGULATOR_ERROR_OVER_CURRENT; - if (status & PB_STATUS_VOUT_OV) - *flags |= REGULATOR_ERROR_REGULATION_OUT; - - /* - * If we haven't discovered any thermal faults or warnings via - * PMBUS_STATUS_TEMPERATURE, map PB_STATUS_TEMPERATURE to a warning as - * a (conservative) best-effort interpretation. - */ - if (!(*flags & (REGULATOR_ERROR_OVER_TEMP | REGULATOR_ERROR_OVER_TEMP_WARN)) && - (status & PB_STATUS_TEMPERATURE)) - *flags |= REGULATOR_ERROR_OVER_TEMP_WARN; return 0; }