Commit a3ead21d authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'wireless-drivers-next-2019-11-05' of... 

Merge tag 'wireless-drivers-next-2019-11-05' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next

Kalle Valo says:

====================
wireless-drivers-next patches for 5.5

First set of patches for 5.5. The most active driver here clearly is
rtw88, lots of patches for it. More quiet on other drivers, smaller
fixes and cleanups all over.

This pull request also has a trivial conflict, the report and example
resolution here:

https://lkml.kernel.org/r/20191031111242.50ab1eca@canb.auug.org.au



Major changes:

rtw88

* add deep power save support

* add mac80211 software tx queue (wake_tx_queue) support

* enable hardware rate control

* add TX-AMSDU support

* add NL80211_EXT_FEATURE_CAN_REPLACE_PTK0 support

* add power tracking support

* add 802.11ac beamformee support

* add set_bitrate_mask support

* add phy_info debugfs to show Tx/Rx physical status

* add RFE type 3 support for 8822b

ath10k

* add support for hardware rfkill on devices where firmware supports it

rtl8xxxu

* add bluetooth co-existence support for single antenna

iwlwifi

* Revamp the debugging infrastructure
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d673f563 086ddf86

Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt

+6 −0
Original line number Diff line number Diff line
@@ -81,6 +81,12 @@ Optional properties: 
	Definition: Name of external front end module used. Some valid FEM names

		    for example: "microsemi-lx5586", "sky85703-11"

		    and "sky85803" etc.

- qcom,snoc-host-cap-8bit-quirk:

	Usage: Optional

	Value type: <empty>

	Definition: Quirk specifying that the firmware expects the 8bit version

		    of the host capability QMI request

- qcom,xo-cal-data: xo cal offset to be configured in xo trim register.



Example (to supply PCI based wifi block details):

drivers/bcma/driver_chipcommon_pmu.c

+16 −8
Original line number Diff line number Diff line
@@ -233,8 +233,10 @@ static void bcma_pmu_workarounds(struct bcma_drv_cc *cc) 


	switch (bus->chipinfo.id) {

	case BCMA_CHIP_ID_BCM4313:

		/* enable 12 mA drive strenth for 4313 and set chipControl

		   register bit 1 */

		/*

		 * enable 12 mA drive strenth for 4313 and set chipControl

		 * register bit 1

		 */

		bcma_chipco_chipctl_maskset(cc, 0,

					    ~BCMA_CCTRL_4313_12MA_LED_DRIVE,

					    BCMA_CCTRL_4313_12MA_LED_DRIVE);
@@ -246,8 +248,10 @@ static void bcma_pmu_workarounds(struct bcma_drv_cc *cc) 
		break;

	case BCMA_CHIP_ID_BCM43224:

	case BCMA_CHIP_ID_BCM43421:

		/* enable 12 mA drive strenth for 43224 and set chipControl

		   register bit 15 */

		/*

		 * enable 12 mA drive strenth for 43224 and set chipControl

		 * register bit 15

		 */

		if (bus->chipinfo.rev == 0) {

			bcma_cc_maskset32(cc, BCMA_CC_CHIPCTL,

					  ~BCMA_CCTRL_43224_GPIO_TOGGLE,
@@ -500,8 +504,10 @@ void bcma_pmu_spuravoid_pllupdate(struct bcma_drv_cc *cc, int spuravoid) 
	case BCMA_CHIP_ID_BCM53572:

		/* 5357[ab]0, 43236[ab]0, and 6362b0 */



		/* BCM5357 needs to touch PLL1_PLLCTL[02],

		   so offset PLL0_PLLCTL[02] by 6 */

		/*

		 * BCM5357 needs to touch PLL1_PLLCTL[02],

		 * so offset PLL0_PLLCTL[02] by 6

		 */

		phypll_offset = (bus->chipinfo.id == BCMA_CHIP_ID_BCM5357 ||

		       bus->chipinfo.id == BCMA_CHIP_ID_BCM4749 ||

		       bus->chipinfo.id == BCMA_CHIP_ID_BCM53572) ? 6 : 0;
@@ -619,8 +625,10 @@ void bcma_pmu_spuravoid_pllupdate(struct bcma_drv_cc *cc, int spuravoid) 
	case BCMA_CHIP_ID_BCM43228:

	case BCMA_CHIP_ID_BCM43428:

		/* LCNXN */

		/* PLL Settings for spur avoidance on/off mode,

		   no on2 support for 43228A0 */

		/*

		 * PLL Settings for spur avoidance on/off mode,

		 * no on2 support for 43228A0

		 */

		if (spuravoid == 1) {

			bcma_pmu_spuravoid_pll_write(cc, BCMA_CC_PMU_PLL_CTL0,

						     0x01100014);

drivers/net/wireless/admtek/adm8211.c

+2 −4
Original line number Diff line number Diff line
@@ -1781,8 +1781,8 @@ static int adm8211_probe(struct pci_dev *pdev, 
{

	struct ieee80211_hw *dev;

	struct adm8211_priv *priv;

	unsigned long mem_addr, mem_len;

	unsigned int io_addr, io_len;

	unsigned long mem_len;

	unsigned int io_len;

	int err;

	u32 reg;

	u8 perm_addr[ETH_ALEN];
@@ -1794,9 +1794,7 @@ static int adm8211_probe(struct pci_dev *pdev, 
		return err;

	}



	io_addr = pci_resource_start(pdev, 0);

	io_len = pci_resource_len(pdev, 0);

	mem_addr = pci_resource_start(pdev, 1);

	mem_len = pci_resource_len(pdev, 1);

	if (io_len < 256 || mem_len < 1024) {

		printk(KERN_ERR "%s (adm8211): Too short PCI resources\n",

drivers/net/wireless/ath/ar5523/ar5523.c

+2 −1
Original line number Diff line number Diff line
@@ -255,6 +255,7 @@ static int ar5523_cmd(struct ar5523 *ar, u32 code, const void *idata, 


	if (flags & AR5523_CMD_FLAG_MAGIC)

		hdr->magic = cpu_to_be32(1 << 24);

	if (ilen)

		memcpy(hdr + 1, idata, ilen);



	cmd->odata = odata;

drivers/net/wireless/ath/ath10k/ce.c

+0 −5
Original line number Diff line number Diff line
@@ -1704,9 +1704,6 @@ ath10k_ce_alloc_dest_ring_64(struct ath10k *ar, unsigned int ce_id, 
	/* Correctly initialize memory to 0 to prevent garbage

	 * data crashing system when download firmware

	 */

	memset(dest_ring->base_addr_owner_space_unaligned, 0,

	       nentries * sizeof(struct ce_desc_64) + CE_DESC_RING_ALIGN);



	dest_ring->base_addr_owner_space =

			PTR_ALIGN(dest_ring->base_addr_owner_space_unaligned,

				  CE_DESC_RING_ALIGN);
@@ -2019,8 +2016,6 @@ void ath10k_ce_alloc_rri(struct ath10k *ar) 
		value |= ar->hw_ce_regs->upd->mask;

		ath10k_ce_write32(ar, ce_base_addr + ctrl1_regs, value);

	}



	memset(ce->vaddr_rri, 0, CE_COUNT * sizeof(u32));

}

EXPORT_SYMBOL(ath10k_ce_alloc_rri);

CRA Git | Maintained and supported by SUSTech CRA and CCSE