Date: Sat, 10 Jan 2026 14:02:06 -0700 From: Warner Losh <imp@bsdimp.com> To: mmel@freebsd.org Cc: Emmanuel Vadot <manu@bidouilliste.com>, Warner Losh <imp@freebsd.org>, src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Martin Filla <freebsd@sysctl.cz> Subject: Re: git: b55d106df978 - main - ophgo: import new .dts Message-ID: <CANCZdfoLwrp%2BtVu6F1pt=4nfc69mZWVBi6aGRAAcRo7R95pzPg@mail.gmail.com> In-Reply-To: <f5394d7a-b9dd-4403-ae3b-dfe322788fdf@FreeBSD.org> References: <6961de2f.34d1b.37ee2089@gitrepo.freebsd.org> <20260110083217.756db8eed35624274459e1fb@bidouilliste.com> <f5394d7a-b9dd-4403-ae3b-dfe322788fdf@FreeBSD.org>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] On Sat, Jan 10, 2026 at 1:11 AM Michal Meloun <mmel@freebsd.org> wrote: > > > On 10.01.2026 8:32, Emmanuel Vadot wrote: > > > > Hello, > > > > On Sat, 10 Jan 2026 05:05:51 +0000 > > Warner Losh <imp@FreeBSD.org> wrote: > > > >> The branch main has been updated by imp: > >> > >> URL: > https://cgit.FreeBSD.org/src/commit/?id=b55d106df9785d141f9e3e1c916e921df9d877ac > >> > >> commit b55d106df9785d141f9e3e1c916e921df9d877ac > >> Author: Martin Filla <freebsd@sysctl.cz> > >> AuthorDate: 2025-09-09 14:34:38 +0000 > >> Commit: Warner Losh <imp@FreeBSD.org> > >> CommitDate: 2026-01-10 05:05:38 +0000 > >> > >> ophgo: import new .dts > >> > >> Signed-off-by: Martin Filla <freebsd@sysctl.cz> > >> 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 said > > 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 [-- Attachment #2 --] <div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote gmail_quote_container"><div dir="ltr" class="gmail_attr">On Sat, Jan 10, 2026 at 1:11 AM Michal Meloun <<a href="mailto:mmel@freebsd.org">mmel@freebsd.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><br> <br> On 10.01.2026 8:32, Emmanuel Vadot wrote:<br> > <br> > Hello,<br> > <br> > On Sat, 10 Jan 2026 05:05:51 +0000<br> > Warner Losh <imp@FreeBSD.org> wrote:<br> > <br> >> The branch main has been updated by imp:<br> >><br> >> URL: <a href="https://cgit.FreeBSD.org/src/commit/?id=b55d106df9785d141f9e3e1c916e921df9d877ac" rel="noreferrer" target="_blank">https://cgit.FreeBSD.org/src/commit/?id=b55d106df9785d141f9e3e1c916e921df9d877ac</a><br>; >><br> >> commit b55d106df9785d141f9e3e1c916e921df9d877ac<br> >> Author: Martin Filla <<a href="mailto:freebsd@sysctl.cz" target="_blank">freebsd@sysctl.cz</a>><br> >> AuthorDate: 2025-09-09 14:34:38 +0000<br> >> Commit: Warner Losh <imp@FreeBSD.org><br> >> CommitDate: 2026-01-10 05:05:38 +0000<br> >><br> >> ophgo: import new .dts<br> >> <br> >> Signed-off-by: Martin Filla <<a href="mailto:freebsd@sysctl.cz" target="_blank">freebsd@sysctl.cz</a>><br> >> Reviewed by: imp<br> >> Pull Request: <a href="https://github.com/freebsd/freebsd-src/pull/1844" rel="noreferrer" target="_blank">https://github.com/freebsd/freebsd-src/pull/1844</a><br>; >> ---<br> >> .../include/dt-bindings/clock/cv181x-clock.h | 175 ++++<br> >> .../include/dt-bindings/dma/cv181x-dmamap.h | 48 ++<br> >> .../include/dt-bindings/reset/cv181x-resets.h | 172 ++++<br> >> .../src/riscv/sophgo/cv181x_asic_bga.dtsi | 56 ++<br> >> .../src/riscv/sophgo/cv181x_asic_emmc.dtsi | 4 +<br> >> .../src/riscv/sophgo/cv181x_asic_qfn.dtsi | 120 +++<br> >> .../src/riscv/sophgo/cv181x_asic_sd.dtsi | 4 +<br> >> .../src/riscv/sophgo/cv181x_asic_spinand.dtsi | 5 +<br> >> .../src/riscv/sophgo/cv181x_asic_spinor.dtsi | 5 +<br> >> .../device-tree/src/riscv/sophgo/cv181x_base.dtsi | 932 +++++++++++++++++++++<br> >> .../src/riscv/sophgo/cv181x_base_arm.dtsi | 320 +++++++<br> >> .../src/riscv/sophgo/cv181x_base_riscv.dtsi | 378 +++++++++<br> >> .../src/riscv/sophgo/cv181x_default_memmap.dtsi | 25 +<br> >> .../sophgo/sg2000_milkv_duos_glibc_arm64_emmc.dts | 108 +++<br> >> .../sophgo/sg2000_milkv_duos_glibc_arm64_sd.dts | 112 +++<br> >> .../sophgo/sg2000_milkv_duos_musl_riscv64_emmc.dts | 108 +++<br> >> .../sophgo/sg2000_milkv_duos_musl_riscv64_sd.dts | 108 +++<br> >> .../src/riscv/sophgo/sg2000_wevb_arm64_sd.dts | 13 +<br> >> .../src/riscv/sophgo/sg2000_wevb_riscv64_sd.dts | 10 +<br> >> sys/modules/dtb/sophgo/Makefile | 15 +<br> >> sys/riscv/conf/GENERIC | 1 +<br> >> sys/riscv/conf/std.sophgo | 8 +<br> >> sys/riscv/sophgo/files.sophgo | 2 +<br> >> 23 files changed, 2729 insertions(+)<br> >><br> > <br> > This adds a lots of files to sys/contrib/device-tree, I though we said<br> > that this directory should be mostly pristine compared to upstream and<br> > only contain small modifications.<br> > I do not see those files in latest upstream too, but there is some<br> > sophgo related stuff in there, where do those files comes from ?<br> > <br> <br> +1<br> Vendor DTs are very rarely accepted by mainstream in compatible manner. <br> Importing them therefore spells nightmare for future updates.<br> <br> Also, adding "sys/riscv/conf/std.sophgo" and <br> "sys/riscv/sophgo/files.sophgo" without any basic SoC driver (clock, <br> reset, pinctrl) does not sounds right.<br></blockquote><div><br></div><div>OK. I've reverted this. You guys are right.</div><div><br></div><div>The files came from the vendor SDK, which is a reputable source. I'd forgotten</div><div>what a pain it is when conflicts happen, though.</div><div><br></div><div>I let my excitement for this cool hardware get the better of me. I've talked to</div><div>the original author, and they agree and will try again when it hits the Linux tree</div><div>and when they've added the necessary glue to our tree.</div><div><br></div><div>Warner</div></div></div>home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfoLwrp%2BtVu6F1pt=4nfc69mZWVBi6aGRAAcRo7R95pzPg>