1 From fca6cb2f059e51dec3fcf3589a5abbbcce5b4043 Mon Sep 17 00:00:00 2001
2 From: Arend Van Spriel <arend.vanspriel@broadcom.com>
3 Date: Wed, 23 Nov 2016 10:25:26 +0000
4 Subject: [PATCH] brcmfmac: split up brcmf_pno_config() function
6 The brcmf_pno_config() function handles two configurations in
7 firmware. Split it and have caller sort out what is needed.
9 Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com>
10 Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
11 Reviewed-by: Franky Lin <franky.lin@broadcom.com>
12 Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
13 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
15 .../broadcom/brcm80211/brcmfmac/cfg80211.c | 11 +++-
16 .../net/wireless/broadcom/brcm80211/brcmfmac/pno.c | 60 ++++++++++++++++------
17 .../net/wireless/broadcom/brcm80211/brcmfmac/pno.h | 17 ++++--
18 3 files changed, 68 insertions(+), 20 deletions(-)
20 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
21 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
25 #define BRCMF_SCAN_IE_LEN_MAX 2048
26 +#define BRCMF_SCHED_SCAN_PERIOD 30
28 #define WPA_OUI "\x00\x50\xF2" /* WPA OUI */
29 #define WPA_OUI_TYPE 1
30 @@ -3396,10 +3397,18 @@ brcmf_cfg80211_sched_scan_start(struct w
34 - ret = brcmf_pno_config(ifp, req);
35 + ret = brcmf_pno_config(ifp, BRCMF_SCHED_SCAN_PERIOD, 0, 0);
39 + /* configure random mac */
40 + if (req->flags & NL80211_SCAN_FLAG_RANDOM_ADDR) {
41 + ret = brcmf_pno_set_random(ifp, req->mac_addr,
42 + req->mac_addr_mask);
47 /* configure each match set */
48 for (i = 0; i < req->n_match_sets; i++) {
50 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c
51 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c
53 #include "fwil_types.h"
55 #define BRCMF_PNO_VERSION 2
56 -#define BRCMF_PNO_TIME 30
57 #define BRCMF_PNO_REPEAT 4
58 #define BRCMF_PNO_FREQ_EXPO_MAX 3
59 +#define BRCMF_PNO_IMMEDIATE_SCAN_BIT 3
60 +#define BRCMF_PNO_ENABLE_BD_SCAN_BIT 5
61 #define BRCMF_PNO_ENABLE_ADAPTSCAN_BIT 6
62 +#define BRCMF_PNO_REPORT_SEPARATELY_BIT 11
63 #define BRCMF_PNO_SCAN_INCOMPLETE 0
64 #define BRCMF_PNO_WPA_AUTH_ANY 0xFFFFFFFF
65 #define BRCMF_PNO_HIDDEN_BIT 2
66 @@ -47,42 +49,68 @@ int brcmf_pno_clean(struct brcmf_if *ifp
70 -int brcmf_pno_config(struct brcmf_if *ifp,
71 - struct cfg80211_sched_scan_request *request)
72 +int brcmf_pno_config(struct brcmf_if *ifp, u32 scan_freq,
73 + u32 mscan, u32 bestn)
75 struct brcmf_pno_param_le pfn_param;
76 - struct brcmf_pno_macaddr_le pfn_mac;
83 memset(&pfn_param, 0, sizeof(pfn_param));
84 pfn_param.version = cpu_to_le32(BRCMF_PNO_VERSION);
86 /* set extra pno params */
87 - pfn_param.flags = cpu_to_le16(1 << BRCMF_PNO_ENABLE_ADAPTSCAN_BIT);
88 + flags = BIT(BRCMF_PNO_IMMEDIATE_SCAN_BIT) |
89 + BIT(BRCMF_PNO_REPORT_SEPARATELY_BIT) |
90 + BIT(BRCMF_PNO_ENABLE_ADAPTSCAN_BIT);
91 pfn_param.repeat = BRCMF_PNO_REPEAT;
92 pfn_param.exp = BRCMF_PNO_FREQ_EXPO_MAX;
94 /* set up pno scan fr */
95 - pfn_param.scan_freq = cpu_to_le32(BRCMF_PNO_TIME);
96 + pfn_param.scan_freq = cpu_to_le32(scan_freq);
101 + /* set bestn in firmware */
102 + err = brcmf_fil_iovar_int_set(ifp, "pfnmem", pfnmem);
104 + brcmf_err("failed to set pfnmem\n");
107 + /* get max mscan which the firmware supports */
108 + err = brcmf_fil_iovar_int_get(ifp, "pfnmem", &pfnmem);
110 + brcmf_err("failed to get pfnmem\n");
113 + mscan = min_t(u32, mscan, pfnmem);
114 + pfn_param.mscan = mscan;
115 + pfn_param.bestn = bestn;
116 + flags |= BIT(BRCMF_PNO_ENABLE_BD_SCAN_BIT);
117 + brcmf_dbg(INFO, "mscan=%d, bestn=%d\n", mscan, bestn);
120 + pfn_param.flags = cpu_to_le16(flags);
121 err = brcmf_fil_iovar_data_set(ifp, "pfn_set", &pfn_param,
125 brcmf_err("pfn_set failed, err=%d\n", err);
129 - /* Find out if mac randomization should be turned on */
130 - if (!(request->flags & NL80211_SCAN_FLAG_RANDOM_ADDR))
136 +int brcmf_pno_set_random(struct brcmf_if *ifp, u8 *mac_addr, u8 *mac_mask)
138 + struct brcmf_pno_macaddr_le pfn_mac;
141 pfn_mac.version = BRCMF_PFN_MACADDR_CFG_VER;
142 pfn_mac.flags = BRCMF_PFN_MAC_OUI_ONLY | BRCMF_PFN_SET_MAC_UNASSOC;
144 - memcpy(pfn_mac.mac, request->mac_addr, ETH_ALEN);
145 - mac_mask = request->mac_addr_mask;
146 + memcpy(pfn_mac.mac, mac_addr, ETH_ALEN);
147 for (i = 0; i < ETH_ALEN; i++) {
148 pfn_mac.mac[i] &= mac_mask[i];
149 pfn_mac.mac[i] |= get_random_int() & ~(mac_mask[i]);
150 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.h
151 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.h
152 @@ -30,10 +30,21 @@ int brcmf_pno_clean(struct brcmf_if *ifp
153 * brcmf_pno_config - configure pno parameters.
155 * @ifp: interface object used.
156 - * @request: scheduled scan parameters.
157 + * @scan_freq: scan frequency period in seconds.
158 + * @mscan: maximum number of scans stored in firmware.
159 + * @bestn: maximum number of APs per scan stored in firmware.
161 -int brcmf_pno_config(struct brcmf_if *ifp,
162 - struct cfg80211_sched_scan_request *request);
163 +int brcmf_pno_config(struct brcmf_if *ifp, u32 scan_freq,
164 + u32 mscan, u32 bestn);
167 + * brcmf_pno_set_random - setup randomisation mac address for pno.
169 + * @ifp: interface object used.
170 + * @mac_addr: MAC address used with randomisation.
171 + * @mac_mask: MAC address mask used for randomisation.
173 +int brcmf_pno_set_random(struct brcmf_if *ifp, u8 *mac_addr, u8 *mac_mask);
176 * brcmf_pno_add_ssid - add ssid for pno in firmware.