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

Merge tag 'wireless-drivers-next-for-davem-2015-08-19' of... 

Merge tag 'wireless-drivers-next-for-davem-2015-08-19' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next



Kalle Valo says:

====================
Major changes:

ath10k:

* add support for qca99x0 family of devices
* improve performance of tx_lock
* add support for raw mode (802.11 frame format) and software crypto
  engine enabled via a module parameter

ath9k:

* add fast-xmit support

wil6210:

* implement TSO support
* support bootloader v1 and onwards

iwlwifi:

* Deprecate -10.ucode
* Clean ups towards multiple Rx queues
* Add support for longer CMD IDs. This will be required by new
  firmwares since we are getting close to the u8 limit.
* bugfixes for the D0i3 power state
* Add basic support for FTM
* polish the Miracast operation
* fix a few power consumption issues
* scan cleanup
* fixes for D0i3 system state
* add paging for devices that support it
* add again the new RBD allocation model
* add more options to the firmware debug system
* add support for frag SKBs in Tx
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e01286ef a6bf49db

drivers/bcma/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ config BCMA_DRIVER_GMAC_CMN 
config BCMA_DRIVER_GPIO

	bool "BCMA GPIO driver"

	depends on BCMA && GPIOLIB

	select IRQ_DOMAIN if BCMA_HOST_SOC

	select GPIOLIB_IRQCHIP if BCMA_HOST_SOC

	help

	  Driver to provide access to the GPIO pins of the bcma bus.

drivers/bcma/bcma_private.h

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ int __init bcma_bus_early_register(struct bcma_bus *bus); 
int bcma_bus_suspend(struct bcma_bus *bus);

int bcma_bus_resume(struct bcma_bus *bus);

#endif

struct device *bcma_bus_get_host_dev(struct bcma_bus *bus);



/* scan.c */

void bcma_detect_chip(struct bcma_bus *bus);

drivers/bcma/driver_gpio.c

+30 −62
Original line number Diff line number Diff line
@@ -8,10 +8,8 @@ 
 * Licensed under the GNU/GPL. See COPYING for details.

 */



#include <linux/gpio.h>

#include <linux/irq.h>

#include <linux/gpio/driver.h>

#include <linux/interrupt.h>

#include <linux/irqdomain.h>

#include <linux/export.h>

#include <linux/bcma/bcma.h>
@@ -79,19 +77,11 @@ static void bcma_gpio_free(struct gpio_chip *chip, unsigned gpio) 
}



#if IS_BUILTIN(CONFIG_BCM47XX) || IS_BUILTIN(CONFIG_ARCH_BCM_5301X)

static int bcma_gpio_to_irq(struct gpio_chip *chip, unsigned gpio)

{

	struct bcma_drv_cc *cc = bcma_gpio_get_cc(chip);



	if (cc->core->bus->hosttype == BCMA_HOSTTYPE_SOC)

		return irq_find_mapping(cc->irq_domain, gpio);

	else

		return -EINVAL;

}



static void bcma_gpio_irq_unmask(struct irq_data *d)

{

	struct bcma_drv_cc *cc = irq_data_get_irq_chip_data(d);

	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);

	struct bcma_drv_cc *cc = bcma_gpio_get_cc(gc);

	int gpio = irqd_to_hwirq(d);

	u32 val = bcma_chipco_gpio_in(cc, BIT(gpio));
@@ -101,7 +91,8 @@ static void bcma_gpio_irq_unmask(struct irq_data *d) 


static void bcma_gpio_irq_mask(struct irq_data *d)

{

	struct bcma_drv_cc *cc = irq_data_get_irq_chip_data(d);

	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);

	struct bcma_drv_cc *cc = bcma_gpio_get_cc(gc);

	int gpio = irqd_to_hwirq(d);



	bcma_chipco_gpio_intmask(cc, BIT(gpio), 0);
