From patchwork Wed Apr 12 16:15:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eddie James X-Patchwork-Id: 82558 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp451108vqo; Wed, 12 Apr 2023 09:22:07 -0700 (PDT) X-Google-Smtp-Source: AKy350bXb8U7/QvHzv26xuuyqdmL/g6Q/mkzC3FwAvFC/EH1t3LrgtaKHtO/XgCxhhNccyborzmo X-Received: by 2002:a17:906:9519:b0:94e:c8c:42ec with SMTP id u25-20020a170906951900b0094e0c8c42ecmr5936151ejx.20.1681316527153; Wed, 12 Apr 2023 09:22:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681316527; cv=none; d=google.com; s=arc-20160816; b=TU+/k6M24PJAD4vzlN8KWtZ6mN3+4+DA01Kq80szLd9xC3hrz1pUNSzizlR08bcB5D qKRAhSp0nOTRCCQ4JVlry7D1NHEm5sHXQMJt2V0R1dg9xrFmav8a8LWwgfyNIMEaR8iz GO9pg8BosnG3eNSCGXUUJxlgB9x4+ruHSKqfhvh8MLev5VkOSUcCAX3BhGumFndoV8fp /Cc3fA04K8wfuEFswVKY3XfAUqZrccM6YVjbGcTPb7EBen/eC9xbZmq+nnVSVE46DQdC segYxMPdNTl/wZhv/898kNvRLoOdF6V70mNlGwZWG8MKly408sFVCc1g2J+slpHhDnbb o9Aw== 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=1Kpd8suCSJvpllpL/T0XrbZxPVM/IOIfz+qTGO3kGdc=; b=dWOScnmW0/lk/mQwwfdJvd3umy6qyGLQckYJ8DIrOS1GJNO4ycxlLlpRB/z/BSeh9b nopUNUnml3eMaik9h98r433yfAzq8UGRm2jis1MqaE6oAWsQDY35y2+RvKfWWX9hqP4C 9C4CX9+GOhqDEroadIVFTX138jekT3ZpjbUSpSWmT+rCeIK0sKkkC/7VLXsXDlQ1F4/r licgNV4YrIwD+ABuCozSKOOovJvRMzubeiv0owl8LKn6bVJFDFblEcJ4nK++bYMwBM75 k4lpuuketY7fBknPjmP63XrjIiM43tpoiXF+sW7hzDqxtY9/IDfFaBZStl6NcED+vw9s UY5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=cAWV8CVT; 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=REJECT sp=NONE dis=NONE) header.from=ibm.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ss13-20020a170907c00d00b0094e4d067a3asi2073714ejc.991.2023.04.12.09.21.42; Wed, 12 Apr 2023 09:22:07 -0700 (PDT) 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=@ibm.com header.s=pp1 header.b=cAWV8CVT; 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=REJECT sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230097AbjDLQQY (ORCPT + 99 others); Wed, 12 Apr 2023 12:16:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45046 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229561AbjDLQQV (ORCPT ); Wed, 12 Apr 2023 12:16:21 -0400 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3778986B0; Wed, 12 Apr 2023 09:15:49 -0700 (PDT) Received: from pps.filterd (m0098409.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 33CFHqKC029895; Wed, 12 Apr 2023 16:15:35 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=1Kpd8suCSJvpllpL/T0XrbZxPVM/IOIfz+qTGO3kGdc=; b=cAWV8CVTu4xF/zmSgTSDT0OPDJD3I8VjQM2QFCJXXMSvJ8R2LvjnhRd0Xfg/9mfiqEvh fR41blCGkt79W8zS5iXWZyivU+mihjYcLQiGUjYF9//lNFW/H35nen6dXSXvEbMiGlCj Av7smilQ5+KNP1ptPl/4A4MXHDvMWvEum8YIF2Y37qOa8Yyi+7xn4jlnvFu5vVg9nOzl Zt8TXO7Z7oukKPivRPmaq8tsYR0/TFRFWDnyMMzdFdkx2eBp93MyJ1ppyhW2gL3rCiJY 7t18dr1fXUd9PLMCJiq+GVnkcQYmjjM9vy5qduYZ0leBPaiwV/4wSzSF+GIsq5JEQjde pg== Received: from ppma05wdc.us.ibm.com (1b.90.2fa9.ip4.static.sl-reverse.com [169.47.144.27]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3pwy5ptpdb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 12 Apr 2023 16:15:35 +0000 Received: from pps.filterd (ppma05wdc.us.ibm.com [127.0.0.1]) by ppma05wdc.us.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 33CDEHXB003076; Wed, 12 Apr 2023 16:15:33 GMT Received: from smtprelay04.dal12v.mail.ibm.com ([9.208.130.102]) by ppma05wdc.us.ibm.com (PPS) with ESMTPS id 3pu0jb72pk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 12 Apr 2023 16:15:33 +0000 Received: from smtpav02.wdc07v.mail.ibm.com (smtpav02.wdc07v.mail.ibm.com [10.39.53.229]) by smtprelay04.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 33CGFWV48585850 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 12 Apr 2023 16:15:33 GMT Received: from smtpav02.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 991F65805B; Wed, 12 Apr 2023 16:15:32 +0000 (GMT) Received: from smtpav02.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B703E5805E; Wed, 12 Apr 2023 16:15:31 +0000 (GMT) Received: from slate16.aus.stglabs.ibm.com (unknown [9.160.16.129]) by smtpav02.wdc07v.mail.ibm.com (Postfix) with ESMTP; Wed, 12 Apr 2023 16:15:31 +0000 (GMT) From: Eddie James To: linux-hwmon@vger.kernel.org Cc: linux-kernel@vger.kernel.org, jdelvare@suse.com, linux@roeck-us.net, Eddie James Subject: [PATCH v2 1/2] hwmon: (pmbus/core) Add lock and unlock functions Date: Wed, 12 Apr 2023 11:15:25 -0500 Message-Id: <20230412161526.252294-2-eajames@linux.ibm.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230412161526.252294-1-eajames@linux.ibm.com> References: <20230412161526.252294-1-eajames@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: 2eX_nPOWx4Lru-Kflz9MyXsfVuTm5sab X-Proofpoint-ORIG-GUID: 2eX_nPOWx4Lru-Kflz9MyXsfVuTm5sab X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-12_07,2023-04-12_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 lowpriorityscore=0 suspectscore=0 bulkscore=0 malwarescore=0 adultscore=0 mlxlogscore=999 clxscore=1015 spamscore=0 impostorscore=0 priorityscore=1501 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304120139 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,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?1762988159185605918?= X-GMAIL-MSGID: =?utf-8?q?1762988159185605918?= Debugfs operations may set the page number, which must be done atomically with the subsequent i2c operation. Lock the update_lock in the debugfs functions and provide a function for pmbus drivers to lock and unlock the update_lock. Signed-off-by: Eddie James --- drivers/hwmon/pmbus/pmbus.h | 2 ++ drivers/hwmon/pmbus/pmbus_core.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/drivers/hwmon/pmbus/pmbus.h b/drivers/hwmon/pmbus/pmbus.h index 11e84e141126..b0832a4c690d 100644 --- a/drivers/hwmon/pmbus/pmbus.h +++ b/drivers/hwmon/pmbus/pmbus.h @@ -505,6 +505,8 @@ int pmbus_get_fan_rate_device(struct i2c_client *client, int page, int id, enum pmbus_fan_mode mode); int pmbus_get_fan_rate_cached(struct i2c_client *client, int page, int id, enum pmbus_fan_mode mode); +int pmbus_lock_interruptible(struct i2c_client *client); +void pmbus_unlock(struct i2c_client *client); int pmbus_update_fan(struct i2c_client *client, int page, int id, u8 config, u8 mask, u16 command); struct dentry *pmbus_get_debugfs_dir(struct i2c_client *client); diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c index ca4510e4f918..04b4c65666fd 100644 --- a/drivers/hwmon/pmbus/pmbus_core.c +++ b/drivers/hwmon/pmbus/pmbus_core.c @@ -3212,8 +3212,13 @@ static int pmbus_debugfs_get(void *data, u64 *val) { int rc; struct pmbus_debugfs_entry *entry = data; + struct pmbus_data *pdata = i2c_get_clientdata(entry->client); + rc = mutex_lock_interruptible(&pdata->update_lock); + if (rc) + return rc; rc = _pmbus_read_byte_data(entry->client, entry->page, entry->reg); + mutex_unlock(&pdata->update_lock); if (rc < 0) return rc; @@ -3230,7 +3235,11 @@ static int pmbus_debugfs_get_status(void *data, u64 *val) struct pmbus_debugfs_entry *entry = data; struct pmbus_data *pdata = i2c_get_clientdata(entry->client); + rc = mutex_lock_interruptible(&pdata->update_lock); + if (rc) + return rc; rc = pdata->read_status(entry->client, entry->page); + mutex_unlock(&pdata->update_lock); if (rc < 0) return rc; @@ -3246,10 +3255,15 @@ static ssize_t pmbus_debugfs_mfr_read(struct file *file, char __user *buf, { int rc; struct pmbus_debugfs_entry *entry = file->private_data; + struct pmbus_data *pdata = i2c_get_clientdata(entry->client); char data[I2C_SMBUS_BLOCK_MAX + 2] = { 0 }; + rc = mutex_lock_interruptible(&pdata->update_lock); + if (rc) + return rc; rc = pmbus_read_block_data(entry->client, entry->page, entry->reg, data); + mutex_unlock(&pdata->update_lock); if (rc < 0) return rc; @@ -3587,6 +3601,22 @@ struct dentry *pmbus_get_debugfs_dir(struct i2c_client *client) } EXPORT_SYMBOL_NS_GPL(pmbus_get_debugfs_dir, PMBUS); +int pmbus_lock_interruptible(struct i2c_client *client) +{ + struct pmbus_data *data = i2c_get_clientdata(client); + + return mutex_lock_interruptible(&data->update_lock); +} +EXPORT_SYMBOL_NS_GPL(pmbus_lock_interruptible, PMBUS); + +void pmbus_unlock(struct i2c_client *client) +{ + struct pmbus_data *data = i2c_get_clientdata(client); + + mutex_unlock(&data->update_lock); +} +EXPORT_SYMBOL_NS_GPL(pmbus_unlock, PMBUS); + static int __init pmbus_core_init(void) { pmbus_debugfs_dir = debugfs_create_dir("pmbus", NULL);