[PATCH] Revert "ALSA: firewire-lib: fix inverted node IDs for amdtp_packet events"

[PATCH] Revert "ALSA: firewire-lib: fix inverted node IDs for amdtp_packet events"

[Takashi Sakamoto]

This reverts commit e703965a129cdd72ff74e248f8fbf0d617844527.

When creating this patch, I compared the value of src field to the
value of first byte of cip_header field (SID) in tracing event.
But in this test I used a device which has a quirk to transfer
isochronous packet with invalid SID.
---
 sound/firewire/amdtp-stream-trace.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sound/firewire/amdtp-stream-trace.h b/sound/firewire/amdtp-stream-trace.h
index 5fe0920f04e5..ab708857979f 100644
--- a/sound/firewire/amdtp-stream-trace.h
+++ b/sound/firewire/amdtp-stream-trace.h
@@ -35,11 +35,11 @@ TRACE_EVENT(amdtp_packet,
 		__entry->cycle = cycles % CYCLES_PER_SECOND;
 		__entry->channel = s->context->channel;
 		if (s->direction == AMDTP_IN_STREAM) {
-			__entry->src = fw_parent_device(s->unit)->card->node_id;
-			__entry->dest = fw_parent_device(s->unit)->node_id;
-		} else {
 			__entry->src = fw_parent_device(s->unit)->node_id;
 			__entry->dest = fw_parent_device(s->unit)->card->node_id;
+		} else {
+			__entry->src = fw_parent_device(s->unit)->card->node_id;
+			__entry->dest = fw_parent_device(s->unit)->node_id;
 		}
 		if (cip_header) {
 			memcpy(__get_dynamic_array(cip_header), cip_header,
-- 
2.20.1

Re: [PATCH] Revert "ALSA: firewire-lib: fix inverted node IDs for amdtp_packet events"

[Takashi Iwai]

On Sun, 23 Jun 2019 03:23:33 +0200,
Takashi Sakamoto wrote:
> 
> This reverts commit e703965a129cdd72ff74e248f8fbf0d617844527.
> 
> When creating this patch, I compared the value of src field to the
> value of first byte of cip_header field (SID) in tracing event.
> But in this test I used a device which has a quirk to transfer
> isochronous packet with invalid SID.

Could you give your sign-off and fixes tags?


thanks,

Takashi

> ---
>  sound/firewire/amdtp-stream-trace.h | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/sound/firewire/amdtp-stream-trace.h b/sound/firewire/amdtp-stream-trace.h
> index 5fe0920f04e5..ab708857979f 100644
> --- a/sound/firewire/amdtp-stream-trace.h
> +++ b/sound/firewire/amdtp-stream-trace.h
> @@ -35,11 +35,11 @@ TRACE_EVENT(amdtp_packet,
>  		__entry->cycle = cycles % CYCLES_PER_SECOND;
>  		__entry->channel = s->context->channel;
>  		if (s->direction == AMDTP_IN_STREAM) {
> -			__entry->src = fw_parent_device(s->unit)->card->node_id;
> -			__entry->dest = fw_parent_device(s->unit)->node_id;
> -		} else {
>  			__entry->src = fw_parent_device(s->unit)->node_id;
>  			__entry->dest = fw_parent_device(s->unit)->card->node_id;
> +		} else {
> +			__entry->src = fw_parent_device(s->unit)->card->node_id;
> +			__entry->dest = fw_parent_device(s->unit)->node_id;
>  		}
>  		if (cip_header) {
>  			memcpy(__get_dynamic_array(cip_header), cip_header,
> -- 
> 2.20.1
> 

Re: [PATCH] Revert "ALSA: firewire-lib: fix inverted node IDs for amdtp_packet events"

[Takashi Sakamoto]

On Mon, Jun 24, 2019 at 11:00:54AM +0200, Takashi Iwai wrote:
> On Sun, 23 Jun 2019 03:23:33 +0200,
> Takashi Sakamoto wrote:
> > 
> > This reverts commit e703965a129cdd72ff74e248f8fbf0d617844527.
> > 
> > When creating this patch, I compared the value of src field to the
> > value of first byte of cip_header field (SID) in tracing event.
> > But in this test I used a device which has a quirk to transfer
> > isochronous packet with invalid SID.
> 
> Could you give your sign-off and fixes tags?

I'll resubmit with them...


Thanks

Takashi Sakamoto