From c90b11990eaa962b2b1340f6a17ae3fc48a9ee76 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Fri, 14 Jun 2019 02:08:45 +0200 Subject: [PATCH] rcar_gen3: drivers: qos: V3M: Convert mstat table to uint64_t Convert the mstat table from a complex structure to simple sequence of uint64_t values, since the structure described just that and the loop can operate over incrementing sequence of addresses just fine. Signed-off-by: Marek Vasut Change-Id: If1917605e5540a38cbd763c56fc1e677573e7066 --- .../renesas/rcar/qos/V3M/qos_init_v3m.c | 14 +- .../renesas/rcar/qos/V3M/qos_init_v3m_mstat.h | 172 +++++++++--------- 2 files changed, 90 insertions(+), 96 deletions(-) diff --git a/drivers/staging/renesas/rcar/qos/V3M/qos_init_v3m.c b/drivers/staging/renesas/rcar/qos/V3M/qos_init_v3m.c index 315813fb3..c1bd4a606 100644 --- a/drivers/staging/renesas/rcar/qos/V3M/qos_init_v3m.c +++ b/drivers/staging/renesas/rcar/qos/V3M/qos_init_v3m.c @@ -129,21 +129,15 @@ return; io_write_32(QOSCTRL_REF_ARS, 0x00330000U); /* QOSBW SRAM setting */ - { uint32_t i; for (i = 0U; i < ARRAY_SIZE(mstat_fix); i++) { - io_write_64(QOSBW_FIX_QOS_BANK0 + mstat_fix[i].addr, - mstat_fix[i].value); - io_write_64(QOSBW_FIX_QOS_BANK1 + mstat_fix[i].addr, - mstat_fix[i].value); + io_write_64(QOSBW_FIX_QOS_BANK0 + i * 8, mstat_fix[i]); + io_write_64(QOSBW_FIX_QOS_BANK1 + i * 8, mstat_fix[i]); } for (i = 0U; i < ARRAY_SIZE(mstat_be); i++) { - io_write_64(QOSBW_BE_QOS_BANK0 + mstat_be[i].addr, - mstat_be[i].value); - io_write_64(QOSBW_BE_QOS_BANK1 + mstat_be[i].addr, - mstat_be[i].value); - } + io_write_64(QOSBW_BE_QOS_BANK0 + i * 8, mstat_be[i]); + io_write_64(QOSBW_BE_QOS_BANK1 + i * 8, mstat_be[i]); } /* AXI-IF arbitration setting */ diff --git a/drivers/staging/renesas/rcar/qos/V3M/qos_init_v3m_mstat.h b/drivers/staging/renesas/rcar/qos/V3M/qos_init_v3m_mstat.h index 866324b4f..d0b7fc3d9 100644 --- a/drivers/staging/renesas/rcar/qos/V3M/qos_init_v3m_mstat.h +++ b/drivers/staging/renesas/rcar/qos/V3M/qos_init_v3m_mstat.h @@ -6,93 +6,93 @@ */ #if RCAR_QOS_TYPE == RCAR_QOS_TYPE_DEFAULT -static const mstat_slot_t mstat_fix[] = { - {0x0000U, 0x000000000000FFFFU}, - {0x0008U, 0x000000000000FFFFU}, - {0x0010U, 0x000000000000FFFFU}, - {0x0018U, 0x000000000000FFFFU}, - {0x0020U, 0x001414090000FFFFU}, - {0x0028U, 0x000C00000000FFFFU}, - {0x0030U, 0x001008040000FFFFU}, - {0x0038U, 0x001004040000FFFFU}, - {0x0040U, 0x001004040000FFFFU}, - {0x0048U, 0x000000000000FFFFU}, - {0x0050U, 0x001004040000FFFFU}, - {0x0058U, 0x001004040000FFFFU}, - {0x0060U, 0x000000000000FFFFU}, - {0x0068U, 0x001404040000FFFFU}, - {0x0070U, 0x001008030000FFFFU}, - {0x0078U, 0x001004030000FFFFU}, - {0x0080U, 0x001004030000FFFFU}, - {0x0088U, 0x000000000000FFFFU}, - {0x0090U, 0x001004040000FFFFU}, - {0x0098U, 0x001004040000FFFFU}, - {0x00A0U, 0x000000000000FFFFU}, - {0x00A8U, 0x000000000000FFFFU}, - {0x00B0U, 0x000000000000FFFFU}, - {0x00B8U, 0x000000000000FFFFU}, - {0x00C0U, 0x000000000000FFFFU}, - {0x00C8U, 0x000000000000FFFFU}, - {0x00D0U, 0x000000000000FFFFU}, - {0x00D8U, 0x000000000000FFFFU}, - {0x00E0U, 0x001404020000FFFFU}, - {0x00E8U, 0x000000000000FFFFU}, - {0x00F0U, 0x000000000000FFFFU}, - {0x00F8U, 0x000000000000FFFFU}, - {0x0100U, 0x000000000000FFFFU}, - {0x0108U, 0x000C04020000FFFFU}, - {0x0110U, 0x000000000000FFFFU}, - {0x0118U, 0x001404020000FFFFU}, - {0x0120U, 0x000000000000FFFFU}, - {0x0128U, 0x000000000000FFFFU}, - {0x0130U, 0x000000000000FFFFU}, - {0x0138U, 0x000000000000FFFFU}, - {0x0140U, 0x000000000000FFFFU}, - {0x0148U, 0x000000000000FFFFU}, +static const uint64_t mstat_fix[] = { + /* 0x0000, */ 0x000000000000FFFFUL, + /* 0x0008, */ 0x000000000000FFFFUL, + /* 0x0010, */ 0x000000000000FFFFUL, + /* 0x0018, */ 0x000000000000FFFFUL, + /* 0x0020, */ 0x001414090000FFFFUL, + /* 0x0028, */ 0x000C00000000FFFFUL, + /* 0x0030, */ 0x001008040000FFFFUL, + /* 0x0038, */ 0x001004040000FFFFUL, + /* 0x0040, */ 0x001004040000FFFFUL, + /* 0x0048, */ 0x000000000000FFFFUL, + /* 0x0050, */ 0x001004040000FFFFUL, + /* 0x0058, */ 0x001004040000FFFFUL, + /* 0x0060, */ 0x000000000000FFFFUL, + /* 0x0068, */ 0x001404040000FFFFUL, + /* 0x0070, */ 0x001008030000FFFFUL, + /* 0x0078, */ 0x001004030000FFFFUL, + /* 0x0080, */ 0x001004030000FFFFUL, + /* 0x0088, */ 0x000000000000FFFFUL, + /* 0x0090, */ 0x001004040000FFFFUL, + /* 0x0098, */ 0x001004040000FFFFUL, + /* 0x00A0, */ 0x000000000000FFFFUL, + /* 0x00A8, */ 0x000000000000FFFFUL, + /* 0x00B0, */ 0x000000000000FFFFUL, + /* 0x00B8, */ 0x000000000000FFFFUL, + /* 0x00C0, */ 0x000000000000FFFFUL, + /* 0x00C8, */ 0x000000000000FFFFUL, + /* 0x00D0, */ 0x000000000000FFFFUL, + /* 0x00D8, */ 0x000000000000FFFFUL, + /* 0x00E0, */ 0x001404020000FFFFUL, + /* 0x00E8, */ 0x000000000000FFFFUL, + /* 0x00F0, */ 0x000000000000FFFFUL, + /* 0x00F8, */ 0x000000000000FFFFUL, + /* 0x0100, */ 0x000000000000FFFFUL, + /* 0x0108, */ 0x000C04020000FFFFUL, + /* 0x0110, */ 0x000000000000FFFFUL, + /* 0x0118, */ 0x001404020000FFFFUL, + /* 0x0120, */ 0x000000000000FFFFUL, + /* 0x0128, */ 0x000000000000FFFFUL, + /* 0x0130, */ 0x000000000000FFFFUL, + /* 0x0138, */ 0x000000000000FFFFUL, + /* 0x0140, */ 0x000000000000FFFFUL, + /* 0x0148, */ 0x000000000000FFFFUL, }; -static const mstat_slot_t mstat_be[] = { - {0x0000U, 0x00100020447FFC01U}, - {0x0008U, 0x00100020447FFC01U}, - {0x0010U, 0x00100040447FFC01U}, - {0x0018U, 0x00100040447FFC01U}, - {0x0020U, 0x0000000000000000U}, - {0x0028U, 0x0000000000000000U}, - {0x0030U, 0x0000000000000000U}, - {0x0038U, 0x0000000000000000U}, - {0x0040U, 0x0000000000000000U}, - {0x0048U, 0x0000000000000000U}, - {0x0050U, 0x0000000000000000U}, - {0x0058U, 0x0000000000000000U}, - {0x0060U, 0x0000000000000000U}, - {0x0068U, 0x0000000000000000U}, - {0x0070U, 0x0000000000000000U}, - {0x0078U, 0x0000000000000000U}, - {0x0080U, 0x0000000000000000U}, - {0x0088U, 0x0000000000000000U}, - {0x0090U, 0x0000000000000000U}, - {0x0098U, 0x0000000000000000U}, - {0x00A0U, 0x00100010447FFC01U}, - {0x00A8U, 0x00100010447FFC01U}, - {0x00B0U, 0x00100010447FFC01U}, - {0x00B8U, 0x00100010447FFC01U}, - {0x00C0U, 0x00100010447FFC01U}, - {0x00C8U, 0x00100010447FFC01U}, - {0x00D0U, 0x0000000000000000U}, - {0x00D8U, 0x00100010447FFC01U}, - {0x00E0U, 0x0000000000000000U}, - {0x00E8U, 0x00100010447FFC01U}, - {0x00F0U, 0x00100010447FFC01U}, - {0x00F8U, 0x00100010447FFC01U}, - {0x0100U, 0x00100010447FFC01U}, - {0x0108U, 0x0000000000000000U}, - {0x0110U, 0x00100010447FFC01U}, - {0x0118U, 0x0000000000000000U}, - {0x0120U, 0x00100010447FFC01U}, - {0x0128U, 0x00100010447FFC01U}, - {0x0130U, 0x00100010447FFC01U}, - {0x0138U, 0x00100010447FFC01U}, - {0x0140U, 0x00100020447FFC01U}, - {0x0148U, 0x00100020447FFC01U}, +static const uint64_t mstat_be[] = { + /* 0x0000, */ 0x00100020447FFC01UL, + /* 0x0008, */ 0x00100020447FFC01UL, + /* 0x0010, */ 0x00100040447FFC01UL, + /* 0x0018, */ 0x00100040447FFC01UL, + /* 0x0020, */ 0x0000000000000000UL, + /* 0x0028, */ 0x0000000000000000UL, + /* 0x0030, */ 0x0000000000000000UL, + /* 0x0038, */ 0x0000000000000000UL, + /* 0x0040, */ 0x0000000000000000UL, + /* 0x0048, */ 0x0000000000000000UL, + /* 0x0050, */ 0x0000000000000000UL, + /* 0x0058, */ 0x0000000000000000UL, + /* 0x0060, */ 0x0000000000000000UL, + /* 0x0068, */ 0x0000000000000000UL, + /* 0x0070, */ 0x0000000000000000UL, + /* 0x0078, */ 0x0000000000000000UL, + /* 0x0080, */ 0x0000000000000000UL, + /* 0x0088, */ 0x0000000000000000UL, + /* 0x0090, */ 0x0000000000000000UL, + /* 0x0098, */ 0x0000000000000000UL, + /* 0x00A0, */ 0x00100010447FFC01UL, + /* 0x00A8, */ 0x00100010447FFC01UL, + /* 0x00B0, */ 0x00100010447FFC01UL, + /* 0x00B8, */ 0x00100010447FFC01UL, + /* 0x00C0, */ 0x00100010447FFC01UL, + /* 0x00C8, */ 0x00100010447FFC01UL, + /* 0x00D0, */ 0x0000000000000000UL, + /* 0x00D8, */ 0x00100010447FFC01UL, + /* 0x00E0, */ 0x0000000000000000UL, + /* 0x00E8, */ 0x00100010447FFC01UL, + /* 0x00F0, */ 0x00100010447FFC01UL, + /* 0x00F8, */ 0x00100010447FFC01UL, + /* 0x0100, */ 0x00100010447FFC01UL, + /* 0x0108, */ 0x0000000000000000UL, + /* 0x0110, */ 0x00100010447FFC01UL, + /* 0x0118, */ 0x0000000000000000UL, + /* 0x0120, */ 0x00100010447FFC01UL, + /* 0x0128, */ 0x00100010447FFC01UL, + /* 0x0130, */ 0x00100010447FFC01UL, + /* 0x0138, */ 0x00100010447FFC01UL, + /* 0x0140, */ 0x00100020447FFC01UL, + /* 0x0148, */ 0x00100020447FFC01UL, }; #endif -- GitLab