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

Commit 85ee5122 authored by Christian Lamparter's avatar Christian Lamparter Committed by John W. Linville
Browse files

carl9170: import 1.9.4 firmware headers 



This patch imports all shared header changes
from carl9170fw.git.

 * update copyright boilerplate

 * add some more strategic __aligned(4).

 * WoWLAN

Signed-off-by: default avatarChristian Lamparter <chunkeey@googlemail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3b4670ff

drivers/net/wireless/ath/carl9170/carl9170.h

+2 −0
Original line number Diff line number Diff line
@@ -67,6 +67,8 @@ 


#define PAYLOAD_MAX	(CARL9170_MAX_CMD_LEN / 4 - 1)



static const u8 ar9170_qmap[__AR9170_NUM_TXQ] = { 3, 2, 1, 0 };



enum carl9170_rf_init_mode {

	CARL9170_RFI_NONE,

	CARL9170_RFI_WARM,

drivers/net/wireless/ath/carl9170/fwcmd.h

+18 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
 * Firmware command interface definitions

 *

 * Copyright 2008, Johannes Berg <johannes@sipsolutions.net>

 * Copyright 2009, 2010, Christian Lamparter <chunkeey@googlemail.com>

 * Copyright 2009-2011 Christian Lamparter <chunkeey@googlemail.com>

 *

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

