Skip to content

Commit

Permalink
Merge tag 'wireless-drivers-next-2020-08-04' of git://git.kernel.org/…
Browse files Browse the repository at this point in the history 
…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]>
  • Loading branch information
@davem330
davem330 committed Aug 4, 2020
2 parents 93f4ddd + 2cfd71f commit cabf06e
Show file tree
Hide file tree
Showing 124 changed files with 5,595 additions and 1,277 deletions.
2 changes: 1 addition & 1 deletion Documentation/networking/device_drivers/wifi/intel/ipw2100.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ such, if you are interested in deploying or shipping a driver as part of
solution intended to be used for purposes other than development, please
obtain a tested driver from Intel Customer Support at:

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

1. Introduction
===============
Expand Down
23 changes: 11 additions & 12 deletions drivers/bcma/driver_gpio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ static irqreturn_t bcma_gpio_irq_handler(int irq, void *dev_id)
static int bcma_gpio_irq_init(struct bcma_drv_cc *cc)
{
struct gpio_chip *chip = &cc->gpio;
struct gpio_irq_chip *girq = &chip->irq;
int hwirq, err;

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

err = gpiochip_irqchip_add(chip,
&bcma_gpio_irq_chip,
0,
handle_simple_irq,
IRQ_TYPE_NONE);
if (err) {
free_irq(hwirq, cc);
return err;
}
girq->chip = &bcma_gpio_irq_chip;
/* This will let us handle the parent IRQ in the driver */
girq->parent_handler = NULL;
girq->num_parents = 0;
girq->parents = NULL;
girq->default_type = IRQ_TYPE_NONE;
girq->handler = handle_simple_irq;

return 0;
}
Expand Down Expand Up @@ -212,13 +211,13 @@ int bcma_gpio_init(struct bcma_drv_cc *cc)
else
chip->base = -1;

err = gpiochip_add_data(chip, cc);
err = bcma_gpio_irq_init(cc);
if (err)
return err;

err = bcma_gpio_irq_init(cc);
err = gpiochip_add_data(chip, cc);
if (err) {
gpiochip_remove(chip);
bcma_gpio_irq_exit(cc);
return err;
}

Expand Down
8 changes: 3 additions & 5 deletions drivers/bcma/scan.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ static s32 bcma_erom_get_mst_port(struct bcma_bus *bus, u32 __iomem **eromptr)
static u32 bcma_erom_get_addr_desc(struct bcma_bus *bus, u32 __iomem **eromptr,
u32 type, u8 port)
{
u32 addrl, addrh, sizeh = 0;
u32 addrl;
u32 size;

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

addrl = ent & SCAN_ADDR_ADDR;
if (ent & SCAN_ADDR_AG32)
addrh = bcma_erom_get_ent(bus, eromptr);
else
addrh = 0;
bcma_erom_get_ent(bus, eromptr);

if ((ent & SCAN_ADDR_SZ) == SCAN_ADDR_SZ_SZD) {
size = bcma_erom_get_ent(bus, eromptr);
if (size & SCAN_SIZE_SG32)
sizeh = bcma_erom_get_ent(bus, eromptr);
bcma_erom_get_ent(bus, eromptr);
}

return addrl;
Expand Down
14 changes: 7 additions & 7 deletions drivers/net/wireless/broadcom/b43/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -734,7 +734,7 @@ static void b43_short_slot_timing_disable(struct b43_wldev *dev)
}

/* DummyTransmission function, as documented on
* http://bcm-v4.sipsolutions.net/802.11/DummyTransmission
* https://bcm-v4.sipsolutions.net/802.11/DummyTransmission
*/
void b43_dummy_transmission(struct b43_wldev *dev, bool ofdm, bool pa_on)
{
Expand Down Expand Up @@ -1198,7 +1198,7 @@ void b43_power_saving_ctl_bits(struct b43_wldev *dev, unsigned int ps_flags)
}
}

/* http://bcm-v4.sipsolutions.net/802.11/PHY/BmacCorePllReset */
/* https://bcm-v4.sipsolutions.net/802.11/PHY/BmacCorePllReset */
void b43_wireless_core_phy_pll_reset(struct b43_wldev *dev)
{
struct bcma_drv_cc *bcma_cc __maybe_unused;
Expand Down Expand Up @@ -2290,7 +2290,7 @@ int b43_do_request_fw(struct b43_request_fw_context *ctx,
return -EPROTO;
}

/* http://bcm-v4.sipsolutions.net/802.11/Init/Firmware */
/* https://bcm-v4.sipsolutions.net/802.11/Init/Firmware */
static int b43_try_request_fw(struct b43_request_fw_context *ctx)
{
struct b43_wldev *dev = ctx->dev;
Expand Down Expand Up @@ -2843,7 +2843,7 @@ static int b43_upload_initvals_band(struct b43_wldev *dev)
}

/* Initialize the GPIOs
* http://bcm-specs.sipsolutions.net/GPIO
* https://bcm-specs.sipsolutions.net/GPIO
*/

#ifdef CONFIG_B43_SSB
Expand Down Expand Up @@ -2971,7 +2971,7 @@ void b43_mac_enable(struct b43_wldev *dev)
}
}

/* http://bcm-specs.sipsolutions.net/SuspendMAC */
/* https://bcm-specs.sipsolutions.net/SuspendMAC */
void b43_mac_suspend(struct b43_wldev *dev)
{
int i;
Expand Down Expand Up @@ -3004,7 +3004,7 @@ void b43_mac_suspend(struct b43_wldev *dev)
dev->mac_suspended++;
}

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

/* Initialize the chip
* http://bcm-specs.sipsolutions.net/ChipInit
* https://bcm-specs.sipsolutions.net/ChipInit
*/
static int b43_chip_init(struct b43_wldev *dev)
{
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/wireless/broadcom/b43/phy_common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ bool b43_is_40mhz(struct b43_wldev *dev)
return dev->phy.chandef->width == NL80211_CHAN_WIDTH_40;
}

/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/BmacPhyClkFgc */
/* https://bcm-v4.sipsolutions.net/802.11/PHY/N/BmacPhyClkFgc */
void b43_phy_force_clock(struct b43_wldev *dev, bool force)
{
u32 tmp;
Expand Down
12 changes: 6 additions & 6 deletions drivers/net/wireless/broadcom/b43/phy_g.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -357,14 +357,14 @@ static void b43_set_original_gains(struct b43_wldev *dev)
b43_dummy_transmission(dev, false, true);
}

/* http://bcm-specs.sipsolutions.net/NRSSILookupTable */
/* https://bcm-specs.sipsolutions.net/NRSSILookupTable */
static void b43_nrssi_hw_write(struct b43_wldev *dev, u16 offset, s16 val)
{
b43_phy_write(dev, B43_PHY_NRSSILT_CTRL, offset);
b43_phy_write(dev, B43_PHY_NRSSILT_DATA, (u16) val);
}

/* http://bcm-specs.sipsolutions.net/NRSSILookupTable */
/* https://bcm-specs.sipsolutions.net/NRSSILookupTable */
static s16 b43_nrssi_hw_read(struct b43_wldev *dev, u16 offset)
{
u16 val;
Expand All @@ -375,7 +375,7 @@ static s16 b43_nrssi_hw_read(struct b43_wldev *dev, u16 offset)
return (s16) val;
}

/* http://bcm-specs.sipsolutions.net/NRSSILookupTable */
/* https://bcm-specs.sipsolutions.net/NRSSILookupTable */
static void b43_nrssi_hw_update(struct b43_wldev *dev, u16 val)
{
u16 i;
Expand All @@ -389,7 +389,7 @@ static void b43_nrssi_hw_update(struct b43_wldev *dev, u16 val)
}
}

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

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

/* http://bcm-specs.sipsolutions.net/EstimatePowerOut
/* https://bcm-specs.sipsolutions.net/EstimatePowerOut
* This function converts a TSSI value to dBm in Q5.2
*/
static s8 b43_gphy_estimate_power_out(struct b43_wldev *dev, s8 tssi)
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/wireless/broadcom/b43/phy_ht.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1018,7 +1018,7 @@ static void b43_phy_ht_op_free(struct b43_wldev *dev)
phy->ht = NULL;
}

/* http://bcm-v4.sipsolutions.net/802.11/Radio/Switch%20Radio */
/* https://bcm-v4.sipsolutions.net/802.11/Radio/Switch%20Radio */
static void b43_phy_ht_op_software_rfkill(struct b43_wldev *dev,
bool blocked)
{
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/wireless/broadcom/b43/phy_lp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ static void b43_lpphy_op_free(struct b43_wldev *dev)
dev->phy.lp = NULL;
}

/* http://bcm-v4.sipsolutions.net/802.11/PHY/LP/ReadBandSrom */
/* https://bcm-v4.sipsolutions.net/802.11/PHY/LP/ReadBandSrom */
static void lpphy_read_band_sprom(struct b43_wldev *dev)
{
struct ssb_sprom *sprom = dev->dev->bus_sprom;
Expand Down
Loading

0 comments on commit cabf06e

Please sign in to comment.