From nobody Thu Apr 21 22:38:18 2022 X-Original-To: dev-commits-src-branches@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 9637719963CB; Thu, 21 Apr 2022 22:38:18 +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 4KksrV3Y5tz4Wpx; Thu, 21 Apr 2022 22:38:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650580698; 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=+gpxBexPGvzZi98dDFqGyn9j4NPxHuMJYaLX1EKgI4o=; b=KMG+F1G7z2oC/gS2CgPpWBKoQtiomC5M/t3c3ZPp1EEPWrvdZFXtZkTMqpQhiB2szaW3PL qUyP3rvqbm5qI6jW8WQ0KlUeaDOyz4oQNp6LnhwKqUYvh4YbEJ1GC9IF96T2lGbOkVjFjP lKO6YlMyjX2YGx/x+1MgEGoOcA2QHETghFxkxUcCX7yTO2fVGeXv4zKiXMKfCqne0VbWg7 yxJ/+FIltnVcKoVnNyhAbNPI/CXUb3Rm5Gct8dWLUpEiRiiXUv5gPcw/PjhBj97pj6pPj0 v6MsRQx2ZG8VzAWCE4eqp32w4N+gU9qDlqY0YTUzeV44ed/KFusZj12e3BFE4Q== 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 5A399117EE; Thu, 21 Apr 2022 22:38:18 +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 23LMcISO019483; Thu, 21 Apr 2022 22:38:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23LMcI4d019482; Thu, 21 Apr 2022 22:38:18 GMT (envelope-from git) Date: Thu, 21 Apr 2022 22:38:18 GMT Message-Id: <202204212238.23LMcI4d019482@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 4321608d3dd8 - stable/13 - stand: libefi: swap /Pci() printing around List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4321608d3dd8dcb397ba3edb81faf304023b0592 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650580698; 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=+gpxBexPGvzZi98dDFqGyn9j4NPxHuMJYaLX1EKgI4o=; b=HgmRqxbxU0sZ1g/hV3Lb884mgbL+hy6byppOAYRmgGdj4+iWpqw3JglVuf6Iozjjua33hM eIjeDW0q6a75eiJrvuupBYDhVImpadPTSHVps4VUN0KPLnSwp0Xh5MueojcRqhveDphZvy gDlPDRbB+VoBtaVDURo+aeyo1OidXxFQVvWiLHSR40MCidolrrqEuo/sVhqtGGA+K2eVZl b/xVdkjSKbJ5bzIDlsQ/fuJn8ax7vYiJztSMNxaN1GX9jQjhGSkvRnJc+NpkpE/l12JfO/ gmK5NKcmEeJmo+PTJh835/IKFUjWBmx4ZEi73jkSPwlGzLMW4aSYJCVBoClwJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650580698; a=rsa-sha256; cv=none; b=dbtx3tXgbh3KJSjAPEXADm0e3/yhxjbXjqa/uJQCE6Q4ICZXTFewqoeYfthruPXxtvjvuu xsSmspdm7reDvgYg6KtnLQZvKMGV2L8wmyjGd9HxiKzwehabsewYirWfsTgGIH51jL+KCl 4euPXa405Q8Mi7BajoGopNfwRnL0BI6CnRr8FXeqrEnuJCXuLEF8fZFqqoybl8VZ2koAG4 tDdspstzcbz7stTZe9Mxw9hzjzNMIB42zT82AEQ3RhdoVIwG52IF0tU2rBQHLQfVrdN3+D risFNkIIjZDqnbjyVyTC0hD5+fWgK5j/LSjVOofsEH5JCVNVoeiVnUXzKSLTWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=4321608d3dd8dcb397ba3edb81faf304023b0592 commit 4321608d3dd8dcb397ba3edb81faf304023b0592 Author: Kyle Evans AuthorDate: 2022-04-13 00:29:54 +0000 Commit: Kyle Evans CommitDate: 2022-04-21 22:34:51 +0000 stand: libefi: swap /Pci() printing around Printing device followed by interface matches, e.g., edk2. Note that this is only a fallback, many firmware implementations will provide the protocol that we'll use to format device paths. Reviewed by: imp, tsoome Sponsored by: Ampere Computing Submitted by: Klara, Inc. (cherry picked from commit 454630c72556d45e401f29f56b3317c2fb0499a0) --- stand/efi/libefi/devpath.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stand/efi/libefi/devpath.c b/stand/efi/libefi/devpath.c index b56c583b5fa7..c25ae73e463c 100644 --- a/stand/efi/libefi/devpath.c +++ b/stand/efi/libefi/devpath.c @@ -146,8 +146,8 @@ efi_hw_dev_path(EFI_DEVICE_PATH *node, char *suffix) switch (subtype) { case HW_PCI_DP: if (asprintf(&name, "Pci(%x,%x)%s", - ((PCI_DEVICE_PATH *)node)->Function, - ((PCI_DEVICE_PATH *)node)->Device, tail) < 0) + ((PCI_DEVICE_PATH *)node)->Device, + ((PCI_DEVICE_PATH *)node)->Function, tail) < 0) name = NULL; break; case HW_PCCARD_DP: