Skip to content

Commit cabf06e

Browse files
davem330davem330
committed
Merge tag 'wireless-drivers-next-2020-08-04' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next
Kalle Valo says: ==================== wireless-drivers-next patches for v5.9 Second set of patches for v5.9. mt76 has most of patches this time. Otherwise it's just smaller fixes and cleanups to other drivers. There was a major conflict in mt76 driver between wireless-drivers and wireless-drivers-next. I solved that by merging the former to the latter. Major changes: rtw88 * add support for ieee80211_ops::change_interface * add support for enabling and disabling beacon * add debugfs file for testing h2c mt76 * ARP filter offload for 7663 * runtime power management for 7663 * testmode support for mfg calibration * support for more channels ==================== Signed-off-by: David S. Miller <[email protected]>
2 parents 93f4ddd + 2cfd71f commit cabf06e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+5595
-1277
lines changed

‎Documentation/networking/device_drivers/wifi/intel/ipw2100.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ such, if you are interested in deploying or shipping a driver as part of
7878
solution intended to be used for purposes other than development, please
7979
obtain a tested driver from Intel Customer Support at:
8080

81-
http://www.intel.com/support/wireless/sb/CS-006408.htm
81+
https://www.intel.com/support/wireless/sb/CS-006408.htm
8282

8383
1. Introduction
8484
===============

‎drivers/bcma/driver_gpio.c

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ static irqreturn_t bcma_gpio_irq_handler(int irq, void *dev_id)
122122
static int bcma_gpio_irq_init(struct bcma_drv_cc *cc)
123123
{
124124
struct gpio_chip *chip = &cc->gpio;
125+
struct gpio_irq_chip *girq = &chip->irq;
125126
int hwirq, err;
126127

127128
if (cc->core->bus->hosttype != BCMA_HOSTTYPE_SOC)
@@ -136,15 +137,13 @@ static int bcma_gpio_irq_init(struct bcma_drv_cc *cc)
136137
bcma_chipco_gpio_intmask(cc, ~0, 0);
137138
bcma_cc_set32(cc, BCMA_CC_IRQMASK, BCMA_CC_IRQ_GPIO);
138139

139-
err = gpiochip_irqchip_add(chip,
140-
&bcma_gpio_irq_chip,
141-
0,
142-
handle_simple_irq,
143-
IRQ_TYPE_NONE);
144-
if (err) {
145-
free_irq(hwirq, cc);
146-
return err;
147-
}
140+
girq->chip = &bcma_gpio_irq_chip;
141+
/* This will let us handle the parent IRQ in the driver */
142+
girq->parent_handler = NULL;
143+
girq->num_parents = 0;
144+
girq->parents = NULL;
145+
girq->default_type = IRQ_TYPE_NONE;
146+
girq->handler = handle_simple_irq;
148147

149148
return 0;
150149
}
@@ -212,13 +211,13 @@ int bcma_gpio_init(struct bcma_drv_cc *cc)
212211
else
213212
chip->base = -1;
214213

215-
err = gpiochip_add_data(chip, cc);
214+
err = bcma_gpio_irq_init(cc);
216215
if (err)
217216
return err;
218217

219-
err = bcma_gpio_irq_init(cc);
218+
err = gpiochip_add_data(chip, cc);
220219
if (err) {
221-
gpiochip_remove(chip);
220+
bcma_gpio_irq_exit(cc);
222221
return err;
223222
}
224223

‎drivers/bcma/scan.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ static s32 bcma_erom_get_mst_port(struct bcma_bus *bus, u32 __iomem **eromptr)
219219
static u32 bcma_erom_get_addr_desc(struct bcma_bus *bus, u32 __iomem **eromptr,
220220
u32 type, u8 port)
221221
{
222-
u32 addrl, addrh, sizeh = 0;
222+
u32 addrl;
223223
u32 size;
224224

225225
u32 ent = bcma_erom_get_ent(bus, eromptr);
@@ -233,14 +233,12 @@ static u32 bcma_erom_get_addr_desc(struct bcma_bus *bus, u32 __iomem **eromptr,
233233

234234
addrl = ent & SCAN_ADDR_ADDR;
235235
if (ent & SCAN_ADDR_AG32)
236-
addrh = bcma_erom_get_ent(bus, eromptr);
237-
else
238-
addrh = 0;
236+
bcma_erom_get_ent(bus, eromptr);
239237

240238
if ((ent & SCAN_ADDR_SZ) == SCAN_ADDR_SZ_SZD) {
241239
size = bcma_erom_get_ent(bus, eromptr);
242240
if (size & SCAN_SIZE_SG32)
243-
sizeh = bcma_erom_get_ent(bus, eromptr);
241+
bcma_erom_get_ent(bus, eromptr);
244242
}
245243

246244
return addrl;

‎drivers/net/wireless/broadcom/b43/main.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -734,7 +734,7 @@ static void b43_short_slot_timing_disable(struct b43_wldev *dev)
734734
}
735735

736736
/* DummyTransmission function, as documented on
737-
* http://bcm-v4.sipsolutions.net/802.11/DummyTransmission
737+
* https://bcm-v4.sipsolutions.net/802.11/DummyTransmission
738738
*/
739739
void b43_dummy_transmission(struct b43_wldev *dev, bool ofdm, bool pa_on)
740740
{
@@ -1198,7 +1198,7 @@ void b43_power_saving_ctl_bits(struct b43_wldev *dev, unsigned int ps_flags)
11981198
}
11991199
}
12001200

1201-
/* http://bcm-v4.sipsolutions.net/802.11/PHY/BmacCorePllReset */
1201+
/* https://bcm-v4.sipsolutions.net/802.11/PHY/BmacCorePllReset */
12021202
void b43_wireless_core_phy_pll_reset(struct b43_wldev *dev)
12031203
{
12041204
struct bcma_drv_cc *bcma_cc __maybe_unused;
@@ -2290,7 +2290,7 @@ int b43_do_request_fw(struct b43_request_fw_context *ctx,
22902290
return -EPROTO;
22912291
}
22922292

2293-
/* http://bcm-v4.sipsolutions.net/802.11/Init/Firmware */
2293+
/* https://bcm-v4.sipsolutions.net/802.11/Init/Firmware */
22942294
static int b43_try_request_fw(struct b43_request_fw_context *ctx)
22952295
{
22962296
struct b43_wldev *dev = ctx->dev;
@@ -2843,7 +2843,7 @@ static int b43_upload_initvals_band(struct b43_wldev *dev)
28432843
}
28442844

28452845
/* Initialize the GPIOs
2846-
* http://bcm-specs.sipsolutions.net/GPIO
2846+
* https://bcm-specs.sipsolutions.net/GPIO
28472847
*/
28482848

28492849
#ifdef CONFIG_B43_SSB
@@ -2971,7 +2971,7 @@ void b43_mac_enable(struct b43_wldev *dev)
29712971
}
29722972
}
29732973

2974-
/* http://bcm-specs.sipsolutions.net/SuspendMAC */
2974+
/* https://bcm-specs.sipsolutions.net/SuspendMAC */
29752975
void b43_mac_suspend(struct b43_wldev *dev)
29762976
{
29772977
int i;
@@ -3004,7 +3004,7 @@ void b43_mac_suspend(struct b43_wldev *dev)
30043004
dev->mac_suspended++;
30053005
}
30063006

3007-
/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/MacPhyClkSet */
3007+
/* https://bcm-v4.sipsolutions.net/802.11/PHY/N/MacPhyClkSet */
30083008
void b43_mac_phy_clock_set(struct b43_wldev *dev, bool on)
30093009
{
30103010
u32 tmp;
@@ -3231,7 +3231,7 @@ static void b43_chip_exit(struct b43_wldev *dev)
32313231
}
32323232

32333233
/* Initialize the chip
3234-
* http://bcm-specs.sipsolutions.net/ChipInit
3234+
* https://bcm-specs.sipsolutions.net/ChipInit
32353235
*/
32363236
static int b43_chip_init(struct b43_wldev *dev)
32373237
{

‎drivers/net/wireless/broadcom/b43/phy_common.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@ bool b43_is_40mhz(struct b43_wldev *dev)
559559
return dev->phy.chandef->width == NL80211_CHAN_WIDTH_40;
560560
}
561561

562-
/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/BmacPhyClkFgc */
562+
/* https://bcm-v4.sipsolutions.net/802.11/PHY/N/BmacPhyClkFgc */
563563
void b43_phy_force_clock(struct b43_wldev *dev, bool force)
564564
{
565565
u32 tmp;

‎drivers/net/wireless/broadcom/b43/phy_g.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -357,14 +357,14 @@ static void b43_set_original_gains(struct b43_wldev *dev)
357357
b43_dummy_transmission(dev, false, true);
358358
}
359359

