| Message ID | 20200815181957.408649-1-martin.blumenstingl@googlemail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 407d3c7da97bf10a7246a463ca45ab848205f00f |
| Headers | show |
| Series | [RESEND,v1] ARM: dts: meson8: remove two invalid interrupt lines from the GPU node | expand |
On Sat, Aug 15, 2020 at 8:20 PM Martin Blumenstingl <martin.blumenstingl@googlemail.com> wrote: > > The 3.10 vendor kernel defines the following GPU 20 interrupt lines: > #define INT_MALI_GP AM_IRQ(160) > #define INT_MALI_GP_MMU AM_IRQ(161) > #define INT_MALI_PP AM_IRQ(162) > #define INT_MALI_PMU AM_IRQ(163) > #define INT_MALI_PP0 AM_IRQ(164) > #define INT_MALI_PP0_MMU AM_IRQ(165) > #define INT_MALI_PP1 AM_IRQ(166) > #define INT_MALI_PP1_MMU AM_IRQ(167) > #define INT_MALI_PP2 AM_IRQ(168) > #define INT_MALI_PP2_MMU AM_IRQ(169) > #define INT_MALI_PP3 AM_IRQ(170) > #define INT_MALI_PP3_MMU AM_IRQ(171) > #define INT_MALI_PP4 AM_IRQ(172) > #define INT_MALI_PP4_MMU AM_IRQ(173) > #define INT_MALI_PP5 AM_IRQ(174) > #define INT_MALI_PP5_MMU AM_IRQ(175) > #define INT_MALI_PP6 AM_IRQ(176) > #define INT_MALI_PP6_MMU AM_IRQ(177) > #define INT_MALI_PP7 AM_IRQ(178) > #define INT_MALI_PP7_MMU AM_IRQ(179) > > However, the driver from the 3.10 vendor kernel does not use the > following four interrupt lines: > - INT_MALI_PP3 > - INT_MALI_PP3_MMU > - INT_MALI_PP7 > - INT_MALI_PP7_MMU > > Drop the "pp3" and "ppmmu3" interrupt lines. This is also important > because there is no matching entry in interrupt-names for it (meaning > the "pp2" interrupt is actually assigned to the "pp3" interrupt line). > > Fixes: 7d3f6b536e72c9 ("ARM: dts: meson8: add the Mali-450 MP6 GPU") > Reported-by: Thomas Graichen <thomas.graichen@gmail.com> > Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Tested-by: thomas graichen <thomas.graichen@gmail.com> sorry - looks like i missed this one > --- > re-send of v1 from [0] because it was never picked up > > > [0] https://patchwork.kernel.org/patch/11582619/ > > > arch/arm/boot/dts/meson8.dtsi | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/arch/arm/boot/dts/meson8.dtsi b/arch/arm/boot/dts/meson8.dtsi > index 277c0bb10453..04688e8abce2 100644 > --- a/arch/arm/boot/dts/meson8.dtsi > +++ b/arch/arm/boot/dts/meson8.dtsi > @@ -240,8 +240,6 @@ mali: gpu@c0000 { > <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>, > <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>, > <GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>, > - <GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>, > - <GIC_SPI 171 IRQ_TYPE_LEVEL_HIGH>, > <GIC_SPI 172 IRQ_TYPE_LEVEL_HIGH>, > <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>, > <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>, > -- > 2.28.0 >
On 15/08/2020 20:19, Martin Blumenstingl wrote: > The 3.10 vendor kernel defines the following GPU 20 interrupt lines: > #define INT_MALI_GP AM_IRQ(160) > #define INT_MALI_GP_MMU AM_IRQ(161) > #define INT_MALI_PP AM_IRQ(162) > #define INT_MALI_PMU AM_IRQ(163) > #define INT_MALI_PP0 AM_IRQ(164) > #define INT_MALI_PP0_MMU AM_IRQ(165) > #define INT_MALI_PP1 AM_IRQ(166) > #define INT_MALI_PP1_MMU AM_IRQ(167) > #define INT_MALI_PP2 AM_IRQ(168) > #define INT_MALI_PP2_MMU AM_IRQ(169) > #define INT_MALI_PP3 AM_IRQ(170) > #define INT_MALI_PP3_MMU AM_IRQ(171) > #define INT_MALI_PP4 AM_IRQ(172) > #define INT_MALI_PP4_MMU AM_IRQ(173) > #define INT_MALI_PP5 AM_IRQ(174) > #define INT_MALI_PP5_MMU AM_IRQ(175) > #define INT_MALI_PP6 AM_IRQ(176) > #define INT_MALI_PP6_MMU AM_IRQ(177) > #define INT_MALI_PP7 AM_IRQ(178) > #define INT_MALI_PP7_MMU AM_IRQ(179) > > However, the driver from the 3.10 vendor kernel does not use the > following four interrupt lines: > - INT_MALI_PP3 > - INT_MALI_PP3_MMU > - INT_MALI_PP7 > - INT_MALI_PP7_MMU > > Drop the "pp3" and "ppmmu3" interrupt lines. This is also important > because there is no matching entry in interrupt-names for it (meaning > the "pp2" interrupt is actually assigned to the "pp3" interrupt line). > > Fixes: 7d3f6b536e72c9 ("ARM: dts: meson8: add the Mali-450 MP6 GPU") > Reported-by: Thomas Graichen <thomas.graichen@gmail.com> > Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> > --- > re-send of v1 from [0] because it was never picked up > > > [0] https://patchwork.kernel.org/patch/11582619/ > > > arch/arm/boot/dts/meson8.dtsi | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/arch/arm/boot/dts/meson8.dtsi b/arch/arm/boot/dts/meson8.dtsi > index 277c0bb10453..04688e8abce2 100644 > --- a/arch/arm/boot/dts/meson8.dtsi > +++ b/arch/arm/boot/dts/meson8.dtsi > @@ -240,8 +240,6 @@ mali: gpu@c0000 { > <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>, > <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>, > <GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>, > - <GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>, > - <GIC_SPI 171 IRQ_TYPE_LEVEL_HIGH>, > <GIC_SPI 172 IRQ_TYPE_LEVEL_HIGH>, > <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>, > <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>, > Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
Martin Blumenstingl <martin.blumenstingl@googlemail.com> writes: > The 3.10 vendor kernel defines the following GPU 20 interrupt lines: > #define INT_MALI_GP AM_IRQ(160) > #define INT_MALI_GP_MMU AM_IRQ(161) > #define INT_MALI_PP AM_IRQ(162) > #define INT_MALI_PMU AM_IRQ(163) > #define INT_MALI_PP0 AM_IRQ(164) > #define INT_MALI_PP0_MMU AM_IRQ(165) > #define INT_MALI_PP1 AM_IRQ(166) > #define INT_MALI_PP1_MMU AM_IRQ(167) > #define INT_MALI_PP2 AM_IRQ(168) > #define INT_MALI_PP2_MMU AM_IRQ(169) > #define INT_MALI_PP3 AM_IRQ(170) > #define INT_MALI_PP3_MMU AM_IRQ(171) > #define INT_MALI_PP4 AM_IRQ(172) > #define INT_MALI_PP4_MMU AM_IRQ(173) > #define INT_MALI_PP5 AM_IRQ(174) > #define INT_MALI_PP5_MMU AM_IRQ(175) > #define INT_MALI_PP6 AM_IRQ(176) > #define INT_MALI_PP6_MMU AM_IRQ(177) > #define INT_MALI_PP7 AM_IRQ(178) > #define INT_MALI_PP7_MMU AM_IRQ(179) > > However, the driver from the 3.10 vendor kernel does not use the > following four interrupt lines: > - INT_MALI_PP3 > - INT_MALI_PP3_MMU > - INT_MALI_PP7 > - INT_MALI_PP7_MMU > > Drop the "pp3" and "ppmmu3" interrupt lines. This is also important > because there is no matching entry in interrupt-names for it (meaning > the "pp2" interrupt is actually assigned to the "pp3" interrupt line). > > Fixes: 7d3f6b536e72c9 ("ARM: dts: meson8: add the Mali-450 MP6 GPU") > Reported-by: Thomas Graichen <thomas.graichen@gmail.com> > Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> > --- > re-send of v1 from [0] because it was never picked up Oops, sorry this fell through the cracks. Now Queued for v5.9-rc1. Kevin
On Sat, 15 Aug 2020 20:19:57 +0200, Martin Blumenstingl wrote: > The 3.10 vendor kernel defines the following GPU 20 interrupt lines: > #define INT_MALI_GP AM_IRQ(160) > #define INT_MALI_GP_MMU AM_IRQ(161) > #define INT_MALI_PP AM_IRQ(162) > #define INT_MALI_PMU AM_IRQ(163) > #define INT_MALI_PP0 AM_IRQ(164) > #define INT_MALI_PP0_MMU AM_IRQ(165) > #define INT_MALI_PP1 AM_IRQ(166) > #define INT_MALI_PP1_MMU AM_IRQ(167) > #define INT_MALI_PP2 AM_IRQ(168) > #define INT_MALI_PP2_MMU AM_IRQ(169) > #define INT_MALI_PP3 AM_IRQ(170) > #define INT_MALI_PP3_MMU AM_IRQ(171) > #define INT_MALI_PP4 AM_IRQ(172) > #define INT_MALI_PP4_MMU AM_IRQ(173) > #define INT_MALI_PP5 AM_IRQ(174) > #define INT_MALI_PP5_MMU AM_IRQ(175) > #define INT_MALI_PP6 AM_IRQ(176) > #define INT_MALI_PP6_MMU AM_IRQ(177) > #define INT_MALI_PP7 AM_IRQ(178) > #define INT_MALI_PP7_MMU AM_IRQ(179) > > [...] Applied, thanks! [1/1] ARM: dts: meson8: remove two invalid interrupt lines from the GPU node commit: b468412409c0e5752ad3396b147cac563ff8dd3b Best regards,
Hi Kevin, On Mon, Aug 24, 2020 at 11:16 PM Kevin Hilman <khilman@baylibre.com> wrote: [...] > Applied, thanks! > > [1/1] ARM: dts: meson8: remove two invalid interrupt lines from the GPU node > commit: b468412409c0e5752ad3396b147cac563ff8dd3b this one still seems to be sitting in the v5.9/fixes branch I don't see a reason to rush this, so can you please queue it up for v5.10/fixes? Thank you! Martin
Martin Blumenstingl <martin.blumenstingl@googlemail.com> writes: > Hi Kevin, > > On Mon, Aug 24, 2020 at 11:16 PM Kevin Hilman <khilman@baylibre.com> wrote: > [...] >> Applied, thanks! >> >> [1/1] ARM: dts: meson8: remove two invalid interrupt lines from the GPU node >> commit: b468412409c0e5752ad3396b147cac563ff8dd3b > this one still seems to be sitting in the v5.9/fixes branch > I don't see a reason to rush this, so can you please queue it up for > v5.10/fixes? Yes, sorry this one slipped through the cracks. Kevin
diff --git a/arch/arm/boot/dts/meson8.dtsi b/arch/arm/boot/dts/meson8.dtsi index 277c0bb10453..04688e8abce2 100644 --- a/arch/arm/boot/dts/meson8.dtsi +++ b/arch/arm/boot/dts/meson8.dtsi @@ -240,8 +240,6 @@ mali: gpu@c0000 { <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 171 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 172 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>,
The 3.10 vendor kernel defines the following GPU 20 interrupt lines: #define INT_MALI_GP AM_IRQ(160) #define INT_MALI_GP_MMU AM_IRQ(161) #define INT_MALI_PP AM_IRQ(162) #define INT_MALI_PMU AM_IRQ(163) #define INT_MALI_PP0 AM_IRQ(164) #define INT_MALI_PP0_MMU AM_IRQ(165) #define INT_MALI_PP1 AM_IRQ(166) #define INT_MALI_PP1_MMU AM_IRQ(167) #define INT_MALI_PP2 AM_IRQ(168) #define INT_MALI_PP2_MMU AM_IRQ(169) #define INT_MALI_PP3 AM_IRQ(170) #define INT_MALI_PP3_MMU AM_IRQ(171) #define INT_MALI_PP4 AM_IRQ(172) #define INT_MALI_PP4_MMU AM_IRQ(173) #define INT_MALI_PP5 AM_IRQ(174) #define INT_MALI_PP5_MMU AM_IRQ(175) #define INT_MALI_PP6 AM_IRQ(176) #define INT_MALI_PP6_MMU AM_IRQ(177) #define INT_MALI_PP7 AM_IRQ(178) #define INT_MALI_PP7_MMU AM_IRQ(179) However, the driver from the 3.10 vendor kernel does not use the following four interrupt lines: - INT_MALI_PP3 - INT_MALI_PP3_MMU - INT_MALI_PP7 - INT_MALI_PP7_MMU Drop the "pp3" and "ppmmu3" interrupt lines. This is also important because there is no matching entry in interrupt-names for it (meaning the "pp2" interrupt is actually assigned to the "pp3" interrupt line). Fixes: 7d3f6b536e72c9 ("ARM: dts: meson8: add the Mali-450 MP6 GPU") Reported-by: Thomas Graichen <thomas.graichen@gmail.com> Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> --- re-send of v1 from [0] because it was never picked up [0] https://patchwork.kernel.org/patch/11582619/ arch/arm/boot/dts/meson8.dtsi | 2 -- 1 file changed, 2 deletions(-)