[PATCH v3 2/4] arm64: dts: correct vendor prefix hisi to hisilicon

Arnd Bergmann arnd at kernel.org
Fri Jan 29 03:21:15 EST 2021


On Fri, Jan 29, 2021 at 2:57 AM Wei Xu <xuwei5 at hisilicon.com> wrote:
> On 2021/1/29 9:02, Wei Xu wrote:
> > On 2021/1/28 22:08, Arnd Bergmann wrote:
> >> 2. Updating the dtb while running an older kernel is now broken since
> >>   the driver can no longer read the property. This is less critical, but
> >>   it does seem easy enough to work around here by leaving both
> >>   properties in place.
> >
> > Yes, it is.
> > But if leaving both in place, the dtbs_check will report following warning again:
> >       'hisi,rst-syscon' does not match any of the regexes
> >
> > That is why leizhen changed the dtb.
> > Do you think it is OK to assume no one will use the new dtb with an older kernel?
> >
> >>
> >> 3. Bisecting through the git history across an incompatible change
> >>   means you can run into broken commits. We try hard to avoid that
> >>   if we are aware of a problem in advance. In this case it could be
> >>   avoided by only merging the incompatible DT change in a following
> >>   merge window after the driver change, or (better) by making it
> >>   a backward-compatible change the same way as addressing 2.
> >
> > Yes, agreed.
> > And The DT change pull request is sent after the driver has been merged into v5.11-rc1.
>
> I can drop this patch and revert what I have changed in Mauro's following patch:
>         "arm64: dts: hisilicon: hi3670.dtsi: add iomcu_rst"
>
> Then resend the pull request. And pick up this patch after the next merge window.
> Do you think is it OK?

Let's start with the updated pull request without this patch so I can merge
the other changes you sent.

I'm still not convinced it helps to drop the property rather than having
both. I think it should be possible to list the old property name in the
binding as 'deprecated' and keep it in the .dts for backwards compatibility
but leave it out in future dts files. Maybe move it into the board .dts file(s)
and make the .dtsi file have only the new property.

      Arnd



More information about the linux-arm-kernel mailing list