From nobody Thu Apr 21 22:34:52 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 CDFED19957EE; Thu, 21 Apr 2022 22:34:52 +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 4KksmX5RgGz4VkZ; Thu, 21 Apr 2022 22:34:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650580492; 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=+x2qm9EPsMf+Z9jIUB5VOKpTXz2Cc5Stw57Pg5Re48c=; b=OSrKRAe0Po05YRC6TecSibJD99uoc9PLbWlDLBAEiTpshKPfQq8fZi33sqdlqF0PRLpRMH bLceKPcyIsv/OLPPUQLXxnZgBMwfZZpm+gRsdMxbWx26H0qdKMuat3ABWtFa9enqqobYU3 cRe/b898CNx0sU3IFEG7iTYpV7WzLignzmHmnAXLBF5DMj1ZPgFjFaqYhrdCG3LCd4EAv+ nusZWYOOGqafMLrSOwiPCCUbR58zNUQRym9VCAgeeTYvt3wJoXscDFYlDxAKsAsBDCqgua TWysVIlynKXYwQ/sncldazY8GP93HYcTSoS/NTOchBCNSQnaHzK5eiF/MeAWLw== 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 96DC2114E5; Thu, 21 Apr 2022 22:34:52 +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 23LMYqap019108; Thu, 21 Apr 2022 22:34:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23LMYqRl019107; Thu, 21 Apr 2022 22:34:52 GMT (envelope-from git) Date: Thu, 21 Apr 2022 22:34:52 GMT Message-Id: <202204212234.23LMYqRl019107@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: 13cc5276ea39 - stable/12 - 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/12 X-Git-Reftype: branch X-Git-Commit: 13cc5276ea3914d6a9a9d4649490b4da356b540e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650580492; 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=+x2qm9EPsMf+Z9jIUB5VOKpTXz2Cc5Stw57Pg5Re48c=; b=bL+3ZnfNSphg34R+QSk/mFTbDTwf8OGBzt5nwLr+ZrmMUUbpJeRotpp7RI/kdjZ3EXM6S+ OR+EWFqPQmMiVcnMQVRcxYXjM5mktvgFeKKx+CYKV2u340jymQrl7ADwYbnVREMgnTVAbd qVyLo6ltiCEvbXigsN0nYVTK+SW0qDazIPwGyj/IxDQ9DVzIMXoC3FG7QvpkR4TuOyCM3L qFNYin4MIfmWBtWTRp+D8ucuOLZj1Jm0nCb1HANo5aX2GCY1Q2mbSOxMyEe1w8LYHSX46X ldwlzynWn7ifdJU6IW8lpv0U5BSbhlXk3wgtP2XpQixB7pWtF+FhalaaXdWqLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650580492; a=rsa-sha256; cv=none; b=lq4bfXHFUFdOZuuO9Zx309kIPgLoPMaXIhDGUeh0K5ITgspACVGY3P3hEVN5+CHkjbnjmz HH13OOHdRuJjkaNepvAXf+HSNiUqruBF2ps86uIHOTgxFDWAW25nnCeT7pTCIpM/b1kuMZ Qc4qnGaw/v9YWcGRnqwEY5X0omwVtH4xDqMoFWFSgy9tVUQV4EcOjoTcNaqz4lShSn/XqR NoPiaAsh4j/nNkASR/LYNUk+TJxxtAheTYlNb8N/P4ayWSqc2u9Jy+RoXaAfAwVd+t94sQ KxpNx0qWUymog0pbamjOMjIRS3WMmwz27rINb4Vs6Xob31lRcfaZh08CuHRK3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=13cc5276ea3914d6a9a9d4649490b4da356b540e commit 13cc5276ea3914d6a9a9d4649490b4da356b540e Author: Kyle Evans AuthorDate: 2022-04-13 00:29:54 +0000 Commit: Kyle Evans CommitDate: 2022-04-21 22:33:09 +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: