2022-04-04 14:04:05

by Stijn Tintel

Subject: [PATCH 2/2] MIPS: Octeon: support all interfaces on CN66XX

CN66XX_PASS1_0 has 7 interfaces, other revisions have 8 interfaces.

Signed-off-by: Stijn Tintel <[email protected]>
---
arch/mips/cavium-octeon/executive/cvmx-helper.c | 6 ++++++
1 file changed, 6 insertions(+)

diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper.c b/arch/mips/cavium-octeon/executive/cvmx-helper.c
index b22f664e2d29..6f49fd9be1f3 100644
--- a/arch/mips/cavium-octeon/executive/cvmx-helper.c
+++ b/arch/mips/cavium-octeon/executive/cvmx-helper.c
@@ -61,6 +61,12 @@ int cvmx_helper_get_number_of_interfaces(void)
{
if (OCTEON_IS_MODEL(OCTEON_CN68XX))
return 9;
+ if (OCTEON_IS_MODEL(OCTEON_CN66XX)) {
+ if (OCTEON_IS_MODEL(OCTEON_CN66XX_PASS1_0))
+ return 7;
+ else
+ return 8;
+ }
if (OCTEON_IS_MODEL(OCTEON_CN56XX) || OCTEON_IS_MODEL(OCTEON_CN52XX))
return 4;
if (OCTEON_IS_MODEL(OCTEON_CN7XXX))
--
2.35.1

2022-04-27 09:47:01

by Thomas Bogendoerfer

Subject: Re: [PATCH 2/2] MIPS: Octeon: support all interfaces on CN66XX

On Sun, Apr 03, 2022 at 05:59:50AM +0300, Stijn Tintel wrote:
> CN66XX_PASS1_0 has 7 interfaces, other revisions have 8 interfaces.
>
> Signed-off-by: Stijn Tintel <[email protected]>
> ---
> arch/mips/cavium-octeon/executive/cvmx-helper.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper.c b/arch/mips/cavium-octeon/executive/cvmx-helper.c
> index b22f664e2d29..6f49fd9be1f3 100644
> --- a/arch/mips/cavium-octeon/executive/cvmx-helper.c
> +++ b/arch/mips/cavium-octeon/executive/cvmx-helper.c
> @@ -61,6 +61,12 @@ int cvmx_helper_get_number_of_interfaces(void)
> {
> if (OCTEON_IS_MODEL(OCTEON_CN68XX))
> return 9;
> + if (OCTEON_IS_MODEL(OCTEON_CN66XX)) {
> + if (OCTEON_IS_MODEL(OCTEON_CN66XX_PASS1_0))
> + return 7;
> + else
> + return 8;
> + }
> if (OCTEON_IS_MODEL(OCTEON_CN56XX) || OCTEON_IS_MODEL(OCTEON_CN52XX))
> return 4;
> if (OCTEON_IS_MODEL(OCTEON_CN7XXX))
> --
> 2.35.1

applied to mips-next.

Thomas.

--
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea. [ RFC1925, 2.3 ]