Re: New bwfm device (bcm43341)
On Fri, Mar 13, 2020 at 05:54:01PM +0100, Rob Schmersel wrote: > On Fri, 13 Mar 2020 16:31:18 +0100 > Patrick Wildt wrote: > > Thanks for the diff! Since Linux uses the same firmware (43340) for > > both 43340 and 43341, I commited the diff slightly differently to > > follow their scheme. Thus there's no need for a symbolic link. > > > > Patrick > > Reason I had it as a separate identifier is that the NVRAM file I > found for the 43341 chip was different compared to the 43340 chip > Might be a slump > > BR/Rob Yeah, but the NVRAM is highly specific anyway, as I explained in your NVRAM thread on misc. :) Patrick
Re: New bwfm device (bcm43341)
On Fri, 13 Mar 2020 16:31:18 +0100 Patrick Wildt wrote: > On Fri, Mar 13, 2020 at 02:49:33PM +0100, Rob Schmersel wrote: > > Hi, > > > Thanks for the diff! Since Linux uses the same firmware (43340) for > both 43340 and 43341, I commited the diff slightly differently to > follow their scheme. Thus there's no need for a symbolic link. > > Patrick > > Index: ic/bwfmvar.h > === > RCS file: /cvs/src/sys/dev/ic/bwfmvar.h,v > retrieving revision 1.18 > diff -u -p -u -r1.18 bwfmvar.h > --- ic/bwfmvar.h 6 Mar 2020 08:41:57 - 1.18 > +++ ic/bwfmvar.h 13 Mar 2020 15:28:04 - > @@ -27,6 +27,7 @@ > #define BRCM_CC_4330_CHIP_ID 0x4330 > #define BRCM_CC_4334_CHIP_ID 0x4334 > #define BRCM_CC_43340_CHIP_ID43340 > +#define BRCM_CC_43341_CHIP_ID43341 > #define BRCM_CC_43362_CHIP_ID43362 > #define BRCM_CC_4335_CHIP_ID 0x4335 > #define BRCM_CC_4339_CHIP_ID 0x4339 > Index: sdmmc/if_bwfm_sdio.c > === > RCS file: /cvs/src/sys/dev/sdmmc/if_bwfm_sdio.c,v > retrieving revision 1.33 > diff -u -p -u -r1.33 if_bwfm_sdio.c > --- sdmmc/if_bwfm_sdio.c 7 Mar 2020 09:56:46 - 1.33 > +++ sdmmc/if_bwfm_sdio.c 13 Mar 2020 15:28:04 - > @@ -372,6 +372,7 @@ bwfm_sdio_preinit(struct bwfm_softc *bwf > chip = "43455"; > break; > case BRCM_CC_43340_CHIP_ID: > + case BRCM_CC_43341_CHIP_ID: > chip = "43340"; > break; > case BRCM_CC_4335_CHIP_ID: > Reason I had it as a separate identifier is that the NVRAM file I found for the 43341 chip was different compared to the 43340 chip Might be a slump BR/Rob
Re: New bwfm device (bcm43341)
On Fri, Mar 13, 2020 at 02:49:33PM +0100, Rob Schmersel wrote: > Hi, > > I got a new toy to play with recently which uses a bcm43341 wireless > chipset. This chipset is the same as the bcm43340 apart from an > additional nfc mode and can re-use the brcmfmac43340-sdio.bin firmware. > (I simply added a symbolic link from firmware supplied in the > bwfm-firmware package) > > In order to get the chipset recognized however I needed to make some > changes as attached Thanks for the diff! Since Linux uses the same firmware (43340) for both 43340 and 43341, I commited the diff slightly differently to follow their scheme. Thus there's no need for a symbolic link. Patrick Index: ic/bwfmvar.h === RCS file: /cvs/src/sys/dev/ic/bwfmvar.h,v retrieving revision 1.18 diff -u -p -u -r1.18 bwfmvar.h --- ic/bwfmvar.h6 Mar 2020 08:41:57 - 1.18 +++ ic/bwfmvar.h13 Mar 2020 15:28:04 - @@ -27,6 +27,7 @@ #define BRCM_CC_4330_CHIP_ID 0x4330 #define BRCM_CC_4334_CHIP_ID 0x4334 #define BRCM_CC_43340_CHIP_ID 43340 +#define BRCM_CC_43341_CHIP_ID 43341 #define BRCM_CC_43362_CHIP_ID 43362 #define BRCM_CC_4335_CHIP_ID 0x4335 #define BRCM_CC_4339_CHIP_ID 0x4339 Index: sdmmc/if_bwfm_sdio.c === RCS file: /cvs/src/sys/dev/sdmmc/if_bwfm_sdio.c,v retrieving revision 1.33 diff -u -p -u -r1.33 if_bwfm_sdio.c --- sdmmc/if_bwfm_sdio.c7 Mar 2020 09:56:46 - 1.33 +++ sdmmc/if_bwfm_sdio.c13 Mar 2020 15:28:04 - @@ -372,6 +372,7 @@ bwfm_sdio_preinit(struct bwfm_softc *bwf chip = "43455"; break; case BRCM_CC_43340_CHIP_ID: + case BRCM_CC_43341_CHIP_ID: chip = "43340"; break; case BRCM_CC_4335_CHIP_ID:
New bwfm device (bcm43341)
Hi, I got a new toy to play with recently which uses a bcm43341 wireless chipset. This chipset is the same as the bcm43340 apart from an additional nfc mode and can re-use the brcmfmac43340-sdio.bin firmware. (I simply added a symbolic link from firmware supplied in the bwfm-firmware package) In order to get the chipset recognized however I needed to make some changes as attached Index: sys/dev/ic/bwfmvar.h === RCS file: /cvs/src/sys/dev/ic/bwfmvar.h,v retrieving revision 1.18 diff -u -p -u -r1.18 bwfmvar.h --- sys/dev/ic/bwfmvar.h6 Mar 2020 08:41:57 - 1.18 +++ sys/dev/ic/bwfmvar.h11 Mar 2020 15:41:51 - @@ -27,6 +27,7 @@ #define BRCM_CC_4330_CHIP_ID 0x4330 #define BRCM_CC_4334_CHIP_ID 0x4334 #define BRCM_CC_43340_CHIP_ID 43340 +#define BRCM_CC_43341_CHIP_ID 43341 #define BRCM_CC_43362_CHIP_ID 43362 #define BRCM_CC_4335_CHIP_ID 0x4335 #define BRCM_CC_4339_CHIP_ID 0x4339 Index: sys/dev/sdmmc/if_bwfm_sdio.c === RCS file: /cvs/src/sys/dev/sdmmc/if_bwfm_sdio.c,v retrieving revision 1.33 diff -u -p -u -r1.33 if_bwfm_sdio.c --- sys/dev/sdmmc/if_bwfm_sdio.c7 Mar 2020 09:56:46 - 1.33 +++ sys/dev/sdmmc/if_bwfm_sdio.c 11 Mar 2020 15:41:53 - @@ -374,6 +374,9 @@ bwfm_sdio_preinit(struct bwfm_softc *bwf case BRCM_CC_43340_CHIP_ID: chip = "43340"; break; + case BRCM_CC_43341_CHIP_ID: + chip = "43341"; + break; case BRCM_CC_4335_CHIP_ID: if (bwfm->sc_chip.ch_chiprev < 2) chip = "4335";
