| Message ID | 20180730092336.18741-2-jorge.sanjuan@codethink.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | usb-audio: Add UAC3 Power Domains | expand |
On Mon, 30 Jul 2018 11:23:33 +0200, Jorge Sanjuan wrote: > > diff --git a/sound/usb/power.c b/sound/usb/power.c > new file mode 100644 > index 000000000000..ce3fea2bd030 > --- /dev/null > +++ b/sound/usb/power.c > @@ -0,0 +1,118 @@ > +/* > + * UAC3 Power Domain state management functions > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License as published by > + * the Free Software Foundation; either version 2 of the License, or > + * (at your option) any later version. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * You should have received a copy of the GNU General Public License > + * along with this program; if not, write to the Free Software > + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA > + * > + */ For a new code, let's use the simpler SPDX form. thanks, Takashi
On Mon, 30 Jul 2018 11:23:33 +0200, Jorge Sanjuan wrote: > > diff --git a/include/linux/usb/audio-v3.h b/include/linux/usb/audio-v3.h > index 334bfa6dfb47..786e5939d831 100644 > --- a/include/linux/usb/audio-v3.h > +++ b/include/linux/usb/audio-v3.h > @@ -447,4 +447,8 @@ struct uac3_interrupt_data_msg { > /* BADD sample rate is always fixed to 48kHz */ > #define UAC3_BADD_SAMPLING_RATE 48000 > > +/* BADD power domains recovery times */ > +#define UAC3_BADD_PD_RECOVER_D1D0 0x0258 > +#define UAC3_BADD_PD_RECOVER_D2D0 0x1770 Please put the unit for these values. I guess they don't need to be hex? Takashi
On 30/07/18 14:03, Takashi Iwai wrote: > On Mon, 30 Jul 2018 11:23:33 +0200, > Jorge Sanjuan wrote: >> >> diff --git a/include/linux/usb/audio-v3.h b/include/linux/usb/audio-v3.h >> index 334bfa6dfb47..786e5939d831 100644 >> --- a/include/linux/usb/audio-v3.h >> +++ b/include/linux/usb/audio-v3.h >> @@ -447,4 +447,8 @@ struct uac3_interrupt_data_msg { >> /* BADD sample rate is always fixed to 48kHz */ >> #define UAC3_BADD_SAMPLING_RATE 48000 >> >> +/* BADD power domains recovery times */ >> +#define UAC3_BADD_PD_RECOVER_D1D0 0x0258 >> +#define UAC3_BADD_PD_RECOVER_D2D0 0x1770 > > Please put the unit for these values. I guess they don't need to be > hex? > Hi! The BADD spec defines these inferred values as hex (see section 6.2.2.13 of the spec). Should we keep them as per spec to avoid confusion? I'll update comment there with the units (50 us increments). Thanks for the reviews today. I'll update this series soon with the suggested changes. Jorge > > Takashi >
On Mon, 30 Jul 2018 18:05:47 +0200, Jorge wrote: > > > > On 30/07/18 14:03, Takashi Iwai wrote: > > On Mon, 30 Jul 2018 11:23:33 +0200, > > Jorge Sanjuan wrote: > >> > >> diff --git a/include/linux/usb/audio-v3.h b/include/linux/usb/audio-v3.h > >> index 334bfa6dfb47..786e5939d831 100644 > >> --- a/include/linux/usb/audio-v3.h > >> +++ b/include/linux/usb/audio-v3.h > >> @@ -447,4 +447,8 @@ struct uac3_interrupt_data_msg { > >> /* BADD sample rate is always fixed to 48kHz */ > >> #define UAC3_BADD_SAMPLING_RATE 48000 > >> > >> +/* BADD power domains recovery times */ > >> +#define UAC3_BADD_PD_RECOVER_D1D0 0x0258 > >> +#define UAC3_BADD_PD_RECOVER_D2D0 0x1770 > > > > Please put the unit for these values. I guess they don't need to be > > hex? > > > > Hi! > > The BADD spec defines these inferred values as hex (see section 6.2.2.13 > of the spec). Should we keep them as per spec to avoid confusion? I'll > update comment there with the units (50 us increments). Well, if they were defined in hex, it makes sense to keep the raw values as is. But it'd be also helpful to give a comment showing the actual usecs. thanks, Takashi
diff --git a/include/linux/usb/audio-v3.h b/include/linux/usb/audio-v3.h index 334bfa6dfb47..786e5939d831 100644 --- a/include/linux/usb/audio-v3.h +++ b/include/linux/usb/audio-v3.h @@ -447,4 +447,8 @@ struct uac3_interrupt_data_msg { /* BADD sample rate is always fixed to 48kHz */ #define UAC3_BADD_SAMPLING_RATE 48000 +/* BADD power domains recovery times */ +#define UAC3_BADD_PD_RECOVER_D1D0 0x0258 +#define UAC3_BADD_PD_RECOVER_D2D0 0x1770 + #endif /* __LINUX_USB_AUDIO_V3_H */ diff --git a/sound/usb/Makefile b/sound/usb/Makefile index 05440e2df8d9..a4d69638b501 100644 --- a/sound/usb/Makefile +++ b/sound/usb/Makefile @@ -15,6 +15,7 @@ snd-usb-audio-objs := card.o \ pcm.o \ proc.o \ quirks.o \ + power.o \ stream.o snd-usbmidi-lib-objs := midi.o diff --git a/sound/usb/power.c b/sound/usb/power.c new file mode 100644 index 000000000000..ce3fea2bd030 --- /dev/null +++ b/sound/usb/power.c @@ -0,0 +1,118 @@ +/* + * UAC3 Power Domain state management functions + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include <linux/slab.h> +#include <linux/usb.h> +#include <linux/usb/audio.h> +#include <linux/usb/audio-v2.h> +#include <linux/usb/audio-v3.h> + +#include "usbaudio.h" +#include "helper.h" +#include "power.h" + +struct snd_usb_power_domain * +snd_usb_find_power_domain(struct usb_host_interface *ctrl_iface, + unsigned char id) +{ + struct snd_usb_power_domain *pd; + void *p; + + pd = kzalloc(sizeof(*pd), GFP_KERNEL); + if (!pd) + return NULL; + + p = NULL; + while ((p = snd_usb_find_csint_desc(ctrl_iface->extra, + ctrl_iface->extralen, + p, UAC3_POWER_DOMAIN)) != NULL) { + struct uac3_power_domain_descriptor *pd_desc = p; + int i; + + for (i = 0; i < pd_desc->bNrEntities; i++) { + if (pd_desc->baEntityID[i] == id) { + pd->pd_id = pd_desc->bPowerDomainID; + pd->pd_d1d0_rec = + le16_to_cpu(pd_desc->waRecoveryTime1); + pd->pd_d2d0_rec = + le16_to_cpu(pd_desc->waRecoveryTime2); + return pd; + } + } + } + + kfree(pd); + return NULL; +} + +int snd_usb_power_domain_set(struct snd_usb_audio *chip, + struct snd_usb_power_domain *pd, + unsigned char state) +{ + struct usb_device *dev = chip->dev; + unsigned char current_state; + int err, idx; + + idx = snd_usb_ctrl_intf(chip) | (pd->pd_id << 8); + + err = snd_usb_ctl_msg(chip->dev, usb_rcvctrlpipe(chip->dev, 0), + UAC2_CS_CUR, + USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_IN, + UAC3_AC_POWER_DOMAIN_CONTROL << 8, idx, + ¤t_state, sizeof(current_state)); + if (err < 0) { + dev_err(&dev->dev, "Can't get UAC3 power state for id %d\n", + pd->pd_id); + return err; + } + + if (current_state == state) { + dev_dbg(&dev->dev, "UAC3 power domain id %d already in state %d\n", + pd->pd_id, state); + return 0; + } + + err = snd_usb_ctl_msg(chip->dev, usb_sndctrlpipe(chip->dev, 0), UAC2_CS_CUR, + USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_OUT, + UAC3_AC_POWER_DOMAIN_CONTROL << 8, idx, + &state, sizeof(state)); + if (err < 0) { + dev_err(&dev->dev, "Can't set UAC3 power state to %d for id %d\n", + state, pd->pd_id); + return err; + } + + if (state == UAC3_PD_STATE_D0) { + switch (current_state) { + case UAC3_PD_STATE_D2: + udelay(pd->pd_d2d0_rec * 50); + break; + case UAC3_PD_STATE_D1: + udelay(pd->pd_d1d0_rec * 50); + break; + default: + return -EINVAL; + } + } + + dev_dbg(&dev->dev, "UAC3 power domain id %d change to state %d\n", + pd->pd_id, state); + + return 0; +} diff --git a/sound/usb/power.h b/sound/usb/power.h index b2e25f60c5a2..6004231a7c75 100644 --- a/sound/usb/power.h +++ b/sound/usb/power.h @@ -2,6 +2,25 @@ #ifndef __USBAUDIO_POWER_H #define __USBAUDIO_POWER_H +struct snd_usb_power_domain { + int pd_id; /* UAC3 Power Domain ID */ + int pd_d1d0_rec; /* D1 to D0 recovery time */ + int pd_d2d0_rec; /* D2 to D0 recovery time */ +}; + +enum { + UAC3_PD_STATE_D0, + UAC3_PD_STATE_D1, + UAC3_PD_STATE_D2, +}; + +int snd_usb_power_domain_set(struct snd_usb_audio *chip, + struct snd_usb_power_domain *pd, + unsigned char state); +struct snd_usb_power_domain * +snd_usb_find_power_domain(struct usb_host_interface *ctrl_iface, + unsigned char id); + #ifdef CONFIG_PM int snd_usb_autoresume(struct snd_usb_audio *chip); void snd_usb_autosuspend(struct snd_usb_audio *chip);
Thee USB Audio Class 3 (UAC3) introduces Power Domains as a new feature to let a host turn individual parts of an audio function to different power states via USB requests. This lets the device get to know a bit amore about what the host is up to in order to optimize power consumption efficiently. The Power Domains are optional for UAC3 configuration but all UAC3 devices shall include at least one BADD configuration where the support for Power Domains is compulsory. This patch adds a set of features/helpers to parse these power domains and change their status. Signed-off-by: Jorge Sanjuan <jorge.sanjuan@codethink.co.uk> --- include/linux/usb/audio-v3.h | 4 ++ sound/usb/Makefile | 1 + sound/usb/power.c | 118 +++++++++++++++++++++++++++++++++++++++++++ sound/usb/power.h | 19 +++++++ 4 files changed, 142 insertions(+) create mode 100644 sound/usb/power.c