projects / openwrt.git / blob
? search:
summary | shortlog | log | commit | commitdiff | tree
history | raw | HEAD
ar71xx: fix sections mismatch warnings in the nand drivers
[openwrt.git] / target / linux / generic / patches-2.6.31 / 941-ssb_update.patch
1 --- a/drivers/ssb/Kconfig
2 +++ b/drivers/ssb/Kconfig
3 @@ -66,6 +66,20 @@ config SSB_PCMCIAHOST
4
5 If unsure, say N
6
7 +config SSB_SDIOHOST_POSSIBLE
8 + bool
9 + depends on SSB && (MMC = y || MMC = SSB)
10 + default y
11 +
12 +config SSB_SDIOHOST
13 + bool "Support for SSB on SDIO-bus host"
14 + depends on SSB_SDIOHOST_POSSIBLE
15 + help
16 + Support for a Sonics Silicon Backplane on top
17 + of a SDIO device.
18 +
19 + If unsure, say N
20 +
21 config SSB_SILENT
22 bool "No SSB kernel messages"
23 depends on SSB && EMBEDDED
24 --- a/drivers/ssb/Makefile
25 +++ b/drivers/ssb/Makefile
26 @@ -6,6 +6,7 @@ ssb-$(CONFIG_SSB_SPROM) += sprom.o
27 # host support
28 ssb-$(CONFIG_SSB_PCIHOST) += pci.o pcihost_wrapper.o
29 ssb-$(CONFIG_SSB_PCMCIAHOST) += pcmcia.o
30 +ssb-$(CONFIG_SSB_SDIOHOST) += sdio.o
31
32 # built-in drivers
33 ssb-y += driver_chipcommon.o
34 --- a/drivers/ssb/b43_pci_bridge.c
35 +++ b/drivers/ssb/b43_pci_bridge.c
36 @@ -5,12 +5,13 @@
37 * because of its small size we include it in the SSB core
38 * instead of creating a standalone module.
39 *
40 - * Copyright 2007 Michael Buesch <mb@bu3sch.de>
41 + * Copyright 2007 Michael Buesch <m@bues.ch>
42 *
43 * Licensed under the GNU/GPL. See COPYING for details.
44 */
45
46 #include <linux/pci.h>
47 +#include <linux/module.h>
48 #include <linux/ssb/ssb.h>
49
50 #include "ssb_private.h"
51 @@ -24,6 +25,7 @@ static const struct pci_device_id b43_pc
52 { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4312) },
53 { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4315) },
54 { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4318) },
55 + { PCI_DEVICE(PCI_VENDOR_ID_BCM_GVC, 0x4318) },
56 { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4319) },
57 { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4320) },
58 { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4321) },
59 --- a/drivers/ssb/driver_chipcommon.c
60 +++ b/drivers/ssb/driver_chipcommon.c
61 @@ -3,7 +3,7 @@
62 * Broadcom ChipCommon core driver
63 *
64 * Copyright 2005, Broadcom Corporation
65 - * Copyright 2006, 2007, Michael Buesch <mb@bu3sch.de>
66 + * Copyright 2006, 2007, Michael Buesch <m@bues.ch>
67 *
68 * Licensed under the GNU/GPL. See COPYING for details.
69 */
70 @@ -46,40 +46,66 @@ void ssb_chipco_set_clockmode(struct ssb
71 if (!ccdev)
72 return;
73 bus = ccdev->bus;
74 +
75 + /* We support SLOW only on 6..9 */
76 + if (ccdev->id.revision >= 10 && mode == SSB_CLKMODE_SLOW)
77 + mode = SSB_CLKMODE_DYNAMIC;
78 +
79 + if (cc->capabilities & SSB_CHIPCO_CAP_PMU)
80 + return; /* PMU controls clockmode, separated function needed */
81 + SSB_WARN_ON(ccdev->id.revision >= 20);
82 +
83 /* chipcommon cores prior to rev6 don't support dynamic clock control */
84 if (ccdev->id.revision < 6)
85 return;
86 - /* chipcommon cores rev10 are a whole new ball game */
87 +
88 + /* ChipCommon cores rev10+ need testing */
89 if (ccdev->id.revision >= 10)
90 return;
91 +
92 if (!(cc->capabilities & SSB_CHIPCO_CAP_PCTL))
93 return;
94
95 switch (mode) {
96 - case SSB_CLKMODE_SLOW:
97 + case SSB_CLKMODE_SLOW: /* For revs 6..9 only */
98 tmp = chipco_read32(cc, SSB_CHIPCO_SLOWCLKCTL);
99 tmp |= SSB_CHIPCO_SLOWCLKCTL_FSLOW;
100 chipco_write32(cc, SSB_CHIPCO_SLOWCLKCTL, tmp);
101 break;
102 case SSB_CLKMODE_FAST:
103 - ssb_pci_xtal(bus, SSB_GPIO_XTAL, 1); /* Force crystal on */
104 - tmp = chipco_read32(cc, SSB_CHIPCO_SLOWCLKCTL);
105 - tmp &= ~SSB_CHIPCO_SLOWCLKCTL_FSLOW;
106 - tmp |= SSB_CHIPCO_SLOWCLKCTL_IPLL;
107 - chipco_write32(cc, SSB_CHIPCO_SLOWCLKCTL, tmp);
108 + if (ccdev->id.revision < 10) {
109 + ssb_pci_xtal(bus, SSB_GPIO_XTAL, 1); /* Force crystal on */
110 + tmp = chipco_read32(cc, SSB_CHIPCO_SLOWCLKCTL);
111 + tmp &= ~SSB_CHIPCO_SLOWCLKCTL_FSLOW;
112 + tmp |= SSB_CHIPCO_SLOWCLKCTL_IPLL;
113 + chipco_write32(cc, SSB_CHIPCO_SLOWCLKCTL, tmp);
114 + } else {
115 + chipco_write32(cc, SSB_CHIPCO_SYSCLKCTL,
116 + (chipco_read32(cc, SSB_CHIPCO_SYSCLKCTL) |
117 + SSB_CHIPCO_SYSCLKCTL_FORCEHT));
118 + /* udelay(150); TODO: not available in early init */
119 + }
120 break;
121 case SSB_CLKMODE_DYNAMIC:
122 - tmp = chipco_read32(cc, SSB_CHIPCO_SLOWCLKCTL);
123 - tmp &= ~SSB_CHIPCO_SLOWCLKCTL_FSLOW;
124 - tmp &= ~SSB_CHIPCO_SLOWCLKCTL_IPLL;
125 - tmp &= ~SSB_CHIPCO_SLOWCLKCTL_ENXTAL;
126 - if ((tmp & SSB_CHIPCO_SLOWCLKCTL_SRC) != SSB_CHIPCO_SLOWCLKCTL_SRC_XTAL)
127 - tmp |= SSB_CHIPCO_SLOWCLKCTL_ENXTAL;
128 - chipco_write32(cc, SSB_CHIPCO_SLOWCLKCTL, tmp);
129 -
130 - /* for dynamic control, we have to release our xtal_pu "force on" */
131 - if (tmp & SSB_CHIPCO_SLOWCLKCTL_ENXTAL)
132 - ssb_pci_xtal(bus, SSB_GPIO_XTAL, 0);
133 + if (ccdev->id.revision < 10) {
134 + tmp = chipco_read32(cc, SSB_CHIPCO_SLOWCLKCTL);
135 + tmp &= ~SSB_CHIPCO_SLOWCLKCTL_FSLOW;
136 + tmp &= ~SSB_CHIPCO_SLOWCLKCTL_IPLL;
137 + tmp &= ~SSB_CHIPCO_SLOWCLKCTL_ENXTAL;
138 + if ((tmp & SSB_CHIPCO_SLOWCLKCTL_SRC) !=
139 + SSB_CHIPCO_SLOWCLKCTL_SRC_XTAL)
140 + tmp |= SSB_CHIPCO_SLOWCLKCTL_ENXTAL;
141 + chipco_write32(cc, SSB_CHIPCO_SLOWCLKCTL, tmp);
142 +
143 + /* For dynamic control, we have to release our xtal_pu
144 + * "force on" */
145 + if (tmp & SSB_CHIPCO_SLOWCLKCTL_ENXTAL)
146 + ssb_pci_xtal(bus, SSB_GPIO_XTAL, 0);
147 + } else {
148 + chipco_write32(cc, SSB_CHIPCO_SYSCLKCTL,
149 + (chipco_read32(cc, SSB_CHIPCO_SYSCLKCTL) &
150 + ~SSB_CHIPCO_SYSCLKCTL_FORCEHT));
151 + }
152 break;
153 default:
154 SSB_WARN_ON(1);
155 @@ -209,6 +235,24 @@ static void chipco_powercontrol_init(str
156 }
157 }
158
159 +/* http://bcm-v4.sipsolutions.net/802.11/PmuFastPwrupDelay */
160 +static u16 pmu_fast_powerup_delay(struct ssb_chipcommon *cc)
161 +{
162 + struct ssb_bus *bus = cc->dev->bus;
163 +
164 + switch (bus->chip_id) {
165 + case 0x4312:
166 + case 0x4322:
167 + case 0x4328:
168 + return 7000;
169 + case 0x4325:
170 + /* TODO: */
171 + default:
172 + return 15000;
173 + }
174 +}
175 +
176 +/* http://bcm-v4.sipsolutions.net/802.11/ClkctlFastPwrupDelay */
177 static void calc_fast_powerup_delay(struct ssb_chipcommon *cc)
178 {
179 struct ssb_bus *bus = cc->dev->bus;
180 @@ -218,6 +262,12 @@ static void calc_fast_powerup_delay(stru
181
182 if (bus->bustype != SSB_BUSTYPE_PCI)
183 return;
184 +
185 + if (cc->capabilities & SSB_CHIPCO_CAP_PMU) {
186 + cc->fast_pwrup_delay = pmu_fast_powerup_delay(cc);
187 + return;
188 + }
189 +
190 if (!(cc->capabilities & SSB_CHIPCO_CAP_PCTL))
191 return;
192
193 @@ -233,6 +283,15 @@ void ssb_chipcommon_init(struct ssb_chip
194 {
195 if (!cc->dev)
196 return; /* We don't have a ChipCommon */
197 + if (cc->dev->id.revision >= 11)
198 + cc->status = chipco_read32(cc, SSB_CHIPCO_CHIPSTAT);
199 + ssb_dprintk(KERN_INFO PFX "chipcommon status is 0x%x\n", cc->status);
200 +
201 + if (cc->dev->id.revision >= 20) {
202 + chipco_write32(cc, SSB_CHIPCO_GPIOPULLUP, 0);
203 + chipco_write32(cc, SSB_CHIPCO_GPIOPULLDOWN, 0);
204 + }
205 +
206 ssb_pmu_init(cc);
207 chipco_powercontrol_init(cc);
208 ssb_chipco_set_clockmode(cc, SSB_CLKMODE_FAST);
209 @@ -370,6 +429,7 @@ u32 ssb_chipco_gpio_control(struct ssb_c
210 {
211 return chipco_write32_masked(cc, SSB_CHIPCO_GPIOCTL, mask, value);
212 }
213 +EXPORT_SYMBOL(ssb_chipco_gpio_control);
214
215 u32 ssb_chipco_gpio_intmask(struct ssb_chipcommon *cc, u32 mask, u32 value)
216 {
217 --- a/drivers/ssb/driver_chipcommon_pmu.c
218 +++ b/drivers/ssb/driver_chipcommon_pmu.c
219 @@ -2,7 +2,7 @@
220 * Sonics Silicon Backplane
221 * Broadcom ChipCommon Power Management Unit driver
222 *
223 - * Copyright 2009, Michael Buesch <mb@bu3sch.de>
224 + * Copyright 2009, Michael Buesch <m@bues.ch>
225 * Copyright 2007, Broadcom Corporation
226 *
227 * Licensed under the GNU/GPL. See COPYING for details.
228 @@ -28,6 +28,21 @@ static void ssb_chipco_pll_write(struct
229 chipco_write32(cc, SSB_CHIPCO_PLLCTL_DATA, value);
230 }
231
232 +static void ssb_chipco_regctl_maskset(struct ssb_chipcommon *cc,
233 + u32 offset, u32 mask, u32 set)
234 +{
235 + u32 value;
236 +
237 + chipco_read32(cc, SSB_CHIPCO_REGCTL_ADDR);
238 + chipco_write32(cc, SSB_CHIPCO_REGCTL_ADDR, offset);
239 + chipco_read32(cc, SSB_CHIPCO_REGCTL_ADDR);
240 + value = chipco_read32(cc, SSB_CHIPCO_REGCTL_DATA);
241 + value &= mask;
242 + value |= set;
243 + chipco_write32(cc, SSB_CHIPCO_REGCTL_DATA, value);
244 + chipco_read32(cc, SSB_CHIPCO_REGCTL_DATA);
245 +}
246 +
247 struct pmu0_plltab_entry {
248 u16 freq; /* Crystal frequency in kHz.*/
249 u8 xf; /* Crystal frequency value for PMU control */
250 @@ -317,6 +332,12 @@ static void ssb_pmu_pll_init(struct ssb_
251 case 0x5354:
252 ssb_pmu0_pllinit_r0(cc, crystalfreq);
253 break;
254 + case 0x4322:
255 + if (cc->pmu.rev == 2) {
256 + chipco_write32(cc, SSB_CHIPCO_PLLCTL_ADDR, 0x0000000A);
257 + chipco_write32(cc, SSB_CHIPCO_PLLCTL_DATA, 0x380005C0);
258 + }
259 + break;
260 default:
261 ssb_printk(KERN_ERR PFX
262 "ERROR: PLL init unknown for device %04X\n",
263 @@ -396,12 +417,15 @@ static void ssb_pmu_resources_init(struc
264 u32 min_msk = 0, max_msk = 0;
265 unsigned int i;
266 const struct pmu_res_updown_tab_entry *updown_tab = NULL;
267 - unsigned int updown_tab_size;
268 + unsigned int updown_tab_size = 0;
269 const struct pmu_res_depend_tab_entry *depend_tab = NULL;
270 - unsigned int depend_tab_size;
271 + unsigned int depend_tab_size = 0;
272
273 switch (bus->chip_id) {
274 case 0x4312:
275 + min_msk = 0xCBB;
276 + break;
277 + case 0x4322:
278 /* We keep the default settings:
279 * min_msk = 0xCBB
280 * max_msk = 0x7FFFF
281 @@ -480,9 +504,9 @@ static void ssb_pmu_resources_init(struc
282 chipco_write32(cc, SSB_CHIPCO_PMU_MAXRES_MSK, max_msk);
283 }
284
285 +/* http://bcm-v4.sipsolutions.net/802.11/SSB/PmuInit */
286 void ssb_pmu_init(struct ssb_chipcommon *cc)
287 {
288 - struct ssb_bus *bus = cc->dev->bus;
289 u32 pmucap;
290
291 if (!(cc->capabilities & SSB_CHIPCO_CAP_PMU))
292 @@ -494,15 +518,91 @@ void ssb_pmu_init(struct ssb_chipcommon
293 ssb_dprintk(KERN_DEBUG PFX "Found rev %u PMU (capabilities 0x%08X)\n",
294 cc->pmu.rev, pmucap);
295
296 - if (cc->pmu.rev >= 1) {
297 - if ((bus->chip_id == 0x4325) && (bus->chip_rev < 2)) {
298 - chipco_mask32(cc, SSB_CHIPCO_PMU_CTL,
299 - ~SSB_CHIPCO_PMU_CTL_NOILPONW);
300 - } else {
301 - chipco_set32(cc, SSB_CHIPCO_PMU_CTL,
302 - SSB_CHIPCO_PMU_CTL_NOILPONW);
303 - }
304 - }
305 + if (cc->pmu.rev == 1)
306 + chipco_mask32(cc, SSB_CHIPCO_PMU_CTL,
307 + ~SSB_CHIPCO_PMU_CTL_NOILPONW);
308 + else
309 + chipco_set32(cc, SSB_CHIPCO_PMU_CTL,
310 + SSB_CHIPCO_PMU_CTL_NOILPONW);
311 ssb_pmu_pll_init(cc);
312 ssb_pmu_resources_init(cc);
313 }
314 +
315 +void ssb_pmu_set_ldo_voltage(struct ssb_chipcommon *cc,
316 + enum ssb_pmu_ldo_volt_id id, u32 voltage)
317 +{
318 + struct ssb_bus *bus = cc->dev->bus;
319 + u32 addr, shift, mask;
320 +
321 + switch (bus->chip_id) {
322 + case 0x4328:
323 + case 0x5354:
324 + switch (id) {
325 + case LDO_VOLT1:
326 + addr = 2;
327 + shift = 25;
328 + mask = 0xF;
329 + break;
330 + case LDO_VOLT2:
331 + addr = 3;
332 + shift = 1;
333 + mask = 0xF;
334 + break;
335 + case LDO_VOLT3:
336 + addr = 3;
337 + shift = 9;
338 + mask = 0xF;
339 + break;
340 + case LDO_PAREF:
341 + addr = 3;
342 + shift = 17;
343 + mask = 0x3F;
344 + break;
345 + default:
346 + SSB_WARN_ON(1);
347 + return;
348 + }
349 + break;
350 + case 0x4312:
351 + if (SSB_WARN_ON(id != LDO_PAREF))
352 + return;
353 + addr = 0;
354 + shift = 21;
355 + mask = 0x3F;
356 + break;
357 + default:
358 + return;
359 + }
360 +
361 + ssb_chipco_regctl_maskset(cc, addr, ~(mask << shift),
362 + (voltage & mask) << shift);
363 +}
364 +
365 +void ssb_pmu_set_ldo_paref(struct ssb_chipcommon *cc, bool on)
366 +{
367 + struct ssb_bus *bus = cc->dev->bus;
368 + int ldo;
369 +
370 + switch (bus->chip_id) {
371 + case 0x4312:
372 + ldo = SSB_PMURES_4312_PA_REF_LDO;
373 + break;
374 + case 0x4328:
375 + ldo = SSB_PMURES_4328_PA_REF_LDO;
376 + break;
377 + case 0x5354:
378 + ldo = SSB_PMURES_5354_PA_REF_LDO;
379 + break;
380 + default:
381 + return;
382 + }
383 +
384 + if (on)
385 + chipco_set32(cc, SSB_CHIPCO_PMU_MINRES_MSK, 1 << ldo);
386 + else
387 + chipco_mask32(cc, SSB_CHIPCO_PMU_MINRES_MSK, ~(1 << ldo));
388 + chipco_read32(cc, SSB_CHIPCO_PMU_MINRES_MSK); //SPEC FIXME found via mmiotrace - dummy read?
389 +}
390 +
391 +EXPORT_SYMBOL(ssb_pmu_set_ldo_voltage);
392 +EXPORT_SYMBOL(ssb_pmu_set_ldo_paref);
393 --- a/drivers/ssb/driver_gige.c
394 +++ b/drivers/ssb/driver_gige.c
395 @@ -3,7 +3,7 @@
396 * Broadcom Gigabit Ethernet core driver
397 *
398 * Copyright 2008, Broadcom Corporation
399 - * Copyright 2008, Michael Buesch <mb@bu3sch.de>
400 + * Copyright 2008, Michael Buesch <m@bues.ch>
401 *
402 * Licensed under the GNU/GPL. See COPYING for details.
403 */
404 @@ -12,6 +12,7 @@
405 #include <linux/ssb/ssb_driver_gige.h>
406 #include <linux/pci.h>
407 #include <linux/pci_regs.h>
408 +#include <linux/slab.h>
409
410
411 /*
412 @@ -105,8 +106,9 @@ void gige_pcicfg_write32(struct ssb_gige
413 gige_write32(dev, SSB_GIGE_PCICFG + offset, value);
414 }
415
416 -static int ssb_gige_pci_read_config(struct pci_bus *bus, unsigned int devfn,
417 - int reg, int size, u32 *val)
418 +static int __devinit ssb_gige_pci_read_config(struct pci_bus *bus,
419 + unsigned int devfn, int reg,
420 + int size, u32 *val)
421 {
422 struct ssb_gige *dev = container_of(bus->ops, struct ssb_gige, pci_ops);
423 unsigned long flags;
424 @@ -135,8 +137,9 @@ static int ssb_gige_pci_read_config(stru
425 return PCIBIOS_SUCCESSFUL;
426 }
427
428 -static int ssb_gige_pci_write_config(struct pci_bus *bus, unsigned int devfn,
429 - int reg, int size, u32 val)
430 +static int __devinit ssb_gige_pci_write_config(struct pci_bus *bus,
431 + unsigned int devfn, int reg,
432 + int size, u32 val)
433 {
434 struct ssb_gige *dev = container_of(bus->ops, struct ssb_gige, pci_ops);
435 unsigned long flags;
436 @@ -165,7 +168,8 @@ static int ssb_gige_pci_write_config(str
437 return PCIBIOS_SUCCESSFUL;
438 }
439
440 -static int ssb_gige_probe(struct ssb_device *sdev, const struct ssb_device_id *id)
441 +static int __devinit ssb_gige_probe(struct ssb_device *sdev,
442 + const struct ssb_device_id *id)
443 {
444 struct ssb_gige *dev;
445 u32 base, tmslow, tmshigh;
446 --- a/drivers/ssb/driver_mipscore.c
447 +++ b/drivers/ssb/driver_mipscore.c
448 @@ -3,7 +3,7 @@
449 * Broadcom MIPS core driver
450 *
451 * Copyright 2005, Broadcom Corporation
452 - * Copyright 2006, 2007, Michael Buesch <mb@bu3sch.de>
453 + * Copyright 2006, 2007, Michael Buesch <m@bues.ch>
454 *
455 * Licensed under the GNU/GPL. See COPYING for details.
456 */
457 @@ -270,7 +270,6 @@ void ssb_mipscore_init(struct ssb_mipsco
458 set_irq(dev, irq++);
459 }
460 break;
461 - /* fallthrough */
462 case SSB_DEV_PCI:
463 case SSB_DEV_ETHERNET:
464 case SSB_DEV_ETHERNET_GBIT:
465 @@ -281,6 +280,10 @@ void ssb_mipscore_init(struct ssb_mipsco
466 set_irq(dev, irq++);
467 break;
468 }
469 + /* fallthrough */
470 + case SSB_DEV_EXTIF:
471 + set_irq(dev, 0);
472 + break;
473 }
474 }
475 ssb_dprintk(KERN_INFO PFX "after irq reconfiguration\n");
476 --- a/drivers/ssb/driver_pcicore.c
477 +++ b/drivers/ssb/driver_pcicore.c
478 @@ -3,7 +3,7 @@
479 * Broadcom PCI-core driver
480 *
481 * Copyright 2005, Broadcom Corporation
482 - * Copyright 2006, 2007, Michael Buesch <mb@bu3sch.de>
483 + * Copyright 2006, 2007, Michael Buesch <m@bues.ch>
484 *
485 * Licensed under the GNU/GPL. See COPYING for details.
486 */
487 @@ -15,6 +15,11 @@
488
489 #include "ssb_private.h"
490
491 +static u32 ssb_pcie_read(struct ssb_pcicore *pc, u32 address);
492 +static void ssb_pcie_write(struct ssb_pcicore *pc, u32 address, u32 data);
493 +static u16 ssb_pcie_mdio_read(struct ssb_pcicore *pc, u8 device, u8 address);
494 +static void ssb_pcie_mdio_write(struct ssb_pcicore *pc, u8 device,
495 + u8 address, u16 data);
496
497 static inline
498 u32 pcicore_read32(struct ssb_pcicore *pc, u16 offset)
499 @@ -246,20 +251,12 @@ static struct pci_controller ssb_pcicore
500 .pci_ops = &ssb_pcicore_pciops,
501 .io_resource = &ssb_pcicore_io_resource,
502 .mem_resource = &ssb_pcicore_mem_resource,
503 - .mem_offset = 0x24000000,
504 };
505
506 -static u32 ssb_pcicore_pcibus_iobase = 0x100;
507 -static u32 ssb_pcicore_pcibus_membase = SSB_PCI_DMA;
508 -
509 /* This function is called when doing a pci_enable_device().
510 * We must first check if the device is a device on the PCI-core bridge. */
511 int ssb_pcicore_plat_dev_init(struct pci_dev *d)
512 {
513 - struct resource *res;
514 - int pos, size;
515 - u32 *base;
516 -
517 if (d->bus->ops != &ssb_pcicore_pciops) {
518 /* This is not a device on the PCI-core bridge. */
519 return -ENODEV;
520 @@ -268,27 +265,6 @@ int ssb_pcicore_plat_dev_init(struct pci
521 ssb_printk(KERN_INFO "PCI: Fixing up device %s\n",
522 pci_name(d));
523
524 - /* Fix up resource bases */
525 - for (pos = 0; pos < 6; pos++) {
526 - res = &d->resource[pos];
527 - if (res->flags & IORESOURCE_IO)
528 - base = &ssb_pcicore_pcibus_iobase;
529 - else
530 - base = &ssb_pcicore_pcibus_membase;
531 - res->flags |= IORESOURCE_PCI_FIXED;
532 - if (res->end) {
533 - size = res->end - res->start + 1;
534 - if (*base & (size - 1))
535 - *base = (*base + size) & ~(size - 1);
536 - res->start = *base;
537 - res->end = res->start + size - 1;
538 - *base += size;
539 - pci_write_config_dword(d, PCI_BASE_ADDRESS_0 + (pos << 2), res->start);
540 - }
541 - /* Fix up PCI bridge BAR0 only */
542 - if (d->bus->number == 0 && PCI_SLOT(d->devfn) == 0)
543 - break;
544 - }
545 /* Fix up interrupt lines */
546 d->irq = ssb_mips_irq(extpci_core->dev) + 2;
547 pci_write_config_byte(d, PCI_INTERRUPT_LINE, d->irq);
548 @@ -338,7 +314,7 @@ int ssb_pcicore_pcibios_map_irq(const st
549 return ssb_mips_irq(extpci_core->dev) + 2;
550 }
551
552 -static void ssb_pcicore_init_hostmode(struct ssb_pcicore *pc)
553 +static void __devinit ssb_pcicore_init_hostmode(struct ssb_pcicore *pc)
554 {
555 u32 val;
556
557 @@ -403,7 +379,7 @@ static void ssb_pcicore_init_hostmode(st
558 register_pci_controller(&ssb_pcicore_controller);
559 }
560
561 -static int pcicore_is_in_hostmode(struct ssb_pcicore *pc)
562 +static int __devinit pcicore_is_in_hostmode(struct ssb_pcicore *pc)
563 {
564 struct ssb_bus *bus = pc->dev->bus;
565 u16 chipid_top;
566 @@ -432,25 +408,137 @@ static int pcicore_is_in_hostmode(struct
567 }
568 #endif /* CONFIG_SSB_PCICORE_HOSTMODE */
569
570 +/**************************************************
571 + * Workarounds.
572 + **************************************************/
573 +
574 +static void __devinit ssb_pcicore_fix_sprom_core_index(struct ssb_pcicore *pc)
575 +{
576 + u16 tmp = pcicore_read16(pc, SSB_PCICORE_SPROM(0));
577 + if (((tmp & 0xF000) >> 12) != pc->dev->core_index) {
578 + tmp &= ~0xF000;
579 + tmp |= (pc->dev->core_index << 12);
580 + pcicore_write16(pc, SSB_PCICORE_SPROM(0), tmp);
581 + }
582 +}
583 +
584 +static u8 ssb_pcicore_polarity_workaround(struct ssb_pcicore *pc)
585 +{
586 + return (ssb_pcie_read(pc, 0x204) & 0x10) ? 0xC0 : 0x80;
587 +}
588 +
589 +static void ssb_pcicore_serdes_workaround(struct ssb_pcicore *pc)
590 +{
591 + const u8 serdes_pll_device = 0x1D;
592 + const u8 serdes_rx_device = 0x1F;
593 + u16 tmp;
594 +
595 + ssb_pcie_mdio_write(pc, serdes_rx_device, 1 /* Control */,
596 + ssb_pcicore_polarity_workaround(pc));
597 + tmp = ssb_pcie_mdio_read(pc, serdes_pll_device, 1 /* Control */);
598 + if (tmp & 0x4000)
599 + ssb_pcie_mdio_write(pc, serdes_pll_device, 1, tmp & ~0x4000);
600 +}
601 +
602 +static void ssb_pcicore_pci_setup_workarounds(struct ssb_pcicore *pc)
603 +{
604 + struct ssb_device *pdev = pc->dev;
605 + struct ssb_bus *bus = pdev->bus;
606 + u32 tmp;
607 +
608 + tmp = pcicore_read32(pc, SSB_PCICORE_SBTOPCI2);
609 + tmp |= SSB_PCICORE_SBTOPCI_PREF;
610 + tmp |= SSB_PCICORE_SBTOPCI_BURST;
611 + pcicore_write32(pc, SSB_PCICORE_SBTOPCI2, tmp);
612 +
613 + if (pdev->id.revision < 5) {
614 + tmp = ssb_read32(pdev, SSB_IMCFGLO);
615 + tmp &= ~SSB_IMCFGLO_SERTO;
616 + tmp |= 2;
617 + tmp &= ~SSB_IMCFGLO_REQTO;
618 + tmp |= 3 << SSB_IMCFGLO_REQTO_SHIFT;
619 + ssb_write32(pdev, SSB_IMCFGLO, tmp);
620 + ssb_commit_settings(bus);
621 + } else if (pdev->id.revision >= 11) {
622 + tmp = pcicore_read32(pc, SSB_PCICORE_SBTOPCI2);
623 + tmp |= SSB_PCICORE_SBTOPCI_MRM;
624 + pcicore_write32(pc, SSB_PCICORE_SBTOPCI2, tmp);
625 + }
626 +}
627 +
628 +static void ssb_pcicore_pcie_setup_workarounds(struct ssb_pcicore *pc)
629 +{
630 + u32 tmp;
631 + u8 rev = pc->dev->id.revision;
632 +
633 + if (rev == 0 || rev == 1) {
634 + /* TLP Workaround register. */
635 + tmp = ssb_pcie_read(pc, 0x4);
636 + tmp |= 0x8;
637 + ssb_pcie_write(pc, 0x4, tmp);
638 + }
639 + if (rev == 1) {
640 + /* DLLP Link Control register. */
641 + tmp = ssb_pcie_read(pc, 0x100);
642 + tmp |= 0x40;
643 + ssb_pcie_write(pc, 0x100, tmp);
644 + }
645 +
646 + if (rev == 0) {
647 + const u8 serdes_rx_device = 0x1F;
648 +
649 + ssb_pcie_mdio_write(pc, serdes_rx_device,
650 + 2 /* Timer */, 0x8128);
651 + ssb_pcie_mdio_write(pc, serdes_rx_device,
652 + 6 /* CDR */, 0x0100);
653 + ssb_pcie_mdio_write(pc, serdes_rx_device,
654 + 7 /* CDR BW */, 0x1466);
655 + } else if (rev == 3 || rev == 4 || rev == 5) {
656 + /* TODO: DLLP Power Management Threshold */
657 + ssb_pcicore_serdes_workaround(pc);
658 + /* TODO: ASPM */
659 + } else if (rev == 7) {
660 + /* TODO: No PLL down */
661 + }
662 +
663 + if (rev >= 6) {
664 + /* Miscellaneous Configuration Fixup */
665 + tmp = pcicore_read16(pc, SSB_PCICORE_SPROM(5));
666 + if (!(tmp & 0x8000))
667 + pcicore_write16(pc, SSB_PCICORE_SPROM(5),
668 + tmp | 0x8000);
669 + }
670 +}
671
672 /**************************************************
673 * Generic and Clientmode operation code.
674 **************************************************/
675
676 -static void ssb_pcicore_init_clientmode(struct ssb_pcicore *pc)
677 +static void __devinit ssb_pcicore_init_clientmode(struct ssb_pcicore *pc)
678 {
679 + struct ssb_device *pdev = pc->dev;
680 + struct ssb_bus *bus = pdev->bus;
681 +
682 + if (bus->bustype == SSB_BUSTYPE_PCI)
683 + ssb_pcicore_fix_sprom_core_index(pc);
684 +
685 /* Disable PCI interrupts. */
686 - ssb_write32(pc->dev, SSB_INTVEC, 0);
687 + ssb_write32(pdev, SSB_INTVEC, 0);
688 +
689 + /* Additional PCIe always once-executed workarounds */
690 + if (pc->dev->id.coreid == SSB_DEV_PCIE) {
691 + ssb_pcicore_serdes_workaround(pc);
692 + /* TODO: ASPM */
693 + /* TODO: Clock Request Update */
694 + }
695 }
696
697 -void ssb_pcicore_init(struct ssb_pcicore *pc)
698 +void __devinit ssb_pcicore_init(struct ssb_pcicore *pc)
699 {
700 struct ssb_device *dev = pc->dev;
701 - struct ssb_bus *bus;
702
703 if (!dev)
704 return;
705 - bus = dev->bus;
706 if (!ssb_device_is_enabled(dev))
707 ssb_device_enable(dev, 0);
708
709 @@ -475,58 +563,104 @@ static void ssb_pcie_write(struct ssb_pc
710 pcicore_write32(pc, 0x134, data);
711 }
712
713 -static void ssb_pcie_mdio_write(struct ssb_pcicore *pc, u8 device,
714 - u8 address, u16 data)
715 +static void ssb_pcie_mdio_set_phy(struct ssb_pcicore *pc, u8 phy)
716 {
717 const u16 mdio_control = 0x128;
718 const u16 mdio_data = 0x12C;
719 u32 v;
720 int i;
721
722 + v = (1 << 30); /* Start of Transaction */
723 + v |= (1 << 28); /* Write Transaction */
724 + v |= (1 << 17); /* Turnaround */
725 + v |= (0x1F << 18);
726 + v |= (phy << 4);
727 + pcicore_write32(pc, mdio_data, v);
728 +
729 + udelay(10);
730 + for (i = 0; i < 200; i++) {
731 + v = pcicore_read32(pc, mdio_control);
732 + if (v & 0x100 /* Trans complete */)
733 + break;
734 + msleep(1);
735 + }
736 +}
737 +
738 +static u16 ssb_pcie_mdio_read(struct ssb_pcicore *pc, u8 device, u8 address)
739 +{
740 + const u16 mdio_control = 0x128;
741 + const u16 mdio_data = 0x12C;
742 + int max_retries = 10;
743 + u16 ret = 0;
744 + u32 v;
745 + int i;
746 +
747 v = 0x80; /* Enable Preamble Sequence */
748 v |= 0x2; /* MDIO Clock Divisor */
749 pcicore_write32(pc, mdio_control, v);
750
751 + if (pc->dev->id.revision >= 10) {
752 + max_retries = 200;
753 + ssb_pcie_mdio_set_phy(pc, device);
754 + }
755 +
756 v = (1 << 30); /* Start of Transaction */
757 - v |= (1 << 28); /* Write Transaction */
758 + v |= (1 << 29); /* Read Transaction */
759 v |= (1 << 17); /* Turnaround */
760 - v |= (u32)device << 22;
761 + if (pc->dev->id.revision < 10)
762 + v |= (u32)device << 22;
763 v |= (u32)address << 18;
764 - v |= data;
765 pcicore_write32(pc, mdio_data, v);
766 /* Wait for the device to complete the transaction */
767 udelay(10);
768 - for (i = 0; i < 10; i++) {
769 + for (i = 0; i < max_retries; i++) {
770 v = pcicore_read32(pc, mdio_control);
771 - if (v & 0x100 /* Trans complete */)
772 + if (v & 0x100 /* Trans complete */) {
773 + udelay(10);
774 + ret = pcicore_read32(pc, mdio_data);
775 break;
776 + }
777 msleep(1);
778 }
779 pcicore_write32(pc, mdio_control, 0);
780 + return ret;
781 }
782
783 -static void ssb_broadcast_value(struct ssb_device *dev,
784 - u32 address, u32 data)
785 +static void ssb_pcie_mdio_write(struct ssb_pcicore *pc, u8 device,
786 + u8 address, u16 data)
787 {
788 - /* This is used for both, PCI and ChipCommon core, so be careful. */
789 - BUILD_BUG_ON(SSB_PCICORE_BCAST_ADDR != SSB_CHIPCO_BCAST_ADDR);
790 - BUILD_BUG_ON(SSB_PCICORE_BCAST_DATA != SSB_CHIPCO_BCAST_DATA);
791 + const u16 mdio_control = 0x128;
792 + const u16 mdio_data = 0x12C;
793 + int max_retries = 10;
794 + u32 v;
795 + int i;
796
797 - ssb_write32(dev, SSB_PCICORE_BCAST_ADDR, address);
798 - ssb_read32(dev, SSB_PCICORE_BCAST_ADDR); /* flush */
799 - ssb_write32(dev, SSB_PCICORE_BCAST_DATA, data);
800 - ssb_read32(dev, SSB_PCICORE_BCAST_DATA); /* flush */
801 -}
802 + v = 0x80; /* Enable Preamble Sequence */
803 + v |= 0x2; /* MDIO Clock Divisor */
804 + pcicore_write32(pc, mdio_control, v);
805
806 -static void ssb_commit_settings(struct ssb_bus *bus)
807 -{
808 - struct ssb_device *dev;
809 + if (pc->dev->id.revision >= 10) {
810 + max_retries = 200;
811 + ssb_pcie_mdio_set_phy(pc, device);
812 + }
813
814 - dev = bus->chipco.dev ? bus->chipco.dev : bus->pcicore.dev;
815 - if (WARN_ON(!dev))
816 - return;
817 - /* This forces an update of the cached registers. */
818 - ssb_broadcast_value(dev, 0xFD8, 0);
819 + v = (1 << 30); /* Start of Transaction */
820 + v |= (1 << 28); /* Write Transaction */
821 + v |= (1 << 17); /* Turnaround */
822 + if (pc->dev->id.revision < 10)
823 + v |= (u32)device << 22;
824 + v |= (u32)address << 18;
825 + v |= data;
826 + pcicore_write32(pc, mdio_data, v);
827 + /* Wait for the device to complete the transaction */
828 + udelay(10);
829 + for (i = 0; i < max_retries; i++) {
830 + v = pcicore_read32(pc, mdio_control);
831 + if (v & 0x100 /* Trans complete */)
832 + break;
833 + msleep(1);
834 + }
835 + pcicore_write32(pc, mdio_control, 0);
836 }
837
838 int ssb_pcicore_dev_irqvecs_enable(struct ssb_pcicore *pc,
839 @@ -551,13 +685,13 @@ int ssb_pcicore_dev_irqvecs_enable(struc
840 might_sleep_if(pdev->id.coreid != SSB_DEV_PCI);
841
842 /* Enable interrupts for this device. */
843 - if (bus->host_pci &&
844 - ((pdev->id.revision >= 6) || (pdev->id.coreid == SSB_DEV_PCIE))) {
845 + if ((pdev->id.revision >= 6) || (pdev->id.coreid == SSB_DEV_PCIE)) {
846 u32 coremask;
847
848 /* Calculate the "coremask" for the device. */
849 coremask = (1 << dev->core_index);
850
851 + SSB_WARN_ON(bus->bustype != SSB_BUSTYPE_PCI);
852 err = pci_read_config_dword(bus->host_pci, SSB_PCI_IRQMASK, &tmp);
853 if (err)
854 goto out;
855 @@ -579,48 +713,10 @@ int ssb_pcicore_dev_irqvecs_enable(struc
856 if (pc->setup_done)
857 goto out;
858 if (pdev->id.coreid == SSB_DEV_PCI) {
859 - tmp = pcicore_read32(pc, SSB_PCICORE_SBTOPCI2);
860 - tmp |= SSB_PCICORE_SBTOPCI_PREF;
861 - tmp |= SSB_PCICORE_SBTOPCI_BURST;
862 - pcicore_write32(pc, SSB_PCICORE_SBTOPCI2, tmp);
863 -
864 - if (pdev->id.revision < 5) {
865 - tmp = ssb_read32(pdev, SSB_IMCFGLO);
866 - tmp &= ~SSB_IMCFGLO_SERTO;
867 - tmp |= 2;
868 - tmp &= ~SSB_IMCFGLO_REQTO;
869 - tmp |= 3 << SSB_IMCFGLO_REQTO_SHIFT;
870 - ssb_write32(pdev, SSB_IMCFGLO, tmp);
871 - ssb_commit_settings(bus);
872 - } else if (pdev->id.revision >= 11) {
873 - tmp = pcicore_read32(pc, SSB_PCICORE_SBTOPCI2);
874 - tmp |= SSB_PCICORE_SBTOPCI_MRM;
875 - pcicore_write32(pc, SSB_PCICORE_SBTOPCI2, tmp);
876 - }
877 + ssb_pcicore_pci_setup_workarounds(pc);
878 } else {
879 WARN_ON(pdev->id.coreid != SSB_DEV_PCIE);
880 - //TODO: Better make defines for all these magic PCIE values.
881 - if ((pdev->id.revision == 0) || (pdev->id.revision == 1)) {
882 - /* TLP Workaround register. */
883 - tmp = ssb_pcie_read(pc, 0x4);
884 - tmp |= 0x8;
885 - ssb_pcie_write(pc, 0x4, tmp);
886 - }
887 - if (pdev->id.revision == 0) {
888 - const u8 serdes_rx_device = 0x1F;
889 -
890 - ssb_pcie_mdio_write(pc, serdes_rx_device,
891 - 2 /* Timer */, 0x8128);
892 - ssb_pcie_mdio_write(pc, serdes_rx_device,
893 - 6 /* CDR */, 0x0100);
894 - ssb_pcie_mdio_write(pc, serdes_rx_device,
895 - 7 /* CDR BW */, 0x1466);
896 - } else if (pdev->id.revision == 1) {
897 - /* DLLP Link Control register. */
898 - tmp = ssb_pcie_read(pc, 0x100);
899 - tmp |= 0x40;
900 - ssb_pcie_write(pc, 0x100, tmp);
901 - }
902 + ssb_pcicore_pcie_setup_workarounds(pc);
903 }
904 pc->setup_done = 1;
905 out:
906 --- a/drivers/ssb/main.c
907 +++ b/drivers/ssb/main.c
908 @@ -3,7 +3,7 @@
909 * Subsystem core
910 *
911 * Copyright 2005, Broadcom Corporation
912 - * Copyright 2006, 2007, Michael Buesch <mb@bu3sch.de>
913 + * Copyright 2006, 2007, Michael Buesch <m@bues.ch>
914 *
915 * Licensed under the GNU/GPL. See COPYING for details.
916 */
917 @@ -12,11 +12,14 @@
918
919 #include <linux/delay.h>
920 #include <linux/io.h>
921 +#include <linux/module.h>
922 #include <linux/ssb/ssb.h>
923 #include <linux/ssb/ssb_regs.h>
924 #include <linux/ssb/ssb_driver_gige.h>
925 #include <linux/dma-mapping.h>
926 #include <linux/pci.h>
927 +#include <linux/mmc/sdio_func.h>
928 +#include <linux/slab.h>
929
930 #include <pcmcia/cs_types.h>
931 #include <pcmcia/cs.h>
932 @@ -88,6 +91,25 @@ found:
933 }
934 #endif /* CONFIG_SSB_PCMCIAHOST */
935
936 +#ifdef CONFIG_SSB_SDIOHOST
937 +struct ssb_bus *ssb_sdio_func_to_bus(struct sdio_func *func)
938 +{
939 + struct ssb_bus *bus;
940 +
941 + ssb_buses_lock();
942 + list_for_each_entry(bus, &buses, list) {
943 + if (bus->bustype == SSB_BUSTYPE_SDIO &&
944 + bus->host_sdio == func)
945 + goto found;
946 + }
947 + bus = NULL;
948 +found:
949 + ssb_buses_unlock();
950 +
951 + return bus;
952 +}
953 +#endif /* CONFIG_SSB_SDIOHOST */
954 +
955 int ssb_for_each_bus_call(unsigned long data,
956 int (*func)(struct ssb_bus *bus, unsigned long data))
957 {
958 @@ -120,6 +142,19 @@ static void ssb_device_put(struct ssb_de
959 put_device(dev->dev);
960 }
961
962 +static inline struct ssb_driver *ssb_driver_get(struct ssb_driver *drv)
963 +{
964 + if (drv)
965 + get_driver(&drv->drv);
966 + return drv;
967 +}
968 +
969 +static inline void ssb_driver_put(struct ssb_driver *drv)
970 +{
971 + if (drv)
972 + put_driver(&drv->drv);
973 +}
974 +
975 static int ssb_device_resume(struct device *dev)
976 {
977 struct ssb_device *ssb_dev = dev_to_ssb_dev(dev);
978 @@ -190,90 +225,81 @@ int ssb_bus_suspend(struct ssb_bus *bus)
979 EXPORT_SYMBOL(ssb_bus_suspend);
980
981 #ifdef CONFIG_SSB_SPROM
982 -int ssb_devices_freeze(struct ssb_bus *bus)
983 +/** ssb_devices_freeze - Freeze all devices on the bus.
984 + *
985 + * After freezing no device driver will be handling a device
986 + * on this bus anymore. ssb_devices_thaw() must be called after
987 + * a successful freeze to reactivate the devices.
988 + *
989 + * @bus: The bus.
990 + * @ctx: Context structure. Pass this to ssb_devices_thaw().
991 + */
992 +int ssb_devices_freeze(struct ssb_bus *bus, struct ssb_freeze_context *ctx)
993 {
994 - struct ssb_device *dev;
995 - struct ssb_driver *drv;
996 - int err = 0;
997 - int i;
998 - pm_message_t state = PMSG_FREEZE;
999 + struct ssb_device *sdev;
1000 + struct ssb_driver *sdrv;
1001 + unsigned int i;
1002 +
1003 + memset(ctx, 0, sizeof(*ctx));
1004 + ctx->bus = bus;
1005 + SSB_WARN_ON(bus->nr_devices > ARRAY_SIZE(ctx->device_frozen));
1006
1007 - /* First check that we are capable to freeze all devices. */
1008 for (i = 0; i < bus->nr_devices; i++) {
1009 - dev = &(bus->devices[i]);
1010 - if (!dev->dev ||
1011 - !dev->dev->driver ||
1012 - !device_is_registered(dev->dev))
1013 - continue;
1014 - drv = drv_to_ssb_drv(dev->dev->driver);
1015 - if (!drv)
1016 + sdev = ssb_device_get(&bus->devices[i]);
1017 +
1018 + if (!sdev->dev || !sdev->dev->driver ||
1019 + !device_is_registered(sdev->dev)) {
1020 + ssb_device_put(sdev);
1021 continue;
1022 - if (!drv->suspend) {
1023 - /* Nope, can't suspend this one. */
1024 - return -EOPNOTSUPP;
1025 }
1026 - }
1027 - /* Now suspend all devices */
1028 - for (i = 0; i < bus->nr_devices; i++) {
1029 - dev = &(bus->devices[i]);
1030 - if (!dev->dev ||
1031 - !dev->dev->driver ||
1032 - !device_is_registered(dev->dev))
1033 - continue;
1034 - drv = drv_to_ssb_drv(dev->dev->driver);
1035 - if (!drv)
1036 + sdrv = ssb_driver_get(drv_to_ssb_drv(sdev->dev->driver));
1037 + if (!sdrv || SSB_WARN_ON(!sdrv->remove)) {
1038 + ssb_device_put(sdev);
1039 continue;
1040 - err = drv->suspend(dev, state);
1041 - if (err) {
1042 - ssb_printk(KERN_ERR PFX "Failed to freeze device %s\n",
1043 - dev_name(dev->dev));
1044 - goto err_unwind;
1045 }
1046 + sdrv->remove(sdev);
1047 + ctx->device_frozen[i] = 1;
1048 }
1049
1050 return 0;
1051 -err_unwind:
1052 - for (i--; i >= 0; i--) {
1053 - dev = &(bus->devices[i]);
1054 - if (!dev->dev ||
1055 - !dev->dev->driver ||
1056 - !device_is_registered(dev->dev))
1057 - continue;
1058 - drv = drv_to_ssb_drv(dev->dev->driver);
1059 - if (!drv)
1060 - continue;
1061 - if (drv->resume)
1062 - drv->resume(dev);
1063 - }
1064 - return err;
1065 }
1066
1067 -int ssb_devices_thaw(struct ssb_bus *bus)
1068 +/** ssb_devices_thaw - Unfreeze all devices on the bus.
1069 + *
1070 + * This will re-attach the device drivers and re-init the devices.
1071 + *
1072 + * @ctx: The context structure from ssb_devices_freeze()
1073 + */
1074 +int ssb_devices_thaw(struct ssb_freeze_context *ctx)
1075 {
1076 - struct ssb_device *dev;
1077 - struct ssb_driver *drv;
1078 - int err;
1079 - int i;
1080 + struct ssb_bus *bus = ctx->bus;
1081 + struct ssb_device *sdev;
1082 + struct ssb_driver *sdrv;
1083 + unsigned int i;
1084 + int err, result = 0;
1085
1086 for (i = 0; i < bus->nr_devices; i++) {
1087 - dev = &(bus->devices[i]);
1088 - if (!dev->dev ||
1089 - !dev->dev->driver ||
1090 - !device_is_registered(dev->dev))
1091 + if (!ctx->device_frozen[i])
1092 continue;
1093 - drv = drv_to_ssb_drv(dev->dev->driver);
1094 - if (!drv)
1095 + sdev = &bus->devices[i];
1096 +
1097 + if (SSB_WARN_ON(!sdev->dev || !sdev->dev->driver))
1098 continue;
1099 - if (SSB_WARN_ON(!drv->resume))
1100 + sdrv = drv_to_ssb_drv(sdev->dev->driver);
1101 + if (SSB_WARN_ON(!sdrv || !sdrv->probe))
1102 continue;
1103 - err = drv->resume(dev);
1104 +
1105 + err = sdrv->probe(sdev, &sdev->id);
1106 if (err) {
1107 ssb_printk(KERN_ERR PFX "Failed to thaw device %s\n",
1108 - dev_name(dev->dev));
1109 + dev_name(sdev->dev));
1110 + result = err;
1111 }
1112 + ssb_driver_put(sdrv);
1113 + ssb_device_put(sdev);
1114 }
1115
1116 - return 0;
1117 + return result;
1118 }
1119 #endif /* CONFIG_SSB_SPROM */
1120
1121 @@ -360,6 +386,35 @@ static int ssb_device_uevent(struct devi
1122 ssb_dev->id.revision);
1123 }
1124
1125 +#define ssb_config_attr(attrib, field, format_string) \
1126 +static ssize_t \
1127 +attrib##_show(struct device *dev, struct device_attribute *attr, char *buf) \
1128 +{ \
1129 + return sprintf(buf, format_string, dev_to_ssb_dev(dev)->field); \
1130 +}
1131 +
1132 +ssb_config_attr(core_num, core_index, "%u\n")
1133 +ssb_config_attr(coreid, id.coreid, "0x%04x\n")
1134 +ssb_config_attr(vendor, id.vendor, "0x%04x\n")
1135 +ssb_config_attr(revision, id.revision, "%u\n")
1136 +ssb_config_attr(irq, irq, "%u\n")
1137 +static ssize_t
1138 +name_show(struct device *dev, struct device_attribute *attr, char *buf)
1139 +{
1140 + return sprintf(buf, "%s\n",
1141 + ssb_core_name(dev_to_ssb_dev(dev)->id.coreid));
1142 +}
1143 +
1144 +static struct device_attribute ssb_device_attrs[] = {
1145 + __ATTR_RO(name),
1146 + __ATTR_RO(core_num),
1147 + __ATTR_RO(coreid),
1148 + __ATTR_RO(vendor),
1149 + __ATTR_RO(revision),
1150 + __ATTR_RO(irq),
1151 + __ATTR_NULL,
1152 +};
1153 +
1154 static struct bus_type ssb_bustype = {
1155 .name = "ssb",
1156 .match = ssb_bus_match,
1157 @@ -369,6 +424,7 @@ static struct bus_type ssb_bustype = {
1158 .suspend = ssb_device_suspend,
1159 .resume = ssb_device_resume,
1160 .uevent = ssb_device_uevent,
1161 + .dev_attrs = ssb_device_attrs,
1162 };
1163
1164 static void ssb_buses_lock(void)
1165 @@ -461,6 +517,7 @@ static int ssb_devices_register(struct s
1166 #ifdef CONFIG_SSB_PCIHOST
1167 sdev->irq = bus->host_pci->irq;
1168 dev->parent = &bus->host_pci->dev;
1169 + sdev->dma_dev = dev->parent;
1170 #endif
1171 break;
1172 case SSB_BUSTYPE_PCMCIA:
1173 @@ -469,8 +526,14 @@ static int ssb_devices_register(struct s
1174 dev->parent = &bus->host_pcmcia->dev;
1175 #endif
1176 break;
1177 + case SSB_BUSTYPE_SDIO:
1178 +#ifdef CONFIG_SSB_SDIOHOST
1179 + dev->parent = &bus->host_sdio->dev;
1180 +#endif
1181 + break;
1182 case SSB_BUSTYPE_SSB:
1183 dev->dma_mask = &dev->coherent_dma_mask;
1184 + sdev->dma_dev = dev;
1185 break;
1186 }
1187
1188 @@ -497,7 +560,7 @@ error:
1189 }
1190
1191 /* Needs ssb_buses_lock() */
1192 -static int ssb_attach_queued_buses(void)
1193 +static int __devinit ssb_attach_queued_buses(void)
1194 {
1195 struct ssb_bus *bus, *n;
1196 int err = 0;
1197 @@ -708,9 +771,9 @@ out:
1198 return err;
1199 }
1200
1201 -static int ssb_bus_register(struct ssb_bus *bus,
1202 - ssb_invariants_func_t get_invariants,
1203 - unsigned long baseaddr)
1204 +static int __devinit ssb_bus_register(struct ssb_bus *bus,
1205 + ssb_invariants_func_t get_invariants,
1206 + unsigned long baseaddr)
1207 {
1208 int err;
1209
1210 @@ -724,12 +787,18 @@ static int ssb_bus_register(struct ssb_b
1211 err = ssb_pci_xtal(bus, SSB_GPIO_XTAL | SSB_GPIO_PLL, 1);
1212 if (err)
1213 goto out;
1214 +
1215 + /* Init SDIO-host device (if any), before the scan */
1216 + err = ssb_sdio_init(bus);
1217 + if (err)
1218 + goto err_disable_xtal;
1219 +
1220 ssb_buses_lock();
1221 bus->busnumber = next_busnumber;
1222 /* Scan for devices (cores) */
1223 err = ssb_bus_scan(bus, baseaddr);
1224 if (err)
1225 - goto err_disable_xtal;
1226 + goto err_sdio_exit;
1227
1228 /* Init PCI-host device (if any) */
1229 err = ssb_pci_init(bus);
1230 @@ -776,6 +845,8 @@ err_pci_exit:
1231 ssb_pci_exit(bus);
1232 err_unmap:
1233 ssb_iounmap(bus);
1234 +err_sdio_exit:
1235 + ssb_sdio_exit(bus);
1236 err_disable_xtal:
1237 ssb_buses_unlock();
1238 ssb_pci_xtal(bus, SSB_GPIO_XTAL | SSB_GPIO_PLL, 0);
1239 @@ -783,8 +854,8 @@ err_disable_xtal:
1240 }
1241
1242 #ifdef CONFIG_SSB_PCIHOST
1243 -int ssb_bus_pcibus_register(struct ssb_bus *bus,
1244 - struct pci_dev *host_pci)
1245 +int __devinit ssb_bus_pcibus_register(struct ssb_bus *bus,
1246 + struct pci_dev *host_pci)
1247 {
1248 int err;
1249
1250 @@ -796,6 +867,9 @@ int ssb_bus_pcibus_register(struct ssb_b
1251 if (!err) {
1252 ssb_printk(KERN_INFO PFX "Sonics Silicon Backplane found on "
1253 "PCI device %s\n", dev_name(&host_pci->dev));
1254 + } else {
1255 + ssb_printk(KERN_ERR PFX "Failed to register PCI version"
1256 + " of SSB with error %d\n", err);
1257 }
1258
1259 return err;
1260 @@ -804,9 +878,9 @@ EXPORT_SYMBOL(ssb_bus_pcibus_register);
1261 #endif /* CONFIG_SSB_PCIHOST */
1262
1263 #ifdef CONFIG_SSB_PCMCIAHOST
1264 -int ssb_bus_pcmciabus_register(struct ssb_bus *bus,
1265 - struct pcmcia_device *pcmcia_dev,
1266 - unsigned long baseaddr)
1267 +int __devinit ssb_bus_pcmciabus_register(struct ssb_bus *bus,
1268 + struct pcmcia_device *pcmcia_dev,
1269 + unsigned long baseaddr)
1270 {
1271 int err;
1272
1273 @@ -825,9 +899,32 @@ int ssb_bus_pcmciabus_register(struct ss
1274 EXPORT_SYMBOL(ssb_bus_pcmciabus_register);
1275 #endif /* CONFIG_SSB_PCMCIAHOST */
1276
1277 -int ssb_bus_ssbbus_register(struct ssb_bus *bus,
1278 - unsigned long baseaddr,
1279 - ssb_invariants_func_t get_invariants)
1280 +#ifdef CONFIG_SSB_SDIOHOST
1281 +int __devinit ssb_bus_sdiobus_register(struct ssb_bus *bus,
1282 + struct sdio_func *func,
1283 + unsigned int quirks)
1284 +{
1285 + int err;
1286 +
1287 + bus->bustype = SSB_BUSTYPE_SDIO;
1288 + bus->host_sdio = func;
1289 + bus->ops = &ssb_sdio_ops;
1290 + bus->quirks = quirks;
1291 +
1292 + err = ssb_bus_register(bus, ssb_sdio_get_invariants, ~0);
1293 + if (!err) {
1294 + ssb_printk(KERN_INFO PFX "Sonics Silicon Backplane found on "
1295 + "SDIO device %s\n", sdio_func_id(func));
1296 + }
1297 +
1298 + return err;
1299 +}
1300 +EXPORT_SYMBOL(ssb_bus_sdiobus_register);
1301 +#endif /* CONFIG_SSB_PCMCIAHOST */
1302 +
1303 +int __devinit ssb_bus_ssbbus_register(struct ssb_bus *bus,
1304 + unsigned long baseaddr,
1305 + ssb_invariants_func_t get_invariants)
1306 {
1307 int err;
1308
1309 @@ -908,8 +1005,8 @@ u32 ssb_calc_clock_rate(u32 plltype, u32
1310 switch (plltype) {
1311 case SSB_PLLTYPE_6: /* 100/200 or 120/240 only */
1312 if (m & SSB_CHIPCO_CLK_T6_MMASK)
1313 - return SSB_CHIPCO_CLK_T6_M0;
1314 - return SSB_CHIPCO_CLK_T6_M1;
1315 + return SSB_CHIPCO_CLK_T6_M1;
1316 + return SSB_CHIPCO_CLK_T6_M0;
1317 case SSB_PLLTYPE_1: /* 48Mhz base, 3 dividers */
1318 case SSB_PLLTYPE_3: /* 25Mhz, 2 dividers */
1319 case SSB_PLLTYPE_4: /* 48Mhz, 4 dividers */
1320 @@ -1024,23 +1121,22 @@ static u32 ssb_tmslow_reject_bitmask(str
1321 {
1322 u32 rev = ssb_read32(dev, SSB_IDLOW) & SSB_IDLOW_SSBREV;
1323
1324 - /* The REJECT bit changed position in TMSLOW between
1325 - * Backplane revisions. */
1326 + /* The REJECT bit seems to be different for Backplane rev 2.3 */
1327 switch (rev) {
1328 case SSB_IDLOW_SSBREV_22:
1329 - return SSB_TMSLOW_REJECT_22;
1330 + case SSB_IDLOW_SSBREV_24:
1331 + case SSB_IDLOW_SSBREV_26:
1332 + return SSB_TMSLOW_REJECT;
1333 case SSB_IDLOW_SSBREV_23:
1334 return SSB_TMSLOW_REJECT_23;
1335 - case SSB_IDLOW_SSBREV_24: /* TODO - find the proper REJECT bits */
1336 - case SSB_IDLOW_SSBREV_25: /* same here */
1337 - case SSB_IDLOW_SSBREV_26: /* same here */
1338 + case SSB_IDLOW_SSBREV_25: /* TODO - find the proper REJECT bit */
1339 case SSB_IDLOW_SSBREV_27: /* same here */
1340 - return SSB_TMSLOW_REJECT_23; /* this is a guess */
1341 + return SSB_TMSLOW_REJECT; /* this is a guess */
1342 default:
1343 printk(KERN_INFO "ssb: Backplane Revision 0x%.8X\n", rev);
1344 WARN_ON(1);
1345 }
1346 - return (SSB_TMSLOW_REJECT_22 | SSB_TMSLOW_REJECT_23);
1347 + return (SSB_TMSLOW_REJECT | SSB_TMSLOW_REJECT_23);
1348 }
1349
1350 int ssb_device_is_enabled(struct ssb_device *dev)
1351 @@ -1099,10 +1195,10 @@ void ssb_device_enable(struct ssb_device
1352 }
1353 EXPORT_SYMBOL(ssb_device_enable);
1354
1355 -/* Wait for a bit in a register to get set or unset.
1356 +/* Wait for bitmask in a register to get set or cleared.
1357 * timeout is in units of ten-microseconds */
1358 -static int ssb_wait_bit(struct ssb_device *dev, u16 reg, u32 bitmask,
1359 - int timeout, int set)
1360 +static int ssb_wait_bits(struct ssb_device *dev, u16 reg, u32 bitmask,
1361 + int timeout, int set)
1362 {
1363 int i;
1364 u32 val;
1365 @@ -1110,7 +1206,7 @@ static int ssb_wait_bit(struct ssb_devic
1366 for (i = 0; i < timeout; i++) {
1367 val = ssb_read32(dev, reg);
1368 if (set) {
1369 - if (val & bitmask)
1370 + if ((val & bitmask) == bitmask)
1371 return 0;
1372 } else {
1373 if (!(val & bitmask))
1374 @@ -1127,20 +1223,38 @@ static int ssb_wait_bit(struct ssb_devic
1375
1376 void ssb_device_disable(struct ssb_device *dev, u32 core_specific_flags)
1377 {
1378 - u32 reject;
1379 + u32 reject, val;
1380
1381 if (ssb_read32(dev, SSB_TMSLOW) & SSB_TMSLOW_RESET)
1382 return;
1383
1384 reject = ssb_tmslow_reject_bitmask(dev);
1385 - ssb_write32(dev, SSB_TMSLOW, reject | SSB_TMSLOW_CLOCK);
1386 - ssb_wait_bit(dev, SSB_TMSLOW, reject, 1000, 1);
1387 - ssb_wait_bit(dev, SSB_TMSHIGH, SSB_TMSHIGH_BUSY, 1000, 0);
1388 - ssb_write32(dev, SSB_TMSLOW,
1389 - SSB_TMSLOW_FGC | SSB_TMSLOW_CLOCK |
1390 - reject | SSB_TMSLOW_RESET |
1391 - core_specific_flags);
1392 - ssb_flush_tmslow(dev);
1393 +
1394 + if (ssb_read32(dev, SSB_TMSLOW) & SSB_TMSLOW_CLOCK) {
1395 + ssb_write32(dev, SSB_TMSLOW, reject | SSB_TMSLOW_CLOCK);
1396 + ssb_wait_bits(dev, SSB_TMSLOW, reject, 1000, 1);
1397 + ssb_wait_bits(dev, SSB_TMSHIGH, SSB_TMSHIGH_BUSY, 1000, 0);
1398 +
1399 + if (ssb_read32(dev, SSB_IDLOW) & SSB_IDLOW_INITIATOR) {
1400 + val = ssb_read32(dev, SSB_IMSTATE);
1401 + val |= SSB_IMSTATE_REJECT;
1402 + ssb_write32(dev, SSB_IMSTATE, val);
1403 + ssb_wait_bits(dev, SSB_IMSTATE, SSB_IMSTATE_BUSY, 1000,
1404 + 0);
1405 + }
1406 +
1407 + ssb_write32(dev, SSB_TMSLOW,
1408 + SSB_TMSLOW_FGC | SSB_TMSLOW_CLOCK |
1409 + reject | SSB_TMSLOW_RESET |
1410 + core_specific_flags);
1411 + ssb_flush_tmslow(dev);
1412 +
1413 + if (ssb_read32(dev, SSB_IDLOW) & SSB_IDLOW_INITIATOR) {
1414 + val = ssb_read32(dev, SSB_IMSTATE);
1415 + val &= ~SSB_IMSTATE_REJECT;
1416 + ssb_write32(dev, SSB_IMSTATE, val);
1417 + }
1418 + }
1419
1420 ssb_write32(dev, SSB_TMSLOW,
1421 reject | SSB_TMSLOW_RESET |
1422 @@ -1149,13 +1263,34 @@ void ssb_device_disable(struct ssb_devic
1423 }
1424 EXPORT_SYMBOL(ssb_device_disable);
1425
1426 +/* Some chipsets need routing known for PCIe and 64-bit DMA */
1427 +static bool ssb_dma_translation_special_bit(struct ssb_device *dev)
1428 +{
1429 + u16 chip_id = dev->bus->chip_id;
1430 +
1431 + if (dev->id.coreid == SSB_DEV_80211) {
1432 + return (chip_id == 0x4322 || chip_id == 43221 ||
1433 + chip_id == 43231 || chip_id == 43222);
1434 + }
1435 +
1436 + return 0;
1437 +}
1438 +
1439 u32 ssb_dma_translation(struct ssb_device *dev)
1440 {
1441 switch (dev->bus->bustype) {
1442 case SSB_BUSTYPE_SSB:
1443 return 0;
1444 case SSB_BUSTYPE_PCI:
1445 - return SSB_PCI_DMA;
1446 + if (dev->bus->host_pci->is_pcie &&
1447 + ssb_read32(dev, SSB_TMSHIGH) & SSB_TMSHIGH_DMA64) {
1448 + return SSB_PCIE_DMA_H32;
1449 + } else {
1450 + if (ssb_dma_translation_special_bit(dev))
1451 + return SSB_PCIE_DMA_H32;
1452 + else
1453 + return SSB_PCI_DMA;
1454 + }
1455 default:
1456 __ssb_dma_not_implemented(dev);
1457 }
1458 @@ -1272,20 +1407,20 @@ EXPORT_SYMBOL(ssb_bus_may_powerdown);
1459
1460 int ssb_bus_powerup(struct ssb_bus *bus, bool dynamic_pctl)
1461 {
1462 - struct ssb_chipcommon *cc;
1463 int err;
1464 enum ssb_clkmode mode;
1465
1466 err = ssb_pci_xtal(bus, SSB_GPIO_XTAL | SSB_GPIO_PLL, 1);
1467 if (err)
1468 goto error;
1469 - cc = &bus->chipco;
1470 - mode = dynamic_pctl ? SSB_CLKMODE_DYNAMIC : SSB_CLKMODE_FAST;
1471 - ssb_chipco_set_clockmode(cc, mode);
1472
1473 #ifdef CONFIG_SSB_DEBUG
1474 bus->powered_up = 1;
1475 #endif
1476 +
1477 + mode = dynamic_pctl ? SSB_CLKMODE_DYNAMIC : SSB_CLKMODE_FAST;
1478 + ssb_chipco_set_clockmode(&bus->chipco, mode);
1479 +
1480 return 0;
1481 error:
1482 ssb_printk(KERN_ERR PFX "Bus powerup failed\n");
1483 @@ -1293,6 +1428,37 @@ error:
1484 }
1485 EXPORT_SYMBOL(ssb_bus_powerup);
1486
1487 +static void ssb_broadcast_value(struct ssb_device *dev,
1488 + u32 address, u32 data)
1489 +{
1490 +#ifdef CONFIG_SSB_DRIVER_PCICORE
1491 + /* This is used for both, PCI and ChipCommon core, so be careful. */
1492 + BUILD_BUG_ON(SSB_PCICORE_BCAST_ADDR != SSB_CHIPCO_BCAST_ADDR);
1493 + BUILD_BUG_ON(SSB_PCICORE_BCAST_DATA != SSB_CHIPCO_BCAST_DATA);
1494 +#endif
1495 +
1496 + ssb_write32(dev, SSB_CHIPCO_BCAST_ADDR, address);
1497 + ssb_read32(dev, SSB_CHIPCO_BCAST_ADDR); /* flush */
1498 + ssb_write32(dev, SSB_CHIPCO_BCAST_DATA, data);
1499 + ssb_read32(dev, SSB_CHIPCO_BCAST_DATA); /* flush */
1500 +}
1501 +
1502 +void ssb_commit_settings(struct ssb_bus *bus)
1503 +{
1504 + struct ssb_device *dev;
1505 +
1506 +#ifdef CONFIG_SSB_DRIVER_PCICORE
1507 + dev = bus->chipco.dev ? bus->chipco.dev : bus->pcicore.dev;
1508 +#else
1509 + dev = bus->chipco.dev;
1510 +#endif
1511 + if (WARN_ON(!dev))
1512 + return;
1513 + /* This forces an update of the cached registers. */
1514 + ssb_broadcast_value(dev, 0xFD8, 0);
1515 +}
1516 +EXPORT_SYMBOL(ssb_commit_settings);
1517 +
1518 u32 ssb_admatch_base(u32 adm)
1519 {
1520 u32 base = 0;
1521 @@ -1358,8 +1524,10 @@ static int __init ssb_modinit(void)
1522 ssb_buses_lock();
1523 err = ssb_attach_queued_buses();
1524 ssb_buses_unlock();
1525 - if (err)
1526 + if (err) {
1527 bus_unregister(&ssb_bustype);
1528 + goto out;
1529 + }
1530
1531 err = b43_pci_ssb_bridge_init();
1532 if (err) {
1533 @@ -1375,7 +1543,7 @@ static int __init ssb_modinit(void)
1534 /* don't fail SSB init because of this */
1535 err = 0;
1536 }
1537 -
1538 +out:
1539 return err;
1540 }
1541 /* ssb must be initialized after PCI but before the ssb drivers.
1542 --- a/drivers/ssb/pci.c
1543 +++ b/drivers/ssb/pci.c
1544 @@ -1,7 +1,7 @@
1545 /*
1546 * Sonics Silicon Backplane PCI-Hostbus related functions.
1547 *
1548 - * Copyright (C) 2005-2006 Michael Buesch <mb@bu3sch.de>
1549 + * Copyright (C) 2005-2006 Michael Buesch <m@bues.ch>
1550 * Copyright (C) 2005 Martin Langer <martin-langer@gmx.de>
1551 * Copyright (C) 2005 Stefano Brivio <st3@riseup.net>
1552 * Copyright (C) 2005 Danny van Dyk <kugelfang@gentoo.org>
1553 @@ -17,6 +17,7 @@
1554
1555 #include <linux/ssb/ssb.h>
1556 #include <linux/ssb/ssb_regs.h>
1557 +#include <linux/slab.h>
1558 #include <linux/pci.h>
1559 #include <linux/delay.h>
1560
1561 @@ -167,10 +168,16 @@ err_pci:
1562 }
1563
1564 /* Get the word-offset for a SSB_SPROM_XXX define. */
1565 -#define SPOFF(offset) (((offset) - SSB_SPROM_BASE) / sizeof(u16))
1566 +#define SPOFF(offset) ((offset) / sizeof(u16))
1567 /* Helper to extract some _offset, which is one of the SSB_SPROM_XXX defines. */
1568 -#define SPEX(_outvar, _offset, _mask, _shift) \
1569 +#define SPEX16(_outvar, _offset, _mask, _shift) \
1570 out->_outvar = ((in[SPOFF(_offset)] & (_mask)) >> (_shift))
1571 +#define SPEX32(_outvar, _offset, _mask, _shift) \
1572 + out->_outvar = ((((u32)in[SPOFF((_offset)+2)] << 16 | \
1573 + in[SPOFF(_offset)]) & (_mask)) >> (_shift))
1574 +#define SPEX(_outvar, _offset, _mask, _shift) \
1575 + SPEX16(_outvar, _offset, _mask, _shift)
1576 +
1577
1578 static inline u8 ssb_crc8(u8 crc, u8 data)
1579 {
1580 @@ -247,7 +254,7 @@ static int sprom_do_read(struct ssb_bus
1581 int i;
1582
1583 for (i = 0; i < bus->sprom_size; i++)
1584 - sprom[i] = ioread16(bus->mmio + SSB_SPROM_BASE + (i * 2));
1585 + sprom[i] = ioread16(bus->mmio + bus->sprom_offset + (i * 2));
1586
1587 return 0;
1588 }
1589 @@ -278,7 +285,7 @@ static int sprom_do_write(struct ssb_bus
1590 ssb_printk("75%%");
1591 else if (i % 2)
1592 ssb_printk(".");
1593 - writew(sprom[i], bus->mmio + SSB_SPROM_BASE + (i * 2));
1594 + writew(sprom[i], bus->mmio + bus->sprom_offset + (i * 2));
1595 mmiowb();
1596 msleep(20);
1597 }
1598 @@ -399,6 +406,46 @@ static void sprom_extract_r123(struct ss
1599 out->antenna_gain.ghz5.a3 = gain;
1600 }
1601
1602 +/* Revs 4 5 and 8 have partially shared layout */
1603 +static void sprom_extract_r458(struct ssb_sprom *out, const u16 *in)
1604 +{
1605 + SPEX(txpid2g[0], SSB_SPROM4_TXPID2G01,
1606 + SSB_SPROM4_TXPID2G0, SSB_SPROM4_TXPID2G0_SHIFT);
1607 + SPEX(txpid2g[1], SSB_SPROM4_TXPID2G01,
1608 + SSB_SPROM4_TXPID2G1, SSB_SPROM4_TXPID2G1_SHIFT);
1609 + SPEX(txpid2g[2], SSB_SPROM4_TXPID2G23,
1610 + SSB_SPROM4_TXPID2G2, SSB_SPROM4_TXPID2G2_SHIFT);
1611 + SPEX(txpid2g[3], SSB_SPROM4_TXPID2G23,
1612 + SSB_SPROM4_TXPID2G3, SSB_SPROM4_TXPID2G3_SHIFT);
1613 +
1614 + SPEX(txpid5gl[0], SSB_SPROM4_TXPID5GL01,
1615 + SSB_SPROM4_TXPID5GL0, SSB_SPROM4_TXPID5GL0_SHIFT);
1616 + SPEX(txpid5gl[1], SSB_SPROM4_TXPID5GL01,
1617 + SSB_SPROM4_TXPID5GL1, SSB_SPROM4_TXPID5GL1_SHIFT);
1618 + SPEX(txpid5gl[2], SSB_SPROM4_TXPID5GL23,
1619 + SSB_SPROM4_TXPID5GL2, SSB_SPROM4_TXPID5GL2_SHIFT);
1620 + SPEX(txpid5gl[3], SSB_SPROM4_TXPID5GL23,
1621 + SSB_SPROM4_TXPID5GL3, SSB_SPROM4_TXPID5GL3_SHIFT);
1622 +
1623 + SPEX(txpid5g[0], SSB_SPROM4_TXPID5G01,
1624 + SSB_SPROM4_TXPID5G0, SSB_SPROM4_TXPID5G0_SHIFT);
1625 + SPEX(txpid5g[1], SSB_SPROM4_TXPID5G01,
1626 + SSB_SPROM4_TXPID5G1, SSB_SPROM4_TXPID5G1_SHIFT);
1627 + SPEX(txpid5g[2], SSB_SPROM4_TXPID5G23,
1628 + SSB_SPROM4_TXPID5G2, SSB_SPROM4_TXPID5G2_SHIFT);
1629 + SPEX(txpid5g[3], SSB_SPROM4_TXPID5G23,
1630 + SSB_SPROM4_TXPID5G3, SSB_SPROM4_TXPID5G3_SHIFT);
1631 +
1632 + SPEX(txpid5gh[0], SSB_SPROM4_TXPID5GH01,
1633 + SSB_SPROM4_TXPID5GH0, SSB_SPROM4_TXPID5GH0_SHIFT);
1634 + SPEX(txpid5gh[1], SSB_SPROM4_TXPID5GH01,
1635 + SSB_SPROM4_TXPID5GH1, SSB_SPROM4_TXPID5GH1_SHIFT);
1636 + SPEX(txpid5gh[2], SSB_SPROM4_TXPID5GH23,
1637 + SSB_SPROM4_TXPID5GH2, SSB_SPROM4_TXPID5GH2_SHIFT);
1638 + SPEX(txpid5gh[3], SSB_SPROM4_TXPID5GH23,
1639 + SSB_SPROM4_TXPID5GH3, SSB_SPROM4_TXPID5GH3_SHIFT);
1640 +}
1641 +
1642 static void sprom_extract_r45(struct ssb_sprom *out, const u16 *in)
1643 {
1644 int i;
1645 @@ -421,10 +468,14 @@ static void sprom_extract_r45(struct ssb
1646 SPEX(country_code, SSB_SPROM4_CCODE, 0xFFFF, 0);
1647 SPEX(boardflags_lo, SSB_SPROM4_BFLLO, 0xFFFF, 0);
1648 SPEX(boardflags_hi, SSB_SPROM4_BFLHI, 0xFFFF, 0);
1649 + SPEX(boardflags2_lo, SSB_SPROM4_BFL2LO, 0xFFFF, 0);
1650 + SPEX(boardflags2_hi, SSB_SPROM4_BFL2HI, 0xFFFF, 0);
1651 } else {
1652 SPEX(country_code, SSB_SPROM5_CCODE, 0xFFFF, 0);
1653 SPEX(boardflags_lo, SSB_SPROM5_BFLLO, 0xFFFF, 0);
1654 SPEX(boardflags_hi, SSB_SPROM5_BFLHI, 0xFFFF, 0);
1655 + SPEX(boardflags2_lo, SSB_SPROM5_BFL2LO, 0xFFFF, 0);
1656 + SPEX(boardflags2_hi, SSB_SPROM5_BFL2HI, 0xFFFF, 0);
1657 }
1658 SPEX(ant_available_a, SSB_SPROM4_ANTAVAIL, SSB_SPROM4_ANTAVAIL_A,
1659 SSB_SPROM4_ANTAVAIL_A_SHIFT);
1660 @@ -464,6 +515,8 @@ static void sprom_extract_r45(struct ssb
1661 memcpy(&out->antenna_gain.ghz5, &out->antenna_gain.ghz24,
1662 sizeof(out->antenna_gain.ghz5));
1663
1664 + sprom_extract_r458(out, in);
1665 +
1666 /* TODO - get remaining rev 4 stuff needed */
1667 }
1668
1669 @@ -474,12 +527,14 @@ static void sprom_extract_r8(struct ssb_
1670
1671 /* extract the MAC address */
1672 for (i = 0; i < 3; i++) {
1673 - v = in[SPOFF(SSB_SPROM1_IL0MAC) + i];
1674 + v = in[SPOFF(SSB_SPROM8_IL0MAC) + i];
1675 *(((__be16 *)out->il0mac) + i) = cpu_to_be16(v);
1676 }
1677 SPEX(country_code, SSB_SPROM8_CCODE, 0xFFFF, 0);
1678 SPEX(boardflags_lo, SSB_SPROM8_BFLLO, 0xFFFF, 0);
1679 SPEX(boardflags_hi, SSB_SPROM8_BFLHI, 0xFFFF, 0);
1680 + SPEX(boardflags2_lo, SSB_SPROM8_BFL2LO, 0xFFFF, 0);
1681 + SPEX(boardflags2_hi, SSB_SPROM8_BFL2HI, 0xFFFF, 0);
1682 SPEX(ant_available_a, SSB_SPROM8_ANTAVAIL, SSB_SPROM8_ANTAVAIL_A,
1683 SSB_SPROM8_ANTAVAIL_A_SHIFT);
1684 SPEX(ant_available_bg, SSB_SPROM8_ANTAVAIL, SSB_SPROM8_ANTAVAIL_BG,
1685 @@ -490,12 +545,55 @@ static void sprom_extract_r8(struct ssb_
1686 SPEX(maxpwr_a, SSB_SPROM8_MAXP_A, SSB_SPROM8_MAXP_A_MASK, 0);
1687 SPEX(itssi_a, SSB_SPROM8_MAXP_A, SSB_SPROM8_ITSSI_A,
1688 SSB_SPROM8_ITSSI_A_SHIFT);
1689 + SPEX(maxpwr_ah, SSB_SPROM8_MAXP_AHL, SSB_SPROM8_MAXP_AH_MASK, 0);
1690 + SPEX(maxpwr_al, SSB_SPROM8_MAXP_AHL, SSB_SPROM8_MAXP_AL_MASK,
1691 + SSB_SPROM8_MAXP_AL_SHIFT);
1692 SPEX(gpio0, SSB_SPROM8_GPIOA, SSB_SPROM8_GPIOA_P0, 0);
1693 SPEX(gpio1, SSB_SPROM8_GPIOA, SSB_SPROM8_GPIOA_P1,
1694 SSB_SPROM8_GPIOA_P1_SHIFT);
1695 SPEX(gpio2, SSB_SPROM8_GPIOB, SSB_SPROM8_GPIOB_P2, 0);
1696 SPEX(gpio3, SSB_SPROM8_GPIOB, SSB_SPROM8_GPIOB_P3,
1697 SSB_SPROM8_GPIOB_P3_SHIFT);
1698 + SPEX(tri2g, SSB_SPROM8_TRI25G, SSB_SPROM8_TRI2G, 0);
1699 + SPEX(tri5g, SSB_SPROM8_TRI25G, SSB_SPROM8_TRI5G,
1700 + SSB_SPROM8_TRI5G_SHIFT);
1701 + SPEX(tri5gl, SSB_SPROM8_TRI5GHL, SSB_SPROM8_TRI5GL, 0);
1702 + SPEX(tri5gh, SSB_SPROM8_TRI5GHL, SSB_SPROM8_TRI5GH,
1703 + SSB_SPROM8_TRI5GH_SHIFT);
1704 + SPEX(rxpo2g, SSB_SPROM8_RXPO, SSB_SPROM8_RXPO2G, 0);
1705 + SPEX(rxpo5g, SSB_SPROM8_RXPO, SSB_SPROM8_RXPO5G,
1706 + SSB_SPROM8_RXPO5G_SHIFT);
1707 + SPEX(rssismf2g, SSB_SPROM8_RSSIPARM2G, SSB_SPROM8_RSSISMF2G, 0);
1708 + SPEX(rssismc2g, SSB_SPROM8_RSSIPARM2G, SSB_SPROM8_RSSISMC2G,
1709 + SSB_SPROM8_RSSISMC2G_SHIFT);
1710 + SPEX(rssisav2g, SSB_SPROM8_RSSIPARM2G, SSB_SPROM8_RSSISAV2G,
1711 + SSB_SPROM8_RSSISAV2G_SHIFT);
1712 + SPEX(bxa2g, SSB_SPROM8_RSSIPARM2G, SSB_SPROM8_BXA2G,
1713 + SSB_SPROM8_BXA2G_SHIFT);
1714 + SPEX(rssismf5g, SSB_SPROM8_RSSIPARM5G, SSB_SPROM8_RSSISMF5G, 0);
1715 + SPEX(rssismc5g, SSB_SPROM8_RSSIPARM5G, SSB_SPROM8_RSSISMC5G,
1716 + SSB_SPROM8_RSSISMC5G_SHIFT);
1717 + SPEX(rssisav5g, SSB_SPROM8_RSSIPARM5G, SSB_SPROM8_RSSISAV5G,
1718 + SSB_SPROM8_RSSISAV5G_SHIFT);
1719 + SPEX(bxa5g, SSB_SPROM8_RSSIPARM5G, SSB_SPROM8_BXA5G,
1720 + SSB_SPROM8_BXA5G_SHIFT);
1721 + SPEX(pa0b0, SSB_SPROM8_PA0B0, 0xFFFF, 0);
1722 + SPEX(pa0b1, SSB_SPROM8_PA0B1, 0xFFFF, 0);
1723 + SPEX(pa0b2, SSB_SPROM8_PA0B2, 0xFFFF, 0);
1724 + SPEX(pa1b0, SSB_SPROM8_PA1B0, 0xFFFF, 0);
1725 + SPEX(pa1b1, SSB_SPROM8_PA1B1, 0xFFFF, 0);
1726 + SPEX(pa1b2, SSB_SPROM8_PA1B2, 0xFFFF, 0);
1727 + SPEX(pa1lob0, SSB_SPROM8_PA1LOB0, 0xFFFF, 0);
1728 + SPEX(pa1lob1, SSB_SPROM8_PA1LOB1, 0xFFFF, 0);
1729 + SPEX(pa1lob2, SSB_SPROM8_PA1LOB2, 0xFFFF, 0);
1730 + SPEX(pa1hib0, SSB_SPROM8_PA1HIB0, 0xFFFF, 0);
1731 + SPEX(pa1hib1, SSB_SPROM8_PA1HIB1, 0xFFFF, 0);
1732 + SPEX(pa1hib2, SSB_SPROM8_PA1HIB2, 0xFFFF, 0);
1733 + SPEX(cck2gpo, SSB_SPROM8_CCK2GPO, 0xFFFF, 0);
1734 + SPEX32(ofdm2gpo, SSB_SPROM8_OFDM2GPO, 0xFFFFFFFF, 0);
1735 + SPEX32(ofdm5glpo, SSB_SPROM8_OFDM5GLPO, 0xFFFFFFFF, 0);
1736 + SPEX32(ofdm5gpo, SSB_SPROM8_OFDM5GPO, 0xFFFFFFFF, 0);
1737 + SPEX32(ofdm5ghpo, SSB_SPROM8_OFDM5GHPO, 0xFFFFFFFF, 0);
1738
1739 /* Extract the antenna gain values. */
1740 SPEX(antenna_gain.ghz24.a0, SSB_SPROM8_AGAIN01,
1741 @@ -509,6 +607,31 @@ static void sprom_extract_r8(struct ssb_
1742 memcpy(&out->antenna_gain.ghz5, &out->antenna_gain.ghz24,
1743 sizeof(out->antenna_gain.ghz5));
1744
1745 + /* Extract FEM info */
1746 + SPEX(fem.ghz2.tssipos, SSB_SPROM8_FEM2G,
1747 + SSB_SROM8_FEM_TSSIPOS, SSB_SROM8_FEM_TSSIPOS_SHIFT);
1748 + SPEX(fem.ghz2.extpa_gain, SSB_SPROM8_FEM2G,
1749 + SSB_SROM8_FEM_EXTPA_GAIN, SSB_SROM8_FEM_EXTPA_GAIN_SHIFT);
1750 + SPEX(fem.ghz2.pdet_range, SSB_SPROM8_FEM2G,
1751 + SSB_SROM8_FEM_PDET_RANGE, SSB_SROM8_FEM_PDET_RANGE_SHIFT);
1752 + SPEX(fem.ghz2.tr_iso, SSB_SPROM8_FEM2G,
1753 + SSB_SROM8_FEM_TR_ISO, SSB_SROM8_FEM_TR_ISO_SHIFT);
1754 + SPEX(fem.ghz2.antswlut, SSB_SPROM8_FEM2G,
1755 + SSB_SROM8_FEM_ANTSWLUT, SSB_SROM8_FEM_ANTSWLUT_SHIFT);
1756 +
1757 + SPEX(fem.ghz5.tssipos, SSB_SPROM8_FEM5G,
1758 + SSB_SROM8_FEM_TSSIPOS, SSB_SROM8_FEM_TSSIPOS_SHIFT);
1759 + SPEX(fem.ghz5.extpa_gain, SSB_SPROM8_FEM5G,
1760 + SSB_SROM8_FEM_EXTPA_GAIN, SSB_SROM8_FEM_EXTPA_GAIN_SHIFT);
1761 + SPEX(fem.ghz5.pdet_range, SSB_SPROM8_FEM5G,
1762 + SSB_SROM8_FEM_PDET_RANGE, SSB_SROM8_FEM_PDET_RANGE_SHIFT);
1763 + SPEX(fem.ghz5.tr_iso, SSB_SPROM8_FEM5G,
1764 + SSB_SROM8_FEM_TR_ISO, SSB_SROM8_FEM_TR_ISO_SHIFT);
1765 + SPEX(fem.ghz5.antswlut, SSB_SPROM8_FEM5G,
1766 + SSB_SROM8_FEM_ANTSWLUT, SSB_SROM8_FEM_ANTSWLUT_SHIFT);
1767 +
1768 + sprom_extract_r458(out, in);
1769 +
1770 /* TODO - get remaining rev 8 stuff needed */
1771 }
1772
1773 @@ -521,36 +644,34 @@ static int sprom_extract(struct ssb_bus
1774 ssb_dprintk(KERN_DEBUG PFX "SPROM revision %d detected.\n", out->revision);
1775 memset(out->et0mac, 0xFF, 6); /* preset et0 and et1 mac */
1776 memset(out->et1mac, 0xFF, 6);
1777 +
1778 if ((bus->chip_id & 0xFF00) == 0x4400) {
1779 /* Workaround: The BCM44XX chip has a stupid revision
1780 * number stored in the SPROM.
1781 * Always extract r1. */
1782 out->revision = 1;
1783 + ssb_dprintk(KERN_DEBUG PFX "SPROM treated as revision %d\n", out->revision);
1784 + }
1785 +
1786 + switch (out->revision) {
1787 + case 1:
1788 + case 2:
1789 + case 3:
1790 sprom_extract_r123(out, in);
1791 - } else if (bus->chip_id == 0x4321) {
1792 - /* the BCM4328 has a chipid == 0x4321 and a rev 4 SPROM */
1793 - out->revision = 4;
1794 + break;
1795 + case 4:
1796 + case 5:
1797 sprom_extract_r45(out, in);
1798 - } else {
1799 - switch (out->revision) {
1800 - case 1:
1801 - case 2:
1802 - case 3:
1803 - sprom_extract_r123(out, in);
1804 - break;
1805 - case 4:
1806 - case 5:
1807 - sprom_extract_r45(out, in);
1808 - break;
1809 - case 8:
1810 - sprom_extract_r8(out, in);
1811 - break;
1812 - default:
1813 - ssb_printk(KERN_WARNING PFX "Unsupported SPROM"
1814 - " revision %d detected. Will extract"
1815 - " v1\n", out->revision);
1816 - sprom_extract_r123(out, in);
1817 - }
1818 + break;
1819 + case 8:
1820 + sprom_extract_r8(out, in);
1821 + break;
1822 + default:
1823 + ssb_printk(KERN_WARNING PFX "Unsupported SPROM"
1824 + " revision %d detected. Will extract"
1825 + " v1\n", out->revision);
1826 + out->revision = 1;
1827 + sprom_extract_r123(out, in);
1828 }
1829
1830 if (out->boardflags_lo == 0xFFFF)
1831 @@ -564,13 +685,34 @@ static int sprom_extract(struct ssb_bus
1832 static int ssb_pci_sprom_get(struct ssb_bus *bus,
1833 struct ssb_sprom *sprom)
1834 {
1835 - const struct ssb_sprom *fallback;
1836 - int err = -ENOMEM;
1837 + int err;
1838 u16 *buf;
1839
1840 + if (!ssb_is_sprom_available(bus)) {
1841 + ssb_printk(KERN_ERR PFX "No SPROM available!\n");
1842 + return -ENODEV;
1843 + }
1844 + if (bus->chipco.dev) { /* can be unavailable! */
1845 + /*
1846 + * get SPROM offset: SSB_SPROM_BASE1 except for
1847 + * chipcommon rev >= 31 or chip ID is 0x4312 and
1848 + * chipcommon status & 3 == 2
1849 + */
1850 + if (bus->chipco.dev->id.revision >= 31)
1851 + bus->sprom_offset = SSB_SPROM_BASE31;
1852 + else if (bus->chip_id == 0x4312 &&
1853 + (bus->chipco.status & 0x03) == 2)
1854 + bus->sprom_offset = SSB_SPROM_BASE31;
1855 + else
1856 + bus->sprom_offset = SSB_SPROM_BASE1;
1857 + } else {
1858 + bus->sprom_offset = SSB_SPROM_BASE1;
1859 + }
1860 + ssb_dprintk(KERN_INFO PFX "SPROM offset is 0x%x\n", bus->sprom_offset);
1861 +
1862 buf = kcalloc(SSB_SPROMSIZE_WORDS_R123, sizeof(u16), GFP_KERNEL);
1863 if (!buf)
1864 - goto out;
1865 + return -ENOMEM;
1866 bus->sprom_size = SSB_SPROMSIZE_WORDS_R123;
1867 sprom_do_read(bus, buf);
1868 err = sprom_check_crc(buf, bus->sprom_size);
1869 @@ -580,17 +722,24 @@ static int ssb_pci_sprom_get(struct ssb_
1870 buf = kcalloc(SSB_SPROMSIZE_WORDS_R4, sizeof(u16),
1871 GFP_KERNEL);
1872 if (!buf)
1873 - goto out;
1874 + return -ENOMEM;
1875 bus->sprom_size = SSB_SPROMSIZE_WORDS_R4;
1876 sprom_do_read(bus, buf);
1877 err = sprom_check_crc(buf, bus->sprom_size);
1878 if (err) {
1879 /* All CRC attempts failed.
1880 * Maybe there is no SPROM on the device?
1881 - * If we have a fallback, use that. */
1882 - fallback = ssb_get_fallback_sprom();
1883 - if (fallback) {
1884 - memcpy(sprom, fallback, sizeof(*sprom));
1885 + * Now we ask the arch code if there is some sprom
1886 + * available for this device in some other storage */
1887 + err = ssb_fill_sprom_with_fallback(bus, sprom);
1888 + if (err) {
1889 + ssb_printk(KERN_WARNING PFX "WARNING: Using"
1890 + " fallback SPROM failed (err %d)\n",
1891 + err);
1892 + } else {
1893 + ssb_dprintk(KERN_DEBUG PFX "Using SPROM"
1894 + " revision %d provided by"
1895 + " platform.\n", sprom->revision);
1896 err = 0;
1897 goto out_free;
1898 }
1899 @@ -602,19 +751,15 @@ static int ssb_pci_sprom_get(struct ssb_
1900
1901 out_free:
1902 kfree(buf);
1903 -out:
1904 return err;
1905 }
1906
1907 static void ssb_pci_get_boardinfo(struct ssb_bus *bus,
1908 struct ssb_boardinfo *bi)
1909 {
1910 - pci_read_config_word(bus->host_pci, PCI_SUBSYSTEM_VENDOR_ID,
1911 - &bi->vendor);
1912 - pci_read_config_word(bus->host_pci, PCI_SUBSYSTEM_ID,
1913 - &bi->type);
1914 - pci_read_config_word(bus->host_pci, PCI_REVISION_ID,
1915 - &bi->rev);
1916 + bi->vendor = bus->host_pci->subsystem_vendor;
1917 + bi->type = bus->host_pci->subsystem_device;
1918 + bi->rev = bus->host_pci->revision;
1919 }
1920
1921 int ssb_pci_get_invariants(struct ssb_bus *bus,
1922 --- a/drivers/ssb/pcihost_wrapper.c
1923 +++ b/drivers/ssb/pcihost_wrapper.c
1924 @@ -6,12 +6,13 @@
1925 * Copyright (c) 2005 Stefano Brivio <st3@riseup.net>
1926 * Copyright (c) 2005 Danny van Dyk <kugelfang@gentoo.org>
1927 * Copyright (c) 2005 Andreas Jaggi <andreas.jaggi@waterwave.ch>
1928 - * Copyright (c) 2005-2007 Michael Buesch <mbuesch@freenet.de>
1929 + * Copyright (c) 2005-2007 Michael Buesch <m@bues.ch>
1930 *
1931 * Licensed under the GNU/GPL. See COPYING for details.
1932 */
1933
1934 #include <linux/pci.h>
1935 +#include <linux/slab.h>
1936 #include <linux/ssb/ssb.h>
1937
1938
1939 @@ -52,12 +53,13 @@ static int ssb_pcihost_resume(struct pci
1940 # define ssb_pcihost_resume NULL
1941 #endif /* CONFIG_PM */
1942
1943 -static int ssb_pcihost_probe(struct pci_dev *dev,
1944 - const struct pci_device_id *id)
1945 +static int __devinit ssb_pcihost_probe(struct pci_dev *dev,
1946 + const struct pci_device_id *id)
1947 {
1948 struct ssb_bus *ssb;
1949 int err = -ENOMEM;
1950 const char *name;
1951 + u32 val;
1952
1953 ssb = kzalloc(sizeof(*ssb), GFP_KERNEL);
1954 if (!ssb)
1955 @@ -73,6 +75,12 @@ static int ssb_pcihost_probe(struct pci_
1956 goto err_pci_disable;
1957 pci_set_master(dev);
1958
1959 + /* Disable the RETRY_TIMEOUT register (0x41) to keep
1960 + * PCI Tx retries from interfering with C3 CPU state */
1961 + pci_read_config_dword(dev, 0x40, &val);
1962 + if ((val & 0x0000ff00) != 0)
1963 + pci_write_config_dword(dev, 0x40, val & 0xffff00ff);
1964 +
1965 err = ssb_bus_pcibus_register(ssb, dev);
1966 if (err)
1967 goto err_pci_release_regions;
1968 @@ -102,7 +110,7 @@ static void ssb_pcihost_remove(struct pc
1969 pci_set_drvdata(dev, NULL);
1970 }
1971
1972 -int ssb_pcihost_register(struct pci_driver *driver)
1973 +int __devinit ssb_pcihost_register(struct pci_driver *driver)
1974 {
1975 driver->probe = ssb_pcihost_probe;
1976 driver->remove = ssb_pcihost_remove;
1977 --- a/drivers/ssb/pcmcia.c
1978 +++ b/drivers/ssb/pcmcia.c
1979 @@ -3,7 +3,7 @@
1980 * PCMCIA-Hostbus related functions
1981 *
1982 * Copyright 2006 Johannes Berg <johannes@sipsolutions.net>
1983 - * Copyright 2007-2008 Michael Buesch <mb@bu3sch.de>
1984 + * Copyright 2007-2008 Michael Buesch <m@bues.ch>
1985 *
1986 * Licensed under the GNU/GPL. See COPYING for details.
1987 */
1988 @@ -617,136 +617,140 @@ static int ssb_pcmcia_sprom_check_crc(co
1989 } \
1990 } while (0)
1991
1992 -int ssb_pcmcia_get_invariants(struct ssb_bus *bus,
1993 - struct ssb_init_invariants *iv)
1994 +static int ssb_pcmcia_get_mac(struct pcmcia_device *p_dev,
1995 + tuple_t *tuple,
1996 + void *priv)
1997 +{
1998 + struct ssb_sprom *sprom = priv;
1999 +
2000 + if (tuple->TupleData[0] != CISTPL_FUNCE_LAN_NODE_ID)
2001 + return -EINVAL;
2002 + if (tuple->TupleDataLen != ETH_ALEN + 2)
2003 + return -EINVAL;
2004 + if (tuple->TupleData[1] != ETH_ALEN)
2005 + return -EINVAL;
2006 + memcpy(sprom->il0mac, &tuple->TupleData[2], ETH_ALEN);
2007 + return 0;
2008 +};
2009 +
2010 +static int ssb_pcmcia_do_get_invariants(struct pcmcia_device *p_dev,
2011 + tuple_t *tuple,
2012 + void *priv)
2013 {
2014 - tuple_t tuple;
2015 - int res;
2016 - unsigned char buf[32];
2017 + struct ssb_init_invariants *iv = priv;
2018 struct ssb_sprom *sprom = &iv->sprom;
2019 struct ssb_boardinfo *bi = &iv->boardinfo;
2020 const char *error_description;
2021
2022 + GOTO_ERROR_ON(tuple->TupleDataLen < 1, "VEN tpl < 1");
2023 + switch (tuple->TupleData[0]) {
2024 + case SSB_PCMCIA_CIS_ID:
2025 + GOTO_ERROR_ON((tuple->TupleDataLen != 5) &&
2026 + (tuple->TupleDataLen != 7),
2027 + "id tpl size");
2028 + bi->vendor = tuple->TupleData[1] |
2029 + ((u16)tuple->TupleData[2] << 8);
2030 + break;
2031 + case SSB_PCMCIA_CIS_BOARDREV:
2032 + GOTO_ERROR_ON(tuple->TupleDataLen != 2,
2033 + "boardrev tpl size");
2034 + sprom->board_rev = tuple->TupleData[1];
2035 + break;
2036 + case SSB_PCMCIA_CIS_PA:
2037 + GOTO_ERROR_ON((tuple->TupleDataLen != 9) &&
2038 + (tuple->TupleDataLen != 10),
2039 + "pa tpl size");
2040 + sprom->pa0b0 = tuple->TupleData[1] |
2041 + ((u16)tuple->TupleData[2] << 8);
2042 + sprom->pa0b1 = tuple->TupleData[3] |
2043 + ((u16)tuple->TupleData[4] << 8);
2044 + sprom->pa0b2 = tuple->TupleData[5] |
2045 + ((u16)tuple->TupleData[6] << 8);
2046 + sprom->itssi_a = tuple->TupleData[7];
2047 + sprom->itssi_bg = tuple->TupleData[7];
2048 + sprom->maxpwr_a = tuple->TupleData[8];
2049 + sprom->maxpwr_bg = tuple->TupleData[8];
2050 + break;
2051 + case SSB_PCMCIA_CIS_OEMNAME:
2052 + /* We ignore this. */
2053 + break;
2054 + case SSB_PCMCIA_CIS_CCODE:
2055 + GOTO_ERROR_ON(tuple->TupleDataLen != 2,
2056 + "ccode tpl size");
2057 + sprom->country_code = tuple->TupleData[1];
2058 + break;
2059 + case SSB_PCMCIA_CIS_ANTENNA:
2060 + GOTO_ERROR_ON(tuple->TupleDataLen != 2,
2061 + "ant tpl size");
2062 + sprom->ant_available_a = tuple->TupleData[1];
2063 + sprom->ant_available_bg = tuple->TupleData[1];
2064 + break;
2065 + case SSB_PCMCIA_CIS_ANTGAIN:
2066 + GOTO_ERROR_ON(tuple->TupleDataLen != 2,
2067 + "antg tpl size");
2068 + sprom->antenna_gain.ghz24.a0 = tuple->TupleData[1];
2069 + sprom->antenna_gain.ghz24.a1 = tuple->TupleData[1];
2070 + sprom->antenna_gain.ghz24.a2 = tuple->TupleData[1];
2071 + sprom->antenna_gain.ghz24.a3 = tuple->TupleData[1];
2072 + sprom->antenna_gain.ghz5.a0 = tuple->TupleData[1];
2073 + sprom->antenna_gain.ghz5.a1 = tuple->TupleData[1];
2074 + sprom->antenna_gain.ghz5.a2 = tuple->TupleData[1];
2075 + sprom->antenna_gain.ghz5.a3 = tuple->TupleData[1];
2076 + break;
2077 + case SSB_PCMCIA_CIS_BFLAGS:
2078 + GOTO_ERROR_ON((tuple->TupleDataLen != 3) &&
2079 + (tuple->TupleDataLen != 5),
2080 + "bfl tpl size");
2081 + sprom->boardflags_lo = tuple->TupleData[1] |
2082 + ((u16)tuple->TupleData[2] << 8);
2083 + break;
2084 + case SSB_PCMCIA_CIS_LEDS:
2085 + GOTO_ERROR_ON(tuple->TupleDataLen != 5,
2086 + "leds tpl size");
2087 + sprom->gpio0 = tuple->TupleData[1];
2088 + sprom->gpio1 = tuple->TupleData[2];
2089 + sprom->gpio2 = tuple->TupleData[3];
2090 + sprom->gpio3 = tuple->TupleData[4];
2091 + break;
2092 + }
2093 + return -ENOSPC; /* continue with next entry */
2094 +
2095 +error:
2096 + ssb_printk(KERN_ERR PFX
2097 + "PCMCIA: Failed to fetch device invariants: %s\n",
2098 + error_description);
2099 + return -ENODEV;
2100 +}
2101 +
2102 +
2103 +int ssb_pcmcia_get_invariants(struct ssb_bus *bus,
2104 + struct ssb_init_invariants *iv)
2105 +{
2106 + struct ssb_sprom *sprom = &iv->sprom;
2107 + int res;
2108 +
2109 memset(sprom, 0xFF, sizeof(*sprom));
2110 sprom->revision = 1;
2111 sprom->boardflags_lo = 0;
2112 sprom->boardflags_hi = 0;
2113
2114 /* First fetch the MAC address. */
2115 - memset(&tuple, 0, sizeof(tuple));
2116 - tuple.DesiredTuple = CISTPL_FUNCE;
2117 - tuple.TupleData = buf;
2118 - tuple.TupleDataMax = sizeof(buf);
2119 - res = pcmcia_get_first_tuple(bus->host_pcmcia, &tuple);
2120 - GOTO_ERROR_ON(res != 0, "MAC first tpl");
2121 - res = pcmcia_get_tuple_data(bus->host_pcmcia, &tuple);
2122 - GOTO_ERROR_ON(res != 0, "MAC first tpl data");
2123 - while (1) {
2124 - GOTO_ERROR_ON(tuple.TupleDataLen < 1, "MAC tpl < 1");
2125 - if (tuple.TupleData[0] == CISTPL_FUNCE_LAN_NODE_ID)
2126 - break;
2127 - res = pcmcia_get_next_tuple(bus->host_pcmcia, &tuple);
2128 - GOTO_ERROR_ON(res != 0, "MAC next tpl");
2129 - res = pcmcia_get_tuple_data(bus->host_pcmcia, &tuple);
2130 - GOTO_ERROR_ON(res != 0, "MAC next tpl data");
2131 + res = pcmcia_loop_tuple(bus->host_pcmcia, CISTPL_FUNCE,
2132 + ssb_pcmcia_get_mac, sprom);
2133 + if (res != 0) {
2134 + ssb_printk(KERN_ERR PFX
2135 + "PCMCIA: Failed to fetch MAC address\n");
2136 + return -ENODEV;
2137 }
2138 - GOTO_ERROR_ON(tuple.TupleDataLen != ETH_ALEN + 2, "MAC tpl size");
2139 - memcpy(sprom->il0mac, &tuple.TupleData[2], ETH_ALEN);
2140
2141 /* Fetch the vendor specific tuples. */
2142 - memset(&tuple, 0, sizeof(tuple));
2143 - tuple.DesiredTuple = SSB_PCMCIA_CIS;
2144 - tuple.TupleData = buf;
2145 - tuple.TupleDataMax = sizeof(buf);
2146 - res = pcmcia_get_first_tuple(bus->host_pcmcia, &tuple);
2147 - GOTO_ERROR_ON(res != 0, "VEN first tpl");
2148 - res = pcmcia_get_tuple_data(bus->host_pcmcia, &tuple);
2149 - GOTO_ERROR_ON(res != 0, "VEN first tpl data");
2150 - while (1) {
2151 - GOTO_ERROR_ON(tuple.TupleDataLen < 1, "VEN tpl < 1");
2152 - switch (tuple.TupleData[0]) {
2153 - case SSB_PCMCIA_CIS_ID:
2154 - GOTO_ERROR_ON((tuple.TupleDataLen != 5) &&
2155 - (tuple.TupleDataLen != 7),
2156 - "id tpl size");
2157 - bi->vendor = tuple.TupleData[1] |
2158 - ((u16)tuple.TupleData[2] << 8);
2159 - break;
2160 - case SSB_PCMCIA_CIS_BOARDREV:
2161 - GOTO_ERROR_ON(tuple.TupleDataLen != 2,
2162 - "boardrev tpl size");
2163 - sprom->board_rev = tuple.TupleData[1];
2164 - break;
2165 - case SSB_PCMCIA_CIS_PA:
2166 - GOTO_ERROR_ON((tuple.TupleDataLen != 9) &&
2167 - (tuple.TupleDataLen != 10),
2168 - "pa tpl size");
2169 - sprom->pa0b0 = tuple.TupleData[1] |
2170 - ((u16)tuple.TupleData[2] << 8);
2171 - sprom->pa0b1 = tuple.TupleData[3] |
2172 - ((u16)tuple.TupleData[4] << 8);
2173 - sprom->pa0b2 = tuple.TupleData[5] |
2174 - ((u16)tuple.TupleData[6] << 8);
2175 - sprom->itssi_a = tuple.TupleData[7];
2176 - sprom->itssi_bg = tuple.TupleData[7];
2177 - sprom->maxpwr_a = tuple.TupleData[8];
2178 - sprom->maxpwr_bg = tuple.TupleData[8];
2179 - break;
2180 - case SSB_PCMCIA_CIS_OEMNAME:
2181 - /* We ignore this. */
2182 - break;
2183 - case SSB_PCMCIA_CIS_CCODE:
2184 - GOTO_ERROR_ON(tuple.TupleDataLen != 2,
2185 - "ccode tpl size");
2186 - sprom->country_code = tuple.TupleData[1];
2187 - break;
2188 - case SSB_PCMCIA_CIS_ANTENNA:
2189 - GOTO_ERROR_ON(tuple.TupleDataLen != 2,
2190 - "ant tpl size");
2191 - sprom->ant_available_a = tuple.TupleData[1];
2192 - sprom->ant_available_bg = tuple.TupleData[1];
2193 - break;
2194 - case SSB_PCMCIA_CIS_ANTGAIN:
2195 - GOTO_ERROR_ON(tuple.TupleDataLen != 2,
2196 - "antg tpl size");
2197 - sprom->antenna_gain.ghz24.a0 = tuple.TupleData[1];
2198 - sprom->antenna_gain.ghz24.a1 = tuple.TupleData[1];
2199 - sprom->antenna_gain.ghz24.a2 = tuple.TupleData[1];
2200 - sprom->antenna_gain.ghz24.a3 = tuple.TupleData[1];
2201 - sprom->antenna_gain.ghz5.a0 = tuple.TupleData[1];
2202 - sprom->antenna_gain.ghz5.a1 = tuple.TupleData[1];
2203 - sprom->antenna_gain.ghz5.a2 = tuple.TupleData[1];
2204 - sprom->antenna_gain.ghz5.a3 = tuple.TupleData[1];
2205 - break;
2206 - case SSB_PCMCIA_CIS_BFLAGS:
2207 - GOTO_ERROR_ON((tuple.TupleDataLen != 3) &&
2208 - (tuple.TupleDataLen != 5),
2209 - "bfl tpl size");
2210 - sprom->boardflags_lo = tuple.TupleData[1] |
2211 - ((u16)tuple.TupleData[2] << 8);
2212 - break;
2213 - case SSB_PCMCIA_CIS_LEDS:
2214 - GOTO_ERROR_ON(tuple.TupleDataLen != 5,
2215 - "leds tpl size");
2216 - sprom->gpio0 = tuple.TupleData[1];
2217 - sprom->gpio1 = tuple.TupleData[2];
2218 - sprom->gpio2 = tuple.TupleData[3];
2219 - sprom->gpio3 = tuple.TupleData[4];
2220 - break;
2221 - }
2222 - res = pcmcia_get_next_tuple(bus->host_pcmcia, &tuple);
2223 - if (res == -ENOSPC)
2224 - break;
2225 - GOTO_ERROR_ON(res != 0, "VEN next tpl");
2226 - res = pcmcia_get_tuple_data(bus->host_pcmcia, &tuple);
2227 - GOTO_ERROR_ON(res != 0, "VEN next tpl data");
2228 - }
2229 + res = pcmcia_loop_tuple(bus->host_pcmcia, SSB_PCMCIA_CIS,
2230 + ssb_pcmcia_do_get_invariants, iv);
2231 + if ((res == 0) || (res == -ENOSPC))
2232 + return 0;
2233
2234 - return 0;
2235 -error:
2236 ssb_printk(KERN_ERR PFX
2237 - "PCMCIA: Failed to fetch device invariants: %s\n",
2238 - error_description);
2239 + "PCMCIA: Failed to fetch device invariants\n");
2240 return -ENODEV;
2241 }
2242
2243 --- a/drivers/ssb/scan.c
2244 +++ b/drivers/ssb/scan.c
2245 @@ -2,7 +2,7 @@
2246 * Sonics Silicon Backplane
2247 * Bus scanning
2248 *
2249 - * Copyright (C) 2005-2007 Michael Buesch <mb@bu3sch.de>
2250 + * Copyright (C) 2005-2007 Michael Buesch <m@bues.ch>
2251 * Copyright (C) 2005 Martin Langer <martin-langer@gmx.de>
2252 * Copyright (C) 2005 Stefano Brivio <st3@riseup.net>
2253 * Copyright (C) 2005 Danny van Dyk <kugelfang@gentoo.org>
2254 @@ -162,6 +162,8 @@ static u8 chipid_to_nrcores(u16 chipid)
2255 static u32 scan_read32(struct ssb_bus *bus, u8 current_coreidx,
2256 u16 offset)
2257 {
2258 + u32 lo, hi;
2259 +
2260 switch (bus->bustype) {
2261 case SSB_BUSTYPE_SSB:
2262 offset += current_coreidx * SSB_CORE_SIZE;
2263 @@ -174,7 +176,12 @@ static u32 scan_read32(struct ssb_bus *b
2264 offset -= 0x800;
2265 } else
2266 ssb_pcmcia_switch_segment(bus, 0);
2267 - break;
2268 + lo = readw(bus->mmio + offset);
2269 + hi = readw(bus->mmio + offset + 2);
2270 + return lo | (hi << 16);
2271 + case SSB_BUSTYPE_SDIO:
2272 + offset += current_coreidx * SSB_CORE_SIZE;
2273 + return ssb_sdio_scan_read32(bus, offset);
2274 }
2275 return readl(bus->mmio + offset);
2276 }
2277 @@ -188,6 +195,8 @@ static int scan_switchcore(struct ssb_bu
2278 return ssb_pci_switch_coreidx(bus, coreidx);
2279 case SSB_BUSTYPE_PCMCIA:
2280 return ssb_pcmcia_switch_coreidx(bus, coreidx);
2281 + case SSB_BUSTYPE_SDIO:
2282 + return ssb_sdio_scan_switch_coreidx(bus, coreidx);
2283 }
2284 return 0;
2285 }
2286 @@ -206,6 +215,8 @@ void ssb_iounmap(struct ssb_bus *bus)
2287 SSB_BUG_ON(1); /* Can't reach this code. */
2288 #endif
2289 break;
2290 + case SSB_BUSTYPE_SDIO:
2291 + break;
2292 }
2293 bus->mmio = NULL;
2294 bus->mapped_device = NULL;
2295 @@ -230,6 +241,10 @@ static void __iomem *ssb_ioremap(struct
2296 SSB_BUG_ON(1); /* Can't reach this code. */
2297 #endif
2298 break;
2299 + case SSB_BUSTYPE_SDIO:
2300 + /* Nothing to ioremap in the SDIO case, just fake it */
2301 + mmio = (void __iomem *)baseaddr;
2302 + break;
2303 }
2304
2305 return mmio;
2306 @@ -245,7 +260,10 @@ static int we_support_multiple_80211_cor
2307 #ifdef CONFIG_SSB_PCIHOST
2308 if (bus->bustype == SSB_BUSTYPE_PCI) {
2309 if (bus->host_pci->vendor == PCI_VENDOR_ID_BROADCOM &&
2310 - bus->host_pci->device == 0x4324)
2311 + ((bus->host_pci->device == 0x4313) ||
2312 + (bus->host_pci->device == 0x431A) ||
2313 + (bus->host_pci->device == 0x4321) ||
2314 + (bus->host_pci->device == 0x4324)))
2315 return 1;
2316 }
2317 #endif /* CONFIG_SSB_PCIHOST */
2318 @@ -294,8 +312,7 @@ int ssb_bus_scan(struct ssb_bus *bus,
2319 } else {
2320 if (bus->bustype == SSB_BUSTYPE_PCI) {
2321 bus->chip_id = pcidev_to_chipid(bus->host_pci);
2322 - pci_read_config_word(bus->host_pci, PCI_REVISION_ID,
2323 - &bus->chip_rev);
2324 + bus->chip_rev = bus->host_pci->revision;
2325 bus->chip_package = 0;
2326 } else {
2327 bus->chip_id = 0x4710;
2328 @@ -339,7 +356,7 @@ int ssb_bus_scan(struct ssb_bus *bus,
2329 dev->bus = bus;
2330 dev->ops = bus->ops;
2331
2332 - ssb_dprintk(KERN_INFO PFX
2333 + printk(KERN_DEBUG PFX
2334 "Core %d found: %s "
2335 "(cc 0x%03X, rev 0x%02X, vendor 0x%04X)\n",
2336 i, ssb_core_name(dev->id.coreid),
2337 @@ -407,6 +424,16 @@ int ssb_bus_scan(struct ssb_bus *bus,
2338 bus->pcicore.dev = dev;
2339 #endif /* CONFIG_SSB_DRIVER_PCICORE */
2340 break;
2341 + case SSB_DEV_ETHERNET:
2342 + if (bus->bustype == SSB_BUSTYPE_PCI) {
2343 + if (bus->host_pci->vendor == PCI_VENDOR_ID_BROADCOM &&
2344 + (bus->host_pci->device & 0xFF00) == 0x4300) {
2345 + /* This is a dangling ethernet core on a
2346 + * wireless device. Ignore it. */
2347 + continue;
2348 + }
2349 + }
2350 + break;
2351 default:
2352 break;
2353 }
2354 --- /dev/null
2355 +++ b/drivers/ssb/sdio.c
2356 @@ -0,0 +1,610 @@
2357 +/*
2358 + * Sonics Silicon Backplane
2359 + * SDIO-Hostbus related functions
2360 + *
2361 + * Copyright 2009 Albert Herranz <albert_herranz@yahoo.es>
2362 + *
2363 + * Based on drivers/ssb/pcmcia.c
2364 + * Copyright 2006 Johannes Berg <johannes@sipsolutions.net>
2365 + * Copyright 2007-2008 Michael Buesch <m@bues.ch>
2366 + *
2367 + * Licensed under the GNU/GPL. See COPYING for details.
2368 + *
2369 + */
2370 +
2371 +#include <linux/ssb/ssb.h>
2372 +#include <linux/delay.h>
2373 +#include <linux/io.h>
2374 +#include <linux/etherdevice.h>
2375 +#include <linux/mmc/sdio_func.h>
2376 +
2377 +#include "ssb_private.h"
2378 +
2379 +/* Define the following to 1 to enable a printk on each coreswitch. */
2380 +#define SSB_VERBOSE_SDIOCORESWITCH_DEBUG 0
2381 +
2382 +
2383 +/* Hardware invariants CIS tuples */
2384 +#define SSB_SDIO_CIS 0x80
2385 +#define SSB_SDIO_CIS_SROMREV 0x00
2386 +#define SSB_SDIO_CIS_ID 0x01
2387 +#define SSB_SDIO_CIS_BOARDREV 0x02
2388 +#define SSB_SDIO_CIS_PA 0x03
2389 +#define SSB_SDIO_CIS_PA_PA0B0_LO 0
2390 +#define SSB_SDIO_CIS_PA_PA0B0_HI 1
2391 +#define SSB_SDIO_CIS_PA_PA0B1_LO 2
2392 +#define SSB_SDIO_CIS_PA_PA0B1_HI 3
2393 +#define SSB_SDIO_CIS_PA_PA0B2_LO 4
2394 +#define SSB_SDIO_CIS_PA_PA0B2_HI 5
2395 +#define SSB_SDIO_CIS_PA_ITSSI 6
2396 +#define SSB_SDIO_CIS_PA_MAXPOW 7
2397 +#define SSB_SDIO_CIS_OEMNAME 0x04
2398 +#define SSB_SDIO_CIS_CCODE 0x05
2399 +#define SSB_SDIO_CIS_ANTENNA 0x06
2400 +#define SSB_SDIO_CIS_ANTGAIN 0x07
2401 +#define SSB_SDIO_CIS_BFLAGS 0x08
2402 +#define SSB_SDIO_CIS_LEDS 0x09
2403 +
2404 +#define CISTPL_FUNCE_LAN_NODE_ID 0x04 /* same as in PCMCIA */
2405 +
2406 +
2407 +/*
2408 + * Function 1 miscellaneous registers.
2409 + *
2410 + * Definitions match src/include/sbsdio.h from the
2411 + * Android Open Source Project
2412 + * http://android.git.kernel.org/?p=platform/system/wlan/broadcom.git
2413 + *
2414 + */
2415 +#define SBSDIO_FUNC1_SBADDRLOW 0x1000a /* SB Address window Low (b15) */
2416 +#define SBSDIO_FUNC1_SBADDRMID 0x1000b /* SB Address window Mid (b23-b16) */
2417 +#define SBSDIO_FUNC1_SBADDRHIGH 0x1000c /* SB Address window High (b24-b31) */
2418 +
2419 +/* valid bits in SBSDIO_FUNC1_SBADDRxxx regs */
2420 +#define SBSDIO_SBADDRLOW_MASK 0x80 /* Valid address bits in SBADDRLOW */
2421 +#define SBSDIO_SBADDRMID_MASK 0xff /* Valid address bits in SBADDRMID */
2422 +#define SBSDIO_SBADDRHIGH_MASK 0xff /* Valid address bits in SBADDRHIGH */
2423 +
2424 +#define SBSDIO_SB_OFT_ADDR_MASK 0x7FFF /* sb offset addr is <= 15 bits, 32k */
2425 +
2426 +/* REVISIT: this flag doesn't seem to matter */
2427 +#define SBSDIO_SB_ACCESS_2_4B_FLAG 0x8000 /* forces 32-bit SB access */
2428 +
2429 +
2430 +/*
2431 + * Address map within the SDIO function address space (128K).
2432 + *
2433 + * Start End Description
2434 + * ------- ------- ------------------------------------------
2435 + * 0x00000 0x0ffff selected backplane address window (64K)
2436 + * 0x10000 0x1ffff backplane control registers (max 64K)
2437 + *
2438 + * The current address window is configured by writing to registers
2439 + * SBADDRLOW, SBADDRMID and SBADDRHIGH.
2440 + *
2441 + * In order to access the contents of a 32-bit Silicon Backplane address
2442 + * the backplane address window must be first loaded with the highest
2443 + * 16 bits of the target address. Then, an access must be done to the
2444 + * SDIO function address space using the lower 15 bits of the address.
2445 + * Bit 15 of the address must be set when doing 32 bit accesses.
2446 + *
2447 + * 10987654321098765432109876543210
2448 + * WWWWWWWWWWWWWWWWW SB Address Window
2449 + * OOOOOOOOOOOOOOOO Offset within SB Address Window
2450 + * a 32-bit access flag
2451 + */
2452 +
2453 +
2454 +/*
2455 + * SSB I/O via SDIO.
2456 + *
2457 + * NOTE: SDIO address @addr is 17 bits long (SDIO address space is 128K).
2458 + */
2459 +
2460 +static inline struct device *ssb_sdio_dev(struct ssb_bus *bus)
2461 +{
2462 + return &bus->host_sdio->dev;
2463 +}
2464 +
2465 +/* host claimed */
2466 +static int ssb_sdio_writeb(struct ssb_bus *bus, unsigned int addr, u8 val)
2467 +{
2468 + int error = 0;
2469 +
2470 + sdio_writeb(bus->host_sdio, val, addr, &error);
2471 + if (unlikely(error)) {
2472 + dev_dbg(ssb_sdio_dev(bus), "%08X <- %02x, error %d\n",
2473 + addr, val, error);
2474 + }
2475 +
2476 + return error;
2477 +}
2478 +
2479 +#if 0
2480 +static u8 ssb_sdio_readb(struct ssb_bus *bus, unsigned int addr)
2481 +{
2482 + u8 val;
2483 + int error = 0;
2484 +
2485 + val = sdio_readb(bus->host_sdio, addr, &error);
2486 + if (unlikely(error)) {
2487 + dev_dbg(ssb_sdio_dev(bus), "%08X -> %02x, error %d\n",
2488 + addr, val, error);
2489 + }
2490 +
2491 + return val;
2492 +}
2493 +#endif
2494 +
2495 +/* host claimed */
2496 +static int ssb_sdio_set_sbaddr_window(struct ssb_bus *bus, u32 address)
2497 +{
2498 + int error;
2499 +
2500 + error = ssb_sdio_writeb(bus, SBSDIO_FUNC1_SBADDRLOW,
2501 + (address >> 8) & SBSDIO_SBADDRLOW_MASK);
2502 + if (error)
2503 + goto out;
2504 + error = ssb_sdio_writeb(bus, SBSDIO_FUNC1_SBADDRMID,
2505 + (address >> 16) & SBSDIO_SBADDRMID_MASK);
2506 + if (error)
2507 + goto out;
2508 + error = ssb_sdio_writeb(bus, SBSDIO_FUNC1_SBADDRHIGH,
2509 + (address >> 24) & SBSDIO_SBADDRHIGH_MASK);
2510 + if (error)
2511 + goto out;
2512 + bus->sdio_sbaddr = address;
2513 +out:
2514 + if (error) {
2515 + dev_dbg(ssb_sdio_dev(bus), "failed to set address window"
2516 + " to 0x%08x, error %d\n", address, error);
2517 + }
2518 +
2519 + return error;
2520 +}
2521 +
2522 +/* for enumeration use only */
2523 +u32 ssb_sdio_scan_read32(struct ssb_bus *bus, u16 offset)
2524 +{
2525 + u32 val;
2526 + int error;
2527 +
2528 + sdio_claim_host(bus->host_sdio);
2529 + val = sdio_readl(bus->host_sdio, offset, &error);
2530 + sdio_release_host(bus->host_sdio);
2531 + if (unlikely(error)) {
2532 + dev_dbg(ssb_sdio_dev(bus), "%04X:%04X > %08x, error %d\n",
2533 + bus->sdio_sbaddr >> 16, offset, val, error);
2534 + }
2535 +
2536 + return val;
2537 +}
2538 +
2539 +/* for enumeration use only */
2540 +int ssb_sdio_scan_switch_coreidx(struct ssb_bus *bus, u8 coreidx)
2541 +{
2542 + u32 sbaddr;
2543 + int error;
2544 +
2545 + sbaddr = (coreidx * SSB_CORE_SIZE) + SSB_ENUM_BASE;
2546 + sdio_claim_host(bus->host_sdio);
2547 + error = ssb_sdio_set_sbaddr_window(bus, sbaddr);
2548 + sdio_release_host(bus->host_sdio);
2549 + if (error) {
2550 + dev_err(ssb_sdio_dev(bus), "failed to switch to core %u,"
2551 + " error %d\n", coreidx, error);
2552 + goto out;
2553 + }
2554 +out:
2555 + return error;
2556 +}
2557 +
2558 +/* host must be already claimed */
2559 +int ssb_sdio_switch_core(struct ssb_bus *bus, struct ssb_device *dev)
2560 +{
2561 + u8 coreidx = dev->core_index;
2562 + u32 sbaddr;
2563 + int error = 0;
2564 +
2565 + sbaddr = (coreidx * SSB_CORE_SIZE) + SSB_ENUM_BASE;
2566 + if (unlikely(bus->sdio_sbaddr != sbaddr)) {
2567 +#if SSB_VERBOSE_SDIOCORESWITCH_DEBUG
2568 + dev_info(ssb_sdio_dev(bus),
2569 + "switching to %s core, index %d\n",
2570 + ssb_core_name(dev->id.coreid), coreidx);
2571 +#endif
2572 + error = ssb_sdio_set_sbaddr_window(bus, sbaddr);
2573 + if (error) {
2574 + dev_dbg(ssb_sdio_dev(bus), "failed to switch to"
2575 + " core %u, error %d\n", coreidx, error);
2576 + goto out;
2577 + }
2578 + bus->mapped_device = dev;
2579 + }
2580 +
2581 +out:
2582 + return error;
2583 +}
2584 +
2585 +static u8 ssb_sdio_read8(struct ssb_device *dev, u16 offset)
2586 +{
2587 + struct ssb_bus *bus = dev->bus;
2588 + u8 val = 0xff;
2589 + int error = 0;
2590 +
2591 + sdio_claim_host(bus->host_sdio);
2592 + if (unlikely(ssb_sdio_switch_core(bus, dev)))
2593 + goto out;
2594 + offset |= bus->sdio_sbaddr & 0xffff;
2595 + offset &= SBSDIO_SB_OFT_ADDR_MASK;
2596 + val = sdio_readb(bus->host_sdio, offset, &error);
2597 + if (error) {
2598 + dev_dbg(ssb_sdio_dev(bus), "%04X:%04X > %02x, error %d\n",
2599 + bus->sdio_sbaddr >> 16, offset, val, error);
2600 + }
2601 +out:
2602 + sdio_release_host(bus->host_sdio);
2603 +
2604 + return val;
2605 +}
2606 +
2607 +static u16 ssb_sdio_read16(struct ssb_device *dev, u16 offset)
2608 +{
2609 + struct ssb_bus *bus = dev->bus;
2610 + u16 val = 0xffff;
2611 + int error = 0;
2612 +
2613 + sdio_claim_host(bus->host_sdio);
2614 + if (unlikely(ssb_sdio_switch_core(bus, dev)))
2615 + goto out;
2616 + offset |= bus->sdio_sbaddr & 0xffff;
2617 + offset &= SBSDIO_SB_OFT_ADDR_MASK;
2618 + val = sdio_readw(bus->host_sdio, offset, &error);
2619 + if (error) {
2620 + dev_dbg(ssb_sdio_dev(bus), "%04X:%04X > %04x, error %d\n",
2621 + bus->sdio_sbaddr >> 16, offset, val, error);
2622 + }
2623 +out:
2624 + sdio_release_host(bus->host_sdio);
2625 +
2626 + return val;
2627 +}
2628 +
2629 +static u32 ssb_sdio_read32(struct ssb_device *dev, u16 offset)
2630 +{
2631 + struct ssb_bus *bus = dev->bus;
2632 + u32 val = 0xffffffff;
2633 + int error = 0;
2634 +
2635 + sdio_claim_host(bus->host_sdio);
2636 + if (unlikely(ssb_sdio_switch_core(bus, dev)))
2637 + goto out;
2638 + offset |= bus->sdio_sbaddr & 0xffff;
2639 + offset &= SBSDIO_SB_OFT_ADDR_MASK;
2640 + offset |= SBSDIO_SB_ACCESS_2_4B_FLAG; /* 32 bit data access */
2641 + val = sdio_readl(bus->host_sdio, offset, &error);
2642 + if (error) {
2643 + dev_dbg(ssb_sdio_dev(bus), "%04X:%04X > %08x, error %d\n",
2644 + bus->sdio_sbaddr >> 16, offset, val, error);
2645 + }
2646 +out:
2647 + sdio_release_host(bus->host_sdio);
2648 +
2649 + return val;
2650 +}
2651 +
2652 +#ifdef CONFIG_SSB_BLOCKIO
2653 +static void ssb_sdio_block_read(struct ssb_device *dev, void *buffer,
2654 + size_t count, u16 offset, u8 reg_width)
2655 +{
2656 + size_t saved_count = count;
2657 + struct ssb_bus *bus = dev->bus;
2658 + int error = 0;
2659 +
2660 + sdio_claim_host(bus->host_sdio);
2661 + if (unlikely(ssb_sdio_switch_core(bus, dev))) {
2662 + error = -EIO;
2663 + memset(buffer, 0xff, count);
2664 + goto err_out;
2665 + }
2666 + offset |= bus->sdio_sbaddr & 0xffff;
2667 + offset &= SBSDIO_SB_OFT_ADDR_MASK;
2668 +
2669 + switch (reg_width) {
2670 + case sizeof(u8): {
2671 + error = sdio_readsb(bus->host_sdio, buffer, offset, count);
2672 + break;
2673 + }
2674 + case sizeof(u16): {
2675 + SSB_WARN_ON(count & 1);
2676 + error = sdio_readsb(bus->host_sdio, buffer, offset, count);
2677 + break;
2678 + }
2679 + case sizeof(u32): {
2680 + SSB_WARN_ON(count & 3);
2681 + offset |= SBSDIO_SB_ACCESS_2_4B_FLAG; /* 32 bit data access */
2682 + error = sdio_readsb(bus->host_sdio, buffer, offset, count);
2683 + break;
2684 + }
2685 + default:
2686 + SSB_WARN_ON(1);
2687 + }
2688 + if (!error)
2689 + goto out;
2690 +
2691 +err_out:
2692 + dev_dbg(ssb_sdio_dev(bus), "%04X:%04X (width=%u, len=%zu), error %d\n",
2693 + bus->sdio_sbaddr >> 16, offset, reg_width, saved_count, error);
2694 +out:
2695 + sdio_release_host(bus->host_sdio);
2696 +}
2697 +#endif /* CONFIG_SSB_BLOCKIO */
2698 +
2699 +static void ssb_sdio_write8(struct ssb_device *dev, u16 offset, u8 val)
2700 +{
2701 + struct ssb_bus *bus = dev->bus;
2702 + int error = 0;
2703 +
2704 + sdio_claim_host(bus->host_sdio);
2705 + if (unlikely(ssb_sdio_switch_core(bus, dev)))
2706 + goto out;
2707 + offset |= bus->sdio_sbaddr & 0xffff;
2708 + offset &= SBSDIO_SB_OFT_ADDR_MASK;
2709 + sdio_writeb(bus->host_sdio, val, offset, &error);
2710 + if (error) {
2711 + dev_dbg(ssb_sdio_dev(bus), "%04X:%04X < %02x, error %d\n",
2712 + bus->sdio_sbaddr >> 16, offset, val, error);
2713 + }
2714 +out:
2715 + sdio_release_host(bus->host_sdio);
2716 +}
2717 +
2718 +static void ssb_sdio_write16(struct ssb_device *dev, u16 offset, u16 val)
2719 +{
2720 + struct ssb_bus *bus = dev->bus;
2721 + int error = 0;
2722 +
2723 + sdio_claim_host(bus->host_sdio);
2724 + if (unlikely(ssb_sdio_switch_core(bus, dev)))
2725 + goto out;
2726 + offset |= bus->sdio_sbaddr & 0xffff;
2727 + offset &= SBSDIO_SB_OFT_ADDR_MASK;
2728 + sdio_writew(bus->host_sdio, val, offset, &error);
2729 + if (error) {
2730 + dev_dbg(ssb_sdio_dev(bus), "%04X:%04X < %04x, error %d\n",
2731 + bus->sdio_sbaddr >> 16, offset, val, error);
2732 + }
2733 +out:
2734 + sdio_release_host(bus->host_sdio);
2735 +}
2736 +
2737 +static void ssb_sdio_write32(struct ssb_device *dev, u16 offset, u32 val)
2738 +{
2739 + struct ssb_bus *bus = dev->bus;
2740 + int error = 0;
2741 +
2742 + sdio_claim_host(bus->host_sdio);
2743 + if (unlikely(ssb_sdio_switch_core(bus, dev)))
2744 + goto out;
2745 + offset |= bus->sdio_sbaddr & 0xffff;
2746 + offset &= SBSDIO_SB_OFT_ADDR_MASK;
2747 + offset |= SBSDIO_SB_ACCESS_2_4B_FLAG; /* 32 bit data access */
2748 + sdio_writel(bus->host_sdio, val, offset, &error);
2749 + if (error) {
2750 + dev_dbg(ssb_sdio_dev(bus), "%04X:%04X < %08x, error %d\n",
2751 + bus->sdio_sbaddr >> 16, offset, val, error);
2752 + }
2753 + if (bus->quirks & SSB_QUIRK_SDIO_READ_AFTER_WRITE32)
2754 + sdio_readl(bus->host_sdio, 0, &error);
2755 +out:
2756 + sdio_release_host(bus->host_sdio);
2757 +}
2758 +
2759 +#ifdef CONFIG_SSB_BLOCKIO
2760 +static void ssb_sdio_block_write(struct ssb_device *dev, const void *buffer,
2761 + size_t count, u16 offset, u8 reg_width)
2762 +{
2763 + size_t saved_count = count;
2764 + struct ssb_bus *bus = dev->bus;
2765 + int error = 0;
2766 +
2767 + sdio_claim_host(bus->host_sdio);
2768 + if (unlikely(ssb_sdio_switch_core(bus, dev))) {
2769 + error = -EIO;
2770 + memset((void *)buffer, 0xff, count);
2771 + goto err_out;
2772 + }
2773 + offset |= bus->sdio_sbaddr & 0xffff;
2774 + offset &= SBSDIO_SB_OFT_ADDR_MASK;
2775 +
2776 + switch (reg_width) {
2777 + case sizeof(u8):
2778 + error = sdio_writesb(bus->host_sdio, offset,
2779 + (void *)buffer, count);
2780 + break;
2781 + case sizeof(u16):
2782 + SSB_WARN_ON(count & 1);
2783 + error = sdio_writesb(bus->host_sdio, offset,
2784 + (void *)buffer, count);
2785 + break;
2786 + case sizeof(u32):
2787 + SSB_WARN_ON(count & 3);
2788 + offset |= SBSDIO_SB_ACCESS_2_4B_FLAG; /* 32 bit data access */
2789 + error = sdio_writesb(bus->host_sdio, offset,
2790 + (void *)buffer, count);
2791 + break;
2792 + default:
2793 + SSB_WARN_ON(1);
2794 + }
2795 + if (!error)
2796 + goto out;
2797 +
2798 +err_out:
2799 + dev_dbg(ssb_sdio_dev(bus), "%04X:%04X (width=%u, len=%zu), error %d\n",
2800 + bus->sdio_sbaddr >> 16, offset, reg_width, saved_count, error);
2801 +out:
2802 + sdio_release_host(bus->host_sdio);
2803 +}
2804 +
2805 +#endif /* CONFIG_SSB_BLOCKIO */
2806 +
2807 +/* Not "static", as it's used in main.c */
2808 +const struct ssb_bus_ops ssb_sdio_ops = {
2809 + .read8 = ssb_sdio_read8,
2810 + .read16 = ssb_sdio_read16,
2811 + .read32 = ssb_sdio_read32,
2812 + .write8 = ssb_sdio_write8,
2813 + .write16 = ssb_sdio_write16,
2814 + .write32 = ssb_sdio_write32,
2815 +#ifdef CONFIG_SSB_BLOCKIO
2816 + .block_read = ssb_sdio_block_read,
2817 + .block_write = ssb_sdio_block_write,
2818 +#endif
2819 +};
2820 +
2821 +#define GOTO_ERROR_ON(condition, description) do { \
2822 + if (unlikely(condition)) { \
2823 + error_description = description; \
2824 + goto error; \
2825 + } \
2826 + } while (0)
2827 +
2828 +int ssb_sdio_get_invariants(struct ssb_bus *bus,
2829 + struct ssb_init_invariants *iv)
2830 +{
2831 + struct ssb_sprom *sprom = &iv->sprom;
2832 + struct ssb_boardinfo *bi = &iv->boardinfo;
2833 + const char *error_description = "none";
2834 + struct sdio_func_tuple *tuple;
2835 + void *mac;
2836 +
2837 + memset(sprom, 0xFF, sizeof(*sprom));
2838 + sprom->boardflags_lo = 0;
2839 + sprom->boardflags_hi = 0;
2840 +
2841 + tuple = bus->host_sdio->tuples;
2842 + while (tuple) {
2843 + switch (tuple->code) {
2844 + case 0x22: /* extended function */
2845 + switch (tuple->data[0]) {
2846 + case CISTPL_FUNCE_LAN_NODE_ID:
2847 + GOTO_ERROR_ON((tuple->size != 7) &&
2848 + (tuple->data[1] != 6),
2849 + "mac tpl size");
2850 + /* fetch the MAC address. */
2851 + mac = tuple->data + 2;
2852 + memcpy(sprom->il0mac, mac, ETH_ALEN);
2853 + memcpy(sprom->et1mac, mac, ETH_ALEN);
2854 + break;
2855 + default:
2856 + break;
2857 + }
2858 + break;
2859 + case 0x80: /* vendor specific tuple */
2860 + switch (tuple->data[0]) {
2861 + case SSB_SDIO_CIS_SROMREV:
2862 + GOTO_ERROR_ON(tuple->size != 2,
2863 + "sromrev tpl size");
2864 + sprom->revision = tuple->data[1];
2865 + break;
2866 + case SSB_SDIO_CIS_ID:
2867 + GOTO_ERROR_ON((tuple->size != 5) &&
2868 + (tuple->size != 7),
2869 + "id tpl size");
2870 + bi->vendor = tuple->data[1] |
2871 + (tuple->data[2]<<8);
2872 + break;
2873 + case SSB_SDIO_CIS_BOARDREV:
2874 + GOTO_ERROR_ON(tuple->size != 2,
2875 + "boardrev tpl size");
2876 + sprom->board_rev = tuple->data[1];
2877 + break;
2878 + case SSB_SDIO_CIS_PA:
2879 + GOTO_ERROR_ON((tuple->size != 9) &&
2880 + (tuple->size != 10),
2881 + "pa tpl size");
2882 + sprom->pa0b0 = tuple->data[1] |
2883 + ((u16)tuple->data[2] << 8);
2884 + sprom->pa0b1 = tuple->data[3] |
2885 + ((u16)tuple->data[4] << 8);
2886 + sprom->pa0b2 = tuple->data[5] |
2887 + ((u16)tuple->data[6] << 8);
2888 + sprom->itssi_a = tuple->data[7];
2889 + sprom->itssi_bg = tuple->data[7];
2890 + sprom->maxpwr_a = tuple->data[8];
2891 + sprom->maxpwr_bg = tuple->data[8];
2892 + break;
2893 + case SSB_SDIO_CIS_OEMNAME:
2894 + /* Not present */
2895 + break;
2896 + case SSB_SDIO_CIS_CCODE:
2897 + GOTO_ERROR_ON(tuple->size != 2,
2898 + "ccode tpl size");
2899 + sprom->country_code = tuple->data[1];
2900 + break;
2901 + case SSB_SDIO_CIS_ANTENNA:
2902 + GOTO_ERROR_ON(tuple->size != 2,
2903 + "ant tpl size");
2904 + sprom->ant_available_a = tuple->data[1];
2905 + sprom->ant_available_bg = tuple->data[1];
2906 + break;
2907 + case SSB_SDIO_CIS_ANTGAIN:
2908 + GOTO_ERROR_ON(tuple->size != 2,
2909 + "antg tpl size");
2910 + sprom->antenna_gain.ghz24.a0 = tuple->data[1];
2911 + sprom->antenna_gain.ghz24.a1 = tuple->data[1];
2912 + sprom->antenna_gain.ghz24.a2 = tuple->data[1];
2913 + sprom->antenna_gain.ghz24.a3 = tuple->data[1];
2914 + sprom->antenna_gain.ghz5.a0 = tuple->data[1];
2915 + sprom->antenna_gain.ghz5.a1 = tuple->data[1];
2916 + sprom->antenna_gain.ghz5.a2 = tuple->data[1];
2917 + sprom->antenna_gain.ghz5.a3 = tuple->data[1];
2918 + break;
2919 + case SSB_SDIO_CIS_BFLAGS:
2920 + GOTO_ERROR_ON((tuple->size != 3) &&
2921 + (tuple->size != 5),
2922 + "bfl tpl size");
2923 + sprom->boardflags_lo = tuple->data[1] |
2924 + ((u16)tuple->data[2] << 8);
2925 + break;
2926 + case SSB_SDIO_CIS_LEDS:
2927 + GOTO_ERROR_ON(tuple->size != 5,
2928 + "leds tpl size");
2929 + sprom->gpio0 = tuple->data[1];
2930 + sprom->gpio1 = tuple->data[2];
2931 + sprom->gpio2 = tuple->data[3];
2932 + sprom->gpio3 = tuple->data[4];
2933 + break;
2934 + default:
2935 + break;
2936 + }
2937 + break;
2938 + default:
2939 + break;
2940 + }
2941 + tuple = tuple->next;
2942 + }
2943 +
2944 + return 0;
2945 +error:
2946 + dev_err(ssb_sdio_dev(bus), "failed to fetch device invariants: %s\n",
2947 + error_description);
2948 + return -ENODEV;
2949 +}
2950 +
2951 +void ssb_sdio_exit(struct ssb_bus *bus)
2952 +{
2953 + if (bus->bustype != SSB_BUSTYPE_SDIO)
2954 + return;
2955 + /* Nothing to do here. */
2956 +}
2957 +
2958 +int ssb_sdio_init(struct ssb_bus *bus)
2959 +{
2960 + if (bus->bustype != SSB_BUSTYPE_SDIO)
2961 + return 0;
2962 +
2963 + bus->sdio_sbaddr = ~0;
2964 +
2965 + return 0;
2966 +}
2967 --- a/drivers/ssb/sprom.c
2968 +++ b/drivers/ssb/sprom.c
2969 @@ -2,7 +2,7 @@
2970 * Sonics Silicon Backplane
2971 * Common SPROM support routines
2972 *
2973 - * Copyright (C) 2005-2008 Michael Buesch <mb@bu3sch.de>
2974 + * Copyright (C) 2005-2008 Michael Buesch <m@bues.ch>
2975 * Copyright (C) 2005 Martin Langer <martin-langer@gmx.de>
2976 * Copyright (C) 2005 Stefano Brivio <st3@riseup.net>
2977 * Copyright (C) 2005 Danny van Dyk <kugelfang@gentoo.org>
2978 @@ -14,9 +14,10 @@
2979 #include "ssb_private.h"
2980
2981 #include <linux/ctype.h>
2982 +#include <linux/slab.h>
2983
2984
2985 -static const struct ssb_sprom *fallback_sprom;
2986 +static int(*get_fallback_sprom)(struct ssb_bus *dev, struct ssb_sprom *out);
2987
2988
2989 static int sprom2hex(const u16 *sprom, char *buf, size_t buf_len,
2990 @@ -102,6 +103,7 @@ ssize_t ssb_attr_sprom_store(struct ssb_
2991 u16 *sprom;
2992 int res = 0, err = -ENOMEM;
2993 size_t sprom_size_words = bus->sprom_size;
2994 + struct ssb_freeze_context freeze;
2995
2996 sprom = kcalloc(bus->sprom_size, sizeof(u16), GFP_KERNEL);
2997 if (!sprom)
2998 @@ -123,18 +125,13 @@ ssize_t ssb_attr_sprom_store(struct ssb_
2999 err = -ERESTARTSYS;
3000 if (mutex_lock_interruptible(&bus->sprom_mutex))
3001 goto out_kfree;
3002 - err = ssb_devices_freeze(bus);
3003 - if (err == -EOPNOTSUPP) {
3004 - ssb_printk(KERN_ERR PFX "SPROM write: Could not freeze devices. "
3005 - "No suspend support. Is CONFIG_PM enabled?\n");
3006 - goto out_unlock;
3007 - }
3008 + err = ssb_devices_freeze(bus, &freeze);
3009 if (err) {
3010 ssb_printk(KERN_ERR PFX "SPROM write: Could not freeze all devices\n");
3011 goto out_unlock;
3012 }
3013 res = sprom_write(bus, sprom);
3014 - err = ssb_devices_thaw(bus);
3015 + err = ssb_devices_thaw(&freeze);
3016 if (err)
3017 ssb_printk(KERN_ERR PFX "SPROM write: Could not thaw all devices\n");
3018 out_unlock:
3019 @@ -148,34 +145,56 @@ out:
3020 }
3021
3022 /**
3023 - * ssb_arch_set_fallback_sprom - Set a fallback SPROM for use if no SPROM is found.
3024 - *
3025 - * @sprom: The SPROM data structure to register.
3026 + * ssb_arch_register_fallback_sprom - Registers a method providing a
3027 + * fallback SPROM if no SPROM is found.
3028 *
3029 - * With this function the architecture implementation may register a fallback
3030 - * SPROM data structure. The fallback is only used for PCI based SSB devices,
3031 - * where no valid SPROM can be found in the shadow registers.
3032 + * @sprom_callback: The callback function.
3033 *
3034 - * This function is useful for weird architectures that have a half-assed SSB device
3035 - * hardwired to their PCI bus.
3036 + * With this function the architecture implementation may register a
3037 + * callback handler which fills the SPROM data structure. The fallback is
3038 + * only used for PCI based SSB devices, where no valid SPROM can be found
3039 + * in the shadow registers.
3040 + *
3041 + * This function is useful for weird architectures that have a half-assed
3042 + * SSB device hardwired to their PCI bus.
3043 + *
3044 + * Note that it does only work with PCI attached SSB devices. PCMCIA
3045 + * devices currently don't use this fallback.
3046 + * Architectures must provide the SPROM for native SSB devices anyway, so
3047 + * the fallback also isn't used for native devices.
3048 *
3049 - * Note that it does only work with PCI attached SSB devices. PCMCIA devices currently
3050 - * don't use this fallback.
3051 - * Architectures must provide the SPROM for native SSB devices anyway,
3052 - * so the fallback also isn't used for native devices.
3053 - *
3054 - * This function is available for architecture code, only. So it is not exported.
3055 + * This function is available for architecture code, only. So it is not
3056 + * exported.
3057 */
3058 -int ssb_arch_set_fallback_sprom(const struct ssb_sprom *sprom)
3059 +int ssb_arch_register_fallback_sprom(int (*sprom_callback)(struct ssb_bus *bus,
3060 + struct ssb_sprom *out))
3061 {
3062 - if (fallback_sprom)
3063 + if (get_fallback_sprom)
3064 return -EEXIST;
3065 - fallback_sprom = sprom;
3066 + get_fallback_sprom = sprom_callback;
3067
3068 return 0;
3069 }
3070
3071 -const struct ssb_sprom *ssb_get_fallback_sprom(void)
3072 +int ssb_fill_sprom_with_fallback(struct ssb_bus *bus, struct ssb_sprom *out)
3073 {
3074 - return fallback_sprom;
3075 + if (!get_fallback_sprom)
3076 + return -ENOENT;
3077 +
3078 + return get_fallback_sprom(bus, out);
3079 +}
3080 +
3081 +/* http://bcm-v4.sipsolutions.net/802.11/IsSpromAvailable */
3082 +bool ssb_is_sprom_available(struct ssb_bus *bus)
3083 +{
3084 + /* status register only exists on chipcomon rev >= 11 and we need check
3085 + for >= 31 only */
3086 + /* this routine differs from specs as we do not access SPROM directly
3087 + on PCMCIA */
3088 + if (bus->bustype == SSB_BUSTYPE_PCI &&
3089 + bus->chipco.dev && /* can be unavailable! */
3090 + bus->chipco.dev->id.revision >= 31)
3091 + return bus->chipco.capabilities & SSB_CHIPCO_CAP_SPROM;
3092 +
3093 + return true;
3094 }
3095 --- a/drivers/ssb/ssb_private.h
3096 +++ b/drivers/ssb/ssb_private.h
3097 @@ -114,6 +114,46 @@ static inline int ssb_pcmcia_init(struct
3098 }
3099 #endif /* CONFIG_SSB_PCMCIAHOST */
3100
3101 +/* sdio.c */
3102 +#ifdef CONFIG_SSB_SDIOHOST
3103 +extern int ssb_sdio_get_invariants(struct ssb_bus *bus,
3104 + struct ssb_init_invariants *iv);
3105 +
3106 +extern u32 ssb_sdio_scan_read32(struct ssb_bus *bus, u16 offset);
3107 +extern int ssb_sdio_switch_core(struct ssb_bus *bus, struct ssb_device *dev);
3108 +extern int ssb_sdio_scan_switch_coreidx(struct ssb_bus *bus, u8 coreidx);
3109 +extern int ssb_sdio_hardware_setup(struct ssb_bus *bus);
3110 +extern void ssb_sdio_exit(struct ssb_bus *bus);
3111 +extern int ssb_sdio_init(struct ssb_bus *bus);
3112 +
3113 +extern const struct ssb_bus_ops ssb_sdio_ops;
3114 +#else /* CONFIG_SSB_SDIOHOST */
3115 +static inline u32 ssb_sdio_scan_read32(struct ssb_bus *bus, u16 offset)
3116 +{
3117 + return 0;
3118 +}
3119 +static inline int ssb_sdio_switch_core(struct ssb_bus *bus,
3120 + struct ssb_device *dev)
3121 +{
3122 + return 0;
3123 +}
3124 +static inline int ssb_sdio_scan_switch_coreidx(struct ssb_bus *bus, u8 coreidx)
3125 +{
3126 + return 0;
3127 +}
3128 +static inline int ssb_sdio_hardware_setup(struct ssb_bus *bus)
3129 +{
3130 + return 0;
3131 +}
3132 +static inline void ssb_sdio_exit(struct ssb_bus *bus)
3133 +{
3134 +}
3135 +static inline int ssb_sdio_init(struct ssb_bus *bus)
3136 +{
3137 + return 0;
3138 +}
3139 +#endif /* CONFIG_SSB_SDIOHOST */
3140 +
3141
3142 /* scan.c */
3143 extern const char *ssb_core_name(u16 coreid);
3144 @@ -131,24 +171,33 @@ ssize_t ssb_attr_sprom_store(struct ssb_
3145 const char *buf, size_t count,
3146 int (*sprom_check_crc)(const u16 *sprom, size_t size),
3147 int (*sprom_write)(struct ssb_bus *bus, const u16 *sprom));
3148 -extern const struct ssb_sprom *ssb_get_fallback_sprom(void);
3149 +extern int ssb_fill_sprom_with_fallback(struct ssb_bus *bus,
3150 + struct ssb_sprom *out);
3151
3152
3153 /* core.c */
3154 extern u32 ssb_calc_clock_rate(u32 plltype, u32 n, u32 m);
3155 -extern int ssb_devices_freeze(struct ssb_bus *bus);
3156 -extern int ssb_devices_thaw(struct ssb_bus *bus);
3157 extern struct ssb_bus *ssb_pci_dev_to_bus(struct pci_dev *pdev);
3158 int ssb_for_each_bus_call(unsigned long data,
3159 int (*func)(struct ssb_bus *bus, unsigned long data));
3160 extern struct ssb_bus *ssb_pcmcia_dev_to_bus(struct pcmcia_device *pdev);
3161
3162 +struct ssb_freeze_context {
3163 + /* Pointer to the bus */
3164 + struct ssb_bus *bus;
3165 + /* Boolean list to indicate whether a device is frozen on this bus. */
3166 + bool device_frozen[SSB_MAX_NR_CORES];
3167 +};
3168 +extern int ssb_devices_freeze(struct ssb_bus *bus, struct ssb_freeze_context *ctx);
3169 +extern int ssb_devices_thaw(struct ssb_freeze_context *ctx);
3170 +
3171 +
3172
3173 /* b43_pci_bridge.c */
3174 #ifdef CONFIG_SSB_B43_PCI_BRIDGE
3175 extern int __init b43_pci_ssb_bridge_init(void);
3176 extern void __exit b43_pci_ssb_bridge_exit(void);
3177 -#else /* CONFIG_SSB_B43_PCI_BRIDGR */
3178 +#else /* CONFIG_SSB_B43_PCI_BRIDGE */
3179 static inline int b43_pci_ssb_bridge_init(void)
3180 {
3181 return 0;
3182 @@ -156,6 +205,6 @@ static inline int b43_pci_ssb_bridge_ini
3183 static inline void b43_pci_ssb_bridge_exit(void)
3184 {
3185 }
3186 -#endif /* CONFIG_SSB_PCIHOST */
3187 +#endif /* CONFIG_SSB_B43_PCI_BRIDGE */
3188
3189 #endif /* LINUX_SSB_PRIVATE_H_ */
3190 --- a/include/linux/pci_ids.h
3191 +++ b/include/linux/pci_ids.h
3192 @@ -2017,6 +2017,7 @@
3193 #define PCI_DEVICE_ID_AFAVLAB_P030 0x2182
3194 #define PCI_SUBDEVICE_ID_AFAVLAB_P061 0x2150
3195
3196 +#define PCI_VENDOR_ID_BCM_GVC 0x14a4
3197 #define PCI_VENDOR_ID_BROADCOM 0x14e4
3198 #define PCI_DEVICE_ID_TIGON3_5752 0x1600
3199 #define PCI_DEVICE_ID_TIGON3_5752M 0x1601
3200 --- a/include/linux/ssb/ssb.h
3201 +++ b/include/linux/ssb/ssb.h
3202 @@ -25,26 +25,62 @@ struct ssb_sprom {
3203 u8 et1phyaddr; /* MII address for enet1 */
3204 u8 et0mdcport; /* MDIO for enet0 */
3205 u8 et1mdcport; /* MDIO for enet1 */
3206 - u8 board_rev; /* Board revision number from SPROM. */
3207 + u16 board_rev; /* Board revision number from SPROM. */
3208 u8 country_code; /* Country Code */
3209 - u8 ant_available_a; /* A-PHY antenna available bits (up to 4) */
3210 - u8 ant_available_bg; /* B/G-PHY antenna available bits (up to 4) */
3211 + u16 leddc_on_time; /* LED Powersave Duty Cycle On Count */
3212 + u16 leddc_off_time; /* LED Powersave Duty Cycle Off Count */
3213 + u8 ant_available_a; /* 2GHz antenna available bits (up to 4) */
3214 + u8 ant_available_bg; /* 5GHz antenna available bits (up to 4) */
3215 u16 pa0b0;
3216 u16 pa0b1;
3217 u16 pa0b2;
3218 u16 pa1b0;
3219 u16 pa1b1;
3220 u16 pa1b2;
3221 + u16 pa1lob0;
3222 + u16 pa1lob1;
3223 + u16 pa1lob2;
3224 + u16 pa1hib0;
3225 + u16 pa1hib1;
3226 + u16 pa1hib2;
3227 u8 gpio0; /* GPIO pin 0 */
3228 u8 gpio1; /* GPIO pin 1 */
3229 u8 gpio2; /* GPIO pin 2 */
3230 u8 gpio3; /* GPIO pin 3 */
3231 - u16 maxpwr_a; /* A-PHY Amplifier Max Power (in dBm Q5.2) */
3232 - u16 maxpwr_bg; /* B/G-PHY Amplifier Max Power (in dBm Q5.2) */
3233 + u16 maxpwr_bg; /* 2.4GHz Amplifier Max Power (in dBm Q5.2) */
3234 + u16 maxpwr_al; /* 5.2GHz Amplifier Max Power (in dBm Q5.2) */
3235 + u16 maxpwr_a; /* 5.3GHz Amplifier Max Power (in dBm Q5.2) */
3236 + u16 maxpwr_ah; /* 5.8GHz Amplifier Max Power (in dBm Q5.2) */
3237 u8 itssi_a; /* Idle TSSI Target for A-PHY */
3238 u8 itssi_bg; /* Idle TSSI Target for B/G-PHY */
3239 - u16 boardflags_lo; /* Boardflags (low 16 bits) */
3240 - u16 boardflags_hi; /* Boardflags (high 16 bits) */
3241 + u8 tri2g; /* 2.4GHz TX isolation */
3242 + u8 tri5gl; /* 5.2GHz TX isolation */
3243 + u8 tri5g; /* 5.3GHz TX isolation */
3244 + u8 tri5gh; /* 5.8GHz TX isolation */
3245 + u8 txpid2g[4]; /* 2GHz TX power index */
3246 + u8 txpid5gl[4]; /* 4.9 - 5.1GHz TX power index */
3247 + u8 txpid5g[4]; /* 5.1 - 5.5GHz TX power index */
3248 + u8 txpid5gh[4]; /* 5.5 - ...GHz TX power index */
3249 + u8 rxpo2g; /* 2GHz RX power offset */
3250 + u8 rxpo5g; /* 5GHz RX power offset */
3251 + u8 rssisav2g; /* 2GHz RSSI params */
3252 + u8 rssismc2g;
3253 + u8 rssismf2g;
3254 + u8 bxa2g; /* 2GHz BX arch */
3255 + u8 rssisav5g; /* 5GHz RSSI params */
3256 + u8 rssismc5g;
3257 + u8 rssismf5g;
3258 + u8 bxa5g; /* 5GHz BX arch */
3259 + u16 cck2gpo; /* CCK power offset */
3260 + u32 ofdm2gpo; /* 2.4GHz OFDM power offset */
3261 + u32 ofdm5glpo; /* 5.2GHz OFDM power offset */
3262 + u32 ofdm5gpo; /* 5.3GHz OFDM power offset */
3263 + u32 ofdm5ghpo; /* 5.8GHz OFDM power offset */
3264 + u16 boardflags_lo; /* Board flags (bits 0-15) */
3265 + u16 boardflags_hi; /* Board flags (bits 16-31) */
3266 + u16 boardflags2_lo; /* Board flags (bits 32-47) */
3267 + u16 boardflags2_hi; /* Board flags (bits 48-63) */
3268 + /* TODO store board flags in a single u64 */
3269
3270 /* Antenna gain values for up to 4 antennas
3271 * on each band. Values in dBm/4 (Q5.2). Negative gain means the
3272 @@ -58,14 +94,23 @@ struct ssb_sprom {
3273 } ghz5; /* 5GHz band */
3274 } antenna_gain;
3275
3276 - /* TODO - add any parameters needed from rev 2, 3, or 4 SPROMs */
3277 + struct {
3278 + struct {
3279 + u8 tssipos, extpa_gain, pdet_range, tr_iso, antswlut;
3280 + } ghz2;
3281 + struct {
3282 + u8 tssipos, extpa_gain, pdet_range, tr_iso, antswlut;
3283 + } ghz5;
3284 + } fem;
3285 +
3286 + /* TODO - add any parameters needed from rev 2, 3, 4, 5 or 8 SPROMs */
3287 };
3288
3289 /* Information about the PCB the circuitry is soldered on. */
3290 struct ssb_boardinfo {
3291 u16 vendor;
3292 u16 type;
3293 - u16 rev;
3294 + u8 rev;
3295 };
3296
3297
3298 @@ -137,7 +182,7 @@ struct ssb_device {
3299 * is an optimization. */
3300 const struct ssb_bus_ops *ops;
3301
3302 - struct device *dev;
3303 + struct device *dev, *dma_dev;
3304
3305 struct ssb_bus *bus;
3306 struct ssb_device_id id;
3307 @@ -195,10 +240,9 @@ struct ssb_driver {
3308 #define drv_to_ssb_drv(_drv) container_of(_drv, struct ssb_driver, drv)
3309
3310 extern int __ssb_driver_register(struct ssb_driver *drv, struct module *owner);
3311 -static inline int ssb_driver_register(struct ssb_driver *drv)
3312 -{
3313 - return __ssb_driver_register(drv, THIS_MODULE);
3314 -}
3315 +#define ssb_driver_register(drv) \
3316 + __ssb_driver_register(drv, THIS_MODULE)
3317 +
3318 extern void ssb_driver_unregister(struct ssb_driver *drv);
3319
3320
3321 @@ -208,6 +252,7 @@ enum ssb_bustype {
3322 SSB_BUSTYPE_SSB, /* This SSB bus is the system bus */
3323 SSB_BUSTYPE_PCI, /* SSB is connected to PCI bus */
3324 SSB_BUSTYPE_PCMCIA, /* SSB is connected to PCMCIA bus */
3325 + SSB_BUSTYPE_SDIO, /* SSB is connected to SDIO bus */
3326 };
3327
3328 /* board_vendor */
3329 @@ -238,20 +283,33 @@ struct ssb_bus {
3330
3331 const struct ssb_bus_ops *ops;
3332
3333 - /* The core in the basic address register window. (PCI bus only) */
3334 + /* The core currently mapped into the MMIO window.
3335 + * Not valid on all host-buses. So don't use outside of SSB. */
3336 struct ssb_device *mapped_device;
3337 - /* Currently mapped PCMCIA segment. (bustype == SSB_BUSTYPE_PCMCIA only) */
3338 - u8 mapped_pcmcia_seg;
3339 + union {
3340 + /* Currently mapped PCMCIA segment. (bustype == SSB_BUSTYPE_PCMCIA only) */
3341 + u8 mapped_pcmcia_seg;
3342 + /* Current SSB base address window for SDIO. */
3343 + u32 sdio_sbaddr;
3344 + };
3345 /* Lock for core and segment switching.
3346 * On PCMCIA-host busses this is used to protect the whole MMIO access. */
3347 spinlock_t bar_lock;
3348
3349 - /* The bus this backplane is running on. */
3350 + /* The host-bus this backplane is running on. */
3351 enum ssb_bustype bustype;
3352 - /* Pointer to the PCI bus (only valid if bustype == SSB_BUSTYPE_PCI). */
3353 - struct pci_dev *host_pci;
3354 - /* Pointer to the PCMCIA device (only if bustype == SSB_BUSTYPE_PCMCIA). */
3355 - struct pcmcia_device *host_pcmcia;
3356 + /* Pointers to the host-bus. Check bustype before using any of these pointers. */
3357 + union {
3358 + /* Pointer to the PCI bus (only valid if bustype == SSB_BUSTYPE_PCI). */
3359 + struct pci_dev *host_pci;
3360 + /* Pointer to the PCMCIA device (only if bustype == SSB_BUSTYPE_PCMCIA). */
3361 + struct pcmcia_device *host_pcmcia;
3362 + /* Pointer to the SDIO device (only if bustype == SSB_BUSTYPE_SDIO). */
3363 + struct sdio_func *host_sdio;
3364 + };
3365 +
3366 + /* See enum ssb_quirks */
3367 + unsigned int quirks;
3368
3369 #ifdef CONFIG_SSB_SPROM
3370 /* Mutex to protect the SPROM writing. */
3371 @@ -260,7 +318,8 @@ struct ssb_bus {
3372
3373 /* ID information about the Chip. */
3374 u16 chip_id;
3375 - u16 chip_rev;
3376 + u8 chip_rev;
3377 + u16 sprom_offset;
3378 u16 sprom_size; /* number of words in sprom */
3379 u8 chip_package;
3380
3381 @@ -306,6 +365,11 @@ struct ssb_bus {
3382 #endif /* DEBUG */
3383 };
3384
3385 +enum ssb_quirks {
3386 + /* SDIO connected card requires performing a read after writing a 32-bit value */
3387 + SSB_QUIRK_SDIO_READ_AFTER_WRITE32 = (1 << 0),
3388 +};
3389 +
3390 /* The initialization-invariants. */
3391 struct ssb_init_invariants {
3392 /* Versioning information about the PCB. */
3393 @@ -336,12 +400,23 @@ extern int ssb_bus_pcmciabus_register(st
3394 struct pcmcia_device *pcmcia_dev,
3395 unsigned long baseaddr);
3396 #endif /* CONFIG_SSB_PCMCIAHOST */
3397 +#ifdef CONFIG_SSB_SDIOHOST
3398 +extern int ssb_bus_sdiobus_register(struct ssb_bus *bus,
3399 + struct sdio_func *sdio_func,
3400 + unsigned int quirks);
3401 +#endif /* CONFIG_SSB_SDIOHOST */
3402 +
3403
3404 extern void ssb_bus_unregister(struct ssb_bus *bus);
3405
3406 +/* Does the device have an SPROM? */
3407 +extern bool ssb_is_sprom_available(struct ssb_bus *bus);
3408 +
3409 /* Set a fallback SPROM.
3410 * See kdoc at the function definition for complete documentation. */
3411 -extern int ssb_arch_set_fallback_sprom(const struct ssb_sprom *sprom);
3412 +extern int ssb_arch_register_fallback_sprom(
3413 + int (*sprom_callback)(struct ssb_bus *bus,
3414 + struct ssb_sprom *out));
3415
3416 /* Suspend a SSB bus.
3417 * Call this from the parent bus suspend routine. */
3418 @@ -612,6 +687,7 @@ extern int ssb_bus_may_powerdown(struct
3419 * Otherwise static always-on powercontrol will be used. */
3420 extern int ssb_bus_powerup(struct ssb_bus *bus, bool dynamic_pctl);
3421
3422 +extern void ssb_commit_settings(struct ssb_bus *bus);
3423
3424 /* Various helper functions */
3425 extern u32 ssb_admatch_base(u32 adm);
3426 --- a/include/linux/ssb/ssb_driver_chipcommon.h
3427 +++ b/include/linux/ssb/ssb_driver_chipcommon.h
3428 @@ -8,7 +8,7 @@
3429 * gpio interface, extbus, and support for serial and parallel flashes.
3430 *
3431 * Copyright 2005, Broadcom Corporation
3432 - * Copyright 2006, Michael Buesch <mb@bu3sch.de>
3433 + * Copyright 2006, Michael Buesch <m@bues.ch>
3434 *
3435 * Licensed under the GPL version 2. See COPYING for details.
3436 */
3437 @@ -53,6 +53,7 @@
3438 #define SSB_CHIPCO_CAP_64BIT 0x08000000 /* 64-bit Backplane */
3439 #define SSB_CHIPCO_CAP_PMU 0x10000000 /* PMU available (rev >= 20) */
3440 #define SSB_CHIPCO_CAP_ECI 0x20000000 /* ECI available (rev >= 20) */
3441 +#define SSB_CHIPCO_CAP_SPROM 0x40000000 /* SPROM present */
3442 #define SSB_CHIPCO_CORECTL 0x0008
3443 #define SSB_CHIPCO_CORECTL_UARTCLK0 0x00000001 /* Drive UART with internal clock */
3444 #define SSB_CHIPCO_CORECTL_SE 0x00000002 /* sync clk out enable (corerev >= 3) */
3445 @@ -122,6 +123,8 @@
3446 #define SSB_CHIPCO_FLASHDATA 0x0048
3447 #define SSB_CHIPCO_BCAST_ADDR 0x0050
3448 #define SSB_CHIPCO_BCAST_DATA 0x0054
3449 +#define SSB_CHIPCO_GPIOPULLUP 0x0058 /* Rev >= 20 only */
3450 +#define SSB_CHIPCO_GPIOPULLDOWN 0x005C /* Rev >= 20 only */
3451 #define SSB_CHIPCO_GPIOIN 0x0060
3452 #define SSB_CHIPCO_GPIOOUT 0x0064
3453 #define SSB_CHIPCO_GPIOOUTEN 0x0068
3454 @@ -130,6 +133,9 @@
3455 #define SSB_CHIPCO_GPIOIRQ 0x0074
3456 #define SSB_CHIPCO_WATCHDOG 0x0080
3457 #define SSB_CHIPCO_GPIOTIMER 0x0088 /* LED powersave (corerev >= 16) */
3458 +#define SSB_CHIPCO_GPIOTIMER_OFFTIME 0x0000FFFF
3459 +#define SSB_CHIPCO_GPIOTIMER_OFFTIME_SHIFT 0
3460 +#define SSB_CHIPCO_GPIOTIMER_ONTIME 0xFFFF0000
3461 #define SSB_CHIPCO_GPIOTIMER_ONTIME_SHIFT 16
3462 #define SSB_CHIPCO_GPIOTOUTM 0x008C /* LED powersave (corerev >= 16) */
3463 #define SSB_CHIPCO_CLOCK_N 0x0090
3464 @@ -188,8 +194,10 @@
3465 #define SSB_CHIPCO_CLKCTLST_HAVEALPREQ 0x00000008 /* ALP available request */
3466 #define SSB_CHIPCO_CLKCTLST_HAVEHTREQ 0x00000010 /* HT available request */
3467 #define SSB_CHIPCO_CLKCTLST_HWCROFF 0x00000020 /* Force HW clock request off */
3468 -#define SSB_CHIPCO_CLKCTLST_HAVEHT 0x00010000 /* HT available */
3469 -#define SSB_CHIPCO_CLKCTLST_HAVEALP 0x00020000 /* APL available */
3470 +#define SSB_CHIPCO_CLKCTLST_HAVEALP 0x00010000 /* ALP available */
3471 +#define SSB_CHIPCO_CLKCTLST_HAVEHT 0x00020000 /* HT available */
3472 +#define SSB_CHIPCO_CLKCTLST_4328A0_HAVEHT 0x00010000 /* 4328a0 has reversed bits */
3473 +#define SSB_CHIPCO_CLKCTLST_4328A0_HAVEALP 0x00020000 /* 4328a0 has reversed bits */
3474 #define SSB_CHIPCO_HW_WORKAROUND 0x01E4 /* Hardware workaround (rev >= 20) */
3475 #define SSB_CHIPCO_UART0_DATA 0x0300
3476 #define SSB_CHIPCO_UART0_IMR 0x0304
3477 @@ -385,6 +393,7 @@
3478
3479
3480 /** Chip specific Chip-Status register contents. */
3481 +#define SSB_CHIPCO_CHST_4322_SPROM_EXISTS 0x00000040 /* SPROM present */
3482 #define SSB_CHIPCO_CHST_4325_SPROM_OTP_SEL 0x00000003
3483 #define SSB_CHIPCO_CHST_4325_DEFCIS_SEL 0 /* OTP is powered up, use def. CIS, no SPROM */
3484 #define SSB_CHIPCO_CHST_4325_SPROM_SEL 1 /* OTP is powered up, SPROM is present */
3485 @@ -398,6 +407,18 @@
3486 #define SSB_CHIPCO_CHST_4325_RCAL_VALUE_SHIFT 4
3487 #define SSB_CHIPCO_CHST_4325_PMUTOP_2B 0x00000200 /* 1 for 2b, 0 for to 2a */
3488
3489 +/** Macros to determine SPROM presence based on Chip-Status register. */
3490 +#define SSB_CHIPCO_CHST_4312_SPROM_PRESENT(status) \
3491 + ((status & SSB_CHIPCO_CHST_4325_SPROM_OTP_SEL) != \
3492 + SSB_CHIPCO_CHST_4325_OTP_SEL)
3493 +#define SSB_CHIPCO_CHST_4322_SPROM_PRESENT(status) \
3494 + (status & SSB_CHIPCO_CHST_4322_SPROM_EXISTS)
3495 +#define SSB_CHIPCO_CHST_4325_SPROM_PRESENT(status) \
3496 + (((status & SSB_CHIPCO_CHST_4325_SPROM_OTP_SEL) != \
3497 + SSB_CHIPCO_CHST_4325_DEFCIS_SEL) && \
3498 + ((status & SSB_CHIPCO_CHST_4325_SPROM_OTP_SEL) != \
3499 + SSB_CHIPCO_CHST_4325_OTP_SEL))
3500 +
3501
3502
3503 /** Clockcontrol masks and values **/
3504 @@ -564,6 +585,7 @@ struct ssb_chipcommon_pmu {
3505 struct ssb_chipcommon {
3506 struct ssb_device *dev;
3507 u32 capabilities;
3508 + u32 status;
3509 /* Fast Powerup Delay constant */
3510 u16 fast_pwrup_delay;
3511 struct ssb_chipcommon_pmu pmu;
3512 @@ -629,5 +651,15 @@ extern int ssb_chipco_serial_init(struct
3513 /* PMU support */
3514 extern void ssb_pmu_init(struct ssb_chipcommon *cc);
3515
3516 +enum ssb_pmu_ldo_volt_id {
3517 + LDO_PAREF = 0,
3518 + LDO_VOLT1,
3519 + LDO_VOLT2,
3520 + LDO_VOLT3,
3521 +};
3522 +
3523 +void ssb_pmu_set_ldo_voltage(struct ssb_chipcommon *cc,
3524 + enum ssb_pmu_ldo_volt_id id, u32 voltage);
3525 +void ssb_pmu_set_ldo_paref(struct ssb_chipcommon *cc, bool on);
3526
3527 #endif /* LINUX_SSB_CHIPCO_H_ */
3528 --- a/include/linux/ssb/ssb_regs.h
3529 +++ b/include/linux/ssb/ssb_regs.h
3530 @@ -85,6 +85,8 @@
3531 #define SSB_IMSTATE_AP_RSV 0x00000030 /* Reserved */
3532 #define SSB_IMSTATE_IBE 0x00020000 /* In Band Error */
3533 #define SSB_IMSTATE_TO 0x00040000 /* Timeout */
3534 +#define SSB_IMSTATE_BUSY 0x01800000 /* Busy (Backplane rev >= 2.3 only) */
3535 +#define SSB_IMSTATE_REJECT 0x02000000 /* Reject (Backplane rev >= 2.3 only) */
3536 #define SSB_INTVEC 0x0F94 /* SB Interrupt Mask */
3537 #define SSB_INTVEC_PCI 0x00000001 /* Enable interrupts for PCI */
3538 #define SSB_INTVEC_ENET0 0x00000002 /* Enable interrupts for enet 0 */
3539 @@ -95,7 +97,7 @@
3540 #define SSB_INTVEC_ENET1 0x00000040 /* Enable interrupts for enet 1 */
3541 #define SSB_TMSLOW 0x0F98 /* SB Target State Low */
3542 #define SSB_TMSLOW_RESET 0x00000001 /* Reset */
3543 -#define SSB_TMSLOW_REJECT_22 0x00000002 /* Reject (Backplane rev 2.2) */
3544 +#define SSB_TMSLOW_REJECT 0x00000002 /* Reject (Standard Backplane) */
3545 #define SSB_TMSLOW_REJECT_23 0x00000004 /* Reject (Backplane rev 2.3) */
3546 #define SSB_TMSLOW_CLOCK 0x00010000 /* Clock Enable */
3547 #define SSB_TMSLOW_FGC 0x00020000 /* Force Gated Clocks On */
3548 @@ -162,7 +164,7 @@
3549
3550 /* SPROM shadow area. If not otherwise noted, fields are
3551 * two bytes wide. Note that the SPROM can _only_ be read
3552 - * in two-byte quantinies.
3553 + * in two-byte quantities.
3554 */
3555 #define SSB_SPROMSIZE_WORDS 64
3556 #define SSB_SPROMSIZE_BYTES (SSB_SPROMSIZE_WORDS * sizeof(u16))
3557 @@ -170,26 +172,27 @@
3558 #define SSB_SPROMSIZE_WORDS_R4 220
3559 #define SSB_SPROMSIZE_BYTES_R123 (SSB_SPROMSIZE_WORDS_R123 * sizeof(u16))
3560 #define SSB_SPROMSIZE_BYTES_R4 (SSB_SPROMSIZE_WORDS_R4 * sizeof(u16))
3561 -#define SSB_SPROM_BASE 0x1000
3562 -#define SSB_SPROM_REVISION 0x107E
3563 +#define SSB_SPROM_BASE1 0x1000
3564 +#define SSB_SPROM_BASE31 0x0800
3565 +#define SSB_SPROM_REVISION 0x007E
3566 #define SSB_SPROM_REVISION_REV 0x00FF /* SPROM Revision number */
3567 #define SSB_SPROM_REVISION_CRC 0xFF00 /* SPROM CRC8 value */
3568 #define SSB_SPROM_REVISION_CRC_SHIFT 8
3569
3570 /* SPROM Revision 1 */
3571 -#define SSB_SPROM1_SPID 0x1004 /* Subsystem Product ID for PCI */
3572 -#define SSB_SPROM1_SVID 0x1006 /* Subsystem Vendor ID for PCI */
3573 -#define SSB_SPROM1_PID 0x1008 /* Product ID for PCI */
3574 -#define SSB_SPROM1_IL0MAC 0x1048 /* 6 bytes MAC address for 802.11b/g */
3575 -#define SSB_SPROM1_ET0MAC 0x104E /* 6 bytes MAC address for Ethernet */
3576 -#define SSB_SPROM1_ET1MAC 0x1054 /* 6 bytes MAC address for 802.11a */
3577 -#define SSB_SPROM1_ETHPHY 0x105A /* Ethernet PHY settings */
3578 +#define SSB_SPROM1_SPID 0x0004 /* Subsystem Product ID for PCI */
3579 +#define SSB_SPROM1_SVID 0x0006 /* Subsystem Vendor ID for PCI */
3580 +#define SSB_SPROM1_PID 0x0008 /* Product ID for PCI */
3581 +#define SSB_SPROM1_IL0MAC 0x0048 /* 6 bytes MAC address for 802.11b/g */
3582 +#define SSB_SPROM1_ET0MAC 0x004E /* 6 bytes MAC address for Ethernet */
3583 +#define SSB_SPROM1_ET1MAC 0x0054 /* 6 bytes MAC address for 802.11a */
3584 +#define SSB_SPROM1_ETHPHY 0x005A /* Ethernet PHY settings */
3585 #define SSB_SPROM1_ETHPHY_ET0A 0x001F /* MII Address for enet0 */
3586 #define SSB_SPROM1_ETHPHY_ET1A 0x03E0 /* MII Address for enet1 */
3587 #define SSB_SPROM1_ETHPHY_ET1A_SHIFT 5
3588 #define SSB_SPROM1_ETHPHY_ET0M (1<<14) /* MDIO for enet0 */
3589 #define SSB_SPROM1_ETHPHY_ET1M (1<<15) /* MDIO for enet1 */
3590 -#define SSB_SPROM1_BINF 0x105C /* Board info */
3591 +#define SSB_SPROM1_BINF 0x005C /* Board info */
3592 #define SSB_SPROM1_BINF_BREV 0x00FF /* Board Revision */
3593 #define SSB_SPROM1_BINF_CCODE 0x0F00 /* Country Code */
3594 #define SSB_SPROM1_BINF_CCODE_SHIFT 8
3595 @@ -197,63 +200,63 @@
3596 #define SSB_SPROM1_BINF_ANTBG_SHIFT 12
3597 #define SSB_SPROM1_BINF_ANTA 0xC000 /* Available A-PHY antennas */
3598 #define SSB_SPROM1_BINF_ANTA_SHIFT 14
3599 -#define SSB_SPROM1_PA0B0 0x105E
3600 -#define SSB_SPROM1_PA0B1 0x1060
3601 -#define SSB_SPROM1_PA0B2 0x1062
3602 -#define SSB_SPROM1_GPIOA 0x1064 /* General Purpose IO pins 0 and 1 */
3603 +#define SSB_SPROM1_PA0B0 0x005E
3604 +#define SSB_SPROM1_PA0B1 0x0060
3605 +#define SSB_SPROM1_PA0B2 0x0062
3606 +#define SSB_SPROM1_GPIOA 0x0064 /* General Purpose IO pins 0 and 1 */
3607 #define SSB_SPROM1_GPIOA_P0 0x00FF /* Pin 0 */
3608 #define SSB_SPROM1_GPIOA_P1 0xFF00 /* Pin 1 */
3609 #define SSB_SPROM1_GPIOA_P1_SHIFT 8
3610 -#define SSB_SPROM1_GPIOB 0x1066 /* General Purpuse IO pins 2 and 3 */
3611 +#define SSB_SPROM1_GPIOB 0x0066 /* General Purpuse IO pins 2 and 3 */
3612 #define SSB_SPROM1_GPIOB_P2 0x00FF /* Pin 2 */
3613 #define SSB_SPROM1_GPIOB_P3 0xFF00 /* Pin 3 */
3614 #define SSB_SPROM1_GPIOB_P3_SHIFT 8
3615 -#define SSB_SPROM1_MAXPWR 0x1068 /* Power Amplifier Max Power */
3616 +#define SSB_SPROM1_MAXPWR 0x0068 /* Power Amplifier Max Power */
3617 #define SSB_SPROM1_MAXPWR_BG 0x00FF /* B-PHY and G-PHY (in dBm Q5.2) */
3618 #define SSB_SPROM1_MAXPWR_A 0xFF00 /* A-PHY (in dBm Q5.2) */
3619 #define SSB_SPROM1_MAXPWR_A_SHIFT 8
3620 -#define SSB_SPROM1_PA1B0 0x106A
3621 -#define SSB_SPROM1_PA1B1 0x106C
3622 -#define SSB_SPROM1_PA1B2 0x106E
3623 -#define SSB_SPROM1_ITSSI 0x1070 /* Idle TSSI Target */
3624 +#define SSB_SPROM1_PA1B0 0x006A
3625 +#define SSB_SPROM1_PA1B1 0x006C
3626 +#define SSB_SPROM1_PA1B2 0x006E
3627 +#define SSB_SPROM1_ITSSI 0x0070 /* Idle TSSI Target */
3628 #define SSB_SPROM1_ITSSI_BG 0x00FF /* B-PHY and G-PHY*/
3629 #define SSB_SPROM1_ITSSI_A 0xFF00 /* A-PHY */
3630 #define SSB_SPROM1_ITSSI_A_SHIFT 8
3631 -#define SSB_SPROM1_BFLLO 0x1072 /* Boardflags (low 16 bits) */
3632 -#define SSB_SPROM1_AGAIN 0x1074 /* Antenna Gain (in dBm Q5.2) */
3633 +#define SSB_SPROM1_BFLLO 0x0072 /* Boardflags (low 16 bits) */
3634 +#define SSB_SPROM1_AGAIN 0x0074 /* Antenna Gain (in dBm Q5.2) */
3635 #define SSB_SPROM1_AGAIN_BG 0x00FF /* B-PHY and G-PHY */
3636 #define SSB_SPROM1_AGAIN_BG_SHIFT 0
3637 #define SSB_SPROM1_AGAIN_A 0xFF00 /* A-PHY */
3638 #define SSB_SPROM1_AGAIN_A_SHIFT 8
3639
3640 /* SPROM Revision 2 (inherits from rev 1) */
3641 -#define SSB_SPROM2_BFLHI 0x1038 /* Boardflags (high 16 bits) */
3642 -#define SSB_SPROM2_MAXP_A 0x103A /* A-PHY Max Power */
3643 +#define SSB_SPROM2_BFLHI 0x0038 /* Boardflags (high 16 bits) */
3644 +#define SSB_SPROM2_MAXP_A 0x003A /* A-PHY Max Power */
3645 #define SSB_SPROM2_MAXP_A_HI 0x00FF /* Max Power High */
3646 #define SSB_SPROM2_MAXP_A_LO 0xFF00 /* Max Power Low */
3647 #define SSB_SPROM2_MAXP_A_LO_SHIFT 8
3648 -#define SSB_SPROM2_PA1LOB0 0x103C /* A-PHY PowerAmplifier Low Settings */
3649 -#define SSB_SPROM2_PA1LOB1 0x103E /* A-PHY PowerAmplifier Low Settings */
3650 -#define SSB_SPROM2_PA1LOB2 0x1040 /* A-PHY PowerAmplifier Low Settings */
3651 -#define SSB_SPROM2_PA1HIB0 0x1042 /* A-PHY PowerAmplifier High Settings */
3652 -#define SSB_SPROM2_PA1HIB1 0x1044 /* A-PHY PowerAmplifier High Settings */
3653 -#define SSB_SPROM2_PA1HIB2 0x1046 /* A-PHY PowerAmplifier High Settings */
3654 -#define SSB_SPROM2_OPO 0x1078 /* OFDM Power Offset from CCK Level */
3655 +#define SSB_SPROM2_PA1LOB0 0x003C /* A-PHY PowerAmplifier Low Settings */
3656 +#define SSB_SPROM2_PA1LOB1 0x003E /* A-PHY PowerAmplifier Low Settings */
3657 +#define SSB_SPROM2_PA1LOB2 0x0040 /* A-PHY PowerAmplifier Low Settings */
3658 +#define SSB_SPROM2_PA1HIB0 0x0042 /* A-PHY PowerAmplifier High Settings */
3659 +#define SSB_SPROM2_PA1HIB1 0x0044 /* A-PHY PowerAmplifier High Settings */
3660 +#define SSB_SPROM2_PA1HIB2 0x0046 /* A-PHY PowerAmplifier High Settings */
3661 +#define SSB_SPROM2_OPO 0x0078 /* OFDM Power Offset from CCK Level */
3662 #define SSB_SPROM2_OPO_VALUE 0x00FF
3663 #define SSB_SPROM2_OPO_UNUSED 0xFF00
3664 -#define SSB_SPROM2_CCODE 0x107C /* Two char Country Code */
3665 +#define SSB_SPROM2_CCODE 0x007C /* Two char Country Code */
3666
3667 /* SPROM Revision 3 (inherits most data from rev 2) */
3668 -#define SSB_SPROM3_IL0MAC 0x104A /* 6 bytes MAC address for 802.11b/g */
3669 -#define SSB_SPROM3_OFDMAPO 0x102C /* A-PHY OFDM Mid Power Offset (4 bytes, BigEndian) */
3670 -#define SSB_SPROM3_OFDMALPO 0x1030 /* A-PHY OFDM Low Power Offset (4 bytes, BigEndian) */
3671 -#define SSB_SPROM3_OFDMAHPO 0x1034 /* A-PHY OFDM High Power Offset (4 bytes, BigEndian) */
3672 -#define SSB_SPROM3_GPIOLDC 0x1042 /* GPIO LED Powersave Duty Cycle (4 bytes, BigEndian) */
3673 +#define SSB_SPROM3_OFDMAPO 0x002C /* A-PHY OFDM Mid Power Offset (4 bytes, BigEndian) */
3674 +#define SSB_SPROM3_OFDMALPO 0x0030 /* A-PHY OFDM Low Power Offset (4 bytes, BigEndian) */
3675 +#define SSB_SPROM3_OFDMAHPO 0x0034 /* A-PHY OFDM High Power Offset (4 bytes, BigEndian) */
3676 +#define SSB_SPROM3_GPIOLDC 0x0042 /* GPIO LED Powersave Duty Cycle (4 bytes, BigEndian) */
3677 #define SSB_SPROM3_GPIOLDC_OFF 0x0000FF00 /* Off Count */
3678 #define SSB_SPROM3_GPIOLDC_OFF_SHIFT 8
3679 #define SSB_SPROM3_GPIOLDC_ON 0x00FF0000 /* On Count */
3680 #define SSB_SPROM3_GPIOLDC_ON_SHIFT 16
3681 -#define SSB_SPROM3_CCKPO 0x1078 /* CCK Power Offset */
3682 +#define SSB_SPROM3_IL0MAC 0x004A /* 6 bytes MAC address for 802.11b/g */
3683 +#define SSB_SPROM3_CCKPO 0x0078 /* CCK Power Offset */
3684 #define SSB_SPROM3_CCKPO_1M 0x000F /* 1M Rate PO */
3685 #define SSB_SPROM3_CCKPO_2M 0x00F0 /* 2M Rate PO */
3686 #define SSB_SPROM3_CCKPO_2M_SHIFT 4
3687 @@ -264,104 +267,257 @@
3688 #define SSB_SPROM3_OFDMGPO 0x107A /* G-PHY OFDM Power Offset (4 bytes, BigEndian) */
3689
3690 /* SPROM Revision 4 */
3691 -#define SSB_SPROM4_IL0MAC 0x104C /* 6 byte MAC address for a/b/g/n */
3692 -#define SSB_SPROM4_ETHPHY 0x105A /* Ethernet PHY settings ?? */
3693 +#define SSB_SPROM4_BFLLO 0x0044 /* Boardflags (low 16 bits) */
3694 +#define SSB_SPROM4_BFLHI 0x0046 /* Board Flags Hi */
3695 +#define SSB_SPROM4_BFL2LO 0x0048 /* Board flags 2 (low 16 bits) */
3696 +#define SSB_SPROM4_BFL2HI 0x004A /* Board flags 2 Hi */
3697 +#define SSB_SPROM4_IL0MAC 0x004C /* 6 byte MAC address for a/b/g/n */
3698 +#define SSB_SPROM4_CCODE 0x0052 /* Country Code (2 bytes) */
3699 +#define SSB_SPROM4_GPIOA 0x0056 /* Gen. Purpose IO # 0 and 1 */
3700 +#define SSB_SPROM4_GPIOA_P0 0x00FF /* Pin 0 */
3701 +#define SSB_SPROM4_GPIOA_P1 0xFF00 /* Pin 1 */
3702 +#define SSB_SPROM4_GPIOA_P1_SHIFT 8
3703 +#define SSB_SPROM4_GPIOB 0x0058 /* Gen. Purpose IO # 2 and 3 */
3704 +#define SSB_SPROM4_GPIOB_P2 0x00FF /* Pin 2 */
3705 +#define SSB_SPROM4_GPIOB_P3 0xFF00 /* Pin 3 */
3706 +#define SSB_SPROM4_GPIOB_P3_SHIFT 8
3707 +#define SSB_SPROM4_ETHPHY 0x005A /* Ethernet PHY settings ?? */
3708 #define SSB_SPROM4_ETHPHY_ET0A 0x001F /* MII Address for enet0 */
3709 #define SSB_SPROM4_ETHPHY_ET1A 0x03E0 /* MII Address for enet1 */
3710 #define SSB_SPROM4_ETHPHY_ET1A_SHIFT 5
3711 #define SSB_SPROM4_ETHPHY_ET0M (1<<14) /* MDIO for enet0 */
3712 #define SSB_SPROM4_ETHPHY_ET1M (1<<15) /* MDIO for enet1 */
3713 -#define SSB_SPROM4_CCODE 0x1052 /* Country Code (2 bytes) */
3714 -#define SSB_SPROM4_ANTAVAIL 0x105D /* Antenna available bitfields */
3715 -#define SSB_SPROM4_ANTAVAIL_A 0x00FF /* A-PHY bitfield */
3716 -#define SSB_SPROM4_ANTAVAIL_A_SHIFT 0
3717 -#define SSB_SPROM4_ANTAVAIL_BG 0xFF00 /* B-PHY and G-PHY bitfield */
3718 -#define SSB_SPROM4_ANTAVAIL_BG_SHIFT 8
3719 -#define SSB_SPROM4_BFLLO 0x1044 /* Boardflags (low 16 bits) */
3720 -#define SSB_SPROM4_AGAIN01 0x105E /* Antenna Gain (in dBm Q5.2) */
3721 +#define SSB_SPROM4_ANTAVAIL 0x005D /* Antenna available bitfields */
3722 +#define SSB_SPROM4_ANTAVAIL_A 0x00FF /* A-PHY bitfield */
3723 +#define SSB_SPROM4_ANTAVAIL_A_SHIFT 0
3724 +#define SSB_SPROM4_ANTAVAIL_BG 0xFF00 /* B-PHY and G-PHY bitfield */
3725 +#define SSB_SPROM4_ANTAVAIL_BG_SHIFT 8
3726 +#define SSB_SPROM4_AGAIN01 0x005E /* Antenna Gain (in dBm Q5.2) */
3727 #define SSB_SPROM4_AGAIN0 0x00FF /* Antenna 0 */
3728 #define SSB_SPROM4_AGAIN0_SHIFT 0
3729 #define SSB_SPROM4_AGAIN1 0xFF00 /* Antenna 1 */
3730 #define SSB_SPROM4_AGAIN1_SHIFT 8
3731 -#define SSB_SPROM4_AGAIN23 0x1060
3732 +#define SSB_SPROM4_AGAIN23 0x0060
3733 #define SSB_SPROM4_AGAIN2 0x00FF /* Antenna 2 */
3734 #define SSB_SPROM4_AGAIN2_SHIFT 0
3735 #define SSB_SPROM4_AGAIN3 0xFF00 /* Antenna 3 */
3736 #define SSB_SPROM4_AGAIN3_SHIFT 8
3737 -#define SSB_SPROM4_BFLHI 0x1046 /* Board Flags Hi */
3738 -#define SSB_SPROM4_MAXP_BG 0x1080 /* Max Power BG in path 1 */
3739 +#define SSB_SPROM4_TXPID2G01 0x0062 /* TX Power Index 2GHz */
3740 +#define SSB_SPROM4_TXPID2G0 0x00FF
3741 +#define SSB_SPROM4_TXPID2G0_SHIFT 0
3742 +#define SSB_SPROM4_TXPID2G1 0xFF00
3743 +#define SSB_SPROM4_TXPID2G1_SHIFT 8
3744 +#define SSB_SPROM4_TXPID2G23 0x0064 /* TX Power Index 2GHz */
3745 +#define SSB_SPROM4_TXPID2G2 0x00FF
3746 +#define SSB_SPROM4_TXPID2G2_SHIFT 0
3747 +#define SSB_SPROM4_TXPID2G3 0xFF00
3748 +#define SSB_SPROM4_TXPID2G3_SHIFT 8
3749 +#define SSB_SPROM4_TXPID5G01 0x0066 /* TX Power Index 5GHz middle subband */
3750 +#define SSB_SPROM4_TXPID5G0 0x00FF
3751 +#define SSB_SPROM4_TXPID5G0_SHIFT 0
3752 +#define SSB_SPROM4_TXPID5G1 0xFF00
3753 +#define SSB_SPROM4_TXPID5G1_SHIFT 8
3754 +#define SSB_SPROM4_TXPID5G23 0x0068 /* TX Power Index 5GHz middle subband */
3755 +#define SSB_SPROM4_TXPID5G2 0x00FF
3756 +#define SSB_SPROM4_TXPID5G2_SHIFT 0
3757 +#define SSB_SPROM4_TXPID5G3 0xFF00
3758 +#define SSB_SPROM4_TXPID5G3_SHIFT 8
3759 +#define SSB_SPROM4_TXPID5GL01 0x006A /* TX Power Index 5GHz low subband */
3760 +#define SSB_SPROM4_TXPID5GL0 0x00FF
3761 +#define SSB_SPROM4_TXPID5GL0_SHIFT 0
3762 +#define SSB_SPROM4_TXPID5GL1 0xFF00
3763 +#define SSB_SPROM4_TXPID5GL1_SHIFT 8
3764 +#define SSB_SPROM4_TXPID5GL23 0x006C /* TX Power Index 5GHz low subband */
3765 +#define SSB_SPROM4_TXPID5GL2 0x00FF
3766 +#define SSB_SPROM4_TXPID5GL2_SHIFT 0
3767 +#define SSB_SPROM4_TXPID5GL3 0xFF00
3768 +#define SSB_SPROM4_TXPID5GL3_SHIFT 8
3769 +#define SSB_SPROM4_TXPID5GH01 0x006E /* TX Power Index 5GHz high subband */
3770 +#define SSB_SPROM4_TXPID5GH0 0x00FF
3771 +#define SSB_SPROM4_TXPID5GH0_SHIFT 0
3772 +#define SSB_SPROM4_TXPID5GH1 0xFF00
3773 +#define SSB_SPROM4_TXPID5GH1_SHIFT 8
3774 +#define SSB_SPROM4_TXPID5GH23 0x0070 /* TX Power Index 5GHz high subband */
3775 +#define SSB_SPROM4_TXPID5GH2 0x00FF
3776 +#define SSB_SPROM4_TXPID5GH2_SHIFT 0
3777 +#define SSB_SPROM4_TXPID5GH3 0xFF00
3778 +#define SSB_SPROM4_TXPID5GH3_SHIFT 8
3779 +#define SSB_SPROM4_MAXP_BG 0x0080 /* Max Power BG in path 1 */
3780 #define SSB_SPROM4_MAXP_BG_MASK 0x00FF /* Mask for Max Power BG */
3781 #define SSB_SPROM4_ITSSI_BG 0xFF00 /* Mask for path 1 itssi_bg */
3782 #define SSB_SPROM4_ITSSI_BG_SHIFT 8
3783 -#define SSB_SPROM4_MAXP_A 0x108A /* Max Power A in path 1 */
3784 +#define SSB_SPROM4_MAXP_A 0x008A /* Max Power A in path 1 */
3785 #define SSB_SPROM4_MAXP_A_MASK 0x00FF /* Mask for Max Power A */
3786 #define SSB_SPROM4_ITSSI_A 0xFF00 /* Mask for path 1 itssi_a */
3787 #define SSB_SPROM4_ITSSI_A_SHIFT 8
3788 -#define SSB_SPROM4_GPIOA 0x1056 /* Gen. Purpose IO # 0 and 1 */
3789 -#define SSB_SPROM4_GPIOA_P0 0x00FF /* Pin 0 */
3790 -#define SSB_SPROM4_GPIOA_P1 0xFF00 /* Pin 1 */
3791 -#define SSB_SPROM4_GPIOA_P1_SHIFT 8
3792 -#define SSB_SPROM4_GPIOB 0x1058 /* Gen. Purpose IO # 2 and 3 */
3793 -#define SSB_SPROM4_GPIOB_P2 0x00FF /* Pin 2 */
3794 -#define SSB_SPROM4_GPIOB_P3 0xFF00 /* Pin 3 */
3795 -#define SSB_SPROM4_GPIOB_P3_SHIFT 8
3796 -#define SSB_SPROM4_PA0B0 0x1082 /* The paXbY locations are */
3797 -#define SSB_SPROM4_PA0B1 0x1084 /* only guesses */
3798 -#define SSB_SPROM4_PA0B2 0x1086
3799 -#define SSB_SPROM4_PA1B0 0x108E
3800 -#define SSB_SPROM4_PA1B1 0x1090
3801 -#define SSB_SPROM4_PA1B2 0x1092
3802 +#define SSB_SPROM4_PA0B0 0x0082 /* The paXbY locations are */
3803 +#define SSB_SPROM4_PA0B1 0x0084 /* only guesses */
3804 +#define SSB_SPROM4_PA0B2 0x0086
3805 +#define SSB_SPROM4_PA1B0 0x008E
3806 +#define SSB_SPROM4_PA1B1 0x0090
3807 +#define SSB_SPROM4_PA1B2 0x0092
3808
3809 /* SPROM Revision 5 (inherits most data from rev 4) */
3810 -#define SSB_SPROM5_BFLLO 0x104A /* Boardflags (low 16 bits) */
3811 -#define SSB_SPROM5_BFLHI 0x104C /* Board Flags Hi */
3812 -#define SSB_SPROM5_IL0MAC 0x1052 /* 6 byte MAC address for a/b/g/n */
3813 -#define SSB_SPROM5_CCODE 0x1044 /* Country Code (2 bytes) */
3814 -#define SSB_SPROM5_GPIOA 0x1076 /* Gen. Purpose IO # 0 and 1 */
3815 +#define SSB_SPROM5_CCODE 0x0044 /* Country Code (2 bytes) */
3816 +#define SSB_SPROM5_BFLLO 0x004A /* Boardflags (low 16 bits) */
3817 +#define SSB_SPROM5_BFLHI 0x004C /* Board Flags Hi */
3818 +#define SSB_SPROM5_BFL2LO 0x004E /* Board flags 2 (low 16 bits) */
3819 +#define SSB_SPROM5_BFL2HI 0x0050 /* Board flags 2 Hi */
3820 +#define SSB_SPROM5_IL0MAC 0x0052 /* 6 byte MAC address for a/b/g/n */
3821 +#define SSB_SPROM5_GPIOA 0x0076 /* Gen. Purpose IO # 0 and 1 */
3822 #define SSB_SPROM5_GPIOA_P0 0x00FF /* Pin 0 */
3823 #define SSB_SPROM5_GPIOA_P1 0xFF00 /* Pin 1 */
3824 #define SSB_SPROM5_GPIOA_P1_SHIFT 8
3825 -#define SSB_SPROM5_GPIOB 0x1078 /* Gen. Purpose IO # 2 and 3 */
3826 +#define SSB_SPROM5_GPIOB 0x0078 /* Gen. Purpose IO # 2 and 3 */
3827 #define SSB_SPROM5_GPIOB_P2 0x00FF /* Pin 2 */
3828 #define SSB_SPROM5_GPIOB_P3 0xFF00 /* Pin 3 */
3829 #define SSB_SPROM5_GPIOB_P3_SHIFT 8
3830
3831 /* SPROM Revision 8 */
3832 -#define SSB_SPROM8_BFLLO 0x1084 /* Boardflags (low 16 bits) */
3833 -#define SSB_SPROM8_BFLHI 0x1086 /* Boardflags Hi */
3834 -#define SSB_SPROM8_IL0MAC 0x108C /* 6 byte MAC address */
3835 -#define SSB_SPROM8_CCODE 0x1092 /* 2 byte country code */
3836 -#define SSB_SPROM8_ANTAVAIL 0x109C /* Antenna available bitfields*/
3837 -#define SSB_SPROM8_ANTAVAIL_A 0xFF00 /* A-PHY bitfield */
3838 -#define SSB_SPROM8_ANTAVAIL_A_SHIFT 8
3839 -#define SSB_SPROM8_ANTAVAIL_BG 0x00FF /* B-PHY and G-PHY bitfield */
3840 -#define SSB_SPROM8_ANTAVAIL_BG_SHIFT 0
3841 -#define SSB_SPROM8_AGAIN01 0x109E /* Antenna Gain (in dBm Q5.2) */
3842 +#define SSB_SPROM8_BOARDREV 0x0082 /* Board revision */
3843 +#define SSB_SPROM8_BFLLO 0x0084 /* Board flags (bits 0-15) */
3844 +#define SSB_SPROM8_BFLHI 0x0086 /* Board flags (bits 16-31) */
3845 +#define SSB_SPROM8_BFL2LO 0x0088 /* Board flags (bits 32-47) */
3846 +#define SSB_SPROM8_BFL2HI 0x008A /* Board flags (bits 48-63) */
3847 +#define SSB_SPROM8_IL0MAC 0x008C /* 6 byte MAC address */
3848 +#define SSB_SPROM8_CCODE 0x0092 /* 2 byte country code */
3849 +#define SSB_SPROM8_GPIOA 0x0096 /*Gen. Purpose IO # 0 and 1 */
3850 +#define SSB_SPROM8_GPIOA_P0 0x00FF /* Pin 0 */
3851 +#define SSB_SPROM8_GPIOA_P1 0xFF00 /* Pin 1 */
3852 +#define SSB_SPROM8_GPIOA_P1_SHIFT 8
3853 +#define SSB_SPROM8_GPIOB 0x0098 /* Gen. Purpose IO # 2 and 3 */
3854 +#define SSB_SPROM8_GPIOB_P2 0x00FF /* Pin 2 */
3855 +#define SSB_SPROM8_GPIOB_P3 0xFF00 /* Pin 3 */
3856 +#define SSB_SPROM8_GPIOB_P3_SHIFT 8
3857 +#define SSB_SPROM8_ANTAVAIL 0x009C /* Antenna available bitfields*/
3858 +#define SSB_SPROM8_ANTAVAIL_A 0xFF00 /* A-PHY bitfield */
3859 +#define SSB_SPROM8_ANTAVAIL_A_SHIFT 8
3860 +#define SSB_SPROM8_ANTAVAIL_BG 0x00FF /* B-PHY and G-PHY bitfield */
3861 +#define SSB_SPROM8_ANTAVAIL_BG_SHIFT 0
3862 +#define SSB_SPROM8_AGAIN01 0x009E /* Antenna Gain (in dBm Q5.2) */
3863 #define SSB_SPROM8_AGAIN0 0x00FF /* Antenna 0 */
3864 #define SSB_SPROM8_AGAIN0_SHIFT 0
3865 #define SSB_SPROM8_AGAIN1 0xFF00 /* Antenna 1 */
3866 #define SSB_SPROM8_AGAIN1_SHIFT 8
3867 -#define SSB_SPROM8_AGAIN23 0x10A0
3868 +#define SSB_SPROM8_AGAIN23 0x00A0
3869 #define SSB_SPROM8_AGAIN2 0x00FF /* Antenna 2 */
3870 #define SSB_SPROM8_AGAIN2_SHIFT 0
3871 #define SSB_SPROM8_AGAIN3 0xFF00 /* Antenna 3 */
3872 #define SSB_SPROM8_AGAIN3_SHIFT 8
3873 -#define SSB_SPROM8_GPIOA 0x1096 /*Gen. Purpose IO # 0 and 1 */
3874 -#define SSB_SPROM8_GPIOA_P0 0x00FF /* Pin 0 */
3875 -#define SSB_SPROM8_GPIOA_P1 0xFF00 /* Pin 1 */
3876 -#define SSB_SPROM8_GPIOA_P1_SHIFT 8
3877 -#define SSB_SPROM8_GPIOB 0x1098 /* Gen. Purpose IO # 2 and 3 */
3878 -#define SSB_SPROM8_GPIOB_P2 0x00FF /* Pin 2 */
3879 -#define SSB_SPROM8_GPIOB_P3 0xFF00 /* Pin 3 */
3880 -#define SSB_SPROM8_GPIOB_P3_SHIFT 8
3881 -#define SSB_SPROM8_MAXP_BG 0x10C0 /* Max Power BG in path 1 */
3882 -#define SSB_SPROM8_MAXP_BG_MASK 0x00FF /* Mask for Max Power BG */
3883 +#define SSB_SPROM8_RSSIPARM2G 0x00A4 /* RSSI params for 2GHz */
3884 +#define SSB_SPROM8_RSSISMF2G 0x000F
3885 +#define SSB_SPROM8_RSSISMC2G 0x00F0
3886 +#define SSB_SPROM8_RSSISMC2G_SHIFT 4
3887 +#define SSB_SPROM8_RSSISAV2G 0x0700
3888 +#define SSB_SPROM8_RSSISAV2G_SHIFT 8
3889 +#define SSB_SPROM8_BXA2G 0x1800
3890 +#define SSB_SPROM8_BXA2G_SHIFT 11
3891 +#define SSB_SPROM8_RSSIPARM5G 0x00A6 /* RSSI params for 5GHz */
3892 +#define SSB_SPROM8_RSSISMF5G 0x000F
3893 +#define SSB_SPROM8_RSSISMC5G 0x00F0
3894 +#define SSB_SPROM8_RSSISMC5G_SHIFT 4
3895 +#define SSB_SPROM8_RSSISAV5G 0x0700
3896 +#define SSB_SPROM8_RSSISAV5G_SHIFT 8
3897 +#define SSB_SPROM8_BXA5G 0x1800
3898 +#define SSB_SPROM8_BXA5G_SHIFT 11
3899 +#define SSB_SPROM8_TRI25G 0x00A8 /* TX isolation 2.4&5.3GHz */
3900 +#define SSB_SPROM8_TRI2G 0x00FF /* TX isolation 2.4GHz */
3901 +#define SSB_SPROM8_TRI5G 0xFF00 /* TX isolation 5.3GHz */
3902 +#define SSB_SPROM8_TRI5G_SHIFT 8
3903 +#define SSB_SPROM8_TRI5GHL 0x00AA /* TX isolation 5.2/5.8GHz */
3904 +#define SSB_SPROM8_TRI5GL 0x00FF /* TX isolation 5.2GHz */
3905 +#define SSB_SPROM8_TRI5GH 0xFF00 /* TX isolation 5.8GHz */
3906 +#define SSB_SPROM8_TRI5GH_SHIFT 8
3907 +#define SSB_SPROM8_RXPO 0x00AC /* RX power offsets */
3908 +#define SSB_SPROM8_RXPO2G 0x00FF /* 2GHz RX power offset */
3909 +#define SSB_SPROM8_RXPO5G 0xFF00 /* 5GHz RX power offset */
3910 +#define SSB_SPROM8_RXPO5G_SHIFT 8
3911 +#define SSB_SPROM8_FEM2G 0x00AE
3912 +#define SSB_SPROM8_FEM5G 0x00B0
3913 +#define SSB_SROM8_FEM_TSSIPOS 0x0001
3914 +#define SSB_SROM8_FEM_TSSIPOS_SHIFT 0
3915 +#define SSB_SROM8_FEM_EXTPA_GAIN 0x0006
3916 +#define SSB_SROM8_FEM_EXTPA_GAIN_SHIFT 1
3917 +#define SSB_SROM8_FEM_PDET_RANGE 0x00F8
3918 +#define SSB_SROM8_FEM_PDET_RANGE_SHIFT 3
3919 +#define SSB_SROM8_FEM_TR_ISO 0x0700
3920 +#define SSB_SROM8_FEM_TR_ISO_SHIFT 8
3921 +#define SSB_SROM8_FEM_ANTSWLUT 0xF800
3922 +#define SSB_SROM8_FEM_ANTSWLUT_SHIFT 11
3923 +#define SSB_SPROM8_THERMAL 0x00B2
3924 +#define SSB_SPROM8_MPWR_RAWTS 0x00B4
3925 +#define SSB_SPROM8_TS_SLP_OPT_CORRX 0x00B6
3926 +#define SSB_SPROM8_FOC_HWIQ_IQSWP 0x00B8
3927 +#define SSB_SPROM8_PHYCAL_TEMPDELTA 0x00BA
3928 +#define SSB_SPROM8_MAXP_BG 0x00C0 /* Max Power 2GHz in path 1 */
3929 +#define SSB_SPROM8_MAXP_BG_MASK 0x00FF /* Mask for Max Power 2GHz */
3930 #define SSB_SPROM8_ITSSI_BG 0xFF00 /* Mask for path 1 itssi_bg */
3931 #define SSB_SPROM8_ITSSI_BG_SHIFT 8
3932 -#define SSB_SPROM8_MAXP_A 0x10C8 /* Max Power A in path 1 */
3933 -#define SSB_SPROM8_MAXP_A_MASK 0x00FF /* Mask for Max Power A */
3934 +#define SSB_SPROM8_PA0B0 0x00C2 /* 2GHz power amp settings */
3935 +#define SSB_SPROM8_PA0B1 0x00C4
3936 +#define SSB_SPROM8_PA0B2 0x00C6
3937 +#define SSB_SPROM8_MAXP_A 0x00C8 /* Max Power 5.3GHz */
3938 +#define SSB_SPROM8_MAXP_A_MASK 0x00FF /* Mask for Max Power 5.3GHz */
3939 #define SSB_SPROM8_ITSSI_A 0xFF00 /* Mask for path 1 itssi_a */
3940 #define SSB_SPROM8_ITSSI_A_SHIFT 8
3941 +#define SSB_SPROM8_MAXP_AHL 0x00CA /* Max Power 5.2/5.8GHz */
3942 +#define SSB_SPROM8_MAXP_AH_MASK 0x00FF /* Mask for Max Power 5.8GHz */
3943 +#define SSB_SPROM8_MAXP_AL_MASK 0xFF00 /* Mask for Max Power 5.2GHz */
3944 +#define SSB_SPROM8_MAXP_AL_SHIFT 8
3945 +#define SSB_SPROM8_PA1B0 0x00CC /* 5.3GHz power amp settings */
3946 +#define SSB_SPROM8_PA1B1 0x00CE
3947 +#define SSB_SPROM8_PA1B2 0x00D0
3948 +#define SSB_SPROM8_PA1LOB0 0x00D2 /* 5.2GHz power amp settings */
3949 +#define SSB_SPROM8_PA1LOB1 0x00D4
3950 +#define SSB_SPROM8_PA1LOB2 0x00D6
3951 +#define SSB_SPROM8_PA1HIB0 0x00D8 /* 5.8GHz power amp settings */
3952 +#define SSB_SPROM8_PA1HIB1 0x00DA
3953 +#define SSB_SPROM8_PA1HIB2 0x00DC
3954 +#define SSB_SPROM8_CCK2GPO 0x0140 /* CCK power offset */
3955 +#define SSB_SPROM8_OFDM2GPO 0x0142 /* 2.4GHz OFDM power offset */
3956 +#define SSB_SPROM8_OFDM5GPO 0x0146 /* 5.3GHz OFDM power offset */
3957 +#define SSB_SPROM8_OFDM5GLPO 0x014A /* 5.2GHz OFDM power offset */
3958 +#define SSB_SPROM8_OFDM5GHPO 0x014E /* 5.8GHz OFDM power offset */
3959 +
3960 +/* Values for boardflags_lo read from SPROM */
3961 +#define SSB_BFL_BTCOEXIST 0x0001 /* implements Bluetooth coexistance */
3962 +#define SSB_BFL_PACTRL 0x0002 /* GPIO 9 controlling the PA */
3963 +#define SSB_BFL_AIRLINEMODE 0x0004 /* implements GPIO 13 radio disable indication */
3964 +#define SSB_BFL_RSSI 0x0008 /* software calculates nrssi slope. */
3965 +#define SSB_BFL_ENETSPI 0x0010 /* has ephy roboswitch spi */
3966 +#define SSB_BFL_XTAL_NOSLOW 0x0020 /* no slow clock available */
3967 +#define SSB_BFL_CCKHIPWR 0x0040 /* can do high power CCK transmission */
3968 +#define SSB_BFL_ENETADM 0x0080 /* has ADMtek switch */
3969 +#define SSB_BFL_ENETVLAN 0x0100 /* can do vlan */
3970 +#define SSB_BFL_AFTERBURNER 0x0200 /* supports Afterburner mode */
3971 +#define SSB_BFL_NOPCI 0x0400 /* board leaves PCI floating */
3972 +#define SSB_BFL_FEM 0x0800 /* supports the Front End Module */
3973 +#define SSB_BFL_EXTLNA 0x1000 /* has an external LNA */
3974 +#define SSB_BFL_HGPA 0x2000 /* had high gain PA */
3975 +#define SSB_BFL_BTCMOD 0x4000 /* BFL_BTCOEXIST is given in alternate GPIOs */
3976 +#define SSB_BFL_ALTIQ 0x8000 /* alternate I/Q settings */
3977 +
3978 +/* Values for boardflags_hi read from SPROM */
3979 +#define SSB_BFH_NOPA 0x0001 /* has no PA */
3980 +#define SSB_BFH_RSSIINV 0x0002 /* RSSI uses positive slope (not TSSI) */
3981 +#define SSB_BFH_PAREF 0x0004 /* uses the PARef LDO */
3982 +#define SSB_BFH_3TSWITCH 0x0008 /* uses a triple throw switch shared with bluetooth */
3983 +#define SSB_BFH_PHASESHIFT 0x0010 /* can support phase shifter */
3984 +#define SSB_BFH_BUCKBOOST 0x0020 /* has buck/booster */
3985 +#define SSB_BFH_FEM_BT 0x0040 /* has FEM and switch to share antenna with bluetooth */
3986 +
3987 +/* Values for boardflags2_lo read from SPROM */
3988 +#define SSB_BFL2_RXBB_INT_REG_DIS 0x0001 /* external RX BB regulator present */
3989 +#define SSB_BFL2_APLL_WAR 0x0002 /* alternative A-band PLL settings implemented */
3990 +#define SSB_BFL2_TXPWRCTRL_EN 0x0004 /* permits enabling TX Power Control */
3991 +#define SSB_BFL2_2X4_DIV 0x0008 /* 2x4 diversity switch */
3992 +#define SSB_BFL2_5G_PWRGAIN 0x0010 /* supports 5G band power gain */
3993 +#define SSB_BFL2_PCIEWAR_OVR 0x0020 /* overrides ASPM and Clkreq settings */
3994 +#define SSB_BFL2_CAESERS_BRD 0x0040 /* is Caesers board (unused) */
3995 +#define SSB_BFL2_BTC3WIRE 0x0080 /* used 3-wire bluetooth coexist */
3996 +#define SSB_BFL2_SKWRKFEM_BRD 0x0100 /* 4321mcm93 uses Skyworks FEM */
3997 +#define SSB_BFL2_SPUR_WAR 0x0200 /* has a workaround for clock-harmonic spurs */
3998 +#define SSB_BFL2_GPLL_WAR 0x0400 /* altenative G-band PLL settings implemented */
3999
4000 /* Values for SSB_SPROM1_BINF_CCODE */
4001 enum {
4002 --- a/drivers/ssb/driver_extif.c
4003 +++ b/drivers/ssb/driver_extif.c
4004 @@ -3,7 +3,7 @@
4005 * Broadcom EXTIF core driver
4006 *
4007 * Copyright 2005, Broadcom Corporation
4008 - * Copyright 2006, 2007, Michael Buesch <mb@bu3sch.de>
4009 + * Copyright 2006, 2007, Michael Buesch <m@bues.ch>
4010 * Copyright 2006, 2007, Felix Fietkau <nbd@openwrt.org>
4011 * Copyright 2007, Aurelien Jarno <aurelien@aurel32.net>
4012 *
4013 --- a/drivers/ssb/embedded.c
4014 +++ b/drivers/ssb/embedded.c
4015 @@ -3,7 +3,7 @@
4016 * Embedded systems support code
4017 *
4018 * Copyright 2005-2008, Broadcom Corporation
4019 - * Copyright 2006-2008, Michael Buesch <mb@bu3sch.de>
4020 + * Copyright 2006-2008, Michael Buesch <m@bues.ch>
4021 *
4022 * Licensed under the GNU/GPL. See COPYING for details.
4023 */
Personal OpenWRT clone
This page took 0.216101 seconds and 5 git commands to generate.