From nobody Sat Jan 10 21:02:06 2026 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 4dpWL85b65z6Mtyd for ; Sat, 10 Jan 2026 21:02:24 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dpWL80ggCz3L61 for ; Sat, 10 Jan 2026 21:02:24 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-2a0d67f1877so41986145ad.2 for ; Sat, 10 Jan 2026 13:02:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1768078938; x=1768683738; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=1cDxvpxJLynLejLMvPaRVj1FnTCzaEl1IcTzyC5HsU0=; b=lM7gPfYw7dFb6Ix/PWjTmCPvfkB+3f0go9BH6E70YyatjASXicVhJk2PdvLyywI2n9 zC3rABrVJWuyRtfcM8lIOre5ENPu4SKcsDt4De2LkQMu96OEY9cYkh+eWHo5J0XnHDSV +HBKA7HWcx0tEH717WHzor31gjOtW1NygBg2rn+7HdJi1JexMRS+tFu4ocqBKmbX4ZHK ton+rPFrMfUuu9EE1DCTAsBVikMOuv10i89sIZvA6TzkWecwOnHLJZHtbB0jZWpSf4xN vfW6dBvQbLpsCbJ1Wcka7NLgQt+fXo/v662330kJWPKlYBSfwbLcoyUbFMpdvWnpYtHu Yyjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768078938; x=1768683738; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=1cDxvpxJLynLejLMvPaRVj1FnTCzaEl1IcTzyC5HsU0=; b=r9D7PEms8lxfZGhkbp5CkDlmdtNDmM6CS8OcBBjXY44JuV+/pLijrEtDxAXGK6Pt4N og4uALXunsz/qUGS1gN9bI/ZA76UzJWFHdGjnS61hi0EfbgrGCcaBTVfzxDPHGxaKgkm rfTVg1wgTgMryeHRRzUSIkbsqskxKGr7EwXbNYgS/Rlf3By2hXz6XO6GFypvowpN9Qya sxyoiLAJD3pAfqxszpOhXuhU38KWrKgdJ81hAX44W2os6FjyNWc3Dd+z9d9+gtTh6JYs uWdxB9b5zW94dXnGvg+Hn24obstLtP6doDaqpWQCgbs3p3sG2awHzmPCmqMkLjcpzyN1 /6jQ== X-Forwarded-Encrypted: i=1; AJvYcCVMDwxwjq/ahM2H5mQO8IfMRqrfrgMb4jK3RR7r8SfgF13n/ARUxxtCPFjMsSNxHNQPEm+mu79GhJyEA0+T0zkYZwh7IQ==@freebsd.org X-Gm-Message-State: AOJu0Yzm1jYkSO6y+QAvrg1ecHrR3RTJKH46LReqRCTMwbxeR2zWnceF jE1ts11CSalA9hAfR1hl9s8HPEuCHPBbbi+IsrtEyVRiyY2UpdZ2AF5ORb8M+9QVk+dSTOB93Pz OsgDO75vsclG1ZU3yBMLSu6rJ4dzLIoTG7AfrRbH3MA== X-Gm-Gg: AY/fxX5Qvsszo8K2aopZTTzi+A/Xys88x326TOgD8T66uQI3h9cisG1FpN/Kg6cQ8Qh 1bRlyvAEQxnLbiwRoGSQ1IeIsHHgHGAwTfpzjwbVeyrSccEE6jB3yHbJ4yJmgWAq8DVau5p6iUx uzVlmoxXrrp8HHzoMR+OU+LfgG/vi2ZfD6mWq3mjXWA2uQrvYbGFVONQWduS6WX1duYGSVKbmY/ keY/LwEBBwlzYb0Gcokloza16YF68GAVYrIKrBFwi1I1oQ/XEwMb+gE0P4P8gEp8aODlig= X-Google-Smtp-Source: AGHT+IFEP7Kf55cgiKgmpNhBSUqZM4m1m0wweQv+DfnwMNkoq0NNQ+B0Jnmo1OXZcblixxc4r7LUSKrkfSSLac8otBQ= X-Received: by 2002:a17:90b:2883:b0:343:6611:f21 with SMTP id 98e67ed59e1d1-34f68b4cdc9mr11812313a91.1.1768078937716; Sat, 10 Jan 2026 13:02:17 -0800 (PST) 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 References: <6961de2f.34d1b.37ee2089@gitrepo.freebsd.org> <20260110083217.756db8eed35624274459e1fb@bidouilliste.com> In-Reply-To: From: Warner Losh Date: Sat, 10 Jan 2026 14:02:06 -0700 X-Gm-Features: AZwV_QhW8nzLVveXdi3mcg7AtjbzusxQogbJIjXzrntjeNc97nBdz7VAF2hmF04 Message-ID: Subject: Re: git: b55d106df978 - main - ophgo: import new .dts To: mmel@freebsd.org Cc: Emmanuel Vadot , Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Martin Filla Content-Type: multipart/alternative; boundary="0000000000000485fa06480ef5a4" X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4dpWL80ggCz3L61 --0000000000000485fa06480ef5a4 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Sat, Jan 10, 2026 at 1:11=E2=80=AFAM Michal Meloun wr= ote: > > > On 10.01.2026 8:32, Emmanuel Vadot wrote: > > > > Hello, > > > > On Sat, 10 Jan 2026 05:05:51 +0000 > > Warner Losh wrote: > > > >> The branch main has been updated by imp: > >> > >> URL: > https://cgit.FreeBSD.org/src/commit/?id=3Db55d106df9785d141f9e3e1c916e921= df9d877ac > >> > >> commit b55d106df9785d141f9e3e1c916e921df9d877ac > >> Author: Martin Filla > >> AuthorDate: 2025-09-09 14:34:38 +0000 > >> Commit: Warner Losh > >> CommitDate: 2026-01-10 05:05:38 +0000 > >> > >> ophgo: import new .dts > >> > >> Signed-off-by: Martin Filla > >> Reviewed by: imp > >> Pull Request: https://github.com/freebsd/freebsd-src/pull/1844 > >> --- > >> .../include/dt-bindings/clock/cv181x-clock.h | 175 ++++ > >> .../include/dt-bindings/dma/cv181x-dmamap.h | 48 ++ > >> .../include/dt-bindings/reset/cv181x-resets.h | 172 ++++ > >> .../src/riscv/sophgo/cv181x_asic_bga.dtsi | 56 ++ > >> .../src/riscv/sophgo/cv181x_asic_emmc.dtsi | 4 + > >> .../src/riscv/sophgo/cv181x_asic_qfn.dtsi | 120 +++ > >> .../src/riscv/sophgo/cv181x_asic_sd.dtsi | 4 + > >> .../src/riscv/sophgo/cv181x_asic_spinand.dtsi | 5 + > >> .../src/riscv/sophgo/cv181x_asic_spinor.dtsi | 5 + > >> .../device-tree/src/riscv/sophgo/cv181x_base.dtsi | 932 > +++++++++++++++++++++ > >> .../src/riscv/sophgo/cv181x_base_arm.dtsi | 320 +++++++ > >> .../src/riscv/sophgo/cv181x_base_riscv.dtsi | 378 +++++++++ > >> .../src/riscv/sophgo/cv181x_default_memmap.dtsi | 25 + > >> .../sophgo/sg2000_milkv_duos_glibc_arm64_emmc.dts | 108 +++ > >> .../sophgo/sg2000_milkv_duos_glibc_arm64_sd.dts | 112 +++ > >> .../sophgo/sg2000_milkv_duos_musl_riscv64_emmc.dts | 108 +++ > >> .../sophgo/sg2000_milkv_duos_musl_riscv64_sd.dts | 108 +++ > >> .../src/riscv/sophgo/sg2000_wevb_arm64_sd.dts | 13 + > >> .../src/riscv/sophgo/sg2000_wevb_riscv64_sd.dts | 10 + > >> sys/modules/dtb/sophgo/Makefile | 15 + > >> sys/riscv/conf/GENERIC | 1 + > >> sys/riscv/conf/std.sophgo | 8 + > >> sys/riscv/sophgo/files.sophgo | 2 + > >> 23 files changed, 2729 insertions(+) > >> > > > > This adds a lots of files to sys/contrib/device-tree, I though we sai= d > > that this directory should be mostly pristine compared to upstream and > > only contain small modifications. > > I do not see those files in latest upstream too, but there is some > > sophgo related stuff in there, where do those files comes from ? > > > > +1 > Vendor DTs are very rarely accepted by mainstream in compatible manner. > Importing them therefore spells nightmare for future updates. > > Also, adding "sys/riscv/conf/std.sophgo" and > "sys/riscv/sophgo/files.sophgo" without any basic SoC driver (clock, > reset, pinctrl) does not sounds right. > OK. I've reverted this. You guys are right. The files came from the vendor SDK, which is a reputable source. I'd forgotten what a pain it is when conflicts happen, though. I let my excitement for this cool hardware get the better of me. I've talked to the original author, and they agree and will try again when it hits the Linux tree and when they've added the necessary glue to our tree. Warner --0000000000000485fa06480ef5a4 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Sat, Jan 10,= 2026 at 1:11=E2=80=AFAM Michal Meloun <mmel@freebsd.org> wrote:


On 10.01.2026 8:32, Emmanuel Vadot wrote:
>
>=C2=A0 =C2=A0Hello,
>
> On Sat, 10 Jan 2026 05:05:51 +0000
> Warner Losh <imp@FreeBSD.org> wrote:
>
>> The branch main has been updated by imp:
>>
>> URL: http= s://cgit.FreeBSD.org/src/commit/?id=3Db55d106df9785d141f9e3e1c916e921df9d87= 7ac
>>
>> commit b55d106df9785d141f9e3e1c916e921df9d877ac
>> Author:=C2=A0 =C2=A0 =C2=A0Martin Filla <freebsd@sysctl.cz>
>> AuthorDate: 2025-09-09 14:34:38 +0000
>> Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
>> CommitDate: 2026-01-10 05:05:38 +0000
>>
>>=C2=A0 =C2=A0 =C2=A0 ophgo: import new .dts
>>=C2=A0 =C2=A0 =C2=A0
>>=C2=A0 =C2=A0 =C2=A0 Signed-off-by: Martin Filla <freebsd@sysctl.cz>
>>=C2=A0 =C2=A0 =C2=A0 Reviewed by: imp
>>=C2=A0 =C2=A0 =C2=A0 Pull Request: https://g= ithub.com/freebsd/freebsd-src/pull/1844
>> ---
>>=C2=A0 =C2=A0.../include/dt-bindings/clock/cv181x-clock.h=C2=A0 =C2= =A0 =C2=A0 =C2=A0| 175 ++++
>>=C2=A0 =C2=A0.../include/dt-bindings/dma/cv181x-dmamap.h=C2=A0 =C2= =A0 =C2=A0 =C2=A0 |=C2=A0 48 ++
>>=C2=A0 =C2=A0.../include/dt-bindings/reset/cv181x-resets.h=C2=A0 = =C2=A0 =C2=A0 | 172 ++++
>>=C2=A0 =C2=A0.../src/riscv/sophgo/cv181x_asic_bga.dtsi=C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 |=C2=A0 56 ++
>>=C2=A0 =C2=A0.../src/riscv/sophgo/cv181x_asic_emmc.dtsi=C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 =C2=A04 +
>>=C2=A0 =C2=A0.../src/riscv/sophgo/cv181x_asic_qfn.dtsi=C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 | 120 +++
>>=C2=A0 =C2=A0.../src/riscv/sophgo/cv181x_asic_sd.dtsi=C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 =C2=A04 +
>>=C2=A0 =C2=A0.../src/riscv/sophgo/cv181x_asic_spinand.dtsi=C2=A0 = =C2=A0 =C2=A0 |=C2=A0 =C2=A05 +
>>=C2=A0 =C2=A0.../src/riscv/sophgo/cv181x_asic_spinor.dtsi=C2=A0 =C2= =A0 =C2=A0 =C2=A0|=C2=A0 =C2=A05 +
>>=C2=A0 =C2=A0.../device-tree/src/riscv/sophgo/cv181x_base.dtsi=C2= =A0 | 932 +++++++++++++++++++++
>>=C2=A0 =C2=A0.../src/riscv/sophgo/cv181x_base_arm.dtsi=C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 | 320 +++++++
>>=C2=A0 =C2=A0.../src/riscv/sophgo/cv181x_base_riscv.dtsi=C2=A0 =C2= =A0 =C2=A0 =C2=A0 | 378 +++++++++
>>=C2=A0 =C2=A0.../src/riscv/sophgo/cv181x_default_memmap.dtsi=C2=A0 = =C2=A0 |=C2=A0 25 +
>>=C2=A0 =C2=A0.../sophgo/sg2000_milkv_duos_glibc_arm64_emmc.dts=C2= =A0 | 108 +++
>>=C2=A0 =C2=A0.../sophgo/sg2000_milkv_duos_glibc_arm64_sd.dts=C2=A0 = =C2=A0 | 112 +++
>>=C2=A0 =C2=A0.../sophgo/sg2000_milkv_duos_musl_riscv64_emmc.dts | 1= 08 +++
>>=C2=A0 =C2=A0.../sophgo/sg2000_milkv_duos_musl_riscv64_sd.dts=C2=A0= =C2=A0| 108 +++
>>=C2=A0 =C2=A0.../src/riscv/sophgo/sg2000_wevb_arm64_sd.dts=C2=A0 = =C2=A0 =C2=A0 |=C2=A0 13 +
>>=C2=A0 =C2=A0.../src/riscv/sophgo/sg2000_wevb_riscv64_sd.dts=C2=A0 = =C2=A0 |=C2=A0 10 +
>>=C2=A0 =C2=A0sys/modules/dtb/sophgo/Makefile=C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 |=C2=A0 15 +
>>=C2=A0 =C2=A0sys/riscv/conf/GENERIC=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0|= =C2=A0 =C2=A01 +
>>=C2=A0 =C2=A0sys/riscv/conf/std.sophgo=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 |=C2=A0 =C2= =A08 +
>>=C2=A0 =C2=A0sys/riscv/sophgo/files.sophgo=C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 |=C2=A0 =C2=A02 +
>>=C2=A0 =C2=A023 files changed, 2729 insertions(+)
>>
>
>=C2=A0 =C2=A0This adds a lots of files to sys/contrib/device-tree, I th= ough we said
> that this directory should be mostly pristine compared to upstream and=
> only contain small modifications.
>=C2=A0 =C2=A0I do not see those files in latest upstream too, but there= is some
> sophgo related stuff in there, where do those files comes from ?
>

+1
Vendor DTs are very rarely accepted by mainstream in compatible manner. Importing them therefore spells nightmare for future updates.

Also, adding "sys/riscv/conf/std.sophgo" and
"sys/riscv/sophgo/files.sophgo" without any basic SoC driver (clo= ck,
reset, pinctrl) does not sounds right.

= OK. I've reverted this. You guys are right.

Th= e files came from the vendor SDK, which is a reputable=C2=A0source. I'd= forgotten
what a pain it is when conflicts happen, though.
=

I let my excitement for this cool hardware get the bett= er of me. I've talked to
the original author, and they agree = and will try again when it hits the Linux tree
and when they'= ve added the necessary glue to our tree.

Warner
--0000000000000485fa06480ef5a4--