mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-08-05 00:34:52 +00:00
ath6kl: add htc ops
In preparation for adding HTC pipe implementation add htc-ops.h to make it possible dynamically choose which HTC type is used. Needed for full USB support. Based on the code by Ray Chen <raychen@qca.qualcomm.com>. Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com> Signed-off-by: Ray Chen <raychen@qca.qualcomm.com> Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
This commit is contained in:
Kalle Valo
parent
048f24f695
commit
e76ac2bf63
10 changed files with 219 additions and 55 deletions
|
|
@ -25,7 +25,7 @@
|
|||
obj-$(CONFIG_ATH6KL) += ath6kl_core.o
|
||||
ath6kl_core-y += debug.o
|
||||
ath6kl_core-y += hif.o
|
||||
ath6kl_core-y += htc.o
|
||||
ath6kl_core-y += htc_mbox.o
|
||||
ath6kl_core-y += bmi.o
|
||||
ath6kl_core-y += cfg80211.o
|
||||
ath6kl_core-y += init.o
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@
|
|||
|
||||
#include "debug.h"
|
||||
#include "hif-ops.h"
|
||||
#include "htc-ops.h"
|
||||
#include "cfg80211.h"
|
||||
|
||||
unsigned int debug_mask;
|
||||
|
|
@ -39,12 +40,21 @@ module_param(uart_debug, uint, 0644);
|
|||
module_param(ath6kl_p2p, uint, 0644);
|
||||
module_param(testmode, uint, 0644);
|
||||
|
||||
int ath6kl_core_init(struct ath6kl *ar)
|
||||
int ath6kl_core_init(struct ath6kl *ar, enum ath6kl_htc_type htc_type)
|
||||
{
|
||||
struct ath6kl_bmi_target_info targ_info;
|
||||
struct net_device *ndev;
|
||||
int ret = 0, i;
|
||||
|
||||
switch (htc_type) {
|
||||
case ATH6KL_HTC_TYPE_MBOX:
|
||||
ath6kl_htc_mbox_attach(ar);
|
||||
break;
|
||||
default:
|
||||
WARN_ON(1);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
ar->ath6kl_wq = create_singlethread_workqueue("ath6kl");
|
||||
if (!ar->ath6kl_wq)
|
||||
return -ENOMEM;
|
||||
|
|
|
|||
|
|
@ -462,6 +462,10 @@ enum ath6kl_hif_type {
|
|||
ATH6KL_HIF_TYPE_USB,
|
||||
};
|
||||
|
||||
enum ath6kl_htc_type {
|
||||
ATH6KL_HTC_TYPE_MBOX,
|
||||
};
|
||||
|
||||
/* Max number of filters that hw supports */
|
||||
#define ATH6K_MAX_MC_FILTERS_PER_LIST 7
|
||||
struct ath6kl_mc_filter {
|
||||
|
|
@ -576,6 +580,7 @@ struct ath6kl {
|
|||
|
||||
struct ath6kl_bmi bmi;
|
||||
const struct ath6kl_hif_ops *hif_ops;
|
||||
const struct ath6kl_htc_ops *htc_ops;
|
||||
struct wmi *wmi;
|
||||
int tx_pending[ENDPOINT_MAX];
|
||||
int total_tx_data_pend;
|
||||
|
|
@ -831,7 +836,7 @@ int ath6kl_init_hw_params(struct ath6kl *ar);
|
|||
void ath6kl_check_wow_status(struct ath6kl *ar);
|
||||
|
||||
struct ath6kl *ath6kl_core_create(struct device *dev);
|
||||
int ath6kl_core_init(struct ath6kl *ar);
|
||||
int ath6kl_core_init(struct ath6kl *ar, enum ath6kl_htc_type htc_type);
|
||||
void ath6kl_core_cleanup(struct ath6kl *ar);
|
||||
void ath6kl_core_destroy(struct ath6kl *ar);
|
||||
|
||||
|
|
|
|||
113
drivers/net/wireless/ath/ath6kl/htc-ops.h
Normal file
113
drivers/net/wireless/ath/ath6kl/htc-ops.h
Normal file
|
|
@ -0,0 +1,113 @@
|
|||
/*
|
||||
* Copyright (c) 2004-2011 Atheros Communications Inc.
|
||||
*
|
||||
* Permission to use, copy, modify, and/or distribute this software for any
|
||||
* purpose with or without fee is hereby granted, provided that the above
|
||||
* copyright notice and this permission notice appear in all copies.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
#ifndef HTC_OPS_H
|
||||
#define HTC_OPS_H
|
||||
|
||||
#include "htc.h"
|
||||
#include "debug.h"
|
||||
|
||||
static inline void *ath6kl_htc_create(struct ath6kl *ar)
|
||||
{
|
||||
return ar->htc_ops->create(ar);
|
||||
}
|
||||
|
||||
static inline int ath6kl_htc_wait_target(struct htc_target *target)
|
||||
{
|
||||
return target->dev->ar->htc_ops->wait_target(target);
|
||||
}
|
||||
|
||||
static inline int ath6kl_htc_start(struct htc_target *target)
|
||||
{
|
||||
return target->dev->ar->htc_ops->start(target);
|
||||
}
|
||||
|
||||
static inline int ath6kl_htc_conn_service(struct htc_target *target,
|
||||
struct htc_service_connect_req *req,
|
||||
struct htc_service_connect_resp *resp)
|
||||
{
|
||||
return target->dev->ar->htc_ops->conn_service(target, req, resp);
|
||||
}
|
||||
|
||||
static inline int ath6kl_htc_tx(struct htc_target *target,
|
||||
struct htc_packet *packet)
|
||||
{
|
||||
return target->dev->ar->htc_ops->tx(target, packet);
|
||||
}
|
||||
|
||||
static inline void ath6kl_htc_stop(struct htc_target *target)
|
||||
{
|
||||
return target->dev->ar->htc_ops->stop(target);
|
||||
}
|
||||
|
||||
static inline void ath6kl_htc_cleanup(struct htc_target *target)
|
||||
{
|
||||
return target->dev->ar->htc_ops->cleanup(target);
|
||||
}
|
||||
|
||||
static inline void ath6kl_htc_flush_txep(struct htc_target *target,
|
||||
enum htc_endpoint_id endpoint,
|
||||
u16 tag)
|
||||
{
|
||||
return target->dev->ar->htc_ops->flush_txep(target, endpoint, tag);
|
||||
}
|
||||
|
||||
static inline void ath6kl_htc_flush_rx_buf(struct htc_target *target)
|
||||
{
|
||||
return target->dev->ar->htc_ops->flush_rx_buf(target);
|
||||
}
|
||||
|
||||
static inline void ath6kl_htc_activity_changed(struct htc_target *target,
|
||||
enum htc_endpoint_id endpoint,
|
||||
bool active)
|
||||
{
|
||||
return target->dev->ar->htc_ops->activity_changed(target, endpoint,
|
||||
active);
|
||||
}
|
||||
|
||||
static inline int ath6kl_htc_get_rxbuf_num(struct htc_target *target,
|
||||
enum htc_endpoint_id endpoint)
|
||||
{
|
||||
return target->dev->ar->htc_ops->get_rxbuf_num(target, endpoint);
|
||||
}
|
||||
|
||||
static inline int ath6kl_htc_add_rxbuf_multiple(struct htc_target *target,
|
||||
struct list_head *pktq)
|
||||
{
|
||||
return target->dev->ar->htc_ops->add_rxbuf_multiple(target, pktq);
|
||||
}
|
||||
|
||||
static inline int ath6kl_htc_credit_setup(struct htc_target *target,
|
||||
struct ath6kl_htc_credit_info *info)
|
||||
{
|
||||
return target->dev->ar->htc_ops->credit_setup(target, info);
|
||||
}
|
||||
|
||||
static inline void ath6kl_htc_tx_complete(struct ath6kl *ar,
|
||||
struct sk_buff *skb)
|
||||
{
|
||||
ar->htc_ops->tx_complete(ar, skb);
|
||||
}
|
||||
|
||||
|
||||
static inline void ath6kl_htc_rx_complete(struct ath6kl *ar,
|
||||
struct sk_buff *skb, u8 pipe)
|
||||
{
|
||||
ar->htc_ops->rx_complete(ar, skb, pipe);
|
||||
}
|
||||
|
||||
|
||||
#endif
|
||||
|
|
@ -519,6 +519,32 @@ struct htc_control_buffer {
|
|||
u8 *buf;
|
||||
};
|
||||
|
||||
struct ath6kl_htc_ops {
|
||||
void* (*create)(struct ath6kl *ar);
|
||||
int (*wait_target)(struct htc_target *target);
|
||||
int (*start)(struct htc_target *target);
|
||||
int (*conn_service)(struct htc_target *target,
|
||||
struct htc_service_connect_req *req,
|
||||
struct htc_service_connect_resp *resp);
|
||||
int (*tx)(struct htc_target *target, struct htc_packet *packet);
|
||||
void (*stop)(struct htc_target *target);
|
||||
void (*cleanup)(struct htc_target *target);
|
||||
void (*flush_txep)(struct htc_target *target,
|
||||
enum htc_endpoint_id endpoint, u16 tag);
|
||||
void (*flush_rx_buf)(struct htc_target *target);
|
||||
void (*activity_changed)(struct htc_target *target,
|
||||
enum htc_endpoint_id endpoint,
|
||||
bool active);
|
||||
int (*get_rxbuf_num)(struct htc_target *target,
|
||||
enum htc_endpoint_id endpoint);
|
||||
int (*add_rxbuf_multiple)(struct htc_target *target,
|
||||
struct list_head *pktq);
|
||||
int (*credit_setup)(struct htc_target *target,
|
||||
struct ath6kl_htc_credit_info *cred_info);
|
||||
int (*tx_complete)(struct ath6kl *ar, struct sk_buff *skb);
|
||||
int (*rx_complete)(struct ath6kl *ar, struct sk_buff *skb, u8 pipe);
|
||||
};
|
||||
|
||||
struct ath6kl_device;
|
||||
|
||||
/* our HTC target state */
|
||||
|
|
@ -569,34 +595,9 @@ struct htc_target {
|
|||
u32 ac_tx_count[WMM_NUM_AC];
|
||||
};
|
||||
|
||||
void *ath6kl_htc_create(struct ath6kl *ar);
|
||||
void ath6kl_htc_set_credit_dist(struct htc_target *target,
|
||||
struct ath6kl_htc_credit_info *cred_info,
|
||||
u16 svc_pri_order[], int len);
|
||||
int ath6kl_htc_wait_target(struct htc_target *target);
|
||||
int ath6kl_htc_start(struct htc_target *target);
|
||||
int ath6kl_htc_conn_service(struct htc_target *target,
|
||||
struct htc_service_connect_req *req,
|
||||
struct htc_service_connect_resp *resp);
|
||||
int ath6kl_htc_tx(struct htc_target *target, struct htc_packet *packet);
|
||||
void ath6kl_htc_stop(struct htc_target *target);
|
||||
void ath6kl_htc_cleanup(struct htc_target *target);
|
||||
void ath6kl_htc_flush_txep(struct htc_target *target,
|
||||
enum htc_endpoint_id endpoint, u16 tag);
|
||||
void ath6kl_htc_flush_rx_buf(struct htc_target *target);
|
||||
void ath6kl_htc_indicate_activity_change(struct htc_target *target,
|
||||
enum htc_endpoint_id endpoint,
|
||||
bool active);
|
||||
int ath6kl_htc_get_rxbuf_num(struct htc_target *target,
|
||||
enum htc_endpoint_id endpoint);
|
||||
int ath6kl_htc_add_rxbuf_multiple(struct htc_target *target,
|
||||
struct list_head *pktq);
|
||||
int ath6kl_htc_rxmsg_pending_handler(struct htc_target *target,
|
||||
u32 msg_look_ahead, int *n_pkts);
|
||||
|
||||
int ath6kl_credit_setup(struct htc_target *htc_target,
|
||||
struct ath6kl_htc_credit_info *cred_info);
|
||||
|
||||
static inline void set_htc_pkt_info(struct htc_packet *packet, void *context,
|
||||
u8 *buf, unsigned int len,
|
||||
enum htc_endpoint_id eid, u16 tag)
|
||||
|
|
@ -636,4 +637,6 @@ static inline int get_queue_depth(struct list_head *queue)
|
|||
return depth;
|
||||
}
|
||||
|
||||
void ath6kl_htc_mbox_attach(struct ath6kl *ar);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -23,6 +23,14 @@
|
|||
|
||||
#define CALC_TXRX_PADDED_LEN(dev, len) (__ALIGN_MASK((len), (dev)->block_mask))
|
||||
|
||||
static void ath6kl_htc_mbox_cleanup(struct htc_target *target);
|
||||
static void ath6kl_htc_mbox_stop(struct htc_target *target);
|
||||
static int ath6kl_htc_mbox_add_rxbuf_multiple(struct htc_target *target,
|
||||
struct list_head *pkt_queue);
|
||||
static void ath6kl_htc_set_credit_dist(struct htc_target *target,
|
||||
struct ath6kl_htc_credit_info *cred_info,
|
||||
u16 svc_pri_order[], int len);
|
||||
|
||||
/* threshold to re-enable Tx bundling for an AC*/
|
||||
#define TX_RESUME_BUNDLE_THRESHOLD 1500
|
||||
|
||||
|
|
@ -130,8 +138,8 @@ static void ath6kl_credit_init(struct ath6kl_htc_credit_info *cred_info,
|
|||
}
|
||||
|
||||
/* initialize and setup credit distribution */
|
||||
int ath6kl_credit_setup(struct htc_target *htc_target,
|
||||
struct ath6kl_htc_credit_info *cred_info)
|
||||
static int ath6kl_htc_mbox_credit_setup(struct htc_target *htc_target,
|
||||
struct ath6kl_htc_credit_info *cred_info)
|
||||
{
|
||||
u16 servicepriority[5];
|
||||
|
||||
|
|
@ -1065,7 +1073,7 @@ static int htc_setup_tx_complete(struct htc_target *target)
|
|||
return status;
|
||||
}
|
||||
|
||||
void ath6kl_htc_set_credit_dist(struct htc_target *target,
|
||||
static void ath6kl_htc_set_credit_dist(struct htc_target *target,
|
||||
struct ath6kl_htc_credit_info *credit_info,
|
||||
u16 srvc_pri_order[], int list_len)
|
||||
{
|
||||
|
|
@ -1093,7 +1101,8 @@ void ath6kl_htc_set_credit_dist(struct htc_target *target,
|
|||
}
|
||||
}
|
||||
|
||||
int ath6kl_htc_tx(struct htc_target *target, struct htc_packet *packet)
|
||||
static int ath6kl_htc_mbox_tx(struct htc_target *target,
|
||||
struct htc_packet *packet)
|
||||
{
|
||||
struct htc_endpoint *endpoint;
|
||||
struct list_head queue;
|
||||
|
|
@ -1121,7 +1130,7 @@ int ath6kl_htc_tx(struct htc_target *target, struct htc_packet *packet)
|
|||
}
|
||||
|
||||
/* flush endpoint TX queue */
|
||||
void ath6kl_htc_flush_txep(struct htc_target *target,
|
||||
static void ath6kl_htc_mbox_flush_txep(struct htc_target *target,
|
||||
enum htc_endpoint_id eid, u16 tag)
|
||||
{
|
||||
struct htc_packet *packet, *tmp_pkt;
|
||||
|
|
@ -1173,12 +1182,13 @@ static void ath6kl_htc_flush_txep_all(struct htc_target *target)
|
|||
if (endpoint->svc_id == 0)
|
||||
/* not in use.. */
|
||||
continue;
|
||||
ath6kl_htc_flush_txep(target, i, HTC_TX_PACKET_TAG_ALL);
|
||||
ath6kl_htc_mbox_flush_txep(target, i, HTC_TX_PACKET_TAG_ALL);
|
||||
}
|
||||
}
|
||||
|
||||
void ath6kl_htc_indicate_activity_change(struct htc_target *target,
|
||||
enum htc_endpoint_id eid, bool active)
|
||||
static void ath6kl_htc_mbox_activity_changed(struct htc_target *target,
|
||||
enum htc_endpoint_id eid,
|
||||
bool active)
|
||||
{
|
||||
struct htc_endpoint *endpoint = &target->endpoint[eid];
|
||||
bool dist = false;
|
||||
|
|
@ -1246,7 +1256,7 @@ static int htc_add_rxbuf(struct htc_target *target, struct htc_packet *packet)
|
|||
|
||||
INIT_LIST_HEAD(&queue);
|
||||
list_add_tail(&packet->list, &queue);
|
||||
return ath6kl_htc_add_rxbuf_multiple(target, &queue);
|
||||
return ath6kl_htc_mbox_add_rxbuf_multiple(target, &queue);
|
||||
}
|
||||
|
||||
static void htc_reclaim_rxbuf(struct htc_target *target,
|
||||
|
|
@ -2290,7 +2300,7 @@ fail_ctrl_rx:
|
|||
return NULL;
|
||||
}
|
||||
|
||||
int ath6kl_htc_add_rxbuf_multiple(struct htc_target *target,
|
||||
static int ath6kl_htc_mbox_add_rxbuf_multiple(struct htc_target *target,
|
||||
struct list_head *pkt_queue)
|
||||
{
|
||||
struct htc_endpoint *endpoint;
|
||||
|
|
@ -2352,7 +2362,7 @@ int ath6kl_htc_add_rxbuf_multiple(struct htc_target *target,
|
|||
return status;
|
||||
}
|
||||
|
||||
void ath6kl_htc_flush_rx_buf(struct htc_target *target)
|
||||
static void ath6kl_htc_mbox_flush_rx_buf(struct htc_target *target)
|
||||
{
|
||||
struct htc_endpoint *endpoint;
|
||||
struct htc_packet *packet, *tmp_pkt;
|
||||
|
|
@ -2394,7 +2404,7 @@ void ath6kl_htc_flush_rx_buf(struct htc_target *target)
|
|||
}
|
||||
}
|
||||
|
||||
int ath6kl_htc_conn_service(struct htc_target *target,
|
||||
static int ath6kl_htc_mbox_conn_service(struct htc_target *target,
|
||||
struct htc_service_connect_req *conn_req,
|
||||
struct htc_service_connect_resp *conn_resp)
|
||||
{
|
||||
|
|
@ -2566,7 +2576,7 @@ static void reset_ep_state(struct htc_target *target)
|
|||
INIT_LIST_HEAD(&target->cred_dist_list);
|
||||
}
|
||||
|
||||
int ath6kl_htc_get_rxbuf_num(struct htc_target *target,
|
||||
static int ath6kl_htc_mbox_get_rxbuf_num(struct htc_target *target,
|
||||
enum htc_endpoint_id endpoint)
|
||||
{
|
||||
int num;
|
||||
|
|
@ -2626,7 +2636,7 @@ static void htc_setup_msg_bndl(struct htc_target *target)
|
|||
}
|
||||
}
|
||||
|
||||
int ath6kl_htc_wait_target(struct htc_target *target)
|
||||
static int ath6kl_htc_mbox_wait_target(struct htc_target *target)
|
||||
{
|
||||
struct htc_packet *packet = NULL;
|
||||
struct htc_ready_ext_msg *rdy_msg;
|
||||
|
|
@ -2695,12 +2705,12 @@ int ath6kl_htc_wait_target(struct htc_target *target)
|
|||
connect.svc_id = HTC_CTRL_RSVD_SVC;
|
||||
|
||||
/* connect fake service */
|
||||
status = ath6kl_htc_conn_service((void *)target, &connect, &resp);
|
||||
status = ath6kl_htc_mbox_conn_service((void *)target, &connect, &resp);
|
||||
|
||||
if (status)
|
||||
/*
|
||||
* FIXME: this call doesn't make sense, the caller should
|
||||
* call ath6kl_htc_cleanup() when it wants remove htc
|
||||
* call ath6kl_htc_mbox_cleanup() when it wants remove htc
|
||||
*/
|
||||
ath6kl_hif_cleanup_scatter(target->dev->ar);
|
||||
|
||||
|
|
@ -2717,7 +2727,7 @@ fail_wait_target:
|
|||
* Start HTC, enable interrupts and let the target know
|
||||
* host has finished setup.
|
||||
*/
|
||||
int ath6kl_htc_start(struct htc_target *target)
|
||||
static int ath6kl_htc_mbox_start(struct htc_target *target)
|
||||
{
|
||||
struct htc_packet *packet;
|
||||
int status;
|
||||
|
|
@ -2754,7 +2764,7 @@ int ath6kl_htc_start(struct htc_target *target)
|
|||
status = ath6kl_hif_unmask_intrs(target->dev);
|
||||
|
||||
if (status)
|
||||
ath6kl_htc_stop(target);
|
||||
ath6kl_htc_mbox_stop(target);
|
||||
|
||||
return status;
|
||||
}
|
||||
|
|
@ -2798,7 +2808,7 @@ static int ath6kl_htc_reset(struct htc_target *target)
|
|||
}
|
||||
|
||||
/* htc_stop: stop interrupt reception, and flush all queued buffers */
|
||||
void ath6kl_htc_stop(struct htc_target *target)
|
||||
static void ath6kl_htc_mbox_stop(struct htc_target *target)
|
||||
{
|
||||
spin_lock_bh(&target->htc_lock);
|
||||
target->htc_flags |= HTC_OP_STATE_STOPPING;
|
||||
|
|
@ -2813,12 +2823,12 @@ void ath6kl_htc_stop(struct htc_target *target)
|
|||
|
||||
ath6kl_htc_flush_txep_all(target);
|
||||
|
||||
ath6kl_htc_flush_rx_buf(target);
|
||||
ath6kl_htc_mbox_flush_rx_buf(target);
|
||||
|
||||
ath6kl_htc_reset(target);
|
||||
}
|
||||
|
||||
void *ath6kl_htc_create(struct ath6kl *ar)
|
||||
static void *ath6kl_htc_mbox_create(struct ath6kl *ar)
|
||||
{
|
||||
struct htc_target *target = NULL;
|
||||
int status = 0;
|
||||
|
|
@ -2859,13 +2869,13 @@ void *ath6kl_htc_create(struct ath6kl *ar)
|
|||
return target;
|
||||
|
||||
err_htc_cleanup:
|
||||
ath6kl_htc_cleanup(target);
|
||||
ath6kl_htc_mbox_cleanup(target);
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* cleanup the HTC instance */
|
||||
void ath6kl_htc_cleanup(struct htc_target *target)
|
||||
static void ath6kl_htc_mbox_cleanup(struct htc_target *target)
|
||||
{
|
||||
struct htc_packet *packet, *tmp_packet;
|
||||
|
||||
|
|
@ -2890,3 +2900,24 @@ void ath6kl_htc_cleanup(struct htc_target *target)
|
|||
kfree(target->dev);
|
||||
kfree(target);
|
||||
}
|
||||
|
||||
static const struct ath6kl_htc_ops ath6kl_htc_mbox_ops = {
|
||||
.create = ath6kl_htc_mbox_create,
|
||||
.wait_target = ath6kl_htc_mbox_wait_target,
|
||||
.start = ath6kl_htc_mbox_start,
|
||||
.conn_service = ath6kl_htc_mbox_conn_service,
|
||||
.tx = ath6kl_htc_mbox_tx,
|
||||
.stop = ath6kl_htc_mbox_stop,
|
||||
.cleanup = ath6kl_htc_mbox_cleanup,
|
||||
.flush_txep = ath6kl_htc_mbox_flush_txep,
|
||||
.flush_rx_buf = ath6kl_htc_mbox_flush_rx_buf,
|
||||
.activity_changed = ath6kl_htc_mbox_activity_changed,
|
||||
.get_rxbuf_num = ath6kl_htc_mbox_get_rxbuf_num,
|
||||
.add_rxbuf_multiple = ath6kl_htc_mbox_add_rxbuf_multiple,
|
||||
.credit_setup = ath6kl_htc_mbox_credit_setup,
|
||||
};
|
||||
|
||||
void ath6kl_htc_mbox_attach(struct ath6kl *ar)
|
||||
{
|
||||
ar->htc_ops = &ath6kl_htc_mbox_ops;
|
||||
}
|
||||
|
|
@ -27,6 +27,7 @@
|
|||
#include "target.h"
|
||||
#include "debug.h"
|
||||
#include "hif-ops.h"
|
||||
#include "htc-ops.h"
|
||||
|
||||
static const struct ath6kl_hw hw_list[] = {
|
||||
{
|
||||
|
|
@ -1510,7 +1511,7 @@ int ath6kl_init_hw_start(struct ath6kl *ar)
|
|||
}
|
||||
|
||||
/* setup credit distribution */
|
||||
ath6kl_credit_setup(ar->htc_target, &ar->credit_state_info);
|
||||
ath6kl_htc_credit_setup(ar->htc_target, &ar->credit_state_info);
|
||||
|
||||
/* start HTC */
|
||||
ret = ath6kl_htc_start(ar->htc_target);
|
||||
|
|
|
|||
|
|
@ -1362,7 +1362,7 @@ static int ath6kl_sdio_probe(struct sdio_func *func,
|
|||
goto err_core_alloc;
|
||||
}
|
||||
|
||||
ret = ath6kl_core_init(ar);
|
||||
ret = ath6kl_core_init(ar, ATH6KL_HTC_TYPE_MBOX);
|
||||
if (ret) {
|
||||
ath6kl_err("Failed to init ath6kl core\n");
|
||||
goto err_core_alloc;
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@
|
|||
|
||||
#include "core.h"
|
||||
#include "debug.h"
|
||||
#include "htc-ops.h"
|
||||
|
||||
/*
|
||||
* tid - tid_mux0..tid_mux3
|
||||
|
|
@ -572,7 +573,7 @@ void ath6kl_indicate_tx_activity(void *devt, u8 traffic_class, bool active)
|
|||
|
||||
notify_htc:
|
||||
/* notify HTC, this may cause credit distribution changes */
|
||||
ath6kl_htc_indicate_activity_change(ar->htc_target, eid, active);
|
||||
ath6kl_htc_activity_changed(ar->htc_target, eid, active);
|
||||
}
|
||||
|
||||
enum htc_send_full_action ath6kl_tx_queue_full(struct htc_target *target,
|
||||
|
|
|
|||
|
|
@ -368,7 +368,7 @@ static int ath6kl_usb_probe(struct usb_interface *interface,
|
|||
|
||||
ar_usb->ar = ar;
|
||||
|
||||
ret = ath6kl_core_init(ar);
|
||||
ret = ath6kl_core_init(ar, ATH6KL_HTC_TYPE_MBOX);
|
||||
if (ret) {
|
||||
ath6kl_err("Failed to init ath6kl core: %d\n", ret);
|
||||
goto err_core_free;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue