Message ID | 20191112110330.179649-5-pihsun@chromium.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | Add support for mt8183 SCP. | expand |
On 12/11/2019 12:03, Pi-Hsun Shih wrote: > From: Eddie Huang <eddie.huang@mediatek.com> > > Add scp node to mt8183 and mt8183-evb > > Signed-off-by: Erin Lo <erin.lo@mediatek.com> > Signed-off-by: Pi-Hsun Shih <pihsun@chromium.org> > Signed-off-by: Eddie Huang <eddie.huang@mediatek.com> Sorry I somehow oversaw this. Next time please don't doubt to ping me. Bjorn, do I understand correctly that you don't send emails to the list informing of the inclusion of a patch/series in your tree? Anyway applied now to v5.9-next/dts64 :) Thanks! > --- > Changes from v20 ... v14: > - No change. > > Changes from v13: > - Change the size of the cfg register region. > > Changes from v12 ... v10: > - No change. > > Changes from v9: > - Remove extra reserve-memory-vpu_share node. > > Changes from v8: > - New patch. > --- > arch/arm64/boot/dts/mediatek/mt8183-evb.dts | 11 +++++++++++ > arch/arm64/boot/dts/mediatek/mt8183.dtsi | 12 ++++++++++++ > 2 files changed, 23 insertions(+) > > diff --git a/arch/arm64/boot/dts/mediatek/mt8183-evb.dts b/arch/arm64/boot/dts/mediatek/mt8183-evb.dts > index 1fb195c683c3..ddb7a7ac9655 100644 > --- a/arch/arm64/boot/dts/mediatek/mt8183-evb.dts > +++ b/arch/arm64/boot/dts/mediatek/mt8183-evb.dts > @@ -24,6 +24,17 @@ memory@40000000 { > chosen { > stdout-path = "serial0:921600n8"; > }; > + > + reserved-memory { > + #address-cells = <2>; > + #size-cells = <2>; > + ranges; > + scp_mem_reserved: scp_mem_region { > + compatible = "shared-dma-pool"; > + reg = <0 0x50000000 0 0x2900000>; > + no-map; > + }; > + }; > }; > > &auxadc { > diff --git a/arch/arm64/boot/dts/mediatek/mt8183.dtsi b/arch/arm64/boot/dts/mediatek/mt8183.dtsi > index 10b32471bc7b..e582f5e6691d 100644 > --- a/arch/arm64/boot/dts/mediatek/mt8183.dtsi > +++ b/arch/arm64/boot/dts/mediatek/mt8183.dtsi > @@ -269,6 +269,18 @@ pwrap: pwrap@1000d000 { > clock-names = "spi", "wrap"; > }; > > + scp: scp@10500000 { > + compatible = "mediatek,mt8183-scp"; > + reg = <0 0x10500000 0 0x80000>, > + <0 0x105c0000 0 0x19080>; > + reg-names = "sram", "cfg"; > + interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&infracfg CLK_INFRA_SCPSYS>; > + clock-names = "main"; > + memory-region = <&scp_mem_reserved>; > + status = "disabled"; > + }; > + > systimer: timer@10017000 { > compatible = "mediatek,mt8183-timer", > "mediatek,mt6765-timer"; >
On Thu, 27 Aug 2020 at 15:44, Matthias Brugger <matthias.bgg@gmail.com> wrote: > > > > On 12/11/2019 12:03, Pi-Hsun Shih wrote: > > From: Eddie Huang <eddie.huang@mediatek.com> > > > > Add scp node to mt8183 and mt8183-evb > > > > Signed-off-by: Erin Lo <erin.lo@mediatek.com> > > Signed-off-by: Pi-Hsun Shih <pihsun@chromium.org> > > Signed-off-by: Eddie Huang <eddie.huang@mediatek.com> > > Sorry I somehow oversaw this. Next time please don't doubt to ping me. > > Bjorn, do I understand correctly that you don't send emails to the list > informing of the inclusion of a patch/series in your tree? > > Anyway applied now to v5.9-next/dts64 :) arm64 build dtbs failed on linux next 20200902. mt8183.dtsi:342.21-352.5: ERROR (phandle_references): /soc/scp@10500000: Reference to non-existent node or label "scp_mem_reserved" build log, make -sk KBUILD_BUILD_USER=TuxBuild -C/linux ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- HOSTCC=gcc CC="sccache aarch64-linux-gnu-gcc" O=build dtbs # ../arch/arm64/boot/dts/broadcom/stingray/stingray-usb.dtsi:7.3-14: Warning (dma_ranges_format): /usb:dma-ranges: empty "dma-ranges" property but its #address-cells (1) differs from / (2) ../arch/arm64/boot/dts/broadcom/stingray/stingray-usb.dtsi:7.3-14: Warning (dma_ranges_format): /usb:dma-ranges: empty "dma-ranges" property but its #size-cells (1) differs from / (2) ../arch/arm64/boot/dts/broadcom/stingray/stingray-usb.dtsi:7.3-14: Warning (dma_ranges_format): /usb:dma-ranges: empty "dma-ranges" property but its #address-cells (1) differs from / (2) ../arch/arm64/boot/dts/broadcom/stingray/stingray-usb.dtsi:7.3-14: Warning (dma_ranges_format): /usb:dma-ranges: empty "dma-ranges" property but its #size-cells (1) differs from / (2) ../arch/arm64/boot/dts/broadcom/stingray/stingray-usb.dtsi:7.3-14: Warning (dma_ranges_format): /usb:dma-ranges: empty "dma-ranges" property but its #address-cells (1) differs from / (2) ../arch/arm64/boot/dts/broadcom/stingray/stingray-usb.dtsi:7.3-14: Warning (dma_ranges_format): /usb:dma-ranges: empty "dma-ranges" property but its #size-cells (1) differs from / (2) ../arch/arm64/boot/dts/mediatek/mt8183.dtsi:342.21-352.5: ERROR (phandle_references): /soc/scp@10500000: Reference to non-existent node or label "scp_mem_reserved" > > Thanks! > > > --- > > Changes from v20 ... v14: > > - No change. > > > > Changes from v13: > > - Change the size of the cfg register region. > > > > Changes from v12 ... v10: > > - No change. > > > > Changes from v9: > > - Remove extra reserve-memory-vpu_share node. > > > > Changes from v8: > > - New patch. > > --- > > arch/arm64/boot/dts/mediatek/mt8183-evb.dts | 11 +++++++++++ > > arch/arm64/boot/dts/mediatek/mt8183.dtsi | 12 ++++++++++++ > > 2 files changed, 23 insertions(+) > > > > diff --git a/arch/arm64/boot/dts/mediatek/mt8183-evb.dts b/arch/arm64/boot/dts/mediatek/mt8183-evb.dts > > index 1fb195c683c3..ddb7a7ac9655 100644 > > --- a/arch/arm64/boot/dts/mediatek/mt8183-evb.dts > > +++ b/arch/arm64/boot/dts/mediatek/mt8183-evb.dts > > @@ -24,6 +24,17 @@ memory@40000000 { > > chosen { > > stdout-path = "serial0:921600n8"; > > }; > > + > > + reserved-memory { > > + #address-cells = <2>; > > + #size-cells = <2>; > > + ranges; > > + scp_mem_reserved: scp_mem_region { > > + compatible = "shared-dma-pool"; > > + reg = <0 0x50000000 0 0x2900000>; > > + no-map; > > + }; > > + }; > > }; > > > > &auxadc { > > diff --git a/arch/arm64/boot/dts/mediatek/mt8183.dtsi b/arch/arm64/boot/dts/mediatek/mt8183.dtsi > > index 10b32471bc7b..e582f5e6691d 100644 > > --- a/arch/arm64/boot/dts/mediatek/mt8183.dtsi > > +++ b/arch/arm64/boot/dts/mediatek/mt8183.dtsi > > @@ -269,6 +269,18 @@ pwrap: pwrap@1000d000 { > > clock-names = "spi", "wrap"; > > }; > > > > + scp: scp@10500000 { > > + compatible = "mediatek,mt8183-scp"; > > + reg = <0 0x10500000 0 0x80000>, > > + <0 0x105c0000 0 0x19080>; > > + reg-names = "sram", "cfg"; > > + interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>; > > + clocks = <&infracfg CLK_INFRA_SCPSYS>; > > + clock-names = "main"; > > + memory-region = <&scp_mem_reserved>; > > + status = "disabled"; > > + }; > > + > > systimer: timer@10017000 { > > compatible = "mediatek,mt8183-timer", > > "mediatek,mt6765-timer"; > > full build log, https://builds.tuxbuild.com/_IfeLhOWMWxIkRkmAtAwOQ/build.log
On Wed, 2 Sep 2020 at 16:45, Naresh Kamboju <naresh.kamboju@linaro.org> wrote: > > On Thu, 27 Aug 2020 at 15:44, Matthias Brugger <matthias.bgg@gmail.com> wrote: > > > > > > > > On 12/11/2019 12:03, Pi-Hsun Shih wrote: > > > From: Eddie Huang <eddie.huang@mediatek.com> > > > > > > Add scp node to mt8183 and mt8183-evb > > > > > > Signed-off-by: Erin Lo <erin.lo@mediatek.com> > > > Signed-off-by: Pi-Hsun Shih <pihsun@chromium.org> > > > Signed-off-by: Eddie Huang <eddie.huang@mediatek.com> > > > > Sorry I somehow oversaw this. Next time please don't doubt to ping me. > > > > Bjorn, do I understand correctly that you don't send emails to the list > > informing of the inclusion of a patch/series in your tree? > > > > Anyway applied now to v5.9-next/dts64 :) > > arm64 build dtbs failed on linux next 20200902. I just hit it as well... I wish the kernel was built after applying patches... it would make the next a better place. Best regards, Krzysztof
On 02/09/2020 17:23, Krzysztof Kozlowski wrote: > On Wed, 2 Sep 2020 at 16:45, Naresh Kamboju <naresh.kamboju@linaro.org> wrote: >> >> On Thu, 27 Aug 2020 at 15:44, Matthias Brugger <matthias.bgg@gmail.com> wrote: >>> >>> >>> >>> On 12/11/2019 12:03, Pi-Hsun Shih wrote: >>>> From: Eddie Huang <eddie.huang@mediatek.com> >>>> >>>> Add scp node to mt8183 and mt8183-evb >>>> >>>> Signed-off-by: Erin Lo <erin.lo@mediatek.com> >>>> Signed-off-by: Pi-Hsun Shih <pihsun@chromium.org> >>>> Signed-off-by: Eddie Huang <eddie.huang@mediatek.com> >>> >>> Sorry I somehow oversaw this. Next time please don't doubt to ping me. >>> >>> Bjorn, do I understand correctly that you don't send emails to the list >>> informing of the inclusion of a patch/series in your tree? >>> >>> Anyway applied now to v5.9-next/dts64 :) >> >> arm64 build dtbs failed on linux next 20200902. > > I just hit it as well... I wish the kernel was built after applying > patches... it would make the next a better place. Any update on this? It is still broken as of next-20200908. Jon
On Wed, Sep 9, 2020 at 3:37 PM Jon Hunter <jonathanh@nvidia.com> wrote: > > > On 02/09/2020 17:23, Krzysztof Kozlowski wrote: > > On Wed, 2 Sep 2020 at 16:45, Naresh Kamboju <naresh.kamboju@linaro.org> wrote: > >> > >> On Thu, 27 Aug 2020 at 15:44, Matthias Brugger <matthias.bgg@gmail.com> wrote: > >>> > >>> > >>> > >>> On 12/11/2019 12:03, Pi-Hsun Shih wrote: > >>>> From: Eddie Huang <eddie.huang@mediatek.com> > >>>> > >>>> Add scp node to mt8183 and mt8183-evb > >>>> > >>>> Signed-off-by: Erin Lo <erin.lo@mediatek.com> > >>>> Signed-off-by: Pi-Hsun Shih <pihsun@chromium.org> > >>>> Signed-off-by: Eddie Huang <eddie.huang@mediatek.com> > >>> > >>> Sorry I somehow oversaw this. Next time please don't doubt to ping me. > >>> > >>> Bjorn, do I understand correctly that you don't send emails to the list > >>> informing of the inclusion of a patch/series in your tree? > >>> > >>> Anyway applied now to v5.9-next/dts64 :) > >> > >> arm64 build dtbs failed on linux next 20200902. > > > > I just hit it as well... I wish the kernel was built after applying > > patches... it would make the next a better place. > > > Any update on this? It is still broken as of next-20200908. > > Jon > I just sent https://lore.kernel.org/patchwork/patch/1303034/ which should fix this. The build failure is because another patch for the mt8183-kukui.dtsi (cd894e274b74 "arm64: dts: mt8183: Add krane-sku176 board") that was merged after this patch is submitted to list is missing the scp_mem_reserved field. Sorry for that. > -- > nvpublic
On 02/09/2020 18:23, Krzysztof Kozlowski wrote: > On Wed, 2 Sep 2020 at 16:45, Naresh Kamboju <naresh.kamboju@linaro.org> wrote: >> >> On Thu, 27 Aug 2020 at 15:44, Matthias Brugger <matthias.bgg@gmail.com> wrote: >>> >>> >>> >>> On 12/11/2019 12:03, Pi-Hsun Shih wrote: >>>> From: Eddie Huang <eddie.huang@mediatek.com> >>>> >>>> Add scp node to mt8183 and mt8183-evb >>>> >>>> Signed-off-by: Erin Lo <erin.lo@mediatek.com> >>>> Signed-off-by: Pi-Hsun Shih <pihsun@chromium.org> >>>> Signed-off-by: Eddie Huang <eddie.huang@mediatek.com> >>> >>> Sorry I somehow oversaw this. Next time please don't doubt to ping me. >>> >>> Bjorn, do I understand correctly that you don't send emails to the list >>> informing of the inclusion of a patch/series in your tree? >>> >>> Anyway applied now to v5.9-next/dts64 :) >> >> arm64 build dtbs failed on linux next 20200902. > Sorry I was on vacation. > I just hit it as well... I wish the kernel was built after applying > patches... it would make the next a better place. > Right... I'll remove the patch now until this is fixed. Once again sorry for the trouble. Regards, Matthias
On 12/11/2019 12:03, Pi-Hsun Shih wrote: > From: Eddie Huang <eddie.huang@mediatek.com> > > Add scp node to mt8183 and mt8183-evb > > Signed-off-by: Erin Lo <erin.lo@mediatek.com> > Signed-off-by: Pi-Hsun Shih <pihsun@chromium.org> > Signed-off-by: Eddie Huang <eddie.huang@mediatek.com> Applied again to v5.9-next/dts64 Thanks! > --- > Changes from v20 ... v14: > - No change. > > Changes from v13: > - Change the size of the cfg register region. > > Changes from v12 ... v10: > - No change. > > Changes from v9: > - Remove extra reserve-memory-vpu_share node. > > Changes from v8: > - New patch. > --- > arch/arm64/boot/dts/mediatek/mt8183-evb.dts | 11 +++++++++++ > arch/arm64/boot/dts/mediatek/mt8183.dtsi | 12 ++++++++++++ > 2 files changed, 23 insertions(+) > > diff --git a/arch/arm64/boot/dts/mediatek/mt8183-evb.dts b/arch/arm64/boot/dts/mediatek/mt8183-evb.dts > index 1fb195c683c3..ddb7a7ac9655 100644 > --- a/arch/arm64/boot/dts/mediatek/mt8183-evb.dts > +++ b/arch/arm64/boot/dts/mediatek/mt8183-evb.dts > @@ -24,6 +24,17 @@ memory@40000000 { > chosen { > stdout-path = "serial0:921600n8"; > }; > + > + reserved-memory { > + #address-cells = <2>; > + #size-cells = <2>; > + ranges; > + scp_mem_reserved: scp_mem_region { > + compatible = "shared-dma-pool"; > + reg = <0 0x50000000 0 0x2900000>; > + no-map; > + }; > + }; > }; > > &auxadc { > diff --git a/arch/arm64/boot/dts/mediatek/mt8183.dtsi b/arch/arm64/boot/dts/mediatek/mt8183.dtsi > index 10b32471bc7b..e582f5e6691d 100644 > --- a/arch/arm64/boot/dts/mediatek/mt8183.dtsi > +++ b/arch/arm64/boot/dts/mediatek/mt8183.dtsi > @@ -269,6 +269,18 @@ pwrap: pwrap@1000d000 { > clock-names = "spi", "wrap"; > }; > > + scp: scp@10500000 { > + compatible = "mediatek,mt8183-scp"; > + reg = <0 0x10500000 0 0x80000>, > + <0 0x105c0000 0 0x19080>; > + reg-names = "sram", "cfg"; > + interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&infracfg CLK_INFRA_SCPSYS>; > + clock-names = "main"; > + memory-region = <&scp_mem_reserved>; > + status = "disabled"; > + }; > + > systimer: timer@10017000 { > compatible = "mediatek,mt8183-timer", > "mediatek,mt6765-timer"; >
diff --git a/arch/arm64/boot/dts/mediatek/mt8183-evb.dts b/arch/arm64/boot/dts/mediatek/mt8183-evb.dts index 1fb195c683c3..ddb7a7ac9655 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183-evb.dts +++ b/arch/arm64/boot/dts/mediatek/mt8183-evb.dts @@ -24,6 +24,17 @@ memory@40000000 { chosen { stdout-path = "serial0:921600n8"; }; + + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + scp_mem_reserved: scp_mem_region { + compatible = "shared-dma-pool"; + reg = <0 0x50000000 0 0x2900000>; + no-map; + }; + }; }; &auxadc { diff --git a/arch/arm64/boot/dts/mediatek/mt8183.dtsi b/arch/arm64/boot/dts/mediatek/mt8183.dtsi index 10b32471bc7b..e582f5e6691d 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8183.dtsi @@ -269,6 +269,18 @@ pwrap: pwrap@1000d000 { clock-names = "spi", "wrap"; }; + scp: scp@10500000 { + compatible = "mediatek,mt8183-scp"; + reg = <0 0x10500000 0 0x80000>, + <0 0x105c0000 0 0x19080>; + reg-names = "sram", "cfg"; + interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&infracfg CLK_INFRA_SCPSYS>; + clock-names = "main"; + memory-region = <&scp_mem_reserved>; + status = "disabled"; + }; + systimer: timer@10017000 { compatible = "mediatek,mt8183-timer", "mediatek,mt6765-timer";