[src/trunk]: src/sys/dev/pci Fixed a panic problem at attach with aq(4) F/W v...

[ryo <ryo%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b0f16e6c1322
branches:  trunk
changeset: 1025537:b0f16e6c1322
user:      ryo <ryo%NetBSD.org@localhost>
date:      Thu Nov 11 06:56:56 2021 +0000

description:
Fixed a panic problem at attach with aq(4) F/W version 1.

- Don't use cprng(9) when attaching, since it's not available yet.
- Wait up to 10 seconds because delay is not enough.
- Even if the delay is not enough, it will fail attach without panic.
- Checked on the actual card D107 (F/W version 1.5.58)

diffstat:

 sys/dev/pci/if_aq.c |  20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diffs (49 lines):

diff -r d630a613b840 -r b0f16e6c1322 sys/dev/pci/if_aq.c
--- a/sys/dev/pci/if_aq.c       Thu Nov 11 01:10:09 2021 +0000
+++ b/sys/dev/pci/if_aq.c       Thu Nov 11 06:56:56 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_aq.c,v 1.29 2021/10/11 15:08:17 msaitoh Exp $       */
+/*     $NetBSD: if_aq.c,v 1.30 2021/11/11 06:56:56 ryo Exp $   */
 
 /**
  * aQuantia Corporation Network Driver
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_aq.c,v 1.29 2021/10/11 15:08:17 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aq.c,v 1.30 2021/11/11 06:56:56 ryo Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_if_aq.h"
@@ -2068,22 +2068,22 @@
        int timo;
 
        if (FW_VERSION_MAJOR(sc) == 1) {
-               if (AQ_READ_REG(sc, FW1X_MPI_INIT2_REG) == 0) {
-                       uint32_t data;
-                       cprng_fast(&data, sizeof(data));
-                       data &= 0xfefefefe;
-                       data |= 0x02020202;
-                       AQ_WRITE_REG(sc, FW1X_MPI_INIT2_REG, data);
-               }
+               if (AQ_READ_REG(sc, FW1X_MPI_INIT2_REG) == 0)
+                       AQ_WRITE_REG(sc, FW1X_MPI_INIT2_REG, 0xfefefefe);
                AQ_WRITE_REG(sc, FW1X_MPI_INIT1_REG, 0);
        }
 
-       for (timo = 100; timo > 0; timo--) {
+       /* Wait a maximum of 10sec. It usually takes about 5sec. */
+       for (timo = 10000; timo > 0; timo--) {
                sc->sc_mbox_addr = AQ_READ_REG(sc, FW_MPI_MBOX_ADDR_REG);
                if (sc->sc_mbox_addr != 0)
                        break;
                delay(1000);
        }
+       if (sc->sc_mbox_addr == 0) {
+               aprint_error_dev(sc->sc_dev, "cannot get mbox addr\n");
+               return ETIMEDOUT;
+       }
 
 #define AQ_FW_MIN_VERSION      0x01050006
 #define AQ_FW_MIN_VERSION_STR  "1.5.6"