 * it under the terms of the GNU General Public License as published by
@@ -54,6 +54,7 @@ enum carl9170_cmd_oids { 
	CARL9170_CMD_BCN_CTRL		= 0x05,

	CARL9170_CMD_READ_TSF		= 0x06,

	CARL9170_CMD_RX_FILTER		= 0x07,

	CARL9170_CMD_WOL		= 0x08,



	/* CAM */

	CARL9170_CMD_EKEY		= 0x10,
@@ -180,6 +181,21 @@ struct carl9170_bcn_ctrl_cmd { 
#define CARL9170_BCN_CTRL_DRAIN	0

#define CARL9170_BCN_CTRL_CAB_TRIGGER	1



struct carl9170_wol_cmd {

	__le32		flags;

	u8		mac[6];

	u8		bssid[6];

	__le32		null_interval;

	__le32		free_for_use2;

	__le32		mask;

	u8		pattern[32];

} __packed;



#define CARL9170_WOL_CMD_SIZE		60



#define CARL9170_WOL_DISCONNECT		1

#define CARL9170_WOL_MAGIC_PKT		2



struct carl9170_cmd_head {

	union {

		struct {
@@ -203,6 +219,7 @@ struct carl9170_cmd { 
		struct carl9170_write_reg	wreg;

		struct carl9170_rf_init		rf_init;

		struct carl9170_psm		psm;

		struct carl9170_wol_cmd		wol;

		struct carl9170_bcn_ctrl_cmd	bcn_ctrl;

		struct carl9170_rx_filter_cmd	rx_filter;

		u8 data[CARL9170_MAX_CMD_PAYLOAD_LEN];

drivers/net/wireless/ath/carl9170/fwdesc.h

+16 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 *

 * Firmware descriptor format

 *

 * Copyright 2009, 2010, Christian Lamparter <chunkeey@googlemail.com>

 * Copyright 2009-2011 Christian Lamparter <chunkeey@googlemail.com>

 *

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

 * it under the terms of the GNU General Public License as published by
@@ -72,6 +72,9 @@ enum carl9170fw_feature_list { 
	/* Wake up on WLAN */

	CARL9170FW_WOL,



	/* Firmware supports PSM in the 5GHZ Band */

	CARL9170FW_FIXED_5GHZ_PSM,



	/* KEEP LAST */

	__CARL9170FW_FEATURE_NUM

};
@@ -82,6 +85,7 @@ enum carl9170fw_feature_list { 
#define DBG_MAGIC	"DBG\0"

#define CHK_MAGIC	"CHK\0"

#define TXSQ_MAGIC	"TXSQ"

#define WOL_MAGIC	"WOL\0"

#define LAST_MAGIC	"LAST"



#define CARL9170FW_SET_DAY(d) (((d) - 1) % 31)
@@ -104,7 +108,7 @@ struct carl9170fw_desc_head { 
	(sizeof(struct carl9170fw_desc_head))



#define CARL9170FW_OTUS_DESC_MIN_VER		6

#define CARL9170FW_OTUS_DESC_CUR_VER		6

#define CARL9170FW_OTUS_DESC_CUR_VER		7

struct carl9170fw_otus_desc {

	struct carl9170fw_desc_head head;

	__le32 feature_set;
@@ -186,6 +190,16 @@ struct carl9170fw_txsq_desc { 
#define CARL9170FW_TXSQ_DESC_SIZE			\

	(sizeof(struct carl9170fw_txsq_desc))



#define CARL9170FW_WOL_DESC_MIN_VER			1

#define CARL9170FW_WOL_DESC_CUR_VER			1

struct carl9170fw_wol_desc {

	struct carl9170fw_desc_head head;



	__le32 supported_triggers;	/* CARL9170_WOL_ */

} __packed;

#define CARL9170FW_WOL_DESC_SIZE			\

	(sizeof(struct carl9170fw_wol_desc))



#define CARL9170FW_LAST_DESC_MIN_VER			1

#define CARL9170FW_LAST_DESC_CUR_VER			2

struct carl9170fw_last_desc {

drivers/net/wireless/ath/carl9170/hw.h

+13 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
 * Register map, hardware-specific definitions

 *

 * Copyright 2008, Johannes Berg <johannes@sipsolutions.net>

 * Copyright 2009, 2010, Christian Lamparter <chunkeey@googlemail.com>

 * Copyright 2009-2011 Christian Lamparter <chunkeey@googlemail.com>

 *

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

 * it under the terms of the GNU General Public License as published by
@@ -357,7 +357,18 @@ 


#define AR9170_MAC_REG_DMA_WLAN_STATUS		(AR9170_MAC_REG_BASE + 0xd38)

#define	AR9170_MAC_REG_DMA_STATUS		(AR9170_MAC_REG_BASE + 0xd3c)



#define AR9170_MAC_REG_DMA_TXQ_LAST_ADDR	(AR9170_MAC_REG_BASE + 0xd40)

#define	AR9170_MAC_REG_DMA_TXQ0_LAST_ADDR	(AR9170_MAC_REG_BASE + 0xd40)

#define	AR9170_MAC_REG_DMA_TXQ1_LAST_ADDR	(AR9170_MAC_REG_BASE + 0xd44)

#define	AR9170_MAC_REG_DMA_TXQ2_LAST_ADDR	(AR9170_MAC_REG_BASE + 0xd48)

#define	AR9170_MAC_REG_DMA_TXQ3_LAST_ADDR	(AR9170_MAC_REG_BASE + 0xd4c)

#define	AR9170_MAC_REG_DMA_TXQ4_LAST_ADDR	(AR9170_MAC_REG_BASE + 0xd50)

#define	AR9170_MAC_REG_DMA_TXQ0Q1_LEN		(AR9170_MAC_REG_BASE + 0xd54)

#define	AR9170_MAC_REG_DMA_TXQ2Q3_LEN		(AR9170_MAC_REG_BASE + 0xd58)

#define	AR9170_MAC_REG_DMA_TXQ4_LEN		(AR9170_MAC_REG_BASE + 0xd5c)



#define AR9170_MAC_REG_DMA_TXQX_LAST_ADDR	(AR9170_MAC_REG_BASE + 0xd74)

#define AR9170_MAC_REG_DMA_TXQX_FAIL_ADDR	(AR9170_MAC_REG_BASE + 0xd78)

#define	AR9170_MAC_REG_TXRX_MPI			(AR9170_MAC_REG_BASE + 0xd7c)

#define		AR9170_MAC_TXRX_MPI_TX_MPI_MASK		0x0000000f

#define		AR9170_MAC_TXRX_MPI_TX_TO_MASK		0x0000fff0

drivers/net/wireless/ath/carl9170/version.h

+3 −3
Original line number Diff line number Diff line 
#ifndef __CARL9170_SHARED_VERSION_H

#define __CARL9170_SHARED_VERSION_H

#define CARL9170FW_VERSION_YEAR 11

#define CARL9170FW_VERSION_MONTH 1

#define CARL9170FW_VERSION_DAY 22

#define CARL9170FW_VERSION_GIT "1.9.2"

#define CARL9170FW_VERSION_MONTH 6

#define CARL9170FW_VERSION_DAY 30

#define CARL9170FW_VERSION_GIT "1.9.4"

#endif /* __CARL9170_SHARED_VERSION_H */