Skip to content

Commit 95b714b

Browse files
Ketan Patilkrzk
authored andcommitted
memory: tegra: Group register and fields
The current register definitions are not in sorted order. Sort these registers according to their address. Put bit fields and masks of the corresponding registers below the register definitions to clearly identify which fields belongs to which registers. Signed-off-by: Ketan Patil <ketanp@nvidia.com> Reviewed-by: Jon Hunter <jonathanh@nvidia.com> Tested-by: Jon Hunter <jonathanh@nvidia.com> Link: https://patch.msgid.link/20260226163115.1152181-3-ketanp@nvidia.com Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
1 parent b8a177f commit 95b714b

1 file changed

Lines changed: 33 additions & 29 deletions

File tree

  • drivers/memory/tegra

drivers/memory/tegra/mc.h

Lines changed: 33 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,35 @@
1313
#include <soc/tegra/mc.h>
1414

1515
#define MC_INTSTATUS 0x00
16+
/* Bit field of MC_INTSTATUS register */
17+
#define MC_INT_DECERR_EMEM BIT(6)
18+
#define MC_INT_INVALID_GART_PAGE BIT(7)
19+
#define MC_INT_SECURITY_VIOLATION BIT(8)
20+
#define MC_INT_ARBITRATION_EMEM BIT(9)
21+
#define MC_INT_INVALID_SMMU_PAGE BIT(10)
22+
#define MC_INT_INVALID_APB_ASID_UPDATE BIT(11)
23+
#define MC_INT_DECERR_VPR BIT(12)
24+
#define MC_INT_SECERR_SEC BIT(13)
25+
#define MC_INT_DECERR_MTS BIT(16)
26+
#define MC_INT_DECERR_GENERALIZED_CARVEOUT BIT(17)
27+
#define MC_INT_DECERR_ROUTE_SANITY BIT(20)
28+
1629
#define MC_INTMASK 0x04
1730
#define MC_GART_ERROR_REQ 0x30
1831
#define MC_EMEM_ADR_CFG 0x54
32+
#define MC_EMEM_ADR_CFG_EMEM_NUMDEV BIT(0)
33+
1934
#define MC_DECERR_EMEM_OTHERS_STATUS 0x58
2035
#define MC_SECURITY_VIOLATION_STATUS 0x74
2136
#define MC_EMEM_ARB_CFG 0x90
37+
#define MC_EMEM_ARB_CFG_CYCLES_PER_UPDATE(x) ((x) & 0x1ff)
38+
#define MC_EMEM_ARB_CFG_CYCLES_PER_UPDATE_MASK 0x1ff
39+
2240
#define MC_EMEM_ARB_OUTSTANDING_REQ 0x94
41+
#define MC_EMEM_ARB_OUTSTANDING_REQ_HOLDOFF_OVERRIDE BIT(30)
42+
#define MC_EMEM_ARB_OUTSTANDING_REQ_LIMIT_ENABLE BIT(31)
43+
#define MC_EMEM_ARB_OUTSTANDING_REQ_MAX_MASK 0x1ff
44+
2345
#define MC_EMEM_ARB_TIMING_RCD 0x98
2446
#define MC_EMEM_ARB_TIMING_RP 0x9c
2547
#define MC_EMEM_ARB_TIMING_RC 0xa0
@@ -39,45 +61,27 @@
3961
#define MC_EMEM_ARB_MISC1 0xdc
4062
#define MC_EMEM_ARB_RING1_THROTTLE 0xe0
4163
#define MC_EMEM_ARB_OVERRIDE 0xe8
64+
#define MC_EMEM_ARB_OVERRIDE_EACK_MASK 0x3
65+
4266
#define MC_TIMING_CONTROL_DBG 0xf8
4367
#define MC_TIMING_CONTROL 0xfc
68+
#define MC_TIMING_UPDATE BIT(0)
69+
4470
#define MC_GLOBAL_INTSTATUS 0xf24
4571

46-
#define MC_INT_DECERR_ROUTE_SANITY BIT(20)
47-
#define MC_INT_DECERR_GENERALIZED_CARVEOUT BIT(17)
48-
#define MC_INT_DECERR_MTS BIT(16)
49-
#define MC_INT_SECERR_SEC BIT(13)
50-
#define MC_INT_DECERR_VPR BIT(12)
51-
#define MC_INT_INVALID_APB_ASID_UPDATE BIT(11)
52-
#define MC_INT_INVALID_SMMU_PAGE BIT(10)
53-
#define MC_INT_ARBITRATION_EMEM BIT(9)
54-
#define MC_INT_SECURITY_VIOLATION BIT(8)
55-
#define MC_INT_INVALID_GART_PAGE BIT(7)
56-
#define MC_INT_DECERR_EMEM BIT(6)
72+
/* Bit field of MC_ERR_STATUS_0 register */
73+
#define MC_ERR_STATUS_RW BIT(16)
74+
#define MC_ERR_STATUS_SECURITY BIT(17)
75+
#define MC_ERR_STATUS_NONSECURE BIT(25)
76+
#define MC_ERR_STATUS_WRITABLE BIT(26)
77+
#define MC_ERR_STATUS_READABLE BIT(27)
5778

5879
#define MC_ERR_STATUS_TYPE_SHIFT 28
5980
#define MC_ERR_STATUS_TYPE_INVALID_SMMU_PAGE (0x6 << 28)
6081
#define MC_ERR_STATUS_TYPE_MASK (0x7 << 28)
61-
#define MC_ERR_STATUS_READABLE BIT(27)
62-
#define MC_ERR_STATUS_WRITABLE BIT(26)
63-
#define MC_ERR_STATUS_NONSECURE BIT(25)
82+
6483
#define MC_ERR_STATUS_ADR_HI_SHIFT 20
6584
#define MC_ERR_STATUS_ADR_HI_MASK 0x3
66-
#define MC_ERR_STATUS_SECURITY BIT(17)
67-
#define MC_ERR_STATUS_RW BIT(16)
68-
69-
#define MC_EMEM_ADR_CFG_EMEM_NUMDEV BIT(0)
70-
71-
#define MC_EMEM_ARB_CFG_CYCLES_PER_UPDATE(x) ((x) & 0x1ff)
72-
#define MC_EMEM_ARB_CFG_CYCLES_PER_UPDATE_MASK 0x1ff
73-
74-
#define MC_EMEM_ARB_OUTSTANDING_REQ_MAX_MASK 0x1ff
75-
#define MC_EMEM_ARB_OUTSTANDING_REQ_HOLDOFF_OVERRIDE BIT(30)
76-
#define MC_EMEM_ARB_OUTSTANDING_REQ_LIMIT_ENABLE BIT(31)
77-
78-
#define MC_EMEM_ARB_OVERRIDE_EACK_MASK 0x3
79-
80-
#define MC_TIMING_UPDATE BIT(0)
8185

8286
#define MC_BROADCAST_CHANNEL ~0
8387

0 commit comments

Comments
 (0)