From nobody Tue Dec 14 12:19:20 2021 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 1233C18EEBF1; Tue, 14 Dec 2021 12:19:21 +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 4JCy9N5tSNz3tYX; Tue, 14 Dec 2021 12:19:20 +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 9F7D689; Tue, 14 Dec 2021 12:19:20 +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 1BECJKc2033158; Tue, 14 Dec 2021 12:19:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BECJK0j033157; Tue, 14 Dec 2021 12:19:20 GMT (envelope-from git) Date: Tue, 14 Dec 2021 12:19:20 GMT Message-Id: <202112141219.1BECJK0j033157@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Wei Hu Subject: git: eabea1c700ad - stable/12 - Hyper-V: vPCI: Prepopulate device bars 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: whu X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: eabea1c700ad8eacb8dc780d8620b59ce72b2cf2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639484360; 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=C+OS/FnwJWJT3KWq9LMyofgG2A2IpJ80NPv75lSCuoM=; b=hEZY1cDmV8ahQfCKUwCVHn26IPkAIQXvk57vqLKfX/7hLB25fpFO8ByPeui83cnSa23LAz xu/UzziwGZHgm5dHAZ4clqu1UnFdwbKJKvRm+I8pSsO4h9cM2I3H4xlM+fPpsJctmfxoen FASbdSd4E7tOMBMWu4uZVhG7Gzl/Jlq0cFjnXSkChtxqk47mpmX1oA8dDwWNknf5/8qVX0 T4vHowPf5zRZ1JVnIfNcaqcowxdYtOFE40vcsTr9BwNDzqGiqNyGFIhURY9f0INOiIPUkn 4EkM8fHagQXtKhir4WLCJAzVMoIV1SftArty/uhg1ZVJYtQRxrKyrvsg/GnauQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639484360; a=rsa-sha256; cv=none; b=GA/AVSBu+yMyWHSxIzcPNZ6olM1TlqSJSkmVOeoV03htKlZYW1ATHO5va91WKgOxWHoTWZ XUVBTe+OPqBz+2FlC2H8g9Rie5AM8Or8YIi0zz05xQjmlbhpP26MWVhPKqSA2Vmhz1k/o3 zSAn5a0MZMw7UHuZNA8gs0+5/+il0hUolZEP10b7us5tad1rT3KOvcjhvyi5ZOpTQ+ytKj XuZak8j2JFvbiGmjYg1UZLyFjXNzAcDOhpFVwF3R4rNdgiLt9dS5mPenf2CFGKvhHmMwjL W2Zc9IjLv8C/HrYGm1c7LYeXxBOBeYTPNPopO9KNFSs2uk6ES6qNS0Vzp1VZIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=eabea1c700ad8eacb8dc780d8620b59ce72b2cf2 commit eabea1c700ad8eacb8dc780d8620b59ce72b2cf2 Author: Wei Hu AuthorDate: 2021-11-27 06:42:34 +0000 Commit: Wei Hu CommitDate: 2021-12-14 12:14:49 +0000 Hyper-V: vPCI: Prepopulate device bars In recent Hyper-V releases on Windows Server 2022, vPCI code does not initialize the last 4 bit of device bar registers. This behavior change could result weird problems cuasing PCI code failure when configuring bars. Just write all 1's to those bars whose probed values are not the same as current read ones. This seems to make Hyper-V vPCI and pci_write_bar() to cooperate correctly on these releases. Reported by: khng@freebsd.org Tested by: khng@freebsd.org MFC after: 2 weeks Sponsored by: Microsoft (cherry picked from commit 75412a521f60d4b0393c730ffb284e7c6ff9d2de) --- sys/dev/hyperv/pcib/vmbus_pcib.c | 43 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/sys/dev/hyperv/pcib/vmbus_pcib.c b/sys/dev/hyperv/pcib/vmbus_pcib.c index 72e430c946db..c7df32044678 100644 --- a/sys/dev/hyperv/pcib/vmbus_pcib.c +++ b/sys/dev/hyperv/pcib/vmbus_pcib.c @@ -1356,6 +1356,47 @@ _hv_pcifront_write_config(struct hv_pci_dev *hpdev, int where, int size, } } +/* + * The vPCI in some Hyper-V releases do not initialize the last 4 + * bit of BAR registers. This could result weird problems causing PCI + * code fail to configure BAR correctly. + * + * Just write all 1's to those BARs whose probed values are not zero. + * This seems to make the Hyper-V vPCI and pci_write_bar() to cooperate + * correctly. + */ + +static void +vmbus_pcib_prepopulate_bars(struct hv_pcibus *hbus) +{ + struct hv_pci_dev *hpdev; + int i; + + mtx_lock(&hbus->device_list_lock); + TAILQ_FOREACH(hpdev, &hbus->children, link) { + for (i = 0; i < 6; i++) { + /* Ignore empty bar */ + if (hpdev->probed_bar[i] == 0) + continue; + + uint32_t bar_val = 0; + + _hv_pcifront_read_config(hpdev, PCIR_BAR(i), + 4, &bar_val); + + if (hpdev->probed_bar[i] != bar_val) { + if (bootverbose) + printf("vmbus_pcib: initialize bar %d " + "by writing all 1s\n", i); + + _hv_pcifront_write_config(hpdev, PCIR_BAR(i), + 4, 0xffffffff); + } + } + } + mtx_unlock(&hbus->device_list_lock); +} + static void vmbus_pcib_set_detaching(void *arg, int pending __unused) { @@ -1479,6 +1520,8 @@ vmbus_pcib_attach(device_t dev) if (ret) goto vmbus_close; + vmbus_pcib_prepopulate_bars(hbus); + hbus->pci_bus = device_add_child(dev, "pci", -1); if (!hbus->pci_bus) { device_printf(dev, "failed to create pci bus\n");