Skip to contentSkip to conversation

usb: gadget: f_uac2: fix AC Interface Header Descriptor wTotalLength

PATCH In review Ruslan Bilovol 2 participants 4 messages Jul 3, 2020 – Jul 23, 2020 USB

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 usb: gadget: f_uac2: fix AC Interface Header Descriptor wTotalLength

As per UAC2 spec (ch. 4.7.2), wTotalLength of AC Interface Header Descriptor "includes the combined length of this descriptor header and all Clock Source, Unit and Terminal descriptors."

Thus add its size to its wTotalLength.

Also after recent changes wTotalLength is calculated dynamically, update static definition of uac2_ac_header_descriptor accordingly

---
 drivers/usb/gadget/function/f_uac2.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/usb/gadget/function/f_uac2.c +2 -5
index db2d4980cb35..3633df6d7610 100644
@@ -215,10 +215,7 @@ static struct uac2_ac_header_descriptor ac_hdr_desc = {
 	.bDescriptorSubtype = UAC_MS_HEADER,
 	.bcdADC = cpu_to_le16(0x200),
 	.bCategory = UAC2_FUNCTION_IO_BOX,
-	.wTotalLength = cpu_to_le16(sizeof in_clk_src_desc
-			+ sizeof out_clk_src_desc + sizeof usb_out_it_desc
-			+ sizeof io_in_it_desc + sizeof usb_in_ot_desc
-			+ sizeof io_out_ot_desc),
+	/* .wTotalLength = DYNAMIC */
 	.bmControls = 0,
 };
 
@@ -501,7 +498,7 @@ static void setup_descriptor(struct f_uac2_opts *opts)
 	as_in_hdr_desc.bTerminalLink = usb_in_ot_desc.bTerminalID;
 
 	iad_desc.bInterfaceCount = 1;
-	ac_hdr_desc.wTotalLength = 0;
+	ac_hdr_desc.wTotalLength = cpu_to_le16(sizeof(ac_hdr_desc));
 
 	if (EPIN_EN(opts)) {
 		u16 len = le16_to_cpu(ac_hdr_desc.wTotalLength);
Signature · 1 line
2.17.1
#1 lore raw
Quoted 5 lines · Ruslan Bilovol

As per UAC2 spec (ch. 4.7.2), wTotalLength of AC Interface Header Descriptor "includes the combined length of this descriptor header and all Clock Source, Unit and Terminal descriptors."

Quoted 7 lines

Thus add its size to its wTotalLength.

Also after recent changes wTotalLength is calculated dynamically, update static definition of uac2_ac_header_descriptor accordingly

Missing a Fixes tag here.

Signature · 1 line
balbi
#2 lore raw
Quoted 10 lines · Felipe Balbi
Quoted 7 lines · Ruslan Bilovol

As per UAC2 spec (ch. 4.7.2), wTotalLength of AC Interface Header Descriptor "includes the combined length of this descriptor header and all Clock Source, Unit and Terminal descriptors."

Thus add its size to its wTotalLength.

Quoted 7 lines
Quoted 5 lines

Also after recent changes wTotalLength is calculated dynamically, update static definition of uac2_ac_header_descriptor accordingly

Missing a Fixes tag here.

The issue is present since this driver introduction in 2012 in the commit 132fcb460839 "usb: gadget: Add Audio Class 2.0 Driver", but in older version of the driver it should be fixed in the uac2_ac_header_descriptor structure initialization

Should I resend this patch or you'll add this tag to the commit message by yourself:

Fixes 132fcb460839 ("usb: gadget: Add Audio Class 2.0 Driver")

Thanks,
Ruslan

#3 lore raw
Quoted 19 lines · Ruslan Bilovol
Quoted 10 lines · Felipe Balbi
Quoted 7 lines · Ruslan Bilovol

As per UAC2 spec (ch. 4.7.2), wTotalLength of AC Interface Header Descriptor "includes the combined length of this descriptor header and all Clock Source, Unit and Terminal descriptors."

Thus add its size to its wTotalLength.

Quoted 7 lines
Quoted 5 lines

Also after recent changes wTotalLength is calculated dynamically, update static definition of uac2_ac_header_descriptor accordingly

Missing a Fixes tag here.

Quoted 8 lines

The issue is present since this driver introduction in 2012 in the commit 132fcb460839 "usb: gadget: Add Audio Class 2.0 Driver", but in older version of the driver it should be fixed in the uac2_ac_header_descriptor structure initialization

Should I resend this patch or you'll add this tag to the commit message by yourself:

Fixes 132fcb460839 ("usb: gadget: Add Audio Class 2.0 Driver")

added, thanks

Signature · 1 line
balbi