lkml.org 
[lkml]   [2015]   [Apr]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [PATCH] iwlwifi: Move each system tracepoints to their own header
From
it's me again.

On Mon, Apr 13, 2015 at 9:22 AM, Emmanuel Grumbach <egrumbach@gmail.com> wrote:
> On Sun, Apr 12, 2015 at 8:37 PM, Emmanuel Grumbach <egrumbach@gmail.com> wrote:
>> On Wed, Apr 8, 2015 at 10:44 AM, Johannes Berg
>> <johannes@sipsolutions.net> wrote:
>>> On Tue, 2015-04-07 at 12:13 -0400, Steven Rostedt wrote:
>>>> Every tracing file must have its own TRACE_SYSTEM defined.
>>>> The iwlwifi tracepoint header broke this and added in the middle
>>>> of the file:
>>> [...]
>>>> Unfortunately, this broke new code in the ftrace infrastructure.
>>>> Moving each of these TRACE_SYSTEMs into their own trace file with
>>>> just one TRACE_SYSTEM per file fixes the issue.
>>>>
>>>> Cc: Johannes Berg <johannes@sipsolutions.net>
>>>> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
>>>
>>>
>>>> drivers/net/wireless/iwlwifi/iwl-devtrace-data.h | 79 ++++
>>>> drivers/net/wireless/iwlwifi/iwl-devtrace-io.h | 155 ++++++++
>>>> .../net/wireless/iwlwifi/iwl-devtrace-iwlwifi.h | 200 ++++++++++
>>>> drivers/net/wireless/iwlwifi/iwl-devtrace-msg.h | 97 +++++
>>>> drivers/net/wireless/iwlwifi/iwl-devtrace-ucode.h | 81 ++++
>>>> drivers/net/wireless/iwlwifi/iwl-devtrace.h | 438 +--------------------
>>>> 6 files changed, 618 insertions(+), 432 deletions(-)
>>>> create mode 100644 drivers/net/wireless/iwlwifi/iwl-devtrace-data.h
>>>> create mode 100644 drivers/net/wireless/iwlwifi/iwl-devtrace-io.h
>>>> create mode 100644 drivers/net/wireless/iwlwifi/iwl-devtrace-iwlwifi.h
>>>> create mode 100644 drivers/net/wireless/iwlwifi/iwl-devtrace-msg.h
>>>> create mode 100644 drivers/net/wireless/iwlwifi/iwl-devtrace-ucode.h
>>>
>>> Looks good to me.
>>>
>>> Reviewed-by: Johannes Berg <johannes@sipsolutions.net>
>>>
>>
>> I had to make quite a few modifications since this patch was not based
>> on iwlwifi-next, but I picked it up in our internal tree.
>
> Wait - you seemed to want to apply that on your tree because of
> dependencies (which I can understand). So how do you suggest to
> proceed?
> You can apply your original version of the patch on your tree, but
> then it'll collapse when it'll meet iwlwifi-next.git.
> I can try to have the modified version of the patch into 4.1 but I
> doubt I'll make it. If I do make it, it'd allow you to work on top of
> 4.1 whenever that'll be ready? What is your timeline?
>

I overthought it. Stephen fixed the conflict correctly.

> Or maybe you can pull iwlwifi-next (which would be odd I have to say)?
> What do you suggest?
> FWIW - I am talking about:
>
> commit 7e1223b50089ab5901215d2fd8c61b42c7cfe034
> Author: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
> Date: Tue Feb 3 20:11:48 2015 +0200
>
> iwlwifi: mvm: new Alive / error table API
>
> The new API slightly changes the layout of the version of
> the firmware - prepare for that.
>
> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>


\
 
 \ /
  Last update: 2015-04-13 11:01    [W:0.064 / U:0.804 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site