@@ -116,6 +107,7 @@ static struct irq_chip bcma_gpio_irq_chip = { 
static irqreturn_t bcma_gpio_irq_handler(int irq, void *dev_id)

{

	struct bcma_drv_cc *cc = dev_id;

	struct gpio_chip *gc = &cc->gpio;

	u32 val = bcma_cc_read32(cc, BCMA_CC_GPIOIN);

	u32 mask = bcma_cc_read32(cc, BCMA_CC_GPIOIRQ);

	u32 pol = bcma_cc_read32(cc, BCMA_CC_GPIOPOL);
@@ -125,81 +117,58 @@ static irqreturn_t bcma_gpio_irq_handler(int irq, void *dev_id) 
	if (!irqs)

		return IRQ_NONE;



	for_each_set_bit(gpio, &irqs, cc->gpio.ngpio)

		generic_handle_irq(bcma_gpio_to_irq(&cc->gpio, gpio));

	for_each_set_bit(gpio, &irqs, gc->ngpio)

		generic_handle_irq(irq_find_mapping(gc->irqdomain, gpio));

	bcma_chipco_gpio_polarity(cc, irqs, val & irqs);



	return IRQ_HANDLED;

}



static int bcma_gpio_irq_domain_init(struct bcma_drv_cc *cc)

static int bcma_gpio_irq_init(struct bcma_drv_cc *cc)

{

	struct gpio_chip *chip = &cc->gpio;

	int gpio, hwirq, err;

	int hwirq, err;



	if (cc->core->bus->hosttype != BCMA_HOSTTYPE_SOC)

		return 0;



	cc->irq_domain = irq_domain_add_linear(NULL, chip->ngpio,

					       &irq_domain_simple_ops, cc);

	if (!cc->irq_domain) {

		err = -ENODEV;

		goto err_irq_domain;

	}

	for (gpio = 0; gpio < chip->ngpio; gpio++) {

		int irq = irq_create_mapping(cc->irq_domain, gpio);



		irq_set_chip_data(irq, cc);

		irq_set_chip_and_handler(irq, &bcma_gpio_irq_chip,

					 handle_simple_irq);

	}



	hwirq = bcma_core_irq(cc->core, 0);

	err = request_irq(hwirq, bcma_gpio_irq_handler, IRQF_SHARED, "gpio",

			  cc);

	if (err)

		goto err_req_irq;

		return err;



	bcma_chipco_gpio_intmask(cc, ~0, 0);

	bcma_cc_set32(cc, BCMA_CC_IRQMASK, BCMA_CC_IRQ_GPIO);



	return 0;



err_req_irq:

	for (gpio = 0; gpio < chip->ngpio; gpio++) {

		int irq = irq_find_mapping(cc->irq_domain, gpio);



		irq_dispose_mapping(irq);

	}

	irq_domain_remove(cc->irq_domain);

err_irq_domain:

	err =  gpiochip_irqchip_add(chip,

				    &bcma_gpio_irq_chip,

				    0,

				    handle_simple_irq,

				    IRQ_TYPE_NONE);

	if (err) {

		free_irq(hwirq, cc);

		return err;

	}



static void bcma_gpio_irq_domain_exit(struct bcma_drv_cc *cc)

{

	struct gpio_chip *chip = &cc->gpio;

	int gpio;

	return 0;

}



static void bcma_gpio_irq_exit(struct bcma_drv_cc *cc)

{

	if (cc->core->bus->hosttype != BCMA_HOSTTYPE_SOC)

		return;



	bcma_cc_mask32(cc, BCMA_CC_IRQMASK, ~BCMA_CC_IRQ_GPIO);

	free_irq(bcma_core_irq(cc->core, 0), cc);

	for (gpio = 0; gpio < chip->ngpio; gpio++) {

		int irq = irq_find_mapping(cc->irq_domain, gpio);



		irq_dispose_mapping(irq);

	}

	irq_domain_remove(cc->irq_domain);

}

#else

static int bcma_gpio_irq_domain_init(struct bcma_drv_cc *cc)

static int bcma_gpio_irq_init(struct bcma_drv_cc *cc)

{

	return 0;

}



static void bcma_gpio_irq_domain_exit(struct bcma_drv_cc *cc)

static void bcma_gpio_irq_exit(struct bcma_drv_cc *cc)

{

}

#endif
@@ -218,9 +187,8 @@ int bcma_gpio_init(struct bcma_drv_cc *cc) 
	chip->set		= bcma_gpio_set_value;

	chip->direction_input	= bcma_gpio_direction_input;

	chip->direction_output	= bcma_gpio_direction_output;

#if IS_BUILTIN(CONFIG_BCM47XX) || IS_BUILTIN(CONFIG_ARCH_BCM_5301X)

	chip->to_irq		= bcma_gpio_to_irq;

#endif

	chip->owner		= THIS_MODULE;

	chip->dev		= bcma_bus_get_host_dev(bus);

#if IS_BUILTIN(CONFIG_OF)

	if (cc->core->bus->hosttype == BCMA_HOSTTYPE_SOC)

		chip->of_node	= cc->core->dev.of_node;
@@ -248,13 +216,13 @@ int bcma_gpio_init(struct bcma_drv_cc *cc) 
	else

		chip->base		= -1;



	err = bcma_gpio_irq_domain_init(cc);

	err = gpiochip_add(chip);

	if (err)

		return err;



	err = gpiochip_add(chip);

	err = bcma_gpio_irq_init(cc);

	if (err) {

		bcma_gpio_irq_domain_exit(cc);

		gpiochip_remove(chip);

		return err;

	}
@@ -263,7 +231,7 @@ int bcma_gpio_init(struct bcma_drv_cc *cc) 


int bcma_gpio_unregister(struct bcma_drv_cc *cc)

{

	bcma_gpio_irq_domain_exit(cc);

	bcma_gpio_irq_exit(cc);

	gpiochip_remove(&cc->gpio);

	return 0;

}

drivers/bcma/main.c

+27 −3
Original line number Diff line number Diff line
@@ -7,7 +7,9 @@ 


#include "bcma_private.h"

#include <linux/module.h>

#include <linux/mmc/sdio_func.h>

#include <linux/platform_device.h>

#include <linux/pci.h>

#include <linux/bcma/bcma.h>

#include <linux/slab.h>

#include <linux/of_address.h>
@@ -269,6 +271,28 @@ void bcma_prepare_core(struct bcma_bus *bus, struct bcma_device *core) 
	}

}



