From owner-dev-commits-src-branches@freebsd.org Fri Sep 3 19:06:04 2021 Return-Path: Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9879E67B26D; Fri, 3 Sep 2021 19:06:04 +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 4H1S1m2nDVz4mmP; Fri, 3 Sep 2021 19:06:04 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 3051C196C; Fri, 3 Sep 2021 19:06:04 +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 183J64Sb050699; Fri, 3 Sep 2021 19:06:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 183J64C6050698; Fri, 3 Sep 2021 19:06:04 GMT (envelope-from git) Date: Fri, 3 Sep 2021 19:06:04 GMT Message-Id: <202109031906.183J64C6050698@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ka Ho Ng Subject: git: da4e35def95a - stable/12 - vmm: Fix ivrs_drv device_printf usage MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: khng X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: da4e35def95a5ca456e2f14efce83e1a76dece79 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Sep 2021 19:06:04 -0000 The branch stable/12 has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=da4e35def95a5ca456e2f14efce83e1a76dece79 commit da4e35def95a5ca456e2f14efce83e1a76dece79 Author: Ka Ho Ng AuthorDate: 2021-06-19 06:05:13 +0000 Commit: Ka Ho Ng CommitDate: 2021-09-03 18:46:40 +0000 vmm: Fix ivrs_drv device_printf usage The original %b description string is wrong. Sponsored by: The FreeBSD Foundation Reviewed by: imp, jhb Differential Revision: https://reviews.freebsd.org/D30805 (cherry picked from commit 210e6aec4f83ee0efef348ed9dd86be7592596a1) --- sys/amd64/vmm/amd/ivrs_drv.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/sys/amd64/vmm/amd/ivrs_drv.c b/sys/amd64/vmm/amd/ivrs_drv.c index 16f5e05e23e3..10d14ec2f210 100644 --- a/sys/amd64/vmm/amd/ivrs_drv.c +++ b/sys/amd64/vmm/amd/ivrs_drv.c @@ -473,7 +473,7 @@ ivhd_print_flag(device_t dev, enum IvrsType ivhd_type, uint8_t flag) "\005IotlbSup" "\006Coherent" "\007PreFSup" - "\008PPRSup"); + "\010PPRSup"); break; case IVRS_TYPE_HARDWARE_EFR: @@ -563,9 +563,9 @@ ivhd_print_ext_feature(device_t dev, uint64_t ext_feature) "\005GTSup" "\006" "\007IASup" - "\008GASup" - "\009HESup" - "\010PCSup", + "\010GASup" + "\011HESup" + "\012PCSup", REG_BITS(ext_low, 11, 10), REG_BITS(ext_low, 13, 12), REG_BITS(ext_low, 15, 14), @@ -582,17 +582,17 @@ ivhd_print_ext_feature(device_t dev, uint64_t ext_feature) (int)(ext_high), "\020" "\006USSup" - "\009PprOvrflwEarlySup" - "\010PPRAutoRspSup" - "\013BlKStopMrkSup" - "\014PerfOptSup" - "\015MsiCapMmioSup" - "\017GIOSup" - "\018HASup" - "\019EPHSup" - "\020AttrFWSup" - "\021HDSup" - "\023InvIotlbSup", + "\011PprOvrflwEarlySup" + "\012PPRAutoRspSup" + "\015BlKStopMrkSup" + "\016PerfOptSup" + "\017MsiCapMmioSup" + "\021GIOSup" + "\022HASup" + "\023EPHSup" + "\024AttrFWSup" + "\025HDSup" + "\027InvIotlbSup", REG_BITS(ext_high, 5, 0), REG_BITS(ext_high, 8, 7), REG_BITS(ext_high, 11, 10));