1 From 250a1b520cd7fdc0df4fc3fedea9066913f49ecf Mon Sep 17 00:00:00 2001
2 From: Gabor Juhos <juhosg@openwrt.org>
3 Date: Sat, 17 Aug 2013 19:31:42 +0200
4 Subject: [PATCH] rt2x00: rt2800: serialize shared memory access
6 The shared memory of the rt2800 devices is accessible
7 through the register offset range between 0x4000 and
8 0x8000. The size of this range is 16KB only and on
9 devices which have more than 16KB of shared memory either
10 the low or the high part of the memory is accessible at a
13 Serialize all accesses to the shared memory by a mutex,
14 in order to avoid concurrent use of that.
16 Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
20 drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 55 +++++++++++++++++++++++++++++-
21 drivers/net/wireless/ralink/rt2x00/rt2800lib.h | 32 +++++++++++++++++
22 drivers/net/wireless/ralink/rt2x00/rt2800mmio.c | 26 ++++++++++++++
23 drivers/net/wireless/ralink/rt2x00/rt2800mmio.h | 4 +++
24 drivers/net/wireless/ralink/rt2x00/rt2800pci.c | 14 ++++++++
25 drivers/net/wireless/ralink/rt2x00/rt2800soc.c | 3 ++
26 drivers/net/wireless/ralink/rt2x00/rt2800usb.c | 31 +++++++++++++++++
27 7 files changed, 164 insertions(+), 1 deletion(-)
29 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
30 +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
31 @@ -451,11 +451,13 @@ void rt2800_mcu_request(struct rt2x00_de
32 rt2x00_set_field32(®, H2M_MAILBOX_CSR_CMD_TOKEN, token);
33 rt2x00_set_field32(®, H2M_MAILBOX_CSR_ARG0, arg0);
34 rt2x00_set_field32(®, H2M_MAILBOX_CSR_ARG1, arg1);
35 + rt2800_shared_mem_lock(rt2x00dev);
36 rt2800_register_write_lock(rt2x00dev, H2M_MAILBOX_CSR, reg);
39 rt2x00_set_field32(®, HOST_CMD_CSR_HOST_COMMAND, command);
40 rt2800_register_write_lock(rt2x00dev, HOST_CMD_CSR, reg);
41 + rt2800_shared_mem_unlock(rt2x00dev);
44 mutex_unlock(&rt2x00dev->csr_mutex);
45 @@ -674,7 +676,9 @@ int rt2800_load_firmware(struct rt2x00_d
46 * Wait for device to stabilize.
48 for (i = 0; i < REGISTER_BUSY_COUNT; i++) {
49 + rt2800_shared_mem_lock(rt2x00dev);
50 rt2800_register_read(rt2x00dev, PBF_SYS_CTRL, ®);
51 + rt2800_shared_mem_unlock(rt2x00dev);
52 if (rt2x00_get_field32(reg, PBF_SYS_CTRL_READY))
55 @@ -694,10 +698,16 @@ int rt2800_load_firmware(struct rt2x00_d
57 * Initialize firmware.
59 + rt2800_shared_mem_lock(rt2x00dev);
60 rt2800_register_write(rt2x00dev, H2M_BBP_AGENT, 0);
61 rt2800_register_write(rt2x00dev, H2M_MAILBOX_CSR, 0);
62 + rt2800_shared_mem_unlock(rt2x00dev);
64 if (rt2x00_is_usb(rt2x00dev)) {
65 + rt2800_shared_mem_lock(rt2x00dev);
66 rt2800_register_write(rt2x00dev, H2M_INT_SRC, 0);
67 + rt2800_shared_mem_unlock(rt2x00dev);
69 rt2800_mcu_request(rt2x00dev, MCU_BOOT_SIGNAL, 0, 0, 0);
72 @@ -1035,8 +1045,10 @@ void rt2800_write_beacon(struct queue_en
74 beacon_base = rt2800_hw_beacon_base(rt2x00dev, entry->entry_idx);
76 + rt2800_shared_mem_lock(rt2x00dev);
77 rt2800_register_multiwrite(rt2x00dev, beacon_base, entry->skb->data,
78 entry->skb->len + padding_len);
79 + rt2800_shared_mem_unlock(rt2x00dev);
80 __set_bit(ENTRY_BCN_ENABLED, &entry->flags);
83 @@ -1066,6 +1078,8 @@ static inline void rt2800_clear_beacon_r
85 beacon_base = rt2800_hw_beacon_base(rt2x00dev, index);
87 + rt2800_shared_mem_lock(rt2x00dev);
90 * For the Beacon base registers we only need to clear
91 * the whole TXWI which (when set to 0) will invalidate
92 @@ -1073,6 +1087,8 @@ static inline void rt2800_clear_beacon_r
94 for (i = 0; i < txwi_desc_size; i += sizeof(__le32))
95 rt2800_register_write(rt2x00dev, beacon_base + i, 0);
97 + rt2800_shared_mem_unlock(rt2x00dev);
100 void rt2800_clear_beacon(struct queue_entry *entry)
101 @@ -1261,7 +1277,9 @@ static void rt2800_delete_wcid_attr(stru
104 offset = MAC_WCID_ATTR_ENTRY(wcid);
105 + rt2800_shared_mem_lock(rt2x00dev);
106 rt2800_register_write(rt2x00dev, offset, 0);
107 + rt2800_shared_mem_unlock(rt2x00dev);
110 static void rt2800_config_wcid_attr_bssidx(struct rt2x00_dev *rt2x00dev,
111 @@ -1274,11 +1292,13 @@ static void rt2800_config_wcid_attr_bssi
112 * The BSS Idx numbers is split in a main value of 3 bits,
113 * and a extended field for adding one additional bit to the value.
115 + rt2800_shared_mem_lock(rt2x00dev);
116 rt2800_register_read(rt2x00dev, offset, ®);
117 rt2x00_set_field32(®, MAC_WCID_ATTRIBUTE_BSS_IDX, (bssidx & 0x7));
118 rt2x00_set_field32(®, MAC_WCID_ATTRIBUTE_BSS_IDX_EXT,
119 (bssidx & 0x8) >> 3);
120 rt2800_register_write(rt2x00dev, offset, reg);
121 + rt2800_shared_mem_unlock(rt2x00dev);
124 static void rt2800_config_wcid_attr_cipher(struct rt2x00_dev *rt2x00dev,
125 @@ -1291,6 +1311,7 @@ static void rt2800_config_wcid_attr_ciph
127 offset = MAC_WCID_ATTR_ENTRY(key->hw_key_idx);
129 + rt2800_shared_mem_lock(rt2x00dev);
130 if (crypto->cmd == SET_KEY) {
131 rt2800_register_read(rt2x00dev, offset, ®);
132 rt2x00_set_field32(®, MAC_WCID_ATTRIBUTE_KEYTAB,
133 @@ -1315,6 +1336,7 @@ static void rt2800_config_wcid_attr_ciph
134 rt2x00_set_field32(®, MAC_WCID_ATTRIBUTE_RX_WIUDF, 0);
135 rt2800_register_write(rt2x00dev, offset, reg);
137 + rt2800_shared_mem_unlock(rt2x00dev);
139 offset = MAC_IVEIV_ENTRY(key->hw_key_idx);
141 @@ -1324,8 +1346,11 @@ static void rt2800_config_wcid_attr_ciph
142 (crypto->cipher == CIPHER_AES))
143 iveiv_entry.iv[3] |= 0x20;
144 iveiv_entry.iv[3] |= key->keyidx << 6;
146 + rt2800_shared_mem_lock(rt2x00dev);
147 rt2800_register_multiwrite(rt2x00dev, offset,
148 &iveiv_entry, sizeof(iveiv_entry));
149 + rt2800_shared_mem_unlock(rt2x00dev);
152 int rt2800_config_shared_key(struct rt2x00_dev *rt2x00dev,
153 @@ -1348,8 +1373,11 @@ int rt2800_config_shared_key(struct rt2x
154 sizeof(key_entry.rx_mic));
156 offset = SHARED_KEY_ENTRY(key->hw_key_idx);
158 + rt2800_shared_mem_lock(rt2x00dev);
159 rt2800_register_multiwrite(rt2x00dev, offset,
160 &key_entry, sizeof(key_entry));
161 + rt2800_shared_mem_unlock(rt2x00dev);
165 @@ -1364,10 +1392,12 @@ int rt2800_config_shared_key(struct rt2x
167 offset = SHARED_KEY_MODE_ENTRY(key->hw_key_idx / 8);
169 + rt2800_shared_mem_lock(rt2x00dev);
170 rt2800_register_read(rt2x00dev, offset, ®);
171 rt2x00_set_field32(®, field,
172 (crypto->cmd == SET_KEY) * crypto->cipher);
173 rt2800_register_write(rt2x00dev, offset, reg);
174 + rt2800_shared_mem_unlock(rt2x00dev);
177 * Update WCID information
178 @@ -1405,8 +1435,11 @@ int rt2800_config_pairwise_key(struct rt
179 sizeof(key_entry.rx_mic));
181 offset = PAIRWISE_KEY_ENTRY(key->hw_key_idx);
183 + rt2800_shared_mem_lock(rt2x00dev);
184 rt2800_register_multiwrite(rt2x00dev, offset,
185 &key_entry, sizeof(key_entry));
186 + rt2800_shared_mem_unlock(rt2x00dev);
190 @@ -4885,14 +4918,19 @@ static int rt2800_init_registers(struct
192 * ASIC will keep garbage value after boot, clear encryption keys.
194 + rt2800_shared_mem_lock(rt2x00dev);
195 for (i = 0; i < 4; i++)
196 rt2800_register_write(rt2x00dev,
197 SHARED_KEY_MODE_ENTRY(i), 0);
198 + rt2800_shared_mem_unlock(rt2x00dev);
200 for (i = 0; i < 256; i++) {
201 rt2800_config_wcid(rt2x00dev, NULL, i);
202 rt2800_delete_wcid_attr(rt2x00dev, i);
204 + rt2800_shared_mem_lock(rt2x00dev);
205 rt2800_register_write(rt2x00dev, MAC_IVEIV_ENTRY(i), 0);
206 + rt2800_shared_mem_unlock(rt2x00dev);
210 @@ -5018,8 +5056,10 @@ static int rt2800_wait_bbp_ready(struct
211 * BBP was enabled after firmware was loaded,
212 * but we need to reactivate it now.
214 + rt2800_shared_mem_lock(rt2x00dev);
215 rt2800_register_write(rt2x00dev, H2M_BBP_AGENT, 0);
216 rt2800_register_write(rt2x00dev, H2M_MAILBOX_CSR, 0);
217 + rt2800_shared_mem_unlock(rt2x00dev);
220 for (i = 0; i < REGISTER_BUSY_COUNT; i++) {
221 @@ -6715,11 +6755,19 @@ int rt2800_enable_radio(struct rt2x00_de
223 * Send signal during boot time to initialize firmware.
225 + rt2800_shared_mem_lock(rt2x00dev);
226 rt2800_register_write(rt2x00dev, H2M_BBP_AGENT, 0);
227 rt2800_register_write(rt2x00dev, H2M_MAILBOX_CSR, 0);
228 - if (rt2x00_is_usb(rt2x00dev))
229 + rt2800_shared_mem_unlock(rt2x00dev);
231 + if (rt2x00_is_usb(rt2x00dev)) {
232 + rt2800_shared_mem_lock(rt2x00dev);
233 rt2800_register_write(rt2x00dev, H2M_INT_SRC, 0);
234 + rt2800_shared_mem_unlock(rt2x00dev);
237 rt2800_mcu_request(rt2x00dev, MCU_BOOT_SIGNAL, 0, 0, 0);
242 @@ -7726,6 +7774,8 @@ int rt2800_probe_hw(struct rt2x00_dev *r
246 + rt2800_shared_mem_init_lock(rt2x00dev);
248 retval = rt2800_probe_rt(rt2x00dev);
251 @@ -7809,8 +7859,11 @@ void rt2800_get_key_seq(struct ieee80211
254 offset = MAC_IVEIV_ENTRY(key->hw_key_idx);
256 + rt2800_shared_mem_lock(rt2x00dev);
257 rt2800_register_multiread(rt2x00dev, offset,
258 &iveiv_entry, sizeof(iveiv_entry));
259 + rt2800_shared_mem_unlock(rt2x00dev);
261 memcpy(&seq->tkip.iv16, &iveiv_entry.iv[0], 2);
262 memcpy(&seq->tkip.iv32, &iveiv_entry.iv[4], 4);
263 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.h
264 +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.h
265 @@ -38,6 +38,11 @@ struct rt2800_drv_data {
266 DECLARE_BITMAP(sta_ids, STA_IDS_SIZE);
268 unsigned long rt2800_flags;
272 + struct mutex mutex;
277 @@ -68,6 +73,10 @@ struct rt2800_ops {
278 const u8 *data, const size_t len);
279 int (*drv_init_registers)(struct rt2x00_dev *rt2x00dev);
280 __le32 *(*drv_get_txwi)(struct queue_entry *entry);
282 + void (*shmem_init_lock)(struct rt2x00_dev *rt2x00dev);
283 + void (*shmem_lock)(struct rt2x00_dev *rt2x00dev);
284 + void (*shmem_unlock)(struct rt2x00_dev *rt2x00dev);
287 static inline bool rt2800_has_high_shared_mem(struct rt2x00_dev *rt2x00dev)
288 @@ -77,6 +86,29 @@ static inline bool rt2800_has_high_share
289 return test_bit(RT2800_HAS_HIGH_SHARED_MEM, &drv_data->rt2800_flags);
292 +static inline void rt2800_shared_mem_init_lock(struct rt2x00_dev *rt2x00dev)
294 + const struct rt2800_ops *rt2800ops = rt2x00dev->ops->drv;
296 + rt2800ops->shmem_init_lock(rt2x00dev);
299 +static inline void rt2800_shared_mem_lock(struct rt2x00_dev *rt2x00dev)
301 + const struct rt2800_ops *rt2800ops = rt2x00dev->ops->drv;
303 + if (rt2800_has_high_shared_mem(rt2x00dev))
304 + rt2800ops->shmem_lock(rt2x00dev);
307 +static inline void rt2800_shared_mem_unlock(struct rt2x00_dev *rt2x00dev)
309 + const struct rt2800_ops *rt2800ops = rt2x00dev->ops->drv;
311 + if (rt2800_has_high_shared_mem(rt2x00dev))
312 + rt2800ops->shmem_unlock(rt2x00dev);
315 static inline void rt2800_register_read(struct rt2x00_dev *rt2x00dev,
316 const unsigned int offset,
318 --- a/drivers/net/wireless/ralink/rt2x00/rt2800mmio.c
319 +++ b/drivers/net/wireless/ralink/rt2x00/rt2800mmio.c
320 @@ -820,8 +820,10 @@ int rt2800mmio_init_registers(struct rt2
321 rt2x00_set_field32(®, WPDMA_RST_IDX_DRX_IDX0, 1);
322 rt2x00mmio_register_write(rt2x00dev, WPDMA_RST_IDX, reg);
324 + rt2800_shared_mem_lock(rt2x00dev);
325 rt2x00mmio_register_write(rt2x00dev, PBF_SYS_CTRL, 0x00000e1f);
326 rt2x00mmio_register_write(rt2x00dev, PBF_SYS_CTRL, 0x00000e00);
327 + rt2800_shared_mem_unlock(rt2x00dev);
329 if (rt2x00_is_pcie(rt2x00dev) &&
330 (rt2x00_rt(rt2x00dev, RT3090) ||
331 @@ -865,6 +867,30 @@ int rt2800mmio_enable_radio(struct rt2x0
333 EXPORT_SYMBOL_GPL(rt2800mmio_enable_radio);
335 +void rt2800mmio_shmem_init_lock(struct rt2x00_dev *rt2x00dev)
337 + struct rt2800_drv_data *drv_data = rt2x00dev->drv_data;
339 + spin_lock_init(&drv_data->shmem_lock.spin);
341 +EXPORT_SYMBOL_GPL(rt2800mmio_shmem_init_lock);
343 +void rt2800mmio_shmem_lock(struct rt2x00_dev *rt2x00dev)
345 + struct rt2800_drv_data *drv_data = rt2x00dev->drv_data;
347 + spin_lock_bh(&drv_data->shmem_lock.spin);
349 +EXPORT_SYMBOL_GPL(rt2800mmio_shmem_lock);
351 +void rt2800mmio_shmem_unlock(struct rt2x00_dev *rt2x00dev)
353 + struct rt2800_drv_data *drv_data = rt2x00dev->drv_data;
355 + spin_unlock_bh(&drv_data->shmem_lock.spin);
357 +EXPORT_SYMBOL_GPL(rt2800mmio_shmem_unlock);
359 MODULE_AUTHOR(DRV_PROJECT);
360 MODULE_VERSION(DRV_VERSION);
361 MODULE_DESCRIPTION("rt2800 MMIO library");
362 --- a/drivers/net/wireless/ralink/rt2x00/rt2800mmio.h
363 +++ b/drivers/net/wireless/ralink/rt2x00/rt2800mmio.h
364 @@ -160,4 +160,8 @@ int rt2800mmio_init_registers(struct rt2
365 /* Device state switch handlers. */
366 int rt2800mmio_enable_radio(struct rt2x00_dev *rt2x00dev);
368 +void rt2800mmio_shmem_init_lock(struct rt2x00_dev *rt2x00dev);
369 +void rt2800mmio_shmem_lock(struct rt2x00_dev *rt2x00dev);
370 +void rt2800mmio_shmem_unlock(struct rt2x00_dev *rt2x00dev);
372 #endif /* RT2800MMIO_H */
373 --- a/drivers/net/wireless/ralink/rt2x00/rt2800pci.c
374 +++ b/drivers/net/wireless/ralink/rt2x00/rt2800pci.c
375 @@ -69,7 +69,9 @@ static void rt2800pci_mcu_status(struct
378 for (i = 0; i < 200; i++) {
379 + rt2800_shared_mem_lock(rt2x00dev);
380 rt2x00mmio_register_read(rt2x00dev, H2M_MAILBOX_CID, ®);
381 + rt2800_shared_mem_unlock(rt2x00dev);
383 if ((rt2x00_get_field32(reg, H2M_MAILBOX_CID_CMD0) == token) ||
384 (rt2x00_get_field32(reg, H2M_MAILBOX_CID_CMD1) == token) ||
385 @@ -83,8 +85,10 @@ static void rt2800pci_mcu_status(struct
387 rt2x00_err(rt2x00dev, "MCU request failed, no response from hardware\n");
389 + rt2800_shared_mem_lock(rt2x00dev);
390 rt2x00mmio_register_write(rt2x00dev, H2M_MAILBOX_STATUS, ~0);
391 rt2x00mmio_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0);
392 + rt2800_shared_mem_unlock(rt2x00dev);
395 static void rt2800pci_eepromregister_read(struct eeprom_93cx6 *eeprom)
396 @@ -184,6 +188,8 @@ static int rt2800pci_write_firmware(stru
399 rt2x00_set_field32(®, PBF_SYS_CTRL_HOST_RAM_WRITE, 1);
401 + rt2800_shared_mem_lock(rt2x00dev);
402 rt2x00mmio_register_write(rt2x00dev, PBF_SYS_CTRL, reg);
405 @@ -197,6 +203,7 @@ static int rt2800pci_write_firmware(stru
407 rt2x00mmio_register_write(rt2x00dev, H2M_BBP_AGENT, 0);
408 rt2x00mmio_register_write(rt2x00dev, H2M_MAILBOX_CSR, 0);
409 + rt2800_shared_mem_unlock(rt2x00dev);
413 @@ -213,8 +220,10 @@ static int rt2800pci_enable_radio(struct
416 /* After resume MCU_BOOT_SIGNAL will trash these. */
417 + rt2800_shared_mem_lock(rt2x00dev);
418 rt2x00mmio_register_write(rt2x00dev, H2M_MAILBOX_STATUS, ~0);
419 rt2x00mmio_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0);
420 + rt2800_shared_mem_unlock(rt2x00dev);
422 rt2800_mcu_request(rt2x00dev, MCU_SLEEP, TOKEN_RADIO_OFF, 0xff, 0x02);
423 rt2800pci_mcu_status(rt2x00dev, TOKEN_RADIO_OFF);
424 @@ -233,10 +242,12 @@ static int rt2800pci_set_state(struct rt
426 rt2800pci_mcu_status(rt2x00dev, TOKEN_WAKEUP);
427 } else if (state == STATE_SLEEP) {
428 + rt2800_shared_mem_lock(rt2x00dev);
429 rt2x00mmio_register_write(rt2x00dev, H2M_MAILBOX_STATUS,
431 rt2x00mmio_register_write(rt2x00dev, H2M_MAILBOX_CID,
433 + rt2800_shared_mem_unlock(rt2x00dev);
434 rt2800_mcu_request(rt2x00dev, MCU_SLEEP, TOKEN_SLEEP,
437 @@ -337,6 +348,9 @@ static const struct rt2800_ops rt2800pci
438 .drv_write_firmware = rt2800pci_write_firmware,
439 .drv_init_registers = rt2800mmio_init_registers,
440 .drv_get_txwi = rt2800mmio_get_txwi,
441 + .shmem_init_lock = rt2800mmio_shmem_init_lock,
442 + .shmem_lock = rt2800mmio_shmem_lock,
443 + .shmem_unlock = rt2800mmio_shmem_unlock,
446 static const struct rt2x00lib_ops rt2800pci_rt2x00_ops = {
447 --- a/drivers/net/wireless/ralink/rt2x00/rt2800soc.c
448 +++ b/drivers/net/wireless/ralink/rt2x00/rt2800soc.c
449 @@ -176,6 +176,9 @@ static const struct rt2800_ops rt2800soc
450 .drv_write_firmware = rt2800soc_write_firmware,
451 .drv_init_registers = rt2800mmio_init_registers,
452 .drv_get_txwi = rt2800mmio_get_txwi,
453 + .shmem_init_lock = rt2800mmio_shmem_init_lock,
454 + .shmem_lock = rt2800mmio_shmem_lock,
455 + .shmem_unlock = rt2800mmio_shmem_unlock,
458 static const struct rt2x00lib_ops rt2800soc_rt2x00_ops = {
459 --- a/drivers/net/wireless/ralink/rt2x00/rt2800usb.c
460 +++ b/drivers/net/wireless/ralink/rt2x00/rt2800usb.c
461 @@ -51,6 +51,27 @@ static bool rt2800usb_hwcrypt_disabled(s
462 return modparam_nohwcrypt;
465 +static void rt2800usb_shmem_init_lock(struct rt2x00_dev *rt2x00dev)
467 + struct rt2800_drv_data *drv_data = rt2x00dev->drv_data;
469 + mutex_init(&drv_data->shmem_lock.mutex);
472 +static void rt2800usb_shmem_lock(struct rt2x00_dev *rt2x00dev)
474 + struct rt2800_drv_data *drv_data = rt2x00dev->drv_data;
476 + mutex_lock(&drv_data->shmem_lock.mutex);
479 +static void rt2800usb_shmem_unlock(struct rt2x00_dev *rt2x00dev)
481 + struct rt2800_drv_data *drv_data = rt2x00dev->drv_data;
483 + mutex_unlock(&drv_data->shmem_lock.mutex);
489 @@ -299,8 +320,10 @@ static int rt2800usb_write_firmware(stru
490 data + offset, length);
493 + rt2800_shared_mem_lock(rt2x00dev);
494 rt2x00usb_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0);
495 rt2x00usb_register_write(rt2x00dev, H2M_MAILBOX_STATUS, ~0);
496 + rt2800_shared_mem_unlock(rt2x00dev);
499 * Send firmware request to device to load firmware,
500 @@ -315,7 +338,10 @@ static int rt2800usb_write_firmware(stru
505 + rt2800_shared_mem_lock(rt2x00dev);
506 rt2x00usb_register_write(rt2x00dev, H2M_MAILBOX_CSR, 0);
507 + rt2800_shared_mem_unlock(rt2x00dev);
511 @@ -333,8 +359,10 @@ static int rt2800usb_init_registers(stru
512 if (rt2800_wait_csr_ready(rt2x00dev))
515 + rt2800_shared_mem_lock(rt2x00dev);
516 rt2x00usb_register_read(rt2x00dev, PBF_SYS_CTRL, ®);
517 rt2x00usb_register_write(rt2x00dev, PBF_SYS_CTRL, reg & ~0x00002000);
518 + rt2800_shared_mem_unlock(rt2x00dev);
521 rt2x00_set_field32(®, MAC_SYS_CTRL_RESET_CSR, 1);
522 @@ -863,6 +891,9 @@ static const struct rt2800_ops rt2800usb
523 .drv_write_firmware = rt2800usb_write_firmware,
524 .drv_init_registers = rt2800usb_init_registers,
525 .drv_get_txwi = rt2800usb_get_txwi,
526 + .shmem_init_lock = rt2800usb_shmem_init_lock,
527 + .shmem_lock = rt2800usb_shmem_lock,
528 + .shmem_unlock = rt2800usb_shmem_unlock,
531 static const struct rt2x00lib_ops rt2800usb_rt2x00_ops = {