Skip to content

Commit 902fbbf

Browse files
superm1alexdeucher
authored andcommitted
drm/amd: Add some missing straps from NBIO 7.11.0
Earlier ASICs have strap information exported, and this is missing for NBIO 7.11.0. Cc: [email protected] Reviewed-by: Alex Deucher <[email protected]> Fixes: ca8c681 ("drm/amdgpu: add nbio 7.11 registers") Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mario Limonciello <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 1c1929d commit 902fbbf

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed

drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_11_0_offset.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7571,6 +7571,8 @@
75717571
// base address: 0x10100000
75727572
#define regRCC_STRAP0_RCC_DEV0_EPF0_STRAP0 0xd000
75737573
#define regRCC_STRAP0_RCC_DEV0_EPF0_STRAP0_BASE_IDX 5
7574+
#define regRCC_DEV0_EPF5_STRAP4 0xd284
7575+
#define regRCC_DEV0_EPF5_STRAP4_BASE_IDX 5
75747576

75757577

75767578
// addressBlock: nbio_nbif0_bif_rst_bif_rst_regblk

drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_11_0_sh_mask.h

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50665,6 +50665,19 @@
5066550665
#define RCC_STRAP0_RCC_DEV0_EPF0_STRAP0__STRAP_D1_SUPPORT_DEV0_F0_MASK 0x40000000L
5066650666
#define RCC_STRAP0_RCC_DEV0_EPF0_STRAP0__STRAP_D2_SUPPORT_DEV0_F0_MASK 0x80000000L
5066750667

50668+
//RCC_DEV0_EPF5_STRAP4
50669+
#define RCC_DEV0_EPF5_STRAP4__STRAP_ATOMIC_64BIT_EN_DEV0_F5__SHIFT 0x14
50670+
#define RCC_DEV0_EPF5_STRAP4__STRAP_ATOMIC_EN_DEV0_F5__SHIFT 0x15
50671+
#define RCC_DEV0_EPF5_STRAP4__STRAP_FLR_EN_DEV0_F5__SHIFT 0x16
50672+
#define RCC_DEV0_EPF5_STRAP4__STRAP_PME_SUPPORT_DEV0_F5__SHIFT 0x17
50673+
#define RCC_DEV0_EPF5_STRAP4__STRAP_INTERRUPT_PIN_DEV0_F5__SHIFT 0x1c
50674+
#define RCC_DEV0_EPF5_STRAP4__STRAP_AUXPWR_SUPPORT_DEV0_F5__SHIFT 0x1f
50675+
#define RCC_DEV0_EPF5_STRAP4__STRAP_ATOMIC_64BIT_EN_DEV0_F5_MASK 0x00100000L
50676+
#define RCC_DEV0_EPF5_STRAP4__STRAP_ATOMIC_EN_DEV0_F5_MASK 0x00200000L
50677+
#define RCC_DEV0_EPF5_STRAP4__STRAP_FLR_EN_DEV0_F5_MASK 0x00400000L
50678+
#define RCC_DEV0_EPF5_STRAP4__STRAP_PME_SUPPORT_DEV0_F5_MASK 0x0F800000L
50679+
#define RCC_DEV0_EPF5_STRAP4__STRAP_INTERRUPT_PIN_DEV0_F5_MASK 0x70000000L
50680+
#define RCC_DEV0_EPF5_STRAP4__STRAP_AUXPWR_SUPPORT_DEV0_F5_MASK 0x80000000L
5066850681

5066950682
// addressBlock: nbio_nbif0_bif_rst_bif_rst_regblk
5067050683
//HARD_RST_CTRL

0 commit comments

Comments
 (0)