From nobody Fri Dec 15 18:57:26 2023 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 4SsJPM4PRRz53wqD; Fri, 15 Dec 2023 18:57:27 +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 4SsJPM1Q7rz3Lvj; Fri, 15 Dec 2023 18:57:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702666647; 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=svWh8ZCe/q0xNXoZFRDDymKfJp46pQr3VrT38fnhRNU=; b=hcnDzXS/k+bGT/QKahNMLeQmjtTIYDcaJAxMxOkyty6JrS3G1iFg/+g29zMww6e/PpXL1N irPgOjOS05XbjLS+03eSMHOORRaPvQkOA3S6Q1gcM3pGO8k94t1uEqomeEDHRHV4pd2WLk NK78VkQWBup3FjfVF7xScrvhglqezlV6nRrMQkdEYx4P/b8dwt+QyZ3H4NSIYkz5XX3+/b fM5v8d93sMOfRuxrrqRsNKerE1imF2wAgsXMLJhvJCN4nNwcajFfIFEQQPvI2n9nio84jb vifVd+Dy/aFnt9DkuqXncUOUSbxAwekD0iKpGy5zeOtxlM2Evp60X9mHZMAJDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702666647; a=rsa-sha256; cv=none; b=X+RmatDDOIDkPGVubTYcYWVomm8qXhhdtBDejPBp/Jwhz3tyO0UlVyZaV9fpRKvH366LX8 w5GFIa9wKdCizQOsJ9USDuqTD4bNyT+SKEBqYJdeOMv7XxWVuPbwdNUmwF17S0UaT9j5jh qN9FxcR2nVLeH6snM6WN/s1oDQ+crmhNXMioKV8+G4vZCCJ+iwOeIRnafGf4i9Gut3TnQj wFi1YhuZic6pxswbzub79gTBvNq531lIvISCZSCW6EFFv/R/uYmaVEYcT0YMWybme8cVD8 1SrXbOddQcBJX4bNDqJdzBw60ykP9iwsYaWnFbr4+GFEH9XjzdP9esStVpEK0w== 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=1702666647; 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=svWh8ZCe/q0xNXoZFRDDymKfJp46pQr3VrT38fnhRNU=; b=vzGPe4/y96MduNx+dVFSWhVVLZyl2EiUXZHICZ8o4eg7QsgqxJva7FbfHZXpY1lPxkm5HI yrq01+wg+pb4/TU6JkXLEJVHjNZ9OHFtxvyujnQpLR8ZTagrnKEflEV1Zpq/xXuhwILc6/ fxvBBGkcWaCjoNKvKoRXx+C2eoPMmiUuPMXIkAk2HTG4ECkL7V45j46EMzJPy9tIxAYHMR 5iq4oshu9aFOMBvRWav/AaJeHj78bS01nHz4NONnkDhc9Ru25IOGMhGbYC+27bQtj9+CQo g+vDcqpshZ3dzBRijRo2IsrJx8W4XbAJUByh9PyaGaqCAGn+rwPEvahauEdwKw== 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 4SsJPM0Rn9z7ck; Fri, 15 Dec 2023 18:57:27 +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 3BFIvQUB018169; Fri, 15 Dec 2023 18:57:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BFIvQCt018166; Fri, 15 Dec 2023 18:57:26 GMT (envelope-from git) Date: Fri, 15 Dec 2023 18:57:26 GMT Message-Id: <202312151857.3BFIvQCt018166@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 6a415720f54d - stable/13 - arm64: lop off another 24MB of KVA for early device mappings 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6a415720f54df09aff13fc991c9937cef986674f Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=6a415720f54df09aff13fc991c9937cef986674f commit 6a415720f54df09aff13fc991c9937cef986674f Author: Kyle Evans AuthorDate: 2023-11-23 16:21:33 +0000 Commit: Kyle Evans CommitDate: 2023-12-15 00:59:09 +0000 arm64: lop off another 24MB of KVA for early device mappings This grows the block enough to fit a 4K 32-bit depth framebuffer; some firmware would present smaller GOP modes to be able to boot with a smaller framebuffer on these devices, but the Windows Devkit firmware is simply not that nice. Instead, it offers exactly one GOP mode that matches the current resolution of the attached display, so with limited control over resolution on most of my displays it'd be nice if we could Just Work(TM) at 4K. andrew notes that he has some ideas for removing PMAP_MAPDEV_EARLY_SIZE entirely, so this limitation could end up removed altogether in the future. Reviewed by: andrew, emaste (cherry picked from commit a3ceeef26bc880b86f4e181bddd9924a2b5e0691) --- sys/arm64/include/pte.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/arm64/include/pte.h b/sys/arm64/include/pte.h index f1b11c3a0189..478bd85aa2e2 100644 --- a/sys/arm64/include/pte.h +++ b/sys/arm64/include/pte.h @@ -143,7 +143,11 @@ typedef uint64_t pt_entry_t; /* page table entry */ /* 0x2 also marks an invalid address */ #define L3_PAGE 0x3 -#define PMAP_MAPDEV_EARLY_SIZE (L2_SIZE * 8) +/* + * A substantial portion of this is to make sure that we can cope with 4K + * framebuffers in early boot, assuming a common 4K resolution @ 32-bit depth. + */ +#define PMAP_MAPDEV_EARLY_SIZE (L2_SIZE * 20) #define L0_ENTRIES_SHIFT 9 #define L0_ENTRIES (1 << L0_ENTRIES_SHIFT)