aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFranky Lin <frankyl@broadcom.com>2013-04-11 07:28:49 -0400
committerJohn W. Linville <linville@tuxdriver.com>2013-04-12 14:27:54 -0400
commite3b919d8b3db014af848af64ead8da4475d4ab60 (patch)
tree207d7c7e1e17c0b9d51cbf775ac3e35514768f44
parent069eddd9267204163325a9dc0bd1cdaeca30f6ae (diff)
brcmutil: add new d11 interface support
802.11 core interface is upgraded with 11ac support. Add channel spec support code to brcmutil. Reviewed-by: Hante Meuleman <meuleman@broadcom.com> Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com> Reviewed-by: Arend van Spriel <arend@broadcom.com> Reviewed-by: Piotr Haber <phaber@broadcom.com> Signed-off-by: Franky Lin <frankyl@broadcom.com> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat
-rw-r--r--drivers/net/wireless/brcm80211/brcmutil/Makefile3
-rw-r--r--drivers/net/wireless/brcm80211/brcmutil/d11.c162
-rw-r--r--drivers/net/wireless/brcm80211/include/brcmu_d11.h145
3 files changed, 309 insertions, 1 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmutil/Makefile b/drivers/net/wireless/brcm80211/brcmutil/Makefile
index 6281c416289e..d7c44752b0b7 100644
--- a/drivers/net/wireless/brcm80211/brcmutil/Makefile
+++ b/drivers/net/wireless/brcm80211/brcmutil/Makefile
@@ -20,7 +20,8 @@ ccflags-y := \
20 -Idrivers/net/wireless/brcm80211/include 20 -Idrivers/net/wireless/brcm80211/include
21 21
22BRCMUTIL_OFILES := \ 22BRCMUTIL_OFILES := \
23 utils.o 23 utils.o \
24 d11.o
24 25
25MODULEPFX := brcmutil 26MODULEPFX := brcmutil
26 27
diff --git a/drivers/net/wireless/brcm80211/brcmutil/d11.c b/drivers/net/wireless/brcm80211/brcmutil/d11.c
new file mode 100644
index 000000000000..30e54e2c6c9b
--- /dev/null
+++ b/drivers/net/wireless/brcm80211/brcmutil/d11.c
@@ -0,0 +1,162 @@
1/*
2 * Copyright (c) 2013 Broadcom Corporation
3 *
4 * Permission to use, copy, modify, and/or distribute this software for any
5 * purpose with or without fee is hereby granted, provided that the above
6 * copyright notice and this permission notice appear in all copies.
7 *
8 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
11 * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
13 * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
14 * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
15 */
16/*********************channel spec common functions*********************/
17
18#include <linux/module.h>
19
20#include <brcmu_utils.h>
21#include <brcmu_wifi.h>
22#include <brcmu_d11.h>
23
24static void brcmu_d11n_encchspec(struct brcmu_chan *ch)
25{
26 ch->chspec = ch->chnum & BRCMU_CHSPEC_CH_MASK;
27
28 switch (ch->bw) {
29 case BRCMU_CHAN_BW_20:
30 ch->chspec |= BRCMU_CHSPEC_D11N_BW_20 | BRCMU_CHSPEC_D11N_SB_N;
31 break;
32 case BRCMU_CHAN_BW_40:
33 default:
34 WARN_ON_ONCE(1);
35 break;
36 }
37
38 if (ch->chnum <= CH_MAX_2G_CHANNEL)
39 ch->chspec |= BRCMU_CHSPEC_D11N_BND_2G;
40 else
41 ch->chspec |= BRCMU_CHSPEC_D11N_BND_5G;
42}
43
44static void brcmu_d11ac_encchspec(struct brcmu_chan *ch)
45{
46 ch->chspec = ch->chnum & BRCMU_CHSPEC_CH_MASK;
47
48 switch (ch->bw) {
49 case BRCMU_CHAN_BW_20:
50 ch->chspec |= BRCMU_CHSPEC_D11AC_BW_20;
51 break;
52 case BRCMU_CHAN_BW_40:
53 case BRCMU_CHAN_BW_80:
54 case BRCMU_CHAN_BW_80P80:
55 case BRCMU_CHAN_BW_160:
56 default:
57 WARN_ON_ONCE(1);
58 break;
59 }
60
61 if (ch->chnum <= CH_MAX_2G_CHANNEL)
62 ch->chspec |= BRCMU_CHSPEC_D11AC_BND_2G;
63 else
64 ch->chspec |= BRCMU_CHSPEC_D11AC_BND_5G;
65}
66
67static void brcmu_d11n_decchspec(struct brcmu_chan *ch)
68{
69 u16 val;
70
71 ch->chnum = (u8)(ch->chspec & BRCMU_CHSPEC_CH_MASK);
72
73 switch (ch->chspec & BRCMU_CHSPEC_D11N_BW_MASK) {
74 case BRCMU_CHSPEC_D11N_BW_20:
75 ch->bw = BRCMU_CHAN_BW_20;
76 break;
77 case BRCMU_CHSPEC_D11N_BW_40:
78 ch->bw = BRCMU_CHAN_BW_40;
79 val = ch->chspec & BRCMU_CHSPEC_D11N_SB_MASK;
80 if (val == BRCMU_CHSPEC_D11N_SB_L) {
81 ch->sb = BRCMU_CHAN_SB_L;
82 ch->chnum -= CH_10MHZ_APART;
83 } else {
84 ch->sb = BRCMU_CHAN_SB_U;
85 ch->chnum += CH_10MHZ_APART;
86 }
87 break;
88 default:
89 WARN_ON_ONCE(1);
90 break;
91 }
92
93 switch (ch->chspec & BRCMU_CHSPEC_D11N_BND_MASK) {
94 case BRCMU_CHSPEC_D11N_BND_5G:
95 ch->band = BRCMU_CHAN_BAND_5G;
96 break;
97 case BRCMU_CHSPEC_D11N_BND_2G:
98 ch->band = BRCMU_CHAN_BAND_2G;
99 break;
100 default:
101 WARN_ON_ONCE(1);
102 break;
103 }
104}
105
106static void brcmu_d11ac_decchspec(struct brcmu_chan *ch)
107{
108 u16 val;
109
110 ch->chnum = (u8)(ch->chspec & BRCMU_CHSPEC_CH_MASK);
111
112 switch (ch->chspec & BRCMU_CHSPEC_D11AC_BW_MASK) {
113 case BRCMU_CHSPEC_D11AC_BW_20:
114 ch->bw = BRCMU_CHAN_BW_20;
115 break;
116 case BRCMU_CHSPEC_D11AC_BW_40:
117 ch->bw = BRCMU_CHAN_BW_40;
118 val = ch->chspec & BRCMU_CHSPEC_D11AC_SB_MASK;
119 if (val == BRCMU_CHSPEC_D11AC_SB_L) {
120 ch->sb = BRCMU_CHAN_SB_L;
121 ch->chnum -= CH_10MHZ_APART;
122 } else if (val == BRCMU_CHSPEC_D11AC_SB_U) {
123 ch->sb = BRCMU_CHAN_SB_U;
124 ch->chnum += CH_10MHZ_APART;
125 } else {
126 WARN_ON_ONCE(1);
127 }
128 break;
129 case BRCMU_CHSPEC_D11AC_BW_80:
130 ch->bw = BRCMU_CHAN_BW_80;
131 break;
132 case BRCMU_CHSPEC_D11AC_BW_8080:
133 case BRCMU_CHSPEC_D11AC_BW_160:
134 default:
135 WARN_ON_ONCE(1);
136 break;
137 }
138
139 switch (ch->chspec & BRCMU_CHSPEC_D11AC_BND_MASK) {
140 case BRCMU_CHSPEC_D11AC_BND_5G:
141 ch->band = BRCMU_CHAN_BAND_5G;
142 break;
143 case BRCMU_CHSPEC_D11AC_BND_2G:
144 ch->band = BRCMU_CHAN_BAND_2G;
145 break;
146 default:
147 WARN_ON_ONCE(1);
148 break;
149 }
150}
151
152void brcmu_d11_attach(struct brcmu_d11inf *d11inf)
153{
154 if (d11inf->io_type == BRCMU_D11N_IOTYPE) {
155 d11inf->encchspec = brcmu_d11n_encchspec;
156 d11inf->decchspec = brcmu_d11n_decchspec;
157 } else {
158 d11inf->encchspec = brcmu_d11ac_encchspec;
159 d11inf->decchspec = brcmu_d11ac_decchspec;
160 }
161}
162EXPORT_SYMBOL(brcmu_d11_attach);
diff --git a/drivers/net/wireless/brcm80211/include/brcmu_d11.h b/drivers/net/wireless/brcm80211/include/brcmu_d11.h
new file mode 100644
index 000000000000..92623f02b1c0
--- /dev/null
+++ b/drivers/net/wireless/brcm80211/include/brcmu_d11.h
@@ -0,0 +1,145 @@
1/*
2 * Copyright (c) 2010 Broadcom Corporation
3 *
4 * Permission to use, copy, modify, and/or distribute this software for any
5 * purpose with or without fee is hereby granted, provided that the above
6 * copyright notice and this permission notice appear in all copies.
7 *
8 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
11 * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
13 * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
14 * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
15 */
16
17#ifndef _BRCMU_D11_H_
18#define _BRCMU_D11_H_
19
20/* d11 io type */
21#define BRCMU_D11N_IOTYPE 1
22#define BRCMU_D11AC_IOTYPE 2
23
24/* A chanspec (channel specification) holds the channel number, band,
25 * bandwidth and control sideband
26 */
27
28/* chanspec binary format */
29
30#define BRCMU_CHSPEC_INVALID 255
31/* bit 0~7 channel number
32 * for 80+80 channels: bit 0~3 low channel id, bit 4~7 high channel id
33 */
34#define BRCMU_CHSPEC_CH_MASK 0x00ff
35#define BRCMU_CHSPEC_CH_SHIFT 0
36#define BRCMU_CHSPEC_CHL_MASK 0x000f
37#define BRCMU_CHSPEC_CHL_SHIFT 0
38#define BRCMU_CHSPEC_CHH_MASK 0x00f0
39#define BRCMU_CHSPEC_CHH_SHIFT 4
40
41/* bit 8~16 for dot 11n IO types
42 * bit 8~9 sideband
43 * bit 10~11 bandwidth
44 * bit 12~13 spectral band
45 * bit 14~15 not used
46 */
47#define BRCMU_CHSPEC_D11N_SB_MASK 0x0300
48#define BRCMU_CHSPEC_D11N_SB_SHIFT 8
49#define BRCMU_CHSPEC_D11N_SB_L 0x0100 /* control lower */
50#define BRCMU_CHSPEC_D11N_SB_U 0x0200 /* control upper */
51#define BRCMU_CHSPEC_D11N_SB_N 0x0300 /* none */
52#define BRCMU_CHSPEC_D11N_BW_MASK 0x0c00
53#define BRCMU_CHSPEC_D11N_BW_SHIFT 10
54#define BRCMU_CHSPEC_D11N_BW_10 0x0400
55#define BRCMU_CHSPEC_D11N_BW_20 0x0800
56#define BRCMU_CHSPEC_D11N_BW_40 0x0c00
57#define BRCMU_CHSPEC_D11N_BND_MASK 0x3000
58#define BRCMU_CHSPEC_D11N_BND_SHIFT 12
59#define BRCMU_CHSPEC_D11N_BND_5G 0x1000
60#define BRCMU_CHSPEC_D11N_BND_2G 0x2000
61
62/* bit 8~16 for dot 11ac IO types
63 * bit 8~10 sideband
64 * bit 11~13 bandwidth
65 * bit 14~15 spectral band
66 */
67#define BRCMU_CHSPEC_D11AC_SB_MASK 0x0700
68#define BRCMU_CHSPEC_D11AC_SB_SHIFT 8
69#define BRCMU_CHSPEC_D11AC_SB_LLL 0x0000
70#define BRCMU_CHSPEC_D11AC_SB_LLU 0x0100
71#define BRCMU_CHSPEC_D11AC_SB_LUL 0x0200
72#define BRCMU_CHSPEC_D11AC_SB_LUU 0x0300
73#define BRCMU_CHSPEC_D11AC_SB_ULL 0x0400
74#define BRCMU_CHSPEC_D11AC_SB_ULU 0x0500
75#define BRCMU_CHSPEC_D11AC_SB_UUL 0x0600
76#define BRCMU_CHSPEC_D11AC_SB_UUU 0x0700
77#define BRCMU_CHSPEC_D11AC_SB_LL BRCMU_CHSPEC_D11AC_SB_LLL
78#define BRCMU_CHSPEC_D11AC_SB_LU BRCMU_CHSPEC_D11AC_SB_LLU
79#define BRCMU_CHSPEC_D11AC_SB_UL BRCMU_CHSPEC_D11AC_SB_LUL
80#define BRCMU_CHSPEC_D11AC_SB_UU BRCMU_CHSPEC_D11AC_SB_LUU
81#define BRCMU_CHSPEC_D11AC_SB_L BRCMU_CHSPEC_D11AC_SB_LLL
82#define BRCMU_CHSPEC_D11AC_SB_U BRCMU_CHSPEC_D11AC_SB_LLU
83#define BRCMU_CHSPEC_D11AC_BW_MASK 0x3800
84#define BRCMU_CHSPEC_D11AC_BW_SHIFT 11
85#define BRCMU_CHSPEC_D11AC_BW_5 0x0000
86#define BRCMU_CHSPEC_D11AC_BW_10 0x0800
87#define BRCMU_CHSPEC_D11AC_BW_20 0x1000
88#define BRCMU_CHSPEC_D11AC_BW_40 0x1800
89#define BRCMU_CHSPEC_D11AC_BW_80 0x2000
90#define BRCMU_CHSPEC_D11AC_BW_160 0x2800
91#define BRCMU_CHSPEC_D11AC_BW_8080 0x3000
92#define BRCMU_CHSPEC_D11AC_BND_MASK 0xc000
93#define BRCMU_CHSPEC_D11AC_BND_SHIFT 14
94#define BRCMU_CHSPEC_D11AC_BND_2G 0x0000
95#define BRCMU_CHSPEC_D11AC_BND_3G 0x4000
96#define BRCMU_CHSPEC_D11AC_BND_4G 0x8000
97#define BRCMU_CHSPEC_D11AC_BND_5G 0xc000
98
99#define BRCMU_CHAN_BAND_2G 0
100#define BRCMU_CHAN_BAND_5G 1
101
102enum brcmu_chan_bw {
103 BRCMU_CHAN_BW_20,
104 BRCMU_CHAN_BW_40,
105 BRCMU_CHAN_BW_80,
106 BRCMU_CHAN_BW_80P80,
107 BRCMU_CHAN_BW_160,
108};
109
110enum brcmu_chan_sb {
111 BRCMU_CHAN_SB_NONE = 0,
112 BRCMU_CHAN_SB_L,
113 BRCMU_CHAN_SB_U,
114 BRCMU_CHAN_SB_LL,
115 BRCMU_CHAN_SB_LU,
116 BRCMU_CHAN_SB_UL,
117 BRCMU_CHAN_SB_UU,
118 BRCMU_CHAN_SB_LLL,
119 BRCMU_CHAN_SB_LLU,
120 BRCMU_CHAN_SB_LUL,
121 BRCMU_CHAN_SB_LUU,
122 BRCMU_CHAN_SB_ULL,
123 BRCMU_CHAN_SB_ULU,
124 BRCMU_CHAN_SB_UUL,
125 BRCMU_CHAN_SB_UUU,
126};
127
128struct brcmu_chan {
129 u16 chspec;
130 u8 chnum;
131 u8 band;
132 enum brcmu_chan_bw bw;
133 enum brcmu_chan_sb sb;
134};
135
136struct brcmu_d11inf {
137 u8 io_type;
138
139 void (*encchspec)(struct brcmu_chan *ch);
140 void (*decchspec)(struct brcmu_chan *ch);
141};
142
143extern void brcmu_d11_attach(struct brcmu_d11inf *d11inf);
144
145#endif /* _BRCMU_CHANNELS_H_ */
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-13 05:36:53 -0400