From nobody Sun Feb 27 16:47:46 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 4BC1319E9ECD; Sun, 27 Feb 2022 16:47:47 +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 4K68ZV4P3Mz4mDK; Sun, 27 Feb 2022 16:47:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645980466; 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=povR/KQUGB7olLXR97Xj9kGl8XoWtxSorJIPyBp/5rc=; b=kVMKWClDJHiEtNl+iQtXkAz2YE6RGwBSZi8Te0CSiNmmU+sUfmfTAsvfQ6HHnN8yYeQFov ggvbRQDhflne1DjN+/cpCWYF+3H/L27mGMfkkaETgYxDxqocN0mhXp0qPZjSwVn9S8pKo+ 48JJnHq9k9yau06JEKHvIsry7WQSsflj5dWsskUDUebMvY/yINWgMPdzOi2GlB52RAEcxh z7ZzR9bjgWccU/rv6onMzbRQAFGer9+uwFd6La0qDGoe1/KGVbJ624UasoZ8s0dcE+Bots p4mcuYJn6HtgEIZ6EPgWecAKf2dR5qIKbBsIPBBTjv1jE8laBqyUvy7lmsRDcA== 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 40C302A56; Sun, 27 Feb 2022 16:47:46 +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 21RGlkKx036877; Sun, 27 Feb 2022 16:47:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21RGlkC9036876; Sun, 27 Feb 2022 16:47:46 GMT (envelope-from git) Date: Sun, 27 Feb 2022 16:47:46 GMT Message-Id: <202202271647.21RGlkC9036876@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: 8278071ae179 - main - libefivar: Correct the string order of ACPI Expanded Device Path 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: 8278071ae17976490f08e8154f226178abf319ea Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645980466; 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=povR/KQUGB7olLXR97Xj9kGl8XoWtxSorJIPyBp/5rc=; b=chZ1A0qrUqbn/1AqdnurK7a6Zue5YnLdDbzgv9JOx4oEuGi25tDuQv6sHYbc7cBLhK8wZn /9qzjvZlmLaYsrmAt4hMc3h7S3dluID8x03TIkUIOZMFeZV3bLQHogrJoBUi4OznZjUYqg N3AeR3bVYyLwHo2BLzE28SAlHlcR4IRH4S2RwM0SmxGogqRPWU+OnLMKJkblOJXKvToGeK C4xCGiC5ZW5bWhBX+rn9kfrBJ/ghfKzIPdi/oxQbLLdEu59jay2G0kz4L6HqKzgKvwzoM1 5GDM3e82T82rfGrSAZrJENRmyX0Rxt3H2xlChCFfQswBQ2RF68oWII2WQzCQIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645980466; a=rsa-sha256; cv=none; b=YN+CIucBQf4kttW66LFt52dGQT95F7U1CLFTOG3Sr8Ymaz2hhGY15lxgW53PfyU1OwSwQY yAJqOqSd0zcqxZn4Yhm5SNOxFdu6P4wOSQDyHsG0z1UvUzTfpq8pbR5DbANUAW+mGrUm9h q7MFXqwO9NiKpoI+xesMdT9CaBuiC2nInMCqRT680NRN2YHrRp13s6JKItNotDtE9x1rdV FnxIGadSz8wNCYkbH0+ycs7w5XQXzBKHudINyGo/OmmxCBH549gJJVSfUtR7MEiF8sDUbZ lm2JJn0nF/izMk4le8yZcAwEnCZwGV7YmovAazn8AF+jJzROWvPl//Q3b9YZbw== 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=8278071ae17976490f08e8154f226178abf319ea commit 8278071ae17976490f08e8154f226178abf319ea Author: Jose Luis Duran AuthorDate: 2022-02-23 16:45:14 +0000 Commit: Warner Losh CommitDate: 2022-02-27 16:13:00 +0000 libefivar: Correct the string order of ACPI Expanded Device Path According to UEFI Spec, ACPI Expanded Device Path can be display AcpiEx(HID|HIDSTR,(CID|CIDSTR,UID|UIDSTR)), but current code display UID|UIDSTR before CID|CIDSTR. This patch is to fix this issue. Upstream Bug: https://bugzilla.tianocore.org/show_bug.cgi?id=1227 Obtained from: https://github.com/tianocore/edk2/commit/05fe7525896cee197cfed98154955dbaa60d6357 Pull Request: https://github.com/freebsd/freebsd-src/pull/581 --- lib/libefivar/efivar-dp-format.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libefivar/efivar-dp-format.c b/lib/libefivar/efivar-dp-format.c index 2256a2013ad4..7abbce033f1d 100644 --- a/lib/libefivar/efivar-dp-format.c +++ b/lib/libefivar/efivar-dp-format.c @@ -536,16 +536,16 @@ DevPathToTextAcpiEx ( UefiDevicePathLibCatPrint (Str, "AcpiEx(%s,", HIDText); } - if (AcpiEx->UID == 0) { - UefiDevicePathLibCatPrint (Str, "%s,", UIDStr); + if (AcpiEx->CID == 0) { + UefiDevicePathLibCatPrint (Str, "%s,", CIDStr); } else { - UefiDevicePathLibCatPrint (Str, "0x%x,", AcpiEx->UID); + UefiDevicePathLibCatPrint (Str, "%s,", CIDText); } - if (AcpiEx->CID == 0) { - UefiDevicePathLibCatPrint (Str, "%s)", CIDStr); + if (AcpiEx->UID == 0) { + UefiDevicePathLibCatPrint (Str, "%s)", UIDStr); } else { - UefiDevicePathLibCatPrint (Str, "%s)", CIDText); + UefiDevicePathLibCatPrint (Str, "0x%x)", AcpiEx->UID); } } else { UefiDevicePathLibCatPrint (