From nobody Wed Apr 13 00:34:12 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 301531B0D773; Wed, 13 Apr 2022 00:34:13 +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 4KdNrP0s86z4RF0; Wed, 13 Apr 2022 00:34:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649810053; 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=fBxSxZgipXtwzXsemI+QjqRX/egU1Z4oSmbX7O/+SzY=; b=c7jqcdIoE1bQAfNqyis7tcQlMUXt2n8TQTurzPq/D3kkUEj/kwBlu9Sc7oM98Bu5LZ6B7W e+2q2yuP/oKIT1xqGjSn5OI9EVTPR8mnUnMZMm5rtrI1Qr1zL5NqBKt3cD2A9bXc4277/R xCnLQ01D/f14FjCD1xQUBglnSSZKLMemzGGDsOfwTWfq/9ZC23y6Dm6NcdX8E6UkBIw9/E znI7kcldV3GcmaLqEJeWIxSeg19twHIcQddj2bQONp4BDVbW3SfkddMjvuYMF3Bl/6E22v 42dAty9/ky1U0WpeeVoFr1RnECd9hfr4VEiLbpX0Iv+iy2SDzKBWqJU2Jw6gNQ== 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 F15C921E08; Wed, 13 Apr 2022 00:34:12 +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 23D0YCea051667; Wed, 13 Apr 2022 00:34:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23D0YCPN051666; Wed, 13 Apr 2022 00:34:12 GMT (envelope-from git) Date: Wed, 13 Apr 2022 00:34:12 GMT Message-Id: <202204130034.23D0YCPN051666@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 454630c72556 - main - stand: libefi: swap /Pci() printing around 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 454630c72556d45e401f29f56b3317c2fb0499a0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649810053; 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=fBxSxZgipXtwzXsemI+QjqRX/egU1Z4oSmbX7O/+SzY=; b=LFPFt2obhmKY950fGXMBZv+jeHs8V4pet3ISPI78PquGJ0E25SMHfl1yRttKB86K/KyyiU FJsC6u/BWCd8zqIEvjRheC51dsXRvRw+JguSsnDqeAnmhg6/Iz3/Rg3J/6AGsQfN1gVC6m uRUkawD9iGUZB1rnDxn0CktdlAybdca7Q9PeatMRj/Ne7jxDR2IESLKPAW1hq1PMKGCsqi ctJV+h9A9lGAhEm42AlOEiBGROiEl5OoTHsIYJl7xPVYrOh9s+vZNFn71WLByOnV1K7Kxq TDfie8cZm9z1PceWgk+XWLjQV4bbHh4ugfNyuTU5mkhLZQksPhJ4Zf5sQsDfgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649810053; a=rsa-sha256; cv=none; b=ygkDCWiBOqv+anRnekSK8Af5WpvPFCf7fDlj1QiEgl9NlycXd1XywRLcoIXf+kVKPBxS1K 8VUFbFdbtN2CxFMQrfI79PVsHBuuxkDX+1J5f4/bPciRnqWSAFVDFUoqhOVoiG/eN3U/q1 OjjYYmmgPXuEA0QYmWBjbuzidIt6K31CGvYQhG4s6NiNL09R8hfnC34BFJ5cTE1LvTBuLw pwyPcybD31cJibNa0dZTPp2fYF6FsEgf310P50NiWQB41u5VsA8+m3ZjfesM10YxFVQjFN B8xjBv043i1eexyOpl4nKr1R9OJAKKcKDNcDOHuBb+4iB/f9Ml/F5HMfa8gVYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=454630c72556d45e401f29f56b3317c2fb0499a0 commit 454630c72556d45e401f29f56b3317c2fb0499a0 Author: Kyle Evans AuthorDate: 2022-04-13 00:29:54 +0000 Commit: Kyle Evans CommitDate: 2022-04-13 00:30:30 +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. Differential Revision: https://reviews.freebsd.org/D34539 --- 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: