Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge tag 'wireless-drivers-next-for-davem-2016-09-15' of... 

Merge tag 'wireless-drivers-next-for-davem-2016-09-15' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next



Kalle Valo says:

====================
wireless-drivers-next patches for 4.9

Major changes:

iwlwifi

* preparation for new a000 HW continues
* some DQA improvements
* add support for GMAC
* add support for 9460, 9270 and 9170 series

mwifiex

* support random MAC address for scanning
* add HT aggregation support for adhoc mode
* add custom regulatory domain support
* add manufacturing mode support via nl80211 testmode interface

bcma

* support BCM53573 series of wireless SoCs

bitfield.h

* add FIELD_PREP() and FIELD_GET() macros

mt7601u

* convert to use the new bitfield.h macros

brcmfmac

* add support for bcm4339 chip with modalias sdio:c00v02D0d4339

ath10k

* add nl80211 testmode support for 10.4 firmware
* hide kernel addresses from logs using %pK format specifier
* implement NAPI support
* enable peer stats by default

ath9k

* use ieee80211_tx_status_noskb where possible

wil6210

* extract firmware capabilities from the firmware file

ath6kl

* enable firmware crash dumps on the AR6004

ath-current is also merged to fix a conflict in ath10k.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 31b96621 b7450e24

drivers/bcma/driver_chipcommon.c

+29 −3
Original line number Diff line number Diff line
@@ -36,12 +36,31 @@ u32 bcma_chipco_get_alp_clock(struct bcma_drv_cc *cc) 
}

EXPORT_SYMBOL_GPL(bcma_chipco_get_alp_clock);



static bool bcma_core_cc_has_pmu_watchdog(struct bcma_drv_cc *cc)

{

	struct bcma_bus *bus = cc->core->bus;



	if (cc->capabilities & BCMA_CC_CAP_PMU) {

		if (bus->chipinfo.id == BCMA_CHIP_ID_BCM53573) {

			WARN(bus->chipinfo.rev <= 1, "No watchdog available\n");

			/* 53573B0 and 53573B1 have bugged PMU watchdog. It can

			 * be enabled but timer can't be bumped. Use CC one

			 * instead.

			 */

			return false;

		}

		return true;

	} else {

		return false;

	}

}



static u32 bcma_chipco_watchdog_get_max_timer(struct bcma_drv_cc *cc)

{

	struct bcma_bus *bus = cc->core->bus;

	u32 nb;



	if (cc->capabilities & BCMA_CC_CAP_PMU) {

	if (bcma_core_cc_has_pmu_watchdog(cc)) {

		if (bus->chipinfo.id == BCMA_CHIP_ID_BCM4706)

			nb = 32;

		else if (cc->core->id.rev < 26)
@@ -95,9 +114,16 @@ static int bcma_chipco_watchdog_ticks_per_ms(struct bcma_drv_cc *cc) 


int bcma_chipco_watchdog_register(struct bcma_drv_cc *cc)

{

	struct bcma_bus *bus = cc->core->bus;

	struct bcm47xx_wdt wdt = {};

	struct platform_device *pdev;



	if (bus->chipinfo.id == BCMA_CHIP_ID_BCM53573 &&

	    bus->chipinfo.rev <= 1) {

		pr_debug("No watchdog on 53573A0 / 53573A1\n");

		return 0;

	}



	wdt.driver_data = cc;

	wdt.timer_set = bcma_chipco_watchdog_timer_set_wdt;

	wdt.timer_set_ms = bcma_chipco_watchdog_timer_set_ms_wdt;
@@ -105,7 +131,7 @@ int bcma_chipco_watchdog_register(struct bcma_drv_cc *cc) 
		bcma_chipco_watchdog_get_max_timer(cc) / cc->ticks_per_ms;



	pdev = platform_device_register_data(NULL, "bcm47xx-wdt",

					     cc->core->bus->num, &wdt,

					     bus->num, &wdt,

					     sizeof(wdt));

	if (IS_ERR(pdev))

		return PTR_ERR(pdev);
@@ -217,7 +243,7 @@ u32 bcma_chipco_watchdog_timer_set(struct bcma_drv_cc *cc, u32 ticks) 
	u32 maxt;



	maxt = bcma_chipco_watchdog_get_max_timer(cc);

	if (cc->capabilities & BCMA_CC_CAP_PMU) {

	if (bcma_core_cc_has_pmu_watchdog(cc)) {

		if (ticks == 1)

			ticks = 2;

		else if (ticks > maxt)

drivers/bcma/main.c

+4 −2
Original line number Diff line number Diff line
@@ -209,6 +209,8 @@ static void bcma_of_fill_device(struct platform_device *parent, 
		core->dev.of_node = node;



	core->irq = bcma_of_get_irq(parent, core, 0);



	of_dma_configure(&core->dev, node);

}



unsigned int bcma_core_irq(struct bcma_device *core, int num)
@@ -248,12 +250,12 @@ void bcma_prepare_core(struct bcma_bus *bus, struct bcma_device *core) 
		core->irq = bus->host_pci->irq;

		break;

	case BCMA_HOSTTYPE_SOC:

		core->dev.dma_mask = &core->dev.coherent_dma_mask;

		if (bus->host_pdev) {

		if (IS_ENABLED(CONFIG_OF) && bus->host_pdev) {

			core->dma_dev = &bus->host_pdev->dev;

			core->dev.parent = &bus->host_pdev->dev;

			bcma_of_fill_device(bus->host_pdev, core);

		} else {

			core->dev.dma_mask = &core->dev.coherent_dma_mask;

			core->dma_dev = &core->dev;

		}

		break;

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

+8 −4
Original line number Diff line number Diff line
@@ -462,13 +462,13 @@ static void ath10k_ahb_halt_chip(struct ath10k *ar) 
static irqreturn_t ath10k_ahb_interrupt_handler(int irq, void *arg)

{

	struct ath10k *ar = arg;

	struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);



	if (!ath10k_pci_irq_pending(ar))

		return IRQ_NONE;



	ath10k_pci_disable_and_clear_legacy_irq(ar);

	tasklet_schedule(&ar_pci->intr_tq);

	ath10k_pci_irq_msi_fw_mask(ar);

	napi_schedule(&ar->napi);



	return IRQ_HANDLED;

}
@@ -577,7 +577,7 @@ static int ath10k_ahb_resource_init(struct ath10k *ar) 


	ath10k_dbg(ar, ATH10K_DBG_BOOT, "irq: %d\n", ar_ahb->irq);



	ath10k_dbg(ar, ATH10K_DBG_BOOT, "mem: 0x%p mem_len: %lu gcc mem: 0x%p tcsr_mem: 0x%p\n",

	ath10k_dbg(ar, ATH10K_DBG_BOOT, "mem: 0x%pK mem_len: %lu gcc mem: 0x%pK tcsr_mem: 0x%pK\n",

		   ar_ahb->mem, ar_ahb->mem_len,

		   ar_ahb->gcc_mem, ar_ahb->tcsr_mem);

	return 0;
@@ -717,6 +717,9 @@ static void ath10k_ahb_hif_stop(struct ath10k *ar) 
	synchronize_irq(ar_ahb->irq);



	ath10k_pci_flush(ar);



	napi_synchronize(&ar->napi);

	napi_disable(&ar->napi);

}



static int ath10k_ahb_hif_power_up(struct ath10k *ar)
@@ -748,6 +751,7 @@ static int ath10k_ahb_hif_power_up(struct ath10k *ar) 
		ath10k_err(ar, "could not wake up target CPU: %d\n", ret);

		goto err_ce_deinit;

	}

	napi_enable(&ar->napi);



	return 0;
@@ -831,7 +835,7 @@ static int ath10k_ahb_probe(struct platform_device *pdev) 
		goto err_resource_deinit;

	}



	ath10k_pci_init_irq_tasklets(ar);

	ath10k_pci_init_napi(ar);



	ret = ath10k_ahb_request_irq_legacy(ar);

	if (ret)

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

+2 −2
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ int ath10k_bmi_lz_data(struct ath10k *ar, const void *buffer, u32 length) 
	u32 txlen;

	int ret;



	ath10k_dbg(ar, ATH10K_DBG_BMI, "bmi lz data buffer 0x%p length %d\n",

	ath10k_dbg(ar, ATH10K_DBG_BMI, "bmi lz data buffer 0x%pK length %d\n",

		   buffer, length);



	if (ar->bmi.done_sent) {
@@ -287,7 +287,7 @@ int ath10k_bmi_fast_download(struct ath10k *ar, 
	int ret;



	ath10k_dbg(ar, ATH10K_DBG_BMI,

		   "bmi fast download address 0x%x buffer 0x%p length %d\n",

		   "bmi fast download address 0x%x buffer 0x%pK length %d\n",

		   address, buffer, length);



	ret = ath10k_bmi_lz_stream_start(ar, address);

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

+2 −2
Original line number Diff line number Diff line
@@ -840,7 +840,7 @@ static int ath10k_ce_init_src_ring(struct ath10k *ar, 
	ath10k_ce_src_ring_highmark_set(ar, ctrl_addr, nentries);



	ath10k_dbg(ar, ATH10K_DBG_BOOT,

		   "boot init ce src ring id %d entries %d base_addr %p\n",

		   "boot init ce src ring id %d entries %d base_addr %pK\n",

		   ce_id, nentries, src_ring->base_addr_owner_space);



	return 0;
@@ -874,7 +874,7 @@ static int ath10k_ce_init_dest_ring(struct ath10k *ar, 
	ath10k_ce_dest_ring_highmark_set(ar, ctrl_addr, nentries);



	ath10k_dbg(ar, ATH10K_DBG_BOOT,

		   "boot ce dest ring id %d entries %d base_addr %p\n",

		   "boot ce dest ring id %d entries %d base_addr %pK\n",

		   ce_id, nentries, dest_ring->base_addr_owner_space);



	return 0;