Re: [PATCH v6 09/11] MIPS: Loongson64: Add generic dts

[Huacai Chen <chenhc@lemote.com>]

Hi, Jiaxun,

On Wed, Mar 25, 2020 at 10:09 AM Jiaxun Yang <jiaxun.yang@flygoat.com> wrote:
>
>
>
> 于 2020年3月25日 GMT+08:00 上午10:11:05, Huacai Chen <chenhc@lemote.com> 写到:
> >Hi, Jiaxun,
> >
> >On Tue, Mar 24, 2020 at 11:40 PM Jiaxun Yang <jiaxun.yang@flygoat.com>
> >wrote:
> >>
> >> Add generic device dts for Loongson-3 devices.
> >> They are currently almost identical but will be different later.
> >> Some PCH devices like PCI Host Bridge is still enabled by platform
> >> code for now.
> >>
> >> Co-developed-by: Huacai Chen <chenhc@lemote.com>
> >> Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
> >> ---
> >>  arch/mips/Kconfig                             |  6 +-
> >>  arch/mips/boot/dts/Makefile                   |  1 +
> >>  arch/mips/boot/dts/loongson/Makefile          |  4 ++
> >>  .../boot/dts/loongson/loongson3-package.dtsi  | 62
> >+++++++++++++++++++
> >>  .../dts/loongson/loongson3_4core_rs780e.dts   | 25 ++++++++
> >>  .../dts/loongson/loongson3_8core_rs780e.dts   | 25 ++++++++
> >>  arch/mips/boot/dts/loongson/rs780e-pch.dtsi   | 26 ++++++++
> >>  7 files changed, 147 insertions(+), 2 deletions(-)
> >>  create mode 100644 arch/mips/boot/dts/loongson/Makefile
> >>  create mode 100644
> >arch/mips/boot/dts/loongson/loongson3-package.dtsi
> >>  create mode 100644
> >arch/mips/boot/dts/loongson/loongson3_4core_rs780e.dts
> >>  create mode 100644
> >arch/mips/boot/dts/loongson/loongson3_8core_rs780e.dts
> >>  create mode 100644 arch/mips/boot/dts/loongson/rs780e-pch.dtsi
> >>
> >> diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
> >> index ca3045b2a2d9..4a0b2f494d79 100644
> >> --- a/arch/mips/Kconfig
> >> +++ b/arch/mips/Kconfig
> >> @@ -486,9 +486,11 @@ config MACH_LOONGSON64
> >>         select SYS_SUPPORTS_HIGHMEM
> >>         select SYS_SUPPORTS_LITTLE_ENDIAN
> >>         select SYS_SUPPORTS_ZBOOT
> >> -       select LOONGSON_MC146818
> >>         select ZONE_DMA32
> >>         select NUMA
> >> +       select COMMON_CLK
> >> +       select USE_OF
> >> +       select BUILTIN_DTB
> >>         help
> >>           This enables the support of Loongson-2/3 family of
> >machines.
> >>
> >> @@ -3081,7 +3083,7 @@ endchoice
> >>  choice
> >>         prompt "Kernel command line type" if !CMDLINE_OVERRIDE
> >>         default MIPS_CMDLINE_FROM_DTB if USE_OF && !ATH79 &&
> >!MACH_INGENIC && \
> >> -                                        !MIPS_MALTA && \
> >> +                                        !MACH_LOONGSON64 &&
> >!MIPS_MALTA && \
> >>                                          !CAVIUM_OCTEON_SOC
> >>         default MIPS_CMDLINE_FROM_BOOTLOADER
> >>
> >> diff --git a/arch/mips/boot/dts/Makefile
> >b/arch/mips/boot/dts/Makefile
> >> index 1e79cab8e269..d429a69bfe30 100644
> >> --- a/arch/mips/boot/dts/Makefile
> >> +++ b/arch/mips/boot/dts/Makefile
> >> @@ -4,6 +4,7 @@ subdir-y        += cavium-octeon
> >>  subdir-y       += img
> >>  subdir-y       += ingenic
> >>  subdir-y       += lantiq
> >> +subdir-y       += loongson
> >>  subdir-y       += mscc
> >>  subdir-y       += mti
> >>  subdir-y       += netlogic
> >> diff --git a/arch/mips/boot/dts/loongson/Makefile
> >b/arch/mips/boot/dts/loongson/Makefile
> >> new file mode 100644
> >> index 000000000000..56d379471262
> >> --- /dev/null
> >> +++ b/arch/mips/boot/dts/loongson/Makefile
> >> @@ -0,0 +1,4 @@
> >> +# SPDX_License_Identifier: GPL_2.0
> >> +dtb-$(CONFIG_MACH_LOONGSON64)  += loongson3_4core_rs780e.dtb
> >loongson3_8core_rs780e.dtb
> >> +
> >> +obj-$(CONFIG_BUILTIN_DTB)      += $(addsuffix .o, $(dtb-y))
> >> diff --git a/arch/mips/boot/dts/loongson/loongson3-package.dtsi
> >b/arch/mips/boot/dts/loongson/loongson3-package.dtsi
> >> new file mode 100644
> >> index 000000000000..d09c313603f1
> >> --- /dev/null
> >> +++ b/arch/mips/boot/dts/loongson/loongson3-package.dtsi
> >> @@ -0,0 +1,62 @@
> >> +// SPDX-License-Identifier: GPL-2.0
> >> +
> >> +#include <dt-bindings/interrupt-controller/irq.h>
> >> +
> >> +/ {
> >> +       #address-cells = <2>;
> >> +       #size-cells = <2>;
> >> +
> >I still add something like this here:
> >
> >                cpu@0 {
> >                        compatible = "loongson,loongson3";
> >                        device_type = "cpu";
> >                        reg = <0x0>;
> >                        next-level-cache = <&scache0>;
> >                };
> >
> >Because it at least solve the problem of cache hierarchy, which cause
> >"lscpu" crash.
>
> That's another problem.
> Previous discussion with rob and Paul all suggested that we shouldn't add cpu node.
> At least for now.
>
Maybe Rob and Paul had never care about the cache hierarchy problem?
And I think the generic .dts files should not be modified from time to
time.

> >
> >> +       cpuintc: interrupt-controller {
> >> +               #address-cells = <0>;
> >> +               #interrupt-cells = <1>;
> >> +               interrupt-controller;
> >> +               compatible = "mti,cpu-interrupt-controller";
> >> +       };
> >> +
> >> +       package0: bus@1fe00000 {
> >> +               compatible = "simple-bus";
> >> +               #address-cells = <2>;
> >> +               #size-cells = <1>;
> >> +               ranges = <0 0x1fe00000 0 0x1fe00000 0x100000
> >> +                       0 0x3ff00000 0 0x3ff00000 0x100000
> >> +                       0xefd 0xfb000000 0xefd 0xfb000000 0x10000000
> >/* 3A HT Config Space */
> >> +                       0x1efd 0xfb000000 0x1efd 0xfb000000
> >0x10000000 /* 3B HT Config Space */>;
> >> +
> >> +               liointc: interrupt-controller@3ff01400 {
> >> +                       compatible = "loongson,liointc-1.0";
> >> +                       reg = <0 0x3ff01400 0x64>;
> >> +
> >> +                       interrupt-controller;
> >> +                       #interrupt-cells = <2>;
> >> +
> >> +                       interrupt-parent = <&cpuintc>;
> >> +                       interrupts = <2>, <3>;
> >> +                       interrupt-names = "int0", "int1";
> >> +
> >> +                       loongson,parent_int_map = <0xf0ffffff>, /*
> >int0 */
> >> +                                               <0x0f000000>, /* int1
> >*/
> >> +                                               <0x00000000>, /* int2
> >*/
> >> +                                               <0x00000000>; /* int3
> >*/
> >> +
> >> +               };
> >> +
> >> +               cpu_uart0: serial@1fe001e0 {
> >> +                       compatible = "ns16550a";
> >> +                       reg = <0 0x1fe001e0 0x8>;
> >> +                       clock-frequency = <33000000>;
> >> +                       interrupt-parent = <&liointc>;
> >> +                       interrupts = <10 IRQ_TYPE_LEVEL_HIGH>;
> >> +                       no-loopback-test;
> >> +               };
> >> +
> >> +               cpu_uart1: serial@1fe001e8 {
> >> +                       status = "disabled";
> >Why disable UART1 by default, is it cause problems?
>
> Yes. It would cause endless suprious interrupt.
> And most machine didn't exposed that port.
> So I'd prefer disable it.
I think the default .dts file should enable devices as many as
possible, and suprious interrupts have not cause serious problems.

>
> >
> >> +                       compatible = "ns16550a";
> >> +                       reg = <0 0x1fe001e8 0x8>;
> >> +                       clock-frequency = <33000000>;
> >> +                       interrupts = <10 IRQ_TYPE_LEVEL_HIGH>;
> >> +                       interrupt-parent = <&liointc>;
> >> +                       no-loopback-test;
> >> +               };
> >> +       };
> >> +};
> >> diff --git a/arch/mips/boot/dts/loongson/loongson3_4core_rs780e.dts
> >b/arch/mips/boot/dts/loongson/loongson3_4core_rs780e.dts
> >> new file mode 100644
> >> index 000000000000..6b5694ca0f95
> >> --- /dev/null
> >> +++ b/arch/mips/boot/dts/loongson/loongson3_4core_rs780e.dts
> >> @@ -0,0 +1,25 @@
> >> +// SPDX-License-Identifier: GPL-2.0
> >> +
> >> +/dts-v1/;
> >> +
> >> +#include "loongson3-package.dtsi"
> >> +#include "rs780e-pch.dtsi"
> >> +
> >> +/ {
> >> +       compatible = "loongson,loongson3-4core-rs780e";
> >> +};
> >> +
> >> +&package0 {
> >> +       htpic: interrupt-controller@efdfb000080 {
> >> +               compatible = "loongson,htpic-1.0";
> >> +               reg = <0xefd 0xfb000080 0x40>;
> >> +               interrupt-controller;
> >> +               #interrupt-cells = <1>;
> >> +
> >> +               interrupt-parent = <&liointc>;
> >> +               interrupts = <24 IRQ_TYPE_LEVEL_HIGH>,
> >> +                               <25 IRQ_TYPE_LEVEL_HIGH>,
> >> +                               <26 IRQ_TYPE_LEVEL_HIGH>,
> >> +                               <27 IRQ_TYPE_LEVEL_HIGH>;
> >> +       };
> >> +};
> >> diff --git a/arch/mips/boot/dts/loongson/loongson3_8core_rs780e.dts
> >b/arch/mips/boot/dts/loongson/loongson3_8core_rs780e.dts
> >> new file mode 100644
> >> index 000000000000..ffefa2f829b0
> >> --- /dev/null
> >> +++ b/arch/mips/boot/dts/loongson/loongson3_8core_rs780e.dts
> >> @@ -0,0 +1,25 @@
> >> +// SPDX-License-Identifier: GPL-2.0
> >> +
> >> +/dts-v1/;
> >> +
> >> +#include "loongson3-package.dtsi"
> >> +#include "rs780e-pch.dtsi"
> >> +
> >> +/ {
> >> +       compatible = "loongson,loongson3-8core-rs780e";
> >> +};
> >> +
> >> +&package0 {
> >> +       htpic: interrupt-controller@1efdfb000080 {
> >> +               compatible = "loongson,htpic-1.0";
> >> +               reg = <0x1efd 0xfb000080 0x40>;
> >> +               interrupt-controller;
> >> +               #interrupt-cells = <1>;
> >> +
> >> +               interrupt-parent = <&liointc>;
> >> +               interrupts = <24 IRQ_TYPE_LEVEL_HIGH>,
> >> +                               <25 IRQ_TYPE_LEVEL_HIGH>,
> >> +                               <26 IRQ_TYPE_LEVEL_HIGH>,
> >> +                               <27 IRQ_TYPE_LEVEL_HIGH>;
> >> +       };
> >> +};
> >> diff --git a/arch/mips/boot/dts/loongson/rs780e-pch.dtsi
> >b/arch/mips/boot/dts/loongson/rs780e-pch.dtsi
> >> new file mode 100644
> >> index 000000000000..45c54d555fa4
> >> --- /dev/null
> >> +++ b/arch/mips/boot/dts/loongson/rs780e-pch.dtsi
> >> @@ -0,0 +1,26 @@
> >> +// SPDX-License-Identifier: GPL-2.0
> >> +
> >> +/ {
> >> +       bus@10000000 {
> >> +               compatible = "simple-bus";
> >> +               #address-cells = <2>;
> >> +               #size-cells = <2>;
> >> +               ranges = <0 0x10000000 0 0x10000000 0 0x10000000
> >> +                               0 0x40000000 0 0x40000000 0
> >0x40000000
> >> +                               0xfd 0xfe000000 0xfd 0xfe000000  0
> >0x2000000 /* PCI Config Space */>;
> >> +
> >> +               isa {
> >> +                       compatible = "isa";
> >> +                       #address-cells = <2>;
> >> +                       #size-cells = <1>;
> >> +                       ranges = <1 0 0 0 0x1000>;
> >> +
> >> +                       rtc0: rtc@70 {
> >> +                               compatible = "motorola,mc146818";
> >> +                               reg = <1 0x70 0x8>;
> >> +                               interrupts = <8>;
> >> +                               interrupt-parent = <&htpic>;
> >> +                       };
> >> +               };
> >> +       };
> >> +};
> >> --
> >> 2.26.0.rc2
> >>
> >>
> >
> >Regards,
> >Huacai
>
> --
> Jiaxun Yang

Regards,
Huacai