From nobody Thu Mar 03 14:20:41 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 9FEB519E5E5F; Thu, 3 Mar 2022 14:20:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K8Y6x5XQhz3LSc; Thu, 3 Mar 2022 14:20:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646317241; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=86slzrANSPzu2ISnlpuAOxV9Pxef0S1xQbqpbnU+LCw=; b=cEdY0lsJXGefQy/RXGgzBduCH3MghH/bBtFl8C469/cznx25rVqBAM4u4jn7Vzj1UPGvr4 8Bc9XTn+FAvYAKikxR+jmqeXTZeEwerrnLT+y49gGuGMI1AzPerUXO40wa+4JjEjqvdQFl vv6DznJD3B29gvviazEGvOSKCyqCX6WtX1K+RJKkqyfZaUl069cTYLAhcMqSypTZjRmsvx eIqgPY7ztqGp9LhETGqI8XuC9fCJ0JVibJlxwKGn1E4HfBwYB4EFl0cfkIdX/Fau7NV32X Vj6/jS1LzoUg7Ezyo54k6//jmHRj/26oZjO3Dm1MTUjIPeN0vfzmKoyNQ+cmrg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7C602194F4; Thu, 3 Mar 2022 14:20:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 223EKfBj090702; Thu, 3 Mar 2022 14:20:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 223EKfqH090701; Thu, 3 Mar 2022 14:20:41 GMT (envelope-from git) Date: Thu, 3 Mar 2022 14:20:41 GMT Message-Id: <202203031420.223EKfqH090701@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eric van Gyzen Subject: git: a7b187860cb7 - stable/13 - ipmi: support getting address from EFI List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vangyzen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a7b187860cb784fb76bd9142f6ae6c53ec5d7f42 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646317241; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=86slzrANSPzu2ISnlpuAOxV9Pxef0S1xQbqpbnU+LCw=; b=OhmjltIqZo4Eb/+FHtRzjSq1Yffok+2/vVEqezEKoicZIkDzBSX7DpHugol18KEjeDYI6O lFrctIAmNRJOjgoQ1a29X63afwer2VCbbZeWTFrT48AxtHoG3NhRDNEcuFefrDhoj8yYA7 ehIsoTsNIVA4MgAJWjUwxzhG4+kVpvJrgbsMwD1JLkEsi4U1kvweGUa4HIiB+OSw2lxjMH On2LbSP2yrY3JdU0PktBequsmGmYbmADCj0dR2Nw6nekWN7XeS5FuQ9BCspY17Jv/1LSHH lLD65aL2bg654suLfiNw8n68xLECKtjiYaIKfqsyHcO5cp6xeCWtF27HaDMADw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646317241; a=rsa-sha256; cv=none; b=dauugw38mVWDPTJhll2d3go6nU6gzsFdSbmByCb3t3w/8ADUNrM581detsXGRkEZkp66q4 ugMdojMUX1Exih7NFPSqGDTMltzgyPGpsW6NCGEzKD1pjgv5VzEE19hrj4zGWmn5xSyO1k Hjc7FZTFCuCBoAj/52Fvem7Oxm3ipJ25hW/o4ojElKyDgwK6vIeLAKcgF6Vov6meJWX/Xj K06bIK4Ax4XNg+lhV8ZJFa0jsWVUDVN69jwbcqEiFgCrjONqa/T9IQtefujpMZ+vgEDPrO jKLv+Bs5C+VsaI+vIoqFUgdgQVJQjuxJzv8Ds36RtfJW9kSHlvN10mDO39eBAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by vangyzen: URL: https://cgit.FreeBSD.org/src/commit/?id=a7b187860cb784fb76bd9142f6ae6c53ec5d7f42 commit a7b187860cb784fb76bd9142f6ae6c53ec5d7f42 Author: Yinlong Lu AuthorDate: 2021-04-29 10:04:36 +0000 Commit: Eric van Gyzen CommitDate: 2022-03-03 14:20:07 +0000 ipmi: support getting address from EFI The original implementation only supports getting the address from legacy BIOS (by searching for the SMBIOS_SIG pattern in a fixed address space). Try to get the SMBIOS table from EFI through efirt (EFI Runtime Services) firstly. Continue to search in the legacy BIOS if a NULL address is returned from EFI. By this way the ipmi function supports both legacy BIOS and UEFI systems. Reviewed by: dab, vangyzen MFC after: 1 week Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D30007 (cherry picked from commit ee8b757a949a9575c7355ea01f0475e0c526b9e5) --- sys/dev/ipmi/ipmi_isa.c | 4 ++++ sys/dev/ipmi/ipmi_pci.c | 4 ++++ sys/dev/ipmi/ipmi_smbios.c | 19 ++++++++++++++++--- sys/dev/ipmi/ipmi_smbus.c | 4 ++++ 4 files changed, 28 insertions(+), 3 deletions(-) diff --git a/sys/dev/ipmi/ipmi_isa.c b/sys/dev/ipmi/ipmi_isa.c index cdff305b07ec..1123f2849905 100644 --- a/sys/dev/ipmi/ipmi_isa.c +++ b/sys/dev/ipmi/ipmi_isa.c @@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -286,3 +287,6 @@ static driver_t ipmi_isa_driver = { }; DRIVER_MODULE(ipmi_isa, isa, ipmi_isa_driver, ipmi_devclass, 0, 0); +#ifdef ARCH_MAY_USE_EFI +MODULE_DEPEND(ipmi_isa, efirt, 1, 1, 1); +#endif diff --git a/sys/dev/ipmi/ipmi_pci.c b/sys/dev/ipmi/ipmi_pci.c index d4598f9db873..13ac4f4b5ede 100644 --- a/sys/dev/ipmi/ipmi_pci.c +++ b/sys/dev/ipmi/ipmi_pci.c @@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -292,3 +293,6 @@ static driver_t ipmi2_pci_driver = { }; DRIVER_MODULE(ipmi2_pci, pci, ipmi2_pci_driver, ipmi_devclass, 0, 0); +#ifdef ARCH_MAY_USE_EFI +MODULE_DEPEND(ipmi2_pci, efirt, 1, 1, 1); +#endif diff --git a/sys/dev/ipmi/ipmi_smbios.c b/sys/dev/ipmi/ipmi_smbios.c index a1b953365d7c..e26b6f2956ad 100644 --- a/sys/dev/ipmi/ipmi_smbios.c +++ b/sys/dev/ipmi/ipmi_smbios.c @@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -150,15 +151,27 @@ smbios_ipmi_info(struct smbios_structure_header *h, void *arg) static void ipmi_smbios_probe(struct ipmi_get_info *info) { +#ifdef ARCH_MAY_USE_EFI + struct uuid efi_smbios; + void *addr_efi; +#endif struct smbios_eps *header; void *table; u_int32_t addr; + addr = 0; bzero(info, sizeof(struct ipmi_get_info)); - /* Find the SMBIOS table header. */ - addr = bios_sigsearch(SMBIOS_START, SMBIOS_SIG, SMBIOS_LEN, - SMBIOS_STEP, SMBIOS_OFF); +#ifdef ARCH_MAY_USE_EFI + efi_smbios = (struct uuid)EFI_TABLE_SMBIOS; + if (!efi_get_table(&efi_smbios, &addr_efi)) + addr = (vm_paddr_t)addr_efi; +#endif + + if (addr == 0) + /* Find the SMBIOS table header. */ + addr = bios_sigsearch(SMBIOS_START, SMBIOS_SIG, SMBIOS_LEN, + SMBIOS_STEP, SMBIOS_OFF); if (addr == 0) return; diff --git a/sys/dev/ipmi/ipmi_smbus.c b/sys/dev/ipmi/ipmi_smbus.c index 212248f0217e..652e0ea6e665 100644 --- a/sys/dev/ipmi/ipmi_smbus.c +++ b/sys/dev/ipmi/ipmi_smbus.c @@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -131,3 +132,6 @@ static driver_t ipmi_smbus_driver = { DRIVER_MODULE(ipmi_smbus, smbus, ipmi_smbus_driver, ipmi_devclass, 0, 0); MODULE_DEPEND(ipmi_smbus, smbus, SMBUS_MINVER, SMBUS_PREFVER, SMBUS_MAXVER); +#ifdef ARCH_MAY_USE_EFI +MODULE_DEPEND(ipmi_smbus, efirt, 1, 1, 1); +#endif