Skip to content

Commit 913e4a9

Browse files
Peter ChenFelipe Balbi
Peter Chen
authored and
Felipe Balbi
committed
usb: gadget: f_uac2: finalize wMaxPacketSize according to bandwidth
According to USB Audio Device 2.0 Spec, Ch4.10.1.1: wMaxPacketSize is defined as follows: Maximum packet size this endpoint is capable of sending or receiving when this configuration is selected. This is determined by the audio bandwidth constraints of the endpoint. In current code, the wMaxPacketSize is defined as the maximum packet size for ISO endpoint, and it will let the host reserve much more space than it really needs, so that we can't let more endpoints work together at one frame. We find this issue when we try to let 4 f_uac2 gadgets work together [1] at FS connection. [1]http://www.spinics.net/lists/linux-usb/msg123478.html Acked-by: Daniel Mack <zonque@gmail.com> Cc: andrzej.p@samsung.com Cc: Daniel Mack <zonque@gmail.com> Cc: tiwai@suse.de Cc: <stable@vger.kernel.org> #v3.18+ Cc: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Peter Chen <peter.chen@freescale.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
1 parent 8078f31 commit 913e4a9

File tree

1 file changed

+29
-2
lines changed

1 file changed

+29
-2
lines changed

drivers/usb/gadget/function/f_uac2.c

+29-2
Original file line numberDiff line numberDiff line change
@@ -975,6 +975,29 @@ free_ep(struct uac2_rtd_params *prm, struct usb_ep *ep)
975975
"%s:%d Error!\n", __func__, __LINE__);
976976
}
977977

978+
static void set_ep_max_packet_size(const struct f_uac2_opts *uac2_opts,
979+
struct usb_endpoint_descriptor *ep_desc,
980+
unsigned int factor, bool is_playback)
981+
{
982+
int chmask, srate, ssize;
983+
u16 max_packet_size;
984+
985+
if (is_playback) {
986+
chmask = uac2_opts->p_chmask;
987+
srate = uac2_opts->p_srate;
988+
ssize = uac2_opts->p_ssize;
989+
} else {
990+
chmask = uac2_opts->c_chmask;
991+
srate = uac2_opts->c_srate;
992+
ssize = uac2_opts->c_ssize;
993+
}
994+
995+
max_packet_size = num_channels(chmask) * ssize *
996+
DIV_ROUND_UP(srate, factor / (1 << (ep_desc->bInterval - 1)));
997+
ep_desc->wMaxPacketSize = cpu_to_le16(min(max_packet_size,
998+
le16_to_cpu(ep_desc->wMaxPacketSize)));
999+
}
1000+
9781001
static int
9791002
afunc_bind(struct usb_configuration *cfg, struct usb_function *fn)
9801003
{
@@ -1070,10 +1093,14 @@ afunc_bind(struct usb_configuration *cfg, struct usb_function *fn)
10701093
uac2->p_prm.uac2 = uac2;
10711094
uac2->c_prm.uac2 = uac2;
10721095

1096+
/* Calculate wMaxPacketSize according to audio bandwidth */
1097+
set_ep_max_packet_size(uac2_opts, &fs_epin_desc, 1000, true);
1098+
set_ep_max_packet_size(uac2_opts, &fs_epout_desc, 1000, false);
1099+
set_ep_max_packet_size(uac2_opts, &hs_epin_desc, 8000, true);
1100+
set_ep_max_packet_size(uac2_opts, &hs_epout_desc, 8000, false);
1101+
10731102
hs_epout_desc.bEndpointAddress = fs_epout_desc.bEndpointAddress;
1074-
hs_epout_desc.wMaxPacketSize = fs_epout_desc.wMaxPacketSize;
10751103
hs_epin_desc.bEndpointAddress = fs_epin_desc.bEndpointAddress;
1076-
hs_epin_desc.wMaxPacketSize = fs_epin_desc.wMaxPacketSize;
10771104

10781105
ret = usb_assign_descriptors(fn, fs_audio_desc, hs_audio_desc, NULL);
10791106
if (ret)

0 commit comments

Comments
 (0)