fe6db7eda9
I forgot to add stubs in case tracing is disabled which caused linking errors:
ERROR: modpost: "__SCT__tp_func_iwlmei_sap_data" [drivers/net/wireless/intel/iwlwifi/mei/iwlmei.ko] undefined!
ERROR: modpost: "__SCT__tp_func_iwlmei_me_msg" [drivers/net/wireless/intel/iwlwifi/mei/iwlmei.ko] undefined!
ERROR: modpost: "__tracepoint_iwlmei_sap_cmd" [drivers/net/wireless/intel/iwlwifi/mei/iwlmei.ko] undefined!
ERROR: modpost: "__tracepoint_iwlmei_me_msg" [drivers/net/wireless/intel/iwlwifi/mei/iwlmei.ko] undefined!
ERROR: modpost: "__SCK__tp_func_iwlmei_me_msg" [drivers/net/wireless/intel/iwlwifi/mei/iwlmei.ko] undefined!
ERROR: modpost: "__SCK__tp_func_iwlmei_sap_data" [drivers/net/wireless/intel/iwlwifi/mei/iwlmei.ko] undefined!
ERROR: modpost: "__tracepoint_iwlmei_sap_data" [drivers/net/wireless/intel/iwlwifi/mei/iwlmei.ko] undefined!
ERROR: modpost: "__SCT__tp_func_iwlmei_sap_cmd" [drivers/net/wireless/intel/iwlwifi/mei/iwlmei.ko] undefined!
ERROR: modpost: "__SCK__tp_func_iwlmei_sap_cmd" [drivers/net/wireless/intel/iwlwifi/mei/iwlmei.ko] undefined!
Fixes: 2da4366f9e ("iwlwifi: mei: add the driver to allow cooperation with CSME")
Reported-by: Jiri Slaby <jirislaby@kernel.org>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Acked-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20211201113411.130409-1-emmanuel.grumbach@intel.com
82 lines
1.9 KiB
C
82 lines
1.9 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* Copyright(c) 2021 Intel Corporation
|
|
*/
|
|
|
|
#if !defined(CONFIG_IWLWIFI_DEVICE_TRACING)
|
|
|
|
#define trace_iwlmei_sap_data(...)
|
|
|
|
#else
|
|
|
|
#if !defined(__IWLWIFI_DEVICE_TRACE_IWLWIFI_SAP_DATA) || defined(TRACE_HEADER_MULTI_READ)
|
|
|
|
#ifndef __IWLWIFI_DEVICE_TRACE_IWLWIFI_SAP_DATA
|
|
enum iwl_sap_data_trace_type {
|
|
IWL_SAP_RX_DATA_TO_AIR,
|
|
IWL_SAP_TX_DATA_FROM_AIR,
|
|
IWL_SAP_RX_DATA_DROPPED_FROM_AIR,
|
|
IWL_SAP_TX_DHCP,
|
|
};
|
|
|
|
static inline size_t
|
|
iwlmei_sap_data_offset(enum iwl_sap_data_trace_type trace_type)
|
|
{
|
|
switch (trace_type) {
|
|
case IWL_SAP_RX_DATA_TO_AIR:
|
|
return 0;
|
|
case IWL_SAP_TX_DATA_FROM_AIR:
|
|
case IWL_SAP_RX_DATA_DROPPED_FROM_AIR:
|
|
return sizeof(struct iwl_sap_hdr);
|
|
case IWL_SAP_TX_DHCP:
|
|
return sizeof(struct iwl_sap_cb_data);
|
|
default:
|
|
WARN_ON_ONCE(1);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
#define __IWLWIFI_DEVICE_TRACE_IWLWIFI_SAP_DATA
|
|
|
|
#include <linux/tracepoint.h>
|
|
#include <linux/skbuff.h>
|
|
#include "sap.h"
|
|
|
|
#undef TRACE_SYSTEM
|
|
#define TRACE_SYSTEM iwlmei_sap_data
|
|
|
|
TRACE_EVENT(iwlmei_sap_data,
|
|
TP_PROTO(const struct sk_buff *skb,
|
|
enum iwl_sap_data_trace_type trace_type),
|
|
TP_ARGS(skb, trace_type),
|
|
TP_STRUCT__entry(
|
|
__dynamic_array(u8, data,
|
|
skb->len - iwlmei_sap_data_offset(trace_type))
|
|
__field(u32, trace_type)
|
|
),
|
|
TP_fast_assign(
|
|
size_t offset = iwlmei_sap_data_offset(trace_type);
|
|
__entry->trace_type = trace_type;
|
|
skb_copy_bits(skb, offset, __get_dynamic_array(data),
|
|
skb->len - offset);
|
|
),
|
|
TP_printk("sap_data:trace_type %d len %d",
|
|
__entry->trace_type, __get_dynamic_array_len(data))
|
|
);
|
|
|
|
/*
|
|
* If you add something here, add a stub in case
|
|
* !defined(CONFIG_IWLWIFI_DEVICE_TRACING)
|
|
*/
|
|
|
|
#endif /* __IWLWIFI_DEVICE_TRACE_IWLWIFI_SAP_DATA */
|
|
|
|
#undef TRACE_INCLUDE_PATH
|
|
#define TRACE_INCLUDE_PATH .
|
|
#undef TRACE_INCLUDE_FILE
|
|
#define TRACE_INCLUDE_FILE trace-data
|
|
#include <trace/define_trace.h>
|
|
|
|
#endif /* CONFIG_IWLWIFI_DEVICE_TRACING */
|