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

Commit ac495534 authored by Franky Lin's avatar Franky Lin Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: move fullmac watchdog timer code to dhd_sdio.c 



The watchdog timer is used in bus interface layer in fullmac. Move
related code to dhd_sdio.c for clean up.

Signed-off-by: default avatarFranky Lin <frankyl@broadcom.com>
Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b7adfa76

drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c

+3 −2
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ extern void brcmf_sdbrcm_isr(void *args); 


#include "dngl_stats.h"

#include "dhd.h"

#include "dhd_bus.h"



/**

 * SDIO Host Controller info
@@ -222,7 +223,7 @@ module_param(sd_f2_blocksize, int, 0); 
void brcmf_sdio_wdtmr_enable(bool enable)

{

	if (enable)

		brcmf_os_wd_timer(sdhcinfo->ch, brcmf_watchdog_ms);

		brcmf_sdbrcm_wd_timer(sdhcinfo->ch, brcmf_watchdog_ms);

	else

		brcmf_os_wd_timer(sdhcinfo->ch, 0);

		brcmf_sdbrcm_wd_timer(sdhcinfo->ch, 0);

}

drivers/staging/brcm80211/brcmfmac/dhd.h

+4 −4
Original line number Diff line number Diff line
@@ -773,9 +773,6 @@ extern atomic_t brcmf_mmc_suspend; 
 * Insmod parameters for debug/test

 */



/* Watchdog timer interval */

extern uint brcmf_watchdog_ms;



#if defined(BCMDBG)

/* Console output poll interval */

extern uint brcmf_console_ms;
@@ -818,6 +815,10 @@ extern uint brcmf_sdiod_drive_strength; 
/* Override to force tx queueing all the time */

extern uint brcmf_force_tx_queueing;



/* thread priority for watchdog and dpc */

extern int brcmf_watchdog_prio;

extern int brcmf_dpc_prio;



#ifdef SDTEST

/* Echo packet generator (SDIO), pkts/s */

extern uint brcmf_pktgen;
@@ -923,7 +924,6 @@ extern void brcmf_os_set_ioctl_resp_timeout(unsigned int timeout_msec); 
extern void *brcmf_os_open_image(char *filename);

extern int brcmf_os_get_image_block(char *buf, int len, void *image);

extern void brcmf_os_close_image(void *image);

extern void brcmf_os_wd_timer(void *bus, uint wdtick);

extern void brcmf_os_sdlock(dhd_pub_t *pub);

extern void brcmf_os_sdunlock(dhd_pub_t *pub);

extern void brcmf_os_sdlock_sndup_rxq(dhd_pub_t *pub);

drivers/staging/brcm80211/brcmfmac/dhd_bus.h

+5 −3
Original line number Diff line number Diff line
@@ -29,6 +29,9 @@ 
 * Exported from dhd bus module (dhd_usb, dhd_sdio)

 */



/* Watchdog timer interval */

extern uint brcmf_watchdog_ms;



/* Indicate (dis)interest in finding dongles. */

extern int dhd_bus_register(void);

extern void dhd_bus_unregister(void);
@@ -55,9 +58,6 @@ brcmf_sdbrcm_bus_txctl(struct dhd_bus *bus, unsigned char *msg, uint msglen); 
extern int

brcmf_sdbrcm_bus_rxctl(struct dhd_bus *bus, unsigned char *msg, uint msglen);



/* Watchdog timer function */

extern bool brcmf_sdbrcm_bus_watchdog(dhd_pub_t *dhd);



#ifdef BCMDBG

/* Device console input function */

extern int
@@ -91,4 +91,6 @@ extern void *dhd_bus_pub(struct dhd_bus *bus); 
extern void *dhd_bus_txq(struct dhd_bus *bus);

extern uint dhd_bus_hdrlen(struct dhd_bus *bus);



extern void brcmf_sdbrcm_wd_timer(struct dhd_bus *bus, uint wdtick);



#endif				/* _dhd_bus_h_ */

drivers/staging/brcm80211/brcmfmac/dhd_common.c

