From patchwork Thu Jan 4 02:48:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kai-Heng Feng X-Patchwork-Id: 184904 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp5384507dyb; Wed, 3 Jan 2024 18:49:03 -0800 (PST) X-Google-Smtp-Source: AGHT+IHQTOsRsxLPwIJ1L8vkS7JdPMLAmdRUanw7QRBGXjAW44cj8290+5QO6BCcQvpM5fUAo9/N X-Received: by 2002:a05:6358:9392:b0:174:f2c7:4448 with SMTP id h18-20020a056358939200b00174f2c74448mr18748861rwb.42.1704336543322; Wed, 03 Jan 2024 18:49:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704336543; cv=none; d=google.com; s=arc-20160816; b=HpdwqfvH9FVa2frRg94/YIWsITn5Yszq1YpgjtNrx6eUhEw0Knp/XvcDxXf8n9SPMI /JqVrucszTDEibqCxpgH4F1v6swSJa44a3HLTrHf65aK8gJkIUbz/UhbvovRDa502nE5 WRbR6MfgIN0hvW0pVYaOZebZRtlPvzE7qcOjJvu/IK/rshuVkCtKOmNhitXeoTDYgZpK NhH0upXzg2sZg/PXs+uAcNsRDTjpNvd/Nir0Qs0us23zsnvhcpHVk19v3vIuOGza/QhT TdOco1JP3BsvVVwUbeRE8RvImN25BQ13ozUTOmjQoXv3SF0l5To6SCCQRUBwK1/ctNro v0mg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=qJZEPxVyP2sE0E3LLTPNVpWVMnWfCSJTXOSyhRDwibE=; fh=EUsWKEM3fynHiFmpY91gAyxDPYrojFFdy7NIwo9HjIg=; b=Dj3BBJ2OND8RG3Z0WcGoYkquRUNm7aHWJXPwuFUvUBhDET5xwcxtbEg/dg0+UCDeWA 2zM+p1qNZnNj+8AYzg6Dv+H8scm39DS8kDdSvlOkyb4oyQ+WEa4j9bGKEGLQsEsYoj0X 5K+qwLXVqbu0YsrTnaO/VC0x15rLsnwoeWENcMN4ENEM6LJ/NGq5fSq9Mqiqf4KBxxWs 6sEuZg24dh+51LhfTEDPczqDMsm+fvSdd4qW0lee2WqWDSp9OC0XuOs8TzUUnXONxMLD BY0IxpjlcnVLE3BcfOmRbuc98WTMTrSimMC+/JKRSK9ZTWh4wGRV6eBghoaUz3TV84B/ Wh0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=PHZgtxPd; spf=pass (google.com: domain of linux-kernel+bounces-16211-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-16211-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id w22-20020a63f516000000b005cd813c23besi20569730pgh.415.2024.01.03.18.49.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jan 2024 18:49:03 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-16211-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=PHZgtxPd; spf=pass (google.com: domain of linux-kernel+bounces-16211-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-16211-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 1776A286FCB for ; Thu, 4 Jan 2024 02:49:03 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6723F10A27; Thu, 4 Jan 2024 02:48:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b="PHZgtxPd" X-Original-To: linux-kernel@vger.kernel.org Received: from smtp-relay-canonical-1.canonical.com (smtp-relay-canonical-1.canonical.com [185.125.188.121]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 38BCE1FBB; Thu, 4 Jan 2024 02:48:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canonical.com Received: from HP-EliteBook-x360-830-G8-Notebook-PC.. (unknown [10.101.196.174]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPSA id A8B123F722; Thu, 4 Jan 2024 02:48:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1704336511; bh=qJZEPxVyP2sE0E3LLTPNVpWVMnWfCSJTXOSyhRDwibE=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=PHZgtxPdoqTnO98HMsw4+UrL6nE121jBQPBCtOT99H61V8UGfRussxW8hXnZvP+T+ x53XaYBR1hJAxqcSpTNlSwgqxFx1jxX1rOO5x/YvKm7vsKJIUU6Jh61E1zbMsggHOz rzNPVKwOWT+LLmZsxr2LYzBkbBlMEShFF8+uu9teXt87TvmBHS7uomjB0yyx02VVIq w2mT7ZtJGDAY9EZ9mexN9UZagH0wARM6coGHE5BkdQvaSGl59FdUsrj2XWW2JdTuy3 8bsPfci6L7smeta59ma/s1YVFaN7Wg0mmwonrxHDVT78YOcQ099SqBvFi1zDsXyeKA nCpYg7bNzQ7AQ== From: Kai-Heng Feng To: jdelvare@suse.com, linux@roeck-us.net Cc: Kai-Heng Feng , "Rafael J. Wysocki" , Len Brown , Robert Moore , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, acpica-devel@lists.linux.dev Subject: [PATCH v3 1/2] ACPI: IPMI: Add helper to wait for when SMI is selected Date: Thu, 4 Jan 2024 10:48:18 +0800 Message-Id: <20240104024819.848979-1-kai.heng.feng@canonical.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787126395435855865 X-GMAIL-MSGID: 1787126395435855865 The function of acpi_power_meter module on Dell system requires IPMI handler is installed and SMI is selected. So add a helper to let acpi_power_meter know when IPMI handler and SMI are ready. Signed-off-by: Kai-Heng Feng --- v3: - New patch. drivers/acpi/acpi_ipmi.c | 17 ++++++++++++++++- include/acpi/acpi_bus.h | 5 +++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/drivers/acpi/acpi_ipmi.c b/drivers/acpi/acpi_ipmi.c index 0555f68c2dfd..54862cab7171 100644 --- a/drivers/acpi/acpi_ipmi.c +++ b/drivers/acpi/acpi_ipmi.c @@ -23,6 +23,8 @@ MODULE_LICENSE("GPL"); #define IPMI_TIMEOUT (5000) #define ACPI_IPMI_MAX_MSG_LENGTH 64 +static struct completion smi_selected; + struct acpi_ipmi_device { /* the device list attached to driver_data.ipmi_devices */ struct list_head head; @@ -463,8 +465,10 @@ static void ipmi_register_bmc(int iface, struct device *dev) if (temp->handle == handle) goto err_lock; } - if (!driver_data.selected_smi) + if (!driver_data.selected_smi) { driver_data.selected_smi = ipmi_device; + complete(&smi_selected); + } list_add_tail(&ipmi_device->head, &driver_data.ipmi_devices); mutex_unlock(&driver_data.ipmi_lock); @@ -578,10 +582,21 @@ acpi_ipmi_space_handler(u32 function, acpi_physical_address address, return status; } +int acpi_wait_for_acpi_ipmi(void) +{ + long ret; + + ret = wait_for_completion_interruptible_timeout(&smi_selected, 2 * HZ); + + return ret > 0 ? 0 : -ETIMEDOUT; +} +EXPORT_SYMBOL_GPL(acpi_wait_for_acpi_ipmi); + static int __init acpi_ipmi_init(void) { int result; acpi_status status; + init_completion(&smi_selected); if (acpi_disabled) return 0; diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 1216d72c650f..afa6e4d4bf46 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -821,11 +821,16 @@ static inline void acpi_put_acpi_dev(struct acpi_device *adev) { acpi_dev_put(adev); } + +int acpi_wait_for_acpi_ipmi(void); + #else /* CONFIG_ACPI */ static inline int register_acpi_bus_type(void *bus) { return 0; } static inline int unregister_acpi_bus_type(void *bus) { return 0; } +static inline int acpi_wait_for_acpi_ipmi(void) { return 0; } + #endif /* CONFIG_ACPI */ #endif /*__ACPI_BUS_H__*/ From patchwork Thu Jan 4 02:48:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kai-Heng Feng X-Patchwork-Id: 184905 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp5384606dyb; Wed, 3 Jan 2024 18:49:28 -0800 (PST) X-Google-Smtp-Source: AGHT+IGBn2FX8OgKsfQmZRtf6exXOXLVPDJfXKKgHxZQVrde6ojhfNydwnpm7x6xDva2FvPMxrj6 X-Received: by 2002:a05:6358:d5aa:b0:175:64c5:a900 with SMTP id ms42-20020a056358d5aa00b0017564c5a900mr20639rwb.60.1704336568230; Wed, 03 Jan 2024 18:49:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704336568; cv=none; d=google.com; s=arc-20160816; b=NMEfsK3AuvW8gHltye2ZBdifX+fxIGYqD/e4NGiBtFmAdVCf4QWSoVn+fo/qwLkBSW yQRQeZ9ud1tiYoO7v9zLtno2xiw6RbKBfA0/uFYeMmQB/nBDBb7PNiSVL5F3qIdP6Q2P jvbIRGZeNrdo5kKi7U3GMX202jETUPrqGQm0Nu6IX/rgKP8qanhsMaXzh60lpIgQtTZE s5JK6zXGBwAY33Rsmo+4QcQ13viTjCoPPc0wZDrbxftIAXfyh0Hq/ziQVlZgsyu5d6C8 7sQVL5LK6biA8wC5sqs/ihDsejG4HptMvJwzbf3SdYdZuNvyahvbJ7MtwCrtlu5E+bz7 Nmug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=HgPMGk6E0+2L7TIuVWwAqyxB34ASPMOpRfr0tWcLfRc=; fh=SzCKdFOxLTr6GR1lmw6aNzdbV1Tq9k5ZyfqOVVuDMX0=; b=XYVQF/tvt8PtNDPrfmJO1ojN+Ua7sj9lVIBYdPGhaUSW24cbX/3dIdqUDGqCb4NL7U rvgxXi7eb03hVA6AZgOVwlYLTkMyqD4/S+tjlRWAygDTKkRP4vugaa6x9ozT2YVDj9oL /+GPgLjKAGFvZzysbaO7wTXbfHfH9m8fNyuH2jGxn7ohQrovv09YABqIbctRVPZuTufz dqE1zfTVL1S+Bk6mzIuxmVIWhvu4SkJ5PFnSxR3tLJe0Lj4l2u4568oMdLbu0lNmOGLH L9AbGol5rdaiqXH+lfnQAF3UoI+G9S7EtcbZ/znmlUgF+K109vzvbqVqibymCCfPv9Tl 19cw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=CDTDhbcb; spf=pass (google.com: domain of linux-kernel+bounces-16212-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-16212-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id b12-20020a63cf4c000000b005ceb4a70213si2431516pgj.385.2024.01.03.18.49.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jan 2024 18:49:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-16212-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=CDTDhbcb; spf=pass (google.com: domain of linux-kernel+bounces-16212-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-16212-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 9D0C5B20ED1 for ; Thu, 4 Jan 2024 02:49:11 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 35974134CD; Thu, 4 Jan 2024 02:48:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b="CDTDhbcb" X-Original-To: linux-kernel@vger.kernel.org Received: from smtp-relay-canonical-1.canonical.com (smtp-relay-canonical-1.canonical.com [185.125.188.121]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E27291FC1; Thu, 4 Jan 2024 02:48:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canonical.com Received: from HP-EliteBook-x360-830-G8-Notebook-PC.. (unknown [10.101.196.174]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPSA id 4BBEB42FC5; Thu, 4 Jan 2024 02:48:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1704336513; bh=HgPMGk6E0+2L7TIuVWwAqyxB34ASPMOpRfr0tWcLfRc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=CDTDhbcb1Mf6ISsdvaCwiSEvK2Q+5bJga2YNlcvPxjjAOfYv78Pz1UBqlhvpmSYwB HTP6r4lWeLntfc+KI+pxMw+GDqvRFmsstw+893OKmFMdYFB+t2kxou4umKbIya77Z8 /9JqodztYRFDA7NFYooyUqPLXnFA6mCKolZjsVWIby0gb2CrXueGCdHTV61rARsZXx yGfrcumxcyo4scKLxDhJ8MR+OfSBEKoqMO5AJ0qwCdy2NTFbO3FnI86Q5Yhn7NLcxh PVGL1YwAKUtmZ80WJZZ5nPfRpIsqTjGpQH46dBK/aJ/VHN7iI6gmL0GnFKgiZauUDN Rp7W0tTK4qKeg== From: Kai-Heng Feng To: jdelvare@suse.com, linux@roeck-us.net Cc: Kai-Heng Feng , linux-hwmon@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 2/2] hwmon: (acpi_power_meter) Ensure IPMI space handler is ready on Dell systems Date: Thu, 4 Jan 2024 10:48:19 +0800 Message-Id: <20240104024819.848979-2-kai.heng.feng@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240104024819.848979-1-kai.heng.feng@canonical.com> References: <20240104024819.848979-1-kai.heng.feng@canonical.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787126421288189181 X-GMAIL-MSGID: 1787126421288189181 The following error can be observed at boot: [ 3.717920] ACPI Error: No handler for Region [SYSI] (00000000ab9e62c5) [IPMI] (20230628/evregion-130) [ 3.717928] ACPI Error: Region IPMI (ID=7) has no handler (20230628/exfldio-261) [ 3.717936] No Local Variables are initialized for Method [_GHL] [ 3.717938] No Arguments are initialized for method [_GHL] [ 3.717940] ACPI Error: Aborting method \_SB.PMI0._GHL due to previous error (AE_NOT_EXIST) (20230628/psparse-529) [ 3.717949] ACPI Error: Aborting method \_SB.PMI0._PMC due to previous error (AE_NOT_EXIST) (20230628/psparse-529) [ 3.717957] ACPI: \_SB_.PMI0: _PMC evaluation failed: AE_NOT_EXIST On Dell systems several methods of acpi_power_meter access variables in IPMI region [0], so wait until IPMI space handler is installed by acpi_ipmi and also wait until SMI is selected to make the space handler fully functional. [0] https://www.dell.com/support/manuals/en-us/redhat-enterprise-linux-v8.0/rhel8_rn_pub/advanced-configuration-and-power-interface-acpi-error-messages-displayed-in-dmesg?guid=guid-0d5ae482-1977-42cf-b417-3ed5c3f5ee62 Signed-off-by: Kai-Heng Feng --- v3: - Use helper. - Use return value to print warning message. v2: - Use completion instead of request_module(). drivers/hwmon/acpi_power_meter.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c index 703666b95bf4..33fb9626633d 100644 --- a/drivers/hwmon/acpi_power_meter.c +++ b/drivers/hwmon/acpi_power_meter.c @@ -883,6 +883,12 @@ static int acpi_power_meter_add(struct acpi_device *device) strcpy(acpi_device_class(device), ACPI_POWER_METER_CLASS); device->driver_data = resource; + if (dmi_match(DMI_SYS_VENDOR, "Dell Inc.") && + acpi_dev_get_first_match_dev("IPI0001", NULL, -1)) { + if (acpi_wait_for_acpi_ipmi()) + dev_warn(&device->dev, "Waiting for ACPI IPMI timeout"); + } + res = read_capabilities(resource); if (res) goto exit_free;