Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6
This commit is contained in:
commit
d21844c7c2
|
@ -102,6 +102,16 @@ config IWLWIFI_DEVICE_TRACING
|
||||||
occur.
|
occur.
|
||||||
endmenu
|
endmenu
|
||||||
|
|
||||||
|
config IWLWIFI_DEVICE_SVTOOL
|
||||||
|
bool "iwlwifi device svtool support"
|
||||||
|
depends on IWLAGN
|
||||||
|
select NL80211_TESTMODE
|
||||||
|
help
|
||||||
|
This option enables the svtool support for iwlwifi device through
|
||||||
|
NL80211_TESTMODE. svtool is a software validation tool that runs in
|
||||||
|
the user space and interacts with the device in the kernel space
|
||||||
|
through the generic netlink message via NL80211_TESTMODE channel.
|
||||||
|
|
||||||
config IWL_P2P
|
config IWL_P2P
|
||||||
bool "iwlwifi experimental P2P support"
|
bool "iwlwifi experimental P2P support"
|
||||||
depends on IWLAGN
|
depends on IWLAGN
|
||||||
|
|
|
@ -16,6 +16,7 @@ iwlagn-objs += iwl-2000.o
|
||||||
|
|
||||||
iwlagn-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o
|
iwlagn-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o
|
||||||
iwlagn-$(CONFIG_IWLWIFI_DEVICE_TRACING) += iwl-devtrace.o
|
iwlagn-$(CONFIG_IWLWIFI_DEVICE_TRACING) += iwl-devtrace.o
|
||||||
|
iwlagn-$(CONFIG_IWLWIFI_DEVICE_SVTOOL) += iwl-sv-open.o
|
||||||
|
|
||||||
CFLAGS_iwl-devtrace.o := -I$(src)
|
CFLAGS_iwl-devtrace.o := -I$(src)
|
||||||
|
|
||||||
|
|
|
@ -171,8 +171,6 @@ static int iwl1000_hw_set_hw_params(struct iwl_priv *priv)
|
||||||
|
|
||||||
static struct iwl_lib_ops iwl1000_lib = {
|
static struct iwl_lib_ops iwl1000_lib = {
|
||||||
.set_hw_params = iwl1000_hw_set_hw_params,
|
.set_hw_params = iwl1000_hw_set_hw_params,
|
||||||
.txq_update_byte_cnt_tbl = iwlagn_txq_update_byte_cnt_tbl,
|
|
||||||
.txq_inval_byte_cnt_tbl = iwlagn_txq_inval_byte_cnt_tbl,
|
|
||||||
.txq_set_sched = iwlagn_txq_set_sched,
|
.txq_set_sched = iwlagn_txq_set_sched,
|
||||||
.txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd,
|
.txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd,
|
||||||
.txq_free_tfd = iwl_hw_txq_free_tfd,
|
.txq_free_tfd = iwl_hw_txq_free_tfd,
|
||||||
|
|
|
@ -252,8 +252,6 @@ static int iwl2030_hw_channel_switch(struct iwl_priv *priv,
|
||||||
|
|
||||||
static struct iwl_lib_ops iwl2000_lib = {
|
static struct iwl_lib_ops iwl2000_lib = {
|
||||||
.set_hw_params = iwl2000_hw_set_hw_params,
|
.set_hw_params = iwl2000_hw_set_hw_params,
|
||||||
.txq_update_byte_cnt_tbl = iwlagn_txq_update_byte_cnt_tbl,
|
|
||||||
.txq_inval_byte_cnt_tbl = iwlagn_txq_inval_byte_cnt_tbl,
|
|
||||||
.txq_set_sched = iwlagn_txq_set_sched,
|
.txq_set_sched = iwlagn_txq_set_sched,
|
||||||
.txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd,
|
.txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd,
|
||||||
.txq_free_tfd = iwl_hw_txq_free_tfd,
|
.txq_free_tfd = iwl_hw_txq_free_tfd,
|
||||||
|
|
|
@ -339,8 +339,6 @@ static int iwl5000_hw_channel_switch(struct iwl_priv *priv,
|
||||||
|
|
||||||
static struct iwl_lib_ops iwl5000_lib = {
|
static struct iwl_lib_ops iwl5000_lib = {
|
||||||
.set_hw_params = iwl5000_hw_set_hw_params,
|
.set_hw_params = iwl5000_hw_set_hw_params,
|
||||||
.txq_update_byte_cnt_tbl = iwlagn_txq_update_byte_cnt_tbl,
|
|
||||||
.txq_inval_byte_cnt_tbl = iwlagn_txq_inval_byte_cnt_tbl,
|
|
||||||
.txq_set_sched = iwlagn_txq_set_sched,
|
.txq_set_sched = iwlagn_txq_set_sched,
|
||||||
.txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd,
|
.txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd,
|
||||||
.txq_free_tfd = iwl_hw_txq_free_tfd,
|
.txq_free_tfd = iwl_hw_txq_free_tfd,
|
||||||
|
@ -376,8 +374,6 @@ static struct iwl_lib_ops iwl5000_lib = {
|
||||||
|
|
||||||
static struct iwl_lib_ops iwl5150_lib = {
|
static struct iwl_lib_ops iwl5150_lib = {
|
||||||
.set_hw_params = iwl5150_hw_set_hw_params,
|
.set_hw_params = iwl5150_hw_set_hw_params,
|
||||||
.txq_update_byte_cnt_tbl = iwlagn_txq_update_byte_cnt_tbl,
|
|
||||||
.txq_inval_byte_cnt_tbl = iwlagn_txq_inval_byte_cnt_tbl,
|
|
||||||
.txq_set_sched = iwlagn_txq_set_sched,
|
.txq_set_sched = iwlagn_txq_set_sched,
|
||||||
.txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd,
|
.txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd,
|
||||||
.txq_free_tfd = iwl_hw_txq_free_tfd,
|
.txq_free_tfd = iwl_hw_txq_free_tfd,
|
||||||
|
|
|
@ -278,8 +278,6 @@ static int iwl6000_hw_channel_switch(struct iwl_priv *priv,
|
||||||
|
|
||||||
static struct iwl_lib_ops iwl6000_lib = {
|
static struct iwl_lib_ops iwl6000_lib = {
|
||||||
.set_hw_params = iwl6000_hw_set_hw_params,
|
.set_hw_params = iwl6000_hw_set_hw_params,
|
||||||
.txq_update_byte_cnt_tbl = iwlagn_txq_update_byte_cnt_tbl,
|
|
||||||
.txq_inval_byte_cnt_tbl = iwlagn_txq_inval_byte_cnt_tbl,
|
|
||||||
.txq_set_sched = iwlagn_txq_set_sched,
|
.txq_set_sched = iwlagn_txq_set_sched,
|
||||||
.txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd,
|
.txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd,
|
||||||
.txq_free_tfd = iwl_hw_txq_free_tfd,
|
.txq_free_tfd = iwl_hw_txq_free_tfd,
|
||||||
|
@ -316,8 +314,6 @@ static struct iwl_lib_ops iwl6000_lib = {
|
||||||
|
|
||||||
static struct iwl_lib_ops iwl6030_lib = {
|
static struct iwl_lib_ops iwl6030_lib = {
|
||||||
.set_hw_params = iwl6000_hw_set_hw_params,
|
.set_hw_params = iwl6000_hw_set_hw_params,
|
||||||
.txq_update_byte_cnt_tbl = iwlagn_txq_update_byte_cnt_tbl,
|
|
||||||
.txq_inval_byte_cnt_tbl = iwlagn_txq_inval_byte_cnt_tbl,
|
|
||||||
.txq_set_sched = iwlagn_txq_set_sched,
|
.txq_set_sched = iwlagn_txq_set_sched,
|
||||||
.txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd,
|
.txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd,
|
||||||
.txq_free_tfd = iwl_hw_txq_free_tfd,
|
.txq_free_tfd = iwl_hw_txq_free_tfd,
|
||||||
|
|
|
@ -54,12 +54,6 @@ int iwlagn_send_tx_ant_config(struct iwl_priv *priv, u8 valid_tx_ant)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Currently this is the superset of everything */
|
|
||||||
static u16 iwlagn_get_hcmd_size(u8 cmd_id, u16 len)
|
|
||||||
{
|
|
||||||
return len;
|
|
||||||
}
|
|
||||||
|
|
||||||
static u16 iwlagn_build_addsta_hcmd(const struct iwl_addsta_cmd *cmd, u8 *data)
|
static u16 iwlagn_build_addsta_hcmd(const struct iwl_addsta_cmd *cmd, u8 *data)
|
||||||
{
|
{
|
||||||
u16 size = (u16)sizeof(struct iwl_addsta_cmd);
|
u16 size = (u16)sizeof(struct iwl_addsta_cmd);
|
||||||
|
@ -332,7 +326,6 @@ struct iwl_hcmd_ops iwlagn_bt_hcmd = {
|
||||||
};
|
};
|
||||||
|
|
||||||
struct iwl_hcmd_utils_ops iwlagn_hcmd_utils = {
|
struct iwl_hcmd_utils_ops iwlagn_hcmd_utils = {
|
||||||
.get_hcmd_size = iwlagn_get_hcmd_size,
|
|
||||||
.build_addsta_hcmd = iwlagn_build_addsta_hcmd,
|
.build_addsta_hcmd = iwlagn_build_addsta_hcmd,
|
||||||
.gain_computation = iwlagn_gain_computation,
|
.gain_computation = iwlagn_gain_computation,
|
||||||
.chain_noise_reset = iwlagn_chain_noise_reset,
|
.chain_noise_reset = iwlagn_chain_noise_reset,
|
||||||
|
|
|
@ -98,9 +98,9 @@ static inline int get_fifo_from_tid(struct iwl_rxon_context *ctx, u16 tid)
|
||||||
/**
|
/**
|
||||||
* iwlagn_txq_update_byte_cnt_tbl - Set up entry in Tx byte-count array
|
* iwlagn_txq_update_byte_cnt_tbl - Set up entry in Tx byte-count array
|
||||||
*/
|
*/
|
||||||
void iwlagn_txq_update_byte_cnt_tbl(struct iwl_priv *priv,
|
static void iwlagn_txq_update_byte_cnt_tbl(struct iwl_priv *priv,
|
||||||
struct iwl_tx_queue *txq,
|
struct iwl_tx_queue *txq,
|
||||||
u16 byte_cnt)
|
u16 byte_cnt)
|
||||||
{
|
{
|
||||||
struct iwlagn_scd_bc_tbl *scd_bc_tbl = priv->scd_bc_tbls.addr;
|
struct iwlagn_scd_bc_tbl *scd_bc_tbl = priv->scd_bc_tbls.addr;
|
||||||
int write_ptr = txq->q.write_ptr;
|
int write_ptr = txq->q.write_ptr;
|
||||||
|
@ -112,21 +112,19 @@ void iwlagn_txq_update_byte_cnt_tbl(struct iwl_priv *priv,
|
||||||
|
|
||||||
WARN_ON(len > 0xFFF || write_ptr >= TFD_QUEUE_SIZE_MAX);
|
WARN_ON(len > 0xFFF || write_ptr >= TFD_QUEUE_SIZE_MAX);
|
||||||
|
|
||||||
if (txq_id != priv->cmd_queue) {
|
sta_id = txq->cmd[txq->q.write_ptr]->cmd.tx.sta_id;
|
||||||
sta_id = txq->cmd[txq->q.write_ptr]->cmd.tx.sta_id;
|
sec_ctl = txq->cmd[txq->q.write_ptr]->cmd.tx.sec_ctl;
|
||||||
sec_ctl = txq->cmd[txq->q.write_ptr]->cmd.tx.sec_ctl;
|
|
||||||
|
|
||||||
switch (sec_ctl & TX_CMD_SEC_MSK) {
|
switch (sec_ctl & TX_CMD_SEC_MSK) {
|
||||||
case TX_CMD_SEC_CCM:
|
case TX_CMD_SEC_CCM:
|
||||||
len += CCMP_MIC_LEN;
|
len += CCMP_MIC_LEN;
|
||||||
break;
|
break;
|
||||||
case TX_CMD_SEC_TKIP:
|
case TX_CMD_SEC_TKIP:
|
||||||
len += TKIP_ICV_LEN;
|
len += TKIP_ICV_LEN;
|
||||||
break;
|
break;
|
||||||
case TX_CMD_SEC_WEP:
|
case TX_CMD_SEC_WEP:
|
||||||
len += WEP_IV_LEN + WEP_ICV_LEN;
|
len += WEP_IV_LEN + WEP_ICV_LEN;
|
||||||
break;
|
break;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bc_ent = cpu_to_le16((len & 0xFFF) | (sta_id << 12));
|
bc_ent = cpu_to_le16((len & 0xFFF) | (sta_id << 12));
|
||||||
|
@ -138,8 +136,8 @@ void iwlagn_txq_update_byte_cnt_tbl(struct iwl_priv *priv,
|
||||||
tfd_offset[TFD_QUEUE_SIZE_MAX + write_ptr] = bc_ent;
|
tfd_offset[TFD_QUEUE_SIZE_MAX + write_ptr] = bc_ent;
|
||||||
}
|
}
|
||||||
|
|
||||||
void iwlagn_txq_inval_byte_cnt_tbl(struct iwl_priv *priv,
|
static void iwlagn_txq_inval_byte_cnt_tbl(struct iwl_priv *priv,
|
||||||
struct iwl_tx_queue *txq)
|
struct iwl_tx_queue *txq)
|
||||||
{
|
{
|
||||||
struct iwlagn_scd_bc_tbl *scd_bc_tbl = priv->scd_bc_tbls.addr;
|
struct iwlagn_scd_bc_tbl *scd_bc_tbl = priv->scd_bc_tbls.addr;
|
||||||
int txq_id = txq->q.id;
|
int txq_id = txq->q.id;
|
||||||
|
@ -539,7 +537,7 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
|
||||||
struct iwl_tx_cmd *tx_cmd;
|
struct iwl_tx_cmd *tx_cmd;
|
||||||
struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
|
struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
|
||||||
int txq_id;
|
int txq_id;
|
||||||
dma_addr_t phys_addr;
|
dma_addr_t phys_addr = 0;
|
||||||
dma_addr_t txcmd_phys;
|
dma_addr_t txcmd_phys;
|
||||||
dma_addr_t scratch_phys;
|
dma_addr_t scratch_phys;
|
||||||
u16 len, firstlen, secondlen;
|
u16 len, firstlen, secondlen;
|
||||||
|
@ -566,7 +564,7 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
|
||||||
spin_lock_irqsave(&priv->lock, flags);
|
spin_lock_irqsave(&priv->lock, flags);
|
||||||
if (iwl_is_rfkill(priv)) {
|
if (iwl_is_rfkill(priv)) {
|
||||||
IWL_DEBUG_DROP(priv, "Dropping - RF KILL\n");
|
IWL_DEBUG_DROP(priv, "Dropping - RF KILL\n");
|
||||||
goto drop_unlock;
|
goto drop_unlock_priv;
|
||||||
}
|
}
|
||||||
|
|
||||||
fc = hdr->frame_control;
|
fc = hdr->frame_control;
|
||||||
|
@ -587,7 +585,7 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
|
||||||
if (sta_id == IWL_INVALID_STATION) {
|
if (sta_id == IWL_INVALID_STATION) {
|
||||||
IWL_DEBUG_DROP(priv, "Dropping - INVALID STATION: %pM\n",
|
IWL_DEBUG_DROP(priv, "Dropping - INVALID STATION: %pM\n",
|
||||||
hdr->addr1);
|
hdr->addr1);
|
||||||
goto drop_unlock;
|
goto drop_unlock_priv;
|
||||||
}
|
}
|
||||||
|
|
||||||
IWL_DEBUG_TX(priv, "station Id %d\n", sta_id);
|
IWL_DEBUG_TX(priv, "station Id %d\n", sta_id);
|
||||||
|
@ -630,10 +628,10 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
|
||||||
if (ieee80211_is_data_qos(fc)) {
|
if (ieee80211_is_data_qos(fc)) {
|
||||||
qc = ieee80211_get_qos_ctl(hdr);
|
qc = ieee80211_get_qos_ctl(hdr);
|
||||||
tid = qc[0] & IEEE80211_QOS_CTL_TID_MASK;
|
tid = qc[0] & IEEE80211_QOS_CTL_TID_MASK;
|
||||||
if (WARN_ON_ONCE(tid >= MAX_TID_COUNT)) {
|
|
||||||
spin_unlock(&priv->sta_lock);
|
if (WARN_ON_ONCE(tid >= MAX_TID_COUNT))
|
||||||
goto drop_unlock;
|
goto drop_unlock_sta;
|
||||||
}
|
|
||||||
seq_number = priv->stations[sta_id].tid[tid].seq_number;
|
seq_number = priv->stations[sta_id].tid[tid].seq_number;
|
||||||
seq_number &= IEEE80211_SCTL_SEQ;
|
seq_number &= IEEE80211_SCTL_SEQ;
|
||||||
hdr->seq_ctrl = hdr->seq_ctrl &
|
hdr->seq_ctrl = hdr->seq_ctrl &
|
||||||
|
@ -651,18 +649,8 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
|
||||||
txq = &priv->txq[txq_id];
|
txq = &priv->txq[txq_id];
|
||||||
q = &txq->q;
|
q = &txq->q;
|
||||||
|
|
||||||
if (unlikely(iwl_queue_space(q) < q->high_mark)) {
|
if (unlikely(iwl_queue_space(q) < q->high_mark))
|
||||||
spin_unlock(&priv->sta_lock);
|
goto drop_unlock_sta;
|
||||||
goto drop_unlock;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ieee80211_is_data_qos(fc)) {
|
|
||||||
priv->stations[sta_id].tid[tid].tfds_in_queue++;
|
|
||||||
if (!ieee80211_has_morefrags(fc))
|
|
||||||
priv->stations[sta_id].tid[tid].seq_number = seq_number;
|
|
||||||
}
|
|
||||||
|
|
||||||
spin_unlock(&priv->sta_lock);
|
|
||||||
|
|
||||||
/* Set up driver data for this TFD */
|
/* Set up driver data for this TFD */
|
||||||
memset(&(txq->txb[q->write_ptr]), 0, sizeof(struct iwl_tx_info));
|
memset(&(txq->txb[q->write_ptr]), 0, sizeof(struct iwl_tx_info));
|
||||||
|
@ -726,12 +714,10 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
|
||||||
txcmd_phys = pci_map_single(priv->pci_dev,
|
txcmd_phys = pci_map_single(priv->pci_dev,
|
||||||
&out_cmd->hdr, firstlen,
|
&out_cmd->hdr, firstlen,
|
||||||
PCI_DMA_BIDIRECTIONAL);
|
PCI_DMA_BIDIRECTIONAL);
|
||||||
|
if (unlikely(pci_dma_mapping_error(priv->pci_dev, txcmd_phys)))
|
||||||
|
goto drop_unlock_sta;
|
||||||
dma_unmap_addr_set(out_meta, mapping, txcmd_phys);
|
dma_unmap_addr_set(out_meta, mapping, txcmd_phys);
|
||||||
dma_unmap_len_set(out_meta, len, firstlen);
|
dma_unmap_len_set(out_meta, len, firstlen);
|
||||||
/* Add buffer containing Tx command and MAC(!) header to TFD's
|
|
||||||
* first entry */
|
|
||||||
priv->cfg->ops->lib->txq_attach_buf_to_tfd(priv, txq,
|
|
||||||
txcmd_phys, firstlen, 1, 0);
|
|
||||||
|
|
||||||
if (!ieee80211_has_morefrags(hdr->frame_control)) {
|
if (!ieee80211_has_morefrags(hdr->frame_control)) {
|
||||||
txq->need_update = 1;
|
txq->need_update = 1;
|
||||||
|
@ -746,10 +732,30 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
|
||||||
if (secondlen > 0) {
|
if (secondlen > 0) {
|
||||||
phys_addr = pci_map_single(priv->pci_dev, skb->data + hdr_len,
|
phys_addr = pci_map_single(priv->pci_dev, skb->data + hdr_len,
|
||||||
secondlen, PCI_DMA_TODEVICE);
|
secondlen, PCI_DMA_TODEVICE);
|
||||||
|
if (unlikely(pci_dma_mapping_error(priv->pci_dev, phys_addr))) {
|
||||||
|
pci_unmap_single(priv->pci_dev,
|
||||||
|
dma_unmap_addr(out_meta, mapping),
|
||||||
|
dma_unmap_len(out_meta, len),
|
||||||
|
PCI_DMA_BIDIRECTIONAL);
|
||||||
|
goto drop_unlock_sta;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ieee80211_is_data_qos(fc)) {
|
||||||
|
priv->stations[sta_id].tid[tid].tfds_in_queue++;
|
||||||
|
if (!ieee80211_has_morefrags(fc))
|
||||||
|
priv->stations[sta_id].tid[tid].seq_number = seq_number;
|
||||||
|
}
|
||||||
|
|
||||||
|
spin_unlock(&priv->sta_lock);
|
||||||
|
|
||||||
|
/* Attach buffers to TFD */
|
||||||
|
priv->cfg->ops->lib->txq_attach_buf_to_tfd(priv, txq,
|
||||||
|
txcmd_phys, firstlen, 1, 0);
|
||||||
|
if (secondlen > 0)
|
||||||
priv->cfg->ops->lib->txq_attach_buf_to_tfd(priv, txq,
|
priv->cfg->ops->lib->txq_attach_buf_to_tfd(priv, txq,
|
||||||
phys_addr, secondlen,
|
phys_addr, secondlen,
|
||||||
0, 0);
|
0, 0);
|
||||||
}
|
|
||||||
|
|
||||||
scratch_phys = txcmd_phys + sizeof(struct iwl_cmd_header) +
|
scratch_phys = txcmd_phys + sizeof(struct iwl_cmd_header) +
|
||||||
offsetof(struct iwl_tx_cmd, scratch);
|
offsetof(struct iwl_tx_cmd, scratch);
|
||||||
|
@ -768,8 +774,8 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
|
||||||
|
|
||||||
/* Set up entry for this TFD in Tx byte-count array */
|
/* Set up entry for this TFD in Tx byte-count array */
|
||||||
if (info->flags & IEEE80211_TX_CTL_AMPDU)
|
if (info->flags & IEEE80211_TX_CTL_AMPDU)
|
||||||
priv->cfg->ops->lib->txq_update_byte_cnt_tbl(priv, txq,
|
iwlagn_txq_update_byte_cnt_tbl(priv, txq,
|
||||||
le16_to_cpu(tx_cmd->len));
|
le16_to_cpu(tx_cmd->len));
|
||||||
|
|
||||||
pci_dma_sync_single_for_device(priv->pci_dev, txcmd_phys,
|
pci_dma_sync_single_for_device(priv->pci_dev, txcmd_phys,
|
||||||
firstlen, PCI_DMA_BIDIRECTIONAL);
|
firstlen, PCI_DMA_BIDIRECTIONAL);
|
||||||
|
@ -815,7 +821,9 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
drop_unlock:
|
drop_unlock_sta:
|
||||||
|
spin_unlock(&priv->sta_lock);
|
||||||
|
drop_unlock_priv:
|
||||||
spin_unlock_irqrestore(&priv->lock, flags);
|
spin_unlock_irqrestore(&priv->lock, flags);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
@ -1248,8 +1256,7 @@ int iwlagn_tx_queue_reclaim(struct iwl_priv *priv, int txq_id, int index)
|
||||||
txq_id >= IWLAGN_FIRST_AMPDU_QUEUE);
|
txq_id >= IWLAGN_FIRST_AMPDU_QUEUE);
|
||||||
tx_info->skb = NULL;
|
tx_info->skb = NULL;
|
||||||
|
|
||||||
if (priv->cfg->ops->lib->txq_inval_byte_cnt_tbl)
|
iwlagn_txq_inval_byte_cnt_tbl(priv, txq);
|
||||||
priv->cfg->ops->lib->txq_inval_byte_cnt_tbl(priv, txq);
|
|
||||||
|
|
||||||
priv->cfg->ops->lib->txq_free_tfd(priv, txq);
|
priv->cfg->ops->lib->txq_free_tfd(priv, txq);
|
||||||
}
|
}
|
||||||
|
|
|
@ -269,7 +269,7 @@ void iwlagn_rx_calib_result(struct iwl_priv *priv,
|
||||||
iwl_calib_set(&priv->calib_results[index], pkt->u.raw, len);
|
iwl_calib_set(&priv->calib_results[index], pkt->u.raw, len);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int iwlagn_init_alive_start(struct iwl_priv *priv)
|
int iwlagn_init_alive_start(struct iwl_priv *priv)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
|
|
@ -102,70 +102,6 @@ void iwl_update_chain_flags(struct iwl_priv *priv)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void iwl_clear_free_frames(struct iwl_priv *priv)
|
|
||||||
{
|
|
||||||
struct list_head *element;
|
|
||||||
|
|
||||||
IWL_DEBUG_INFO(priv, "%d frames on pre-allocated heap on clear.\n",
|
|
||||||
priv->frames_count);
|
|
||||||
|
|
||||||
while (!list_empty(&priv->free_frames)) {
|
|
||||||
element = priv->free_frames.next;
|
|
||||||
list_del(element);
|
|
||||||
kfree(list_entry(element, struct iwl_frame, list));
|
|
||||||
priv->frames_count--;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (priv->frames_count) {
|
|
||||||
IWL_WARN(priv, "%d frames still in use. Did we lose one?\n",
|
|
||||||
priv->frames_count);
|
|
||||||
priv->frames_count = 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct iwl_frame *iwl_get_free_frame(struct iwl_priv *priv)
|
|
||||||
{
|
|
||||||
struct iwl_frame *frame;
|
|
||||||
struct list_head *element;
|
|
||||||
if (list_empty(&priv->free_frames)) {
|
|
||||||
frame = kzalloc(sizeof(*frame), GFP_KERNEL);
|
|
||||||
if (!frame) {
|
|
||||||
IWL_ERR(priv, "Could not allocate frame!\n");
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
priv->frames_count++;
|
|
||||||
return frame;
|
|
||||||
}
|
|
||||||
|
|
||||||
element = priv->free_frames.next;
|
|
||||||
list_del(element);
|
|
||||||
return list_entry(element, struct iwl_frame, list);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void iwl_free_frame(struct iwl_priv *priv, struct iwl_frame *frame)
|
|
||||||
{
|
|
||||||
memset(frame, 0, sizeof(*frame));
|
|
||||||
list_add(&frame->list, &priv->free_frames);
|
|
||||||
}
|
|
||||||
|
|
||||||
static u32 iwl_fill_beacon_frame(struct iwl_priv *priv,
|
|
||||||
struct ieee80211_hdr *hdr,
|
|
||||||
int left)
|
|
||||||
{
|
|
||||||
lockdep_assert_held(&priv->mutex);
|
|
||||||
|
|
||||||
if (!priv->beacon_skb)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
if (priv->beacon_skb->len > left)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
memcpy(hdr, priv->beacon_skb->data, priv->beacon_skb->len);
|
|
||||||
|
|
||||||
return priv->beacon_skb->len;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Parse the beacon frame to find the TIM element and set tim_idx & tim_size */
|
/* Parse the beacon frame to find the TIM element and set tim_idx & tim_size */
|
||||||
static void iwl_set_beacon_tim(struct iwl_priv *priv,
|
static void iwl_set_beacon_tim(struct iwl_priv *priv,
|
||||||
struct iwl_tx_beacon_cmd *tx_beacon_cmd,
|
struct iwl_tx_beacon_cmd *tx_beacon_cmd,
|
||||||
|
@ -193,13 +129,18 @@ static void iwl_set_beacon_tim(struct iwl_priv *priv,
|
||||||
IWL_WARN(priv, "Unable to find TIM Element in beacon\n");
|
IWL_WARN(priv, "Unable to find TIM Element in beacon\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
static unsigned int iwl_hw_get_beacon_cmd(struct iwl_priv *priv,
|
int iwlagn_send_beacon_cmd(struct iwl_priv *priv)
|
||||||
struct iwl_frame *frame)
|
|
||||||
{
|
{
|
||||||
struct iwl_tx_beacon_cmd *tx_beacon_cmd;
|
struct iwl_tx_beacon_cmd *tx_beacon_cmd;
|
||||||
|
struct iwl_host_cmd cmd = {
|
||||||
|
.id = REPLY_TX_BEACON,
|
||||||
|
.flags = CMD_SIZE_HUGE,
|
||||||
|
};
|
||||||
u32 frame_size;
|
u32 frame_size;
|
||||||
u32 rate_flags;
|
u32 rate_flags;
|
||||||
u32 rate;
|
u32 rate;
|
||||||
|
int err;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* We have to set up the TX command, the TX Beacon command, and the
|
* We have to set up the TX command, the TX Beacon command, and the
|
||||||
* beacon contents.
|
* beacon contents.
|
||||||
|
@ -212,17 +153,19 @@ static unsigned int iwl_hw_get_beacon_cmd(struct iwl_priv *priv,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Initialize memory */
|
if (WARN_ON(!priv->beacon_skb))
|
||||||
tx_beacon_cmd = &frame->u.beacon;
|
return -EINVAL;
|
||||||
memset(tx_beacon_cmd, 0, sizeof(*tx_beacon_cmd));
|
|
||||||
|
/* Allocate beacon memory */
|
||||||
|
tx_beacon_cmd = kzalloc(sizeof(*tx_beacon_cmd) + priv->beacon_skb->len,
|
||||||
|
GFP_KERNEL);
|
||||||
|
if (!tx_beacon_cmd)
|
||||||
|
return -ENOMEM;
|
||||||
|
|
||||||
|
frame_size = priv->beacon_skb->len;
|
||||||
|
|
||||||
/* Set up TX beacon contents */
|
/* Set up TX beacon contents */
|
||||||
frame_size = iwl_fill_beacon_frame(priv, tx_beacon_cmd->frame,
|
memcpy(tx_beacon_cmd->frame, priv->beacon_skb->data, frame_size);
|
||||||
sizeof(frame->u) - sizeof(*tx_beacon_cmd));
|
|
||||||
if (WARN_ON_ONCE(frame_size > MAX_MPDU_SIZE))
|
|
||||||
return 0;
|
|
||||||
if (!frame_size)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
/* Set up TX command fields */
|
/* Set up TX command fields */
|
||||||
tx_beacon_cmd->tx.len = cpu_to_le16((u16)frame_size);
|
tx_beacon_cmd->tx.len = cpu_to_le16((u16)frame_size);
|
||||||
|
@ -245,41 +188,16 @@ static unsigned int iwl_hw_get_beacon_cmd(struct iwl_priv *priv,
|
||||||
tx_beacon_cmd->tx.rate_n_flags = iwl_hw_set_rate_n_flags(rate,
|
tx_beacon_cmd->tx.rate_n_flags = iwl_hw_set_rate_n_flags(rate,
|
||||||
rate_flags);
|
rate_flags);
|
||||||
|
|
||||||
return sizeof(*tx_beacon_cmd) + frame_size;
|
/* Submit command */
|
||||||
}
|
cmd.len = sizeof(*tx_beacon_cmd) + frame_size;
|
||||||
|
cmd.data = tx_beacon_cmd;
|
||||||
|
|
||||||
int iwlagn_send_beacon_cmd(struct iwl_priv *priv)
|
err = iwl_send_cmd_sync(priv, &cmd);
|
||||||
{
|
|
||||||
struct iwl_frame *frame;
|
|
||||||
unsigned int frame_size;
|
|
||||||
int rc;
|
|
||||||
struct iwl_host_cmd cmd = {
|
|
||||||
.id = REPLY_TX_BEACON,
|
|
||||||
.flags = CMD_SIZE_HUGE,
|
|
||||||
};
|
|
||||||
|
|
||||||
frame = iwl_get_free_frame(priv);
|
/* Free temporary storage */
|
||||||
if (!frame) {
|
kfree(tx_beacon_cmd);
|
||||||
IWL_ERR(priv, "Could not obtain free frame buffer for beacon "
|
|
||||||
"command.\n");
|
|
||||||
return -ENOMEM;
|
|
||||||
}
|
|
||||||
|
|
||||||
frame_size = iwl_hw_get_beacon_cmd(priv, frame);
|
return err;
|
||||||
if (!frame_size) {
|
|
||||||
IWL_ERR(priv, "Error configuring the beacon command\n");
|
|
||||||
iwl_free_frame(priv, frame);
|
|
||||||
return -EINVAL;
|
|
||||||
}
|
|
||||||
|
|
||||||
cmd.len = frame_size;
|
|
||||||
cmd.data = &frame->u.cmd[0];
|
|
||||||
|
|
||||||
rc = iwl_send_cmd_sync(priv, &cmd);
|
|
||||||
|
|
||||||
iwl_free_frame(priv, frame);
|
|
||||||
|
|
||||||
return rc;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline dma_addr_t iwl_tfd_tb_get_addr(struct iwl_tfd *tfd, u8 idx)
|
static inline dma_addr_t iwl_tfd_tb_get_addr(struct iwl_tfd *tfd, u8 idx)
|
||||||
|
@ -776,6 +694,8 @@ static void iwl_rx_handle(struct iwl_priv *priv)
|
||||||
|
|
||||||
wake_up_all(&priv->_agn.notif_waitq);
|
wake_up_all(&priv->_agn.notif_waitq);
|
||||||
}
|
}
|
||||||
|
if (priv->pre_rx_handler)
|
||||||
|
priv->pre_rx_handler(priv, rxb);
|
||||||
|
|
||||||
/* Based on type of command response or notification,
|
/* Based on type of command response or notification,
|
||||||
* handle those that need handling via function in
|
* handle those that need handling via function in
|
||||||
|
@ -2211,7 +2131,7 @@ static int iwlagn_send_calib_cfg_rt(struct iwl_priv *priv, u32 cfg)
|
||||||
* from protocol/runtime uCode (initialization uCode's
|
* from protocol/runtime uCode (initialization uCode's
|
||||||
* Alive gets handled by iwl_init_alive_start()).
|
* Alive gets handled by iwl_init_alive_start()).
|
||||||
*/
|
*/
|
||||||
static int iwl_alive_start(struct iwl_priv *priv)
|
int iwl_alive_start(struct iwl_priv *priv)
|
||||||
{
|
{
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
|
struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
|
||||||
|
@ -2354,9 +2274,6 @@ static void __iwl_down(struct iwl_priv *priv)
|
||||||
|
|
||||||
dev_kfree_skb(priv->beacon_skb);
|
dev_kfree_skb(priv->beacon_skb);
|
||||||
priv->beacon_skb = NULL;
|
priv->beacon_skb = NULL;
|
||||||
|
|
||||||
/* clear out any free frames */
|
|
||||||
iwl_clear_free_frames(priv);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void iwl_down(struct iwl_priv *priv)
|
static void iwl_down(struct iwl_priv *priv)
|
||||||
|
@ -3414,8 +3331,6 @@ static int iwl_init_drv(struct iwl_priv *priv)
|
||||||
spin_lock_init(&priv->sta_lock);
|
spin_lock_init(&priv->sta_lock);
|
||||||
spin_lock_init(&priv->hcmd_lock);
|
spin_lock_init(&priv->hcmd_lock);
|
||||||
|
|
||||||
INIT_LIST_HEAD(&priv->free_frames);
|
|
||||||
|
|
||||||
mutex_init(&priv->mutex);
|
mutex_init(&priv->mutex);
|
||||||
|
|
||||||
priv->ieee_channels = NULL;
|
priv->ieee_channels = NULL;
|
||||||
|
@ -3507,6 +3422,7 @@ struct ieee80211_ops iwlagn_hw_ops = {
|
||||||
.cancel_remain_on_channel = iwl_mac_cancel_remain_on_channel,
|
.cancel_remain_on_channel = iwl_mac_cancel_remain_on_channel,
|
||||||
.offchannel_tx = iwl_mac_offchannel_tx,
|
.offchannel_tx = iwl_mac_offchannel_tx,
|
||||||
.offchannel_tx_cancel_wait = iwl_mac_offchannel_tx_cancel_wait,
|
.offchannel_tx_cancel_wait = iwl_mac_offchannel_tx_cancel_wait,
|
||||||
|
CFG80211_TESTMODE_CMD(iwl_testmode_cmd)
|
||||||
};
|
};
|
||||||
|
|
||||||
static u32 iwl_hw_detect(struct iwl_priv *priv)
|
static u32 iwl_hw_detect(struct iwl_priv *priv)
|
||||||
|
@ -3816,6 +3732,7 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
||||||
|
|
||||||
iwl_setup_deferred_work(priv);
|
iwl_setup_deferred_work(priv);
|
||||||
iwl_setup_rx_handlers(priv);
|
iwl_setup_rx_handlers(priv);
|
||||||
|
iwl_testmode_init(priv);
|
||||||
|
|
||||||
/*********************************************
|
/*********************************************
|
||||||
* 8. Enable interrupts and read RFKILL state
|
* 8. Enable interrupts and read RFKILL state
|
||||||
|
|
|
@ -139,11 +139,6 @@ void iwlagn_set_wr_ptrs(struct iwl_priv *priv,
|
||||||
void iwlagn_tx_queue_set_status(struct iwl_priv *priv,
|
void iwlagn_tx_queue_set_status(struct iwl_priv *priv,
|
||||||
struct iwl_tx_queue *txq,
|
struct iwl_tx_queue *txq,
|
||||||
int tx_fifo_id, int scd_retry);
|
int tx_fifo_id, int scd_retry);
|
||||||
void iwlagn_txq_update_byte_cnt_tbl(struct iwl_priv *priv,
|
|
||||||
struct iwl_tx_queue *txq,
|
|
||||||
u16 byte_cnt);
|
|
||||||
void iwlagn_txq_inval_byte_cnt_tbl(struct iwl_priv *priv,
|
|
||||||
struct iwl_tx_queue *txq);
|
|
||||||
void iwlagn_txq_set_sched(struct iwl_priv *priv, u32 mask);
|
void iwlagn_txq_set_sched(struct iwl_priv *priv, u32 mask);
|
||||||
void iwl_free_tfds_in_queue(struct iwl_priv *priv,
|
void iwl_free_tfds_in_queue(struct iwl_priv *priv,
|
||||||
int sta_id, int tid, int freed);
|
int sta_id, int tid, int freed);
|
||||||
|
@ -344,5 +339,22 @@ iwlagn_wait_notification(struct iwl_priv *priv,
|
||||||
void __releases(wait_entry)
|
void __releases(wait_entry)
|
||||||
iwlagn_remove_notification(struct iwl_priv *priv,
|
iwlagn_remove_notification(struct iwl_priv *priv,
|
||||||
struct iwl_notification_wait *wait_entry);
|
struct iwl_notification_wait *wait_entry);
|
||||||
|
extern int iwlagn_init_alive_start(struct iwl_priv *priv);
|
||||||
|
extern int iwl_alive_start(struct iwl_priv *priv);
|
||||||
|
/* svtool */
|
||||||
|
#ifdef CONFIG_IWLWIFI_DEVICE_SVTOOL
|
||||||
|
extern int iwl_testmode_cmd(struct ieee80211_hw *hw, void *data, int len);
|
||||||
|
extern void iwl_testmode_init(struct iwl_priv *priv);
|
||||||
|
#else
|
||||||
|
static inline
|
||||||
|
int iwl_testmode_cmd(struct ieee80211_hw *hw, void *data, int len)
|
||||||
|
{
|
||||||
|
return -ENOSYS;
|
||||||
|
}
|
||||||
|
static inline
|
||||||
|
void iwl_testmode_init(struct iwl_priv *priv)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif /* __iwl_agn_h__ */
|
#endif /* __iwl_agn_h__ */
|
||||||
|
|
|
@ -99,7 +99,6 @@ struct iwl_hcmd_ops {
|
||||||
};
|
};
|
||||||
|
|
||||||
struct iwl_hcmd_utils_ops {
|
struct iwl_hcmd_utils_ops {
|
||||||
u16 (*get_hcmd_size)(u8 cmd_id, u16 len);
|
|
||||||
u16 (*build_addsta_hcmd)(const struct iwl_addsta_cmd *cmd, u8 *data);
|
u16 (*build_addsta_hcmd)(const struct iwl_addsta_cmd *cmd, u8 *data);
|
||||||
void (*gain_computation)(struct iwl_priv *priv,
|
void (*gain_computation)(struct iwl_priv *priv,
|
||||||
u32 *average_noise,
|
u32 *average_noise,
|
||||||
|
@ -129,11 +128,6 @@ struct iwl_lib_ops {
|
||||||
/* set hw dependent parameters */
|
/* set hw dependent parameters */
|
||||||
int (*set_hw_params)(struct iwl_priv *priv);
|
int (*set_hw_params)(struct iwl_priv *priv);
|
||||||
/* Handling TX */
|
/* Handling TX */
|
||||||
void (*txq_update_byte_cnt_tbl)(struct iwl_priv *priv,
|
|
||||||
struct iwl_tx_queue *txq,
|
|
||||||
u16 byte_cnt);
|
|
||||||
void (*txq_inval_byte_cnt_tbl)(struct iwl_priv *priv,
|
|
||||||
struct iwl_tx_queue *txq);
|
|
||||||
void (*txq_set_sched)(struct iwl_priv *priv, u32 mask);
|
void (*txq_set_sched)(struct iwl_priv *priv, u32 mask);
|
||||||
int (*txq_attach_buf_to_tfd)(struct iwl_priv *priv,
|
int (*txq_attach_buf_to_tfd)(struct iwl_priv *priv,
|
||||||
struct iwl_tx_queue *txq,
|
struct iwl_tx_queue *txq,
|
||||||
|
|
|
@ -238,15 +238,6 @@ struct iwl_channel_info {
|
||||||
#define IEEE80211_HLEN (IEEE80211_4ADDR_LEN)
|
#define IEEE80211_HLEN (IEEE80211_4ADDR_LEN)
|
||||||
#define IEEE80211_FRAME_LEN (IEEE80211_DATA_LEN + IEEE80211_HLEN)
|
#define IEEE80211_FRAME_LEN (IEEE80211_DATA_LEN + IEEE80211_HLEN)
|
||||||
|
|
||||||
struct iwl_frame {
|
|
||||||
union {
|
|
||||||
struct ieee80211_hdr frame;
|
|
||||||
struct iwl_tx_beacon_cmd beacon;
|
|
||||||
u8 raw[IEEE80211_FRAME_LEN];
|
|
||||||
u8 cmd[360];
|
|
||||||
} u;
|
|
||||||
struct list_head list;
|
|
||||||
};
|
|
||||||
|
|
||||||
#define SEQ_TO_SN(seq) (((seq) & IEEE80211_SCTL_SEQ) >> 4)
|
#define SEQ_TO_SN(seq) (((seq) & IEEE80211_SCTL_SEQ) >> 4)
|
||||||
#define SN_TO_SEQ(ssn) (((ssn) << 4) & IEEE80211_SCTL_SEQ)
|
#define SN_TO_SEQ(ssn) (((ssn) << 4) & IEEE80211_SCTL_SEQ)
|
||||||
|
@ -1188,12 +1179,10 @@ struct iwl_priv {
|
||||||
struct ieee80211_rate *ieee_rates;
|
struct ieee80211_rate *ieee_rates;
|
||||||
struct iwl_cfg *cfg;
|
struct iwl_cfg *cfg;
|
||||||
|
|
||||||
/* temporary frame storage list */
|
|
||||||
struct list_head free_frames;
|
|
||||||
int frames_count;
|
|
||||||
|
|
||||||
enum ieee80211_band band;
|
enum ieee80211_band band;
|
||||||
|
|
||||||
|
void (*pre_rx_handler)(struct iwl_priv *priv,
|
||||||
|
struct iwl_rx_mem_buffer *rxb);
|
||||||
void (*rx_handlers[REPLY_MAX])(struct iwl_priv *priv,
|
void (*rx_handlers[REPLY_MAX])(struct iwl_priv *priv,
|
||||||
struct iwl_rx_mem_buffer *rxb);
|
struct iwl_rx_mem_buffer *rxb);
|
||||||
|
|
||||||
|
|
469
drivers/net/wireless/iwlwifi/iwl-sv-open.c
Normal file
469
drivers/net/wireless/iwlwifi/iwl-sv-open.c
Normal file
|
@ -0,0 +1,469 @@
|
||||||
|
/******************************************************************************
|
||||||
|
*
|
||||||
|
* This file is provided under a dual BSD/GPLv2 license. When using or
|
||||||
|
* redistributing this file, you may do so under either license.
|
||||||
|
*
|
||||||
|
* GPL LICENSE SUMMARY
|
||||||
|
*
|
||||||
|
* Copyright(c) 2010 - 2011 Intel Corporation. All rights reserved.
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of version 2 of the GNU General Public License 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 Street, Fifth Floor, Boston, MA 02110,
|
||||||
|
* USA
|
||||||
|
*
|
||||||
|
* The full GNU General Public License is included in this distribution
|
||||||
|
* in the file called LICENSE.GPL.
|
||||||
|
*
|
||||||
|
* Contact Information:
|
||||||
|
* Intel Linux Wireless <ilw@linux.intel.com>
|
||||||
|
* Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
|
||||||
|
*
|
||||||
|
* BSD LICENSE
|
||||||
|
*
|
||||||
|
* Copyright(c) 2010 - 2011 Intel Corporation. All rights reserved.
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions
|
||||||
|
* are met:
|
||||||
|
*
|
||||||
|
* * Redistributions of source code must retain the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer.
|
||||||
|
* * Redistributions in binary form must reproduce the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer in
|
||||||
|
* the documentation and/or other materials provided with the
|
||||||
|
* distribution.
|
||||||
|
* * Neither the name Intel Corporation nor the names of its
|
||||||
|
* contributors may be used to endorse or promote products derived
|
||||||
|
* from this software without specific prior written permission.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||||
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||||
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||||
|
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||||
|
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||||
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||||
|
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||||
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||||
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||||
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*
|
||||||
|
*****************************************************************************/
|
||||||
|
#include <linux/init.h>
|
||||||
|
#include <linux/kernel.h>
|
||||||
|
#include <linux/module.h>
|
||||||
|
#include <net/net_namespace.h>
|
||||||
|
#include <linux/netdevice.h>
|
||||||
|
#include <net/cfg80211.h>
|
||||||
|
#include <net/mac80211.h>
|
||||||
|
#include <net/netlink.h>
|
||||||
|
|
||||||
|
|
||||||
|
#include "iwl-dev.h"
|
||||||
|
#include "iwl-core.h"
|
||||||
|
#include "iwl-debug.h"
|
||||||
|
#include "iwl-fh.h"
|
||||||
|
#include "iwl-io.h"
|
||||||
|
#include "iwl-agn.h"
|
||||||
|
#include "iwl-testmode.h"
|
||||||
|
|
||||||
|
|
||||||
|
/* The TLVs used in the gnl message policy between the kernel module and
|
||||||
|
* user space application. iwl_testmode_gnl_msg_policy is to be carried
|
||||||
|
* through the NL80211_CMD_TESTMODE channel regulated by nl80211.
|
||||||
|
* See iwl-testmode.h
|
||||||
|
*/
|
||||||
|
static
|
||||||
|
struct nla_policy iwl_testmode_gnl_msg_policy[IWL_TM_ATTR_MAX] = {
|
||||||
|
[IWL_TM_ATTR_COMMAND] = { .type = NLA_U32, },
|
||||||
|
|
||||||
|
[IWL_TM_ATTR_UCODE_CMD_ID] = { .type = NLA_U8, },
|
||||||
|
[IWL_TM_ATTR_UCODE_CMD_DATA] = { .type = NLA_UNSPEC, },
|
||||||
|
|
||||||
|
[IWL_TM_ATTR_REG_OFFSET] = { .type = NLA_U32, },
|
||||||
|
[IWL_TM_ATTR_REG_VALUE8] = { .type = NLA_U8, },
|
||||||
|
[IWL_TM_ATTR_REG_VALUE32] = { .type = NLA_U32, },
|
||||||
|
|
||||||
|
[IWL_TM_ATTR_SYNC_RSP] = { .type = NLA_UNSPEC, },
|
||||||
|
[IWL_TM_ATTR_UCODE_RX_PKT] = { .type = NLA_UNSPEC, },
|
||||||
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
* See the struct iwl_rx_packet in iwl-commands.h for the format of the
|
||||||
|
* received events from the device
|
||||||
|
*/
|
||||||
|
static inline int get_event_length(struct iwl_rx_mem_buffer *rxb)
|
||||||
|
{
|
||||||
|
struct iwl_rx_packet *pkt = rxb_addr(rxb);
|
||||||
|
if (pkt)
|
||||||
|
return le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK;
|
||||||
|
else
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This function multicasts the spontaneous messages from the device to the
|
||||||
|
* user space. It is invoked whenever there is a received messages
|
||||||
|
* from the device. This function is called within the ISR of the rx handlers
|
||||||
|
* in iwlagn driver.
|
||||||
|
*
|
||||||
|
* The parsing of the message content is left to the user space application,
|
||||||
|
* The message content is treated as unattacked raw data and is encapsulated
|
||||||
|
* with IWL_TM_ATTR_UCODE_RX_PKT multicasting to the user space.
|
||||||
|
*
|
||||||
|
* @priv: the instance of iwlwifi device
|
||||||
|
* @rxb: pointer to rx data content received by the ISR
|
||||||
|
*
|
||||||
|
* See the message policies and TLVs in iwl_testmode_gnl_msg_policy[].
|
||||||
|
* For the messages multicasting to the user application, the mandatory
|
||||||
|
* TLV fields are :
|
||||||
|
* IWL_TM_ATTR_COMMAND must be IWL_TM_CMD_DEV2APP_UCODE_RX_PKT
|
||||||
|
* IWL_TM_ATTR_UCODE_RX_PKT for carrying the message content
|
||||||
|
*/
|
||||||
|
|
||||||
|
static void iwl_testmode_ucode_rx_pkt(struct iwl_priv *priv,
|
||||||
|
struct iwl_rx_mem_buffer *rxb)
|
||||||
|
{
|
||||||
|
struct ieee80211_hw *hw = priv->hw;
|
||||||
|
struct sk_buff *skb;
|
||||||
|
void *data;
|
||||||
|
int length;
|
||||||
|
|
||||||
|
data = (void *)rxb_addr(rxb);
|
||||||
|
length = get_event_length(rxb);
|
||||||
|
|
||||||
|
if (!data || length == 0)
|
||||||
|
return;
|
||||||
|
|
||||||
|
skb = cfg80211_testmode_alloc_event_skb(hw->wiphy, 20 + length,
|
||||||
|
GFP_ATOMIC);
|
||||||
|
if (skb == NULL) {
|
||||||
|
IWL_DEBUG_INFO(priv,
|
||||||
|
"Run out of memory for messages to user space ?\n");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
NLA_PUT_U32(skb, IWL_TM_ATTR_COMMAND, IWL_TM_CMD_DEV2APP_UCODE_RX_PKT);
|
||||||
|
NLA_PUT(skb, IWL_TM_ATTR_UCODE_RX_PKT, length, data);
|
||||||
|
cfg80211_testmode_event(skb, GFP_ATOMIC);
|
||||||
|
return;
|
||||||
|
|
||||||
|
nla_put_failure:
|
||||||
|
kfree_skb(skb);
|
||||||
|
IWL_DEBUG_INFO(priv, "Ouch, overran buffer, check allocation!\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
void iwl_testmode_init(struct iwl_priv *priv)
|
||||||
|
{
|
||||||
|
priv->pre_rx_handler = iwl_testmode_ucode_rx_pkt;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This function handles the user application commands to the ucode.
|
||||||
|
*
|
||||||
|
* It retrieves the mandatory fields IWL_TM_ATTR_UCODE_CMD_ID and
|
||||||
|
* IWL_TM_ATTR_UCODE_CMD_DATA and calls to the handler to send the
|
||||||
|
* host command to the ucode.
|
||||||
|
*
|
||||||
|
* If any mandatory field is missing, -ENOMSG is replied to the user space
|
||||||
|
* application; otherwise, the actual execution result of the host command to
|
||||||
|
* ucode is replied.
|
||||||
|
*
|
||||||
|
* @hw: ieee80211_hw object that represents the device
|
||||||
|
* @tb: gnl message fields from the user space
|
||||||
|
*/
|
||||||
|
static int iwl_testmode_ucode(struct ieee80211_hw *hw, struct nlattr **tb)
|
||||||
|
{
|
||||||
|
struct iwl_priv *priv = hw->priv;
|
||||||
|
struct iwl_host_cmd cmd;
|
||||||
|
|
||||||
|
memset(&cmd, 0, sizeof(struct iwl_host_cmd));
|
||||||
|
|
||||||
|
if (!tb[IWL_TM_ATTR_UCODE_CMD_ID] ||
|
||||||
|
!tb[IWL_TM_ATTR_UCODE_CMD_DATA]) {
|
||||||
|
IWL_DEBUG_INFO(priv,
|
||||||
|
"Error finding ucode command mandatory fields\n");
|
||||||
|
return -ENOMSG;
|
||||||
|
}
|
||||||
|
|
||||||
|
cmd.id = nla_get_u8(tb[IWL_TM_ATTR_UCODE_CMD_ID]);
|
||||||
|
cmd.data = nla_data(tb[IWL_TM_ATTR_UCODE_CMD_DATA]);
|
||||||
|
cmd.len = nla_len(tb[IWL_TM_ATTR_UCODE_CMD_DATA]);
|
||||||
|
IWL_INFO(priv, "testmode ucode command ID 0x%x, flags 0x%x,"
|
||||||
|
" len %d\n", cmd.id, cmd.flags, cmd.len);
|
||||||
|
/* ok, let's submit the command to ucode */
|
||||||
|
return iwl_send_cmd(priv, &cmd);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This function handles the user application commands for register access.
|
||||||
|
*
|
||||||
|
* It retrieves command ID carried with IWL_TM_ATTR_COMMAND and calls to the
|
||||||
|
* handlers respectively.
|
||||||
|
*
|
||||||
|
* If it's an unknown commdn ID, -ENOSYS is returned; or -ENOMSG if the
|
||||||
|
* mandatory fields(IWL_TM_ATTR_REG_OFFSET,IWL_TM_ATTR_REG_VALUE32,
|
||||||
|
* IWL_TM_ATTR_REG_VALUE8) are missing; Otherwise 0 is replied indicating
|
||||||
|
* the success of the command execution.
|
||||||
|
*
|
||||||
|
* If IWL_TM_ATTR_COMMAND is IWL_TM_CMD_APP2DEV_REG_READ32, the register read
|
||||||
|
* value is returned with IWL_TM_ATTR_REG_VALUE32.
|
||||||
|
*
|
||||||
|
* @hw: ieee80211_hw object that represents the device
|
||||||
|
* @tb: gnl message fields from the user space
|
||||||
|
*/
|
||||||
|
static int iwl_testmode_reg(struct ieee80211_hw *hw, struct nlattr **tb)
|
||||||
|
{
|
||||||
|
struct iwl_priv *priv = hw->priv;
|
||||||
|
u32 ofs, val32;
|
||||||
|
u8 val8;
|
||||||
|
struct sk_buff *skb;
|
||||||
|
int status = 0;
|
||||||
|
|
||||||
|
if (!tb[IWL_TM_ATTR_REG_OFFSET]) {
|
||||||
|
IWL_DEBUG_INFO(priv, "Error finding register offset\n");
|
||||||
|
return -ENOMSG;
|
||||||
|
}
|
||||||
|
ofs = nla_get_u32(tb[IWL_TM_ATTR_REG_OFFSET]);
|
||||||
|
IWL_INFO(priv, "testmode register access command offset 0x%x\n", ofs);
|
||||||
|
|
||||||
|
switch (nla_get_u32(tb[IWL_TM_ATTR_COMMAND])) {
|
||||||
|
case IWL_TM_CMD_APP2DEV_REG_READ32:
|
||||||
|
val32 = iwl_read32(priv, ofs);
|
||||||
|
IWL_INFO(priv, "32bit value to read 0x%x\n", val32);
|
||||||
|
|
||||||
|
skb = cfg80211_testmode_alloc_reply_skb(hw->wiphy, 20);
|
||||||
|
if (!skb) {
|
||||||
|
IWL_DEBUG_INFO(priv, "Error allocating memory\n");
|
||||||
|
return -ENOMEM;
|
||||||
|
}
|
||||||
|
NLA_PUT_U32(skb, IWL_TM_ATTR_REG_VALUE32, val32);
|
||||||
|
status = cfg80211_testmode_reply(skb);
|
||||||
|
if (status < 0)
|
||||||
|
IWL_DEBUG_INFO(priv,
|
||||||
|
"Error sending msg : %d\n", status);
|
||||||
|
break;
|
||||||
|
case IWL_TM_CMD_APP2DEV_REG_WRITE32:
|
||||||
|
if (!tb[IWL_TM_ATTR_REG_VALUE32]) {
|
||||||
|
IWL_DEBUG_INFO(priv,
|
||||||
|
"Error finding value to write\n");
|
||||||
|
return -ENOMSG;
|
||||||
|
} else {
|
||||||
|
val32 = nla_get_u32(tb[IWL_TM_ATTR_REG_VALUE32]);
|
||||||
|
IWL_INFO(priv, "32bit value to write 0x%x\n", val32);
|
||||||
|
iwl_write32(priv, ofs, val32);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case IWL_TM_CMD_APP2DEV_REG_WRITE8:
|
||||||
|
if (!tb[IWL_TM_ATTR_REG_VALUE8]) {
|
||||||
|
IWL_DEBUG_INFO(priv, "Error finding value to write\n");
|
||||||
|
return -ENOMSG;
|
||||||
|
} else {
|
||||||
|
val8 = nla_get_u8(tb[IWL_TM_ATTR_REG_VALUE8]);
|
||||||
|
IWL_INFO(priv, "8bit value to write 0x%x\n", val8);
|
||||||
|
iwl_write8(priv, ofs, val8);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
IWL_DEBUG_INFO(priv, "Unknown testmode register command ID\n");
|
||||||
|
return -ENOSYS;
|
||||||
|
}
|
||||||
|
|
||||||
|
return status;
|
||||||
|
|
||||||
|
nla_put_failure:
|
||||||
|
kfree_skb(skb);
|
||||||
|
return -EMSGSIZE;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static int iwl_testmode_cfg_init_calib(struct iwl_priv *priv)
|
||||||
|
{
|
||||||
|
struct iwl_notification_wait calib_wait;
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
iwlagn_init_notification_wait(priv, &calib_wait,
|
||||||
|
CALIBRATION_COMPLETE_NOTIFICATION,
|
||||||
|
NULL, NULL);
|
||||||
|
ret = iwlagn_init_alive_start(priv);
|
||||||
|
if (ret) {
|
||||||
|
IWL_DEBUG_INFO(priv,
|
||||||
|
"Error configuring init calibration: %d\n", ret);
|
||||||
|
goto cfg_init_calib_error;
|
||||||
|
}
|
||||||
|
|
||||||
|
ret = iwlagn_wait_notification(priv, &calib_wait, 2 * HZ);
|
||||||
|
if (ret)
|
||||||
|
IWL_DEBUG_INFO(priv, "Error detecting"
|
||||||
|
" CALIBRATION_COMPLETE_NOTIFICATION: %d\n", ret);
|
||||||
|
return ret;
|
||||||
|
|
||||||
|
cfg_init_calib_error:
|
||||||
|
iwlagn_remove_notification(priv, &calib_wait);
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This function handles the user application commands for driver.
|
||||||
|
*
|
||||||
|
* It retrieves command ID carried with IWL_TM_ATTR_COMMAND and calls to the
|
||||||
|
* handlers respectively.
|
||||||
|
*
|
||||||
|
* If it's an unknown commdn ID, -ENOSYS is replied; otherwise, the returned
|
||||||
|
* value of the actual command execution is replied to the user application.
|
||||||
|
*
|
||||||
|
* If there's any message responding to the user space, IWL_TM_ATTR_SYNC_RSP
|
||||||
|
* is used for carry the message while IWL_TM_ATTR_COMMAND must set to
|
||||||
|
* IWL_TM_CMD_DEV2APP_SYNC_RSP.
|
||||||
|
*
|
||||||
|
* @hw: ieee80211_hw object that represents the device
|
||||||
|
* @tb: gnl message fields from the user space
|
||||||
|
*/
|
||||||
|
static int iwl_testmode_driver(struct ieee80211_hw *hw, struct nlattr **tb)
|
||||||
|
{
|
||||||
|
struct iwl_priv *priv = hw->priv;
|
||||||
|
struct sk_buff *skb;
|
||||||
|
unsigned char *rsp_data_ptr = NULL;
|
||||||
|
int status = 0, rsp_data_len = 0;
|
||||||
|
|
||||||
|
switch (nla_get_u32(tb[IWL_TM_ATTR_COMMAND])) {
|
||||||
|
case IWL_TM_CMD_APP2DEV_GET_DEVICENAME:
|
||||||
|
rsp_data_ptr = (unsigned char *)priv->cfg->name;
|
||||||
|
rsp_data_len = strlen(priv->cfg->name);
|
||||||
|
skb = cfg80211_testmode_alloc_reply_skb(hw->wiphy,
|
||||||
|
rsp_data_len + 20);
|
||||||
|
if (!skb) {
|
||||||
|
IWL_DEBUG_INFO(priv,
|
||||||
|
"Error allocating memory\n");
|
||||||
|
return -ENOMEM;
|
||||||
|
}
|
||||||
|
NLA_PUT_U32(skb, IWL_TM_ATTR_COMMAND,
|
||||||
|
IWL_TM_CMD_DEV2APP_SYNC_RSP);
|
||||||
|
NLA_PUT(skb, IWL_TM_ATTR_SYNC_RSP,
|
||||||
|
rsp_data_len, rsp_data_ptr);
|
||||||
|
status = cfg80211_testmode_reply(skb);
|
||||||
|
if (status < 0)
|
||||||
|
IWL_DEBUG_INFO(priv, "Error sending msg : %d\n",
|
||||||
|
status);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case IWL_TM_CMD_APP2DEV_LOAD_INIT_FW:
|
||||||
|
status = iwlagn_load_ucode_wait_alive(priv, &priv->ucode_init,
|
||||||
|
UCODE_SUBTYPE_INIT, -1);
|
||||||
|
if (status)
|
||||||
|
IWL_DEBUG_INFO(priv,
|
||||||
|
"Error loading init ucode: %d\n", status);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case IWL_TM_CMD_APP2DEV_CFG_INIT_CALIB:
|
||||||
|
iwl_testmode_cfg_init_calib(priv);
|
||||||
|
iwlagn_stop_device(priv);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case IWL_TM_CMD_APP2DEV_LOAD_RUNTIME_FW:
|
||||||
|
status = iwlagn_load_ucode_wait_alive(priv,
|
||||||
|
&priv->ucode_rt,
|
||||||
|
UCODE_SUBTYPE_REGULAR,
|
||||||
|
UCODE_SUBTYPE_REGULAR_NEW);
|
||||||
|
if (status) {
|
||||||
|
IWL_DEBUG_INFO(priv,
|
||||||
|
"Error loading runtime ucode: %d\n", status);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
status = iwl_alive_start(priv);
|
||||||
|
if (status)
|
||||||
|
IWL_DEBUG_INFO(priv,
|
||||||
|
"Error starting the device: %d\n", status);
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
IWL_DEBUG_INFO(priv, "Unknown testmode driver command ID\n");
|
||||||
|
return -ENOSYS;
|
||||||
|
}
|
||||||
|
return status;
|
||||||
|
|
||||||
|
nla_put_failure:
|
||||||
|
kfree_skb(skb);
|
||||||
|
return -EMSGSIZE;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* The testmode gnl message handler that takes the gnl message from the
|
||||||
|
* user space and parses it per the policy iwl_testmode_gnl_msg_policy, then
|
||||||
|
* invoke the corresponding handlers.
|
||||||
|
*
|
||||||
|
* This function is invoked when there is user space application sending
|
||||||
|
* gnl message through the testmode tunnel NL80211_CMD_TESTMODE regulated
|
||||||
|
* by nl80211.
|
||||||
|
*
|
||||||
|
* It retrieves the mandatory field, IWL_TM_ATTR_COMMAND, before
|
||||||
|
* dispatching it to the corresponding handler.
|
||||||
|
*
|
||||||
|
* If IWL_TM_ATTR_COMMAND is missing, -ENOMSG is replied to user application;
|
||||||
|
* -ENOSYS is replied to the user application if the command is unknown;
|
||||||
|
* Otherwise, the command is dispatched to the respective handler.
|
||||||
|
*
|
||||||
|
* @hw: ieee80211_hw object that represents the device
|
||||||
|
* @data: pointer to user space message
|
||||||
|
* @len: length in byte of @data
|
||||||
|
*/
|
||||||
|
int iwl_testmode_cmd(struct ieee80211_hw *hw, void *data, int len)
|
||||||
|
{
|
||||||
|
struct nlattr *tb[IWL_TM_ATTR_MAX - 1];
|
||||||
|
struct iwl_priv *priv = hw->priv;
|
||||||
|
int result;
|
||||||
|
|
||||||
|
result = nla_parse(tb, IWL_TM_ATTR_MAX - 1, data, len,
|
||||||
|
iwl_testmode_gnl_msg_policy);
|
||||||
|
if (result != 0) {
|
||||||
|
IWL_DEBUG_INFO(priv,
|
||||||
|
"Error parsing the gnl message : %d\n", result);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* IWL_TM_ATTR_COMMAND is absolutely mandatory */
|
||||||
|
if (!tb[IWL_TM_ATTR_COMMAND]) {
|
||||||
|
IWL_DEBUG_INFO(priv, "Error finding testmode command type\n");
|
||||||
|
return -ENOMSG;
|
||||||
|
}
|
||||||
|
/* in case multiple accesses to the device happens */
|
||||||
|
mutex_lock(&priv->mutex);
|
||||||
|
|
||||||
|
switch (nla_get_u32(tb[IWL_TM_ATTR_COMMAND])) {
|
||||||
|
case IWL_TM_CMD_APP2DEV_UCODE:
|
||||||
|
IWL_DEBUG_INFO(priv, "testmode cmd to uCode\n");
|
||||||
|
result = iwl_testmode_ucode(hw, tb);
|
||||||
|
break;
|
||||||
|
case IWL_TM_CMD_APP2DEV_REG_READ32:
|
||||||
|
case IWL_TM_CMD_APP2DEV_REG_WRITE32:
|
||||||
|
case IWL_TM_CMD_APP2DEV_REG_WRITE8:
|
||||||
|
IWL_DEBUG_INFO(priv, "testmode cmd to register\n");
|
||||||
|
result = iwl_testmode_reg(hw, tb);
|
||||||
|
break;
|
||||||
|
case IWL_TM_CMD_APP2DEV_GET_DEVICENAME:
|
||||||
|
case IWL_TM_CMD_APP2DEV_LOAD_INIT_FW:
|
||||||
|
case IWL_TM_CMD_APP2DEV_CFG_INIT_CALIB:
|
||||||
|
case IWL_TM_CMD_APP2DEV_LOAD_RUNTIME_FW:
|
||||||
|
IWL_DEBUG_INFO(priv, "testmode cmd to driver\n");
|
||||||
|
result = iwl_testmode_driver(hw, tb);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
IWL_DEBUG_INFO(priv, "Unknown testmode command\n");
|
||||||
|
result = -ENOSYS;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
mutex_unlock(&priv->mutex);
|
||||||
|
return result;
|
||||||
|
}
|
151
drivers/net/wireless/iwlwifi/iwl-testmode.h
Normal file
151
drivers/net/wireless/iwlwifi/iwl-testmode.h
Normal file
|
@ -0,0 +1,151 @@
|
||||||
|
/******************************************************************************
|
||||||
|
*
|
||||||
|
* This file is provided under a dual BSD/GPLv2 license. When using or
|
||||||
|
* redistributing this file, you may do so under either license.
|
||||||
|
*
|
||||||
|
* GPL LICENSE SUMMARY
|
||||||
|
*
|
||||||
|
* Copyright(c) 2010 - 2011 Intel Corporation. All rights reserved.
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of version 2 of the GNU General Public License 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 Street, Fifth Floor, Boston, MA 02110,
|
||||||
|
* USA
|
||||||
|
*
|
||||||
|
* The full GNU General Public License is included in this distribution
|
||||||
|
* in the file called LICENSE.GPL.
|
||||||
|
*
|
||||||
|
* Contact Information:
|
||||||
|
* Intel Linux Wireless <ilw@linux.intel.com>
|
||||||
|
* Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
|
||||||
|
*
|
||||||
|
* BSD LICENSE
|
||||||
|
*
|
||||||
|
* Copyright(c) 2010 - 2011 Intel Corporation. All rights reserved.
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions
|
||||||
|
* are met:
|
||||||
|
*
|
||||||
|
* * Redistributions of source code must retain the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer.
|
||||||
|
* * Redistributions in binary form must reproduce the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer in
|
||||||
|
* the documentation and/or other materials provided with the
|
||||||
|
* distribution.
|
||||||
|
* * Neither the name Intel Corporation nor the names of its
|
||||||
|
* contributors may be used to endorse or promote products derived
|
||||||
|
* from this software without specific prior written permission.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||||
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||||
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||||
|
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||||
|
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||||
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||||
|
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||||
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||||
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||||
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*
|
||||||
|
*****************************************************************************/
|
||||||
|
#ifndef __IWL_TESTMODE_H__
|
||||||
|
#define __IWL_TESTMODE_H__
|
||||||
|
|
||||||
|
#include <linux/types.h>
|
||||||
|
|
||||||
|
|
||||||
|
/* Commands from user space to kernel space(IWL_TM_CMD_ID_APP2DEV_XX) and
|
||||||
|
* from and kernel space to user space(IWL_TM_CMD_ID_DEV2APP_XX).
|
||||||
|
* The command ID is carried with IWL_TM_ATTR_COMMAND. There are three types of
|
||||||
|
* of command from user space and two types of command from kernel space.
|
||||||
|
* See below.
|
||||||
|
*/
|
||||||
|
enum iwl_tm_cmd_t {
|
||||||
|
/* commands from user application to the uCode,
|
||||||
|
* the actual uCode host command ID is carried with
|
||||||
|
* IWL_TM_ATTR_UCODE_CMD_ID */
|
||||||
|
IWL_TM_CMD_APP2DEV_UCODE = 1,
|
||||||
|
|
||||||
|
/* commands from user applicaiton to access register */
|
||||||
|
IWL_TM_CMD_APP2DEV_REG_READ32,
|
||||||
|
IWL_TM_CMD_APP2DEV_REG_WRITE32,
|
||||||
|
IWL_TM_CMD_APP2DEV_REG_WRITE8,
|
||||||
|
|
||||||
|
/* commands fom user space for pure driver level operations */
|
||||||
|
IWL_TM_CMD_APP2DEV_GET_DEVICENAME,
|
||||||
|
IWL_TM_CMD_APP2DEV_LOAD_INIT_FW,
|
||||||
|
IWL_TM_CMD_APP2DEV_CFG_INIT_CALIB,
|
||||||
|
IWL_TM_CMD_APP2DEV_LOAD_RUNTIME_FW,
|
||||||
|
/* if there is other new command for the driver layer operation,
|
||||||
|
* append them here */
|
||||||
|
|
||||||
|
|
||||||
|
/* commands from kernel space to carry the synchronous response
|
||||||
|
* to user application */
|
||||||
|
IWL_TM_CMD_DEV2APP_SYNC_RSP,
|
||||||
|
|
||||||
|
/* commands from kernel space to multicast the spontaneous messages
|
||||||
|
* to user application */
|
||||||
|
IWL_TM_CMD_DEV2APP_UCODE_RX_PKT,
|
||||||
|
IWL_TM_CMD_MAX,
|
||||||
|
};
|
||||||
|
|
||||||
|
enum iwl_tm_attr_t {
|
||||||
|
IWL_TM_ATTR_NOT_APPLICABLE = 0,
|
||||||
|
|
||||||
|
/* From user space to kernel space:
|
||||||
|
* the command either destines to ucode, driver, or register;
|
||||||
|
* See enum iwl_tm_cmd_t.
|
||||||
|
*
|
||||||
|
* From kernel space to user space:
|
||||||
|
* the command either carries synchronous response,
|
||||||
|
* or the spontaneous message multicast from the device;
|
||||||
|
* See enum iwl_tm_cmd_t. */
|
||||||
|
IWL_TM_ATTR_COMMAND,
|
||||||
|
|
||||||
|
/* When IWL_TM_ATTR_COMMAND is IWL_TM_CMD_APP2DEV_UCODE,
|
||||||
|
* The mandatory fields are :
|
||||||
|
* IWL_TM_ATTR_UCODE_CMD_ID for recognizable command ID;
|
||||||
|
* IWL_TM_ATTR_COMMAND_FLAG for the flags of the commands;
|
||||||
|
* The optional fields are:
|
||||||
|
* IWL_TM_ATTR_UCODE_CMD_DATA for the actual command payload
|
||||||
|
* to the ucode */
|
||||||
|
IWL_TM_ATTR_UCODE_CMD_ID,
|
||||||
|
IWL_TM_ATTR_UCODE_CMD_DATA,
|
||||||
|
|
||||||
|
/* When IWL_TM_ATTR_COMMAND is IWL_TM_CMD_APP2DEV_REG_XXX,
|
||||||
|
* The mandatory fields are:
|
||||||
|
* IWL_TM_ATTR_REG_OFFSET for the offset of the target register;
|
||||||
|
* IWL_TM_ATTR_REG_VALUE8 or IWL_TM_ATTR_REG_VALUE32 for value */
|
||||||
|
IWL_TM_ATTR_REG_OFFSET,
|
||||||
|
IWL_TM_ATTR_REG_VALUE8,
|
||||||
|
IWL_TM_ATTR_REG_VALUE32,
|
||||||
|
|
||||||
|
/* When IWL_TM_ATTR_COMMAND is IWL_TM_CMD_DEV2APP_SYNC_RSP,
|
||||||
|
* The mandatory fields are:
|
||||||
|
* IWL_TM_ATTR_SYNC_RSP for the data content responding to the user
|
||||||
|
* application command */
|
||||||
|
IWL_TM_ATTR_SYNC_RSP,
|
||||||
|
/* When IWL_TM_ATTR_COMMAND is IWL_TM_CMD_DEV2APP_UCODE_RX_PKT,
|
||||||
|
* The mandatory fields are:
|
||||||
|
* IWL_TM_ATTR_UCODE_RX_PKT for the data content multicast to the user
|
||||||
|
* application */
|
||||||
|
IWL_TM_ATTR_UCODE_RX_PKT,
|
||||||
|
|
||||||
|
IWL_TM_ATTR_MAX,
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
#endif
|
|
@ -442,12 +442,10 @@ int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
|
||||||
struct iwl_cmd_meta *out_meta;
|
struct iwl_cmd_meta *out_meta;
|
||||||
dma_addr_t phys_addr;
|
dma_addr_t phys_addr;
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
int len;
|
|
||||||
u32 idx;
|
u32 idx;
|
||||||
u16 fix_size;
|
u16 fix_size;
|
||||||
bool is_ct_kill = false;
|
bool is_ct_kill = false;
|
||||||
|
|
||||||
cmd->len = priv->cfg->ops->utils->get_hcmd_size(cmd->id, cmd->len);
|
|
||||||
fix_size = (u16)(cmd->len + sizeof(out_cmd->hdr));
|
fix_size = (u16)(cmd->len + sizeof(out_cmd->hdr));
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -502,7 +500,6 @@ int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
|
||||||
}
|
}
|
||||||
|
|
||||||
memset(out_meta, 0, sizeof(*out_meta)); /* re-initialize to NULL */
|
memset(out_meta, 0, sizeof(*out_meta)); /* re-initialize to NULL */
|
||||||
out_meta->flags = cmd->flags | CMD_MAPPED;
|
|
||||||
if (cmd->flags & CMD_WANT_SKB)
|
if (cmd->flags & CMD_WANT_SKB)
|
||||||
out_meta->source = cmd;
|
out_meta->source = cmd;
|
||||||
if (cmd->flags & CMD_ASYNC)
|
if (cmd->flags & CMD_ASYNC)
|
||||||
|
@ -519,9 +516,6 @@ int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
|
||||||
INDEX_TO_SEQ(q->write_ptr));
|
INDEX_TO_SEQ(q->write_ptr));
|
||||||
if (cmd->flags & CMD_SIZE_HUGE)
|
if (cmd->flags & CMD_SIZE_HUGE)
|
||||||
out_cmd->hdr.sequence |= SEQ_HUGE_FRAME;
|
out_cmd->hdr.sequence |= SEQ_HUGE_FRAME;
|
||||||
len = sizeof(struct iwl_device_cmd);
|
|
||||||
if (idx == TFD_CMD_SLOTS)
|
|
||||||
len = IWL_MAX_CMD_SIZE;
|
|
||||||
|
|
||||||
#ifdef CONFIG_IWLWIFI_DEBUG
|
#ifdef CONFIG_IWLWIFI_DEBUG
|
||||||
switch (out_cmd->hdr.cmd) {
|
switch (out_cmd->hdr.cmd) {
|
||||||
|
@ -543,17 +537,20 @@ int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
|
||||||
q->write_ptr, idx, priv->cmd_queue);
|
q->write_ptr, idx, priv->cmd_queue);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
txq->need_update = 1;
|
|
||||||
|
|
||||||
if (priv->cfg->ops->lib->txq_update_byte_cnt_tbl)
|
|
||||||
/* Set up entry in queue's byte count circular buffer */
|
|
||||||
priv->cfg->ops->lib->txq_update_byte_cnt_tbl(priv, txq, 0);
|
|
||||||
|
|
||||||
phys_addr = pci_map_single(priv->pci_dev, &out_cmd->hdr,
|
phys_addr = pci_map_single(priv->pci_dev, &out_cmd->hdr,
|
||||||
fix_size, PCI_DMA_BIDIRECTIONAL);
|
fix_size, PCI_DMA_BIDIRECTIONAL);
|
||||||
|
if (unlikely(pci_dma_mapping_error(priv->pci_dev, phys_addr))) {
|
||||||
|
idx = -ENOMEM;
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
|
||||||
dma_unmap_addr_set(out_meta, mapping, phys_addr);
|
dma_unmap_addr_set(out_meta, mapping, phys_addr);
|
||||||
dma_unmap_len_set(out_meta, len, fix_size);
|
dma_unmap_len_set(out_meta, len, fix_size);
|
||||||
|
|
||||||
|
out_meta->flags = cmd->flags | CMD_MAPPED;
|
||||||
|
|
||||||
|
txq->need_update = 1;
|
||||||
|
|
||||||
trace_iwlwifi_dev_hcmd(priv, &out_cmd->hdr, fix_size, cmd->flags);
|
trace_iwlwifi_dev_hcmd(priv, &out_cmd->hdr, fix_size, cmd->flags);
|
||||||
|
|
||||||
priv->cfg->ops->lib->txq_attach_buf_to_tfd(priv, txq,
|
priv->cfg->ops->lib->txq_attach_buf_to_tfd(priv, txq,
|
||||||
|
@ -564,6 +561,7 @@ int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
|
||||||
q->write_ptr = iwl_queue_inc_wrap(q->write_ptr, q->n_bd);
|
q->write_ptr = iwl_queue_inc_wrap(q->write_ptr, q->n_bd);
|
||||||
iwl_txq_update_write_ptr(priv, txq);
|
iwl_txq_update_write_ptr(priv, txq);
|
||||||
|
|
||||||
|
out:
|
||||||
spin_unlock_irqrestore(&priv->hcmd_lock, flags);
|
spin_unlock_irqrestore(&priv->hcmd_lock, flags);
|
||||||
return idx;
|
return idx;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue