Re: [PATCH] MIPS: OCTEON: fix management port MII address on Kontron S1901

[David Daney <ddaney.cavm@gmail.com>]

On 08/11/2015 12:56 AM, Aaro Koskinen wrote:
> 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: Aaro Koskinen <aaro.koskinen@nokia.com>

This seems reasonable, I cannot test it, but ...

Acked-by: David Daney <david.daney@cavium.com>

> ---
>   arch/mips/cavium-octeon/executive/cvmx-helper-board.c | 6 ++++++
>   arch/mips/include/asm/octeon/cvmx-bootinfo.h          | 2 ++
>   2 files changed, 8 insertions(+)
>
> diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper-board.c b/arch/mips/cavium-octeon/executive/cvmx-helper-board.c
> index 9eb0fee..36e30d6 100644
> --- a/arch/mips/cavium-octeon/executive/cvmx-helper-board.c
> +++ b/arch/mips/cavium-octeon/executive/cvmx-helper-board.c
> @@ -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... */
> diff --git a/arch/mips/include/asm/octeon/cvmx-bootinfo.h b/arch/mips/include/asm/octeon/cvmx-bootinfo.h
> index c373d95..d92cf59 100644
> --- a/arch/mips/include/asm/octeon/cvmx-bootinfo.h
> +++ b/arch/mips/include/asm/octeon/cvmx-bootinfo.h
> @@ -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";
>