On 23/05/2023 12:19, Varadarajan Narayanan wrote: > On Thu, May 18, 2023 at 01:06:49PM +0200, Krzysztof Kozlowski wrote: >> On 18/05/2023 11:05, Varadarajan Narayanan wrote: >>> On Thu, May 18, 2023 at 09:09:12AM +0200, Krzysztof Kozlowski wrote: >>>> On 18/05/2023 07:40, Varadarajan Narayanan wrote: >>>>> On Wed, May 17, 2023 at 09:00:49AM +0200, Krzysztof Kozlowski wrote: >>>>>> On 17/05/2023 07:57, Varadarajan Narayanan wrote: >>>>>>> Part-1 is adding the 'const' entries at the beginning i.e. >>>>>>> >>>>>>> + - const: qcom,tsens-v0_1 >>>>>>> + - const: qcom,tsens-v1 >>>>>>> + - const: qcom,tsens-v2 >>>>>>> + - const: qcom,ipq8074-tsens >>>>>>> >>>>>>> Part-2 is changing from one valid syntax to another i.e. >>>>>>> >>>>>>> + items: >>>>>>> + - enum: >>>>>>> + - qcom,ipq9574-tsens >>>>>>> + - const: qcom,ipq8074-tsens >>>>>>> >>>>>>> Without both of the above changes, either or both of dtbs_check >>>>>>> & dt_binding_check fails. So, it is not possible to just add the >>>>>>> "valid hunk" (part-2) alone. >>>>>> >>>>>> Of course it is. All schema files work like that... >>>>>>> >>>>>>> If having both part-1 and part-2 in the same patch is not >>>>>>> acceptable, shall I split them into two patches? Please let me know. >>>>>> >>>>>> No, hunk one is not justified. >>>>> >>>>> For the other compatibles, the enum entries and const/fallback >>>>> entries are different. For the 9574 & 8074 case, we want to have >>>>> qcom,ipq8074-tsens as both enum and const/fallback entry. Hence, >>>>> if we don't have the first hunk, dtbs_check fails for 8074 >>>>> related dtbs >>>>> >>>>> ipq8074-hk01.dtb: thermal-sensor@4a9000: compatible: 'oneOf' condition >>>>> ['qcom,ipq8074-tsens'] is too short >>>> >>>> Why? It is already there. Open the file and you will see that this is >>>> already covered. >>> >>> I guess dtbs_check doesn't like the same value being a const and >>> a oneof entry. >> >> I don't understand. > > - description: v2 of TSENS with combined interrupt > items: > - enum: > - qcom,ipq9574-tsens <--- one of the compatible entries > - const: qcom,ipq8074-tsens <--- fallback entry > > In this patch, we want 8074 to act as a compatible entry for > ipq8074*.dts and fallback entry for ipq9574.dtsi. That is why I > believe we are not able to just add 9574 and get it to pass > dtbs_check and dt_binding_check. Nope, no other bindings have any problems with that. Fix your syntax as I said. > >>> Have attached the file, please see if something is >>> not in order. >> >> I don't know what changed there. Please work on patches. >> >>> >>>> If you remove it, then yes, you will see errors and the answer is: do >>>> not remove it. >>> >>> I haven't removed it. >> >> You did. Look: >> >> - description: v2 of TSENS with combined interrupt >> - enum: >> - - qcom,ipq8074-tsens >> >> The first character in the diff (-) means removal. > > It changed from 'enum' to 'const', that is why I said it is not > removed. You removed that hunk. Diff hunk. It does not matter that you added similar one in different place. You removed this one. Don't. > >>> For this patch, ipq8074-tsens changed from >>> being an oneof enum entry to a const entry. Probably, that is why >>> dtbs_check is giving these errors. >> >> You removed the entry which you should not have touched. >> >>> >>>>> ipq8074-hk10-c2.dtb: thermal-sensor@4a9000: compatible: 'oneOf' condition >>>>> ['qcom,ipq8074-tsens'] is too short >>>>> >>>>> ipq8074-hk10-c1.dtb: thermal-sensor@4a9000: compatible: 'oneOf' condition >>>>> ['qcom,ipq8074-tsens'] is too short >>>>> >>>>> I'm not sure of the correct solution. Having the first hunk >>>>> solves the above dtbs_check errors, so went with it. I'm able to >>>>> avoid dtbs_check errors with just one entry in the first hunk. >>>> >>>> You made multiple changes in one patch which is not correct. Your goal >>>> is to add only one change - ipq9574 followed by ipq8074. Add this one. >>>> Don't touch others. >>> >>> But that breaks dtbs_check. >> >> All other cases, hundreds of other binding files, do not have problem. >> Only this one "breaks dtbs_check". No, it does not. >> >> Whatever is broken is result of your removal of unrelated pieces. > > Not sure about other binding files. Probably they don't have the > same value for fallback and normal compatible. If there is such > an example binding file, will replicate that syntax/structure for > ipq9574 too. No. There are many examples of other bindings which do not have any problems with it and what we talk here is common pattern. You created some fake problem of wrong syntax and then fixed it with different approach... > > In the 'nvidia,tegra210-ope' example (https://elixir.bootlin.com/linux/v6.3-rc6/source/Documentation/devicetree/bindings/sound/nvidia,tegra210-ope.yaml#L25) > too 'nvidia,tegra210-ope' is listed twice > > - const: nvidia,tegra210-ope <=== > - items: > - enum: > - nvidia,tegra234-ope > - nvidia,tegra194-ope > - nvidia,tegra186-ope > - const: nvidia,tegra210-ope <=== > >>>>> + - const: qcom,ipq8074-tsens >>>>> >>>>> Please let me know if there is a better way to resolve this or we >>>>> can have just the 8074 entry in the first hunk. >>>> >>>> You only need to add new item on the oneOf list: >>>> - enum >>>> - ipq9574 >>>> - const: ipq8074 >>> >>> The "['qcom,ipq8074-tsens'] is too short" errors were generated >>> with the above snippet only. Please see the attachment >> >> It's not true. The error you see is result because you removed something >> you should not. I did not ask you to remove anything. So repeating - >> "add new item". Adding is not "removal and adding". Adding is just "adding". > > See below for the changes that were tried and the corresponding errors. > > (1) No lines removed > > @@ -66,6 +66,7 @@ > - description: v2 of TSENS with combined interrupt > enum: > - qcom,ipq8074-tsens > + - qcom,ipq9574-tsens This does not make sense, right? Let's not discuss solutions which do not make sense... > > reg: > items: > > dt_binding_check: No errors > > dtbs_check : > arch/arm64/boot/dts/qcom/ipq9574-rdp433.dtb: thermal-sensor@4a9000: compatible: 'oneOf' conditional failed, one must be fixed: > ['qcom,ipq9574-tsens', 'qcom,ipq8074-tsens'] is too long > > (2) No lines removed > > @@ -66,6 +66,8 @@ > - description: v2 of TSENS with combined interrupt > enum: > - qcom,ipq8074-tsens > + - qcom,ipq9574-tsens > + - const: qcom,ipq8074-tsens You change existing entry, which breaks it. Don't. > > reg: > items: > > dt_binding_check: No errors > > dtbs_check : Gives errors for all the DTS files that have tsens-v0_1, tsens-v2, tsens-v1. Copy pasted a sample for each one of them > arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dtb: /soc@0/thermal-sensor@4a9000: failed to match any schema with compatible: ['qcom,msm8916-tsens', 'qcom,tsens-v0_1'] > arch/arm64/boot/dts/qcom/msm8953-xiaomi-tissot.dtb: /soc@0/thermal-sensor@4a9000: failed to match any schema with compatible: ['qcom,msm8953-tsens', 'qcom,tsens-v2'] > arch/arm64/boot/dts/qcom/msm8956-sony-xperia-loire-suzu.dtb: /soc@0/thermal-sensor@4a9000: failed to match any schema with compatible: ['qcom,msm8956-tsens', 'qcom,tsens-v1'] > > > (3) No lines removed > @@ -19,6 +19,7 @@ > properties: > compatible: > oneOf: > + - const: qcom,ipq8074-tsens > - description: msm8960 TSENS based > items: > - enum: > @@ -66,6 +67,8 @@ > - description: v2 of TSENS with combined interrupt > enum: > - qcom,ipq8074-tsens > + - qcom,ipq9574-tsens > + - const: qcom,ipq8074-tsens Don't change existing entry. > > reg: > items: > > dt_binding_check: Same as above > > dtbs_check : Same as above > > (4) Change 8074 from enum to const > @@ -19,6 +19,7 @@ > properties: > compatible: > oneOf: > + - const: qcom,ipq8074-tsens > - description: msm8960 TSENS based > items: > - enum: > @@ -64,8 +65,10 @@ > - const: qcom,tsens-v2 > > - description: v2 of TSENS with combined interrupt > - enum: > - - qcom,ipq8074-tsens > + items: > + - enum: > + - qcom,ipq9574-tsens > + - const: qcom,ipq8074-tsens Don't touch existing entry. Third time. > > reg: > items: > > dt_binding_check: No errors > > dtbs_check : No errors > > But (4) doesn't seem acceptable. Any other alternative to resolve this? Don't touch existing entry. Fourth time. Add a new one matching your combination. Best regards, Krzysztof
