Skip to content

Commit edefae9

Browse files
aakoskinpaulburton
authored andcommitted
MIPS: OCTEON: mark RGMII interface disabled on OCTEON III
Commit 885872b ("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: 885872b ("MIPS: Octeon: Add Octeon III CN7xxx interface detection") Signed-off-by: Aaro Koskinen <[email protected]> Signed-off-by: Paul Burton <[email protected]> Cc: Ralf Baechle <[email protected]> Cc: James Hogan <[email protected]> Cc: [email protected] Cc: [email protected] # 4.7+
1 parent db1ce3f commit edefae9

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,8 @@ static cvmx_helper_interface_mode_t __cvmx_get_mode_cn7xxx(int interface)
266266
case 3:
267267
return CVMX_HELPER_INTERFACE_MODE_LOOP;
268268
case 4:
269-
return CVMX_HELPER_INTERFACE_MODE_RGMII;
269+
/* TODO: Implement support for AGL (RGMII). */
270+
return CVMX_HELPER_INTERFACE_MODE_DISABLED;
270271
default:
271272
return CVMX_HELPER_INTERFACE_MODE_DISABLED;
272273
}

0 commit comments

Comments
 (0)