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

Commit 274c66cd authored by Luciano Coelho's avatar Luciano Coelho
Browse files

wl18xx: add trigger command and ack event operations 



Add the operations that allow wlcore to trigger commands to the
firmware and acknowledge when an event has been fully received.

Allocate a private buffer to hold the maximum sized cmd. Send the
entire length of the buffer each time a command is sent to signal
EOT. Remove the previous EOT mechanism.

Signed-off-by: default avatarLuciano Coelho <coelho@ti.com>
Signed-off-by: default avatarArik Nemtsov <arik@wizery.com>
parent 46a1d512

drivers/net/wireless/ti/wl18xx/main.c

+20 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 


#include "reg.h"

#include "conf.h"

#include "wl18xx.h"



static struct wl18xx_conf wl18xx_default_conf = {

	.phy = {
@@ -284,9 +285,28 @@ static int wl18xx_boot(struct wl1271 *wl) 
	return ret;

}



static void wl18xx_trigger_cmd(struct wl1271 *wl, int cmd_box_addr,

			       void *buf, size_t len)

{

	struct wl18xx_priv *priv = wl->priv;



	memcpy(priv->cmd_buf, buf, len);

	memset(priv->cmd_buf + len, 0, WL18XX_CMD_MAX_SIZE - len);



	wl1271_write(wl, cmd_box_addr, priv->cmd_buf, WL18XX_CMD_MAX_SIZE,

		     false);

}



static void wl18xx_ack_event(struct wl1271 *wl)

{

	wlcore_write_reg(wl, REG_INTERRUPT_TRIG, WL18XX_INTR_TRIG_EVENT_ACK);

}



static struct wlcore_ops wl18xx_ops = {

	.identify_chip	= wl18xx_identify_chip,

	.boot		= wl18xx_boot,

	.trigger_cmd	= wl18xx_trigger_cmd,

	.ack_event	= wl18xx_ack_event,

};



int __devinit wl18xx_probe(struct platform_device *pdev)

drivers/net/wireless/ti/wl18xx/reg.h

+16 −0
Original line number Diff line number Diff line
@@ -113,6 +113,22 @@ 


#define CHIP_ID_185x_PG10              (0x06030101)



/*

 * Host Command Interrupt. Setting this bit masks

 * the interrupt that the host issues to inform

 * the FW that it has sent a command

 * to the Wlan hardware Command Mailbox.

 */

#define WL18XX_INTR_TRIG_CMD       BIT(28)



/*

 * Host Event Acknowlegde Interrupt. The host

 * sets this bit to acknowledge that it received

 * the unsolicited information from the event

 * mailbox.

 */

#define WL18XX_INTR_TRIG_EVENT_ACK BIT(29)



/* TODO: maybe move elsewhere? */

#define NUM_OF_CHANNELS_11_ABG 150

#define NUM_OF_CHANNELS_11_P 7

drivers/net/wireless/ti/wl18xx/wl18xx.h

0 → 100644
+33 −0
Original line number Diff line number Diff line 
/*

 * This file is part of wl18xx

 *

 * Copyright (C) 2011 Texas Instruments Inc.

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

 * version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful, but

 * WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA

 * 02110-1301 USA

 *

 */



#ifndef __WL18XX_PRIV_H__

#define __WL18XX_PRIV_H__





#define WL18XX_CMD_MAX_SIZE          740



struct wl18xx_priv {

	/* buffer for sending commands to FW */

	u8 cmd_buf[WL18XX_CMD_MAX_SIZE];

};



#endif /* __WL18XX_PRIV_H__ */