* [PATCH] MIPS: OCTEON: fix management port MII address on Kontron S1901
@ 2015-08-11 7:56 Aaro Koskinen
2015-08-11 20:06 ` David Daney
0 siblings, 1 reply; 3+ messages in thread
From: Aaro Koskinen @ 2015-08-11 7:56 UTC (permalink / raw)
To: Ralf Baechle, linux-mips
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>
---
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";
--
2.4.3
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] MIPS: OCTEON: fix management port MII address on Kontron S1901
2015-08-11 7:56 [PATCH] MIPS: OCTEON: fix management port MII address on Kontron S1901 Aaro Koskinen
@ 2015-08-11 20:06 ` David Daney
2015-08-19 20:49 ` Ralf Baechle
0 siblings, 1 reply; 3+ messages in thread
From: David Daney @ 2015-08-11 20:06 UTC (permalink / raw)
To: Aaro Koskinen; +Cc: Ralf Baechle, linux-mips
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";
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] MIPS: OCTEON: fix management port MII address on Kontron S1901
2015-08-11 20:06 ` David Daney
@ 2015-08-19 20:49 ` Ralf Baechle
0 siblings, 0 replies; 3+ messages in thread
From: Ralf Baechle @ 2015-08-19 20:49 UTC (permalink / raw)
To: David Daney; +Cc: Aaro Koskinen, linux-mips
On Tue, Aug 11, 2015 at 01:06:59PM -0700, David Daney wrote:
>
> 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>
Queued for 4.3.
Thanks folks!
Ralf
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-08-19 20:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-11 7:56 [PATCH] MIPS: OCTEON: fix management port MII address on Kontron S1901 Aaro Koskinen
2015-08-11 20:06 ` David Daney
2015-08-19 20:49 ` Ralf Baechle
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.