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

Commit 759c5b59 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by Kalle Valo
Browse files

rt2800: initial watchdog implementation 



Add watchdog for rt2800 devices. For now it only detect hung
and print error.

[Note: I verified that printing messages from process context is
fine on MT7620 (WT3020) platform that have problem when printk
is called from interrupt context].

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 2034afe4

drivers/net/wireless/ralink/rt2x00/rt2800lib.c

+56 −0
Original line number Diff line number Diff line
@@ -1212,6 +1212,60 @@ void rt2800_txdone_nostatus(struct rt2x00_dev *rt2x00dev) 
}

EXPORT_SYMBOL_GPL(rt2800_txdone_nostatus);



static int rt2800_check_hung(struct data_queue *queue)

{

	unsigned int cur_idx = rt2800_drv_get_dma_done(queue);



	if (queue->wd_idx != cur_idx)

		queue->wd_count = 0;

	else

		queue->wd_count++;



	return queue->wd_count > 16;

}



void rt2800_watchdog(struct rt2x00_dev *rt2x00dev)

{

	struct data_queue *queue;

	bool hung_tx = false;

	bool hung_rx = false;



	if (test_bit(DEVICE_STATE_SCANNING, &rt2x00dev->flags))

		return;



	queue_for_each(rt2x00dev, queue) {

		switch (queue->qid) {

		case QID_AC_VO:

		case QID_AC_VI:

		case QID_AC_BE:

		case QID_AC_BK:

		case QID_MGMT:

			if (rt2x00queue_empty(queue))

				continue;

			hung_tx = rt2800_check_hung(queue);

			break;

		case QID_RX:

			/* For station mode we should reactive at least

			 * beacons. TODO: need to find good way detect

			 * RX hung for AP mode.

			 */

			if (rt2x00dev->intf_sta_count == 0)

				continue;

			hung_rx = rt2800_check_hung(queue);

			break;

		default:

			break;

		}

	}



	if (hung_tx)

		rt2x00_warn(rt2x00dev, "Watchdog TX hung detected\n");



	if (hung_rx)

		rt2x00_warn(rt2x00dev, "Watchdog RX hung detected\n");

}

EXPORT_SYMBOL_GPL(rt2800_watchdog);



static unsigned int rt2800_hw_beacon_base(struct rt2x00_dev *rt2x00dev,

					  unsigned int index)

{
@@ -10211,6 +10265,8 @@ int rt2800_probe_hw(struct rt2x00_dev *rt2x00dev) 
		__set_bit(REQUIRE_TASKLET_CONTEXT, &rt2x00dev->cap_flags);

	}



	rt2x00dev->link.watchdog_interval = msecs_to_jiffies(100);



	/*

	 * Set the rssi offset.

	 */

drivers/net/wireless/ralink/rt2x00/rt2800lib.h

+2 −0
Original line number Diff line number Diff line
@@ -197,6 +197,8 @@ void rt2800_txdone_nostatus(struct rt2x00_dev *rt2x00dev); 
bool rt2800_txstatus_timeout(struct rt2x00_dev *rt2x00dev);

bool rt2800_txstatus_pending(struct rt2x00_dev *rt2x00dev);



void rt2800_watchdog(struct rt2x00_dev *rt2x00dev);



void rt2800_write_beacon(struct queue_entry *entry, struct txentry_desc *txdesc);

void rt2800_clear_beacon(struct queue_entry *entry);

drivers/net/wireless/ralink/rt2x00/rt2800pci.c

+1 −0
Original line number Diff line number Diff line
@@ -351,6 +351,7 @@ static const struct rt2x00lib_ops rt2800pci_rt2x00_ops = { 
	.link_tuner		= rt2800_link_tuner,

	.gain_calibration	= rt2800_gain_calibration,

	.vco_calibration	= rt2800_vco_calibration,

	.watchdog		= rt2800_watchdog,

	.start_queue		= rt2800mmio_start_queue,

	.kick_queue		= rt2800mmio_kick_queue,

	.stop_queue		= rt2800mmio_stop_queue,

drivers/net/wireless/ralink/rt2x00/rt2800soc.c

+1 −0
Original line number Diff line number Diff line
@@ -196,6 +196,7 @@ static const struct rt2x00lib_ops rt2800soc_rt2x00_ops = { 
	.link_tuner		= rt2800_link_tuner,

	.gain_calibration	= rt2800_gain_calibration,

	.vco_calibration	= rt2800_vco_calibration,

	.watchdog		= rt2800_watchdog,

	.start_queue		= rt2800mmio_start_queue,

	.kick_queue		= rt2800mmio_kick_queue,

	.stop_queue		= rt2800mmio_stop_queue,

drivers/net/wireless/ralink/rt2x00/rt2800usb.c

+1 −0
Original line number Diff line number Diff line
@@ -687,6 +687,7 @@ static const struct rt2x00lib_ops rt2800usb_rt2x00_ops = { 
	.link_tuner		= rt2800_link_tuner,

	.gain_calibration	= rt2800_gain_calibration,

	.vco_calibration	= rt2800_vco_calibration,

	.watchdog		= rt2800_watchdog,

	.start_queue		= rt2800usb_start_queue,

	.kick_queue		= rt2x00usb_kick_queue,

	.stop_queue		= rt2800usb_stop_queue,