360-
/* http://bcm-specs.sipsolutions.net/NRSSILookupTable */
360+
/* https://bcm-specs.sipsolutions.net/NRSSILookupTable */
361361
static void b43_nrssi_hw_write(struct b43_wldev *dev, u16 offset, s16 val)
362362
{
363363
b43_phy_write(dev, B43_PHY_NRSSILT_CTRL, offset);
364364
b43_phy_write(dev, B43_PHY_NRSSILT_DATA, (u16) val);
365365
}
366366

367-
/* http://bcm-specs.sipsolutions.net/NRSSILookupTable */
367+
/* https://bcm-specs.sipsolutions.net/NRSSILookupTable */
368368
static s16 b43_nrssi_hw_read(struct b43_wldev *dev, u16 offset)
369369
{
370370
u16 val;
@@ -375,7 +375,7 @@ static s16 b43_nrssi_hw_read(struct b43_wldev *dev, u16 offset)
375375
return (s16) val;
376376
}
377377

378-
/* http://bcm-specs.sipsolutions.net/NRSSILookupTable */
378+
/* https://bcm-specs.sipsolutions.net/NRSSILookupTable */
379379
static void b43_nrssi_hw_update(struct b43_wldev *dev, u16 val)
380380
{
381381
u16 i;
@@ -389,7 +389,7 @@ static void b43_nrssi_hw_update(struct b43_wldev *dev, u16 val)
389389
}
390390
}
391391

392-
/* http://bcm-specs.sipsolutions.net/NRSSILookupTable */
392+
/* https://bcm-specs.sipsolutions.net/NRSSILookupTable */
393393
static void b43_nrssi_mem_update(struct b43_wldev *dev)
394394
{
395395
struct b43_phy_g *gphy = dev->phy.g;
@@ -1575,7 +1575,7 @@ static void b43_phy_initb5(struct b43_wldev *dev)
15751575
b43_write16(dev, 0x03E4, (b43_read16(dev, 0x03E4) & 0xFFC0) | 0x0004);
15761576
}
15771577

1578-
/* http://bcm-v4.sipsolutions.net/802.11/PHY/Init/B6 */
1578+
/* https://bcm-v4.sipsolutions.net/802.11/PHY/Init/B6 */
15791579
static void b43_phy_initb6(struct b43_wldev *dev)
15801580
{
15811581
struct b43_phy *phy = &dev->phy;
@@ -2746,7 +2746,7 @@ static int b43_gphy_op_interf_mitigation(struct b43_wldev *dev,
27462746
return 0;
27472747
}
27482748

2749-
/* http://bcm-specs.sipsolutions.net/EstimatePowerOut
2749+
/* https://bcm-specs.sipsolutions.net/EstimatePowerOut
27502750
* This function converts a TSSI value to dBm in Q5.2
27512751
*/
27522752
static s8 b43_gphy_estimate_power_out(struct b43_wldev *dev, s8 tssi)

‎drivers/net/wireless/broadcom/b43/phy_ht.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1018,7 +1018,7 @@ static void b43_phy_ht_op_free(struct b43_wldev *dev)
10181018
phy->ht = NULL;
10191019
}
10201020

1021-
/* http://bcm-v4.sipsolutions.net/802.11/Radio/Switch%20Radio */
1021+
/* https://bcm-v4.sipsolutions.net/802.11/Radio/Switch%20Radio */
10221022
static void b43_phy_ht_op_software_rfkill(struct b43_wldev *dev,
10231023
bool blocked)
10241024
{

‎drivers/net/wireless/broadcom/b43/phy_lp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ static void b43_lpphy_op_free(struct b43_wldev *dev)
7070
dev->phy.lp = NULL;
7171
}
7272

73-
/* http://bcm-v4.sipsolutions.net/802.11/PHY/LP/ReadBandSrom */
73+
/* https://bcm-v4.sipsolutions.net/802.11/PHY/LP/ReadBandSrom */
7474
static void lpphy_read_band_sprom(struct b43_wldev *dev)
7575
{
7676
struct ssb_sprom *sprom = dev->dev->bus_sprom;

0 commit comments

Comments
 (0)