+0 −16
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ enum { 
	IOV_MSGLEVEL,

	IOV_BCMERRORSTR,

	IOV_BCMERROR,

	IOV_WDTICK,

	IOV_DUMP,

#ifdef BCMDBG

	IOV_CONS,
@@ -78,8 +77,6 @@ const struct brcmu_iovar brcmf_iovars[] = { 
	,

	{"bcmerror", IOV_BCMERROR, 0, IOVT_INT8, 0}

	,

	{"wdtick", IOV_WDTICK, 0, IOVT_UINT32, 0}

	,

	{"dump", IOV_DUMP, 0, IOVT_BUFFER, DHD_IOCTL_MAXLEN}

	,

#ifdef BCMDBG
@@ -237,19 +234,6 @@ brcmf_c_doiovar(dhd_pub_t *dhd_pub, const struct brcmu_iovar *vi, u32 actionid, 
		memcpy(arg, &int_val, val_size);

		break;



	case IOV_GVAL(IOV_WDTICK):

		int_val = (s32) brcmf_watchdog_ms;

		memcpy(arg, &int_val, val_size);

		break;



	case IOV_SVAL(IOV_WDTICK):

		if (!dhd_pub->up) {

			bcmerror = -ENOLINK;

			break;

		}

		brcmf_os_wd_timer(dhd_pub, (uint) int_val);

		break;



	case IOV_GVAL(IOV_DUMP):

		bcmerror = brcmf_c_dump(dhd_pub, arg, len);

		break;

drivers/staging/brcm80211/brcmfmac/dhd_linux.c

+0 −159
Original line number Diff line number Diff line
@@ -82,15 +82,11 @@ typedef struct dhd_info { 


	struct semaphore proto_sem;

	wait_queue_head_t ioctl_resp_wait;

	struct timer_list timer;

	bool wd_timer_valid;

	struct tasklet_struct tasklet;

	spinlock_t sdlock;

	/* Thread based operation */

	bool threads_only;

	struct semaphore sdsem;

	struct task_struct *watchdog_tsk;

	struct semaphore watchdog_sem;

	struct task_struct *dpc_tsk;

	struct semaphore dpc_sem;
@@ -128,10 +124,6 @@ module_param(brcmf_msg_level, int, 0); 
uint brcmf_sysioc = true;

module_param(brcmf_sysioc, uint, 0);



/* Watchdog interval */

uint brcmf_watchdog_ms = 10;

module_param(brcmf_watchdog_ms, uint, 0);



#ifdef BCMDBG

/* Console poll interval */

uint brcmf_console_ms;
@@ -159,10 +151,6 @@ module_param(brcmf_pkt_filter_init, uint, 0); 
uint brcmf_master_mode = true;

module_param(brcmf_master_mode, uint, 1);



/* Watchdog thread priority, -1 to use kernel timer */

int brcmf_watchdog_prio = 97;

module_param(brcmf_watchdog_prio, int, 0);



/* DPC thread priority, -1 to use tasklet */

int brcmf_dpc_prio = 98;

module_param(brcmf_dpc_prio, int, 0);
@@ -1030,64 +1018,6 @@ static struct net_device_stats *brcmf_netdev_get_stats(struct net_device *net) 
	return &ifp->stats;

}



static int brcmf_watchdog_thread(void *data)

{

	dhd_info_t *dhd = (dhd_info_t *) data;



	/* This thread doesn't need any user-level access,

	 * so get rid of all our resources

	 */

	if (brcmf_watchdog_prio > 0) {

		struct sched_param param;

		param.sched_priority = (brcmf_watchdog_prio < MAX_RT_PRIO) ?

		    brcmf_watchdog_prio : (MAX_RT_PRIO - 1);

		sched_setscheduler(current, SCHED_FIFO, &param);

	}



	allow_signal(SIGTERM);

	/* Run until signal received */

	while (1) {

		if (kthread_should_stop())

			break;

		if (down_interruptible(&dhd->watchdog_sem) == 0) {

			if (dhd->pub.dongle_reset == false) {

				/* Call the bus module watchdog */

				brcmf_sdbrcm_bus_watchdog(&dhd->pub);

			}

			/* Count the tick for reference */

			dhd->pub.tickcnt++;

		} else

			break;

	}

	return 0;

}



static void brcmf_watchdog(unsigned long data)

{

	dhd_info_t *dhd = (dhd_info_t *) data;



	if (dhd->watchdog_tsk) {

		up(&dhd->watchdog_sem);



		/* Reschedule the watchdog */

		if (dhd->wd_timer_valid) {

			mod_timer(&dhd->timer,

				  jiffies + brcmf_watchdog_ms * HZ / 1000);

		}

		return;

	}



	/* Call the bus module watchdog */

	brcmf_sdbrcm_bus_watchdog(&dhd->pub);



	/* Count the tick for reference */

	dhd->pub.tickcnt++;



	/* Reschedule the watchdog */

	if (dhd->wd_timer_valid)

		mod_timer(&dhd->timer, jiffies + brcmf_watchdog_ms * HZ / 1000);

}



static int brcmf_dpc_thread(void *data)

{

	dhd_info_t *dhd = (dhd_info_t *) data;
@@ -1667,11 +1597,6 @@ dhd_pub_t *brcmf_attach(struct dhd_bus *bus, uint bus_hdrlen) 
		strcpy(brcmf_nv_path, wl_cfg80211_get_nvramname());

	}



	/* Set up the watchdog timer */

	init_timer(&dhd->timer);

	dhd->timer.data = (unsigned long) dhd;

	dhd->timer.function = brcmf_watchdog;



	/* Initialize thread based operation and lock */

	sema_init(&dhd->sdsem, 1);

	if ((brcmf_watchdog_prio >= 0) && (brcmf_dpc_prio >= 0))
@@ -1679,20 +1604,6 @@ dhd_pub_t *brcmf_attach(struct dhd_bus *bus, uint bus_hdrlen) 
	else

		dhd->threads_only = false;



	if (brcmf_dpc_prio >= 0) {

		/* Initialize watchdog thread */

		sema_init(&dhd->watchdog_sem, 0);

		dhd->watchdog_tsk = kthread_run(brcmf_watchdog_thread, dhd,

						"dhd_watchdog");

		if (IS_ERR(dhd->watchdog_tsk)) {

			printk(KERN_WARNING

				"dhd_watchdog thread failed to start\n");

			dhd->watchdog_tsk = NULL;

		}

	} else {

		dhd->watchdog_tsk = NULL;

	}



	/* Set up the bottom half handler */

	if (brcmf_dpc_prio >= 0) {

		/* Initialize DPC thread */
@@ -1773,10 +1684,6 @@ int brcmf_bus_start(dhd_pub_t *dhdp) 
		}

	}



	/* Start the watchdog timer */

	dhd->pub.tickcnt = 0;

	brcmf_os_wd_timer(&dhd->pub, brcmf_watchdog_ms);



	/* Bring up the bus */

	ret = brcmf_sdbrcm_bus_init(&dhd->pub, true);

	if (ret != 0) {
@@ -1787,8 +1694,6 @@ int brcmf_bus_start(dhd_pub_t *dhdp) 


	/* If bus is not ready, can't come up */

	if (dhd->pub.busstate != DHD_BUS_DATA) {

		del_timer_sync(&dhd->timer);

		dhd->wd_timer_valid = false;

		DHD_ERROR(("%s failed bus is not ready\n", __func__));

		return -ENODEV;

	}
@@ -1935,10 +1840,6 @@ static void brcmf_bus_detach(dhd_pub_t *dhdp) 


			/* Stop the bus module */

			brcmf_sdbrcm_bus_stop(dhd->pub.bus, true);



			/* Clear the watchdog timer */

			del_timer_sync(&dhd->timer);

			dhd->wd_timer_valid = false;

		}

	}

}
@@ -1971,12 +1872,6 @@ void brcmf_detach(dhd_pub_t *dhdp) 
				unregister_netdev(ifp->net);

			}



			if (dhd->watchdog_tsk) {

				send_sig(SIGTERM, dhd->watchdog_tsk, 1);

				kthread_stop(dhd->watchdog_tsk);

				dhd->watchdog_tsk = NULL;

			}



			if (dhd->dpc_tsk) {

				send_sig(SIGTERM, dhd->dpc_tsk, 1);

				kthread_stop(dhd->dpc_tsk);
@@ -2119,51 +2014,6 @@ int brcmf_os_ioctl_resp_wake(dhd_pub_t *pub) 
	return 0;

}



