CVS commit: src/sys/dev/ic

[SAITOH Masanobu]

Module Name:    src
Committed By:   msaitoh
Date:           Fri Oct 20 09:58:11 UTC 2023

Modified Files:
        src/sys/dev/ic: dwc_eqos.c

Log Message:
eqos(4): Accept if snpsver == 0x52. Tested with Intel Elkhart Lake.

 TODO:
        Multiqueue support.
        Add watchdog timer.
        Add detach function.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/ic/dwc_eqos.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/ic/dwc_eqos.c
diff -u src/sys/dev/ic/dwc_eqos.c:1.19 src/sys/dev/ic/dwc_eqos.c:1.20
--- src/sys/dev/ic/dwc_eqos.c:1.19	Fri Oct 20 09:53:27 2023
+++ src/sys/dev/ic/dwc_eqos.c	Fri Oct 20 09:58:11 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_eqos.c,v 1.19 2023/10/20 09:53:27 msaitoh Exp $ */
+/* $NetBSD: dwc_eqos.c,v 1.20 2023/10/20 09:58:11 msaitoh Exp $ */
 
 /*-
  * Copyright (c) 2022 Jared McNeill <jmcne...@invisible.ca>
@@ -28,12 +28,17 @@
 
 /*
  * DesignWare Ethernet Quality-of-Service controller
+ *
+ * TODO:
+ *	Multiqueue support.
+ *	Add watchdog timer.
+ *	Add detach function.
  */
 
 #include "opt_net_mpsafe.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwc_eqos.c,v 1.19 2023/10/20 09:53:27 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc_eqos.c,v 1.20 2023/10/20 09:58:11 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -1378,11 +1383,11 @@ eqos_attach(struct eqos_softc *sc)
 	    GMAC_MAC_VERSION_USERVER_SHIFT;
 	snpsver = ver & GMAC_MAC_VERSION_SNPSVER_MASK;
 
-	if (snpsver != 0x51) {
-		aprint_error(": EQOS version 0x%02xx not supported\n",
-		    snpsver);
-		return ENXIO;
-	}
+	if ((snpsver < 0x51) || (snpsver > 0x52)) {
+	       aprint_error(": EQOS version 0x%02xx not supported\n",
+		   snpsver);
+	       return ENXIO;
+       }	
 
 	if (sc->sc_csr_clock < 20000000) {
 		aprint_error(": CSR clock too low\n");