Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net/wireless/iwlwifi: fix iwlwifi_dev_ucode_error tracepoint

fix iwlwifi_dev_ucode_error tracepoint to pass pointer to a table
instead of all 17 arguments by value.
dvm/main.c and mvm/utils.c have 'struct iwl_error_event_table'
defined with very similar yet subtly different fields and offsets.
tracepoint is still common and using definition of 'struct iwl_error_event_table'
from dvm/commands.h while copying fields.
Long term this tracepoint probably should be split into two.

Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

authored by

Alexei Starovoitov and committed by
Daniel Borkmann
4fe43c2c 14624a93

+21 -33
+1 -6
drivers/net/wireless/intel/iwlwifi/dvm/main.c
··· 1651 1651 priv->status, table.valid); 1652 1652 } 1653 1653 1654 - trace_iwlwifi_dev_ucode_error(trans->dev, table.error_id, table.tsf_low, 1655 - table.data1, table.data2, table.line, 1656 - table.blink2, table.ilink1, table.ilink2, 1657 - table.bcon_time, table.gp1, table.gp2, 1658 - table.gp3, table.ucode_ver, table.hw_ver, 1659 - 0, table.brd_ver); 1654 + trace_iwlwifi_dev_ucode_error(trans->dev, &table, 0, table.brd_ver); 1660 1655 IWL_ERR(priv, "0x%08X | %-28s\n", table.error_id, 1661 1656 desc_lookup(table.error_id)); 1662 1657 IWL_ERR(priv, "0x%08X | uPc\n", table.pc);
+18 -21
drivers/net/wireless/intel/iwlwifi/iwl-devtrace-iwlwifi.h
··· 126 126 __entry->framelen, __entry->skbaddr) 127 127 ); 128 128 129 + struct iwl_error_event_table; 129 130 TRACE_EVENT(iwlwifi_dev_ucode_error, 130 - TP_PROTO(const struct device *dev, u32 desc, u32 tsf_low, 131 - u32 data1, u32 data2, u32 line, u32 blink2, u32 ilink1, 132 - u32 ilink2, u32 bcon_time, u32 gp1, u32 gp2, u32 rev_type, 133 - u32 major, u32 minor, u32 hw_ver, u32 brd_ver), 134 - TP_ARGS(dev, desc, tsf_low, data1, data2, line, 135 - blink2, ilink1, ilink2, bcon_time, gp1, gp2, 136 - rev_type, major, minor, hw_ver, brd_ver), 131 + TP_PROTO(const struct device *dev, const struct iwl_error_event_table *table, 132 + u32 hw_ver, u32 brd_ver), 133 + TP_ARGS(dev, table, hw_ver, brd_ver), 137 134 TP_STRUCT__entry( 138 135 DEV_ENTRY 139 136 __field(u32, desc) ··· 152 155 ), 153 156 TP_fast_assign( 154 157 DEV_ASSIGN; 155 - __entry->desc = desc; 156 - __entry->tsf_low = tsf_low; 157 - __entry->data1 = data1; 158 - __entry->data2 = data2; 159 - __entry->line = line; 160 - __entry->blink2 = blink2; 161 - __entry->ilink1 = ilink1; 162 - __entry->ilink2 = ilink2; 163 - __entry->bcon_time = bcon_time; 164 - __entry->gp1 = gp1; 165 - __entry->gp2 = gp2; 166 - __entry->rev_type = rev_type; 167 - __entry->major = major; 168 - __entry->minor = minor; 158 + __entry->desc = table->error_id; 159 + __entry->tsf_low = table->tsf_low; 160 + __entry->data1 = table->data1; 161 + __entry->data2 = table->data2; 162 + __entry->line = table->line; 163 + __entry->blink2 = table->blink2; 164 + __entry->ilink1 = table->ilink1; 165 + __entry->ilink2 = table->ilink2; 166 + __entry->bcon_time = table->bcon_time; 167 + __entry->gp1 = table->gp1; 168 + __entry->gp2 = table->gp2; 169 + __entry->rev_type = table->gp3; 170 + __entry->major = table->ucode_ver; 171 + __entry->minor = table->hw_ver; 169 172 __entry->hw_ver = hw_ver; 170 173 __entry->brd_ver = brd_ver; 171 174 ),
+1
drivers/net/wireless/intel/iwlwifi/iwl-devtrace.c
··· 30 30 #ifndef __CHECKER__ 31 31 #include "iwl-trans.h" 32 32 33 + #include "dvm/commands.h" 33 34 #define CREATE_TRACE_POINTS 34 35 #include "iwl-devtrace.h" 35 36
+1 -6
drivers/net/wireless/intel/iwlwifi/mvm/utils.c
··· 549 549 550 550 IWL_ERR(mvm, "Loaded firmware version: %s\n", mvm->fw->fw_version); 551 551 552 - trace_iwlwifi_dev_ucode_error(trans->dev, table.error_id, table.tsf_low, 553 - table.data1, table.data2, table.data3, 554 - table.blink2, table.ilink1, 555 - table.ilink2, table.bcon_time, table.gp1, 556 - table.gp2, table.fw_rev_type, table.major, 557 - table.minor, table.hw_ver, table.brd_ver); 552 + trace_iwlwifi_dev_ucode_error(trans->dev, &table, table.hw_ver, table.brd_ver); 558 553 IWL_ERR(mvm, "0x%08X | %-28s\n", table.error_id, 559 554 desc_lookup(table.error_id)); 560 555 IWL_ERR(mvm, "0x%08X | trm_hw_status0\n", table.trm_hw_status0);