Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cef232ec authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Ralf Baechle
Browse files

MIPS: Octeon: Fix management port MII address on Kontron S1901 



Management port MII address is incorrect on Kontron S1901 resulting
in broken networking. Fix by providing definitions for the in-tree DT
pruning code.

Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@nokia.com>
Acked-by: default avatarDavid Daney <david.daney@cavium.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/10914/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent e5dd8f2c

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

+6 −0
Original line number Diff line number Diff line
@@ -195,6 +195,12 @@ int cvmx_helper_board_get_mii_address(int ipd_port) 
			return 8;

		else

			return -1;

	case CVMX_BOARD_TYPE_KONTRON_S1901:

		if (ipd_port == CVMX_HELPER_BOARD_MGMT_IPD_PORT)

			return 1;

		else

			return -1;



	}



	/* Some unknown board. Somebody forgot to update this function... */

arch/mips/include/asm/octeon/cvmx-bootinfo.h

+2 −0
Original line number Diff line number Diff line
@@ -284,6 +284,7 @@ enum cvmx_board_types_enum { 
	CVMX_BOARD_TYPE_CUST_PRIVATE_MIN = 20001,

	CVMX_BOARD_TYPE_UBNT_E100 = 20002,

	CVMX_BOARD_TYPE_CUST_DSR1000N = 20006,

	CVMX_BOARD_TYPE_KONTRON_S1901 = 21901,

	CVMX_BOARD_TYPE_CUST_PRIVATE_MAX = 30000,



	/* The remaining range is reserved for future use. */
@@ -384,6 +385,7 @@ static inline const char *cvmx_board_type_to_string(enum 
		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_PRIVATE_MIN)

		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E100)

		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_DSR1000N)

		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_KONTRON_S1901)

		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_PRIVATE_MAX)

	}

	return "Unsupported Board";