From: Aaro Koskinen <aaro.koskinen@iki.fi>
To: Ralf Baechle <ralf@linux-mips.org>,
Paul Burton <paul.burton@mips.com>,
James Hogan <jhogan@kernel.org>,
linux-mips@vger.kernel.org
Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
Subject: [PATCH 3/6] MIPS: OCTEON: cvmx_pko_mem_debug8: use oldest forward compatible definition
Date: Tue, 4 Dec 2018 22:12:17 +0200 [thread overview]
Message-ID: <20181204201220.12667-4-aaro.koskinen@iki.fi> (raw)
In-Reply-To: <20181204201220.12667-1-aaro.koskinen@iki.fi>
cn58xx is compatible with cn52xx, so use the latter.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
---
arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c | 2 +-
arch/mips/include/asm/octeon/cvmx-pko.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c b/arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c
index 8241fc6aa17d..3839feba68f2 100644
--- 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 5f47f76ed510..20eb9c46a75a 100644
--- 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;
}
}
--
2.17.0
next prev parent reply other threads:[~2018-12-04 20:20 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-04 20:12 [PATCH 0/6] MIPS: OCTEON: cleanups, part II Aaro Koskinen
2018-12-04 20:12 ` [PATCH 1/6] MIPS: OCTEON: enable all OCTEON drivers in defconfig Aaro Koskinen
2018-12-04 20:12 ` [PATCH 2/6] MIPS: OCTEON: octeon-usb: use common gpio_bit definition Aaro Koskinen
2018-12-04 20:12 ` Aaro Koskinen [this message]
2018-12-04 20:12 ` [PATCH 4/6] MIPS: OCTEON: cvmx_mio_fus_dat3: use oldest forward compatible definition Aaro Koskinen
2018-12-04 20:12 ` [PATCH 5/6] MIPS: OCTEON: cvmx_gmxx_inf_mode: " Aaro Koskinen
2018-12-05 22:09 ` [PATCH 0/6] MIPS: OCTEON: cleanups, part II Aaro Koskinen
2018-12-05 22:20 ` Paul Burton
2018-12-05 22:25 ` Aaro Koskinen
2018-12-05 22:39 ` Paul Burton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181204201220.12667-4-aaro.koskinen@iki.fi \
--to=aaro.koskinen@iki.fi \
--cc=jhogan@kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=paul.burton@mips.com \
--cc=ralf@linux-mips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).