Commit 855feca9 authored Jan 02, 2019 by Aaro Koskinen Committed by Greg Kroah-Hartman Jan 09, 2019

MIPS: OCTEON: mark RGMII interface disabled on OCTEON III



commit edefae94b7b9f10d5efe32dece5a36e9d9ecc29e upstream.

Commit 885872b7 ("MIPS: Octeon: Add Octeon III CN7xxx
interface detection") added RGMII interface detection for OCTEON III,
but it results in the following logs:

[    7.165984] ERROR: Unsupported Octeon model in __cvmx_helper_rgmii_probe
[    7.173017] ERROR: Unsupported Octeon model in __cvmx_helper_rgmii_probe

The current RGMII routines are valid only for older OCTEONS that
use GMX/ASX hardware blocks. On later chips AGL should be used,
but support for that is missing in the mainline. Until that is added,
mark the interface as disabled.

Fixes: 885872b7 ("MIPS: Octeon: Add Octeon III CN7xxx interface detection")
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
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
Cc: stable@vger.kernel.org # 4.7+
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 93cf55e2

arch/mips/cavium-octeon/executive/cvmx-helper.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -290,7 +290,8 @@ static cvmx_helper_interface_mode_t __cvmx_get_mode_cn7xxx(int interface)
		case 3:
		return CVMX_HELPER_INTERFACE_MODE_LOOP;
		case 4:
		return CVMX_HELPER_INTERFACE_MODE_RGMII;
		/* TODO: Implement support for AGL (RGMII). */
		return CVMX_HELPER_INTERFACE_MODE_DISABLED;
		default:
		return CVMX_HELPER_INTERFACE_MODE_DISABLED;
		}