From nobody Mon Mar 4 18:45:55 2024 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 4TpSM76SVqz5D5S1; Mon, 4 Mar 2024 18:45:55 +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 4TpSM74mnpz4bL0; Mon, 4 Mar 2024 18:45:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709577955; 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=7hKzwIzjurCBgC8EIApcBewWGVnNNFsq1dizPMpwLxY=; b=ecjM2fII6GDwh9Z7Tqn1XT0PD/Tcfxj5ZWvVjAterrBtjpNQ5Zo7UJlng6R7w/BZ+CVPIn c1aDRYwqTgMGikN9PEWAD6PTOU5vgEL3Fxsaf2FyHS+GR9t6cKafmDWxuC9wPgou3KucIZ GWUlkcXbGQ53tNzTigHVY+ARdajbc3qdblxQgDVqhEaBJunPPa3diVPZN9mMgB1nwN0eNc tnHO/vofP3aHM+OXPLf5XkAoPLn9u6KUAAdttQ3yT1Wvdj2Nb7Znx1qjcYKfmNiE8ixKvy zDNdXM0pugnKcB+QfWkZmZ42Rl19Il8yyzs9+bIUcIsQakG+LZ2dTlnS1hk5QA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709577955; a=rsa-sha256; cv=none; b=juBbwNM/dhCEoYm88ZqGZlXToeRhdnaQUAwrrKCCfEYYsps/NU3R35H3XjQ5R0BOsArFnp LCQ9sDr3+5JIb/F6eGZFGxug+be9mo9CJjy6dnSRKaHBczUYDAzDF4CpSX1sJRyGMp4Nk+ le7kllt7sjglXnakOV6zgahVBoxXFKK8qOvUqnEv7/9h49yNwSVceuUGmxP7DepeXDJ64C +Ygfe8qy+rTUb2EiR+B5IcFnIWZYJthqtnRCqrIoxjBUAfpWOtsR1qOig7jCh79UG3DL8K bn5Cd0buYjkCUhrYlSeolheowL+YmczZpGT+Qru93FDFvWikcFzsVqXK5rA8EQ== 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=1709577955; 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=7hKzwIzjurCBgC8EIApcBewWGVnNNFsq1dizPMpwLxY=; b=ZWRH2+yoQPV+z0xwo2stS1wCL0/DVXPkxCTEm6E7mGAQHSdZyuch/l+3uQqZzNYZmunoxB KQ7NFbudunve1BMdALrN3Kcj/DFnpKVyUXx7TFttOZ8zlqYO6oGHfvWLqCQzQydGTZJ+Jz r+VYjfCqFlgbzgAO4r1tswOCIMf6ss/wcxlKGrcdxYMDvRvH45FSV0jKqXUdSc/NxQL/qu Vq0G2ImZO0BwrxRaZc7+z3KY4GWGen3ZmOH8hQbWe6iqIaX0TG4uVXj//uQ41UmwM90962 yTGountvejptcmGoo17hcKkjq0fexhyOi9n5p4NqUDJirRCftH0cxZK4tiibKQ== 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 4TpSM74FldzYlr; Mon, 4 Mar 2024 18:45:55 +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 424Ijter096896; Mon, 4 Mar 2024 18:45:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 424IjtKo096893; Mon, 4 Mar 2024 18:45:55 GMT (envelope-from git) Date: Mon, 4 Mar 2024 18:45:55 GMT Message-Id: <202403041845.424IjtKo096893@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: da48ddbf7c38 - main - riscv: catch up with EARLY_PRINTF changes 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: da48ddbf7c38d481d01cf3a9752764bf826cb15e Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=da48ddbf7c38d481d01cf3a9752764bf826cb15e commit da48ddbf7c38d481d01cf3a9752764bf826cb15e Author: Mitchell Horne AuthorDate: 2024-03-04 18:45:17 +0000 Commit: Mitchell Horne CommitDate: 2024-03-04 18:45:17 +0000 riscv: catch up with EARLY_PRINTF changes On this platform early console access is possible via SBI. Follow recent changes to EARLY_PRINTF option and give it a named constant. Update the commented option in GENERIC so that it compiles. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D44100 --- sys/riscv/conf/GENERIC | 2 +- sys/riscv/riscv/riscv_console.c | 2 +- sys/sys/systm.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC index 74ca1a94fc87..ca71f7423cfa 100644 --- a/sys/riscv/conf/GENERIC +++ b/sys/riscv/conf/GENERIC @@ -165,7 +165,7 @@ options WITNESS # Enable checks to detect deadlocks and cycles options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones options ALT_BREAK_TO_DEBUGGER # Enter debugger on keyboard escape sequence -# options EARLY_PRINTF +# options EARLY_PRINTF=sbi options VERBOSE_SYSINIT=0 # Support debug.verbose_sysinit, off by default # Kernel dump features. diff --git a/sys/riscv/riscv/riscv_console.c b/sys/riscv/riscv/riscv_console.c index d6c4ce4540cb..e582b3385384 100644 --- a/sys/riscv/riscv/riscv_console.c +++ b/sys/riscv/riscv/riscv_console.c @@ -110,7 +110,7 @@ riscv_putc(int c) sbi_console_putchar(c); } -#ifdef EARLY_PRINTF +#if CHECK_EARLY_PRINTF(sbi) early_putc_t *early_putc = riscv_putc; #endif diff --git a/sys/sys/systm.h b/sys/sys/systm.h index f72f82c100dc..17a1c814cf75 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -215,6 +215,7 @@ extern early_putc_t *early_putc; #define early_printf_ns8250 3 #define early_printf_pl011 4 #define early_printf_snps 5 +#define early_printf_sbi 6 #else #define CHECK_EARLY_PRINTF(x) 0 #endif