From nobody Wed Oct 22 05:15:52 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 4cry763HTcz6Dfxd; Wed, 22 Oct 2025 05:16:02 +0000 (UTC) (envelope-from zlei@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cry762SHTz42Fy; Wed, 22 Oct 2025 05:16:02 +0000 (UTC) (envelope-from zlei@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761110162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ft2hCunLZtxDJ881mn9Vupq1/h/Mj5dH4Y+swu7gGBI=; b=qeoaxVKhKJfb1yNaAjYMbqYQ4vNcP4s084FkVqzz+0sP80xrGTvyWOIhf1HVDh1TLASoYo vTDB4jEJuu0orXChUyjEjtc15tYLV5Yb3VZkYrjeF3knYUC5Rs4r0HdvoA1U4/FOccQrMz uI8w9H9scyuM/9CoYchUamy/W2mXR3XVesr7Msn3jr7ZGmkz6kTcBUYO+I8GCivrQfv1ck 3cjJYxSDAK2fh8phGJi77/a59d/KMNLENis7ZLpCOSyQHoKnGh7QUN4uAh7cVqI9fKqYnj FJ5zkU3lrcIw+jKCiQ8allZpunRbN07hP0Nyh58bMKVGE2hvr7ZdbhMFG6VcBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761110162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ft2hCunLZtxDJ881mn9Vupq1/h/Mj5dH4Y+swu7gGBI=; b=PJ8adEosI2mK598FmXtzrKPig9iAN4wlsogQLJArxc+Mpf+fS7spVZjgVNp4ZlNSdsZfak 3pVNGB6LzvN/mYQwzerEssGL9Ztivgj2NUYuRoOi3Nm6T53bGzMjqokgqSdj83wRxuXsw+ tT+3nVOlFm4hfNtKDjnOPP2VyAPuzaw6X/rFEUEeONRC1c0ikr1sWG9WH68DVrUdaHIk83 nis9oRcABds+KnRLqKnNstcrHR7J0cAJHmNch+IswVAiSYC4W+Zfb1Ebc3uikLrbg8bOIU Zb6wKyyVOTSNnzTYxzxISyf4+6c5OBCYaMb2yQToLXzpXYUEFpsEracqwMw/AQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761110162; a=rsa-sha256; cv=none; b=X0goCxS+Accl5AGC75+j7obadJioYaPkR2vA/uM1HlNqDN0Hx5yspwjtNSMjBViIYyWRdQ E/7EuMCjJEgFZREFWOUsw25kUqwFJgryn1W5BhG4VjmMrqiHIRX4ty++/XzDhmp/is16xm hGq182EJ7l8XoyRcT1gEEJGJeHOM8dOZCpWwCZNSx6jo4C4Vb6XUrtk1OEpAKHAKR0fAoH qCzWa9INvdoaQulaH685zsPGiiwFAizP2TWZBVIXKAXhNdJJhB2eMkEG6VNx2ekryKi0Jr MwkobcLo5VnMEZt7x4CXQjfiIbf/exsL/VylDL4z1WNjoFZr2i8W73XF9Z/uEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from smtpclient.apple (ns1.oxydns.net [45.32.91.63]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: zlei/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4cry7500lkz10MV; Wed, 22 Oct 2025 05:16:00 +0000 (UTC) (envelope-from zlei@FreeBSD.org) Content-Type: text/plain; charset=us-ascii 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 (Mac OS X Mail 16.0 \(3696.120.41.1.10\)) Subject: Re: git: 5522519731b7 - main - modules: enable allwinner kmods on riscv From: Zhenlei Huang In-Reply-To: <202510202342.59KNgHDl091154@gitrepo.freebsd.org> Date: Wed, 22 Oct 2025 13:15:52 +0800 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <8FF166A8-80E3-461C-88E8-2BE0BD6239A9@FreeBSD.org> References: <202510202342.59KNgHDl091154@gitrepo.freebsd.org> To: Mitchell Horne X-Mailer: Apple Mail (2.3696.120.41.1.10) Hi Mitchell, The riscv LINT kernel build fails with this change, ``` $ make buildkernel TARGET_ARCH=3Driscv64 KERNCONF=3DLINT =3D=3D=3D> allwinner/aw_sid (all) cc -target riscv64-unknown-freebsd16.0 = --sysroot=3D/usr/obj/home/zlei/freebsd-src/riscv.riscv64/tmp = -B/usr/obj/home/zlei/freebsd-src/riscv.riscv64/tmp/usr/bin -O2 -pipe = -fno-common -march=3Drv64imafdc -mabi=3Dlp64d -fno-strict-aliasing = -Werror -D_KERNEL -DKLD_MODULE -DKLD_TIED -nostdinc = -DHAVE_KERNEL_OPTION_HEADERS -include = /usr/obj/home/zlei/freebsd-src/riscv.riscv64/sys/LINT/opt_global.h -I. = -I/home/zlei/freebsd-src/sys = -I/home/zlei/freebsd-src/sys/contrib/ck/include -fno-common -g = -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -fPIC = -fdebug-prefix-map=3D./machine=3D/home/zlei/freebsd-src/sys/riscv/include = -I/usr/obj/home/zlei/freebsd-src/riscv.riscv64/sys/LINT -fno-builtin = -MD -MF.depend.aw_sid.o -MTaw_sid.o -march=3Drv64imafdch -mabi=3Dlp64 = -mno-relax -ffreestanding -fwrapv -fstack-protector -gdwarf-4 -Wall = -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wcast-qual = -Wundef -Wno-pointer-sign -D__printf__=3D__freebsd_kprintf__ = -Wmissing-include-dirs -fdiagnostics-show-option -Wno-unknown-pragmas = -Wswitch -Wno-error=3Dtautological-compare -Wno-error=3Dempty-body = -Wno-error=3Dparentheses-equality -Wno-error=3Dunused-function = -Wno-error=3Dpointer-sign -Wno-error=3Dshift-negative-value = -Wno-address-of-packed-member -Wno-format-zero-length -mcmodel=3Dmedium = -std=3Dgnu17 -c /home/zlei/freebsd-src/sys/arm/allwinner/aw_sid.c -o = aw_sid.o /home/zlei/freebsd-src/sys/arm/allwinner/aw_sid.c:48:10: fatal error: = 'nvmem_if.h' file not found 48 | #include "nvmem_if.h" | ^~~~~~~~~~~~ 1 error generated. *** Error code 1 ``` Best regards, Zhenlei > On Oct 21, 2025, at 7:42 AM, Mitchell Horne = wrote: >=20 > The branch main has been updated by mhorne: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D5522519731b74e7b56c710ec5ea4d340= 65f3ed32 >=20 > commit 5522519731b74e7b56c710ec5ea4d34065f3ed32 > Author: Mitchell Horne > AuthorDate: 2024-09-18 17:19:16 +0000 > Commit: Mitchell Horne > CommitDate: 2025-10-20 23:37:13 +0000 >=20 > modules: enable allwinner kmods on riscv >=20 > While here, standardize the place they are enabled in the Makefile. = For > armv7 the module subdirectory was added explicitly in the config = file, > but this is not idiomatic. >=20 > MFC after: 3 days > Sponsored by: The FreeBSD Foundation > --- > sys/arm/conf/GENERIC | 1 - > sys/arm/conf/NOTES | 1 - > sys/modules/Makefile | 2 +- > 3 files changed, 1 insertion(+), 3 deletions(-) >=20 > diff --git a/sys/arm/conf/GENERIC b/sys/arm/conf/GENERIC > index 7394f3842d43..9607b16756ea 100644 > --- a/sys/arm/conf/GENERIC > +++ b/sys/arm/conf/GENERIC > @@ -272,5 +272,4 @@ makeoptions MODULES_EXTRA+=3D"dtb/rpi" > makeoptions MODULES_EXTRA+=3D"dtb/zynq" >=20 > # SOC-specific modules > -makeoptions MODULES_EXTRA+=3D"allwinner" > makeoptions MODULES_EXTRA+=3D"imx" > diff --git a/sys/arm/conf/NOTES b/sys/arm/conf/NOTES > index 920d721dc3ba..0a5d34c3849a 100644 > --- a/sys/arm/conf/NOTES > +++ b/sys/arm/conf/NOTES > @@ -94,7 +94,6 @@ nodevice bnxt >=20 > # Build SOC-specific modules... >=20 > -makeoptions MODULES_EXTRA+=3D"allwinner" > makeoptions MODULES_EXTRA+=3D"imx" >=20 > # Build dtb files... > diff --git a/sys/modules/Makefile b/sys/modules/Makefile > index 63a0b3260e6d..9ec7c33465f3 100644 > --- a/sys/modules/Makefile > +++ b/sys/modules/Makefile > @@ -680,6 +680,7 @@ _irdma=3D irdma > .if ${MACHINE_CPUARCH} =3D=3D "aarch64" || ${MACHINE_CPUARCH} =3D=3D = "arm" || \ > ${MACHINE_CPUARCH} =3D=3D "riscv" > .if !empty(OPT_FDT) > +_allwinner=3D allwinner > _if_cgem=3D if_cgem > .endif > .endif > @@ -713,7 +714,6 @@ _hyperv=3D hyperv > _vf_i2c=3D vf_i2c >=20 > .if !empty(OPT_FDT) > -_allwinner=3D allwinner > _dwwdt=3D dwwdt > _enetc=3D enetc > _felix=3D felix