From nobody Fri Aug 18 07:41:50 2023 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 4RRv2k6zWPz4qrZ8; Fri, 18 Aug 2023 07:41:50 +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 4RRv2k37Bmz3G3B; Fri, 18 Aug 2023 07:41:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692344510; 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=ODmjbrFXg+j7arGU2KxCNzzbYP7xKrGi5i/P0kxsmyI=; b=l8btvmPuPLuPU7fCIBWuk99sc9YarsJAV7LyIrh2xIJbQPPyDQEBuWOz/di5Y5H+zE1wL9 xeSzabOS8FB7eYzNF1jftUfXSPkl9Re8lyI5H+QCTe6N8Yn0/JzEoaNYSChI7qCXqdAl/i IYI6ltEBdA1obzAi8vB0tGatbsOEQCTG/OQsGF/JQTKM6EzVsAtkTUiOpPd9pABH8A0Dbf mRdSmKtm+17G1wtyCynWWAFv5lvFKTdkf5BGl7jtozA8BsVanXysHIPudg4daqzR3BowNj 8xy9odeqt4pxzvG66fdAtRQUqGBVFT1MonFoC5P5hNZBBP3P3bg+kkF4WcX0/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692344510; 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=ODmjbrFXg+j7arGU2KxCNzzbYP7xKrGi5i/P0kxsmyI=; b=Rr+xF0EFIiahipc0BPiMhQdr7JklnbgBYiZYuEdFMAijNS7qhmP695oymiZvXLu4sc0RwV KO9x8KCpQyJoGW513Qt4gWkieY8OG3wIfSSxGqugSN7rsKkmMa+oQVmdLni3CFH/CQeSA2 8ptbtYKgs4l4k32+cGma5TmyG7kGcY+72JC+U6EQqN7c8y4soFj5ZO/4FSmiGmfTFx5u4C 72IerrCtyKPLn1mvJy9aendmAwAqWrwBmSE85mJ1ZzOF9c1xJKYmMIn7+BDo2094p0jZps rlC1+wIVuSEperptO9I+OFYRXEvU3KWPbxDA/fe7A3xsqYaQyCbHRR3rfsYH8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692344510; a=rsa-sha256; cv=none; b=wpk4BtRQYF6NmQ2QIQZieD7d1SIWZ/1aXWk1Rfr4fPoSbgQziNud4zqF8FQ4Tc6Y/q3gPf msi8YRIYWynQZOEvYynQezASS/u11hyOFT0Gi2fGz0XQay1McdZFMsLYUa8vUuwrk2IrTk +/GgTKwr85c6wcPWQMq8Hwd9kmqcG/GU1yAOlIIB9cviPz9Mrf7bNQZKZV291feYZjksfN Gdv2OXG5YRgqL6yWt7DsFKapHd5e+zbB7OT/QBUrVtAbnGc/DyYjJBn5F27REQjuzzKveR MnAMiiGf9MBGNImPjIJTGT8DlwLiUYv2NgOF+fdm6aaQCGXUneE8zDLFy8j+2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RRv2k1zCCz174n; Fri, 18 Aug 2023 07:41:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37I7foTA066830; Fri, 18 Aug 2023 07:41:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37I7fo81066827; Fri, 18 Aug 2023 07:41:50 GMT (envelope-from git) Date: Fri, 18 Aug 2023 07:41:50 GMT Message-Id: <202308180741.37I7fo81066827@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: 6d037b69ee62 - stable/13 - bhyve: emulate graphics stolen memory register 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: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6d037b69ee623ffee05864d6f01712c875409be0 Auto-Submitted: auto-generated The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=6d037b69ee623ffee05864d6f01712c875409be0 commit 6d037b69ee623ffee05864d6f01712c875409be0 Author: Corvin Köhne AuthorDate: 2023-05-11 09:18:56 +0000 Commit: Corvin Köhne CommitDate: 2023-08-18 07:32:07 +0000 bhyve: emulate graphics stolen memory register This register contains a host physical address. This address is meaningless for the guest. We have to emulate it and set it to a valid guest physical address. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D40060 (cherry picked from commit d9fa7c113df254b237e5a573d0567eb686e5fcde) --- usr.sbin/bhyve/pci_gvt-d.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/pci_gvt-d.c b/usr.sbin/bhyve/pci_gvt-d.c index 9c5b0906ec29..3109bc06be82 100644 --- a/usr.sbin/bhyve/pci_gvt-d.c +++ b/usr.sbin/bhyve/pci_gvt-d.c @@ -23,6 +23,8 @@ #define PCI_VENDOR_INTEL 0x8086 +#define PCIR_BDSM 0x5C /* Base of Data Stolen Memory register */ + #define PCIM_BDSM_GSM_ALIGNMENT \ 0x00100000 /* Graphics Stolen Memory is 1 MB aligned */ @@ -96,6 +98,7 @@ gvt_d_setup_gsm(struct pci_devinst *const pi) struct passthru_softc *sc; struct passthru_mmio_mapping *gsm; size_t sysctl_len; + uint32_t bdsm; int error; sc = pi->pi_arg; @@ -156,7 +159,12 @@ gvt_d_setup_gsm(struct pci_devinst *const pi) "Warning: Unable to reuse host address of Graphics Stolen Memory. GPU passthrough might not work properly."); } - return (0); + bdsm = read_config(passthru_get_sel(sc), PCIR_BDSM, 4); + pci_set_cfgdata32(pi, PCIR_BDSM, + gsm->gpa | (bdsm & (PCIM_BDSM_GSM_ALIGNMENT - 1))); + + return (set_pcir_handler(sc, PCIR_BDSM, 4, passthru_cfgread_emulate, + passthru_cfgwrite_emulate)); } static int