Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/amdgpu: add defines for DF and TCP Hashing

On Arcturus, we need TC channel hashing, which is set by the
driver, to match DF hashing, which is set by VBIOS. To match
these, we plan to query the DF information and then properly
set the TC configuration bits to match them.

This patch adds the required fields to register definitions
in preparation for a future patch which will use them.

Signed-off-by: Joseph Greathouse <Joseph.Greathouse@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Joseph Greathouse and committed by
Alex Deucher
ae99fc35 bdf84a80

+17
+3
drivers/gpu/drm/amd/include/asic_reg/df/df_3_6_offset.h
··· 27 27 #define mmDF_PIE_AON0_DfGlobalClkGater 0x00fc 28 28 #define mmDF_PIE_AON0_DfGlobalClkGater_BASE_IDX 0 29 29 30 + #define mmDF_CS_UMC_AON0_DfGlobalCtrl 0x00fe 31 + #define mmDF_CS_UMC_AON0_DfGlobalCtrl_BASE_IDX 0 32 + 30 33 #define mmDF_CS_UMC_AON0_DramBaseAddress0 0x0044 31 34 #define mmDF_CS_UMC_AON0_DramBaseAddress0_BASE_IDX 0 32 35
+8
drivers/gpu/drm/amd/include/asic_reg/df/df_3_6_sh_mask.h
··· 33 33 #define DF_PIE_AON0_DfGlobalClkGater__MGCGMode__SHIFT 0x0 34 34 #define DF_PIE_AON0_DfGlobalClkGater__MGCGMode_MASK 0x0000000FL 35 35 36 + /* DF_CS_UMC_AON0_DfGlobalCtrl */ 37 + #define DF_CS_UMC_AON0_DfGlobalCtrl__GlbHashIntlvCtl64K__SHIFT 0x14 38 + #define DF_CS_UMC_AON0_DfGlobalCtrl__GlbHashIntlvCtl2M__SHIFT 0x15 39 + #define DF_CS_UMC_AON0_DfGlobalCtrl__GlbHashIntlvCtl1G__SHIFT 0x16 40 + #define DF_CS_UMC_AON0_DfGlobalCtrl__GlbHashIntlvCtl64K_MASK 0x00100000L 41 + #define DF_CS_UMC_AON0_DfGlobalCtrl__GlbHashIntlvCtl2M_MASK 0x00200000L 42 + #define DF_CS_UMC_AON0_DfGlobalCtrl__GlbHashIntlvCtl1G_MASK 0x00400000L 43 + 36 44 /* DF_CS_AON0_DramBaseAddress0 */ 37 45 #define DF_CS_UMC_AON0_DramBaseAddress0__AddrRngVal__SHIFT 0x0 38 46 #define DF_CS_UMC_AON0_DramBaseAddress0__LgcyMmioHoleEn__SHIFT 0x1
+6
drivers/gpu/drm/amd/include/asic_reg/gc/gc_9_0_sh_mask.h
··· 8739 8739 #define TCP_ADDR_CONFIG__NUM_BANKS__SHIFT 0x4 8740 8740 #define TCP_ADDR_CONFIG__COLHI_WIDTH__SHIFT 0x6 8741 8741 #define TCP_ADDR_CONFIG__RB_SPLIT_COLHI__SHIFT 0x9 8742 + #define TCP_ADDR_CONFIG__ENABLE64KHASH__SHIFT 0xb 8743 + #define TCP_ADDR_CONFIG__ENABLE2MHASH__SHIFT 0xc 8744 + #define TCP_ADDR_CONFIG__ENABLE1GHASH__SHIFT 0xd 8742 8745 #define TCP_ADDR_CONFIG__NUM_TCC_BANKS_MASK 0x0000000FL 8743 8746 #define TCP_ADDR_CONFIG__NUM_BANKS_MASK 0x00000030L 8744 8747 #define TCP_ADDR_CONFIG__COLHI_WIDTH_MASK 0x000001C0L 8745 8748 #define TCP_ADDR_CONFIG__RB_SPLIT_COLHI_MASK 0x00000200L 8749 + #define TCP_ADDR_CONFIG__ENABLE64KHASH_MASK 0x00000800L 8750 + #define TCP_ADDR_CONFIG__ENABLE2MHASH_MASK 0x00001000L 8751 + #define TCP_ADDR_CONFIG__ENABLE1GHASH_MASK 0x00002000L 8746 8752 //TCP_CREDIT 8747 8753 #define TCP_CREDIT__LFIFO_CREDIT__SHIFT 0x0 8748 8754 #define TCP_CREDIT__REQ_FIFO_CREDIT__SHIFT 0x10