From nobody Sun Feb 27 16:47:47 2022 X-Original-To: dev-commits-src-main@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 316F919E9CF2; Sun, 27 Feb 2022 16:47:49 +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 4K68ZW757jz4m5N; Sun, 27 Feb 2022 16:47:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645980468; 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=XlWAWRZXYTXiZcry0I/z+3CcYerWgd6e9hBYCSCBK7c=; b=E/ffVFYw324oVXSjJIxR36OrGcgxYJ+4Zh4Te1zSZP4I/kWV09a6OAB1gyFh4lrGuaZjzI BBJboznaNHXi2WMdlwdeTFeDfXyyeooV37Z44NIY4mPf8O6gXqbfNf6wt6sxJo3o2wzAhn FyWVys/HuduaBXiu7IDRY9TmZmiHQDIVBDGQ1QBC9kjfdGtG8IdSWk+wrCAh/jc18XeGBA z0lDRIVPM+RsP13nZZHyPZ4KkxDQJQlqbRwHa4r8wpYvCJ5M/qGS04EG6Cn3TBzj0u55Oe hIRtKsiE0zHJgx/VwOHtyKKft1VETc29Q4KCmYNkXyJpKQezbexdKoEaZXqTpw== 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 642A22E68; Sun, 27 Feb 2022 16:47:47 +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 21RGll2x036901; Sun, 27 Feb 2022 16:47:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21RGllES036900; Sun, 27 Feb 2022 16:47:47 GMT (envelope-from git) Date: Sun, 27 Feb 2022 16:47:47 GMT Message-Id: <202202271647.21RGllES036900@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: ac2b16d3b11b - main - libefivar: Correct condition check for AcpiExp text format List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ac2b16d3b11b88ba1f3023de3645575542be4ca3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645980468; 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=XlWAWRZXYTXiZcry0I/z+3CcYerWgd6e9hBYCSCBK7c=; b=CNmJxiLLluENRh9PiuErL4PtVV+thskNzhWsHIyXb6A4rCXPE9H62O8gPsH6+b+zZLt3h9 1EdpYhIwwxkybOMcl1aUU4o4aNm0Bap85j34ZbGwxzmSGqVo07n8ZOwvQ5FDIUVhG45CzT CNFEbS8zpVbGB3ZkrohppAQ6JMomn0yeJkhR4HSrU5wEXO8kFcimF6dCAtjzwrh1CsB1b6 aVPhi1JHDL/0vK8y0JMAgwUK5qcNkh2UyEX9w4s6mhPv6wcZZpFCskZuW8TgqqGWquOwon WMpctsX6YEsXonRXrHEu8w6NtRB92UI7RIoaw1ucrK5ocPzKnTXWGgkBwOsWXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645980468; a=rsa-sha256; cv=none; b=C8ZgwGZpmcsEWhGHNT8HGM0l/ijGNIZA99bzrmm7bsC4AJzEm/ix1jTl7EKk14ltxdTP9Y xZ2iG+Byt7hSg9qcjGTtQ4lQmCelAOxw/6BrAwbx2wzWJN+WSaUarymx3uc28sSEqCxshG bTTYW0ADdSV4sWkgO9nwlLOPNLqOl7xC23XdtljVoxbca1c/BzFmJO1kESrnXSDOlx3bHq sa292OoZLM7LnLpNjA5v1oJgobb1ILIhhZolhlh1SLwtk0dLiWDoBnkHcy1rWtkvVmD86I ZODtKJGKpRlrd2kyF/AWRV6JK/e7DbH4ODngsMGkVYFRUZ+shQQgU4doExBP/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ac2b16d3b11b88ba1f3023de3645575542be4ca3 commit ac2b16d3b11b88ba1f3023de3645575542be4ca3 Author: Jose Luis Duran AuthorDate: 2022-02-23 16:38:58 +0000 Commit: Warner Losh CommitDate: 2022-02-27 16:13:04 +0000 libefivar: Correct condition check for AcpiExp text format According to UEFI Spec, for ACPI Expanded Device Path, when HIDSTR=empty, CIDSTR=empty, UID STR!=empty, the ACPI Expanded Device Path node can be displayed as AcpiExp(HID,CID,UIDSTR) format. And if UID is 0 and UIDSTR is empty, then use AcpiEx format. This patch is to correct the condition check to follow UEFI Spec when convert the device path node to the AcpiExp text format. Upstream Bug: https://bugzilla.tianocore.org/show_bug.cgi?id=1226 Obtained from: https://github.com/tianocore/edk2/commit/fb4bea551e5b7e16e54676bca3d1ccde65f57c77 Pull Request: https://github.com/freebsd/freebsd-src/pull/581 --- lib/libefivar/efivar-dp-format.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libefivar/efivar-dp-format.c b/lib/libefivar/efivar-dp-format.c index 7abbce033f1d..24f4cdc94d98 100644 --- a/lib/libefivar/efivar-dp-format.c +++ b/lib/libefivar/efivar-dp-format.c @@ -514,7 +514,7 @@ DevPathToTextAcpiEx ( (AcpiEx->CID >> 16) & 0xFFFF ); - if ((*HIDStr == '\0') && (*CIDStr == '\0') && (AcpiEx->UID == 0)) { + if ((*HIDStr == '\0') && (*CIDStr == '\0') && (*UIDStr != '\0')) { // // use AcpiExp() //