accel/ivpu: Fix swapped register names in pwr_island_drive functions
Karol Wachowski
maintainerPATCH 1/1 accel/ivpu: Fix swapped register names in pwr_island_drive functions
pwr_island_drive_37xx and pwr_island_drive_40xx functions had incorrectly swapped registers definitions. Bug is purely cosmetic as those registers have exactly same offsets and layout in both 37XX and 40XX.
--- drivers/accel/ivpu/ivpu_hw_ip.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/accel/ivpu/ivpu_hw_ip.c +8 -8
@@ -308,26 +308,26 @@ static void pwr_island_trickle_drive_40xx(struct ivpu_device *vdev, bool enable)static void pwr_island_drive_37xx (struct ivpu_device *vdev,bool enable) { -u32 val =REGV_RD32 (VPU_40XX_HOST_SS_AON_PWR_ISLAND_EN0 ); +u32 val =REGV_RD32 (VPU_37XX_HOST_SS_AON_PWR_ISLAND_EN0 );if (enable) - val =REG_SET_FLD (VPU_40XX_HOST_SS_AON_PWR_ISLAND_EN0 ,CSS_CPU , val); + val =REG_SET_FLD (VPU_37XX_HOST_SS_AON_PWR_ISLAND_EN0 ,MSS_CPU , val);else - val =REG_CLR_FLD (VPU_40XX_HOST_SS_AON_PWR_ISLAND_EN0 ,CSS_CPU , val); + val =REG_CLR_FLD (VPU_37XX_HOST_SS_AON_PWR_ISLAND_EN0 ,MSS_CPU , val); -REGV_WR32 (VPU_40XX_HOST_SS_AON_PWR_ISLAND_EN0 , val); +REGV_WR32 (VPU_37XX_HOST_SS_AON_PWR_ISLAND_EN0 , val); }static void pwr_island_drive_40xx (struct ivpu_device *vdev,bool enable) { -u32 val =REGV_RD32 (VPU_37XX_HOST_SS_AON_PWR_ISLAND_EN0 ); +u32 val =REGV_RD32 (VPU_40XX_HOST_SS_AON_PWR_ISLAND_EN0 );if (enable) - val =REG_SET_FLD (VPU_37XX_HOST_SS_AON_PWR_ISLAND_EN0 ,MSS_CPU , val); + val =REG_SET_FLD (VPU_40XX_HOST_SS_AON_PWR_ISLAND_EN0 ,CSS_CPU , val);else - val =REG_CLR_FLD (VPU_37XX_HOST_SS_AON_PWR_ISLAND_EN0 ,MSS_CPU , val); + val =REG_CLR_FLD (VPU_40XX_HOST_SS_AON_PWR_ISLAND_EN0 ,CSS_CPU , val); -REGV_WR32 (VPU_37XX_HOST_SS_AON_PWR_ISLAND_EN0 , val); +REGV_WR32 (VPU_40XX_HOST_SS_AON_PWR_ISLAND_EN0 , val); }static void pwr_island_enable (struct ivpu_device *vdev)
Signature · 1 line
2.43.0
Quoted 38 lines · Karol Wachowski
pwr_island_drive_37xxandpwr_island_drive_40xxfunctions had incorrectly swapped registers definitions. Bug is purely cosmetic as those registers have exactly same offsets and layout in both 37XX and 40XX.Signed-off-by Karol Wachowski <[email protected]>--- drivers/accel/ivpu/ivpu_hw_ip.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)drivers/accel/ivpu/ivpu_hw_ip.c +5
-6@@ -308,26 +308,26 @@ static void pwr_island_trickle_drive_40xx(struct ivpu_device *vdev, bool enable)static void pwr_island_drive_37xx (struct ivpu_device *vdev,bool enable) { -u32 val =REGV_RD32 (VPU_40XX_HOST_SS_AON_PWR_ISLAND_EN0 ); +u32 val =REGV_RD32 (VPU_37XX_HOST_SS_AON_PWR_ISLAND_EN0 );if (enable) - val =REG_SET_FLD (VPU_40XX_HOST_SS_AON_PWR_ISLAND_EN0 ,CSS_CPU , val); + val =REG_SET_FLD (VPU_37XX_HOST_SS_AON_PWR_ISLAND_EN0 ,MSS_CPU , val);else - val =REG_CLR_FLD (VPU_40XX_HOST_SS_AON_PWR_ISLAND_EN0 ,CSS_CPU , val); + val =REG_CLR_FLD (VPU_37XX_HOST_SS_AON_PWR_ISLAND_EN0 ,MSS_CPU , val); -REGV_WR32 (VPU_40XX_HOST_SS_AON_PWR_ISLAND_EN0 , val); +REGV_WR32 (VPU_37XX_HOST_SS_AON_PWR_ISLAND_EN0 , val); }static void pwr_island_drive_40xx (struct ivpu_device *vdev,bool enable) { -u32 val =REGV_RD32 (VPU_37XX_HOST_SS_AON_PWR_ISLAND_EN0 ); +u32 val =REGV_RD32 (VPU_40XX_HOST_SS_AON_PWR_ISLAND_EN0 );if (enable) - val =REG_SET_FLD (VPU_37XX_HOST_SS_AON_PWR_ISLAND_EN0 ,MSS_CPU , val);
drivers/accel/ivpu/ivpu_hw_ip.c static void pwr_island_trickle_drive_40xx(struct ivpu_device *vdev, bool enable) · line 333
Quoted 10 lines
drivers/accel/ivpu/ivpu_hw_ip.c +3
-2+ val =REG_SET_FLD (VPU_40XX_HOST_SS_AON_PWR_ISLAND_EN0 ,CSS_CPU , val); else - val =REG_CLR_FLD (VPU_37XX_HOST_SS_AON_PWR_ISLAND_EN0 ,MSS_CPU , val); + val =REG_CLR_FLD (VPU_40XX_HOST_SS_AON_PWR_ISLAND_EN0 ,CSS_CPU , val); -REGV_WR32 (VPU_37XX_HOST_SS_AON_PWR_ISLAND_EN0 , val); +REGV_WR32 (VPU_40XX_HOST_SS_AON_PWR_ISLAND_EN0 , val); }static void pwr_island_enable (struct ivpu_device *vdev)
Quoted 48 lines · Andrzej Kacprowski
Quoted 47 lines · Karol Wachowski
pwr_island_drive_37xxandpwr_island_drive_40xxfunctions had incorrectly swapped registers definitions. Bug is purely cosmetic as those registers have exactly same offsets and layout in both 37XX and 40XX.Signed-off-by Karol Wachowski <[email protected]>---
drivers/accel/ivpu/ivpu_hw_ip.c| 16 ++++++++--------1 file changed, 8 insertions(+), 8 deletions(-)drivers/accel/ivpu/ renamed from drivers/accel/ivpu/ivpu_hw_ip.c +0
-0
ivpu_hw_ip.c
index37f95a0551ed..81f0b1f8f5a6100644drivers/accel/ivpu/ivpu_hw_ip.c +0
-0@@ -308,26 +308,26 @@ static void pwr_island_trickle_drive_40xx(struct ivpu_device *vdev, bool enable)static void
pwr_island_drive_37xx(struct ivpu_device *vdev, bool enable)
{
- u32 val =REGV_RD32(VPU_40XX_HOST_SS_AON_PWR_ISLAND_EN0); + u32 val =REGV_RD32(VPU_37XX_HOST_SS_AON_PWR_ISLAND_EN0); if (enable)
- val =REG_SET_FLD(VPU_40XX_HOST_SS_AON_PWR_ISLAND_EN0, CSS_CPU, val);
+ val =REG_SET_FLD(VPU_37XX_HOST_SS_AON_PWR_ISLAND_EN0, MSS_CPU, val);
else
- val =REG_CLR_FLD(VPU_40XX_HOST_SS_AON_PWR_ISLAND_EN0, CSS_CPU, val);
+ val =REG_CLR_FLD(VPU_37XX_HOST_SS_AON_PWR_ISLAND_EN0, MSS_CPU, val);
-REGV_WR32(VPU_40XX_HOST_SS_AON_PWR_ISLAND_EN0, val); +REGV_WR32(VPU_37XX_HOST_SS_AON_PWR_ISLAND_EN0, val); }
static voidpwr_island_drive_40xx(struct ivpu_device *vdev, bool enable)
{
- u32 val =REGV_RD32(VPU_37XX_HOST_SS_AON_PWR_ISLAND_EN0); + u32 val =REGV_RD32(VPU_40XX_HOST_SS_AON_PWR_ISLAND_EN0); if (enable)
- val =REG_SET_FLD(VPU_37XX_HOST_SS_AON_PWR_ISLAND_EN0, MSS_CPU, val);
+ val =REG_SET_FLD(VPU_40XX_HOST_SS_AON_PWR_ISLAND_EN0, CSS_CPU, val);
else
- val =REG_CLR_FLD(VPU_37XX_HOST_SS_AON_PWR_ISLAND_EN0, MSS_CPU, val);
Quoted 8 lines
Quoted 6 lines
+ val =
REG_CLR_FLD(VPU_40XX_HOST_SS_AON_PWR_ISLAND_EN0, CSS_CPU, val);
-REGV_WR32(VPU_37XX_HOST_SS_AON_PWR_ISLAND_EN0, val); +REGV_WR32(VPU_40XX_HOST_SS_AON_PWR_ISLAND_EN0, val); }
static voidpwr_island_enable(struct ivpu_device *vdev)Reviewed-by Andrzej Kacprowski <[email protected]>
Thank you, applied to drm-misc-next.
Karol