 @@ -1,14 +1,14 @@
-/* $NetBSD: if_bwfm_sdio.c,v 1.9 2019/10/28 06:37:52 mlelstv Exp $ */
+/* $NetBSD: if_bwfm_sdio.c,v 1.10 2019/12/30 16:28:14 mlelstv 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
 @@ -106,26 +106,27 @@ struct bwfm_sdio_softc {
 	char			*sc_console_buf;
 	size_t			sc_console_buf_size;
 	uint32_t		sc_console_readidx;
 	int			sc_phandle;
 	void			*sc_fdtih;
 };
 static int	bwfm_sdio_match(device_t, cfdata_t, void *);
 static void	bwfm_sdio_attach(device_t, device_t, void *);
 static int	bwfm_sdio_detach(device_t, int);
 static void	bwfm_sdio_attachhook(device_t);
 static int	bwfm_fdt_find_phandle(device_t, device_t);
 static const char *bwfm_fdt_get_model(void);
 static void	bwfm_sdio_backplane(struct bwfm_sdio_softc *, uint32_t);
 static uint8_t	bwfm_sdio_read_1(struct bwfm_sdio_softc *, uint32_t);
 static uint32_t	bwfm_sdio_read_4(struct bwfm_sdio_softc *, uint32_t);
 static void	bwfm_sdio_write_1(struct bwfm_sdio_softc *, uint32_t,
 		     uint8_t);
 static void	bwfm_sdio_write_4(struct bwfm_sdio_softc *, uint32_t,
 		     uint32_t);
 static uint32_t	bwfm_sdio_dev_read(struct bwfm_sdio_softc *, uint32_t);
 static void	bwfm_sdio_dev_write(struct bwfm_sdio_softc *, uint32_t,
 		     uint32_t);
 @@ -367,27 +368,28 @@ bwfm_sdio_attach(device_t parent, device
 	bwfm_sdio_write_1(sc, BWFM_SDIO_FUNC1_CHIPCLKCSR, 0);
 	sc->sc_clkstate = CLK_SDONLY;
 	config_mountroot(self, bwfm_sdio_attachhook);
+}
 static void
 bwfm_sdio_attachhook(device_t self)
+{
 	struct bwfm_sdio_softc *sc = device_private(self);
 	struct bwfm_softc *bwfm = &sc->sc_sc;
 	firmware_handle_t fwh;
-	const char *name, *nvname;
+	const char *name, *nvname, *model;
 	char *nvnamebuf;
 	u_char *ucode, *nvram;
 	size_t size, nvlen, nvsize;
 	uint32_t reg, clk;
 	int error;
 	DPRINTF(("%s: chip 0x%08x rev %u\n", DEVNAME(sc),
 	    bwfm->sc_chip.ch_chip, bwfm->sc_chip.ch_chiprev));
 	switch (bwfm->sc_chip.ch_chip) {
 	case BRCM_CC_4330_CHIP_ID:
 		name = "brcmfmac4330-sdio.bin";
 		nvname = "brcmfmac4330-sdio.txt";
 		break;
 	case BRCM_CC_4334_CHIP_ID:
 @@ -425,48 +427,64 @@ bwfm_sdio_attachhook(device_t self)
 			nvname = "brcmfmac43430-sdio.txt";
+		}
 		break;
 	case BRCM_CC_4356_CHIP_ID:
 		name = "brcmfmac4356-sdio.bin";
 		nvname = "brcmfmac4356-sdio.txt";
 		break;
 	default:
 		printf("%s: unknown firmware for chip %s\n",
 		    DEVNAME(sc), bwfm->sc_chip.ch_name);
 		goto err;
+	}
 	/* compute a model specific filename for the NV config */
 	nvnamebuf = NULL;
 	model = bwfm_fdt_get_model();
 	if (model != NULL) {
 		/* assume nvname ends in ".txt" */
 		nvnamebuf = kmem_asprintf("%.*s.%s.txt",
 		    (int)(strlen(nvname) - 4),
 		    nvname, model);
+	}
 	aprint_verbose_dev(self, "Firmware       %s\n", name);
 	aprint_verbose_dev(self, "Default Config %s\n", nvname);
 	if (nvnamebuf != NULL)
 		aprint_verbose_dev(self, "Model Config   %s\n", nvnamebuf);
 	if (firmware_open("if_bwfm", name, &fwh) != 0) {
 		printf("%s: failed firmware_open of file %s\n",
 		    DEVNAME(sc), name);
 		goto err;
+	}
 	size = firmware_get_size(fwh);
 	ucode = firmware_malloc(size);
 	if (ucode == NULL) {
 		printf("%s: failed firmware_open of file %s\n",
 		    DEVNAME(sc), name);
 		firmware_close(fwh);
 		goto err;
+	}
 	error = firmware_read(fwh, 0, ucode, size);
 	firmware_close(fwh);
 	if (error != 0) {
 		printf("%s: failed to read firmware (error %d)\n",
 		    DEVNAME(sc), error);
 		goto err1;
+	}
-	if (firmware_open("if_bwfm", nvname, &fwh) != 0) {
+	if ((nvnamebuf == NULL || firmware_open("if_bwfm", nvnamebuf, &fwh) != 0)
 	    && firmware_open("if_bwfm", nvname, &fwh) != 0) {
 		printf("%s: failed firmware_open of file %s\n",
 		    DEVNAME(sc), nvname);
 		goto err1;
+	}
 	nvlen = firmware_get_size(fwh);
 	nvram = firmware_malloc(nvlen);
 	if (nvram == NULL) {
 		printf("%s: failed firmware_open of file %s\n",
 		    DEVNAME(sc), name);
 		firmware_close(fwh);
 		goto err1;
+	}
 	error = firmware_read(fwh, 0, nvram, nvlen);
 @@ -482,26 +500,28 @@ bwfm_sdio_attachhook(device_t self)
 		goto err2;
+	}
 	sc->sc_alp_only = true;
 	if (bwfm_sdio_load_microcode(sc, ucode, size, nvram, nvsize) != 0) {
 		printf("%s: could not load microcode\n",
 		    DEVNAME(sc));
 		goto err2;
+	}
 	sc->sc_alp_only = false;
 	firmware_free(nvram, nvlen);
 	firmware_free(ucode, size);
 	if (nvnamebuf != NULL)
 		kmem_free(nvnamebuf, strlen(nvnamebuf)+1);
 	sdmmc_pause(hztoms(1)*1000, NULL);
 	bwfm_sdio_clkctl(sc, CLK_AVAIL, false);
 	if (sc->sc_clkstate != CLK_AVAIL) {
 		printf("%s: could not access clock\n",
 		    DEVNAME(sc));
 		goto err;
+	}
 	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);
 @@ -555,26 +575,28 @@ bwfm_sdio_attachhook(device_t self)
 	sdmmc_pause(100000, NULL);
 	sc->sc_sc.sc_bus_ops = &bwfm_sdio_bus_ops;
 	sc->sc_sc.sc_proto_ops = &bwfm_proto_bcdc_ops;
 	bwfm_attach(&sc->sc_sc);
 	sc->sc_bwfm_attached = true;
 	return;
 err2:
 	firmware_free(nvram, nvlen);
 err1:
 	firmware_free(ucode, size);
 	if (nvnamebuf != NULL)
 		kmem_free(nvnamebuf, strlen(nvnamebuf)+1);
 err:
 	return;
