1 From 8602e62441aba276cafd68034b72162fbc5ca0a6 Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
3 Date: Wed, 6 Feb 2019 12:28:16 +0100
4 Subject: [PATCH] brcmfmac: pass bus to the __brcmf_err() in pcie.c
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
9 This enables dev_err() usage (instead of pr_err()) in the __brcmf_err().
10 It makes error messages more meaningful and is important for debugging
11 errors/bugs on systems with multiple brcmfmac supported devices.
13 All bus files should follow & get updated similarly (soon).
15 Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
16 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
18 .../broadcom/brcm80211/brcmfmac/debug.h | 2 +
19 .../broadcom/brcm80211/brcmfmac/pcie.c | 59 +++++++++++--------
20 2 files changed, 38 insertions(+), 23 deletions(-)
22 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
23 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
24 @@ -52,6 +52,7 @@ void __brcmf_err(struct brcmf_bus *bus,
25 /* Macro for error messages. When debugging / tracing the driver all error
26 * messages are important to us.
29 #define brcmf_err(fmt, ...) \
31 if (IS_ENABLED(CPTCFG_BRCMDBG) || \
32 @@ -59,6 +60,7 @@ void __brcmf_err(struct brcmf_bus *bus,
34 __brcmf_err(NULL, __func__, fmt, ##__VA_ARGS__);\
38 #if defined(DEBUG) || defined(CPTCFG_BRCM_TRACING)
40 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
41 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
43 #include <brcmu_wifi.h>
44 #include <brcm_hw_ids.h>
46 +/* Custom brcmf_err() that takes bus arg and passes it further */
47 +#define brcmf_err(bus, fmt, ...) \
49 + if (IS_ENABLED(CPTCFG_BRCMDBG) || \
50 + IS_ENABLED(CPTCFG_BRCM_TRACING) || \
52 + __brcmf_err(bus, __func__, fmt, ##__VA_ARGS__); \
57 #include "commonring.h"
58 @@ -531,6 +540,7 @@ static void
59 brcmf_pcie_select_core(struct brcmf_pciedev_info *devinfo, u16 coreid)
61 const struct pci_dev *pdev = devinfo->pdev;
62 + struct brcmf_bus *bus = dev_get_drvdata(&pdev->dev);
63 struct brcmf_core *core;
66 @@ -548,7 +558,7 @@ brcmf_pcie_select_core(struct brcmf_pcie
70 - brcmf_err("Unsupported core selected %x\n", coreid);
71 + brcmf_err(bus, "Unsupported core selected %x\n", coreid);
75 @@ -848,9 +858,8 @@ static irqreturn_t brcmf_pcie_isr_thread
77 static int brcmf_pcie_request_irq(struct brcmf_pciedev_info *devinfo)
79 - struct pci_dev *pdev;
81 - pdev = devinfo->pdev;
82 + struct pci_dev *pdev = devinfo->pdev;
83 + struct brcmf_bus *bus = dev_get_drvdata(&pdev->dev);
85 brcmf_pcie_intr_disable(devinfo);
87 @@ -861,7 +870,7 @@ static int brcmf_pcie_request_irq(struct
88 brcmf_pcie_isr_thread, IRQF_SHARED,
89 "brcmf_pcie_intr", devinfo)) {
90 pci_disable_msi(pdev);
91 - brcmf_err("Failed to request IRQ %d\n", pdev->irq);
92 + brcmf_err(bus, "Failed to request IRQ %d\n", pdev->irq);
95 devinfo->irq_allocated = true;
96 @@ -871,15 +880,14 @@ static int brcmf_pcie_request_irq(struct
98 static void brcmf_pcie_release_irq(struct brcmf_pciedev_info *devinfo)
100 - struct pci_dev *pdev;
101 + struct pci_dev *pdev = devinfo->pdev;
102 + struct brcmf_bus *bus = dev_get_drvdata(&pdev->dev);
106 if (!devinfo->irq_allocated)
109 - pdev = devinfo->pdev;
111 brcmf_pcie_intr_disable(devinfo);
112 free_irq(pdev->irq, devinfo);
113 pci_disable_msi(pdev);
114 @@ -891,7 +899,7 @@ static void brcmf_pcie_release_irq(struc
118 - brcmf_err("Still in IRQ (processing) !!!\n");
119 + brcmf_err(bus, "Still in IRQ (processing) !!!\n");
121 status = brcmf_pcie_read_reg32(devinfo, BRCMF_PCIE_PCIE2REG_MAILBOXINT);
122 brcmf_pcie_write_reg32(devinfo, BRCMF_PCIE_PCIE2REG_MAILBOXINT, status);
123 @@ -1102,6 +1110,7 @@ static void brcmf_pcie_release_ringbuffe
125 static int brcmf_pcie_init_ringbuffers(struct brcmf_pciedev_info *devinfo)
127 + struct brcmf_bus *bus = dev_get_drvdata(&devinfo->pdev->dev);
128 struct brcmf_pcie_ringbuf *ring;
129 struct brcmf_pcie_ringbuf *rings;
131 @@ -1254,7 +1263,7 @@ static int brcmf_pcie_init_ringbuffers(s
135 - brcmf_err("Allocating ring buffers failed\n");
136 + brcmf_err(bus, "Allocating ring buffers failed\n");
137 brcmf_pcie_release_ringbuffers(devinfo);
140 @@ -1277,6 +1286,7 @@ brcmf_pcie_release_scratchbuffers(struct
142 static int brcmf_pcie_init_scratchbuffers(struct brcmf_pciedev_info *devinfo)
144 + struct brcmf_bus *bus = dev_get_drvdata(&devinfo->pdev->dev);
148 @@ -1316,7 +1326,7 @@ static int brcmf_pcie_init_scratchbuffer
152 - brcmf_err("Allocating scratch buffers failed\n");
153 + brcmf_err(bus, "Allocating scratch buffers failed\n");
154 brcmf_pcie_release_scratchbuffers(devinfo);
157 @@ -1437,6 +1447,7 @@ static int
158 brcmf_pcie_init_share_ram_info(struct brcmf_pciedev_info *devinfo,
161 + struct brcmf_bus *bus = dev_get_drvdata(&devinfo->pdev->dev);
162 struct brcmf_pcie_shared_info *shared;
165 @@ -1448,7 +1459,8 @@ brcmf_pcie_init_share_ram_info(struct br
166 brcmf_dbg(PCIE, "PCIe protocol version %d\n", shared->version);
167 if ((shared->version > BRCMF_PCIE_MAX_SHARED_VERSION) ||
168 (shared->version < BRCMF_PCIE_MIN_SHARED_VERSION)) {
169 - brcmf_err("Unsupported PCIE version %d\n", shared->version);
170 + brcmf_err(bus, "Unsupported PCIE version %d\n",
175 @@ -1490,6 +1502,7 @@ static int brcmf_pcie_download_fw_nvram(
176 const struct firmware *fw, void *nvram,
179 + struct brcmf_bus *bus = dev_get_drvdata(&devinfo->pdev->dev);
181 u32 sharedram_addr_written;
183 @@ -1544,7 +1557,7 @@ static int brcmf_pcie_download_fw_nvram(
186 if (sharedram_addr == sharedram_addr_written) {
187 - brcmf_err("FW failed to initialize\n");
188 + brcmf_err(bus, "FW failed to initialize\n");
191 brcmf_dbg(PCIE, "Shared RAM addr: 0x%08x\n", sharedram_addr);
192 @@ -1555,16 +1568,15 @@ static int brcmf_pcie_download_fw_nvram(
194 static int brcmf_pcie_get_resource(struct brcmf_pciedev_info *devinfo)
196 - struct pci_dev *pdev;
197 + struct pci_dev *pdev = devinfo->pdev;
198 + struct brcmf_bus *bus = dev_get_drvdata(&pdev->dev);
200 phys_addr_t bar0_addr, bar1_addr;
203 - pdev = devinfo->pdev;
205 err = pci_enable_device(pdev);
207 - brcmf_err("pci_enable_device failed err=%d\n", err);
208 + brcmf_err(bus, "pci_enable_device failed err=%d\n", err);
212 @@ -1577,7 +1589,7 @@ static int brcmf_pcie_get_resource(struc
213 /* read Bar-1 mapped memory range */
214 bar1_size = pci_resource_len(pdev, 2);
215 if ((bar1_size == 0) || (bar1_addr == 0)) {
216 - brcmf_err("BAR1 Not enabled, device size=%ld, addr=%#016llx\n",
217 + brcmf_err(bus, "BAR1 Not enabled, device size=%ld, addr=%#016llx\n",
218 bar1_size, (unsigned long long)bar1_addr);
221 @@ -1586,7 +1598,7 @@ static int brcmf_pcie_get_resource(struc
222 devinfo->tcm = ioremap_nocache(bar1_addr, bar1_size);
224 if (!devinfo->regs || !devinfo->tcm) {
225 - brcmf_err("ioremap() failed (%p,%p)\n", devinfo->regs,
226 + brcmf_err(bus, "ioremap() failed (%p,%p)\n", devinfo->regs,
230 @@ -1873,7 +1885,7 @@ fail_bus:
234 - brcmf_err("failed %x:%x\n", pdev->vendor, pdev->device);
235 + brcmf_err(NULL, "failed %x:%x\n", pdev->vendor, pdev->device);
236 brcmf_pcie_release_resource(devinfo);
238 brcmf_chip_detach(devinfo->ci);
239 @@ -1947,7 +1959,7 @@ static int brcmf_pcie_pm_enter_D3(struct
240 wait_event_timeout(devinfo->mbdata_resp_wait, devinfo->mbdata_completed,
241 BRCMF_PCIE_MBDATA_TIMEOUT);
242 if (!devinfo->mbdata_completed) {
243 - brcmf_err("Timeout on response for entering D3 substate\n");
244 + brcmf_err(bus, "Timeout on response for entering D3 substate\n");
245 brcmf_bus_change_state(bus, BRCMF_BUS_UP);
248 @@ -1993,7 +2005,7 @@ cleanup:
250 err = brcmf_pcie_probe(pdev, NULL);
252 - brcmf_err("probe after resume failed, err=%d\n", err);
253 + brcmf_err(bus, "probe after resume failed, err=%d\n", err);
257 @@ -2066,7 +2078,8 @@ void brcmf_pcie_register(void)
258 brcmf_dbg(PCIE, "Enter\n");
259 err = pci_register_driver(&brcmf_pciedrvr);
261 - brcmf_err("PCIE driver registration failed, err=%d\n", err);
262 + brcmf_err(NULL, "PCIE driver registration failed, err=%d\n",