Skip to content

Commit

Permalink
mac802154: add trace functionality for driver ops
Browse files Browse the repository at this point in the history 
This patch adds trace events for driver operations.

Signed-off-by: Varka Bhadram <[email protected]>
Acked-by: Alexander Aring <[email protected]>
Signed-off-by: Marcel Holtmann <[email protected]>
  • Loading branch information
@bhadram @holtmann
bhadram authored and holtmann committed Jun 2, 2015
1 parent 1caf6f4 commit 0ecc4e6
Show file tree
Hide file tree
Showing 4 changed files with 362 additions and 15 deletions.
4 changes: 3 additions & 1 deletion net/mac802154/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
obj-$(CONFIG_MAC802154) += mac802154.o
mac802154-objs := main.o rx.o tx.o mac_cmd.o mib.o \
iface.o llsec.o util.o cfg.o
iface.o llsec.o util.o cfg.o trace.o

CFLAGS_trace.o := -I$(src)

ccflags-y += -D__CHECK_ENDIAN__
92 changes: 78 additions & 14 deletions net/mac802154/driver-ops.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include <net/mac802154.h>

#include "ieee802154_i.h"
#include "trace.h"

static inline int
drv_xmit_async(struct ieee802154_local *local, struct sk_buff *skb)
Expand All @@ -27,19 +28,25 @@ drv_xmit_sync(struct ieee802154_local *local, struct sk_buff *skb)

static inline int drv_start(struct ieee802154_local *local)
{
int ret;

might_sleep();

trace_802154_drv_start(local);
local->started = true;
smp_mb();

return local->ops->start(&local->hw);
ret = local->ops->start(&local->hw);
trace_802154_drv_return_int(local, ret);
return ret;
}

static inline void drv_stop(struct ieee802154_local *local)
{
might_sleep();

trace_802154_drv_stop(local);
local->ops->stop(&local->hw);
trace_802154_drv_return_void(local);

/* sync away all work on the tasklet before clearing started */
tasklet_disable(&local->tasklet);
Expand All @@ -53,64 +60,90 @@ static inline void drv_stop(struct ieee802154_local *local)
static inline int
drv_set_channel(struct ieee802154_local *local, u8 page, u8 channel)
{
int ret;

might_sleep();

return local->ops->set_channel(&local->hw, page, channel);
trace_802154_drv_set_channel(local, page, channel);
ret = local->ops->set_channel(&local->hw, page, channel);
trace_802154_drv_return_int(local, ret);
return ret;
}

static inline int drv_set_tx_power(struct ieee802154_local *local, s32 mbm)
{
int ret;

might_sleep();

if (!local->ops->set_txpower) {
WARN_ON(1);
return -EOPNOTSUPP;
}

return local->ops->set_txpower(&local->hw, mbm);
trace_802154_drv_set_tx_power(local, mbm);
ret = local->ops->set_txpower(&local->hw, mbm);
trace_802154_drv_return_int(local, ret);
return ret;
}

static inline int drv_set_cca_mode(struct ieee802154_local *local,
const struct wpan_phy_cca *cca)
{
int ret;

might_sleep();

if (!local->ops->set_cca_mode) {
WARN_ON(1);
return -EOPNOTSUPP;
}

return local->ops->set_cca_mode(&local->hw, cca);
trace_802154_drv_set_cca_mode(local, cca);
ret = local->ops->set_cca_mode(&local->hw, cca);
trace_802154_drv_return_int(local, ret);
return ret;
}

static inline int drv_set_lbt_mode(struct ieee802154_local *local, bool mode)
{
int ret;

might_sleep();

if (!local->ops->set_lbt) {
WARN_ON(1);
return -EOPNOTSUPP;
}

return local->ops->set_lbt(&local->hw, mode);
trace_802154_drv_set_lbt_mode(local, mode);
ret = local->ops->set_lbt(&local->hw, mode);
trace_802154_drv_return_int(local, ret);
return ret;
}

static inline int
drv_set_cca_ed_level(struct ieee802154_local *local, s32 mbm)
{
int ret;

might_sleep();

if (!local->ops->set_cca_ed_level) {
WARN_ON(1);
return -EOPNOTSUPP;
}

return local->ops->set_cca_ed_level(&local->hw, mbm);
trace_802154_drv_set_cca_ed_level(local, mbm);
ret = local->ops->set_cca_ed_level(&local->hw, mbm);
trace_802154_drv_return_int(local, ret);
return ret;
}

static inline int drv_set_pan_id(struct ieee802154_local *local, __le16 pan_id)
{
struct ieee802154_hw_addr_filt filt;
int ret;

might_sleep();

Expand All @@ -121,14 +154,18 @@ static inline int drv_set_pan_id(struct ieee802154_local *local, __le16 pan_id)

filt.pan_id = pan_id;

return local->ops->set_hw_addr_filt(&local->hw, &filt,
trace_802154_drv_set_pan_id(local, pan_id);
ret = local->ops->set_hw_addr_filt(&local->hw, &filt,
IEEE802154_AFILT_PANID_CHANGED);
trace_802154_drv_return_int(local, ret);
return ret;
}

static inline int
drv_set_extended_addr(struct ieee802154_local *local, __le64 extended_addr)
{
struct ieee802154_hw_addr_filt filt;
int ret;

might_sleep();

Expand All @@ -139,14 +176,18 @@ drv_set_extended_addr(struct ieee802154_local *local, __le64 extended_addr)

filt.ieee_addr = extended_addr;

return local->ops->set_hw_addr_filt(&local->hw, &filt,
trace_802154_drv_set_extended_addr(local, extended_addr);
ret = local->ops->set_hw_addr_filt(&local->hw, &filt,
IEEE802154_AFILT_IEEEADDR_CHANGED);
trace_802154_drv_return_int(local, ret);
return ret;
}

static inline int
drv_set_short_addr(struct ieee802154_local *local, __le16 short_addr)
{
struct ieee802154_hw_addr_filt filt;
int ret;

might_sleep();

Expand All @@ -157,14 +198,18 @@ drv_set_short_addr(struct ieee802154_local *local, __le16 short_addr)

filt.short_addr = short_addr;

return local->ops->set_hw_addr_filt(&local->hw, &filt,
trace_802154_drv_set_short_addr(local, short_addr);
ret = local->ops->set_hw_addr_filt(&local->hw, &filt,
IEEE802154_AFILT_SADDR_CHANGED);
trace_802154_drv_return_int(local, ret);
return ret;
}

static inline int
drv_set_pan_coord(struct ieee802154_local *local, bool is_coord)
{
struct ieee802154_hw_addr_filt filt;
int ret;

might_sleep();

Expand All @@ -175,49 +220,68 @@ drv_set_pan_coord(struct ieee802154_local *local, bool is_coord)

filt.pan_coord = is_coord;

return local->ops->set_hw_addr_filt(&local->hw, &filt,
trace_802154_drv_set_pan_coord(local, is_coord);
ret = local->ops->set_hw_addr_filt(&local->hw, &filt,
IEEE802154_AFILT_PANC_CHANGED);
trace_802154_drv_return_int(local, ret);
return ret;
}

static inline int
drv_set_csma_params(struct ieee802154_local *local, u8 min_be, u8 max_be,
u8 max_csma_backoffs)
{
int ret;

might_sleep();

if (!local->ops->set_csma_params) {
WARN_ON(1);
return -EOPNOTSUPP;
}

return local->ops->set_csma_params(&local->hw, min_be, max_be,
trace_802154_drv_set_csma_params(local, min_be, max_be,
max_csma_backoffs);
ret = local->ops->set_csma_params(&local->hw, min_be, max_be,
max_csma_backoffs);
trace_802154_drv_return_int(local, ret);
return ret;
}

static inline int
drv_set_max_frame_retries(struct ieee802154_local *local, s8 max_frame_retries)
{
int ret;

might_sleep();

if (!local->ops->set_frame_retries) {
WARN_ON(1);
return -EOPNOTSUPP;
}

return local->ops->set_frame_retries(&local->hw, max_frame_retries);
trace_802154_drv_set_max_frame_retries(local, max_frame_retries);
ret = local->ops->set_frame_retries(&local->hw, max_frame_retries);
trace_802154_drv_return_int(local, ret);
return ret;
}

static inline int
drv_set_promiscuous_mode(struct ieee802154_local *local, bool on)
{
int ret;

might_sleep();

if (!local->ops->set_promiscuous_mode) {
WARN_ON(1);
return -EOPNOTSUPP;
}

return local->ops->set_promiscuous_mode(&local->hw, on);
trace_802154_drv_set_promiscuous_mode(local, on);
ret = local->ops->set_promiscuous_mode(&local->hw, on);
trace_802154_drv_return_int(local, ret);
return ret;
}

#endif /* __MAC802154_DRIVER_OPS */
9 changes: 9 additions & 0 deletions net/mac802154/trace.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#include <linux/module.h>

#ifndef __CHECKER__
#include <net/cfg802154.h>
#include "driver-ops.h"
#define CREATE_TRACE_POINTS
#include "trace.h"

#endif
Loading

0 comments on commit 0ecc4e6

Please sign in to comment.