brcm80211: patches providing new functionality
cover brcm80211: patches providing new functionality
This series consist of patches completing/fixing firmware-signalling functionality, and P2P device support for brcmfmac. For debugging, a change has been made to obtain firmware console log through debugfs.
This series is intended for v3.10 kernel and applies to the master branch of the wireless-next repository.
Arend van Spriel (14):
brcmfmac: fix unaligned access in TXSTATUS signal handling
brcmfmac: handle firmware signalling destination entry state
brcmfmac: handle firmware signals requesting for packets
brcmfmac: add hexadecimal trace of message payload
brcmfmac: add role attribute to struct brcmf_if_event definition
brcmfmac: remove condition for calling event handler
brcmfmac: remove use of unconditional access of struct
wireless_dev::netdev
brcmfmac: use struct brcmf_if instance as parameter in
brcmf_set_mpc()
brcmfmac: use struct brcmf_if instance iso netdevice in escan
functions
brcmfmac: support creation of P2P_DEVICE through user-space
brcmfmac: wait for firmware event when creating P2P_DEVICE interface
brcmfmac: fix reception of P2P probe requests on P2P_DEVICE interface
brcmfmac: obtain wdev using vif object in action frame rx
brcmfmac: only use ifidx from BDC header in brcmf_rx_frames()
Piotr Haber (2):
brcmfmac: read firmware console without trap indication
brcmfmac: firmware shared data version fix
drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 1 + drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.c | 4 + drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h | 5 + .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 37 ++-- drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 35 ++-- drivers/net/wireless/brcm80211/brcmfmac/fweh.c | 15 +- drivers/net/wireless/brcm80211/brcmfmac/fweh.h | 6 +- drivers/net/wireless/brcm80211/brcmfmac/fwil.c | 1 + drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 115 ++++++++++-- drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 190 +++++++++++++++++--- .../net/wireless/brcm80211/brcmfmac/tracepoint.h | 14 ++ .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 123 +++++++------ .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.h | 11 +- 13 files changed, 408 insertions(+), 149 deletions(-)
Signature · 1 line
1.7.10.4
PATCH 1/16 brcmfmac: fix unaligned access in TXSTATUS signal handling
reported by Hante. Needs to be squashed in commit 187fbcec.
--- drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c +3 -1
@@ -1181,13 +1181,15 @@ static int brcmf_fws_fifocreditback_indicate(struct brcmf_fws_info *fws,static int brcmf_fws_txstatus_indicate (struct brcmf_fws_info *fws,u8 *data) { +__le32 status_le;u32 status;u32 hslot;u32 genbit;u8 flags; fws->stats.txs_indicate++; - status =le32_to_cpu (*(__le32 *)data); +memcpy (&status_le, data,sizeof (status_le)); + status =le32_to_cpu (status_le); flags =brcmf_txstatus_get_field (status,FLAGS ); hslot =brcmf_txstatus_get_field (status,HSLOT ); genbit =brcmf_txstatus_get_field (status,GENERATION );
Signature · 1 line
1.7.10.4
PATCH 2/16 brcmfmac: handle firmware signalling destination entry state
In reply to Arend van SprielFirmware can signal whether the host driver may sent packets for a specific destination or interface. This can happen when a destination is sleeping or when going off-channel.
--- drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.c | 4 + drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h | 2 + drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 80 ++++++++++++++++++-- 3 files changed, 79 insertions(+), 7 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.c +4 -0
@@ -143,6 +143,8 @@ ssize_t brcmf_debugfs_fws_stats_read(struct file *f, char __user *data,"tlv_parse_failed: %u\n" "tlv_invalid_type: %u\n" "mac_update_fails: %u\n" +"ps_update_fails: %u\n" +"if_update_fails: %u\n" "pkt2bus: %u\n" "generic_error: %u\n" "rollback_success: %u\n"
@@ -161,6 +163,8 @@ ssize_t brcmf_debugfs_fws_stats_read(struct file *f, char __user *data, fwstats->tlv_parse_failed, fwstats->tlv_invalid_type, fwstats->mac_update_failed, + fwstats->mac_ps_update_failed, + fwstats->if_update_failed, fwstats->pkt2bus, fwstats->generic_error, fwstats->rollback_success,
drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h +2 -0
@@ -144,6 +144,8 @@ struct brcmf_fws_stats {u32 fifo_credits_back[6 ];u32 generic_error;u32 mac_update_failed; +u32 mac_ps_update_failed; +u32 if_update_failed;u32 rollback_success;u32 rollback_failed;u32 delayq_full_error;
drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c +73 -7
111 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH 3/16 brcmfmac: handle firmware signals requesting for packets
In reply to Arend van SprielThe firmware can request the host driver for packets, by sending either the MAC_REQUEST_CREDIT or the MAC_REQUEST_PACKET primitive. This patch adds handling of these primitives.
--- drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h | 2 ++ drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 29 ++++++++++++++++++-- 2 files changed, 29 insertions(+), 2 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h +2 -0
@@ -146,6 +146,8 @@ struct brcmf_fws_stats {u32 mac_update_failed;u32 mac_ps_update_failed;u32 if_update_failed; +u32 packet_request_failed; +u32 credit_request_failed;u32 rollback_success;u32 rollback_failed;u32 delayq_full_error;
drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c +27 -2
@@ -959,6 +959,29 @@ fail:return ret; } +static int brcmf_fws_request_indicate (struct brcmf_fws_info *fws,u8 type, +u8 *data) +{ +struct brcmf_fws_mac_descriptor *entry; + + entry = &fws->desc.nodes[data[1 ] &0x1F ]; +if (!entry->occupied) { +if (type ==BRCMF_FWS_TYPE_MAC_REQUEST_CREDIT ) + fws->stats.credit_request_failed++; +else + fws->stats.packet_request_failed++; +return -ESRCH ; + } + +if (type ==BRCMF_FWS_TYPE_MAC_REQUEST_CREDIT ) + entry->requested_credit = data[0 ]; +else + entry->requested_packet = data[0 ]; + + entry->ac_bitmap = data[2 ]; +return 0 ; +} +static void brcmf_fws_return_credits (struct brcmf_fws_info *fws,u8 fifo,u8 credits) {
@@ -1366,8 +1389,6 @@ int brcmf_fws_hdrpull(struct brcmf_pub *drvr, int ifidx, s16 signal_len,break ;switch (type) { -case BRCMF_FWS_TYPE_MAC_REQUEST_CREDIT : -case BRCMF_FWS_TYPE_MAC_REQUEST_PACKET :case BRCMF_FWS_TYPE_HOST_REORDER_RXPKTS :case BRCMF_FWS_TYPE_COMP_TXSTATUS :break ;
@@ -1383,6 +1404,10 @@ int brcmf_fws_hdrpull(struct brcmf_pub *drvr, int ifidx, s16 signal_len,case BRCMF_FWS_TYPE_INTERFACE_CLOSE :brcmf_fws_interface_state_indicate (fws, type, data);break ; +case BRCMF_FWS_TYPE_MAC_REQUEST_CREDIT : +case BRCMF_FWS_TYPE_MAC_REQUEST_PACKET : +brcmf_fws_request_indicate (fws, type, data); +break ;case BRCMF_FWS_TYPE_TXSTATUS :brcmf_fws_txstatus_indicate (fws, data);break ;
Signature · 1 line
1.7.10.4
PATCH 4/16 brcmfmac: read firmware console without trap indication
In reply to Arend van SprielFrom: Piotr Haber <[email protected]>
Firmware console output can be read also when there was no trap indication.
--- drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 30 +++++++++----------- 1 file changed, 14 insertions(+), 16 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +14 -16
@@ -2804,21 +2804,18 @@ static int brcmf_sdio_trap_info(struct brcmf_sdio *bus, struct sdpcm_shared *sh,int error, res;char buf[350 ];struct brcmf_trap_info tr; -int nbytes;loff_t pos =0 ; -if ((sh->flags &SDPCM_SHARED_TRAP ) ==0 ) +if ((sh->flags &SDPCM_SHARED_TRAP ) ==0 ) { +brcmf_dbg (INFO ,"no trap in firmware\n" );return 0 ; + } error =brcmf_sdbrcm_membytes (bus, false, sh->trap_addr, (u8 *)&tr,sizeof (struct brcmf_trap_info ));if (error <0 )return error; - nbytes =brcmf_sdio_dump_console (bus, sh, data, count); -if (nbytes <0 ) -return nbytes; - res =scnprintf (buf,sizeof (buf),"dongle trap info: type 0x%x @ epc 0x%08x\n" " cpsr 0x%08x spsr 0x%08x sp 0x%08x\n"
@@ -2834,12 +2831,7 @@ static int brcmf_sdio_trap_info(struct brcmf_sdio *bus, struct sdpcm_shared *sh,le32_to_cpu (tr.r4),le32_to_cpu (tr.r5), le32_to_cpu(tr.r6), le32_to_cpu(tr.r7)); - error =simple_read_from_buffer (data+nbytes, count, &pos, buf, res); -if (error <0 ) -return error; - - nbytes += error; -return nbytes; +return simple_read_from_buffer (data, count, &pos, buf, res); } static int brcmf_sdio_assert_info(struct brcmf_sdio *bus,
@@ -2921,14 +2913,20 @@ static int brcmf_sdbrcm_died_dump(struct brcmf_sdio *bus, char __user *data, error =brcmf_sdio_assert_info (bus, &sh, data, count);if (error <0 ) goto done; - nbytes = error; - error =brcmf_sdio_trap_info (bus, &sh, data, count); + + error =brcmf_sdio_trap_info (bus, &sh, data+nbytes, count);if (error <0 ) goto done; + nbytes += error; + + error =brcmf_sdio_dump_console (bus, &sh, data+nbytes, count); +if (error <0 ) + goto done; + nbytes += error; - error += nbytes; - *ppos += error; + error = nbytes; + *ppos += nbytes; done:return error; }
Signature · 1 line
1.7.10.4
PATCH 5/16 brcmfmac: firmware shared data version fix
In reply to Arend van SprielFrom: Piotr Haber <[email protected]>
Firware shared data structure is backward compatible for fields we are interested in.
Allow reading of shared data in case of version mismatch.
--- drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +2 -2
@@ -2721,8 +2721,8 @@ static int brcmf_sdio_readshared(struct brcmf_sdio *bus, sh->console_addr =le32_to_cpu (sh_le.console_addr); sh->msgtrace_addr =le32_to_cpu (sh_le.msgtrace_addr); -if ((sh->flags &SDPCM_SHARED_VERSION_MASK ) !=SDPCM_SHARED_VERSION ) { -brcmf_err ("sdpcm_shared version mismatch: dhd %d dongle %d\n" , +if ((sh->flags &SDPCM_SHARED_VERSION_MASK ) >SDPCM_SHARED_VERSION ) { +brcmf_err ("sdpcm shared version unsupported: dhd %d dongle %d\n" ,SDPCM_SHARED_VERSION , sh->flags &SDPCM_SHARED_VERSION_MASK );return -EPROTO ;
Signature · 1 line
1.7.10.4
PATCH 6/16 brcmfmac: add hexadecimal trace of message payload
In reply to Arend van SprielAdds a trace function used in brcmf_dbg_hex_dump() which adds the raw binary data to the trace. It requires trace-cmd plugin to see this data.
--- drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h | 1 + drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 1 + drivers/net/wireless/brcm80211/brcmfmac/fweh.c | 1 + drivers/net/wireless/brcm80211/brcmfmac/fwil.c | 1 + drivers/net/wireless/brcm80211/brcmfmac/tracepoint.h | 14 ++++++++++++++ drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 1 + 6 files changed, 19 insertions(+)
drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h +1 -0
@@ -93,6 +93,7 @@ do { \#define brcmf_dbg_hex_dump (test, data, len, fmt, ...) \ do { \ + trace_brcmf_hexdump((void *)data, len); \ if (test) \ brcmu_dbg_hex_dump(data, len, fmt, ##__VA_ARGS__); \ } while (0)
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +1 -0
@@ -94,6 +94,7 @@ struct rte_console {#include "dhd_bus.h" #include "dhd_dbg.h" +#include "tracepoint.h" #define TXQLEN 2048/* bulk tx queue length */ #define TXHI (TXQLEN - 256)/* turn on flow control above TXHI */
drivers/net/wireless/brcm80211/brcmfmac/fweh.c +1 -0
@@ -20,6 +20,7 @@#include "dhd.h" #include "dhd_dbg.h" +#include "tracepoint.h" #include "fwsignal.h" #include "fweh.h" #include "fwil.h"
drivers/net/wireless/brcm80211/brcmfmac/fwil.c +1 -0
@@ -25,6 +25,7 @@#include "dhd.h" #include "dhd_bus.h" #include "dhd_dbg.h" +#include "tracepoint.h" #include "fwil.h"
drivers/net/wireless/brcm80211/brcmfmac/tracepoint.h +14 -0
@@ -73,6 +73,20 @@ TRACE_EVENT(brcmf_dbg,TP_printk ("%s: %s" ,__get_str (func),__get_str (msg)) ); +TRACE_EVENT (brcmf_hexdump, + TP_PROTO(void *data, size_t len), +TP_ARGS (data, len), +TP_STRUCT__entry ( + __field(unsigned long, len) +__dynamic_array (u8, hdata, len) + ), +TP_fast_assign ( + __entry->len = len; + memcpy(__get_dynamic_array(hdata), data, len); + ), +TP_printk ("hexdump [length=%lu]" , __entry->len) +); +#ifdef CONFIG_BRCM_TRACING #undef TRACE_INCLUDE_PATH
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +1 -0
@@ -26,6 +26,7 @@#include <brcmu_wifi.h> #include "dhd.h" #include "dhd_dbg.h" +#include "tracepoint.h" #include "fwil_types.h" #include "p2p.h" #include "wl_cfg80211.h"
Signature · 1 line
1.7.10.4
PATCH 7/16 brcmfmac: add role attribute to struct brcmf_if_event definition
In reply to Arend van SprielAccording specification the IF event has an additional field indicating the role or type of the interface for which this event is sent.
--- drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 1 + drivers/net/wireless/brcm80211/brcmfmac/fweh.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/dhd.h +1 -0
@@ -548,6 +548,7 @@ struct brcmf_if_event {u8 action;u8 flags;u8 bssidx; +u8 role; };/* forward declarations */
drivers/net/wireless/brcm80211/brcmfmac/fweh.c +3 -3
@@ -181,9 +181,9 @@ static void brcmf_fweh_handle_if_event(struct brcmf_pub *drvr,struct brcmf_if *ifp;int err =0 ; -brcmf_dbg (EVENT ,"action: %u idx: %u bsscfg: %u flags: %u\n" , - ifevent->action, ifevent->ifidx, - ifevent->bssidx, ifevent->flags); +brcmf_dbg (EVENT ,"action: %u idx: %u bsscfg: %u flags: %u role: %u\n" , + ifevent->action, ifevent->ifidx, ifevent->bssidx, + ifevent->flags, ifevent->role);if (ifevent->ifidx >=BRCMF_MAX_IFS ) { brcmf_err("invalid interface index: %u\n",
Signature · 1 line
1.7.10.4
PATCH 8/16 brcmfmac: remove condition for calling event handler
In reply to Arend van SprielIn fweh module the event handler was only called if the struct brcmf_if instance had a non-null netdev associated. This restriction is no longer valid for P2P_DEVICE type of interface. This patch removes that restriction.
--- drivers/net/wireless/brcm80211/brcmfmac/fweh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/brcm80211/brcmfmac/fweh.c +1 -1
@@ -156,7 +156,7 @@ static int brcmf_fweh_call_event_handler(struct brcmf_if *ifp, fweh = &ifp->drvr->fweh;/* handle the event if valid interface and handler */ -if (ifp->ndev && fweh->evt_handler[code]) +if (fweh->evt_handler[code]) err = fweh->evt_handler[code](ifp, emsg, data);else brcmf_err ("unhandled event %d ignored\n" , code);
Signature · 1 line
1.7.10.4
PATCH 9/16 brcmfmac: remove use of unconditional access of struct wireless_dev::netdev
In reply to Arend van SprielWith the introduction of the P2P_DEVICE interface type an instance of struct wireless_dev does not always have a netdev assigned to it. Better use container_of() construct to obtain internal structure and go from there.
--- drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +4 -6
@@ -3868,13 +3868,13 @@ brcmf_cfg80211_mgmt_frame_register(struct wiphy *wiphy,struct wireless_dev *wdev, u16 frame_type, bool reg) { - struct brcmf_if *ifp = netdev_priv(wdev->netdev); -struct brcmf_cfg80211_vif *vif = ifp->vif; + struct brcmf_cfg80211_vif *vif;u16 mgmt_type;brcmf_dbg (TRACE ,"Enter, frame_type %04x, reg=%d\n" , frame_type, reg); mgmt_type = (frame_type &IEEE80211_FCTL_STYPE ) >>4 ; + vif = container_of(wdev, struct brcmf_cfg80211_vif, wdev);if (reg) vif->mgmt_rx_reg |=BIT (mgmt_type);else
@@ -3890,7 +3890,6 @@ brcmf_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, {struct brcmf_cfg80211_info *cfg =wiphy_to_cfg (wiphy);const struct ieee80211_mgmt *mgmt; -struct brcmf_if *ifp;struct brcmf_cfg80211_vif *vif;s32 err =0 ;s32 ie_offset;
@@ -3926,8 +3925,7 @@ brcmf_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, ie_offset =DOT11_MGMT_HDR_LEN +DOT11_BCN_PRB_FIXED_LEN ; ie_len = len - ie_offset; - ifp =netdev_priv (wdev->netdev); - vif = ifp->vif; + vif = container_of(wdev, struct brcmf_cfg80211_vif, wdev);if (vif == cfg->p2p.bss_idx[P2PAPI_BSSCFG_PRIMARY ].vif) vif = cfg->p2p.bss_idx[P2PAPI_BSSCFG_DEVICE ].vif; err = brcmf_vif_set_mgmt_ie(vif,
@@ -3962,7 +3960,7 @@ brcmf_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, *cookie,le16_to_cpu (action_frame->len), chan->center_freq); - ack =brcmf_p2p_send_action_frame (cfg, wdev->netdev, + ack =brcmf_p2p_send_action_frame (cfg,cfg_to_ndev (cfg), af_params); cfg80211_mgmt_tx_status(wdev, *cookie, buf, len, ack,
Signature · 1 line
1.7.10.4
PATCH 10/16 brcmfmac: use struct brcmf_if instance as parameter in brcmf_set_mpc()
In reply to Arend van SprielRemove use of struct netdevice as parameter to brcmf_set_mpc() as it will not always be available, ie. there will be non-netdevice interfaces.
--- drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 8 +++--- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 29 ++++++++++---------- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.h | 2 +- 3 files changed, 20 insertions(+), 19 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/p2p.c +4 -4
@@ -1384,7 +1384,7 @@ int brcmf_p2p_notify_action_frame_rx(struct brcmf_if *ifp,/* After complete GO Negotiation, roll back to mpc mode */ if ((action ==P2P_PAF_GON_CONF ) || (action ==P2P_PAF_PROVDIS_RSP )) -brcmf_set_mpc (ifp->ndev,1 ); +brcmf_set_mpc (ifp,1 );if (action ==P2P_PAF_GON_CONF ) {brcmf_dbg (TRACE ,"P2P: GO_NEG_PHASE status cleared\n" );clear_bit (BRCMF_P2P_STATUS_GO_NEG_PHASE , &p2p->status);
@@ -1725,7 +1725,7 @@ bool brcmf_p2p_send_action_frame(struct brcmf_cfg80211_info *cfg,/* To make sure to send successfully action frame, turn off mpc */ if (config_af_params.mpc_onoff ==0 ) -brcmf_set_mpc (ndev,0 ); +brcmf_set_mpc (netdev_priv (ndev),0 );/* set status and destination address before sending af */ if (p2p->next_af_subtype !=P2P_PAF_SUBTYPE_INVALID ) {
@@ -1820,7 +1820,7 @@ exit:clear_bit (BRCMF_P2P_STATUS_WAITING_NEXT_ACT_FRAME , &p2p->status);/* if all done, turn mpc on again */ if (config_af_params.mpc_onoff ==1 ) -brcmf_set_mpc (ndev,1 ); +brcmf_set_mpc (netdev_priv (ndev),1 );return ack; }
@@ -2046,7 +2046,7 @@ int brcmf_p2p_ifchange(struct brcmf_cfg80211_info *cfg,brcmf_err ("vif for P2PAPI_BSSCFG_CONNECTION does not exist\n" );return -EPERM ; } -brcmf_set_mpc (vif->ifp->ndev,0 ); +brcmf_set_mpc (vif->ifp,0 );/* In concurrency case, STA may be already associated in a particular */ /* channel. so retrieve the current channel of primary interface and */
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +15 -14
@@ -490,9 +490,8 @@ static struct wireless_dev *brcmf_cfg80211_add_iface(struct wiphy *wiphy, } } -void brcmf_set_mpc (struct net_device *ndev,int mpc) +void brcmf_set_mpc (struct brcmf_if *ifp,int mpc) { -struct brcmf_if *ifp =netdev_priv (ndev);s32 err =0 ;if (check_vif_up (ifp->vif)) {
@@ -510,6 +509,7 @@ brcmf_notify_escan_complete(struct brcmf_cfg80211_info *cfg,struct net_device *ndev, bool aborted, bool fw_abort) { + struct brcmf_if *ifp = netdev_priv(ndev);struct brcmf_scan_params_le params_le;struct cfg80211_scan_request *scan_request;s32 err =0 ;
@@ -539,7 +539,7 @@ brcmf_notify_escan_complete(struct brcmf_cfg80211_info *cfg,/* Scan is aborted by setting channel_list[0] to -1 */ params_le.channel_list[0 ] =cpu_to_le16 (-1 );/* E-Scan (or anyother type) can be aborted by SCAN */ - err =brcmf_fil_cmd_data_set (netdev_priv (ndev),BRCMF_C_SCAN , + err =brcmf_fil_cmd_data_set (ifp,BRCMF_C_SCAN , ¶ms_le,sizeof (params_le));if (err)brcmf_err ("Scan abort failed\n" );
@@ -553,12 +553,12 @@ brcmf_notify_escan_complete(struct brcmf_cfg80211_info *cfg, cfg->sched_escan = false;if (!aborted)cfg80211_sched_scan_results (cfg_to_wiphy (cfg)); -brcmf_set_mpc (ndev,1 ); +brcmf_set_mpc (ifp,1 ); }else if (scan_request) {brcmf_dbg (SCAN ,"ESCAN Completed scan: %s\n" , aborted ?"Aborted" :"Done" );cfg80211_scan_done (scan_request, aborted); -brcmf_set_mpc (ndev,1 ); +brcmf_set_mpc (ifp,1 ); }if (!test_and_clear_bit (BRCMF_SCAN_STATUS_BUSY , &cfg->scan_status))brcmf_dbg (SCAN ,"Scan complete, probably P2P scan\n" );
@@ -813,19 +813,20 @@ brcmf_do_escan(struct brcmf_cfg80211_info *cfg, struct wiphy *wiphy,u32 passive_scan;struct brcmf_scan_results *results;struct escan_info *escan = &cfg->escan_info; +struct brcmf_if *ifp =netdev_priv (ndev);brcmf_dbg (SCAN ,"Enter\n" ); escan->ndev = ndev; escan->wiphy = wiphy; escan->escan_state =WL_ESCAN_STATE_SCANNING ; passive_scan = cfg->active_scan ?0 :1 ; - err =brcmf_fil_cmd_int_set (netdev_priv (ndev),BRCMF_C_SET_PASSIVE_SCAN , + err =brcmf_fil_cmd_int_set (ifp,BRCMF_C_SET_PASSIVE_SCAN , passive_scan);if (err) {brcmf_err ("error (%d)\n" , err);return err; } -brcmf_set_mpc (ndev,0 ); +brcmf_set_mpc (ifp,0 ); results = (struct brcmf_scan_results *)cfg->escan_info.escan_buf; results->version =0 ; results->count =0 ;
@@ -833,7 +834,7 @@ brcmf_do_escan(struct brcmf_cfg80211_info *cfg, struct wiphy *wiphy, err = escan->run (cfg, ndev, request,WL_ESCAN_ACTION_START );if (err) -brcmf_set_mpc (ndev,1 ); +brcmf_set_mpc (ifp,1 );return err; }
@@ -921,7 +922,7 @@ brcmf_cfg80211_escan(struct wiphy *wiphy, struct net_device *ndev,brcmf_err ("WLC_SET_PASSIVE_SCAN error (%d)\n" , err); goto scan_out; } -brcmf_set_mpc (ndev,0 ); +brcmf_set_mpc (ifp,0 ); err =brcmf_fil_cmd_data_set (ifp,BRCMF_C_SCAN , &sr->ssid_le,sizeof (sr->ssid_le));if (err) {
@@ -931,7 +932,7 @@ brcmf_cfg80211_escan(struct wiphy *wiphy, struct net_device *ndev,else brcmf_err ("WLC_SCAN error (%d)\n" , err); -brcmf_set_mpc (ndev,1 ); +brcmf_set_mpc (ifp,1 ); goto scan_out; } }
@@ -2697,7 +2698,7 @@ static s32 brcmf_cfg80211_suspend(struct wiphy *wiphy,brcmf_abort_scanning (cfg);/* Turn off watchdog timer */ -brcmf_set_mpc (ndev,1 ); +brcmf_set_mpc (netdev_priv (ndev),1 ); exit:brcmf_dbg (TRACE ,"Exit\n" );
@@ -3668,7 +3669,7 @@ brcmf_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *ndev, ssid_le.SSID_len =cpu_to_le32 ((u32 )settings->ssid_len); } -brcmf_set_mpc (ndev,0 ); +brcmf_set_mpc (ifp,0 );/* find the RSN_IE */ rsn_ie = brcmf_parse_tlvs((u8 *)settings->beacon.tail,
@@ -3776,7 +3777,7 @@ brcmf_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *ndev, exit:if (err) -brcmf_set_mpc (ndev,1 ); +brcmf_set_mpc (ifp,1 );return err; }
@@ -3810,7 +3811,7 @@ static int brcmf_cfg80211_stop_ap(struct wiphy *wiphy, struct net_device *ndev)if (err <0 )brcmf_err ("bss_enable config failed %d\n" , err); } -brcmf_set_mpc (ndev,1 ); +brcmf_set_mpc (ifp,1 );set_bit (BRCMF_VIF_STATUS_AP_CREATING , &ifp->vif->sme_state);clear_bit (BRCMF_VIF_STATUS_AP_CREATED , &ifp->vif->sme_state);
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h +1 -1
@@ -495,7 +495,7 @@ int brcmf_cfg80211_wait_vif_event_timeout(struct brcmf_cfg80211_info *cfg,s32 brcmf_notify_escan_complete (struct brcmf_cfg80211_info *cfg,struct net_device *ndev,bool aborted,bool fw_abort); -void brcmf_set_mpc (struct net_device *ndev,int mpc); +void brcmf_set_mpc (struct brcmf_if *ndev,int mpc);void brcmf_abort_scanning (struct brcmf_cfg80211_info *cfg);#endif /* _wl_cfg80211_h_ */
Signature · 1 line
1.7.10.4
PATCH 11/16 brcmfmac: use struct brcmf_if instance iso netdevice in escan functions
In reply to Arend van Sprielescan functionality is also required for P2P device operations so it is better not to rely on struct netdevice instances.
--- drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 17 ++--- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 68 +++++++++----------- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.h | 9 ++- 3 files changed, 42 insertions(+), 52 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/p2p.c +9 -8
@@ -773,7 +773,7 @@ exit:* validates the channels in the request. */ static s32 brcmf_p2p_run_escan (struct brcmf_cfg80211_info *cfg, -struct net_device *ndev, +struct brcmf_if *ifp,struct cfg80211_scan_request *request,u16 action) {
@@ -1261,7 +1261,7 @@ static void brcmf_p2p_stop_wait_next_action_frame(struct brcmf_cfg80211_info *cfg) {struct brcmf_p2p_info *p2p = &cfg->p2p; -struct net_device *ndev = cfg->escan_info.ndev; +struct brcmf_if *ifp = cfg->escan_info.ifp; if (test_bit(BRCMF_P2P_STATUS_SENDING_ACT_FRAME, &p2p->status) && (test_bit(BRCMF_P2P_STATUS_ACTION_TX_COMPLETED, &p2p->status) ||
@@ -1271,12 +1271,12 @@ brcmf_p2p_stop_wait_next_action_frame(struct brcmf_cfg80211_info *cfg)* So abort scan for off channel completion. */ if (p2p->af_sent_channel) -brcmf_notify_escan_complete (cfg, ndev, true, true); +brcmf_notify_escan_complete (cfg, ifp, true, true); }else if (test_bit (BRCMF_P2P_STATUS_WAITING_NEXT_AF_LISTEN , &p2p->status)) {brcmf_dbg (TRACE ,"*** Wake UP ** abort listen for next af frame\n" );/* So abort scan to cancel listen */ -brcmf_notify_escan_complete (cfg, ndev, true, true); +brcmf_notify_escan_complete (cfg, ifp, true, true); } }
@@ -1637,6 +1637,7 @@ bool brcmf_p2p_send_action_frame(struct brcmf_cfg80211_info *cfg, struct brcmf_fil_af_params_le *af_params) {struct brcmf_p2p_info *p2p = &cfg->p2p; +struct brcmf_if *ifp =netdev_priv (ndev);struct brcmf_fil_action_frame_le *action_frame;struct brcmf_config_af_params config_af_params;struct afx_hdl *afx_hdl = &p2p->afx_hdl;
@@ -1725,7 +1726,7 @@ bool brcmf_p2p_send_action_frame(struct brcmf_cfg80211_info *cfg,/* To make sure to send successfully action frame, turn off mpc */ if (config_af_params.mpc_onoff ==0 ) -brcmf_set_mpc (netdev_priv (ndev),0 ); +brcmf_set_mpc (ifp,0 );/* set status and destination address before sending af */ if (p2p->next_af_subtype !=P2P_PAF_SUBTYPE_INVALID ) {
@@ -1753,7 +1754,7 @@ bool brcmf_p2p_send_action_frame(struct brcmf_cfg80211_info *cfg,* care of current piggback algo, lets abort the scan here * itself. */ -brcmf_notify_escan_complete (cfg, ndev, true, true); +brcmf_notify_escan_complete (cfg, ifp, true, true);/* update channel */ af_params->channel =cpu_to_le32 (afx_hdl->peer_chan);
@@ -1820,7 +1821,7 @@ exit:clear_bit (BRCMF_P2P_STATUS_WAITING_NEXT_ACT_FRAME , &p2p->status);/* if all done, turn mpc on again */ if (config_af_params.mpc_onoff ==1 ) -brcmf_set_mpc (netdev_priv (ndev),1 ); +brcmf_set_mpc (ifp,1 );return ack; }
@@ -2040,7 +2041,7 @@ int brcmf_p2p_ifchange(struct brcmf_cfg80211_info *cfg,brcmf_err ("vif for P2PAPI_BSSCFG_PRIMARY does not exist\n" );return -EPERM ; } -brcmf_notify_escan_complete (cfg, vif->ifp->ndev, true, true); +brcmf_notify_escan_complete (cfg, vif->ifp, true, true); vif = p2p->bss_idx[P2PAPI_BSSCFG_CONNECTION ].vif;if (!vif) {brcmf_err ("vif for P2PAPI_BSSCFG_CONNECTION does not exist\n" );
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +29 -39
195 lines not on this page · raw message
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h +4 -5
@@ -238,9 +238,8 @@ struct escan_info {u32 escan_state;u8 escan_buf[WL_ESCAN_BUF_SIZE ];struct wiphy *wiphy; -struct net_device *ndev; -s32 (*run)(struct brcmf_cfg80211_info *cfg, -struct net_device *ndev, +struct brcmf_if *ifp; +s32 (*run)(struct brcmf_cfg80211_info *cfg,struct brcmf_if *ifp,struct cfg80211_scan_request *request,u16 action); };
@@ -493,8 +492,8 @@ bool brcmf_cfg80211_vif_event_armed(struct brcmf_cfg80211_info *cfg);int brcmf_cfg80211_wait_vif_event_timeout (struct brcmf_cfg80211_info *cfg,u8 action,ulong timeout);s32 brcmf_notify_escan_complete (struct brcmf_cfg80211_info *cfg, -struct net_device *ndev, -bool aborted,bool fw_abort); +struct brcmf_if *ifp,bool aborted, +bool fw_abort);void brcmf_set_mpc (struct brcmf_if *ndev,int mpc);void brcmf_abort_scanning (struct brcmf_cfg80211_info *cfg);
Signature · 1 line
1.7.10.4
PATCH 12/16 brcmfmac: support creation of P2P_DEVICE through user-space
In reply to Arend van SprielThe current driver code creates a P2P_DEVICE through a module parameter. This device has a dummy netdevice which is not how this interface type is intended. This patch add proper support for the P2P_DEVICE interface type. This requires a wpa_supplicant with such support as well.
--- drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 148 ++++++++++++++++++-- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 6 +- 2 files changed, 143 insertions(+), 11 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/p2p.c +139 -9
@@ -15,6 +15,7 @@*/ #include <linux/slab.h> #include <linux/netdevice.h> +#include <linux/etherdevice.h> #include <net/cfg80211.h> #include <brcmu_wifi.h>
@@ -455,7 +456,9 @@ static int brcmf_p2p_set_firmware(struct brcmf_if *ifp, u8 *p2p_mac) {s32 ret =0 ; +brcmf_fil_cmd_int_set (ifp,BRCMF_C_DOWN ,1 );brcmf_fil_iovar_int_set (ifp,"apsta" ,1 ); +brcmf_fil_cmd_int_set (ifp,BRCMF_C_UP ,1 );/* In case of COB type, firmware has default mac address * After Initializing firmware, we have to set current mac address to
@@ -473,21 +476,29 @@ static int brcmf_p2p_set_firmware(struct brcmf_if *ifp, u8 *p2p_mac)* brcmf_p2p_generate_bss_mac() - derive mac addresses for P2P. * * @p2p: P2P specific data. +* @dev_addr: optional device address. * -* P2P needs mac addresses for P2P device and interface. These are -* derived from the primary net device, ie. the permanent ethernet -* address of the device. +* P2P needs mac addresses for P2P device and interface. If no device +* address it specified, these are derived from the primary net device, ie. +* the permanent ethernet address of the device. */ -static void brcmf_p2p_generate_bss_mac (struct brcmf_p2p_info *p2p) +static void brcmf_p2p_generate_bss_mac (struct brcmf_p2p_info *p2p,u8 *dev_addr) {struct brcmf_if *pri_ifp = p2p->bss_idx[P2PAPI_BSSCFG_PRIMARY ].vif->ifp;struct brcmf_if *p2p_ifp = p2p->bss_idx[P2PAPI_BSSCFG_DEVICE ].vif->ifp; +bool local_admin = false; + +if (!dev_addr ||is_zero_ether_addr (dev_addr)) { + dev_addr = pri_ifp->mac_addr; + local_admin = true; + }/* Generate the P2P Device Address. This consists of the device's * primary MAC address with the locally administered bit set. */ -memcpy (p2p->dev_addr, pri_ifp->mac_addr,ETH_ALEN ); - p2p->dev_addr[0 ] |=0x02 ; +memcpy (p2p->dev_addr, dev_addr,ETH_ALEN ); +if (local_admin) + p2p->dev_addr[0 ] |=0x02 ;memcpy (p2p_ifp->mac_addr, p2p->dev_addr,ETH_ALEN );/* Generate the P2P Interface Address. If the discovery and connection
@@ -495,6 +506,7 @@ static void brcmf_p2p_generate_bss_mac(struct brcmf_p2p_info *p2p)* different from the P2P Device Address, but also locally administered. */ memcpy (p2p->int_addr, p2p->dev_addr,ETH_ALEN ); + p2p->int_addr[0 ] |=0x02 ; p2p->int_addr[4 ] ^=0x80 ; }
@@ -1935,7 +1947,7 @@ s32 brcmf_p2p_attach(struct brcmf_cfg80211_info *cfg) p2p->bss_idx[P2PAPI_BSSCFG_DEVICE ].vif = p2p_vif; -brcmf_p2p_generate_bss_mac (p2p); +brcmf_p2p_generate_bss_mac (p2p,NULL );brcmf_p2p_set_firmware (pri_ifp, p2p->dev_addr);/* Initialize P2P Discovery in the firmware */
@@ -2125,13 +2137,96 @@ static int brcmf_p2p_release_p2p_if(struct brcmf_cfg80211_vif *vif) }/** +* brcmf_p2p_create_p2pdev() - create a P2P_DEVICE virtual interface. +* +* @p2p: P2P specific data. +* @wiphy: wiphy device of new interface. +* @addr: mac address for this new interface. +*/ +static struct wireless_dev *brcmf_p2p_create_p2pdev (struct brcmf_p2p_info *p2p, +struct wiphy *wiphy, +u8 *addr) +{ +struct brcmf_cfg80211_vif *p2p_vif; +struct brcmf_if *p2p_ifp; +struct brcmf_if *pri_ifp; +int err; +u32 bssidx; + +if (p2p->bss_idx[P2PAPI_BSSCFG_DEVICE ].vif) +return ERR_PTR (-ENOSPC ); + + p2p_vif =brcmf_alloc_vif (p2p->cfg,NL80211_IFTYPE_P2P_DEVICE , + false); +if (IS_ERR (p2p_vif)) { +brcmf_err ("could not create discovery vif\n" ); +return (struct wireless_dev *)p2p_vif; + } + +/* create ifp here */ + p2p_ifp =kzalloc (sizeof (*p2p_ifp),GFP_KERNEL ); +if (!p2p_ifp) +return ERR_PTR (-ENOMEM ); + + p2p_vif->ifp = p2p_ifp; + p2p_ifp->vif = p2p_vif; + + p2p->bss_idx[P2PAPI_BSSCFG_DEVICE ].vif = p2p_vif; +brcmf_p2p_generate_bss_mac (p2p, addr); +memcpy (&p2p_vif->wdev.address, p2p->dev_addr,sizeof (p2p->dev_addr)); + + pri_ifp = p2p->bss_idx[P2PAPI_BSSCFG_PRIMARY ].vif->ifp; +brcmf_p2p_set_firmware (pri_ifp, p2p->dev_addr); + +/* Initialize P2P Discovery in the firmware */ + err =brcmf_fil_iovar_int_set (pri_ifp,"p2p_disc" ,1 ); +if (err <0 ) { +brcmf_err ("set p2p_disc error\n" ); +brcmf_free_vif (p2p_vif); +return ERR_PTR (err); + } +/* obtain bsscfg index for P2P discovery */ + err =brcmf_fil_iovar_int_get (pri_ifp,"p2p_dev" , &bssidx); +if (err <0 ) { +brcmf_err ("retrieving discover bsscfg index failed\n" ); +brcmf_free_vif (p2p_vif); +return ERR_PTR (err); + } + + p2p_ifp->drvr = p2p->cfg->pub; + p2p_ifp->bssidx = bssidx; + +init_completion (&p2p->send_af_done); +INIT_WORK (&p2p->afx_hdl.afx_work, brcmf_p2p_afx_handler); +init_completion (&p2p->afx_hdl.act_frm_scan); +init_completion (&p2p->wait_next_af); + +return &p2p_vif->wdev; +} + +/** +* brcmf_p2p_delete_p2pdev() - delete P2P_DEVICE virtual interface. +* +* @vif: virtual interface object to delete. +*/ +static void brcmf_p2p_delete_p2pdev (struct brcmf_cfg80211_vif *vif) +{ +struct brcmf_p2p_info *p2p = &vif->ifp->drvr->config->p2p; + +cfg80211_unregister_wdev (&vif->wdev); + p2p->bss_idx[P2PAPI_BSSCFG_DEVICE ].vif =NULL ; +kfree (vif->ifp); +brcmf_free_vif (vif); +} + +/** * brcmf_p2p_add_vif() - create a new P2P virtual interface. * * @wiphy: wiphy device of new interface. * @name: name of the new interface. * @type: nl80211 interface type. -* @flags: TBD -* @params: TBD +* @flags: not used. +* @params: contains mac address for P2P device. */ struct wireless_dev *brcmf_p2p_add_vif(struct wiphy *wiphy, const char *name, enum nl80211_iftype type, u32 *flags,
@@ -2158,6 +2253,9 @@ struct wireless_dev *brcmf_p2p_add_vif(struct wiphy *wiphy, const char *name, iftype =BRCMF_FIL_P2P_IF_GO ; mode =WL_MODE_AP ;break ; +case NL80211_IFTYPE_P2P_DEVICE : +return brcmf_p2p_create_p2pdev (&cfg->p2p, wiphy, + params->macaddr);default :return ERR_PTR (-EOPNOTSUPP ); }
@@ -2245,6 +2343,8 @@ int brcmf_p2p_del_vif(struct wiphy *wiphy, struct wireless_dev *wdev)break ;case NL80211_IFTYPE_P2P_DEVICE : +brcmf_p2p_delete_p2pdev (vif); +return 0 ;default :return -ENOTSUPP ;break ;
@@ -2276,3 +2376,33 @@ int brcmf_p2p_del_vif(struct wiphy *wiphy, struct wireless_dev *wdev)return err; } + +int brcmf_p2p_start_device (struct wiphy *wiphy,struct wireless_dev *wdev) +{ +struct brcmf_cfg80211_info *cfg =wiphy_to_cfg (wiphy); +struct brcmf_p2p_info *p2p = &cfg->p2p; +struct brcmf_cfg80211_vif *vif; +int err; + + vif = container_of(wdev, struct brcmf_cfg80211_vif, wdev); +mutex_lock (&cfg->usr_sync); + err =brcmf_p2p_enable_discovery (p2p); +if (!err) +set_bit (BRCMF_VIF_STATUS_READY , &vif->sme_state); +mutex_unlock (&cfg->usr_sync); +return err; +} + +void brcmf_p2p_stop_device (struct wiphy *wiphy,struct wireless_dev *wdev) +{ +struct brcmf_cfg80211_info *cfg =wiphy_to_cfg (wiphy); +struct brcmf_p2p_info *p2p = &cfg->p2p; +struct brcmf_cfg80211_vif *vif; + + vif = container_of(wdev, struct brcmf_cfg80211_vif, wdev); +mutex_lock (&cfg->usr_sync); + (void )brcmf_p2p_deinit_discovery (p2p); +brcmf_abort_scanning (cfg); +clear_bit (BRCMF_VIF_STATUS_READY , &vif->sme_state); +mutex_unlock (&cfg->usr_sync); +}
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +4 -2
@@ -482,9 +482,9 @@ static struct wireless_dev *brcmf_cfg80211_add_iface(struct wiphy *wiphy,return ERR_PTR (-EOPNOTSUPP );case NL80211_IFTYPE_P2P_CLIENT :case NL80211_IFTYPE_P2P_GO : +case NL80211_IFTYPE_P2P_DEVICE :return brcmf_p2p_add_vif (wiphy, name, type, flags, params);case NL80211_IFTYPE_UNSPECIFIED : -case NL80211_IFTYPE_P2P_DEVICE :default :return ERR_PTR (-EINVAL ); }
@@ -594,9 +594,9 @@ int brcmf_cfg80211_del_iface(struct wiphy *wiphy, struct wireless_dev *wdev)return -EOPNOTSUPP ;case NL80211_IFTYPE_P2P_CLIENT :case NL80211_IFTYPE_P2P_GO : +case NL80211_IFTYPE_P2P_DEVICE :return brcmf_p2p_del_vif (wiphy, wdev);case NL80211_IFTYPE_UNSPECIFIED : -case NL80211_IFTYPE_P2P_DEVICE :default :return -EINVAL ; }
@@ -4023,6 +4023,8 @@ static struct cfg80211_ops wl_cfg80211_ops = { .mgmt_tx = brcmf_cfg80211_mgmt_tx, .remain_on_channel = brcmf_p2p_remain_on_channel, .cancel_remain_on_channel = brcmf_cfg80211_cancel_remain_on_channel, + .start_p2p_device = brcmf_p2p_start_device, + .stop_p2p_device = brcmf_p2p_stop_device, #ifdef CONFIG_NL80211_TESTMODE .testmode_cmd = brcmf_cfg80211_testmode #endif
Signature · 1 line
1.7.10.4
PATCH 13/16 brcmfmac: wait for firmware event when creating P2P_DEVICE interface
In reply to Arend van SprielThe firmware sends a IF event to notify the host driver that the P2P_DEVICE interface has been created. Wait for the event before returning the related wireless_dev.
--- .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 28 +++++++---- drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 2 +- drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 52 +++++++++++--------- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 8 +-- 4 files changed, 55 insertions(+), 35 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c +19 -9
@@ -755,15 +755,23 @@ struct brcmf_if *brcmf_add_if(struct brcmf_pub *drvr, s32 bssidx, s32 ifidx, } } -/* Allocate netdev, including space for private structure */ - ndev =alloc_netdev (sizeof (struct brcmf_if ), name, ether_setup); -if (!ndev) { -brcmf_err ("OOM - alloc_netdev\n" ); -return ERR_PTR (-ENOMEM ); +if (!brcmf_p2p_enable && bssidx ==1 ) { +/* this is P2P_DEVICE interface */ +brcmf_dbg (INFO ,"allocate non-netdev interface\n" ); + ifp =kzalloc (sizeof (*ifp),GFP_KERNEL ); + }else { +brcmf_dbg (INFO ,"allocate netdev interface\n" ); +/* Allocate netdev, including space for private structure */ + ndev =alloc_netdev (sizeof (*ifp), name, ether_setup); +if (!ndev) { +brcmf_err ("OOM - alloc_netdev\n" ); +return ERR_PTR (-ENOMEM ); + } + + ifp =netdev_priv (ndev); + ifp->ndev = ndev; } - ifp =netdev_priv (ndev); - ifp->ndev = ndev; ifp->drvr = drvr; drvr->iflist[bssidx] = ifp; ifp->ifidx = ifidx;
@@ -775,7 +783,7 @@ struct brcmf_if *brcmf_add_if(struct brcmf_pub *drvr, s32 bssidx, s32 ifidx,memcpy (ifp->mac_addr, mac_addr,ETH_ALEN );brcmf_dbg (TRACE ," ==== pid:%x, if:%s (%pM) created ===\n" , - current->pid, ifp->ndev->name, ifp->mac_addr); + current->pid, name, ifp->mac_addr);return ifp; }
@@ -807,11 +815,13 @@ void brcmf_del_if(struct brcmf_pub *drvr, s32 bssidx) }unregister_netdev (ifp->ndev); - drvr->iflist[bssidx] =NULL ;if (bssidx ==0 )brcmf_cfg80211_detach (drvr->config);free_netdev (ifp->ndev); + }else { +kfree (ifp); } + drvr->iflist[bssidx] =NULL ; }int brcmf_attach (uint bus_hdrlen,struct device *dev)
drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c +1 -1
@@ -1786,7 +1786,7 @@ void brcmf_fws_add_interface(struct brcmf_if *ifp)brcmf_dbg (TRACE ,"enter: idx=%d, mac=%pM\n" , ifp->bssidx, ifp->mac_addr); -if (!ifp->drvr->fw_signals) +if (!ifp->ndev || !ifp->drvr->fw_signals)return ; entry = &fws->desc.iface[ifp->ifidx];
drivers/net/wireless/brcm80211/brcmfmac/p2p.c +30 -22
101 lines not on this page · raw message
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +5 -3
@@ -4568,9 +4568,11 @@ static s32 brcmf_notify_vif_event(struct brcmf_if *ifp, ifp->vif = vif; vif->ifp = ifp; - vif->wdev.netdev = ifp->ndev; - ifp->ndev->ieee80211_ptr = &vif->wdev; -SET_NETDEV_DEV (ifp->ndev,wiphy_dev (cfg->wiphy)); +if (ifp->ndev) { + vif->wdev.netdev = ifp->ndev; + ifp->ndev->ieee80211_ptr = &vif->wdev; +SET_NETDEV_DEV (ifp->ndev,wiphy_dev (cfg->wiphy)); + }mutex_unlock (&event->vif_event_lock);wake_up (&event->vif_wq);return 0 ;
Signature · 1 line
1.7.10.4
PATCH 14/16 brcmfmac: fix reception of P2P probe requests on P2P_DEVICE interface
In reply to Arend van SprielThe probe requests received on P2P_DEVICE interface were not sent to wpa_supplicant, which makes the device not discoverable by peers.
--- drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 6 +++--- drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/p2p.c +3 -3
@@ -1850,7 +1850,6 @@ s32 brcmf_p2p_notify_rx_mgmt_p2p_probereq(struct brcmf_if *ifp,struct brcmf_cfg80211_info *cfg = ifp->drvr->config;struct brcmf_p2p_info *p2p = &cfg->p2p;struct afx_hdl *afx_hdl = &p2p->afx_hdl; -struct wireless_dev *wdev;struct brcmf_cfg80211_vif *vif = ifp->vif;struct brcmf_rx_mgmt_data *rxframe = (struct brcmf_rx_mgmt_data *)data;u16 chanspec =be16_to_cpu (rxframe->chanspec);
@@ -1893,8 +1892,9 @@ s32 brcmf_p2p_notify_rx_mgmt_p2p_probereq(struct brcmf_if *ifp,CHSPEC_IS2G (chanspec) ?IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ); - wdev = ifp->ndev->ieee80211_ptr; -cfg80211_rx_mgmt (wdev, freq,0 , mgmt_frame, mgmt_frame_len,GFP_ATOMIC ); + +cfg80211_rx_mgmt (&vif->wdev, freq,0 , mgmt_frame, mgmt_frame_len, +GFP_ATOMIC );brcmf_dbg (INFO ,"mgmt_frame_len (%d) , e->datalen (%d), chanspec (%04x), freq (%d)\n" , mgmt_frame_len, e->datalen, chanspec, freq);
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +5 -0
@@ -4112,6 +4112,11 @@ brcmf_txrx_stypes[NUM_NL80211_IFTYPES] = {BIT (IEEE80211_STYPE_AUTH >>4 ) |BIT (IEEE80211_STYPE_DEAUTH >>4 ) |BIT (IEEE80211_STYPE_ACTION >>4 ) + }, + [NL80211_IFTYPE_P2P_DEVICE] = { + .tx = 0xffff, + .rx =BIT (IEEE80211_STYPE_ACTION >>4 ) | + BIT(IEEE80211_STYPE_PROBE_REQ >> 4) } };
Signature · 1 line
1.7.10.4
PATCH 15/16 brcmfmac: obtain wdev using vif object in action frame rx
In reply to Arend van SprielThe function brcmf_p2p_notify_action_frame_rx() the wireless_dev is needed to pass the action frame to cfg80211. The wireless_dev is held in brcmf_cfg80211_vif object. Use that instead of the ieee80211_ptr in net_device as P2P_DEVICE interface does not have a net_device associated with it.
--- drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/brcm80211/brcmfmac/p2p.c +2 -1
@@ -1431,7 +1431,8 @@ int brcmf_p2p_notify_action_frame_rx(struct brcmf_if *ifp,CHSPEC_IS2G (chanspec) ?IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ); - wdev = ifp->ndev->ieee80211_ptr; + + wdev = &ifp->vif->wdev;cfg80211_rx_mgmt (wdev, freq,0 , (u8 *)mgmt_frame, mgmt_frame_len,GFP_ATOMIC );
Signature · 1 line
1.7.10.4
PATCH 16/16 brcmfmac: only use ifidx from BDC header in brcmf_rx_frames()
In reply to Arend van SprielIn brcmf_rx_frames() the call to brcmf_fweh_process_skb() could change the ifidx using information in the event data. This is only different to the BDC ifidx for IF ADD event. However, the creation of the new interface is deferred to event worker so it does not exist. After brcmf_fweh_process_skb() it is only used to set statistics.
--- drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c | 9 ++------- drivers/net/wireless/brcm80211/brcmfmac/fweh.c | 6 ++---- drivers/net/wireless/brcm80211/brcmfmac/fweh.h | 6 +++--- 3 files changed, 7 insertions(+), 14 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c +2 -7
@@ -323,13 +323,8 @@ void brcmf_rx_frames(struct device *dev, struct sk_buff_head *skb_list)/* Strip header, count, deliver upward */ skb_pull (skb,ETH_HLEN ); -/* Process special event packets and then discard them */ -brcmf_fweh_process_skb (drvr, skb, &ifidx); - -if (drvr->iflist[ifidx]) { - ifp = drvr->iflist[ifidx]; - ifp->ndev->last_rx = jiffies; - } +/* Process special event packets */ +brcmf_fweh_process_skb (drvr, skb);if (!(ifp->ndev->flags &IFF_UP )) {brcmu_pkt_buf_free_skb (skb);
drivers/net/wireless/brcm80211/brcmfmac/fweh.c +2 -4
@@ -407,13 +407,12 @@ int brcmf_fweh_activate_events(struct brcmf_if *ifp)* * @drvr: driver information object. * @event_packet: event packet to process. -* @ifidx: index of the firmware interface (may change). * * If the packet buffer contains a firmware event message it will * dispatch the event to a registered handler (using worker). */ void brcmf_fweh_process_event (struct brcmf_pub *drvr, -struct brcmf_event *event_packet,u8 *ifidx) +struct brcmf_event *event_packet) {enum brcmf_fweh_event_code code;struct brcmf_fweh_info *fweh = &drvr->fweh;
@@ -425,7 +424,6 @@ void brcmf_fweh_process_event(struct brcmf_pub *drvr,/* get event info */ code =get_unaligned_be32 (&event_packet->msg.event_type); datalen =get_unaligned_be32 (&event_packet->msg.datalen); - *ifidx = event_packet->msg.ifidx; data = &event_packet[1 ];if (code >=BRCMF_E_LAST )
@@ -442,7 +440,7 @@ void brcmf_fweh_process_event(struct brcmf_pub *drvr,return ; event->code = code; - event->ifidx = *ifidx; + event->ifidx = event_packet->msg.ifidx;/* use memcpy to get aligned event message */ memcpy (&event->emsg, &event_packet->msg,sizeof (event->emsg));
drivers/net/wireless/brcm80211/brcmfmac/fweh.h +3 -3
@@ -187,10 +187,10 @@ void brcmf_fweh_unregister(struct brcmf_pub *drvr, enum brcmf_fweh_event_code code);int brcmf_fweh_activate_events (struct brcmf_if *ifp);void brcmf_fweh_process_event (struct brcmf_pub *drvr, -struct brcmf_event *event_packet,u8 *ifidx); +struct brcmf_event *event_packet);static inline void brcmf_fweh_process_skb (struct brcmf_pub *drvr, -struct sk_buff *skb,u8 *ifidx) +struct sk_buff *skb) {struct brcmf_event *event_packet;u8 *data;
@@ -213,7 +213,7 @@ static inline void brcmf_fweh_process_skb(struct brcmf_pub *drvr,if (usr_stype !=BCMILCP_BCM_SUBTYPE_EVENT )return ; - brcmf_fweh_process_event(drvr, event_packet, ifidx); + brcmf_fweh_process_event(drvr, event_packet); }#endif /* FWEH_H_ */
Signature · 1 line
1.7.10.4