From patchwork Wed Dec 14 08:07:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naresh Solanki X-Patchwork-Id: 33092 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp74749wrn; Wed, 14 Dec 2022 00:08:39 -0800 (PST) X-Google-Smtp-Source: AA0mqf4s+3kdBmIQgwU83/pJFSGnctOfFT+I0kbHsoffVNA3UVtHIdylBHqParN9B0odb2VZWl+t X-Received: by 2002:a17:906:2b46:b0:7c1:bb5:5704 with SMTP id b6-20020a1709062b4600b007c10bb55704mr19857456ejg.26.1671005319734; Wed, 14 Dec 2022 00:08:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671005319; cv=none; d=google.com; s=arc-20160816; b=JkP8p2aorsAqdxTXLqSS/Zx/7tu6CvZM2TQkiOBMDovzUzDaEwFjOi0dJsN+lDaM6P 1G1cZZEh8ppe7WW+yypmdcHSZ5S4U5N2n5RjVgo8wMaVBXo2LyGAh49vC5tqkifshif2 X8DdVyPMvEc/dmCFVn8+SqGDT5+dPwubihcsTtafGUMPAo4AazTQCd8136ZXELEdF1tg 6Gjsgj2QFGPc/cYXL+YJxI3pWaIWzo6W+l8z8FyfKfNT/MUugkEhF8H/9Le/Jnc9rJ8a z73Fm6U/b94bq+0AuTiMxlKmntGbzjxFI513X0mSNT7PiQmVDAj52tO8/ldVtyAAGB66 gd1g== 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=lrvSScxuHlRI0bKk77hVXZre2a8Ky0+wyi62OkXbDKg=; b=rE/euFIITDXMl3p+6k3auGn9UrdqjpV+h4tMQSV3auPNGKPb2pid3TEM7YrG4+Rbq8 OI1pJ1ViJ3D/a8djePHEJ7xRIVUKiV0vM4hxDO3kAznfEe30+fmfb9ZpARiyNrBGhOF/ BFrvp9zJWG76swtgZ49M8rJLXzloGKDDQHX1cqe4uS8hRrMaBie8t1psSIAn+frGF4pJ PHEytB4w8kKa9/x1D8nmgNtxtEEP8uDwO7iWjRvxH6zOa7pbvZh9ThA4wIg7M45/i/gB VzAicu9U2VEV+ApdTqtdnCwr/O2tiURFxM8iE+oJPxSOpWLFqO7GGZxUY8/XKNtFtjlR JUog== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@9elements.com header.s=google header.b=NDgGwNsa; 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 dr21-20020a170907721500b0079800b8172bsi2154393ejc.450.2022.12.14.00.08.14; Wed, 14 Dec 2022 00:08:39 -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=NDgGwNsa; 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 S237633AbiLNIHe (ORCPT + 99 others); Wed, 14 Dec 2022 03:07:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35020 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237528AbiLNIHY (ORCPT ); Wed, 14 Dec 2022 03:07:24 -0500 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B0C511EAE9 for ; Wed, 14 Dec 2022 00:07:23 -0800 (PST) Received: by mail-wr1-x430.google.com with SMTP id bx10so18447341wrb.0 for ; Wed, 14 Dec 2022 00:07:23 -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=lrvSScxuHlRI0bKk77hVXZre2a8Ky0+wyi62OkXbDKg=; b=NDgGwNsaUJ1PgX9iay1BXJXgXFINWdGVempBeKoivktTCLLoAyuyVtxpvX2J0aEEIz LZniGOWVou+nmDF33yOkNHFq2rvq2EfxY89n3hbbHOsayoBVyM9xUt93O1tzzyjifQpU tFgWks5akwxcLUtDpk0PxE5Ap95o+oNoDYNNh7P59OfqJk0/6OjjHRmzOUOki579kHG4 U84tPO3Hgd31UwCSw5zpCuPOFzGACnJ7JVhsuxIovIMIsvsa37lgx93go9AORv8ukVTn fJ/ltGXJL7Y3QxmhpAdAFAdIlv+kRKYFxPGYRhr5SmvD6QW/NjFaBc6dP/efe72EOkZc /GXA== 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=lrvSScxuHlRI0bKk77hVXZre2a8Ky0+wyi62OkXbDKg=; b=eMQBAjwtwlreNECZ+lEEw+9Njq2JnBpjthm3302+ngXIjmRhD9beoKh0gTlZxL2I/B ur28DAI+FKX4jtAPuYgOosXRCFyiQHKL44sUxwBnKUpLQtpAe8zpt1uReapKeT9kKqj1 1vmwdbx68SWHs6xU8eOrmfZ6upzrJwIDO7NFqfgGii0DM8wzHQvQtdHdIRZ1ByPJCjiF sfGrAf92aEL6zNPPyp9VkgzNx3kbrizKgijtMWIrURkzUcloqf+GrkiZUraI5O4slVXh avMde7C08+pA47wzwCDJ0ntAM8yDhXT7LEuKpT7A2K+OL7cXlmRtHSHwlDOkcuYhYSfB FT5A== X-Gm-Message-State: ANoB5pnDosku22OpcBCwMjJmRNyyFJZ8DnMprSD+Hh//pOS7c70J33xh NmxuQlCQfUgBrfA3XplRDrNGqQ== X-Received: by 2002:adf:fb4f:0:b0:236:621a:984c with SMTP id c15-20020adffb4f000000b00236621a984cmr14148584wrs.36.1671005242159; Wed, 14 Dec 2022 00:07:22 -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 k3-20020a5d5183000000b002422bc69111sm2500781wrv.9.2022.12.14.00.07.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Dec 2022 00:07:21 -0800 (PST) From: Naresh Solanki X-Google-Original-From: Naresh Solanki To: devicetree@vger.kernel.org, Guenter Roeck , Jean Delvare , Liam Girdwood , Mark Brown Cc: linux-kernel@vger.kernel.org, linux-hwmon@vger.kernel.org, Patrick Rudolph , Naresh Solanki Subject: [PATCH RESEND v6 1/5] hwmon: (pmbus/core): Add interrupt support Date: Wed, 14 Dec 2022 09:07:11 +0100 Message-Id: <20221214080715.2700442-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 autolearn=ham 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?1752176074108145396?= X-GMAIL-MSGID: =?utf-8?q?1752176074108145396?= From: Patrick Rudolph Implement PMBUS irq handler. Signed-off-by: Patrick Rudolph Signed-off-by: Naresh Solanki --- drivers/hwmon/pmbus/pmbus.h | 2 +- drivers/hwmon/pmbus/pmbus_core.c | 84 ++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 1 deletion(-) base-commit: 364ffd2537c44cb6914ff5669153f4a86fffad29 diff --git a/drivers/hwmon/pmbus/pmbus.h b/drivers/hwmon/pmbus/pmbus.h index 10fb17879f8e..6b2e6cf93b19 100644 --- a/drivers/hwmon/pmbus/pmbus.h +++ b/drivers/hwmon/pmbus/pmbus.h @@ -26,7 +26,7 @@ enum pmbus_regs { PMBUS_CAPABILITY = 0x19, PMBUS_QUERY = 0x1A, - + PMBUS_SMBALERT_MASK = 0x1B, PMBUS_VOUT_MODE = 0x20, PMBUS_VOUT_COMMAND = 0x21, PMBUS_VOUT_TRIM = 0x22, diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c index 95e95783972a..244fd2597252 100644 --- a/drivers/hwmon/pmbus/pmbus_core.c +++ b/drivers/hwmon/pmbus/pmbus_core.c @@ -3072,11 +3072,89 @@ static int pmbus_regulator_register(struct pmbus_data *data) return 0; } + +static int pmbus_write_smbalert_mask(struct i2c_client *client, u8 page, u8 reg, u8 val) +{ + return pmbus_write_word_data(client, page, PMBUS_SMBALERT_MASK, reg | (val << 8)); +} + +static irqreturn_t pmbus_fault_handler(int irq, void *pdata) +{ + struct pmbus_data *data = pdata; + struct i2c_client *client = to_i2c_client(data->dev); + int i, status; + + for (i = 0; i < data->info->pages; i++) { + + mutex_lock(&data->update_lock); + status = pmbus_read_status_word(client, i); + if (status < 0) { + mutex_unlock(&data->update_lock); + return status; + } + + if (status & ~(PB_STATUS_OFF | PB_STATUS_BUSY | PB_STATUS_POWER_GOOD_N)) + pmbus_clear_fault_page(client, i); + + mutex_unlock(&data->update_lock); + } + + return IRQ_HANDLED; +} + +static int pmbus_irq_setup(struct i2c_client *client, struct pmbus_data *data) +{ + struct device *dev = &client->dev; + const struct pmbus_regulator_status_category *cat; + const struct pmbus_regulator_status_assoc *bit; + int i, j, err, ret, func; + u8 mask; + + for (i = 0; i < data->info->pages; i++) { + func = data->info->func[i]; + + for (j = 0; j < ARRAY_SIZE(pmbus_regulator_flag_map); j++) { + cat = &pmbus_regulator_flag_map[j]; + if (!(func & cat->func)) + continue; + mask = 0; + for (bit = cat->bits; bit->pflag; bit++) + mask |= bit->pflag; + + err = pmbus_write_smbalert_mask(client, i, cat->reg, ~mask); + if (err) + dev_err(dev, "Failed to set smbalert for reg 0x%02x\n", cat->reg); + } + + pmbus_write_smbalert_mask(client, i, PMBUS_STATUS_CML, 0xff); + pmbus_write_smbalert_mask(client, i, PMBUS_STATUS_OTHER, 0xff); + pmbus_write_smbalert_mask(client, i, PMBUS_STATUS_MFR_SPECIFIC, 0xff); + if (data->info->func[i] & PMBUS_HAVE_FAN12) + pmbus_write_smbalert_mask(client, i, PMBUS_STATUS_FAN_12, 0xff); + if (data->info->func[i] & PMBUS_HAVE_FAN34) + pmbus_write_smbalert_mask(client, i, PMBUS_STATUS_FAN_34, 0xff); + } + + /* Register notifiers - can fail if IRQ is not given */ + ret = devm_request_threaded_irq(dev, client->irq, NULL, pmbus_fault_handler, + 0, "pmbus-irq", data); + if (ret) { + dev_warn(dev, "IRQ disabled %d\n", ret); + return ret; + } + + return 0; +} + #else static int pmbus_regulator_register(struct pmbus_data *data) { return 0; } +static int pmbus_irq_setup(struct i2c_client *client, struct pmbus_data *data) +{ + return 0; +} #endif static struct dentry *pmbus_debugfs_dir; /* pmbus debugfs directory */ @@ -3441,6 +3519,12 @@ int pmbus_do_probe(struct i2c_client *client, struct pmbus_driver_info *info) if (ret) return ret; + if (client->irq > 0) { + ret = pmbus_irq_setup(client, data); + if (ret) + return ret; + } + ret = pmbus_init_debugfs(client, data); if (ret) dev_warn(dev, "Failed to register debugfs\n"); From patchwork Wed Dec 14 08:07:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naresh Solanki X-Patchwork-Id: 33093 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp74752wrn; Wed, 14 Dec 2022 00:08:40 -0800 (PST) X-Google-Smtp-Source: AA0mqf5rCNrK7UTPIO+xFam028m0foEDruFcL0AkUygzyCzqzmGA4Z08VKFIeRz2Bi5NBZKczsRb X-Received: by 2002:a17:906:49c2:b0:7ad:acdf:d08f with SMTP id w2-20020a17090649c200b007adacdfd08fmr20124432ejv.11.1671005319955; Wed, 14 Dec 2022 00:08:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671005319; cv=none; d=google.com; s=arc-20160816; b=wE5B5rP4FiBcZvogUtJ9EAat0H5cN/kUd6T6e+oymhZ6zPO5uhRY+LYfKMyOLcQC+e th8VajdNPTw+r6KIQ9MMj+0jWLSZG3JyP5mMCP0zuZuKEld39iz95d/L4HTwCRicjmeo c/KPWpTDlgYcSIZlZP+DMTo0Sz6qFoRrbYblLuM8HfqWA08yq12m6u/KK78rn7tCbi6g xRo6p/Tea44abLL+vBalIibAm0p/NAjJegTYZKNHnpf6GUv4DHeBoWNJC9yzPCFCHITm epvyJxKk1eICMlQXb/DZNY7UyMzrLowA9h8//eAGzbeQPT6irFL7+xETJj1Gd7t+g5sh w2kw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=cxBW8yp9uVxjnMmLtiQH8YKJ4OzTSN8FpMGVyjSKVsU=; b=yrCHhQgZLjaxMIshaHm965NCvqsNImfwion6vWmFPqJHItyzdh+zf9OKpz4ZgR7lsJ d8ciLnagkeH4vKL1CVrs9QVWLjEiSzRlAE1++H63NCo6sSBapFPxSrR0oL63rFNAXElY IQSczDD2sSno7rM3UFN325gGpi/ha6Kzg48KZ8YeaWSFH3OUnZpOzswt8M3N3aH/EsJk QgOAUtyUXKu0i9P2iW5H+0zUeg0kUeUtsxvTa2j79WYfRhZS161nwpMPBd5HCud8H3Gq SkwJaEqeKMBCovkjsHHUW6CmSZHlJ9AUHdntTOjbYDCEVBZo1Gngc3zckfUvvAcyNnu/ E1Lw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@9elements.com header.s=google header.b=I7Tlplv0; 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 du1-20020a17090772c100b007ae10525573si8052644ejc.671.2022.12.14.00.08.14; Wed, 14 Dec 2022 00:08:39 -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=I7Tlplv0; 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 S237645AbiLNIHk (ORCPT + 99 others); Wed, 14 Dec 2022 03:07:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35070 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237551AbiLNIHZ (ORCPT ); Wed, 14 Dec 2022 03:07:25 -0500 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA37A1EC74 for ; Wed, 14 Dec 2022 00:07:24 -0800 (PST) Received: by mail-wr1-x436.google.com with SMTP id h7so18417186wrs.6 for ; Wed, 14 Dec 2022 00:07:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=cxBW8yp9uVxjnMmLtiQH8YKJ4OzTSN8FpMGVyjSKVsU=; b=I7Tlplv0te9iHlBXHdq2mbDLsr157BzIU5BI9+6K31yXeihg+x0paGoP8mw+h74MGe BD3ymOvEKHI3dHriPIrtpruJMSPjn2Thb/LQuIDnWFQq9x9act5RGCFDquo4vIxGzVkU tOvFxfeZW/S5oBz1vmmegbN80P6Ai4faqxnUQdxo/a29fF0TE5mZDCywmzglvkB/vKYR RVHx7EnlylviydZyaXgaot9DYMqj26wKTAqEQ+JKsV3hbPUAM/MYyhIDRmuXc/Iu1YEk 2zUhS4s+vSMX+ohSeZKkB1TMDLSKydMQwx3EE5lDXJkiCX7X7dg2mdoZo90W2k9QtT09 fm8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cxBW8yp9uVxjnMmLtiQH8YKJ4OzTSN8FpMGVyjSKVsU=; b=nQrHWHqo3TUiTrGhG+LQoyH8HSYYuYrtuhKr6ENPUZ95X+pR4JPwHGEm45vbiKIbuw yLmMTsJTStFNqblLpLaSiEWHfg8El2eNpk9FQmxGB6xaKkIWdiwgjpJpj037Li6TBAYZ oKyGTuxSGEM3eOa4oaRa0soYRQRJwcgsGfDHw8AialWSn6WQRZ3Xs3yqO27L76iJjxDY Q0CiEeCdr2sv83F60lYxh5XmEnNkW5+cGLglM+WdYSBDhecuM2kMc2IeL9W6b1Go4AAX R7uwS4JxX9kuS6WVByEEm6gqDRoLTXriH0LjnT9VbmaYtgf/eVL0c0G1bTnwOCwFafrH GrVw== X-Gm-Message-State: ANoB5pk+cQWz8NFdyl57TuZMy9XwCYh3lWKTS4PaxdBuKR56N73Fy/UW xfg/aIAlQ/o2u09OGO0sbamoQA== X-Received: by 2002:a5d:64c5:0:b0:242:1748:130e with SMTP id f5-20020a5d64c5000000b002421748130emr20005159wri.31.1671005243234; Wed, 14 Dec 2022 00:07:23 -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 k3-20020a5d5183000000b002422bc69111sm2500781wrv.9.2022.12.14.00.07.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Dec 2022 00:07:22 -0800 (PST) From: Naresh Solanki X-Google-Original-From: Naresh Solanki To: devicetree@vger.kernel.org, Guenter Roeck , Jean Delvare , Liam Girdwood , Mark Brown Cc: linux-kernel@vger.kernel.org, linux-hwmon@vger.kernel.org, Patrick Rudolph , Naresh Solanki Subject: [PATCH RESEND v6 2/5] hwmon: (pmbus/core): Notify hwmon events Date: Wed, 14 Dec 2022 09:07:12 +0100 Message-Id: <20221214080715.2700442-2-Naresh.Solanki@9elements.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221214080715.2700442-1-Naresh.Solanki@9elements.com> References: <20221214080715.2700442-1-Naresh.Solanki@9elements.com> 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 autolearn=ham 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?1752176074238787591?= X-GMAIL-MSGID: =?utf-8?q?1752176074238787591?= Notify hwmon events using the pmbus irq handler. Signed-off-by: Naresh Solanki --- drivers/hwmon/pmbus/pmbus_core.c | 95 ++++++++++++++++++++++++-------- 1 file changed, 72 insertions(+), 23 deletions(-) diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c index 244fd2597252..b005a1c8ad7e 100644 --- a/drivers/hwmon/pmbus/pmbus_core.c +++ b/drivers/hwmon/pmbus/pmbus_core.c @@ -2781,18 +2781,43 @@ static const struct pmbus_regulator_status_category pmbus_regulator_flag_map[] = }, }; -static int pmbus_regulator_get_error_flags(struct regulator_dev *rdev, unsigned int *flags) +#define to_dev_attr(_dev_attr) \ + container_of(_dev_attr, struct device_attribute, attr) + +static void pmbus_notify(struct pmbus_data *data, int page, int reg, int flags) +{ + int i; + + for (i = 0; i < data->num_attributes; i++) { + struct device_attribute *da = to_dev_attr(data->group.attrs[i]); + struct sensor_device_attribute *attr = to_sensor_dev_attr(da); + int index = attr->index; + u16 smask = pb_index_to_mask(index); + u8 spage = pb_index_to_page(index); + u16 sreg = pb_index_to_reg(index); + + if (reg == sreg && page == spage && (smask & flags)) { + dev_dbg(data->dev, "sysfs notify: %s", da->attr.name); + sysfs_notify(&data->dev->kobj, NULL, da->attr.name); + kobject_uevent(&data->dev->kobj, KOBJ_CHANGE); + flags &= ~smask; + } + + if (!flags) + break; + } +} + +static int pmbus_get_flags(struct pmbus_data *data, u8 page, unsigned int *error, + bool notify) { - int i, status; const struct pmbus_regulator_status_category *cat; const struct pmbus_regulator_status_assoc *bit; - struct device *dev = rdev_get_dev(rdev); - struct i2c_client *client = to_i2c_client(dev->parent); - struct pmbus_data *data = i2c_get_clientdata(client); - u8 page = rdev_get_id(rdev); + struct i2c_client *client = to_i2c_client(data->dev); int func = data->info->func[page]; + int i, status, ret; - *flags = 0; + *error = 0; mutex_lock(&data->update_lock); @@ -2803,14 +2828,17 @@ static int pmbus_regulator_get_error_flags(struct regulator_dev *rdev, unsigned status = _pmbus_read_byte_data(client, page, cat->reg); if (status < 0) { - mutex_unlock(&data->update_lock); - return status; + ret = status; + goto unlock; } for (bit = cat->bits; bit->pflag; bit++) { if (status & bit->pflag) - *flags |= bit->rflag; + *error |= bit->rflag; } + + if (notify && status) + pmbus_notify(data, page, cat->reg, status); } /* @@ -2823,36 +2851,53 @@ static int pmbus_regulator_get_error_flags(struct regulator_dev *rdev, unsigned * REGULATOR_ERROR__WARN. */ status = pmbus_get_status(client, page, PMBUS_STATUS_WORD); - mutex_unlock(&data->update_lock); - if (status < 0) - return status; - if (pmbus_regulator_is_enabled(rdev)) { + if (status < 0) { + ret = status; + goto unlock; + } + + ret = _pmbus_read_byte_data(client, page, PMBUS_OPERATION); + if (ret < 0) + goto unlock; + + if (ret & PB_OPERATION_CONTROL_ON) { if (status & PB_STATUS_OFF) - *flags |= REGULATOR_ERROR_FAIL; + *error |= REGULATOR_ERROR_FAIL; if (status & PB_STATUS_POWER_GOOD_N) - *flags |= REGULATOR_ERROR_REGULATION_OUT; + *error |= 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; + *error |= REGULATOR_ERROR_OVER_CURRENT; if (status & PB_STATUS_VOUT_OV) - *flags |= REGULATOR_ERROR_REGULATION_OUT; + *error |= 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)) && + if (!(*error & (REGULATOR_ERROR_OVER_TEMP | REGULATOR_ERROR_OVER_TEMP_WARN)) && (status & PB_STATUS_TEMPERATURE)) - *flags |= REGULATOR_ERROR_OVER_TEMP_WARN; + *error |= REGULATOR_ERROR_OVER_TEMP_WARN; - return 0; +unlock: + mutex_unlock(&data->update_lock); + return ret; +} + +static int pmbus_regulator_get_error_flags(struct regulator_dev *rdev, unsigned int *flags) +{ + struct device *dev = rdev_get_dev(rdev); + struct i2c_client *client = to_i2c_client(dev->parent); + struct pmbus_data *data = i2c_get_clientdata(client); + + return pmbus_get_flags(data, rdev_get_id(rdev), flags, false); } static int pmbus_regulator_get_status(struct regulator_dev *rdev) @@ -3082,10 +3127,14 @@ static irqreturn_t pmbus_fault_handler(int irq, void *pdata) { struct pmbus_data *data = pdata; struct i2c_client *client = to_i2c_client(data->dev); - int i, status; + int i, status, ret; for (i = 0; i < data->info->pages; i++) { + ret = pmbus_get_flags(data, i, &status, true); + if (ret) + return ret; + mutex_lock(&data->update_lock); status = pmbus_read_status_word(client, i); if (status < 0) { @@ -3099,7 +3148,7 @@ static irqreturn_t pmbus_fault_handler(int irq, void *pdata) mutex_unlock(&data->update_lock); } - return IRQ_HANDLED; + return ret; } static int pmbus_irq_setup(struct i2c_client *client, struct pmbus_data *data) From patchwork Wed Dec 14 08:07:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naresh Solanki X-Patchwork-Id: 33094 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp74874wrn; Wed, 14 Dec 2022 00:09:00 -0800 (PST) X-Google-Smtp-Source: AA0mqf6MrybJkgFa/pabRFwpHUpc9HHh2nEUOB/jrareGDxnS06aw8CrKkz2MePGBu6DcAVwy5Xu X-Received: by 2002:a17:906:b091:b0:7ae:bfec:74c7 with SMTP id x17-20020a170906b09100b007aebfec74c7mr20883957ejy.72.1671005340259; Wed, 14 Dec 2022 00:09:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671005340; cv=none; d=google.com; s=arc-20160816; b=c6cK4EBFX+TpTSuU7nds4DGB4GN5gF/XBUI5XgqrmqXyf/1ZLQnvQsdkT+ZbtRsWcj riFTI/I6EBnZZz8LruPqxKJw+ss9I/jVlQQgdjafgUXnrdgMMHLr1ld4xUSW0x6zu+42 8lud5wYxsbiNqIKuRrrCPNFinQLLitNpP3Grd3q0zDplNPzLuI6AB/hSjtucZhABS1ke EDrD6fckZmb8tTNaU0rPaCaPBdvXSCLL45usyNP+r0/zso6x7Qf62onsNi3QJN7KVMhP DpYMOclAKOcFdcsFWkFzMmm/pYpyYQ2ZNypjSdWVfG5kgorRmwS6Occv5wBKTews29Gg o9nA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=DPKbqc0ak5V4UJgzOj7j3ooXS6vGnBnkbq2OKYA/WT4=; b=TneN17jzGcNeEa2bRQ+KGVFHUGrRI47sjmKQZ0RzNyxFBgGNRXzuf15+8ki00km1iK 4BooK6gJTWA5L9wfbXT2xsYxbQiCBBxx79ED/rvgR5BzCUp4CP3GMr5REikXumTNrGtW qHs+Da2P2xc/sUcIbkEitGpbwbMXOqGy90WT5zlZpFZxFerAjQTe7b/mLG/QB0a1yRiX wAEWrmqCudjucLCquPrKDw80qqNf0qzql8V1Xc+AbbRrv4O3E01B9OnocroXd3KX8FUT XyIK6x3fXkcalk5eu90+CV1MEbIyQpi9WUX9Mwzj++BkA2t/NFnpOPD3YeBlq61mm/W6 HJiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@9elements.com header.s=google header.b=GKMFGf7u; 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 ji18-20020a170907981200b0078d484e0e79si11374102ejc.481.2022.12.14.00.08.34; Wed, 14 Dec 2022 00:09:00 -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=GKMFGf7u; 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 S237673AbiLNIHm (ORCPT + 99 others); Wed, 14 Dec 2022 03:07:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35090 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237570AbiLNIH0 (ORCPT ); Wed, 14 Dec 2022 03:07:26 -0500 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9CFAB1EECE for ; Wed, 14 Dec 2022 00:07:25 -0800 (PST) Received: by mail-wr1-x42c.google.com with SMTP id h7so18417228wrs.6 for ; Wed, 14 Dec 2022 00:07:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DPKbqc0ak5V4UJgzOj7j3ooXS6vGnBnkbq2OKYA/WT4=; b=GKMFGf7uTwbrGxI72tbBYjGVoIHtTjvHBLWSUmjOvGwhKnjG1sd1NNkSsecFPljB5r lg4ycYrz/8FSi/Ai9o9t2R5Bm26ByJEKc2jeKMSywKSSMzsocU8Rmx18GjSXxnxofumH pV1u8y2fyS6V3BIYWr3Kej7OcY67raaFmiuwQN0IymI8mIWzsZRGTTOsWplLnu6mZXN4 HQAyAQa3zUFAoN9rnDDjdfKxmRxfSBJc9+EZkzdbubpCPbrh84SXui/oRRJc2XXcdEic gd/VnYDd8PoaypUf8V134FPEvEf/KbMTmLoJ/BeR+5GJdO2B3ZeaYOsaH/qTUAlwkSMn 1krw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DPKbqc0ak5V4UJgzOj7j3ooXS6vGnBnkbq2OKYA/WT4=; b=jnFAxo2luAIXhaDA/DNAXYtKY0byQ+kN75WDN0gO7tuLO5VvTkQe7mDrVq6mw+Nqaj QpCIRi4NvLmA9EHGd+3l8v0g7uBLSh3HC2WJ9n7WpqscOPqmla7rEzR2+rwRs0lAJnU5 mOQ8rxKxjcG5wpo8xFJXz53y3lEF8N87mnMbNBCOm3kLhrDd9Xczpjblmghp08Cj0lVu 4HJUK6IitvXQQ31AKgn4uuXUhGaZvYOBn0Kx8CcGj/MnXOzgVNNEQF0K928R2LeyfmpI uw0E2GWmlfmqOai+yUCJYTCFwwhBUNCqLk26nGfOMG3IF4fMcPGd47enf/VHv8E3bO2j C7rA== X-Gm-Message-State: ANoB5pkuIQCRNztlfdPX6JJ2G0gibI2iExchGymRqUs3F7YKENAlQ5hn wzcSUFQwJQh8udQKwV1P0zkrrw== X-Received: by 2002:adf:fc8a:0:b0:242:14bb:439d with SMTP id g10-20020adffc8a000000b0024214bb439dmr13317808wrr.43.1671005244192; Wed, 14 Dec 2022 00:07:24 -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 k3-20020a5d5183000000b002422bc69111sm2500781wrv.9.2022.12.14.00.07.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Dec 2022 00:07:23 -0800 (PST) From: Naresh Solanki X-Google-Original-From: Naresh Solanki To: devicetree@vger.kernel.org, Guenter Roeck , Jean Delvare , Liam Girdwood , Mark Brown Cc: linux-kernel@vger.kernel.org, linux-hwmon@vger.kernel.org, Patrick Rudolph , Naresh Solanki Subject: [PATCH RESEND v6 3/5] hwmon: (pmbus/core): Add rdev in pmbus_data struct Date: Wed, 14 Dec 2022 09:07:13 +0100 Message-Id: <20221214080715.2700442-3-Naresh.Solanki@9elements.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221214080715.2700442-1-Naresh.Solanki@9elements.com> References: <20221214080715.2700442-1-Naresh.Solanki@9elements.com> 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 autolearn=ham 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?1752176095891310565?= X-GMAIL-MSGID: =?utf-8?q?1752176095891310565?= Add regulator device in pmbus_data & initialize the same during PMBus regulator register. Signed-off-by: Naresh Solanki --- Change in V5: - Fix error check for rdev --- drivers/hwmon/pmbus/pmbus_core.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c index b005a1c8ad7e..afd98e639b4f 100644 --- a/drivers/hwmon/pmbus/pmbus_core.c +++ b/drivers/hwmon/pmbus/pmbus_core.c @@ -81,6 +81,7 @@ struct pmbus_label { struct pmbus_data { struct device *dev; struct device *hwmon_dev; + struct regulator_dev **rdevs; u32 flags; /* from platform data */ @@ -3095,9 +3096,13 @@ static int pmbus_regulator_register(struct pmbus_data *data) struct device *dev = data->dev; const struct pmbus_driver_info *info = data->info; const struct pmbus_platform_data *pdata = dev_get_platdata(dev); - struct regulator_dev *rdev; int i; + data->rdevs = devm_kzalloc(dev, sizeof(struct regulator_dev *) * info->num_regulators, + GFP_KERNEL); + if (!data->rdevs) + return -ENOMEM; + for (i = 0; i < info->num_regulators; i++) { struct regulator_config config = { }; @@ -3107,10 +3112,10 @@ static int pmbus_regulator_register(struct pmbus_data *data) if (pdata && pdata->reg_init_data) config.init_data = &pdata->reg_init_data[i]; - rdev = devm_regulator_register(dev, &info->reg_desc[i], + data->rdevs[i] = devm_regulator_register(dev, &info->reg_desc[i], &config); - if (IS_ERR(rdev)) - return dev_err_probe(dev, PTR_ERR(rdev), + if (IS_ERR(data->rdevs[i])) + return dev_err_probe(dev, PTR_ERR(data->rdevs[i]), "Failed to register %s regulator\n", info->reg_desc[i].name); } From patchwork Wed Dec 14 08:07:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naresh Solanki X-Patchwork-Id: 33096 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp75416wrn; Wed, 14 Dec 2022 00:10:24 -0800 (PST) X-Google-Smtp-Source: AA0mqf5NCxedq3JE+n9tdz48CY192XdCKSjGvUSoJLnJERpGkLPoJ8oAcX370sohswg+f7WvTl7A X-Received: by 2002:aa7:d5ce:0:b0:46b:aedf:f32b with SMTP id d14-20020aa7d5ce000000b0046baedff32bmr26725614eds.4.1671005424074; Wed, 14 Dec 2022 00:10:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671005424; cv=none; d=google.com; s=arc-20160816; b=VrtiPy3fBbQn+Am9R0ETVNIraDri/KeyHjMMjhcQWkZXjMafbkkXm0VPPMD4iz2ViS FqPC1isFoAvo4UVex1i72fCiVdZBwZFkEdGbj5tqwzAByYLohJk+QhTzpdkzyCb260hQ n5cA5x695MrXcpgixXCyv9gXD4Ec7hS4QXsVa8ZFPkzMPhsqFl9y0g/L/9Goo69Eo/Ob ACl/RI3iF4ZxTjLegi9rhvyFjBjfp1GwJbs7/ChYIfkRFz25jWISeLPOkklsz12qTO28 VBpjNScTA4yAzqNrGcyHgV0t5P1YGtzucP+eFv+T/9X7qGj1hoEM+QSmlGxrIBSELX9A PkyA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=l4I7a1GqXJo8TnUT7+EadFpwe8WXb+46MsnUGIDBeH8=; b=yrlkNBW8JC2S0bBz/XtEgi94M+sXa4OYVcgF5VO/CImb81a8r75fvNCRGZ4scM3qDB Lwg7e6SojWyG/mSsLdBHVFAnSAzI8tqlu9n4WACHPJyT/IuEEz3ZN6qoejcL9yt2Pj5Z vCYA11AhGbLuAJxKkc1t8NmV9CqhP7ucsQZsrYJno+JYUitpYDcUb8IseeM9/Axzm85h AF+K0/NLySsZaf+dRn/+GmfF1t5LaiXTpX2/EVZC1DDt7sVxonYEf21bXN1tFKJxjPlj YoroIsV9bGn/RXnY+JUOLGu16e7ATg/TUW88QtdgacQZHBRSsHj1UIDWD+fMUvr6CuT8 iZiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@9elements.com header.s=google header.b=d2f4tYg1; 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 u23-20020a056402065700b0046b2966d088si9501542edx.502.2022.12.14.00.10.00; Wed, 14 Dec 2022 00:10:24 -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=d2f4tYg1; 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 S237689AbiLNIHq (ORCPT + 99 others); Wed, 14 Dec 2022 03:07:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35024 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237566AbiLNIH2 (ORCPT ); Wed, 14 Dec 2022 03:07:28 -0500 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C13BC1EADF for ; Wed, 14 Dec 2022 00:07:26 -0800 (PST) Received: by mail-wr1-x436.google.com with SMTP id w15so18399830wrl.9 for ; Wed, 14 Dec 2022 00:07:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=l4I7a1GqXJo8TnUT7+EadFpwe8WXb+46MsnUGIDBeH8=; b=d2f4tYg1ydCRNbpi9K6fJxUJaAagYBs6CBH5ii7Q0/v2HdNvZpwDB855rUnYjzK10U YwmsQlUPlu1Olq1oOtaVCcDvbTb8nZ885T6wBxYNNkEVa+mmbJbVjNSrgU7v6ozMJ4V6 bAVvbrX4v3UfVodsuFmwQQSqpk4kxRIPPrrsDXEjdxTpDAdlbpyCQACzkAzxh3EVK+Lk OLEpHKKtf7gVH4x1wJefIITrI4nRd3cqu0dxHFw8GnNPQkwAkGVfACcn8DeKAUQ9zWaw XN7wMv0SNnCm+yBKLcSulbHMPq94eIduM6GZTp+SquA8ymOyU3VK/aD/T+iq7v/+MJQn 6N0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=l4I7a1GqXJo8TnUT7+EadFpwe8WXb+46MsnUGIDBeH8=; b=TjoIg4Gi2wNlHBkFGY885dgyl4jiZwXwPSduU8DLmhT1HtqRGbNbKfM1CkKdmo4P6s NNfrJxDPS2xy5waj3yQddP2tr1WVH0Ub9VtsnmPUT/67aW+LgKCVZL128JuSTlaRLqwS YPzjA1GB0YXNWYnBn/oXFgwRsG1VozIqzzjOajmV26Hc/E4EQNBGKjSE38P65ww07fPc rTqC+ZMuNVygkkvzWPfm8qewZlt1Crbtwsry8o9tXCbT6N+jPU2ItbFKutQRv3C3Qcpd kS7hKr0rxy4cIEZYhE/2GnXbYl7O7YqR/qM0PjMcEeHdZ/kfF/upPq9nmobwjv2wnRqa mmUg== X-Gm-Message-State: ANoB5pmPBvnIUl0ocnL0b1QnDs54Xnd2UQrVbtYSNxL1VckXjvP6BUh5 PSuxgfU0D38gSbkBUhPzf0pyvg== X-Received: by 2002:adf:fd0e:0:b0:242:1926:783d with SMTP id e14-20020adffd0e000000b002421926783dmr18661142wrr.7.1671005245266; Wed, 14 Dec 2022 00:07:25 -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 k3-20020a5d5183000000b002422bc69111sm2500781wrv.9.2022.12.14.00.07.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Dec 2022 00:07:25 -0800 (PST) From: Naresh Solanki X-Google-Original-From: Naresh Solanki To: devicetree@vger.kernel.org, Guenter Roeck , Jean Delvare , Liam Girdwood , Mark Brown Cc: linux-kernel@vger.kernel.org, linux-hwmon@vger.kernel.org, Patrick Rudolph , Naresh Solanki Subject: [PATCH RESEND v6 4/5] hwmon: (pmbus/core): Add regulator event support Date: Wed, 14 Dec 2022 09:07:14 +0100 Message-Id: <20221214080715.2700442-4-Naresh.Solanki@9elements.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221214080715.2700442-1-Naresh.Solanki@9elements.com> References: <20221214080715.2700442-1-Naresh.Solanki@9elements.com> 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 autolearn=unavailable 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?1752176183420100392?= X-GMAIL-MSGID: =?utf-8?q?1752176183420100392?= From: Patrick Rudolph Add regulator events corresponding to regulator error in regulator flag map. Also capture the same in pmbus_regulator_get_flags. Signed-off-by: Patrick Rudolph Signed-off-by: Naresh Solanki --- drivers/hwmon/pmbus/pmbus_core.c | 69 +++++++++++++++++++++----------- 1 file changed, 46 insertions(+), 23 deletions(-) diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c index afd98e639b4f..22176f266891 100644 --- a/drivers/hwmon/pmbus/pmbus_core.c +++ b/drivers/hwmon/pmbus/pmbus_core.c @@ -2739,9 +2739,9 @@ static int pmbus_regulator_disable(struct regulator_dev *rdev) return _pmbus_regulator_on_off(rdev, 0); } -/* A PMBus status flag and the corresponding REGULATOR_ERROR_* flag */ +/* A PMBus status flag and the corresponding REGULATOR_ERROR_* and REGULATOR_EVENTS_* flag */ struct pmbus_regulator_status_assoc { - int pflag, rflag; + int pflag, rflag, eflag; }; /* PMBus->regulator bit mappings for a PMBus status register */ @@ -2756,27 +2756,36 @@ static const struct pmbus_regulator_status_category pmbus_regulator_flag_map[] = .func = PMBUS_HAVE_STATUS_VOUT, .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_OV_WARNING, REGULATOR_ERROR_OVER_VOLTAGE_WARN }, - { PB_VOLTAGE_OV_FAULT, REGULATOR_ERROR_REGULATION_OUT }, + { PB_VOLTAGE_UV_WARNING, REGULATOR_ERROR_UNDER_VOLTAGE_WARN, + REGULATOR_EVENT_UNDER_VOLTAGE_WARN }, + { PB_VOLTAGE_UV_FAULT, REGULATOR_ERROR_UNDER_VOLTAGE, + REGULATOR_EVENT_UNDER_VOLTAGE }, + { PB_VOLTAGE_OV_WARNING, REGULATOR_ERROR_OVER_VOLTAGE_WARN, + REGULATOR_EVENT_OVER_VOLTAGE_WARN }, + { PB_VOLTAGE_OV_FAULT, REGULATOR_ERROR_REGULATION_OUT, + REGULATOR_EVENT_OVER_VOLTAGE_WARN }, { }, }, }, { .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, + REGULATOR_EVENT_OVER_CURRENT_WARN }, + { PB_IOUT_OC_FAULT, REGULATOR_ERROR_OVER_CURRENT, + REGULATOR_EVENT_OVER_CURRENT }, + { PB_IOUT_OC_LV_FAULT, REGULATOR_ERROR_OVER_CURRENT, + REGULATOR_EVENT_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, + REGULATOR_EVENT_OVER_TEMP_WARN }, + { PB_TEMP_OT_FAULT, REGULATOR_ERROR_OVER_TEMP, + REGULATOR_EVENT_OVER_TEMP }, { }, }, }, @@ -2810,7 +2819,7 @@ static void pmbus_notify(struct pmbus_data *data, int page, int reg, int flags) } static int pmbus_get_flags(struct pmbus_data *data, u8 page, unsigned int *error, - bool notify) + unsigned int *event, bool notify) { const struct pmbus_regulator_status_category *cat; const struct pmbus_regulator_status_assoc *bit; @@ -2819,6 +2828,7 @@ static int pmbus_get_flags(struct pmbus_data *data, u8 page, unsigned int *error int i, status, ret; *error = 0; + *event = 0; mutex_lock(&data->update_lock); @@ -2833,10 +2843,11 @@ static int pmbus_get_flags(struct pmbus_data *data, u8 page, unsigned int *error goto unlock; } - for (bit = cat->bits; bit->pflag; bit++) { - if (status & bit->pflag) + for (bit = cat->bits; bit->pflag; bit++) + if (status & bit->pflag) { *error |= bit->rflag; - } + *event |= bit->eflag; + } if (notify && status) pmbus_notify(data, page, cat->reg, status); @@ -2863,20 +2874,28 @@ static int pmbus_get_flags(struct pmbus_data *data, u8 page, unsigned int *error goto unlock; if (ret & PB_OPERATION_CONTROL_ON) { - if (status & PB_STATUS_OFF) + if (status & PB_STATUS_OFF) { *error |= REGULATOR_ERROR_FAIL; + *event |= REGULATOR_EVENT_FAIL; + } - if (status & PB_STATUS_POWER_GOOD_N) + if (status & PB_STATUS_POWER_GOOD_N) { *error |= REGULATOR_ERROR_REGULATION_OUT; + *event |= REGULATOR_EVENT_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) + if (status & PB_STATUS_IOUT_OC) { *error |= REGULATOR_ERROR_OVER_CURRENT; - if (status & PB_STATUS_VOUT_OV) + *event |= REGULATOR_EVENT_OVER_CURRENT; + } + if (status & PB_STATUS_VOUT_OV) { *error |= REGULATOR_ERROR_REGULATION_OUT; + *event |= REGULATOR_EVENT_FAIL; + } /* * If we haven't discovered any thermal faults or warnings via @@ -2884,8 +2903,10 @@ static int pmbus_get_flags(struct pmbus_data *data, u8 page, unsigned int *error * a (conservative) best-effort interpretation. */ if (!(*error & (REGULATOR_ERROR_OVER_TEMP | REGULATOR_ERROR_OVER_TEMP_WARN)) && - (status & PB_STATUS_TEMPERATURE)) + (status & PB_STATUS_TEMPERATURE)) { *error |= REGULATOR_ERROR_OVER_TEMP_WARN; + *event |= REGULATOR_EVENT_OVER_TEMP_WARN; + } unlock: mutex_unlock(&data->update_lock); @@ -2897,8 +2918,9 @@ static int pmbus_regulator_get_error_flags(struct regulator_dev *rdev, unsigned struct device *dev = rdev_get_dev(rdev); struct i2c_client *client = to_i2c_client(dev->parent); struct pmbus_data *data = i2c_get_clientdata(client); + int event; - return pmbus_get_flags(data, rdev_get_id(rdev), flags, false); + return pmbus_get_flags(data, rdev_get_id(rdev), flags, &event, false); } static int pmbus_regulator_get_status(struct regulator_dev *rdev) @@ -3132,11 +3154,12 @@ static irqreturn_t pmbus_fault_handler(int irq, void *pdata) { struct pmbus_data *data = pdata; struct i2c_client *client = to_i2c_client(data->dev); - int i, status, ret; + int i, status, ret, event; for (i = 0; i < data->info->pages; i++) { - ret = pmbus_get_flags(data, i, &status, true); + ret = pmbus_get_flags(data, i, &status, &event, true); + if (ret) return ret; From patchwork Wed Dec 14 08:07:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naresh Solanki X-Patchwork-Id: 33095 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp74950wrn; Wed, 14 Dec 2022 00:09:12 -0800 (PST) X-Google-Smtp-Source: AA0mqf4LAc2xEUpqvokZQl9nJxjCFQTATdvIKKAOxDxEiDWQYF3vyAkISNXbzqoBcl35vk6tbiFQ X-Received: by 2002:a05:6402:294b:b0:461:ca30:653 with SMTP id ed11-20020a056402294b00b00461ca300653mr22910815edb.31.1671005351868; Wed, 14 Dec 2022 00:09:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671005351; cv=none; d=google.com; s=arc-20160816; b=yreqzA5ql6mXwQb6uM+P8RlGLd6wZ2szQdUESetKNmHBSNfQZtM+x/9Y7CfYQacgxB +smiWT1fekQNerhwo8bzgL5H/jH6xJZYtZBa0fNFVmt8hGAaFtdH/FKceLtYdLrFkGO0 tDQERJKHsZikWbgfqTJMLJQ+sLZiyRL63J0iYv7MrrM67wF2miyJYlu8AGyGvsOuY7X2 ceOlnYD8tYQcZV86wqy2LFyOwftmssP3YgowRiZDUSpMyOdAD0dAjIHzxbDVfRWQ1dtJ UkdJxk5Q/iWbpCSGo72cTb1Jts0DXxp59JnL1BjyV48xCxk4C+0noJg/3LCFg5a5Z2+V CcIw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=YmisXUUTcc/2wLYtw2JwGMf2iLn2WSeYXglBIEeZoho=; b=Pdhm7Dvpg8dDY9oTlhlAwGqfDcrEi1vkBgrS7zUonFDCiM4wWuJHHop/6+fuE0ASvm zla4l3vMy3aUCM3FZx5MZ6QrotHhGaPDJT9e8WfVxt3g+yHkWWHDCZs/ZgQRgBqWFoLI oYVJTyXT5SzM/Y/4tfnL1B0mDhoKy9tK0ChIfEFnhONFL/2iJoHw+o0cSVqVYtJsCOz0 zuAe1aKAn9QlkN8DV20l86jWVd1iFpwBrrrIdCvXrI13JZWfSalOwYfGyHjrwaywHtrS U54Jt8xRqSqfTy8UsbRFo88Ueyqb+3Z5tZHgRo94iOF10xidhMzTPfWwKWXDUSqZVpC4 5ZbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@9elements.com header.s=google header.b="M8/xtqY2"; 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 h18-20020a056402281200b0046b953601besi13380277ede.29.2022.12.14.00.08.47; Wed, 14 Dec 2022 00:09:11 -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="M8/xtqY2"; 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 S237502AbiLNIHw (ORCPT + 99 others); Wed, 14 Dec 2022 03:07:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34986 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237578AbiLNIH2 (ORCPT ); Wed, 14 Dec 2022 03:07:28 -0500 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B08C01EAE4 for ; Wed, 14 Dec 2022 00:07:27 -0800 (PST) Received: by mail-wr1-x430.google.com with SMTP id u12so18400380wrr.11 for ; Wed, 14 Dec 2022 00:07:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YmisXUUTcc/2wLYtw2JwGMf2iLn2WSeYXglBIEeZoho=; b=M8/xtqY2O3i3K2Yz6NqK5+aza3ypoIX9p/uaSSc4ZVwUCb2XQrkVHtxv0yjcN/kSiB SGrwjRxkjHrn4YoUiOL3CBahkHHkRXa5uywll9J70oIMl45KBCMDE7FLt4JI243Fg4ja K8iOUVGS5VrRSnXxN4xPHIIdPEAnOQGQPQb+hxvJeH3FWJUbZy19/E4ZwH3b1a/b2bpA nR/JTjWlp8NuTdqnNYny0Lk10aey91oh75kRrEB0cRD/TfNF+q3o5dhKT5Sm5FlU0XwX E6ioTc5CGAovSvL4kZfhRj9MsJ54hdrA/CnUmttLwo8v53mBwMIh1Utm8tOfM7KbqCcJ NIUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YmisXUUTcc/2wLYtw2JwGMf2iLn2WSeYXglBIEeZoho=; b=3kMwk5HJC6Y7wCJQxO/Qhlhf3EjhYHN1sbwv5fc8LeNzGIfzP0fIexQ06twCeOjSZs wr8PbZOccgbf4BYZZNkNky07xYGzVnU3Z5KUw5aeX0aCQ7ZH8LmAmHULlc+YYaMi79j7 BANL3u563E2cs5ML7JX+LdY8iN0+UwiNrifkZ+4hAWdNVdWfyUFmh4IW5PkflhQgq6sY Surwk/iIy8kLln8BLQ5v9tmeABJpQtMpNUW+sMLJKxzXbZ5r15MhDnuUPcbpdXFEZ2YK rJkpcy+W6+LAjsk9CeVm9zYXV2S6k3iyzodD2jqaGOJfYJLrH2iy92pfhOa0tfq+JkAN NSSg== X-Gm-Message-State: ANoB5pnScnvNQ9JzLtkWVNOHwaCPX3N/RPWHGIPeteQOGoX7yj6TwHr2 gJQgTzfeVE+pSv9r6TqiyrS+pQ== X-Received: by 2002:a05:6000:1290:b0:242:733b:af28 with SMTP id f16-20020a056000129000b00242733baf28mr17016908wrx.5.1671005246307; Wed, 14 Dec 2022 00:07:26 -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 k3-20020a5d5183000000b002422bc69111sm2500781wrv.9.2022.12.14.00.07.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Dec 2022 00:07:26 -0800 (PST) From: Naresh Solanki X-Google-Original-From: Naresh Solanki To: devicetree@vger.kernel.org, Guenter Roeck , Jean Delvare , Liam Girdwood , Mark Brown Cc: linux-kernel@vger.kernel.org, linux-hwmon@vger.kernel.org, Patrick Rudolph , Naresh Solanki Subject: [PATCH RESEND v6 5/5] hwmon: (pmbus/core): Notify regulator events Date: Wed, 14 Dec 2022 09:07:15 +0100 Message-Id: <20221214080715.2700442-5-Naresh.Solanki@9elements.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221214080715.2700442-1-Naresh.Solanki@9elements.com> References: <20221214080715.2700442-1-Naresh.Solanki@9elements.com> 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 autolearn=unavailable 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?1752176107893051026?= X-GMAIL-MSGID: =?utf-8?q?1752176107893051026?= Notify regulator events in PMBus irq handler. Signed-off-by: Naresh Solanki --- drivers/hwmon/pmbus/pmbus_core.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c index 22176f266891..c8fae2a9502d 100644 --- a/drivers/hwmon/pmbus/pmbus_core.c +++ b/drivers/hwmon/pmbus/pmbus_core.c @@ -3154,7 +3154,7 @@ static irqreturn_t pmbus_fault_handler(int irq, void *pdata) { struct pmbus_data *data = pdata; struct i2c_client *client = to_i2c_client(data->dev); - int i, status, ret, event; + int i, j, status, ret, event; for (i = 0; i < data->info->pages; i++) { @@ -3163,6 +3163,15 @@ static irqreturn_t pmbus_fault_handler(int irq, void *pdata) if (ret) return ret; + if (event) { + for (j = 0; j < data->info->num_regulators; j++) { + if (i == rdev_get_id(data->rdevs[i])) { + regulator_notifier_call_chain(data->rdevs[i], event, NULL); + ret = IRQ_HANDLED; + } + } + } + mutex_lock(&data->update_lock); status = pmbus_read_status_word(client, i); if (status < 0) {