From: Aaro Koskinen <aaro.koskinen@iki.fi>
To: linux-mips@vger.kernel.org
Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
Subject: [PATCH 4/5] MIPS: OCTEON: delete board-specific link status
Date: Tue, 5 Feb 2019 00:41:48 +0200 [thread overview]
Message-ID: <20190204224149.8139-5-aaro.koskinen@iki.fi> (raw)
In-Reply-To: <20190204224149.8139-1-aaro.koskinen@iki.fi>
Delete board-specific link status. This info should now come from
the DT only.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
---
.../executive/cvmx-helper-board.c | 43 +------------------
1 file changed, 1 insertion(+), 42 deletions(-)
diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper-board.c b/arch/mips/cavium-octeon/executive/cvmx-helper-board.c
index 46ea54ea73ea..634eae578ffe 100644
--- a/arch/mips/cavium-octeon/executive/cvmx-helper-board.c
+++ b/arch/mips/cavium-octeon/executive/cvmx-helper-board.c
@@ -217,53 +217,12 @@ cvmx_helper_link_info_t __cvmx_helper_board_link_get(int ipd_port)
/* Unless we fix it later, all links are defaulted to down */
result.u64 = 0;
- /*
- * This switch statement should handle all ports that either don't use
- * Marvell PHYS, or don't support in-band status.
- */
- switch (cvmx_sysinfo_get()->board_type) {
- case CVMX_BOARD_TYPE_SIM:
+ if (octeon_is_simulation()) {
/* The simulator gives you a simulated 1Gbps full duplex link */
result.s.link_up = 1;
result.s.full_duplex = 1;
result.s.speed = 1000;
return result;
- case CVMX_BOARD_TYPE_EBH3100:
- case CVMX_BOARD_TYPE_CN3010_EVB_HS5:
- case CVMX_BOARD_TYPE_CN3005_EVB_HS5:
- case CVMX_BOARD_TYPE_CN3020_EVB_HS5:
- /* Port 1 on these boards is always Gigabit */
- if (ipd_port == 1) {
- result.s.link_up = 1;
- result.s.full_duplex = 1;
- result.s.speed = 1000;
- return result;
- }
- /* Fall through to the generic code below */
- break;
- case CVMX_BOARD_TYPE_CUST_NB5:
- /* Port 1 on these boards is always Gigabit */
- if (ipd_port == 1) {
- result.s.link_up = 1;
- result.s.full_duplex = 1;
- result.s.speed = 1000;
- return result;
- }
- break;
- case CVMX_BOARD_TYPE_BBGW_REF:
- /* Port 1 on these boards is always Gigabit */
- if (ipd_port == 2) {
- /* Port 2 is not hooked up */
- result.u64 = 0;
- return result;
- } else {
- /* Ports 0 and 1 connect to the switch */
- result.s.link_up = 1;
- result.s.full_duplex = 1;
- result.s.speed = 1000;
- return result;
- }
- break;
}
if (OCTEON_IS_MODEL(OCTEON_CN3XXX)
--
2.17.0
next prev parent reply other threads:[~2019-02-04 22:41 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-04 22:41 [PATCH 0/5] MIPS: OCTEON: avoid board-specific stuff in ethernet code Aaro Koskinen
2019-02-04 22:41 ` [PATCH 1/5] MIPS: OCTEON: add fixed-link nodes to in-kernel device tree Aaro Koskinen
2019-02-04 22:41 ` [PATCH 2/5] MIPS: OCTEON: warn if deprecated link status is being used Aaro Koskinen
2019-02-04 22:41 ` [PATCH 3/5] MIPS: OCTEON: don't lie about interface type of CN3005 board Aaro Koskinen
2019-02-04 22:41 ` Aaro Koskinen [this message]
2019-02-04 22:41 ` [PATCH 5/5] MIPS: OCTEON: program rx/tx-delay always from DT Aaro Koskinen
2019-02-08 18:03 ` [PATCH 0/5] MIPS: OCTEON: avoid board-specific stuff in ethernet code 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=20190204224149.8139-5-aaro.koskinen@iki.fi \
--to=aaro.koskinen@iki.fi \
--cc=linux-mips@vger.kernel.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).