brcmfmac: Move all module parameters to one place (7d34b056) · Commits · e / devices / android_kernel_oneplus_sm7250

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

+5 −7

Original line number	Diff line number	Diff line
		@@ -47,6 +47,8 @@
		#include "debug.h"
		#include "sdio.h"
		#include "of.h"
		#include "core.h"
		#include "common.h"

		#define SDIOH_API_ACCESS_RETRY_LIMIT 2

		@@ -57,7 +59,6 @@
		/* Maximum milliseconds to wait for F2 to come up */
		#define SDIO_WAIT_F2RDY 3000

		#define BRCMF_DEFAULT_TXGLOM_SIZE 32 /* max tx frames in glom chain */
		#define BRCMF_DEFAULT_RXGLOM_SIZE 32 /* max rx frames in glom chain */

		struct brcmf_sdiod_freezer {
		@@ -68,10 +69,6 @@ struct brcmf_sdiod_freezer {
		struct completion resumed;
		};

		static int brcmf_sdiod_txglomsz = BRCMF_DEFAULT_TXGLOM_SIZE;
		module_param_named(txglomsz, brcmf_sdiod_txglomsz, int, 0);
		MODULE_PARM_DESC(txglomsz, "maximum tx packet chain size [SDIO]");

		static irqreturn_t brcmf_sdiod_oob_irqhandler(int irq, void *dev_id)
		{
		struct brcmf_bus *bus_if = dev_get_drvdata(dev_id);
		@@ -890,7 +887,8 @@ static void brcmf_sdiod_sgtable_alloc(struct brcmf_sdio_dev *sdiodev)
		if (!sdiodev->sg_support)
		return;

		nents = max_t(uint, BRCMF_DEFAULT_RXGLOM_SIZE, brcmf_sdiod_txglomsz);
		nents = max_t(uint, BRCMF_DEFAULT_RXGLOM_SIZE,
		sdiodev->bus_if->drvr->settings->sdiod_txglomsz);
		nents += (nents >> 4) + 1;

		WARN_ON(nents > sdiodev->max_segment_count);
		@@ -902,7 +900,7 @@ static void brcmf_sdiod_sgtable_alloc(struct brcmf_sdio_dev *sdiodev)
		sdiodev->sg_support = false;
		}

		sdiodev->txglomsz = brcmf_sdiod_txglomsz;
		sdiodev->txglomsz = sdiodev->bus_if->drvr->settings->sdiod_txglomsz;
		}

		#ifdef CONFIG_PM_SLEEP

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

+5 −8

Original line number	Diff line number	Diff line
		@@ -236,10 +236,6 @@ struct parsed_vndr_ies {
		struct parsed_vndr_ie_info ie_info[VNDR_IE_PARSE_LIMIT];
		};

		static int brcmf_roamoff;
		module_param_named(roamoff, brcmf_roamoff, int, S_IRUSR);
		MODULE_PARM_DESC(roamoff, "do not use internal roaming engine");


		static u16 chandef_to_chanspec(struct brcmu_d11inf *d11inf,
		struct cfg80211_chan_def *ch)
		@@ -5395,7 +5391,7 @@ static s32 brcmf_dongle_roam(struct brcmf_if *ifp)
		__le32 roam_delta[2];

		/* Configure beacon timeout value based upon roaming setting */
		if (brcmf_roamoff)
		if (ifp->drvr->settings->roamoff)
		bcn_timeout = BRCMF_DEFAULT_BCN_TIMEOUT_ROAM_OFF;
		else
		bcn_timeout = BRCMF_DEFAULT_BCN_TIMEOUT_ROAM_ON;
		@@ -5409,8 +5405,9 @@ static s32 brcmf_dongle_roam(struct brcmf_if *ifp)
		* roaming.
		*/
		brcmf_dbg(INFO, "Internal Roaming = %s\n",
		brcmf_roamoff ? "Off" : "On");
		err = brcmf_fil_iovar_int_set(ifp, "roam_off", !!(brcmf_roamoff));
		ifp->drvr->settings->roamoff ? "Off" : "On");
		err = brcmf_fil_iovar_int_set(ifp, "roam_off",
		ifp->drvr->settings->roamoff);
		if (err) {
		brcmf_err("roam_off error (%d)\n", err);
		goto roam_setup_done;
		@@ -6082,7 +6079,7 @@ static int brcmf_setup_wiphy(struct wiphy wiphy, struct brcmf_if ifp)
		WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL;
		if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_TDLS))
		wiphy->flags \|= WIPHY_FLAG_SUPPORTS_TDLS;
		if (!brcmf_roamoff)
		if (!ifp->drvr->settings->roamoff)
		wiphy->flags \|= WIPHY_FLAG_SUPPORTS_FW_ROAM;
		wiphy->mgmt_stypes = brcmf_txrx_stypes;
		wiphy->max_remain_on_channel_duration = 5000;

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

