Commit ac40fe53 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman

MIPS: OCTEON: mark RGMII interface disabled on OCTEON III

commit edefae94 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: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarPaul 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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent af8a41b9
...@@ -286,7 +286,8 @@ static cvmx_helper_interface_mode_t __cvmx_get_mode_cn7xxx(int interface) ...@@ -286,7 +286,8 @@ static cvmx_helper_interface_mode_t __cvmx_get_mode_cn7xxx(int interface)
case 3: case 3:
return CVMX_HELPER_INTERFACE_MODE_LOOP; return CVMX_HELPER_INTERFACE_MODE_LOOP;
case 4: case 4:
return CVMX_HELPER_INTERFACE_MODE_RGMII; /* TODO: Implement support for AGL (RGMII). */
return CVMX_HELPER_INTERFACE_MODE_DISABLED;
default: default:
return CVMX_HELPER_INTERFACE_MODE_DISABLED; return CVMX_HELPER_INTERFACE_MODE_DISABLED;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment