1 From: Hante Meuleman <meuleman@broadcom.com>
2 Date: Tue, 14 Apr 2015 20:10:33 +0200
3 Subject: [PATCH] brcmfmac: Add support for multiple PCIE devices in
6 With PCIE it is possible to support multiple devices with the
7 same device type. They all load the same nvram file. In order to
8 support this the nvram can specify which part of the nvram is
9 for which pcie device. This patch adds support for these new
12 Reviewed-by: Arend Van Spriel <arend@broadcom.com>
13 Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
14 Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
15 Reviewed-by: Daniel (Deognyoun) Kim <dekim@broadcom.com>
16 Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
17 Signed-off-by: Arend van Spriel <arend@broadcom.com>
20 --- a/drivers/net/wireless/brcm80211/brcmfmac/firmware.c
21 +++ b/drivers/net/wireless/brcm80211/brcmfmac/firmware.c
26 +#define BRCMF_FW_MAX_NVRAM_SIZE 64000
27 +#define BRCMF_FW_NVRAM_DEVPATH_LEN 19 /* devpath0=pcie/1/4/ */
28 +#define BRCMF_FW_NVRAM_PCIEDEV_LEN 9 /* pcie/1/4/ */
30 char brcmf_firmware_path[BRCMF_FW_PATH_LEN];
31 module_param_string(firmware_path, brcmf_firmware_path,
32 BRCMF_FW_PATH_LEN, 0440);
33 @@ -46,6 +50,8 @@ enum nvram_parser_state {
34 * @column: current column in line.
35 * @pos: byte offset in input buffer.
36 * @entry: start position of key,value entry.
37 + * @multi_dev_v1: detect pcie multi device v1 (compressed).
38 + * @multi_dev_v2: detect pcie multi device v2.
41 enum nvram_parser_state state;
42 @@ -56,6 +62,8 @@ struct nvram_parser {
50 static bool is_nvram_char(char c)
51 @@ -108,6 +116,10 @@ static enum nvram_parser_state brcmf_nvr
55 + if (strncmp(&nvp->fwnv->data[nvp->entry], "devpath", 7) == 0)
56 + nvp->multi_dev_v1 = true;
57 + if (strncmp(&nvp->fwnv->data[nvp->entry], "pcie/", 5) == 0)
58 + nvp->multi_dev_v2 = true;
59 } else if (!is_nvram_char(c)) {
60 brcmf_dbg(INFO, "warning: ln=%d:col=%d: '=' expected, skip invalid key entry\n",
61 nvp->line, nvp->column);
62 @@ -133,6 +145,8 @@ brcmf_nvram_handle_value(struct nvram_pa
63 ekv = (u8 *)&nvp->fwnv->data[nvp->pos];
64 skv = (u8 *)&nvp->fwnv->data[nvp->entry];
66 + if (nvp->nvram_len + cplen + 1 >= BRCMF_FW_MAX_NVRAM_SIZE)
68 /* copy to output buffer */
69 memcpy(&nvp->nvram[nvp->nvram_len], skv, cplen);
70 nvp->nvram_len += cplen;
71 @@ -180,10 +194,18 @@ static enum nvram_parser_state
72 static int brcmf_init_nvram_parser(struct nvram_parser *nvp,
73 const struct firmware *nv)
77 memset(nvp, 0, sizeof(*nvp));
79 + /* Limit size to MAX_NVRAM_SIZE, some files contain lot of comment */
80 + if (nv->size > BRCMF_FW_MAX_NVRAM_SIZE)
81 + size = BRCMF_FW_MAX_NVRAM_SIZE;
84 /* Alloc for extra 0 byte + roundup by 4 + length field */
85 - nvp->nvram = kzalloc(nv->size + 1 + 3 + sizeof(u32), GFP_KERNEL);
86 + size += 1 + 3 + sizeof(u32);
87 + nvp->nvram = kzalloc(size, GFP_KERNEL);
91 @@ -192,12 +214,136 @@ static int brcmf_init_nvram_parser(struc
95 +/* brcmf_fw_strip_multi_v1 :Some nvram files contain settings for multiple
96 + * devices. Strip it down for one device, use domain_nr/bus_nr to determine
97 + * which data is to be returned. v1 is the version where nvram is stored
98 + * compressed and "devpath" maps to index for valid entries.
100 +static void brcmf_fw_strip_multi_v1(struct nvram_parser *nvp, u16 domain_nr,
108 + nvram = kzalloc(nvp->nvram_len + 1 + 3 + sizeof(u32), GFP_KERNEL);
112 + /* min length: devpath0=pcie/1/4/ + 0:x=y */
113 + if (nvp->nvram_len < BRCMF_FW_NVRAM_DEVPATH_LEN + 6)
116 + /* First search for the devpathX and see if it is the configuration
117 + * for domain_nr/bus_nr. Search complete nvp
121 + while (i < nvp->nvram_len - BRCMF_FW_NVRAM_DEVPATH_LEN) {
122 + /* Format: devpathX=pcie/Y/Z/
123 + * Y = domain_nr, Z = bus_nr, X = virtual ID
125 + if ((strncmp(&nvp->nvram[i], "devpath", 7) == 0) &&
126 + (strncmp(&nvp->nvram[i + 8], "=pcie/", 6) == 0)) {
127 + if (((nvp->nvram[i + 14] - '0') == domain_nr) &&
128 + ((nvp->nvram[i + 16] - '0') == bus_nr)) {
129 + id = nvp->nvram[i + 7] - '0';
134 + while (nvp->nvram[i] != 0)
141 + /* Now copy all valid entries, release old nvram and assign new one */
144 + while (i < nvp->nvram_len) {
145 + if ((nvp->nvram[i] - '0' == id) && (nvp->nvram[i + 1] == ':')) {
147 + while (nvp->nvram[i] != 0) {
148 + nvram[j] = nvp->nvram[i];
155 + while (nvp->nvram[i] != 0)
160 + nvp->nvram = nvram;
161 + nvp->nvram_len = j;
166 + nvp->nvram_len = 0;
169 +/* brcmf_fw_strip_multi_v2 :Some nvram files contain settings for multiple
170 + * devices. Strip it down for one device, use domain_nr/bus_nr to determine
171 + * which data is to be returned. v2 is the version where nvram is stored
172 + * uncompressed, all relevant valid entries are identified by
173 + * pcie/domain_nr/bus_nr:
175 +static void brcmf_fw_strip_multi_v2(struct nvram_parser *nvp, u16 domain_nr,
181 + nvram = kzalloc(nvp->nvram_len + 1 + 3 + sizeof(u32), GFP_KERNEL);
185 + /* Copy all valid entries, release old nvram and assign new one.
186 + * Valid entries are of type pcie/X/Y/ where X = domain_nr and
191 + while (i < nvp->nvram_len - BRCMF_FW_NVRAM_PCIEDEV_LEN) {
192 + if ((strncmp(&nvp->nvram[i], "pcie/", 5) == 0) &&
193 + (nvp->nvram[i + 6] == '/') && (nvp->nvram[i + 8] == '/') &&
194 + ((nvp->nvram[i + 5] - '0') == domain_nr) &&
195 + ((nvp->nvram[i + 7] - '0') == bus_nr)) {
196 + i += BRCMF_FW_NVRAM_PCIEDEV_LEN;
197 + while (nvp->nvram[i] != 0) {
198 + nvram[j] = nvp->nvram[i];
205 + while (nvp->nvram[i] != 0)
210 + nvp->nvram = nvram;
211 + nvp->nvram_len = j;
215 + nvp->nvram_len = 0;
218 /* brcmf_nvram_strip :Takes a buffer of "<var>=<value>\n" lines read from a fil
219 * and ending in a NUL. Removes carriage returns, empty lines, comment lines,
220 * and converts newlines to NULs. Shortens buffer as needed and pads with NULs.
221 * End of buffer is completed with token identifying length of buffer.
223 -static void *brcmf_fw_nvram_strip(const struct firmware *nv, u32 *new_length)
224 +static void *brcmf_fw_nvram_strip(const struct firmware *nv, u32 *new_length,
225 + u16 domain_nr, u16 bus_nr)
227 struct nvram_parser nvp;
229 @@ -212,6 +358,16 @@ static void *brcmf_fw_nvram_strip(const
230 if (nvp.state == END)
233 + if (nvp.multi_dev_v1)
234 + brcmf_fw_strip_multi_v1(&nvp, domain_nr, bus_nr);
235 + else if (nvp.multi_dev_v2)
236 + brcmf_fw_strip_multi_v2(&nvp, domain_nr, bus_nr);
238 + if (nvp.nvram_len == 0) {
244 *new_length = roundup(nvp.nvram_len + 1, 4);
245 while (pad != *new_length) {
246 @@ -239,6 +395,8 @@ struct brcmf_fw {
248 const struct firmware *code;
249 const char *nvram_name;
252 void (*done)(struct device *dev, const struct firmware *fw,
253 void *nvram_image, u32 nvram_len);
255 @@ -254,7 +412,8 @@ static void brcmf_fw_request_nvram_done(
259 - nvram = brcmf_fw_nvram_strip(fw, &nvram_length);
260 + nvram = brcmf_fw_nvram_strip(fw, &nvram_length,
261 + fwctx->domain_nr, fwctx->bus_nr);
262 release_firmware(fw);
263 if (!nvram && !(fwctx->flags & BRCMF_FW_REQ_NV_OPTIONAL))
265 @@ -309,11 +468,12 @@ fail:
269 -int brcmf_fw_get_firmwares(struct device *dev, u16 flags,
270 - const char *code, const char *nvram,
271 - void (*fw_cb)(struct device *dev,
272 - const struct firmware *fw,
273 - void *nvram_image, u32 nvram_len))
274 +int brcmf_fw_get_firmwares_pcie(struct device *dev, u16 flags,
275 + const char *code, const char *nvram,
276 + void (*fw_cb)(struct device *dev,
277 + const struct firmware *fw,
278 + void *nvram_image, u32 nvram_len),
279 + u16 domain_nr, u16 bus_nr)
281 struct brcmf_fw *fwctx;
283 @@ -333,8 +493,21 @@ int brcmf_fw_get_firmwares(struct device
285 if (flags & BRCMF_FW_REQUEST_NVRAM)
286 fwctx->nvram_name = nvram;
287 + fwctx->domain_nr = domain_nr;
288 + fwctx->bus_nr = bus_nr;
290 return request_firmware_nowait(THIS_MODULE, true, code, dev,
292 brcmf_fw_request_code_done);
295 +int brcmf_fw_get_firmwares(struct device *dev, u16 flags,
296 + const char *code, const char *nvram,
297 + void (*fw_cb)(struct device *dev,
298 + const struct firmware *fw,
299 + void *nvram_image, u32 nvram_len))
301 + return brcmf_fw_get_firmwares_pcie(dev, flags, code, nvram, fw_cb, 0,
305 --- a/drivers/net/wireless/brcm80211/brcmfmac/firmware.h
306 +++ b/drivers/net/wireless/brcm80211/brcmfmac/firmware.h
307 @@ -32,6 +32,12 @@ void brcmf_fw_nvram_free(void *nvram);
308 * fails it will not use the callback, but call device_release_driver()
309 * instead which will call the driver .remove() callback.
311 +int brcmf_fw_get_firmwares_pcie(struct device *dev, u16 flags,
312 + const char *code, const char *nvram,
313 + void (*fw_cb)(struct device *dev,
314 + const struct firmware *fw,
315 + void *nvram_image, u32 nvram_len),
316 + u16 domain_nr, u16 bus_nr);
317 int brcmf_fw_get_firmwares(struct device *dev, u16 flags,
318 const char *code, const char *nvram,
319 void (*fw_cb)(struct device *dev,
320 --- a/drivers/net/wireless/brcm80211/brcmfmac/pcie.c
321 +++ b/drivers/net/wireless/brcm80211/brcmfmac/pcie.c
322 @@ -1649,8 +1649,13 @@ brcmf_pcie_probe(struct pci_dev *pdev, c
323 struct brcmf_pciedev_info *devinfo;
324 struct brcmf_pciedev *pcie_bus_dev;
325 struct brcmf_bus *bus;
329 - brcmf_dbg(PCIE, "Enter %x:%x\n", pdev->vendor, pdev->device);
330 + domain_nr = pci_domain_nr(pdev->bus) + 1;
331 + bus_nr = pdev->bus->number;
332 + brcmf_dbg(PCIE, "Enter %x:%x (%d/%d)\n", pdev->vendor, pdev->device,
333 + domain_nr, bus_nr);
336 devinfo = kzalloc(sizeof(*devinfo), GFP_KERNEL);
337 @@ -1699,10 +1704,10 @@ brcmf_pcie_probe(struct pci_dev *pdev, c
341 - ret = brcmf_fw_get_firmwares(bus->dev, BRCMF_FW_REQUEST_NVRAM |
342 - BRCMF_FW_REQ_NV_OPTIONAL,
343 - devinfo->fw_name, devinfo->nvram_name,
345 + ret = brcmf_fw_get_firmwares_pcie(bus->dev, BRCMF_FW_REQUEST_NVRAM |
346 + BRCMF_FW_REQ_NV_OPTIONAL,
347 + devinfo->fw_name, devinfo->nvram_name,
348 + brcmf_pcie_setup, domain_nr, bus_nr);