Commit f74f1ec2 authored by Arend van Spriel's avatar Arend van Spriel Committed by Kalle Valo
Browse files

wifi: brcmfmac: add support for Cypress firmware api 



Cypress uses the brcmfmac driver and releases firmware which will
likely diverge over time (or already has). So adding support for
handling that.

Reviewed-by: default avatarHante Meuleman <hante.meuleman@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
Reviewed-by: default avatarFranky Lin <franky.lin@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20221129135446.151065-5-arend.vanspriel@broadcom.com
parent d6a5c562

drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ brcmfmac-$(CONFIG_DMI) += \ 


ifeq ($(CONFIG_BRCMFMAC),m)

obj-m += wcc/

obj-m += cyw/

else

brcmfmac-$(CONFIG_BRCMFMAC) += wcc/core.o

brcmfmac-$(CONFIG_BRCMFMAC) += cyw/core.o

endif

drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c

+24 −24
Original line number Diff line number Diff line
@@ -959,36 +959,36 @@ int brcmf_sdiod_probe(struct brcmf_sdio_dev *sdiodev) 
	return ret;

}



#define BRCMF_SDIO_DEVICE(dev_id)	\

#define BRCMF_SDIO_DEVICE(dev_id, fw_vend) \

	{ \

		SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, dev_id), \

		.driver_data = BRCMF_FWVENDOR_WCC \

		.driver_data = BRCMF_FWVENDOR_ ## fw_vend \

	}



/* devices we support, null terminated */

static const struct sdio_device_id brcmf_sdmmc_ids[] = {

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43143),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43241),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4329),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4330),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4334),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43340),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43341),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43362),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43364),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4335_4339),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4339),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43430),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4345),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43455),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4354),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4356),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4359),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_4373),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_43012),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_43439),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_43752),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_89359),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43143, WCC),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43241, WCC),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4329, WCC),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4330, WCC),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4334, WCC),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43340, WCC),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43341, WCC),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43362, WCC),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43364, WCC),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4335_4339, WCC),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4339, WCC),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43430, WCC),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4345, WCC),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43455, WCC),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4354, WCC),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4356, WCC),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4359, WCC),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_4373, CYW),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_43012, CYW),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_43439, CYW),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_43752, CYW),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_89359, CYW),

	{ /* end: all zeroes */ }

};

MODULE_DEVICE_TABLE(sdio, brcmf_sdmmc_ids);

drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 


enum brcmf_fwvendor {

	BRCMF_FWVENDOR_WCC,

	BRCMF_FWVENDOR_CYW,

	/* keep last */

	BRCMF_FWVENDOR_NUM,

	BRCMF_FWVENDOR_INVALID

drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/Makefile

0 → 100644
+12 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: ISC

#

# Copyright (c) 2022 Broadcom Corporation



ccflags-y += \

	-I $(srctree)/$(src) \

	-I $(srctree)/$(src)/.. \

	-I $(srctree)/$(src)/../../include



obj-m += brcmfmac-cyw.o

brcmfmac-cyw-objs += \

		core.o module.o

drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c

0 → 100644
+27 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: ISC

/*

 * Copyright (c) 2022 Broadcom Corporation

 */

#include <linux/errno.h>

#include <linux/types.h>

#include <core.h>

#include <bus.h>

#include <fwvid.h>



#include "vops.h"



static int brcmf_cyw_attach(struct brcmf_pub *drvr)

{

	pr_err("%s: executing\n", __func__);

	return 0;

}



static void brcmf_cyw_detach(struct brcmf_pub *drvr)

{

	pr_err("%s: executing\n", __func__);

}



const struct brcmf_fwvid_ops brcmf_cyw_ops = {

	.attach = brcmf_cyw_attach,

	.detach = brcmf_cyw_detach,

};