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

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

Merge tag 'wireless-drivers-next-for-davem-2018-08-12' of... 

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



Kalle Valo says:

====================
pull-request: wireless-drivers-next 2018-08-12

wireless-drivers-next patches for 4.19

Last set of new features for 4.19. Most notable is simplifying SSB
debugging code with two Kconfig option removals and fixing mt76 USB
build problems.

Major changes:

ath10k

* add debugfs file warm_hw_reset

wil6210

* add debugfs files tx_latency, link_stats and link_stats_global

* add 3-MSI support

* allow scan on AP interface

* support max aggregation window size 64

ssb

* remove CONFIG_SSB_SILENT and CONFIG_SSB_DEBUG Kconfig options

mt76

* fix build problems with recently added USB support
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 45c91fb2 209b4375

arch/mips/configs/bcm47xx_defconfig

+0 −1
Original line number Original line Diff line number Diff line
@@ -66,7 +66,6 @@ CONFIG_HW_RANDOM=y 
CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_SYSFS=y

CONFIG_WATCHDOG=y

CONFIG_WATCHDOG=y

CONFIG_BCM47XX_WDT=y

CONFIG_BCM47XX_WDT=y

CONFIG_SSB_DEBUG=y

CONFIG_SSB_DRIVER_GIGE=y

CONFIG_SSB_DRIVER_GIGE=y

CONFIG_BCMA_DRIVER_GMAC_CMN=y

CONFIG_BCMA_DRIVER_GMAC_CMN=y

CONFIG_USB=y

CONFIG_USB=y

arch/powerpc/configs/wii_defconfig

+0 −1
Original line number Original line Diff line number Diff line
@@ -78,7 +78,6 @@ CONFIG_GPIO_HLWD=y 
CONFIG_POWER_RESET=y

CONFIG_POWER_RESET=y

CONFIG_POWER_RESET_GPIO=y

CONFIG_POWER_RESET_GPIO=y

# CONFIG_HWMON is not set

# CONFIG_HWMON is not set

CONFIG_SSB_DEBUG=y

CONFIG_FB=y

CONFIG_FB=y

# CONFIG_VGA_CONSOLE is not set

# CONFIG_VGA_CONSOLE is not set

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE=y

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

+0 −5
Original line number Original line Diff line number Diff line
@@ -133,11 +133,8 @@ static void ath10k_ahb_clock_deinit(struct ath10k *ar) 
static int ath10k_ahb_clock_enable(struct ath10k *ar)

static int ath10k_ahb_clock_enable(struct ath10k *ar)

{

{

	struct ath10k_ahb *ar_ahb = ath10k_ahb_priv(ar);

	struct ath10k_ahb *ar_ahb = ath10k_ahb_priv(ar);

	struct device *dev;

	int ret;

	int ret;





	dev = &ar_ahb->pdev->dev;



	if (IS_ERR_OR_NULL(ar_ahb->cmd_clk) ||

	if (IS_ERR_OR_NULL(ar_ahb->cmd_clk) ||

	    IS_ERR_OR_NULL(ar_ahb->ref_clk) ||

	    IS_ERR_OR_NULL(ar_ahb->ref_clk) ||

	    IS_ERR_OR_NULL(ar_ahb->rtc_clk)) {

	    IS_ERR_OR_NULL(ar_ahb->rtc_clk)) {
@@ -451,12 +448,10 @@ static int ath10k_ahb_resource_init(struct ath10k *ar) 
{

{

	struct ath10k_ahb *ar_ahb = ath10k_ahb_priv(ar);

	struct ath10k_ahb *ar_ahb = ath10k_ahb_priv(ar);

	struct platform_device *pdev;

	struct platform_device *pdev;

	struct device *dev;

	struct resource *res;

	struct resource *res;

	int ret;

	int ret;





	pdev = ar_ahb->pdev;

	pdev = ar_ahb->pdev;

	dev = &pdev->dev;





	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res) {

	if (!res) {

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -2095,6 +2095,7 @@ static int ath10k_core_init_firmware_features(struct ath10k *ar) 
		ar->fw_stats_req_mask = WMI_STAT_PDEV | WMI_STAT_VDEV |

		ar->fw_stats_req_mask = WMI_STAT_PDEV | WMI_STAT_VDEV |

			WMI_STAT_PEER;

			WMI_STAT_PEER;

		ar->max_spatial_stream = WMI_MAX_SPATIAL_STREAM;

		ar->max_spatial_stream = WMI_MAX_SPATIAL_STREAM;

		ar->wmi.mgmt_max_num_pending_tx = TARGET_TLV_MGMT_NUM_MSDU_DESC;

		break;

		break;

	case ATH10K_FW_WMI_OP_VERSION_10_4:

	case ATH10K_FW_WMI_OP_VERSION_10_4:

		ar->max_num_peers = TARGET_10_4_NUM_PEERS;

		ar->max_num_peers = TARGET_10_4_NUM_PEERS;

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

+5 −0
Original line number Original line Diff line number Diff line
@@ -186,6 +186,11 @@ struct ath10k_wmi { 
	const struct wmi_ops *ops;

	const struct wmi_ops *ops;

	const struct wmi_peer_flags_map *peer_flags;

	const struct wmi_peer_flags_map *peer_flags;





	u32 mgmt_max_num_pending_tx;



	/* Protected by data_lock */

	struct idr mgmt_pending_tx;



	u32 num_mem_chunks;

	u32 num_mem_chunks;

	u32 rx_decap_mode;

	u32 rx_decap_mode;

	struct ath10k_mem_chunk mem_chunks[WMI_MAX_MEM_REQS];

	struct ath10k_mem_chunk mem_chunks[WMI_MAX_MEM_REQS];