From: Quentin Schulz <quentin.schulz@cherry.de>
To: Niklas Cassel <cassel@kernel.org>,
Quentin Schulz <foss+kernel@0leil.net>
Cc: Rob Herring <robh@kernel.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
Conor Dooley <conor+dt@kernel.org>,
Heiko Stuebner <heiko@sntech.de>, Jagan Teki <jagan@edgeble.ai>,
Michael Riesch <michael.riesch@wolfvision.net>,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 2/3] arm64: dts: rockchip: add overlay tests for Rock 5B PCIe overlays
Date: Fri, 17 Jan 2025 12:50:52 +0100 [thread overview]
Message-ID: <4985c21b-56b8-45b3-a96d-1427ca905c6c@cherry.de> (raw)
In-Reply-To: <Z4o2_0yX-hq-DfCs@ryzen>
Hi Niklas,
On 1/17/25 11:54 AM, Niklas Cassel wrote:
> On Thu, Jan 16, 2025 at 03:47:11PM +0100, Quentin Schulz wrote:
>> From: Quentin Schulz <quentin.schulz@cherry.de>
>>
>> According to commit 40658534756f ("arm64: dts: rockchip: Add rock5b
>> overlays for PCIe endpoint mode"), Rock 5B can operate in PCIe endpoint
>> mode. For that to work, the rk3588-rock-5b-pcie-ep.dtbo overlay needs to
>> be applied on Rock 5B base Device Tree. If that Rock 5B is connected to
>> another Rock 5B, the latter needs to apply the
>> rk3588-rock-5b-pcie-srns.dtbo overlay.
>>
>> In order to make sure the overlays are still valid in the future, let's
>> add a validation test by applying the overlays on top of the main base
>> at build time.
>>
>> Fixes: 40658534756f ("arm64: dts: rockchip: Add rock5b overlays for PCIe endpoint mode")
>
> Not sure if I agree with the Fixes-tag.
> I don't think there is anything broken with that commit, but I definitely
> think that it is a good idea make sure that they don't break in the future.
>
That's fair. I actually think it'd be a good idea to backport this to
stable releases. It could be possible for stable right now to somehow
only backport changes to the base DT without modifying the DTO (or
vice-versa) and then break the overlay unknowingly.
I added the Fixes to make it a bit simpler to know up to when to
backport it, though I still haven't decided if I should have added Cc:
stable there.
So 1) what's your opinion on backporting this to stable
2) if backporting, shouldn't I still remove the Fixes?
>
>> @@ -145,8 +145,6 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-orangepi-5-plus.dtb
>> dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-quartzpro64.dtb
>> dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-rock-5-itx.dtb
>> dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-rock-5b.dtb
>> -dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-rock-5b-pcie-ep.dtbo
>> -dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-rock-5b-pcie-srns.dtbo
>> dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-tiger-haikou.dtb
>> dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-toybrick-x0.dtb
>> dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-turing-rk1.dtb
>> @@ -165,5 +163,9 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-rock-5c.dtb
>>
>> # Overlays
>> dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-edgeble-neu6a-wifi.dtb
>> +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-rock-5b-pcie-ep.dtb
>> +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-rock-5b-pcie-srns.dtb
>
> You moved these lines further down, but you changed the suffix from
> .dtbo to .dtb, why? It seems a little confusing, is that really needed?
>
That was also confusing to me, but that's actually how it works.
rk3588-rock-5b-pcie-ep.dtb somehow points at rk3588-rock-5b-pcie-ep-dtbs
which is the overlay application test of rk3588-rock-5b-pcie-ep.dtbo
onto rk3588-rock-5b.dtb. For that to work, the .dtbo needs to be
compiled. The target must be auto-generated somewhere because that still
works. You can remove all *.dtb* from the tree, apply this patch and
compile with make dtbs and you'll see that the DTBO is generated and the
build time test of overlay application done as well (the log line starts
with OVL).
Not sure exactly how to make this a bit less confusing in the commit
log, as I myself do not really know why that is necessary or how it is
working. But "it works" (tm).
This matches what was done for ti/ as well.
Cheers,
Quentin
next prev parent reply other threads:[~2025-01-17 11:50 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-16 14:47 [PATCH v2 0/3] arm64: dts: rockchip: minimal support for Pre-ICT tester adapter for RK3588 Jaguar + add overlay tests Quentin Schulz
2025-01-16 14:47 ` [PATCH v2 1/3] arm64: dts: rockchip: add overlay test for Edgeble NCM6A Quentin Schulz
2025-01-17 11:18 ` Krzysztof Kozlowski
2025-01-20 9:07 ` Michael Riesch
2025-01-20 9:23 ` Quentin Schulz
2025-01-20 10:34 ` Michael Riesch
2025-01-22 13:17 ` Heiko Stübner
2025-01-16 14:47 ` [PATCH v2 2/3] arm64: dts: rockchip: add overlay tests for Rock 5B PCIe overlays Quentin Schulz
2025-01-17 10:54 ` Niklas Cassel
2025-01-17 11:50 ` Quentin Schulz [this message]
2025-01-17 13:04 ` Niklas Cassel
2025-01-17 11:19 ` Krzysztof Kozlowski
2025-01-17 13:08 ` Niklas Cassel
2025-01-16 14:47 ` [PATCH v2 3/3] arm64: dts: rockchip: minimal support for Pre-ICT tester adapter for RK3588 Jaguar Quentin Schulz
2025-01-17 11:19 ` Krzysztof Kozlowski
2025-01-20 9:06 ` [PATCH v2 0/3] arm64: dts: rockchip: minimal support for Pre-ICT tester adapter for RK3588 Jaguar + add overlay tests Michael Riesch
2025-01-20 9:20 ` Quentin Schulz
2025-01-20 10:27 ` Michael Riesch
2025-01-22 15:38 ` Quentin Schulz
2025-01-22 16:12 ` Niklas Cassel
2025-01-23 14:13 ` Heiko Stübner
2025-01-24 10:21 ` Niklas Cassel
2025-01-24 10:50 ` Heiko Stübner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4985c21b-56b8-45b3-a96d-1427ca905c6c@cherry.de \
--to=quentin.schulz@cherry.de \
--cc=cassel@kernel.org \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=foss+kernel@0leil.net \
--cc=heiko@sntech.de \
--cc=jagan@edgeble.ai \
--cc=krzk+dt@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=michael.riesch@wolfvision.net \
--cc=robh@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®