+}
 static int
 bwfm_fdt_find_phandle(device_t self, device_t parent)
+{
 	prop_dictionary_t dict;
 	device_t dev;
 	const char *str;
 	int phandle;
 	/* locate in FDT */
 @@ -593,26 +615,35 @@ bwfm_fdt_find_phandle(device_t self, dev
 		if (!prop_dictionary_get_cstring_nocopy(dict, "fdt-path", &str))
 			return -1;
 		/* are we the only FDT child ? */
 		phandle = OF_child(OF_finddevice(str));
+	}
 	if (!of_match_compatible(phandle, compatible))
 		return -1;
 	return phandle;
+}
 static const char *
 bwfm_fdt_get_model(void)
+{
 	int phandle;
 	phandle = OF_finddevice("/");
 	return fdtbus_get_string_index(phandle, "compatible", 0);
+}
 static int
 bwfm_sdio_detach(device_t self, int flags)
+{
 	struct bwfm_sdio_softc *sc = (struct bwfm_sdio_softc *)self;
 #ifdef BWFM_DEBUG
 	bwfm_sdio_debug_console(sc);
 #endif
 	if (sc->sc_ih || sc->sc_fdtih) {
 		sdmmc_intr_disable(sc->sc_sf[1]);
 		if (sc->sc_ih)
 			sdmmc_intr_disestablish(sc->sc_ih);