MIPS: OCTEON: cvmx_pko_mem_debug8: use oldest forward compatible definition

[ Upstream commit 1c6121c39677175bd372076020948e184bad4b6b ]

cn58xx is compatible with cn50xx, so use the latter.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
[paul.burton@mips.com: s/cn52xx/cn50xx/ in commit message.]
Signed-off-by: Paul Burton <paul.burton@mips.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: James Hogan <jhogan@kernel.org>
Cc: linux-mips@vger.kernel.org
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c b/arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c
index 8241fc6aa17d8668c21373febf27960e8b495e57..3839feba68f2043c99ad4ed46a24698e7ec5780f 100644 (file)
--- a/arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c
+++ b/arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c
@@ -266,7 +266,7 @@ int cvmx_cmd_queue_length(cvmx_cmd_queue_id_t queue_id)
                } else {
                        union cvmx_pko_mem_debug8 debug8;
                        debug8.u64 = cvmx_read_csr(CVMX_PKO_MEM_DEBUG8);
-                       return debug8.cn58xx.doorbell;
+                       return debug8.cn50xx.doorbell;
                }
        case CVMX_CMD_QUEUE_ZIP:
        case CVMX_CMD_QUEUE_DFA:

diff --git a/arch/mips/include/asm/octeon/cvmx-pko.h b/arch/mips/include/asm/octeon/cvmx-pko.h
index 5f47f76ed510a53dd760bedf911d3d1414d8a4de..20eb9c46a75ab18dbb2fec8b0a67d7dfb1af7300 100644 (file)
--- a/arch/mips/include/asm/octeon/cvmx-pko.h
+++ b/arch/mips/include/asm/octeon/cvmx-pko.h
@@ -611,7 +611,7 @@ static inline void cvmx_pko_get_port_status(uint64_t port_num, uint64_t clear,
                pko_reg_read_idx.s.index = cvmx_pko_get_base_queue(port_num);
                cvmx_write_csr(CVMX_PKO_REG_READ_IDX, pko_reg_read_idx.u64);
                debug8.u64 = cvmx_read_csr(CVMX_PKO_MEM_DEBUG8);
-               status->doorbell = debug8.cn58xx.doorbell;
+               status->doorbell = debug8.cn50xx.doorbell;
        }
 }