Correct Xiaomi Poco F1 compatible strings and evaluation.

[PATCH 2/2] arm64: dts: qcom: sdm845-xiaomi-beryllium: Fix compatible strings

Posted by David Heidelberg via B4 Relay 3 days, 19 hours ago

From: Jens Reidel <adrian@travitia.xyz>

The most specific strings should come first (panel variant included),
then the more generic ones (device and SoC).

This is necessary for hexagonrpcd to guess the HexagonFS path for the
device. It tries all of the compatible entries, but if none for
xiaomi,beryllium existed it wouldn't be able to guess it.

Fixes: bcf429831ecb ("arm64: dts: qcom: sdm845-xiaomi-beryllium-ebbg: introduce Xiaomi Poco F1 EBBG variant")
Fixes: dd6459a0890a ("arm64: dts: qcom: split beryllium dts into common dtsi and tianma dts")
Signed-off-by: Jens Reidel <adrian@travitia.xyz>
Signed-off-by: David Heidelberg <david@ixit.cz>
---
 arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-ebbg.dts   | 2 +-
 arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-tianma.dts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-ebbg.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-ebbg.dts
index 2d6f0e382a6cb..d157622f84d13 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-ebbg.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-ebbg.dts
@@ -6,7 +6,7 @@
 
 / {
 	model = "Xiaomi Pocophone F1 (EBBG)";
-	compatible = "xiaomi,beryllium-ebbg", "qcom,sdm845";
+	compatible = "xiaomi,beryllium-ebbg", "xiaomi,beryllium", "qcom,sdm845";
 };
 
 &display_panel {
diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-tianma.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-tianma.dts
index b58964cde8342..71816a9f33b48 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-tianma.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-tianma.dts
@@ -6,7 +6,7 @@
 
 / {
 	model = "Xiaomi Pocophone F1 (Tianma)";
-	compatible = "xiaomi,beryllium", "qcom,sdm845";
+	compatible = "xiaomi,beryllium-tianma", "xiaomi,beryllium", "qcom,sdm845";
 };
 
 &display_panel {

-- 
2.53.0

Re: [PATCH 2/2] arm64: dts: qcom: sdm845-xiaomi-beryllium: Fix compatible strings

Posted by Krzysztof Kozlowski 2 days, 4 hours ago

On Fri, Apr 03, 2026 at 06:55:34PM +0200, David Heidelberg wrote:
> From: Jens Reidel <adrian@travitia.xyz>
> 
> The most specific strings should come first (panel variant included),
> then the more generic ones (device and SoC).
> 
> This is necessary for hexagonrpcd to guess the HexagonFS path for the
> device. It tries all of the compatible entries, but if none for
> xiaomi,beryllium existed it wouldn't be able to guess it.
> 
> Fixes: bcf429831ecb ("arm64: dts: qcom: sdm845-xiaomi-beryllium-ebbg: introduce Xiaomi Poco F1 EBBG variant")
> Fixes: dd6459a0890a ("arm64: dts: qcom: split beryllium dts into common dtsi and tianma dts")
> Signed-off-by: Jens Reidel <adrian@travitia.xyz>
> Signed-off-by: David Heidelberg <david@ixit.cz>
> ---
>  arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-ebbg.dts   | 2 +-
>  arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-tianma.dts | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-ebbg.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-ebbg.dts
> index 2d6f0e382a6cb..d157622f84d13 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-ebbg.dts
> +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-ebbg.dts
> @@ -6,7 +6,7 @@
>  
>  / {
>  	model = "Xiaomi Pocophone F1 (EBBG)";
> -	compatible = "xiaomi,beryllium-ebbg", "qcom,sdm845";
> +	compatible = "xiaomi,beryllium-ebbg", "xiaomi,beryllium", "qcom,sdm845";

So now for all users of this ABI, the ebbg variant will be treated like
it was Tianma. Your commit msg should try to explain the impact of this,
beside the hexagonrpcd.

Technically this is ABI change.

Best regards,
Krzysztof

Re: [PATCH 2/2] arm64: dts: qcom: sdm845-xiaomi-beryllium: Fix compatible strings

Posted by David Heidelberg 2 days, 4 hours ago

On 05/04/2026 10:02, Krzysztof Kozlowski wrote:
> On Fri, Apr 03, 2026 at 06:55:34PM +0200, David Heidelberg wrote:
>> From: Jens Reidel <adrian@travitia.xyz>
>>
>> The most specific strings should come first (panel variant included),
>> then the more generic ones (device and SoC).
>>
>> This is necessary for hexagonrpcd to guess the HexagonFS path for the
>> device. It tries all of the compatible entries, but if none for
>> xiaomi,beryllium existed it wouldn't be able to guess it.
>>
>> Fixes: bcf429831ecb ("arm64: dts: qcom: sdm845-xiaomi-beryllium-ebbg: introduce Xiaomi Poco F1 EBBG variant")
>> Fixes: dd6459a0890a ("arm64: dts: qcom: split beryllium dts into common dtsi and tianma dts")
>> Signed-off-by: Jens Reidel <adrian@travitia.xyz>
>> Signed-off-by: David Heidelberg <david@ixit.cz>
>> ---
>>   arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-ebbg.dts   | 2 +-
>>   arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-tianma.dts | 2 +-
>>   2 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-ebbg.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-ebbg.dts
>> index 2d6f0e382a6cb..d157622f84d13 100644
>> --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-ebbg.dts
>> +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-ebbg.dts
>> @@ -6,7 +6,7 @@
>>   
>>   / {
>>   	model = "Xiaomi Pocophone F1 (EBBG)";
>> -	compatible = "xiaomi,beryllium-ebbg", "qcom,sdm845";
>> +	compatible = "xiaomi,beryllium-ebbg", "xiaomi,beryllium", "qcom,sdm845";
> 
> So now for all users of this ABI, the ebbg variant will be treated like
> it was Tianma. Your commit msg should try to explain the impact of this,
> beside the hexagonrpcd.

Sure, I'll update the commit msg.

> 
> Technically this is ABI change.
> 
> Best regards,
> Krzysztof
> 

-- 
David Heidelberg