struct device *bcma_bus_get_host_dev(struct bcma_bus *bus)

{

	switch (bus->hosttype) {

	case BCMA_HOSTTYPE_PCI:

		if (bus->host_pci)

			return &bus->host_pci->dev;

		else

			return NULL;

	case BCMA_HOSTTYPE_SOC:

		if (bus->host_pdev)

			return &bus->host_pdev->dev;

		else

			return NULL;

	case BCMA_HOSTTYPE_SDIO:

		if (bus->host_sdio)

			return &bus->host_sdio->dev;

		else

			return NULL;

	}

	return NULL;

}



void bcma_init_bus(struct bcma_bus *bus)

{

	mutex_lock(&bcma_buses_mutex);
@@ -388,6 +412,7 @@ int bcma_bus_register(struct bcma_bus *bus) 
{

	int err;

	struct bcma_device *core;

	struct device *dev;



	/* Scan for devices (cores) */

	err = bcma_bus_scan(bus);
@@ -410,13 +435,12 @@ int bcma_bus_register(struct bcma_bus *bus) 
		bcma_core_pci_early_init(&bus->drv_pci[0]);

	}



	dev = bcma_bus_get_host_dev(bus);

	/* TODO: remove check for IS_BUILTIN(CONFIG_BCMA) check when

	 * of_default_bus_match_table is exported or in some other way

	 * accessible. This is just a temporary workaround.

	 */

	if (IS_BUILTIN(CONFIG_BCMA) && bus->host_pdev) {

		struct device *dev = &bus->host_pdev->dev;



	if (IS_BUILTIN(CONFIG_BCMA) && dev) {

		of_platform_populate(dev->of_node, of_default_bus_match_table,

				     NULL, dev);

	}

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

+53 −1
Original line number Diff line number Diff line
@@ -31,16 +31,19 @@ 
#include "wmi-ops.h"



unsigned int ath10k_debug_mask;

static unsigned int ath10k_cryptmode_param;

static bool uart_print;

static bool skip_otp;



module_param_named(debug_mask, ath10k_debug_mask, uint, 0644);

module_param_named(cryptmode, ath10k_cryptmode_param, uint, 0644);

module_param(uart_print, bool, 0644);

module_param(skip_otp, bool, 0644);



MODULE_PARM_DESC(debug_mask, "Debugging mask");

MODULE_PARM_DESC(uart_print, "Uart target debugging");

MODULE_PARM_DESC(skip_otp, "Skip otp failure for calibration in testmode");

MODULE_PARM_DESC(cryptmode, "Crypto mode: 0-hardware, 1-software");



static const struct ath10k_hw_params ath10k_hw_params_list[] = {

	{
@@ -1073,6 +1076,46 @@ static int ath10k_core_init_firmware_features(struct ath10k *ar) 
		return -EINVAL;

	}



	ar->wmi.rx_decap_mode = ATH10K_HW_TXRX_NATIVE_WIFI;

	switch (ath10k_cryptmode_param) {

	case ATH10K_CRYPT_MODE_HW:

		clear_bit(ATH10K_FLAG_RAW_MODE, &ar->dev_flags);

		clear_bit(ATH10K_FLAG_HW_CRYPTO_DISABLED, &ar->dev_flags);

		break;

	case ATH10K_CRYPT_MODE_SW:

		if (!test_bit(ATH10K_FW_FEATURE_RAW_MODE_SUPPORT,

			      ar->fw_features)) {

			ath10k_err(ar, "cryptmode > 0 requires raw mode support from firmware");

			return -EINVAL;

		}



		set_bit(ATH10K_FLAG_RAW_MODE, &ar->dev_flags);

		set_bit(ATH10K_FLAG_HW_CRYPTO_DISABLED, &ar->dev_flags);

		break;

	default:

		ath10k_info(ar, "invalid cryptmode: %d\n",

			    ath10k_cryptmode_param);

		return -EINVAL;

	}



	ar->htt.max_num_amsdu = ATH10K_HTT_MAX_NUM_AMSDU_DEFAULT;

	ar->htt.max_num_ampdu = ATH10K_HTT_MAX_NUM_AMPDU_DEFAULT;



	if (test_bit(ATH10K_FLAG_RAW_MODE, &ar->dev_flags)) {

		ar->wmi.rx_decap_mode = ATH10K_HW_TXRX_RAW;



		/* Workaround:

		 *

		 * Firmware A-MSDU aggregation breaks with RAW Tx encap mode

		 * and causes enormous performance issues (malformed frames,

		 * etc).

		 *

		 * Disabling A-MSDU makes RAW mode stable with heavy traffic

		 * albeit a bit slower compared to regular operation.

		 */

		ar->htt.max_num_amsdu = 1;

	}



	/* Backwards compatibility for firmwares without

	 * ATH10K_FW_IE_WMI_OP_VERSION.

	 */
@@ -1606,6 +1649,10 @@ struct ath10k *ath10k_core_create(size_t priv_size, struct device *dev, 
	if (!ar->workqueue)

		goto err_free_mac;



	ar->workqueue_aux = create_singlethread_workqueue("ath10k_aux_wq");

	if (!ar->workqueue_aux)

		goto err_free_wq;



	mutex_init(&ar->conf_mutex);

	spin_lock_init(&ar->data_lock);
@@ -1626,10 +1673,12 @@ struct ath10k *ath10k_core_create(size_t priv_size, struct device *dev, 


	ret = ath10k_debug_create(ar);

	if (ret)

		goto err_free_wq;

		goto err_free_aux_wq;



	return ar;



err_free_aux_wq:

	destroy_workqueue(ar->workqueue_aux);

err_free_wq:

	destroy_workqueue(ar->workqueue);
@@ -1645,6 +1694,9 @@ void ath10k_core_destroy(struct ath10k *ar) 
	flush_workqueue(ar->workqueue);

	destroy_workqueue(ar->workqueue);



	flush_workqueue(ar->workqueue_aux);

	destroy_workqueue(ar->workqueue_aux);



	ath10k_debug_destroy(ar);

	ath10k_mac_destroy(ar);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE