1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
|
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
@@ -62,6 +62,7 @@
#include <linux/if_arp.h>
#include <linux/rtnetlink.h>
#include <linux/time.h>
+#include <linux/pci.h>
#include <asm/uaccess.h>
#include "if_ethersubr.h" /* for ETHER_IS_MULTICAST */
@@ -401,6 +402,15 @@ static int outdoor = -1;
static int xchanmode = -1;
static int beacon_cal = 1;
+static const struct ath_hw_detect generic_hw_info = {
+ .vendor_name = "Unknown",
+ .card_name = "Generic",
+ .vendor = PCI_ANY_ID,
+ .id = PCI_ANY_ID,
+ .subvendor = PCI_ANY_ID,
+ .subid = PCI_ANY_ID
+};
+
static const char *hal_status_desc[] = {
"No error",
"No hardware present or device not yet supported",
@@ -542,6 +552,8 @@ ath_attach(u_int16_t devid, struct net_d
DPRINTF(sc, ATH_DEBUG_ANY, "%s: devid 0x%x\n", __func__, devid);
#endif
+ sc->sc_hwinfo = &generic_hw_info;
+
/* Allocate space for dynamically determined maximum VAP count */
sc->sc_bslot =
kmalloc(ath_maxvaps * sizeof(struct ieee80211vap*), GFP_KERNEL);
@@ -1507,6 +1519,28 @@ ath_vap_create(struct ieee80211com *ic,
return vap;
}
+void
+ath_hw_detect(struct ath_softc *sc, const struct ath_hw_detect *cards, int n_cards, u32 vendor, u32 id, u32 subvendor, u32 subid)
+{
+ int i;
+
+ for (i = 0; i < n_cards; i++) {
+ const struct ath_hw_detect *c = &cards[i];
+
+ if ((c->vendor != PCI_ANY_ID) && c->vendor != vendor)
+ continue;
+ if ((c->id != PCI_ANY_ID) && c->id != id)
+ continue;
+ if ((c->subvendor != PCI_ANY_ID) && c->subvendor != subvendor)
+ continue;
+ if ((c->subid != PCI_ANY_ID) && c->subid != subid)
+ continue;
+
+ sc->sc_hwinfo = c;
+ break;
+ }
+}
+
static void
ath_vap_delete(struct ieee80211vap *vap)
{
@@ -10818,6 +10852,12 @@ ath_ioctl(struct net_device *dev, struct
* is to add module parameters.
*/
+/* sysctls for hardware info */
+enum {
+ ATH_CARD_VENDOR,
+ ATH_CARD_NAME,
+};
+
/*
* Dynamic (i.e. per-device) sysctls. These are automatically
* mirrored in /proc/sys.
@@ -10897,6 +10937,38 @@ ath_sysctl_get_intmit(struct ath_softc *
}
static int
+ATH_SYSCTL_DECL(ath_sysctl_hwinfo, ctl, write, filp, buffer, lenp, ppos)
+{
+ struct ath_softc *sc = ctl->extra1;
+ struct ath_hal *ah = sc->sc_ah;
+ int ret = 0;
+
+ if (write)
+ return -EINVAL;
+
+ ATH_LOCK(sc);
+ switch((long)ctl->extra2) {
+ case ATH_CARD_VENDOR:
+ ctl->data = (char *)sc->sc_hwinfo->vendor_name;
+ break;
+ case ATH_CARD_NAME:
+ ctl->data = (char *)sc->sc_hwinfo->card_name;
+ break;
+ default:
+ ret = -EINVAL;
+ break;
+ }
+ if (ret == 0) {
+ ctl->maxlen = strlen(ctl->data);
+ ret = ATH_SYSCTL_PROC_DOSTRING(ctl, write, filp,
+ buffer, lenp, ppos);
+ }
+ ATH_UNLOCK(sc);
+
+ return ret;
+}
+
+static int
ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl, write, filp, buffer, lenp, ppos)
{
struct ath_softc *sc = ctl->extra1;
@@ -11176,6 +11248,24 @@ static int maxint = 0x7fffffff; /* 32-b
static const ctl_table ath_sysctl_template[] = {
{ .ctl_name = CTL_AUTO,
+ .procname = "dev_vendor",
+ .mode = 0644,
+ .proc_handler = ath_sysctl_hwinfo,
+ .strategy = &sysctl_string,
+ .data = "N/A",
+ .maxlen = 1,
+ .extra2 = (void *)ATH_CARD_VENDOR,
+ },
+ { .ctl_name = CTL_AUTO,
+ .procname = "dev_name",
+ .mode = 0644,
+ .proc_handler = ath_sysctl_hwinfo,
+ .strategy = &sysctl_string,
+ .data = "N/A",
+ .maxlen = 1,
+ .extra2 = (void *)ATH_CARD_NAME,
+ },
+ { .ctl_name = CTL_AUTO,
.procname = "slottime",
.mode = 0644,
.proc_handler = ath_sysctl_halparam,
--- a/ath/if_athvar.h
+++ b/ath/if_athvar.h
@@ -168,12 +168,16 @@ static inline struct net_device *_alloc_
void __user *buffer, size_t *lenp)
#define ATH_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \
proc_dointvec(ctl, write, filp, buffer, lenp)
+#define ATH_SYSCTL_PROC_DOSTRING(ctl, write, filp, buffer, lenp, ppos) \
+ proc_dostring(ctl, write, filp, buffer, lenp)
#else /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,8) */
#define ATH_SYSCTL_DECL(f, ctl, write, filp, buffer, lenp, ppos) \
f(ctl_table *ctl, int write, struct file *filp, \
void __user *buffer, size_t *lenp, loff_t *ppos)
#define ATH_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \
proc_dointvec(ctl, write, filp, buffer, lenp, ppos)
+#define ATH_SYSCTL_PROC_DOSTRING(ctl, write, filp, buffer, lenp, ppos) \
+ proc_dostring(ctl, write, filp, buffer, lenp, ppos)
#endif
#define ATH_TIMEOUT 1000
@@ -469,6 +473,7 @@ struct ath_hal;
struct ath_desc;
struct ath_ratectrl;
struct ath_tx99;
+struct ath_hw_detect;
struct proc_dir_entry;
/*
@@ -629,6 +634,7 @@ struct ath_softc {
struct ath_ratectrl *sc_rc; /* tx rate control support */
struct ath_tx99 *sc_tx99; /* tx99 support */
void (*sc_setdefantenna)(struct ath_softc *, u_int);
+ const struct ath_hw_detect *sc_hwinfo;
unsigned int sc_invalid:1; /* being detached */
unsigned int sc_mrretry:1; /* multi-rate retry support */
@@ -929,4 +935,15 @@ int ar_device(int devid);
void ath_radar_detected(struct ath_softc *sc, const char* message);
+struct ath_hw_detect {
+ const char *vendor_name;
+ const char *card_name;
+ u32 vendor;
+ u32 id;
+ u32 subvendor;
+ u32 subid;
+};
+
+extern void ath_hw_detect(struct ath_softc *sc, const struct ath_hw_detect *cards, int n_cards, u32 vendor, u32 id, u32 subvendor, u32 subid);
+
#endif /* _DEV_ATH_ATHVAR_H */
--- a/ath/if_ath_ahb.c
+++ b/ath/if_ath_ahb.c
@@ -20,6 +20,7 @@
#include <linux/netdevice.h>
#include <linux/cache.h>
#include <linux/platform_device.h>
+#include <linux/pci.h>
#include <asm/io.h>
#include <asm/uaccess.h>
@@ -181,12 +182,97 @@ exit_ath_wmac(u_int16_t wlanNum, struct
return 0;
}
+static const char ubnt[] = "Ubiquiti Networks";
+static const struct ath_hw_detect cards[] = {
+ {
+ .vendor_name = ubnt,
+ .card_name = "PowerStation2 (18V)",
+ .vendor = PCI_ANY_ID,
+ .id = PCI_ANY_ID,
+ .subvendor = PCI_ANY_ID,
+ .subid = 0xb102,
+ },
+ {
+ .vendor_name = ubnt,
+ .card_name = "PowerStation2 (16D)",
+ .vendor = PCI_ANY_ID,
+ .id = PCI_ANY_ID,
+ .subvendor = PCI_ANY_ID,
+ .subid = 0xb202,
+ },
+ {
+ .vendor_name = ubnt,
+ .card_name = "PowerStation2 (EXT)",
+ .vendor = PCI_ANY_ID,
+ .id = PCI_ANY_ID,
+ .subvendor = PCI_ANY_ID,
+ .subid = 0xb302,
+ },
+ {
+ .vendor_name = ubnt,
+ .card_name = "PowerStation5 (22V)",
+ .vendor = PCI_ANY_ID,
+ .id = PCI_ANY_ID,
+ .subvendor = PCI_ANY_ID,
+ .subid = 0xb105,
+ },
+ {
+ .vendor_name = ubnt,
+ .card_name = "PowerStation5 (EXT)",
+ .vendor = PCI_ANY_ID,
+ .id = PCI_ANY_ID,
+ .subvendor = PCI_ANY_ID,
+ .subid = 0xb305,
+ },
+ {
+ .vendor_name = ubnt,
+ .card_name = "WispStation5",
+ .vendor = PCI_ANY_ID,
+ .id = PCI_ANY_ID,
+ .subvendor = PCI_ANY_ID,
+ .subid = 0xa105,
+ },
+ {
+ .vendor_name = ubnt,
+ .card_name = "LiteStation2",
+ .vendor = PCI_ANY_ID,
+ .id = PCI_ANY_ID,
+ .subvendor = PCI_ANY_ID,
+ .subid = 0xa002,
+ },
+ {
+ .vendor_name = ubnt,
+ .card_name = "LiteStation5",
+ .vendor = PCI_ANY_ID,
+ .id = PCI_ANY_ID,
+ .subvendor = PCI_ANY_ID,
+ .subid = 0xa005,
+ },
+ {
+ .vendor_name = ubnt,
+ .card_name = "NanoStation2",
+ .vendor = PCI_ANY_ID,
+ .id = PCI_ANY_ID,
+ .subvendor = PCI_ANY_ID,
+ .subid = 0xc002,
+ },
+ {
+ .vendor_name = ubnt,
+ .card_name = "NanoStation5",
+ .vendor = PCI_ANY_ID,
+ .id = PCI_ANY_ID,
+ .subvendor = PCI_ANY_ID,
+ .subid = 0xc005,
+ },
+};
+
static int
init_ath_wmac(u_int16_t devid, u_int16_t wlanNum, struct ar531x_config *config)
{
const char *athname;
struct net_device *dev;
struct ath_ahb_softc *sc;
+ u16 *radio_data;
if (((wlanNum != 0) && (wlanNum != 1)) ||
(sclist[wlanNum] != NULL))
@@ -248,6 +334,16 @@ init_ath_wmac(u_int16_t devid, u_int16_t
sc->aps_sc.sc_softled = 1; /* SoftLED over GPIO */
sc->aps_sc.sc_ledpin = config->board->sysLedGpio;
sc->aps_sc.sc_invalid = 0;
+ radio_data = (u16 *) config->radio;
+ if (radio_data) {
+ u16 vendor, id, subvendor, subid;
+ vendor = radio_data[1];
+ id = radio_data[0];
+ subvendor = radio_data[8];
+ subid = radio_data[7];
+ ath_hw_detect(&sc->aps_sc, cards, ARRAY_SIZE(cards), vendor, id, subvendor, subid);
+ }
+
return 0;
bad4:
|
