]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
accel/ivpu: Remove boot params address setting via MMIO register
authorAndrzej Kacprowski <andrzej.kacprowski@linux.intel.com>
Thu, 5 Mar 2026 14:22:26 +0000 (15:22 +0100)
committerThomas Zimmermann <tzimmermann@suse.de>
Tue, 10 Mar 2026 12:34:31 +0000 (13:34 +0100)
The NPU 60XX uses the default boot params location specified
in the firmware image header, consistent with earlier generations.
Remove the unnecessary MMIO register write, freeing the AON register
for future use.

Fixes: 44e4c88951fa ("accel/ivpu: Implement warm boot flow for NPU6 and unify boot handling")
Signed-off-by: Andrzej Kacprowski <andrzej.kacprowski@linux.intel.com>
Reviewed-by: Karol Wachowski <karol.wachowski@linux.intel.com>
Signed-off-by: Karol Wachowski <karol.wachowski@linux.intel.com>
Link: https://patch.msgid.link/20260305142226.194995-1-andrzej.kacprowski@linux.intel.com
(cherry picked from commit 81e62e7bf8b9309bf0febdf00940818f98bc23d8)
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
drivers/accel/ivpu/ivpu_hw_40xx_reg.h
drivers/accel/ivpu/ivpu_hw_ip.c

index 421242acb184451c652f31745cf6791389cde91f..fc0ee8d637f9689e7d50fe9d9784b11d39c5b9d6 100644 (file)
 #define VPU_50XX_HOST_SS_AON_PWR_ISLAND_STATUS_DLY                     0x0003006cu
 #define VPU_50XX_HOST_SS_AON_PWR_ISLAND_STATUS_DLY_STATUS_DLY_MASK     GENMASK(7, 0)
 
-#define VPU_40XX_HOST_SS_AON_RETENTION0                                 0x0003000cu
-#define VPU_40XX_HOST_SS_AON_RETENTION1                                 0x00030010u
-#define VPU_40XX_HOST_SS_AON_RETENTION2                                 0x00030014u
-#define VPU_40XX_HOST_SS_AON_RETENTION3                                 0x00030018u
-#define VPU_40XX_HOST_SS_AON_RETENTION4                                 0x0003001cu
-
 #define VPU_40XX_HOST_SS_AON_IDLE_GEN                                  0x00030200u
 #define VPU_40XX_HOST_SS_AON_IDLE_GEN_EN_MASK                          BIT_MASK(0)
 #define VPU_40XX_HOST_SS_AON_IDLE_GEN_HW_PG_EN_MASK                    BIT_MASK(1)
index 959984c54341af11c940fd56934e38fc2226b4a6..37f95a0551eda949e90a22919d39aeea917b36f4 100644 (file)
@@ -931,7 +931,6 @@ static int soc_cpu_boot_40xx(struct ivpu_device *vdev)
 
 static int soc_cpu_boot_60xx(struct ivpu_device *vdev)
 {
-       REGV_WR64(VPU_40XX_HOST_SS_AON_RETENTION1, vdev->fw->mem_bp->vpu_addr);
        soc_cpu_set_entry_point_40xx(vdev, vdev->fw->cold_boot_entry_point);
 
        return 0;