+63 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,40 @@ const u8 ALLFFMAC[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
		/* boost value for RSSI_DELTA in preferred join selection */
		#define BRCMF_JOIN_PREF_RSSI_BOOST 8

		#define BRCMF_DEFAULT_TXGLOM_SIZE 32 /* max tx frames in glom chain */

		static int brcmf_sdiod_txglomsz = BRCMF_DEFAULT_TXGLOM_SIZE;
		module_param_named(txglomsz, brcmf_sdiod_txglomsz, int, 0);
		MODULE_PARM_DESC(txglomsz, "Maximum tx packet chain size [SDIO]");

		/* Debug level configuration. See debug.h for bits, sysfs modifiable */
		int brcmf_msg_level;
		module_param_named(debug, brcmf_msg_level, int, S_IRUSR \| S_IWUSR);
		MODULE_PARM_DESC(debug, "Level of debug output");

		static int brcmf_p2p_enable;
		module_param_named(p2pon, brcmf_p2p_enable, int, 0);
		MODULE_PARM_DESC(p2pon, "Enable legacy p2p management functionality");

		static int brcmf_feature_disable;
		module_param_named(feature_disable, brcmf_feature_disable, int, 0);
		MODULE_PARM_DESC(feature_disable, "Disable features");

		static char brcmf_firmware_path[BRCMF_FW_ALTPATH_LEN];
		module_param_string(alternative_fw_path, brcmf_firmware_path,
		BRCMF_FW_ALTPATH_LEN, S_IRUSR);
		MODULE_PARM_DESC(alternative_fw_path, "Alternative firmware path");

		static int brcmf_fcmode;
		module_param_named(fcmode, brcmf_fcmode, int, 0);
		MODULE_PARM_DESC(fcmode, "Mode of firmware signalled flow control");

		static int brcmf_roamoff;
		module_param_named(roamoff, brcmf_roamoff, int, S_IRUSR);
		MODULE_PARM_DESC(roamoff, "Do not use internal roaming engine");

		struct brcmf_mp_global_t brcmf_mp_global;

		int brcmf_c_preinit_dcmds(struct brcmf_if *ifp)
		{
		s8 eventmask[BRCMF_EVENTING_MASK_LEN];
		@@ -178,3 +212,32 @@ void __brcmf_dbg(u32 level, const char func, const char fmt, ...)
		va_end(args);
		}
		#endif

		void brcmf_mp_attach(void)
		{
		strlcpy(brcmf_mp_global.firmware_path, brcmf_firmware_path,
		BRCMF_FW_ALTPATH_LEN);
		}

		int brcmf_mp_device_attach(struct brcmf_pub *drvr)
		{
		drvr->settings = kzalloc(sizeof(*drvr->settings), GFP_ATOMIC);
		if (!drvr->settings) {
		brcmf_err("Failed to alloca storage space for settings\n");
		return -ENOMEM;
		}

		drvr->settings->sdiod_txglomsz = brcmf_sdiod_txglomsz;
		drvr->settings->p2p_enable = !!brcmf_p2p_enable;
		drvr->settings->feature_disable = brcmf_feature_disable;
		drvr->settings->fcmode = brcmf_fcmode;
		drvr->settings->roamoff = !!brcmf_roamoff;

		return 0;
		}

		void brcmf_mp_device_detach(struct brcmf_pub *drvr)
		{
		kfree(drvr->settings);
		}

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

+43 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,49 @@

		extern const u8 ALLFFMAC[ETH_ALEN];

		#define BRCMF_FW_ALTPATH_LEN 256

		/* Definitions for the module global and device specific settings are defined
		* here. Two structs are used for them. brcmf_mp_global_t and brcmf_mp_device.
		* The mp_global is instantiated once in a global struct and gets initialized
		* by the common_attach function which should be called before any other
		* (module) initiliazation takes place. The device specific settings is part
		* of the drvr struct and should be initialized on every brcmf_attach.
		*/

		/**
		* struct brcmf_mp_global_t - Global module paramaters.
		*
		* @firmware_path: Alternative firmware path.
		*/
		struct brcmf_mp_global_t {
		char firmware_path[BRCMF_FW_ALTPATH_LEN];
		};

		extern struct brcmf_mp_global_t brcmf_mp_global;

		/**
		* struct brcmf_mp_device - Device module paramaters.
		*
		* @sdiod_txglomsz: SDIO txglom size.
		* @joinboost_5g_rssi: 5g rssi booost for preferred join selection.
		* @p2p_enable: Legacy P2P0 enable (old wpa_supplicant).
		* @feature_disable: Feature_disable bitmask.
		* @fcmode: FWS flow control.
		* @roamoff: Firmware roaming off?
		*/
		struct brcmf_mp_device {
		int sdiod_txglomsz;
		int joinboost_5g_rssi;
		bool p2p_enable;
		int feature_disable;
		int fcmode;
		bool roamoff;
		};

		void brcmf_mp_attach(void);
		int brcmf_mp_device_attach(struct brcmf_pub *drvr);
		void brcmf_mp_device_detach(struct brcmf_pub *drvr);
		/* Sets dongle media info (drv_version, mac address). */
		int brcmf_c_preinit_dcmds(struct brcmf_if *ifp);

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

+9 −13

Original line number	Diff line number	Diff line
		@@ -57,16 +57,6 @@ MODULE_LICENSE("Dual BSD/GPL");

		#define BRCMF_BSSIDX_INVALID -1

		/* Error bits */
		int brcmf_msg_level;
		module_param_named(debug, brcmf_msg_level, int, S_IRUSR \| S_IWUSR);
		MODULE_PARM_DESC(debug, "level of debug output");

		/* P2P0 enable */
		static int brcmf_p2p_enable;
		module_param_named(p2pon, brcmf_p2p_enable, int, 0);
		MODULE_PARM_DESC(p2pon, "enable legacy p2p management functionality");

		char brcmf_ifname(struct brcmf_if ifp)
		{
		if (!ifp)
		@@ -827,7 +817,7 @@ struct brcmf_if brcmf_add_if(struct brcmf_pub drvr, s32 bsscfgidx, s32 ifidx,
		}
		}

		if (!brcmf_p2p_enable && is_p2pdev) {
		if (!drvr->settings->p2p_enable && is_p2pdev) {
		/* this is P2P_DEVICE interface */
		brcmf_dbg(INFO, "allocate non-netdev interface\n");
		ifp = kzalloc(sizeof(*ifp), GFP_KERNEL);
		@@ -1058,6 +1048,10 @@ int brcmf_attach(struct device *dev)
		drvr->bus_if = dev_get_drvdata(dev);
		drvr->bus_if->drvr = drvr;

		/* Initialize device specific settings */
		if (brcmf_mp_device_attach(drvr))
		goto fail;

		/* attach debug facilities */
		brcmf_debug_attach(drvr);

		@@ -1150,7 +1144,7 @@ int brcmf_bus_start(struct device *dev)
		brcmf_fws_add_interface(ifp);

		drvr->config = brcmf_cfg80211_attach(drvr, bus_if->dev,
		brcmf_p2p_enable);
		drvr->settings->p2p_enable);
		if (drvr->config == NULL) {
		ret = -ENOMEM;
		goto fail;
		@@ -1158,7 +1152,7 @@ int brcmf_bus_start(struct device *dev)

		ret = brcmf_net_attach(ifp, false);

		if ((!ret) && (brcmf_p2p_enable)) {
		if ((!ret) && (drvr->settings->p2p_enable)) {
		p2p_ifp = drvr->iflist[1];
		if (p2p_ifp)
		ret = brcmf_net_p2p_attach(p2p_ifp);
		@@ -1260,6 +1254,8 @@ void brcmf_detach(struct device *dev)

		brcmf_proto_detach(drvr);

		brcmf_mp_device_detach(drvr);

		brcmf_debug_detach(drvr);
		bus_if->drvr = NULL;
		kfree(drvr);