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

Commit 771f951b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "wil6210: dump firmware memory when firmware crashes"

parents 167df594 fafef5de

drivers/net/wireless/ath/wil6210/Kconfig

+1 −0
Original line number Diff line number Diff line 
config WIL6210

	tristate "Wilocity 60g WiFi card wil6210 support"

	select WANT_DEV_COREDUMP

	depends on CFG80211

	depends on PCI

	default n

drivers/net/wireless/ath/wil6210/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ wil6210-y += pmc.o 
wil6210-$(CONFIG_WIL6210_TRACING) += trace.o

wil6210-y += wil_platform.o

wil6210-y += ethtool.o

wil6210-y += wil_crash_dump.o



# for tracing framework to find trace.h

CFLAGS_trace.o := -I$(src)

drivers/net/wireless/ath/wil6210/interrupt.c

+2 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2012-2014 Qualcomm Atheros, Inc.

 * Copyright (c) 2012-2015 Qualcomm Atheros, Inc.

 *

 * Permission to use, copy, modify, and/or distribute this software for any

 * purpose with or without fee is hereby granted, provided that the above
@@ -391,6 +391,7 @@ static irqreturn_t wil6210_irq_misc_thread(int irq, void *cookie) 
	wil_dbg_irq(wil, "Thread ISR MISC 0x%08x\n", isr);



	if (isr & ISR_MISC_FW_ERROR) {

		wil_fw_core_dump(wil);

		wil_notify_fw_error(wil);

		isr &= ~ISR_MISC_FW_ERROR;

		wil_fw_error_recovery(wil);

drivers/net/wireless/ath/wil6210/main.c

+4 −2
Original line number Diff line number Diff line
@@ -203,11 +203,13 @@ static void _wil6210_disconnect(struct wil6210_priv *wil, const u8 *bssid, 
	 * - disconnect single STA, already disconnected

	 * - disconnect all

	 *

	 * For "disconnect all", there are 2 options:

	 * For "disconnect all", there are 3 options:

	 * - bssid == NULL

	 * - bssid is broadcast address (ff:ff:ff:ff:ff:ff)

	 * - bssid is our MAC address

	 */

	if (bssid && memcmp(ndev->dev_addr, bssid, ETH_ALEN)) {

	if (bssid && !is_broadcast_ether_addr(bssid) &&

	    !ether_addr_equal_unaligned(ndev->dev_addr, bssid)) {

		cid = wil_find_cid(wil, bssid);

		wil_dbg_misc(wil, "Disconnect %pM, CID=%d, reason=%d\n",

			     bssid, cid, reason_code);

drivers/net/wireless/ath/wil6210/pcie_bus.c

+1 −1
Original line number Diff line number Diff line
@@ -260,6 +260,7 @@ static const struct pci_device_id wil6210_pcie_ids[] = { 
MODULE_DEVICE_TABLE(pci, wil6210_pcie_ids);



#ifdef CONFIG_PM

#ifdef CONFIG_PM_SLEEP



static int wil6210_suspend(struct device *dev, bool is_runtime)

{
@@ -307,7 +308,6 @@ static int wil6210_resume(struct device *dev, bool is_runtime) 
	return rc;

}



#ifdef CONFIG_PM_SLEEP

static int wil6210_pm_suspend(struct device *dev)

{

	return wil6210_suspend(dev, false);