From patchwork Wed Mar 20 08:43:16 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: 13597569 Received: from smtp-relay-canonical-0.canonical.com (smtp-relay-canonical-0.canonical.com [185.125.188.120]) (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 C0F6B39FEF; Wed, 20 Mar 2024 08:50:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.125.188.120 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710924605; cv=none; b=SPrt9w+RB3F6VuTADSM0QbROmhs7vbThaZUxJVXYfsPDlUZNslE3fH8BocpIbxf7Rbp1/LZnwrwsqPSvcd+EDBoPlq/DZXznSkd6zzkEdUQVxy8SdwjZncc58s7ZpH4+y2JU6TK7in3wlcHcX44PJ1CHO28xaO9LkL6+RnTihPg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710924605; c=relaxed/simple; bh=xGb4RhUYDWPElHint+HXBjgURCNEhZssnpEzWgr9f5I=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=Xm7tD5oNSIdR410vNbRMMCPPOzVAvH/aCMJrc+Aao114KPqDKL/jHkWtjwyJBFypNFGjxArTMKE+ZIXCS+JqQFexniy3iAEAIIAkwssSYRmc/mm0lG+6WP5bTzvx7q3SArDQzg89FliVAc4raMNm4EK6Dhq06llg5I3Qwi7qGKc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com; spf=pass smtp.mailfrom=canonical.com; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b=LP11FVl/; arc=none smtp.client-ip=185.125.188.120 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b="LP11FVl/" Received: from localhost.localdomain (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-0.canonical.com (Postfix) with ESMTPSA id CCA2F40F3D; Wed, 20 Mar 2024 08:44:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1710924249; bh=+aw+nCBe+T3oJ08NUcmK8t7uBWVt6oUIlxWmPcFE1Jo=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=LP11FVl/yZMXhnRTXF2PkvKa6S3Dk2kwamlqfX47REpx8fr4kmO+U8NCFpjtpXML3 myxDmfN4/rj5CCb80TDQqR41NDVMnyWBtiQ9WosUfAnd6VUzkuEGbehtvcEQXvWaSP hHZl82+N0tH67TmyxoneiKSS5n6qUr83yFgXmbvfAwGV+wO38cbwcgOMo9eRMB2LPe TGALCrz9NkJEs4xrWg0txyfY44sS8cO5C+SdRH/qCckqPBg+YH2VWf5kmJ/mZ/CZZL 9bzZ4wtcKC7+GdtM89FDRBmGMA+Gt/6TBAXZ8KJOk6z5rL18hIawZrtIXks17ijtqN ycJPH+PkXTNpg== From: Kai-Heng Feng To: rafael@kernel.org, lenb@kernel.org, jdelvare@suse.com, linux@roeck-us.net Cc: robert.moore@intel.com, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hwmon@vger.kernel.org, acpica-devel@lists.linux.dev, Kai-Heng Feng , "Rafael J . Wysocki" Subject: [PATCH v5 1/2] ACPI: IPMI: Add helper to wait for when SMI is selected Date: Wed, 20 Mar 2024 16:43:16 +0800 Message-Id: <20240320084317.366853-1-kai.heng.feng@canonical.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 On Dell servers, many APCI methods of acpi_power_meter module evaluate variables inside IPMI region, so the region handler needs to be installed. In addition to that, the handler needs to be fully functional, and that depends on SMI being selected. So add a helper to let acpi_power_meter know when the handler is installed and ready to be used. Signed-off-by: Kai-Heng Feng Acked-by: Rafael J. Wysocki --- v5: - No change. v4: - Wording. - Define and comment on timeout value. - Move the completion to driver_data. - Remove the tenary operator. v3: - New patch. drivers/acpi/acpi_ipmi.c | 23 ++++++++++++++++++++++- include/acpi/acpi_bus.h | 5 +++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/drivers/acpi/acpi_ipmi.c b/drivers/acpi/acpi_ipmi.c index 0555f68c2dfd..5fba4dab5d08 100644 --- a/drivers/acpi/acpi_ipmi.c +++ b/drivers/acpi/acpi_ipmi.c @@ -22,6 +22,8 @@ MODULE_LICENSE("GPL"); /* the IPMI timeout is 5s */ #define IPMI_TIMEOUT (5000) #define ACPI_IPMI_MAX_MSG_LENGTH 64 +/* 2s should be suffient for SMI being selected */ +#define ACPI_IPMI_SMI_SELECTION_TIMEOUT (2 * HZ) struct acpi_ipmi_device { /* the device list attached to driver_data.ipmi_devices */ @@ -54,6 +56,7 @@ struct ipmi_driver_data { * to this selected global IPMI system interface. */ struct acpi_ipmi_device *selected_smi; + struct completion smi_selection_done; }; struct acpi_ipmi_msg { @@ -463,8 +466,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(&driver_data.smi_selection_done); + } list_add_tail(&ipmi_device->head, &driver_data.ipmi_devices); mutex_unlock(&driver_data.ipmi_lock); @@ -578,6 +583,20 @@ 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(&driver_data.smi_selection_done, + ACPI_IPMI_SMI_SELECTION_TIMEOUT); + + if (ret <= 0) + return -ETIMEDOUT; + + return 0; +} +EXPORT_SYMBOL_GPL(acpi_wait_for_acpi_ipmi); + static int __init acpi_ipmi_init(void) { int result; @@ -586,6 +605,8 @@ static int __init acpi_ipmi_init(void) if (acpi_disabled) return 0; + init_completion(&driver_data.smi_selection_done); + status = acpi_install_address_space_handler(ACPI_ROOT_OBJECT, ACPI_ADR_SPACE_IPMI, &acpi_ipmi_space_handler, diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 5de954e2b18a..5a69cbd58c5e 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -976,11 +976,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 Wed Mar 20 08:43:17 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: 13597570 Received: from smtp-relay-canonical-0.canonical.com (smtp-relay-canonical-0.canonical.com [185.125.188.120]) (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 E90B839FF2; Wed, 20 Mar 2024 08:50:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.125.188.120 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710924606; cv=none; b=OpUfIf+qFKV9KF7+OsKWVwu0UxBfGpmZ1NDWA06CksTMrR2FaNmxVGppp0IZuGQBX1eUBYlNuvOPLgrhwrOY3hXS/cucshUUjYd3Us1ljCo/wLw2JJmnqHdtBZHomowWuxZ8UTnhPHxrsD9066+HK/ZMvpkyFV9jbakeVM/YhZw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710924606; c=relaxed/simple; bh=qN90YsyhEdTYLpAgk86xiUkWMEl53xc5BeEM/tePBFw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=SxKw/LyW8CpGCtpfT0R0CdC+G9oG+x40BBnW9Rr7Bd5HoFuHFegsUp0N5+cy0nV4i0/wMf6DX9uh4VAx2YsaaOgJaOPbf4Jn3FYJoqdqeFolxbcIIHIz9tdOKP/vZapyqlpFSkeeR+TX3akmUprWEGtNpjNGknGIow/mMBh9H2M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com; spf=pass smtp.mailfrom=canonical.com; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b=mdx1PW+V; arc=none smtp.client-ip=185.125.188.120 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b="mdx1PW+V" Received: from localhost.localdomain (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-0.canonical.com (Postfix) with ESMTPSA id 0ACE241C1B; Wed, 20 Mar 2024 08:44:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1710924254; bh=3Phe7IR9wF0mRfOHuRR6w4aXwl1W5QC++Hur2AKYbiY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=mdx1PW+Vl7YelstHZeGGC96/XjqJrPLabPIvRYbpM0kGPveB2JaU9y/YRkWVOv2FI AKjtuJW6HyiRQYgqmP4E28tuQ6w0mmnMrrIKfZosMd3h3iPl+u4mG+lFHSNWDH6bfz r/Lmlbis4H6D8sXbQpqMF3dYJgvZ14bL/XbxrPOtUU7CjER8DeG5h+TVPyKD0KDoUu vAlQsJ7sxPqY3Foptos8KLwHwPA+9vu2gOuRP0+Zhp6mhe3x4XQXd5rGUPoaC1oClz LlG5g2ms5YQbmeGKaf8Y8i8CckL2xpOyr9TU7MMdkiRYGAx0rNuzKP2trvPPd+1d7Z Zk0/7KiIENTYA== From: Kai-Heng Feng To: rafael@kernel.org, lenb@kernel.org, jdelvare@suse.com, linux@roeck-us.net Cc: robert.moore@intel.com, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hwmon@vger.kernel.org, acpica-devel@lists.linux.dev, Kai-Heng Feng Subject: [PATCH v5 2/2] hwmon: (acpi_power_meter) Ensure IPMI space handler is ready on Dell systems Date: Wed, 20 Mar 2024 16:43:17 +0800 Message-Id: <20240320084317.366853-2-kai.heng.feng@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240320084317.366853-1-kai.heng.feng@canonical.com> References: <20240320084317.366853-1-kai.heng.feng@canonical.com> Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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. Since the dependency is inside BIOS's ASL code and it's not discoverable, so use this fixup is a hack to workaround BIOS issue. [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 --- v5: - Check CONFIG_ACPI_IPMI to fix link error. - Use acpi_dev_put() to balance reference count. - Wording. - Add comment to explain the rationale. v4: - No change. v3: - Use helper. - Use return value to print warning message. v2: - Use completion instead of request_module(). drivers/hwmon/acpi_power_meter.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c index 703666b95bf4..b34cb57f2a0e 100644 --- a/drivers/hwmon/acpi_power_meter.c +++ b/drivers/hwmon/acpi_power_meter.c @@ -868,6 +868,9 @@ static int acpi_power_meter_add(struct acpi_device *device) { int res; struct acpi_power_meter_resource *resource; +#if IS_REACHABLE(CONFIG_ACPI_IPMI) + struct acpi_device *ipi_device; +#endif if (!device) return -EINVAL; @@ -883,6 +886,24 @@ static int acpi_power_meter_add(struct acpi_device *device) strcpy(acpi_device_class(device), ACPI_POWER_METER_CLASS); device->driver_data = resource; +#if IS_REACHABLE(CONFIG_ACPI_IPMI) + /* + * On Dell systems several methods of acpi_power_meter access + * variables in IPMI region, 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. + */ + if (dmi_match(DMI_SYS_VENDOR, "Dell Inc.")) { + ipi_device = acpi_dev_get_first_match_dev("IPI0001", NULL, -1); + + if (ipi_device) { + if (acpi_wait_for_acpi_ipmi()) + dev_warn(&device->dev, "Waiting for ACPI IPMI timeout"); + acpi_dev_put(ipi_device); + } + } +#endif + res = read_capabilities(resource); if (res) goto exit_free;