Mon Jul 20 06:44:55 2020 UTC ()

only ask for SDPCMD_INTSTATUS_HMB_SW_MASK and SDPCMD_INTSTATUS_CHIPACTIVE
interrupts, not all of them.  we only ack these ones.

mostly fixes pinebookpro wifi hard hangs.  still is problematic and can
trigger interrupt storm that appears as a hard hang without NET_MPSAFE,
and a follow up, less clearly right, change will reduce that to a soft
hang of the interface that can be cleared with 'ifconfig bwfm0 down up',
and even often recovers itself now.


(mrg)

diff -r1.19 -r1.20 src/sys/dev/sdmmc/if_bwfm_sdio.c

--- src/sys/dev/sdmmc/if_bwfm_sdio.c 2020/06/23 10:09:33	1.19
+++ src/sys/dev/sdmmc/if_bwfm_sdio.c 2020/07/20 06:44:55	1.20

 @@ -1,14 +1,14 @@
-/* $NetBSD: if_bwfm_sdio.c,v 1.19 2020/06/23 10:09:33 martin Exp $ */
+/* $NetBSD: if_bwfm_sdio.c,v 1.20 2020/07/20 06:44:55 mrg Exp $ */
 /* $OpenBSD: if_bwfm_sdio.c,v 1.1 2017/10/11 17:19:50 patrick Exp $ */
 /*
  * Copyright (c) 2010-2016 Broadcom Corporation
  * Copyright (c) 2016,2017 Patrick Wildt <patrick@blueri.se>
+ *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 @@ -495,29 +495,28 @@ bwfm_sdio_attachhook(device_t self)
+	}
 	clk = bwfm_sdio_read_1(sc, BWFM_SDIO_FUNC1_CHIPCLKCSR);
 	bwfm_sdio_write_1(sc, BWFM_SDIO_FUNC1_CHIPCLKCSR,
 	    clk | BWFM_SDIO_FUNC1_CHIPCLKCSR_FORCE_HT);
 	bwfm_sdio_dev_write(sc, SDPCMD_TOSBMAILBOXDATA,
 	    SDPCM_PROT_VERSION << SDPCM_PROT_VERSION_SHIFT);
 	if (sdmmc_io_function_enable(sc->sc_sf[2])) {
 		aprint_error_dev(bwfm->sc_dev, "cannot enable function 2\n");
 		goto err;
+	}
-//	bwfm_sdio_dev_write(sc, SDPCMD_HOSTINTMASK,
+	bwfm_sdio_dev_write(sc, SDPCMD_HOSTINTMASK,
-//	    SDPCMD_INTSTATUS_HMB_SW_MASK | SDPCMD_INTSTATUS_CHIPACTIVE);
+	    SDPCMD_INTSTATUS_HMB_SW_MASK | SDPCMD_INTSTATUS_CHIPACTIVE);
 	bwfm_sdio_dev_write(sc, SDPCMD_HOSTINTMASK, 0xffffffff);
 	bwfm_sdio_write_1(sc, BWFM_SDIO_WATERMARK, 8);
 	if (bwfm_chip_sr_capable(bwfm)) {
 		reg = bwfm_sdio_read_1(sc, BWFM_SDIO_FUNC1_WAKEUPCTRL);
 		reg |= BWFM_SDIO_FUNC1_WAKEUPCTRL_HTWAIT;
 		bwfm_sdio_write_1(sc, BWFM_SDIO_FUNC1_WAKEUPCTRL, reg);
 		bwfm_sdio_write_1(sc, BWFM_SDIO_CCCR_CARDCAP,
 		    BWFM_SDIO_CCCR_CARDCAP_CMD14_SUPPORT |
 		    BWFM_SDIO_CCCR_CARDCAP_CMD14_EXT);
 		bwfm_sdio_write_1(sc, BWFM_SDIO_FUNC1_CHIPCLKCSR,
 		    BWFM_SDIO_FUNC1_CHIPCLKCSR_FORCE_HT);
 		sc->sc_sr_enabled = 1;
 	} else {