diff options
| author | Reza Arbab <arbab@linux.ibm.com> | 2018-08-01 15:01:17 -0500 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.ibm.com> | 2018-08-06 03:00:59 -0500 |
| commit | f43465a0ac6da0e2f120c227e103497cb35cc8c4 (patch) | |
| tree | 5edde6d079f86d2557beb19aa609246fcb35c285 | |
| parent | 06e9970099459ad01f3cb4456baf94093165a183 (diff) | |
| download | skiboot-f43465a0ac6da0e2f120c227e103497cb35cc8c4.zip skiboot-f43465a0ac6da0e2f120c227e103497cb35cc8c4.tar.gz skiboot-f43465a0ac6da0e2f120c227e103497cb35cc8c4.tar.bz2 | |
npu2: Don't open code NPU2_RELAXED_ORDERING_CFG2
Make the code that initializes these registers more descriptive by
using macros instead of open coded literals. No functional change.
Signed-off-by: Reza Arbab <arbab@linux.ibm.com>
Reviewed-By: Alistair Popple <alistair@popple.id.au>
Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
| -rw-r--r-- | hw/npu2.c | 31 | ||||
| -rw-r--r-- | include/npu2-regs.h | 2 |
2 files changed, 15 insertions, 18 deletions
@@ -857,7 +857,8 @@ static void npu2_mcd_init(struct npu2 *p) static void npu2_hw_init(struct npu2 *p) { - uint64_t val; + uint64_t reg, val; + int s, b; npu2_ioda_reset(&p->phb_nvlink, false); @@ -916,6 +917,17 @@ static void npu2_hw_init(struct npu2 *p) NPU2DBG(p, "Using large memory map + MCD disabled\n"); p->gpu_map_type = GPU_MEM_4T_DOWN; } + + /* Static initialization of every relaxed-ordering cfg[2] register */ + val = NPU2_RELAXED_ORDERING_CMD_CL_RD_NC_F0 | + NPU2_RELAXED_ORDERING_SOURCE4_RDENA; + + for (s = NPU2_STACK_STCK_0; s <= NPU2_STACK_STCK_2; s++) { + for (b = NPU2_BLOCK_SM_0; b <= NPU2_BLOCK_SM_3; b++) { + reg = NPU2_REG_OFFSET(s, b, NPU2_RELAXED_ORDERING_CFG2); + npu2_write(p, reg, val); + } + } } static int64_t npu2_map_pe_dma_window_real(struct phb *phb, @@ -1416,23 +1428,6 @@ static void npu2_probe_phb(struct dt_node *dn) xscom_write_mask(gcid, 0x5011510, val, val); xscom_write_mask(gcid, 0x5011530, val, val); - /* - * Enable relaxed ordering for peer-to-peer reads - */ - val = PPC_BIT(5) | PPC_BIT(29); - xscom_write_mask(gcid, 0x501100c, val, val); - xscom_write_mask(gcid, 0x501103c, val, val); - xscom_write_mask(gcid, 0x501106c, val, val); - xscom_write_mask(gcid, 0x501109c, val, val); - xscom_write_mask(gcid, 0x501120c, val, val); - xscom_write_mask(gcid, 0x501123c, val, val); - xscom_write_mask(gcid, 0x501126c, val, val); - xscom_write_mask(gcid, 0x501129c, val, val); - xscom_write_mask(gcid, 0x501140c, val, val); - xscom_write_mask(gcid, 0x501143c, val, val); - xscom_write_mask(gcid, 0x501146c, val, val); - xscom_write_mask(gcid, 0x501149c, val, val); - val = PPC_BIT(6) | PPC_BIT(7) | PPC_BIT(11); xscom_write_mask(gcid, 0x5011009, val, PPC_BITMASK(6,11)); xscom_write_mask(gcid, 0x5011039, val, PPC_BITMASK(6,11)); diff --git a/include/npu2-regs.h b/include/npu2-regs.h index 4a17ac8..d9db988 100644 --- a/include/npu2-regs.h +++ b/include/npu2-regs.h @@ -155,6 +155,8 @@ void npu2_scom_write(uint64_t gcid, uint64_t scom_base, #define NPU2_RELAXED_ORDERING_CFG0 0x050 #define NPU2_RELAXED_ORDERING_CFG1 0x058 #define NPU2_RELAXED_ORDERING_CFG2 0x060 +#define NPU2_RELAXED_ORDERING_CMD_CL_RD_NC_F0 PPC_BIT(5) +#define NPU2_RELAXED_ORDERING_SOURCE4_RDENA PPC_BIT(29) #define NPU2_NTL0_BAR 0x068 #define NPU2_NTL1_BAR 0x070 #define NPU2_NTL_BAR_ENABLE PPC_BIT(0) |