From nobody Wed Apr 10 15:19:25 2024 X-Original-To: dev-commits-src-main@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 4VF61p1wwNz5HHYY; Wed, 10 Apr 2024 15:19:26 +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 4VF61n5sMrz4nTR; Wed, 10 Apr 2024 15:19:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712762365; 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=a4SlGKJ/lxC65+5DYBnDQemIPr3aS5JsA3MNH/391MI=; b=LZg2YcfPjbEzlMk5PJ+X/CM5HL8kg42zizAKsGdjCGDb7DAw8Hb0YIgNnKmSQYi58Mrt8F 8i/m6BXaTKerj0IrRLbcIEmuq676J2JI+kOnz1wdZBENKSwDzyMFQbui6DOKwKhCB7QzD/ lCw3Zh4YjvdWPHRWxk2VhlQU2d2k2vZDv0nDync2ll7iZjWHxSZ9HBFVg+7N6Lam1dPAG0 9LSj9vZlBCtXbG6bBPEND3ebh7dLN4VpFI8moG6sVLZWZjJz1rbJU/EslX8YQsYjXgQKPl 6XNe+qfYFjsM+vpJ4ojfFHuhOxG0XZWzTUosvGc6Suac/5KLffQQLIdQQl7yGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712762365; a=rsa-sha256; cv=none; b=HlM1fhovlikT16JnIpdgUwiOquMEtilMcNl/LYAQaI0FsNfCJyhDfVEJR/hskZRHA9s+kX xNL/94VrwLo/MI2nGsUNesk5k38/HciKsRFLQt6bmX0OIxjx+9PUMR7gfJp0T6/9XXMpvL Ou0qLQmBAkjkexP1e3O3Csl/JUpwugJU8Ru9TvhESTSMfS8qDyqhAiaE2CRf5ULti0g0ap i5SuzKyyB/5TSm8oPmQN2+x22Ej0sstz6Rzx6cxtTju6X4XH44jaqkglA1Da0+jAO7NIYb 4o4d0E5K2daRX37mvwqwVVaZRVLhj9xZacUnzgWKmfB7tyEUzuU++tbzQBK6CQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712762365; 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=a4SlGKJ/lxC65+5DYBnDQemIPr3aS5JsA3MNH/391MI=; b=uKnNQ7HTeGDgBxCBd0kE94H+27AN+hFPcqFB8z9w0RfEqMcrPlhHbrOiMhXaUt99PXyOV8 EGTBpIi340JNmNyytRf3qxbPL94Ct+miL61H4SFmnf/7SauZ9BLkT9bdp8U/OE/iyHpRux hbMuuBe06qfbBgAVMQqbzMssqOI5uP6gpBTS06aLA9x6XOy6WuxT0QOVFGlrD2Miyw9jOO 6UwRhQkiZW2jFOLErkqYaFlU/Z6q28pf5EF7EXrUZVpRjbVmdKTrUfwo+zWME8i5Dj0bQT ImqpQIP/+M+n/mP+ZzAOTV8xWSOz/8upwQU54pY1ORRCuuOblCqb2v9aNjUU5w== 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 4VF61n5TFgzjlp; Wed, 10 Apr 2024 15:19:25 +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 43AFJP3x093726; Wed, 10 Apr 2024 15:19:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43AFJPSG093723; Wed, 10 Apr 2024 15:19:25 GMT (envelope-from git) Date: Wed, 10 Apr 2024 15:19:25 GMT Message-Id: <202404101519.43AFJPSG093723@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 95b948c1d118 - main - bhyve: Fix arm64 PCI I/O range to match FDT List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: dev-commits-src-main+owner@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 95b948c1d11831e4a47735371097a397bf0cf707 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=95b948c1d11831e4a47735371097a397bf0cf707 commit 95b948c1d11831e4a47735371097a397bf0cf707 Author: Jessica Clarke AuthorDate: 2024-02-19 22:40:24 +0000 Commit: Mark Johnston CommitDate: 2024-04-10 15:17:56 +0000 bhyve: Fix arm64 PCI I/O range to match FDT This is supposed to combine with the memory range to make one contiguous block, as is laid out in the FDT, so make this match what the OS is told and thus actually configures. Also drop the confusing leading zero from all three of these constants that is making these 9 rather than 8 hex digits long (as one would expect for a 32-bit address). Reviewed by: jhb MFC after: 2 weeks Obtained from: CheriBSD --- usr.sbin/bhyve/pci_emul.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/bhyve/pci_emul.c b/usr.sbin/bhyve/pci_emul.c index 0b0be09c4de7..8eaa9b71fa15 100644 --- a/usr.sbin/bhyve/pci_emul.c +++ b/usr.sbin/bhyve/pci_emul.c @@ -136,9 +136,9 @@ static TAILQ_HEAD(boot_list, boot_device) boot_devices = TAILQ_HEAD_INITIALIZER( */ #define PCI_EMUL_MEMBASE32 0xc0000000 #elif defined(__aarch64__) -#define PCI_EMUL_IOBASE 0x00df00000UL -#define PCI_EMUL_IOLIMIT 0x00e000000UL -#define PCI_EMUL_MEMBASE32 0x0a0000000UL +#define PCI_EMUL_IOBASE 0xdf000000UL +#define PCI_EMUL_IOLIMIT 0xe0000000UL +#define PCI_EMUL_MEMBASE32 0xa0000000UL #else #error Unsupported platform #endif