diff mbox series

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

Message ID 20220403025950.837085-2-stijn@linux-ipv6.be (mailing list archive)
State Accepted
Commit aa88b7066a10e2cb5355478f22daa28794ab3835
Headers show
Series [1/2] MIPS: Octeon: fix CN6640 hang on XAUI init | expand

Commit Message

Stijn Tintel April 3, 2022, 2:59 a.m. UTC 
CN66XX_PASS1_0 has 7 interfaces, other revisions have 8 interfaces.

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
---
 arch/mips/cavium-octeon/executive/cvmx-helper.c | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

Thomas Bogendoerfer April 26, 2022, 2:30 p.m. UTC | #1 
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 <stijn@linux-ipv6.be>
> ---
>  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.
diff mbox series

Patch

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))