From nobody Mon Mar 03 16:12:29 2025 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 4Z63k600Pbz5pjR6; Mon, 03 Mar 2025 16:12:30 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z63k53W9vz40Hd; Mon, 03 Mar 2025 16:12:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741018349; 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=IpsiCpH5DaRbUEWjZiFOtZ6zbwoYpV7oyKwNVnFCtUo=; b=e6e4NNb1RPi+zVu1mqBb2lK4k8tgUA/E8QnCMo55lgidrxDvDdtqCcqkGTLn4mDasg41cc Uz5XApwpTPlvDgEkuuWcctrpT4JLXSfYTTlqmNJV6QO4vnmoRcBeUJ5XkX0POSMGQKloll 4rrq9JnSyOjUohttDLcolF8swXMyA8w6SpGsqfdxu3Xm2wHt++MEb+XbGORX397U/G++vu l8DX/+h36Jdbu83XzJbRYBNqsmvq4B1GeZ80ofwuqNTK0NEW2fQ927GD5q/yDYfB8GQIHQ n8fN2jScxzQhV0jKrcKYcuBXp8FE8hJVKM5yNfpKtENYdsxsSEq4GsZZvu2oSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741018349; a=rsa-sha256; cv=none; b=vIQrXqTmLRTThS8CXUULZ/F0s61bFxmnadXSEhDBEwsfuY4KGaY1/rwM/Wje5++yvJy07l rZxCtiecwYtDogAIu9d1KoxGZ+0BEtCUxcKV9+yPXXo6UVFKa0PIW2fSIBa3eUx47FMrjY z2t7Pl+xL7JiYLpnVmDCu+VfZ6uuJtRvMk52vPg9jZ014/Yd+SDvLp+oic+bhXmvxq2EhX lsLBzkrurlZ9a/sCOmO6lofhsFfpNlF1OeyJzaxpeRbcMLTSiAnaSV7bqXGnNG7zH2Lkx4 JtJB+NJWeajFEx3K7LL94ywtJs1DSjHjiSOKAbo9PkEsUdAe6LOZt+O1URPiew== 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=1741018349; 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=IpsiCpH5DaRbUEWjZiFOtZ6zbwoYpV7oyKwNVnFCtUo=; b=bZXrRj2TniMzArAX107isqF3aToBPHu0hBd4czi2GDJKYDvdmjnO2MbYxadWdXR0O/jp6b 1J1khOUTLAKthAgsMEhkkiaA0k6oh4+bUfnqFonImVZvoaQqhUmzb0daO0fFLJgCaf9/+w mzFvY4GH7wPuE4uLVUus7R/A5Z9Q1x0GOV+dY9q7lKwPfdED4H/Jd7YlwXD9b1XeEEipLC 8vJDos7p7GvYYHzEfxTgTzE+RSHhJmMgu9K+YXtc3hncaoLT+xxRl/KYJ8wp8jp7He2G/l 3OltjUB2qt+kP07VBTHk1lbOUsiK4V7ZZDSG4l7t4ec6y3ZHF/lImznaClux+g== 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 4Z63k52GGgzvZl; Mon, 03 Mar 2025 16:12:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 523GCTQW007281; Mon, 3 Mar 2025 16:12:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 523GCTO4007278; Mon, 3 Mar 2025 16:12:29 GMT (envelope-from git) Date: Mon, 3 Mar 2025 16:12:29 GMT Message-Id: <202503031612.523GCTO4007278@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: e2a08ac9ce42 - main - riscv: enable EFI framebuffer 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e2a08ac9ce424f543a2f03c67fb882fdabbdd32a Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=e2a08ac9ce424f543a2f03c67fb882fdabbdd32a commit e2a08ac9ce424f543a2f03c67fb882fdabbdd32a Author: Mitchell Horne AuthorDate: 2025-03-03 15:46:39 +0000 Commit: Mitchell Horne CommitDate: 2025-03-03 16:12:15 +0000 riscv: enable EFI framebuffer Pass framebuffer information from loader(8) to the kernel via the MODINFOMD_EFI_FB metadata field. Enable the vt_efifb driver. A small tweak is required to work around the lack of VM_MEMATTR_WRITE_COMBINING on this platform; we use VM_MEMATTR_UNCACHEABLE instead. Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D48884 --- stand/efi/loader/bootinfo.c | 2 +- sys/dev/vt/hw/efifb/efifb.c | 9 +++++++-- sys/riscv/conf/GENERIC | 1 + sys/riscv/include/metadata.h | 1 + 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/stand/efi/loader/bootinfo.c b/stand/efi/loader/bootinfo.c index 3e74a9228b5e..ca86a319613f 100644 --- a/stand/efi/loader/bootinfo.c +++ b/stand/efi/loader/bootinfo.c @@ -182,7 +182,7 @@ bi_load_efi_data(struct preloaded_file *kfp, bool exit_bs) struct efi_map_header *efihdr; bool do_vmap; -#if defined(__amd64__) || defined(__aarch64__) || defined(__i386__) +#ifdef MODINFOMD_EFI_FB struct efi_fb efifb; efifb.fb_addr = gfx_state.tg_fb.fb_addr; diff --git a/sys/dev/vt/hw/efifb/efifb.c b/sys/dev/vt/hw/efifb/efifb.c index eda05ec3d203..ad49b6735998 100644 --- a/sys/dev/vt/hw/efifb/efifb.c +++ b/sys/dev/vt/hw/efifb/efifb.c @@ -96,9 +96,11 @@ vt_efifb_init(struct vt_device *vd) { struct fb_info *info; struct efi_fb *efifb; - int memattr; + vm_memattr_t memattr; int roff, goff, boff; - char attr[16]; + +#ifdef VM_MEMATTR_WRITE_COMBINING + char attr[16]; /* * XXX TODO: I think there's more nuance here than we're acknowledging, @@ -122,6 +124,9 @@ vt_efifb_init(struct vt_device *vd) memattr = VM_MEMATTR_UNCACHEABLE; } } +#else + memattr = VM_MEMATTR_UNCACHEABLE; +#endif info = vd->vd_softc; if (info == NULL) diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC index 34426f167963..8dca3bdb3369 100644 --- a/sys/riscv/conf/GENERIC +++ b/sys/riscv/conf/GENERIC @@ -140,6 +140,7 @@ device uart_ns8250 # ns8250-type UART driver # Console device vt +device vt_efifb device kbdmux # RTC diff --git a/sys/riscv/include/metadata.h b/sys/riscv/include/metadata.h index fbc0afce5c10..6ade03e15ea3 100644 --- a/sys/riscv/include/metadata.h +++ b/sys/riscv/include/metadata.h @@ -30,6 +30,7 @@ #define MODINFOMD_DTBP 0x1001 #define MODINFOMD_EFI_MAP 0x1002 +#define MODINFOMD_EFI_FB 0x1003 struct efi_map_header { size_t memory_size;