| Message ID | cover.1698717154.git.zhoubinbin@loongson.cn |
|---|---|
| Headers | show |
| Series | dt-bindings: interrupt-controller: Fix some loongson,liointc warnings | expand |
On Tue, Oct 31, 2023 at 11:52 PM Rob Herring <robh@kernel.org> wrote: > > On Tue, Oct 31, 2023 at 10:36:37AM +0800, Binbin Zhou wrote: > > As we know, the Loongson-2K0500 is a single-core CPU, and the > > core1-related register (isr1) does not exist, and we need a separate > > declaration. > > > > This fixes dtbs_check warning: > > > > DTC_CHK arch/loongarch/boot/dts/loongson-2k0500-ref.dtb > > arch/loongarch/boot/dts/loongson-2k0500-ref.dtb: interrupt-controller@1fe11400: reg-names: ['main', 'isr0'] is too short > > From schema: Documentation/devicetree/bindings/interrupt-controller/loongson,liointc.yaml > > arch/loongarch/boot/dts/loongson-2k0500-ref.dtb: interrupt-controller@1fe11400: Unevaluated properties are not allowed ('reg-names' was unexpected) > > From schema: Documentation/devicetree/bindings/interrupt-controller/loongson,liointc.yaml > > arch/loongarch/boot/dts/loongson-2k0500-ref.dtb: interrupt-controller@1fe11400: reg: [[0, 534844416, 0, 64], [0, 534843456, 0, 8]] is too short > > From schema: Documentation/devicetree/bindings/interrupt-controller/loongson,liointc.yaml > > arch/loongarch/boot/dts/loongson-2k0500-ref.dtb: interrupt-controller@1fe11440: reg-names: ['main', 'isr0'] is too short > > From schema: Documentation/devicetree/bindings/interrupt-controller/loongson,liointc.yaml > > > > Signed-off-by: Binbin Zhou <zhoubinbin@loongson.cn> > > --- > > .../loongson,liointc.yaml | 22 ++++++++++++++----- > > 1 file changed, 16 insertions(+), 6 deletions(-) > > > > diff --git a/Documentation/devicetree/bindings/interrupt-controller/loongson,liointc.yaml b/Documentation/devicetree/bindings/interrupt-controller/loongson,liointc.yaml > > index 0d9511b8a792..7393d7dfbe82 100644 > > --- a/Documentation/devicetree/bindings/interrupt-controller/loongson,liointc.yaml > > +++ b/Documentation/devicetree/bindings/interrupt-controller/loongson,liointc.yaml > > @@ -11,8 +11,13 @@ maintainers: > > > > description: | > > This interrupt controller is found in the Loongson-3 family of chips and > > - Loongson-2K1000 chip, as the primary package interrupt controller which > > + Loongson-2K series chips, as the primary package interrupt controller which > > can route local I/O interrupt to interrupt lines of cores. > > + Be aware of the following points. > > + 1.The Loongson-2K0500 is a single core CPU, the isr1 register could not be defined; > > + 2.The Loongson-2K0500/2K1000 has 64 device interrupt sources as inputs, so we > > + need to define two nodes in dts{i} to describe the "0-31" and "32-61" interrupt > > + sources respectively. > > > > allOf: > > - $ref: /schemas/interrupt-controller.yaml# > > @@ -29,10 +34,14 @@ properties: > > maxItems: 3 > > > > reg-names: > > - items: > > - - const: main > > - - const: isr0 > > - - const: isr1 > > + oneOf: > > + - items: > > + - const: main > > + - const: isr0 > > + - items: > > + - const: main > > + - const: isr0 > > + - const: isr1 > > Just adding 'minItems: 2' accomplishes the same thing without > duplicating the list. OK, I will do it. Thanks. Binbin > > > > > interrupt-controller: true > > > > @@ -94,7 +103,8 @@ if: > > then: > > properties: > > reg: > > - minItems: 3 > > + minItems: 2 > > + maxItems: 3 > > > > required: > > - reg-names > > -- > > 2.39.3 > >
On Tue, Oct 31, 2023 at 11:50 PM Rob Herring <robh@kernel.org> wrote: > > On Tue, Oct 31, 2023 at 10:36:36AM +0800, Binbin Zhou wrote: > > Since the 'loongson,parent_int_map' attribute naming is non-standard, we > > should use 'loongson,parent-int-map' instead. > > Also, 'loongson,parent_int_map' should be marked as deprecated. > > While yes, '-' is preferred over '_', I don't think it is worth carrying > support (here and in the kernel) for both. Hi Rob: We try to keep it compatible as the MIPS Loongson has been using this property for a long time. Krzysztof also thinks it is required. Thanks. Binbin > > > > > Signed-off-by: Binbin Zhou <zhoubinbin@loongson.cn> > > --- > > .../interrupt-controller/loongson,liointc.yaml | 15 +++++++++++---- > > 1 file changed, 11 insertions(+), 4 deletions(-)
Hi all: Some liointc-related DTBS_CHECK warnings were found when trying to introduce the Loongson-2K DTS{I} for LoongArch. This patch series attempts to fix those warnings, as well as fixing non-standard property naming. Of course, these fixes also apply to MIPS Loongson-2K1000/Loongson-3A dts{i}. Thanks. ----- V3: patch(1/5): - new patch, 'loongson,parent_int_map' renamed to 'loongson,parent-int-map'; patch(2/5)(3/5): - Separate the change points into separate patches; patch(4/5): - new patch, make sure both parent map forms can be parsed; patch(5/5): - new patch, fix 'loongson,parent_int_map' references in mips loongson dts{i}. Link to V2: https://lore.kernel.org/all/20230821061315.3416836-1-zhoubinbin@loongson.cn/ V2: 1. Update commit message; 2. "interruprt-names" should be "required", the driver gets the parent interrupts through it; 3. Add more descriptions to explain the rationale for multiple nodes; 4. Rewrite if-else statements. Link to V1: https://lore.kernel.org/all/20230815084713.1627520-1-zhoubinbin@loongson.cn/ Binbin Zhou (5): dt-bindings: interrupt-controller: loongson,liointc: Standardize the naming of 'loongson,parent-int-map' dt-bindings: interrupt-controller: loongson,liointc: Fix dtbs_check warning for reg-names dt-bindings: interrupt-controller: loongson,liointc: Fix dtbs_check for interrupt-names irqchip/loongson-liointc: Fix 'loongson,parent_int_map' parse MIPS: Loongson64: DTS: Fix 'loongson,parent_int_map' references .../loongson,liointc.yaml | 44 +++++++++++++------ .../boot/dts/loongson/loongson64-2k1000.dtsi | 4 +- .../dts/loongson/loongson64c-package.dtsi | 2 +- .../dts/loongson/loongson64g-package.dtsi | 2 +- .../dts/loongson/loongson64v_4core_virtio.dts | 2 +- drivers/irqchip/irq-loongson-liointc.c | 7 ++- 6 files changed, 41 insertions(+), 20 deletions(-)