void brcmf_os_wd_timer(void *bus, uint wdtick)

{

	dhd_pub_t *pub = bus;

	static uint save_dhd_watchdog_ms;

	dhd_info_t *dhd = (dhd_info_t *) pub->info;



	/* don't start the wd until fw is loaded */

	if (pub->busstate == DHD_BUS_DOWN)

		return;



	/* Totally stop the timer */

	if (!wdtick && dhd->wd_timer_valid == true) {

		del_timer_sync(&dhd->timer);

		dhd->wd_timer_valid = false;

		save_dhd_watchdog_ms = wdtick;

		return;

	}



	if (wdtick) {

		brcmf_watchdog_ms = (uint) wdtick;



		if (save_dhd_watchdog_ms != brcmf_watchdog_ms) {



			if (dhd->wd_timer_valid == true)

				/* Stop timer and restart at new value */

				del_timer_sync(&dhd->timer);



			/* Create timer again when watchdog period is

			   dynamically changed or in the first instance

			 */

			dhd->timer.expires =

			    jiffies + brcmf_watchdog_ms * HZ / 1000;

			add_timer(&dhd->timer);



		} else {

			/* Re arm the timer, at last watchdog period */

			mod_timer(&dhd->timer,

				  jiffies + brcmf_watchdog_ms * HZ / 1000);

		}



		dhd->wd_timer_valid = true;

		save_dhd_watchdog_ms = wdtick;

	}

}



void *brcmf_os_open_image(char *filename)

{

	struct file *fp;
@@ -2257,17 +2107,8 @@ int brcmf_netdev_reset(struct net_device *dev, u8 flag) 
{

	dhd_info_t *dhd = *(dhd_info_t **)netdev_priv(dev);



	/* Turning off watchdog */

	if (flag)

		brcmf_os_wd_timer(&dhd->pub, 0);



	brcmf_bus_devreset(&dhd->pub, flag);



	/* Turning on watchdog back */

	if (!flag)

		brcmf_os_wd_timer(&dhd->pub, brcmf_watchdog_ms);

	DHD_ERROR(("%s:  WLAN OFF DONE\n", __func__));



	return 1;

}