korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 12:28:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

ALSA: firewire-lib: handle quirk to calculate payload quadlets as data block counter

Browse Source 
[ Upstream commit 4a486439d2 ]

Miglia Harmony Audio (OXFW970) has a quirk to put the number of
accumulated quadlets in CIP payload into the dbc field of CIP header.

This commit handles the quirk in the packet processing layer.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Link: https://lore.kernel.org/r/20240218074128.95210-4-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Takashi Sakamoto 2024-02-18 16:41:27 +09:00 committed by Greg Kroah-Hartman
parent 84ed33a082
commit b75395ec4b
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sound/firewire/amdtp-stream.c
View File

@ -771,10 +771,14 @@ static int check_cip_header(struct amdtp_stream *s, const __be32 *buf,
} else {
unsigned int dbc_interval;
if (*data_blocks > 0 && s->ctx_data.tx.dbc_interval > 0)
dbc_interval = s->ctx_data.tx.dbc_interval;
else
dbc_interval = *data_blocks;
if (!(s->flags & CIP_DBC_IS_PAYLOAD_QUADLETS)) {
if (*data_blocks > 0 && s->ctx_data.tx.dbc_interval > 0)
dbc_interval = s->ctx_data.tx.dbc_interval;
else
dbc_interval = *data_blocks;
} else {
dbc_interval = payload_length / sizeof(__be32);
}
lost = dbc != ((*data_block_counter + dbc_interval) & 0xff);
}

4
sound/firewire/amdtp-stream.h
View File

@ -37,6 +37,9 @@
* the value of current SYT_INTERVAL; e.g. initial value is not zero.
* @CIP_UNAWARE_SYT: For outgoing packet, the value in SYT field of CIP is 0xffff.
* For incoming packet, the value in SYT field of CIP is not handled.
* @CIP_DBC_IS_PAYLOAD_QUADLETS: Available for incoming packet, and only effective with
* CIP_DBC_IS_END_EVENT flag. The value of dbc field is the number of accumulated quadlets
* in CIP payload, instead of the number of accumulated data blocks.
*/
enum cip_flags {
CIP_NONBLOCKING = 0x00,
@ -51,6 +54,7 @@ enum cip_flags {
CIP_NO_HEADER = 0x100,
CIP_UNALIGHED_DBC = 0x200,
CIP_UNAWARE_SYT = 0x400,
CIP_DBC_IS_PAYLOAD_QUADLETS = 0x800,
};
/**