diff mbox series

ARM: boot: dts: bcm2711: Fix HVS register range

Message ID 1645272475-4096-1-git-send-email-stefan.wahren@i2se.com (mailing list archive)
State Not Applicable
Headers show
Series ARM: boot: dts: bcm2711: Fix HVS register range | expand

Commit Message

Stefan Wahren Feb. 19, 2022, 12:07 p.m. UTC 
From: Maxime Ripard <maxime@cerno.tech>

While the HVS has the same context memory size in the BCM2711 than in
the previous SoCs, the range allocated to the registers doubled and it
now takes 16k + 16k, compared to 8k + 16k before.

The KMS driver will use the whole context RAM though, eventually
resulting in a pointer dereference error when we access the higher half
of the context memory since it hasn't been mapped.

Fixes: 4564363351e2 ("ARM: dts: bcm2711: Enable the display pipeline")
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
---
 arch/arm/boot/dts/bcm2711.dtsi | 1 +
 1 file changed, 1 insertion(+)

Comments

Florian Fainelli Feb. 23, 2022, 7:03 p.m. UTC | #1 
On Sat, 19 Feb 2022 13:07:55 +0100, Stefan Wahren <stefan.wahren@i2se.com> wrote:
> From: Maxime Ripard <maxime@cerno.tech>
> 
> While the HVS has the same context memory size in the BCM2711 than in
> the previous SoCs, the range allocated to the registers doubled and it
> now takes 16k + 16k, compared to 8k + 16k before.
> 
> The KMS driver will use the whole context RAM though, eventually
> resulting in a pointer dereference error when we access the higher half
> of the context memory since it hasn't been mapped.
> 
> Fixes: 4564363351e2 ("ARM: dts: bcm2711: Enable the display pipeline")
> Signed-off-by: Maxime Ripard <maxime@cerno.tech>
> Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
> ---

Applied to https://github.com/Broadcom/stblinux/commits/devicetree/fixes, thanks!
--
Florian
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi
index dff18fc..21294f7 100644
--- a/arch/arm/boot/dts/bcm2711.dtsi
+++ b/arch/arm/boot/dts/bcm2711.dtsi
@@ -290,6 +290,7 @@ 
 
 		hvs: hvs@7e400000 {
 			compatible = "brcm,bcm2711-hvs";
+			reg = <0x7e400000 0x8000>;
 			interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
 		};