May 2013 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] ALSA: hda - re-apply fixup when resuming haswell hdmi codec
by mengdong.lin＠intel.com 07 May '13

07 May '13

From: Mengdong Lin <mengdong.lin(a)intel.com> This patch is a supplement to a previous patch: "ALSA: hda - Add fixup for Haswell to enable all pin and convertor widgets". Some Haswell BIOS will disable the 2nd and 3rd pin/covertor widgets when the HD-A controller changes state from D3 to D0. So when the controller resumes after a system or runtime suspend, these widgets are disabled and programming these widgets to D0 will cause H/W error and codec will not respond. So this patch adds a "set_power_state" ops for Haswell codec. Before setting the codec to D0, this function will apply a BIOS-specific fixup to enable the 2nd & 3rd pins/cvts if need. And since BIOS will also disable DP1.2, so this function will check and enable DP1.2 mode if need. Signed-off-by: Mengdong Lin <mengdong.lin(a)intel.com> diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index adb5dce..9ecb55c 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1842,7 +1842,7 @@ static void intel_haswell_enable_all_pins(struct hda_codec *codec, { unsigned int vendor_param; - if (action != HDA_FIXUP_ACT_PRE_PROBE) + if (action != HDA_FIXUP_ACT_PRE_PROBE && action != HDA_FIXUP_ACT_INIT) return; vendor_param = snd_hda_codec_read(codec, INTEL_VENDOR_NID, 0, INTEL_GET_VENDOR_VERB, 0); @@ -1855,7 +1855,8 @@ static void intel_haswell_enable_all_pins(struct hda_codec *codec, if (vendor_param == -1) return; - snd_hda_codec_update_widgets(codec); + if (action == HDA_FIXUP_ACT_PRE_PROBE) + snd_hda_codec_update_widgets(codec); return; } @@ -1874,7 +1875,27 @@ static void intel_haswell_fixup_enable_dp12(struct hda_codec *codec) INTEL_SET_VENDOR_VERB, vendor_param); } +static void haswell_set_power_state(struct hda_codec *codec, hda_nid_t fg, + unsigned int power_state) +{ + unsigned int state; + unsigned int vendor_param; + + if (AC_PWRST_D0 == power_state) { + snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_INIT); + + intel_haswell_fixup_enable_dp12(codec); + + } + snd_hda_codec_read(codec, fg, 0, + AC_VERB_SET_POWER_STATE, + power_state); + + snd_hda_codec_set_power_to_all(codec, fg, power_state); + + return; +} /* available models for fixup */ enum { @@ -1922,6 +1943,10 @@ static int patch_generic_hdmi(struct hda_codec *codec) return -EINVAL; } codec->patch_ops = generic_hdmi_patch_ops; + + if (codec->vendor_id == 0x80862807) + codec->patch_ops.set_power_state = haswell_set_power_state; + generic_hdmi_init_per_pins(codec); init_channel_allocations(); -- 1.7.10.4

2 1

[alsa-devel] [PATCH]ALSA: HDA: Fix Oops caused by dereference NULL pointer
by Wang YanQing 07 May '13

07 May '13

The interrupt handler azx_interrupt will call azx_update_rirb, which may call snd_hda_queue_unsol_event, snd_hda_queue_unsol_event will dereference chip->bus pointer. The problem is we alloc chip->bus in azx_codec_create which will be called after we enable IRQ and enable unsolicited event in azx_probe. This will cause Oops due dereference NULL pointer. I meet it, good luck:) Signed-off-by: Wang YanQing <udknight(a)gmail.com> --- sound/pci/hda/hda_codec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 622f726..9c76752 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -618,6 +618,9 @@ int snd_hda_queue_unsol_event(struct hda_bus *bus, u32 res, u32 res_ex) unsigned int wp; trace_hda_unsol_event(bus, res, res_ex); + if (!bus) + return 0; + unsol = bus->unsol; if (!unsol) return 0; -- 1.7.12.4.dirty

2 1

[alsa-devel] [PATCH 1/6] ASoC: Samsung: Remove redundant platform_set_drvdata()
by Sachin Kamat 07 May '13

07 May '13

Commit 0998d06310 (device-core: Ensure drvdata = NULL when no driver is bound) removes the need to set driver data field to NULL. Signed-off-by: Sachin Kamat <sachin.kamat(a)linaro.org> Cc: Sangbeom Kim <sbkim73(a)samsung.com> --- sound/soc/samsung/smdk_wm8580pcm.c | 1 - sound/soc/samsung/smdk_wm8994pcm.c | 1 - 2 files changed, 2 deletions(-) diff --git a/sound/soc/samsung/smdk_wm8580pcm.c b/sound/soc/samsung/smdk_wm8580pcm.c index e43bd42..23a9204 100644 --- a/sound/soc/samsung/smdk_wm8580pcm.c +++ b/sound/soc/samsung/smdk_wm8580pcm.c @@ -176,7 +176,6 @@ static int snd_smdk_probe(struct platform_device *pdev) static int snd_smdk_remove(struct platform_device *pdev) { snd_soc_unregister_card(&smdk_pcm); - platform_set_drvdata(pdev, NULL); return 0; } diff --git a/sound/soc/samsung/smdk_wm8994pcm.c b/sound/soc/samsung/smdk_wm8994pcm.c index 3688a32..0c84ca0 100644 --- a/sound/soc/samsung/smdk_wm8994pcm.c +++ b/sound/soc/samsung/smdk_wm8994pcm.c @@ -146,7 +146,6 @@ static int snd_smdk_probe(struct platform_device *pdev) static int snd_smdk_remove(struct platform_device *pdev) { snd_soc_unregister_card(&smdk_pcm); - platform_set_drvdata(pdev, NULL); return 0; } -- 1.7.9.5

4 12

[alsa-devel] [PATCH v2 12/13] ASoC: fsl: imx-audmux: Let device core handle pinctrl
by Fabio Estevam 07 May '13

07 May '13

From: Fabio Estevam <fabio.estevam(a)freescale.com> Since commit ab78029 (drivers/pinctrl: grab default handles from device core), we can rely on device core for handling pinctrl. So remove devm_pinctrl_get_select_default() from the driver. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- Changes since v1: - Rebased against topic/fsl branch sound/soc/fsl/imx-audmux.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/sound/soc/fsl/imx-audmux.c b/sound/soc/fsl/imx-audmux.c index 47f046a..e260f1f 100644 --- a/sound/soc/fsl/imx-audmux.c +++ b/sound/soc/fsl/imx-audmux.c @@ -26,7 +26,6 @@ #include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/slab.h> -#include <linux/pinctrl/consumer.h> #include "imx-audmux.h" @@ -247,7 +246,6 @@ EXPORT_SYMBOL_GPL(imx_audmux_v2_configure_port); static int imx_audmux_probe(struct platform_device *pdev) { struct resource *res; - struct pinctrl *pinctrl; const struct of_device_id *of_id = of_match_device(imx_audmux_dt_ids, &pdev->dev); @@ -256,12 +254,6 @@ static int imx_audmux_probe(struct platform_device *pdev) if (IS_ERR(audmux_base)) return PTR_ERR(audmux_base); - pinctrl = devm_pinctrl_get_select_default(&pdev->dev); - if (IS_ERR(pinctrl)) { - dev_err(&pdev->dev, "setup pinctrl failed!"); - return PTR_ERR(pinctrl); - } - audmux_clk = devm_clk_get(&pdev->dev, "audmux"); if (IS_ERR(audmux_clk)) { dev_dbg(&pdev->dev, "cannot get clock: %ld\n", -- 1.7.9.5

2 1

Re: [alsa-devel] [RFC] ASoC: sgtl5000: Remove cache support
by Mark Brown 07 May '13

07 May '13

On Mon, May 06, 2013 at 03:19:27PM -0500, Matt Sealey wrote: > I have asked before and I will ask again; does anyone have any insight Not on the list you haven't as far as I can tell... this is the first I've heard of any concern about this code, I'd not be surprised if others were similarly unaware of any concerns. > The patch came from out of nowhere, and the comments seem to say that > the LDO gets enabled on every chip higher than a specific version. > Now, this is totally against the design documentation for the SGTL5000 > which specifically states that using the internal LDO is quite > possibly the *worst* power consuming case and NOT best practise for > putting the codec on a design, with the sole benefit being reduced > external component count. Are you sure it's purely about power consumption? A common application for LDOs in this situation is to clean up noise on the incoming power supply, improving rejection of noise. This is mostly irrelevant for digital supplies but can be desirable for analogue ones. Of course this looks like it's being used as a digital supply so... I have to say your explanation is a little curious, though - normally an LDO would require an external capacitor and so would either increase the component count (adding the capactior) or have no effect (if one is already present for decoupling). What is the supply for this LDO and where does the output go? > What happens if we just take out the internal LDO setup conditional on > version, and only initialize it if VDDD is missing? Do boards that If the LDO is enabled and connected to a supply which is also driven externally that's not a clever idea, the two regulators will both be trying to regulate the same supply. > I am not entirely sure how well the commit linked by Fabio would work > on mainline since if it uses hw_read/write it should also be updating > the cache with those values to be sure they can later be modified... > the BSP code does that then fills the cache with the existing values > afterwards. That commit is just bogus in the way it interacts with the cache, half of it looks awfully like it's trying to work around some breakage in the way the cache was being set up. > So maybe we don't disable the cache, or it gets ported to regmap, but > the order should be enable regulators in a non-cached way then fill > the cache AFTERWARDS - the code at ToT mainline doesn't fix the cache I'm sorry, this makes no sense to me. If we know the physical defaults for the device and we can get the device into that state then we should have no need to read from the cache. If we don't know what they are then they shouldn't be listed. > after it does regulator/power regs setup, I assume because cache > filling is now somehow automated in ASoC (and if this is the case, There is no cache filling to automate, if (as is the case here) register defaults are provided they're used. > then the cache io setup needs to be done after regulator/power setup, > the defaults list/cache needs to be updated for those registers before > any register caching io is done..). And maybe setting up the regulator > is kind of pointless anyway (meaning that whole caching/not-caching > thing just falls away?) Again this makes no sense, it seems like you're very confused here. The whole purpose of the register defaults is to reflect the default values of the registers. The infrastructure relies on this being the case, otherwise it will get confused for example during cache sync when it decides if a write to the device is required. I think the point that you lost me was your assumption that the regulator enable needs to be done without the cache. What makes you believe that this is the case? Note that as I said in another post the driver is currently totally broken with regard to anything that actually powers off the device, there's never any attempt made to restore the register cache.

1 0

[alsa-devel] [PATCH 13/13] ASoC: mxs: mxs-saif: Let device core handle pinctrl
by Fabio Estevam 06 May '13

06 May '13

Since commit ab78029 (drivers/pinctrl: grab default handles from device core), we can rely on device core for handling pinctrl. So remove devm_pinctrl_get_select_default() from the driver. Cc: Mark Brown <broonie(a)kernel.org> Cc: <alsa-devel(a)alsa-project.org> Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- sound/soc/mxs/mxs-saif.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c index 3a2aa1d..12723b0 100644 --- a/sound/soc/mxs/mxs-saif.c +++ b/sound/soc/mxs/mxs-saif.c @@ -27,7 +27,6 @@ #include <linux/delay.h> #include <linux/time.h> #include <linux/fsl/mxs-dma.h> -#include <linux/pinctrl/consumer.h> #include <sound/core.h> #include <sound/pcm.h> #include <sound/pcm_params.h> @@ -661,7 +660,6 @@ static int mxs_saif_probe(struct platform_device *pdev) struct device_node *np = pdev->dev.of_node; struct resource *iores, *dmares; struct mxs_saif *saif; - struct pinctrl *pinctrl; int ret = 0; struct device_node *master; @@ -701,12 +699,6 @@ static int mxs_saif_probe(struct platform_device *pdev) mxs_saif[saif->id] = saif; - pinctrl = devm_pinctrl_get_select_default(&pdev->dev); - if (IS_ERR(pinctrl)) { - ret = PTR_ERR(pinctrl); - return ret; - } - saif->clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(saif->clk)) { ret = PTR_ERR(saif->clk); -- 1.7.9.5

2 1

[alsa-devel] [PATCH 12/13] ASoC: fsl: imx-audmux: Let device core handle pinctrl
by Fabio Estevam 06 May '13

06 May '13

Since commit ab78029 (drivers/pinctrl: grab default handles from device core), we can rely on device core for handling pinctrl. So remove devm_pinctrl_get_select_default() from the driver. Cc: Mark Brown <broonie(a)kernel.org> Cc: <alsa-devel(a)alsa-project.org> Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- sound/soc/fsl/imx-audmux.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/sound/soc/fsl/imx-audmux.c b/sound/soc/fsl/imx-audmux.c index 3f333e5..22967c6 100644 --- a/sound/soc/fsl/imx-audmux.c +++ b/sound/soc/fsl/imx-audmux.c @@ -26,7 +26,6 @@ #include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/slab.h> -#include <linux/pinctrl/consumer.h> #include "imx-audmux.h" @@ -247,7 +246,6 @@ EXPORT_SYMBOL_GPL(imx_audmux_v2_configure_port); static int imx_audmux_probe(struct platform_device *pdev) { struct resource *res; - struct pinctrl *pinctrl; const struct of_device_id *of_id = of_match_device(imx_audmux_dt_ids, &pdev->dev); @@ -256,12 +254,6 @@ static int imx_audmux_probe(struct platform_device *pdev) if (IS_ERR(audmux_base)) return PTR_ERR(audmux_base); - pinctrl = devm_pinctrl_get_select_default(&pdev->dev); - if (IS_ERR(pinctrl)) { - dev_err(&pdev->dev, "setup pinctrl failed!"); - return PTR_ERR(pinctrl); - } - audmux_clk = clk_get(&pdev->dev, "audmux"); if (IS_ERR(audmux_clk)) { dev_dbg(&pdev->dev, "cannot get clock: %ld\n", -- 1.7.9.5

2 1

[alsa-devel] [PATCH 1/2] ASoC: mxs-sgtl5000: Remove unneeded 'ret' variable
by Fabio Estevam 06 May '13

06 May '13

From: Fabio Estevam <fabio.estevam(a)freescale.com> Variable 'ret' is not needed here, so just remove it. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- sound/soc/mxs/mxs-sgtl5000.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/mxs/mxs-sgtl5000.c b/sound/soc/mxs/mxs-sgtl5000.c index b1d9b5e..4f74b05 100644 --- a/sound/soc/mxs/mxs-sgtl5000.c +++ b/sound/soc/mxs/mxs-sgtl5000.c @@ -116,7 +116,7 @@ static int mxs_sgtl5000_probe_dt(struct platform_device *pdev) { struct device_node *np = pdev->dev.of_node; struct device_node *saif_np[2], *codec_np; - int i, ret = 0; + int i; if (!np) return 1; /* no device tree */ @@ -142,7 +142,7 @@ static int mxs_sgtl5000_probe_dt(struct platform_device *pdev) of_node_put(saif_np[0]); of_node_put(saif_np[1]); - return ret; + return 0; } static int mxs_sgtl5000_probe(struct platform_device *pdev) -- 1.7.9.5

3 5

[alsa-devel] [PATCH] ALSA: hda - delay resume haswell hdmi codec in system resume
by mengdong.lin＠intel.com 06 May '13

06 May '13

From: Mengdong Lin <mengdong.lin(a)intel.com> In system resume, Haswell codec cannot be programmed to D0 before Gfx driver initializes the display pipeline and audio, which will trigger an unsol event on the pin with HDMI/DP cable connected. Otherwise, the connected pin will stay in D3 with right channel muted and thus no sound can be heard. This patch - adds a codec flag to delay resuming a codec. System resume will skip the codecs if this flag is set, and these codecs will be resumed on later codec access. - adds a set_power_state ops for Haswell HDMI codec. In a delayed resume, this ops will enable and wait for the unsol event, and then resume the codec. A 300ms timeout is set in case unsol event is lost. Signed-off-by: Mengdong Lin <mengdong.lin(a)intel.com> diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 04b5738..bcb7205 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -5508,11 +5508,15 @@ int snd_hda_resume(struct hda_bus *bus) struct hda_codec *codec; list_for_each_entry(codec, &bus->codec_list, list) { - hda_call_codec_resume(codec); + if (codec->support_delay_resume) + codec->resume_delayed = 1; + else + hda_call_codec_resume(codec); } return 0; } EXPORT_SYMBOL_HDA(snd_hda_resume); + #endif /* CONFIG_PM */ /* diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h index 23ca172..5b5e5f4 100644 --- a/sound/pci/hda/hda_codec.h +++ b/sound/pci/hda/hda_codec.h @@ -886,6 +886,8 @@ struct hda_codec { unsigned int d3_stop_clk:1; /* support D3 operation without BCLK */ unsigned int pm_down_notified:1; /* PM notified to controller */ unsigned int in_pm:1; /* suspend/resume being performed */ + unsigned int support_delay_resume:1; /* codec support delay resume */ + unsigned int resume_delayed:1; /* resume delayed by PM */ int power_transition; /* power-state in transition */ int power_count; /* current (global) power refcount */ struct delayed_work power_work; /* delayed task for powerdown */ diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 78e1827..d116908 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -98,6 +98,14 @@ struct hdmi_spec { */ struct hda_multi_out multiout; struct hda_pcm_stream pcm_playback; + +#ifdef CONFIG_PM + /* + * Non-generic Intel Haswell specific + */ + unsigned int ready_to_resume:1; + wait_queue_head_t resume_wq; +#endif }; @@ -977,6 +985,13 @@ static void hdmi_intrinsic_event(struct hda_codec *codec, unsigned int res) if (pin_idx < 0) return; +#ifdef CONFIG_PM + if (codec->resume_delayed) { + spec->ready_to_resume = 1; + wake_up(&spec->resume_wq); + } +#endif + hdmi_present_sense(&spec->pins[pin_idx], 1); snd_hda_jack_report_sync(codec); } @@ -1846,6 +1861,63 @@ static const struct hda_fixup hdmi_fixups[] = { }; +#ifdef CONFIG_PM +static void intel_haswell_wait_ready_to_resume(struct hda_codec *codec) +{ + struct hdmi_spec *spec = codec->spec; + int pin_idx; + + spec->ready_to_resume = 0; + + for (pin_idx = 0; pin_idx < spec->num_pins; pin_idx++) { + struct hdmi_spec_per_pin *per_pin; + hda_nid_t pin_nid; + struct hda_jack_tbl *jack; + + per_pin = &spec->pins[pin_idx]; + pin_nid = per_pin->pin_nid; + jack = snd_hda_jack_tbl_get(codec, pin_nid); + if (jack) + snd_hda_codec_write(codec, pin_nid, 0, + AC_VERB_SET_UNSOLICITED_ENABLE, + AC_USRSP_EN | jack->tag); + } + + wait_event_timeout(spec->resume_wq, + spec->ready_to_resume, msecs_to_jiffies(300)); + if (!spec->ready_to_resume) + snd_printd(KERN_WARNING "HDMI: Haswell not ready to resume\n"); +} + +static void intel_haswell_set_power_state(struct hda_codec *codec, hda_nid_t fg, + unsigned int power_state) +{ + if (codec->resume_delayed && power_state == AC_PWRST_D0) { + intel_haswell_wait_ready_to_resume(codec); + codec->resume_delayed = 0; + } + + snd_hda_codec_read(codec, fg, 0, + AC_VERB_SET_POWER_STATE, + power_state); + + snd_hda_codec_set_power_to_all(codec, fg, power_state); +} + +static inline void intel_haswell_allow_delay_resume(struct hda_codec *codec) +{ + struct hdmi_spec *spec = codec->spec; + + init_waitqueue_head(&spec->resume_wq); + codec->support_delay_resume = 1; + + codec->patch_ops.set_power_state = + intel_haswell_set_power_state; +} +#else +define intel_haswell_allow_delay_resume NULL +#endif + static int patch_generic_hdmi(struct hda_codec *codec) { struct hdmi_spec *spec; @@ -1868,6 +1940,10 @@ static int patch_generic_hdmi(struct hda_codec *codec) return -EINVAL; } codec->patch_ops = generic_hdmi_patch_ops; + + if (codec->vendor_id == 0x80862807) + intel_haswell_allow_delay_resume(codec); + generic_hdmi_init_per_pins(codec); init_channel_allocations(); -- 1.7.10.4

4 51

[alsa-devel] [PATCH] alsactl: sprintf to snprintf prevent buffer overflow
by Doug Goldstein 06 May '13

06 May '13

sprintf() is a bit dangerous unless you explicitly know your type size and want to keep it in sync always. Its safer to just use snprintf() and ensure your string doesn't overflow and is NULL terminated. Signed-off-by: Doug Goldstein <cardoe(a)cardoe.com> --- This was written to fix the buffer overflow crash in alsactl with the 1.0.27 release, which is documented in Gentoo bug #468160 [1]. The issue is actually already fixed upstream by 95788fea25c1a59985828d4b91af0772d077600b however the fix just changes the size and continues to use sprintf() which IMHO is still dangerous. The attached patch will fix the issue in a safer manner for good. [1] https://bugs.gentoo.org/show_bug.cgi?id=468160 --- alsactl/lock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/alsactl/lock.c b/alsactl/lock.c index fce208b..587a109 100644 --- a/alsactl/lock.c +++ b/alsactl/lock.c @@ -53,9 +53,9 @@ static int state_lock_(const char *file, int lock, int timeout) lck.l_len = 11; lck.l_pid = 0; if (lock) { - sprintf(lcktxt, "%10li\n", (long)getpid()); + snprintf(lcktxt, sizeof(lcktxt), "%10li\n", (long)getpid()); } else { - sprintf(lcktxt, "%10s\n", ""); + snprintf(lcktxt, sizeof(lcktxt), "%10s\n", ""); } while (fd < 0 && timeout-- > 0) { fd = open(nfile, O_RDWR); -- 1.8.2.1

2 1

[alsa-devel] [PATCH 1/2] ALSA: mips/hal2: Remove redundant platform_set_drvdata()
by Sachin Kamat 06 May '13

06 May '13

Commit 0998d06310 (device-core: Ensure drvdata = NULL when no driver is bound) removes the need to set driver data field to NULL. Signed-off-by: Sachin Kamat <sachin.kamat(a)linaro.org> Cc: Thomas Bogendoerfer <tsbogend(a)alpha.fanken.de> --- sound/mips/hal2.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/mips/hal2.c b/sound/mips/hal2.c index 7420c59..2b7f6e8 100644 --- a/sound/mips/hal2.c +++ b/sound/mips/hal2.c @@ -922,7 +922,6 @@ static int hal2_remove(struct platform_device *pdev) struct snd_card *card = platform_get_drvdata(pdev); snd_card_free(card); - platform_set_drvdata(pdev, NULL); return 0; } -- 1.7.9.5

2 3

[alsa-devel] [PATCH resend 2/2] ALSA: mips/sgio2audio: Remove redundant platform_set_drvdata()
by Sachin Kamat 06 May '13

06 May '13

Commit 0998d06310 (device-core: Ensure drvdata = NULL when no driver is bound) removes the need to set driver data field to NULL. Signed-off-by: Sachin Kamat <sachin.kamat(a)linaro.org> Cc: Vivien Chappelier <vivien.chappelier(a)linux-mips.org> --- Resending becasue of a typo in patch title --- sound/mips/sgio2audio.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/mips/sgio2audio.c b/sound/mips/sgio2audio.c index 01a03ef..cfe99ae 100644 --- a/sound/mips/sgio2audio.c +++ b/sound/mips/sgio2audio.c @@ -963,7 +963,6 @@ static int snd_sgio2audio_remove(struct platform_device *pdev) struct snd_card *card = platform_get_drvdata(pdev); snd_card_free(card); - platform_set_drvdata(pdev, NULL); return 0; } -- 1.7.9.5

1 0

[alsa-devel] [RFC 26/26] HID/ALSA: wiimote: add speaker support
by David Herrmann 05 May '13

05 May '13

Classic Wii Remotes provide a speaker on the device. We can stream PCM data, mute and change volume via special protocol requests and remote audio registers. The device supports several different formats, but fully understood are only signed 8-bit PCM and something that looks like 4-bit Yamaha ADPCM. Theoretically, we can set data-rates from 183Hz up to 12MHz, but a realistic range for Bluetooth l2cap is 1000-4000 Hz. Data is streamed as 20bytes blocks and must be sent in a constant rate. There is no way to read the current position. It would be way too slow, anyway. However, if we stream data too fast, older devices will report overrun errors. It is nearly impossible to avoid them as we have no fine-grained control over bluetooth radio. But that's probably also the reason why newer devices no longer send these errors. Note that 8bit PCM at such low rates has quite bad sound quality. You also need to use user-space programs like "sox/play" as other applications require rates >4000/8000Hz. The 4bit Yamaha ADPCM should improve sound-quality a lot, however, the kernel currently doesn't support this. So we either need to add ALSA support or add an internal encoder. But this will be implemented in follow-up patches so we first get the infrastructure ready. Thanks to David Henningsson for very helpful advice on the driver layout. The driver is also very loosely based on the sgio2audio driver by Vivien Chappelier <vivien.chappelier(a)linux-mips.org> and the dummy alsa sound driver. Cc: alsa-devel(a)alsa-project.org Cc: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: David Herrmann <dh.herrmann(a)gmail.com> --- Hi This is my second revision of the Wii Remote sound-driver. It is based on the hotplugging rework in this series. It's the only patch that is marked as RFC but I thought I'd just include it in this series for completenes. If someone wants to give it a try, I used the "sox" tools for testing as most other tools require rates >4000/8000Hz. Sample created via: sox input.wav -b 8 -e signed -c 1 -r 2000 output.raw Play via: (prefix with: SOX_OPTS="--buffer 128" for better responsiveness) AUDIODEV=hw:1 play -e signed -b 8 -c 1 -r 2000 output.raw Comments welcome! I tested this with 4 different devices and all worked well. I also tested hotplugging while playing audio and I never got any deadlocks or oopses. It's the first time I worked with the sound-layer, but I'm now pretty sure I got everything right. Maybe I could even relax the heavy-locking but better be safe. Cheers David drivers/hid/Kconfig | 4 + drivers/hid/Makefile | 3 + drivers/hid/hid-wiimote-core.c | 66 +++- drivers/hid/hid-wiimote-modules.c | 5 + drivers/hid/hid-wiimote-speaker.c | 662 ++++++++++++++++++++++++++++++++++++++ drivers/hid/hid-wiimote.h | 17 + 6 files changed, 755 insertions(+), 2 deletions(-) create mode 100644 drivers/hid/hid-wiimote-speaker.c diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index e8ef86c..3bc81c8 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -699,6 +699,7 @@ config HID_WIIMOTE tristate "Nintendo Wii / Wii U peripherals" depends on HID depends on LEDS_CLASS + depends on !SND || HIGH_RES_TIMERS select POWER_SUPPLY select INPUT_FF_MEMLESS ---help--- @@ -715,6 +716,9 @@ config HID_WIIMOTE the Wii U Gamepad) might be supported in the future. But currently support is limited to Bluetooth based devices. + If Alsa sound support (CONFIG_SND) is enabled, this driver also provides + a sound card interface for Wii Remote speakers. + If unsure, say N. To compile this driver as a module, choose M here: the diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile index 8b7106b..d149e10 100644 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile @@ -32,6 +32,9 @@ hid-wiimote-y := hid-wiimote-core.o hid-wiimote-modules.o ifdef CONFIG_DEBUG_FS hid-wiimote-y += hid-wiimote-debug.o endif +ifdef CONFIG_SND + hid-wiimote-y += hid-wiimote-speaker.o +endif obj-$(CONFIG_HID_A4TECH) += hid-a4tech.o obj-$(CONFIG_HID_ACRUX) += hid-axff.o diff --git a/drivers/hid/hid-wiimote-core.c b/drivers/hid/hid-wiimote-core.c index 279a07d..ea07fc3 100644 --- a/drivers/hid/hid-wiimote-core.c +++ b/drivers/hid/hid-wiimote-core.c @@ -309,8 +309,8 @@ void wiiproto_req_ir2(struct wiimote_data *wdata, __u8 flags) #define wiiproto_req_weeprom(wdata, os, buf, sz) \ wiiproto_req_wmem((wdata), true, (os), (buf), (sz)) -static void wiiproto_req_wmem(struct wiimote_data *wdata, bool eeprom, - __u32 offset, const __u8 *buf, __u8 size) +void wiiproto_req_wmem(struct wiimote_data *wdata, bool eeprom, + __u32 offset, const __u8 *buf, __u8 size) { __u8 cmd[22]; @@ -359,6 +359,58 @@ void wiiproto_req_rmem(struct wiimote_data *wdata, bool eeprom, __u32 offset, wiimote_queue(wdata, cmd, sizeof(cmd)); } +void wiiproto_req_speaker(struct wiimote_data *wdata, bool on) +{ + __u8 cmd[2]; + + cmd[0] = WIIPROTO_REQ_SPEAKER; + cmd[1] = on ? 0x04 : 0x00; + + wiiproto_keep_rumble(wdata, &cmd[1]); + wiimote_queue(wdata, cmd, sizeof(cmd)); +} + +void wiiproto_req_mute(struct wiimote_data *wdata, bool on) +{ + __u8 cmd[2]; + + cmd[0] = WIIPROTO_REQ_MUTE; + cmd[1] = on ? 0x04 : 0x00; + + wiiproto_keep_rumble(wdata, &cmd[1]); + wiimote_queue(wdata, cmd, sizeof(cmd)); +} + +/* send audio data, possibly fragmented into two blocks */ +size_t wiiproto_req_audio(struct wiimote_data *wdata, const __u8 *b1, + size_t len1, const __u8 *b2, size_t len2) +{ + __u8 cmd[22]; + size_t pos, len; + + pos = 0; + len = min_t(size_t, len1, 20ULL); + memcpy(&cmd[2 + pos], b1, len); + pos += len; + + if (pos < 20 && len2) { + len = min_t(size_t, len2, 20ULL - pos); + memcpy(&cmd[2 + pos], b2, len); + pos += len; + } + + cmd[0] = WIIPROTO_REQ_AUDIO; + cmd[1] = (pos & 0xff) << 3; + + for ( ; pos < 20; ++pos) + cmd[pos] = 0; + + wiiproto_keep_rumble(wdata, &cmd[1]); + wiimote_queue(wdata, cmd, sizeof(cmd)); + + return pos; +} + /* requries the cmd-mutex to be held */ int wiimote_cmd_write(struct wiimote_data *wdata, __u32 offset, const __u8 *wmem, __u8 size) @@ -570,6 +622,7 @@ static const __u8 * const wiimote_devtype_mods[WIIMOTE_DEV_NUM] = { WIIMOD_LED4, WIIMOD_ACCEL, WIIMOD_IR, + WIIMOD_SPEAKER, WIIMOD_NULL, }, [WIIMOTE_DEV_GEN10] = (const __u8[]){ @@ -582,6 +635,7 @@ static const __u8 * const wiimote_devtype_mods[WIIMOTE_DEV_NUM] = { WIIMOD_LED4, WIIMOD_ACCEL, WIIMOD_IR, + WIIMOD_SPEAKER, WIIMOD_NULL, }, [WIIMOTE_DEV_GEN20] = (const __u8[]){ @@ -595,6 +649,7 @@ static const __u8 * const wiimote_devtype_mods[WIIMOTE_DEV_NUM] = { WIIMOD_ACCEL, WIIMOD_IR, WIIMOD_BUILTIN_MP, + WIIMOD_SPEAKER, WIIMOD_NULL, }, [WIIMOTE_DEV_BALANCE_BOARD] = (const __u8[]) { @@ -1469,6 +1524,13 @@ static void handler_return(struct wiimote_data *wdata, const __u8 *payload) if (wiimote_cmd_pending(wdata, cmd, 0)) { wdata->state.cmd_err = err; wiimote_cmd_complete(wdata); + } else if (cmd == WIIPROTO_REQ_AUDIO && err == 4) { + /* If we stream audio data too fast, we get overrun errors + * from the device. However, on audio-period bounds, + * we have a very hard time sending audio at the exact rate + * as we have no control over the bluetooth l2cap IRQs. + * Hence, drop any overrun errors. */ + hid_dbg(wdata->hdev, "audio overrun error\n"); } else if (err) { hid_warn(wdata->hdev, "Remote error %hhu on req %hhu\n", err, cmd); diff --git a/drivers/hid/hid-wiimote-modules.c b/drivers/hid/hid-wiimote-modules.c index ab25a64..25483aa 100644 --- a/drivers/hid/hid-wiimote-modules.c +++ b/drivers/hid/hid-wiimote-modules.c @@ -2074,6 +2074,11 @@ const struct wiimod_ops *wiimod_table[WIIMOD_NUM] = { [WIIMOD_IR] = &wiimod_ir, [WIIMOD_BUILTIN_MP] = &wiimod_builtin_mp, [WIIMOD_NO_MP] = &wiimod_no_mp, +#ifdef CONFIG_SND + [WIIMOD_SPEAKER] = &wiimod_speaker, +#else + [WIIMOD_SPEAKER] = &wiimod_dummy, +#endif }; const struct wiimod_ops *wiimod_ext_table[WIIMOTE_EXT_NUM] = { diff --git a/drivers/hid/hid-wiimote-speaker.c b/drivers/hid/hid-wiimote-speaker.c new file mode 100644 index 0000000..89b7f9f --- /dev/null +++ b/drivers/hid/hid-wiimote-speaker.c @@ -0,0 +1,662 @@ +/* + * Driver for audio speakers of Nintendo Wii / Wii U peripherals + * Copyright (c) 2012-2013 David Herrmann <dh.herrmann(a)gmail.com> + */ + +/* + * 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. + */ + +/* + * Audio Speakers + * Some Wii peripherals provide an audio speaker that supports 8bit PCM, 4bit + * Yamaha ADPCM and some other mostly unknown formats. Not all setup options + * are known, but we know how to setup an 8bit PCM or 4bit ADPCM stream and + * adjust volume. Data is sent as 20bytes chunks and needs to be streamed at + * a constant rate. + */ + +#include <linux/device.h> +#include <linux/hid.h> +#include <linux/hrtimer.h> +#include <linux/interrupt.h> +#include <linux/mutex.h> +#include <linux/spinlock.h> +#include <sound/control.h> +#include <sound/core.h> +#include <sound/initval.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include "hid-wiimote.h" + +struct wiimote_speaker { + spinlock_t lock; + struct snd_card *card; + struct wiimote_data *wdata; + unsigned int online : 1; + unsigned int mute : 1; + __u8 volume; + + unsigned long pos; + struct snd_pcm_substream *subs; + struct mutex runlock; + + struct hrtimer timer; + struct tasklet_struct tasklet; +}; + +enum wiimod_speaker_mode { + WIIMOD_SPEAKER_MODE_PCM8, + /* TODO: 4bit Yamaha ADPCM is currently not implemented */ + WIIMOD_SPEAKER_MODE_ADPCM4, +}; + +static int wiimod_speaker_enable(struct wiimote_speaker *speaker) +{ + struct wiimote_data *wdata = speaker->wdata; + unsigned long flags; + + spin_lock_irqsave(&wdata->state.lock, flags); + + if (!speaker->online) { + speaker->online = 1; + wiiproto_req_speaker(wdata, true); + wiiproto_req_mute(wdata, speaker->mute); + } + + spin_unlock_irqrestore(&wdata->state.lock, flags); + + return 0; +} + +static void wiimod_speaker_disable(struct wiimote_speaker *speaker) +{ + struct wiimote_data *wdata = speaker->wdata; + unsigned long flags; + + spin_lock_irqsave(&wdata->state.lock, flags); + + if (speaker->online) { + speaker->online = 0; + wiiproto_req_speaker(wdata, false); + } + + spin_unlock_irqrestore(&wdata->state.lock, flags); +} + +static void wiimod_speaker_set_mute(struct wiimote_speaker *speaker, bool mute) +{ + struct wiimote_data *wdata = speaker->wdata; + unsigned long flags; + + spin_lock_irqsave(&wdata->state.lock, flags); + + if (speaker->mute != mute) { + speaker->mute = mute; + if (speaker->online) + wiiproto_req_mute(wdata, mute); + } + + spin_unlock_irqrestore(&wdata->state.lock, flags); +} + +static void wiimod_speaker_set_volume(struct wiimote_speaker *speaker, + __u8 volume) +{ + struct wiimote_data *wdata = speaker->wdata; + unsigned long flags; + + spin_lock_irqsave(&wdata->state.lock, flags); + + if (speaker->volume != volume) { + speaker->volume = volume; + if (speaker->online) + wiiproto_req_wmem(wdata, false, 0xa20005, &volume, + sizeof(volume)); + } + + spin_unlock_irqrestore(&wdata->state.lock, flags); +} + +/* Change speaker configuration. \mode can be one of WIIMOD_SPEAKER_MODE_*, + * \rate is the PCM sample rate and \volume is the requested volume. */ +static int wiimod_speaker_setup(struct wiimote_speaker *speaker, + __u8 mode, __u16 rate, __s16 volume) +{ + struct wiimote_data *wdata = speaker->wdata; + unsigned long flags; + __u8 config[7], m, wmem; + __u16 r; + int ret; + + if (!rate) + return -EINVAL; + + switch (mode) { + case WIIMOD_SPEAKER_MODE_PCM8: + r = 12000000ULL / rate; + m = 0x40; + break; + case WIIMOD_SPEAKER_MODE_ADPCM4: + r = 6000000ULL / rate; + m = 0x00; + break; + default: + return -EINVAL; + } + + config[0] = 0x00; + config[1] = m; + config[2] = r & 0x00ff; + config[3] = (r & 0xff00) >> 8; + config[4] = volume & 0xff; + config[5] = 0x00; + config[6] = 0x00; + + wiimote_cmd_acquire_noint(wdata); + + /* mute speaker during setup and read/write volume field */ + spin_lock_irqsave(&wdata->state.lock, flags); + + wiiproto_req_mute(wdata, true); + if (volume < 0) + config[4] = speaker->volume; + else + speaker->volume = volume; + + spin_unlock_irqrestore(&wdata->state.lock, flags); + + /* power speaker */ + wmem = 0x01; + ret = wiimote_cmd_write(wdata, 0xa20009, &wmem, sizeof(wmem)); + if (ret) + goto out_unlock; + + /* prepare setup */ + wmem = 0x08; + ret = wiimote_cmd_write(wdata, 0xa20001, &wmem, sizeof(wmem)); + if (ret) + goto out_unlock; + + /* write configuration */ + ret = wiimote_cmd_write(wdata, 0xa20001, config, sizeof(config)); + if (ret) + goto out_unlock; + + /* enable speaker */ + wmem = 0x01; + ret = wiimote_cmd_write(wdata, 0xa20008, &wmem, sizeof(wmem)); + if (ret) + goto out_unlock; + +out_unlock: + wiimote_cmd_release(wdata); + return ret; +} + +/* returns true if a period has elapsed */ +static bool wiimod_speaker_push(struct wiimote_speaker *speaker) +{ + struct wiimote_data *wdata = speaker->wdata; + struct snd_pcm_runtime *runtime = speaker->subs->runtime; + unsigned long flags; + bool elapsed; + unsigned long buflen, plen, len; + __u8 *src; + + spin_lock_irqsave(&wdata->state.lock, flags); + + buflen = frames_to_bytes(runtime, runtime->buffer_size); + plen = frames_to_bytes(runtime, runtime->period_size); + src = runtime->dma_area; + + len = buflen - speaker->pos; + + /* no need to send data while muted or offline */ + if (speaker->online && !speaker->mute) { + if (len < 20) + wiiproto_req_audio(wdata, &src[speaker->pos], + len, src, 20 - len); + else + wiiproto_req_audio(wdata, &src[speaker->pos], + 20, NULL, 0); + } + + speaker->pos += 20; + speaker->pos %= buflen; + elapsed = (speaker->pos % plen) < 20; + + spin_unlock_irqrestore(&wdata->state.lock, flags); + + return elapsed; +} + +/* timer handling */ + +static void wiimod_speaker_task(unsigned long data) +{ + struct wiimote_speaker *speaker = (void*)data; + unsigned long flags; + bool elapsed = false; + + spin_lock_irqsave(&speaker->lock, flags); + if (speaker->wdata) + elapsed = wiimod_speaker_push(speaker); + spin_unlock_irqrestore(&speaker->lock, flags); + + if (elapsed) + snd_pcm_period_elapsed(speaker->subs); +} + +static enum hrtimer_restart wiimod_speaker_tick(struct hrtimer *timer) +{ + struct wiimote_speaker *speaker = container_of(timer, + struct wiimote_speaker, + timer); + unsigned long missed; + __u64 ival; + + tasklet_schedule(&speaker->tasklet); + + ival = 1000000000ULL * 20U; + ival /= speaker->subs->runtime->rate; + + missed = hrtimer_forward_now(timer, ns_to_ktime(ival)); + if (missed > 1) + snd_printdd("wiimote: speaker: missed %lu timer interrupts\n", + missed - 1); + + return HRTIMER_RESTART; +} + +/* PCM layer */ + +static const struct snd_pcm_hardware wiimod_speaker_playback_hw = { + .info = SNDRV_PCM_INFO_MMAP | + SNDRV_PCM_INFO_MMAP_VALID | + SNDRV_PCM_INFO_INTERLEAVED, + .formats = SNDRV_PCM_FMTBIT_S8, + .rates = SNDRV_PCM_RATE_CONTINUOUS, + .rate_min = 500, + .rate_max = 2000, /* TODO: >2000 only supported by 2nd gen */ + .channels_min = 1, + .channels_max = 1, + .buffer_bytes_max = 32768, + .period_bytes_min = 128, + .period_bytes_max = 32768, + .periods_min = 1, + .periods_max = 1024, +}; + +static int wiimod_speaker_playback_open(struct snd_pcm_substream *substream) +{ + struct wiimote_speaker *speaker = snd_pcm_substream_chip(substream); + struct snd_pcm_runtime *runtime = substream->runtime; + unsigned long flags; + int ret; + + runtime->hw = wiimod_speaker_playback_hw; + + spin_lock_irqsave(&speaker->lock, flags); + ret = -ENODEV; + if (speaker->wdata) { + runtime->private_data = speaker->wdata; + ret = wiimod_speaker_enable(speaker); + } + spin_unlock_irqrestore(&speaker->lock, flags); + + return ret; +} + +static int wiimod_speaker_playback_close(struct snd_pcm_substream *substream) +{ + struct wiimote_speaker *speaker = snd_pcm_substream_chip(substream); + unsigned long flags; + + spin_lock_irqsave(&speaker->lock, flags); + if (speaker->wdata) + wiimod_speaker_disable(speaker); + spin_unlock_irqrestore(&speaker->lock, flags); + + hrtimer_cancel(&speaker->timer); + tasklet_kill(&speaker->tasklet); + + return 0; +} + +static int wiimod_speaker_playback_hw_params(struct snd_pcm_substream *subs, + struct snd_pcm_hw_params *hw) +{ + return snd_pcm_lib_alloc_vmalloc_buffer(subs, params_buffer_bytes(hw)); +} + +static int wiimod_speaker_playback_hw_free(struct snd_pcm_substream *subs) +{ + return snd_pcm_lib_free_vmalloc_buffer(subs); +} + +static int wiimod_speaker_playback_prepare(struct snd_pcm_substream *subs) +{ + struct wiimote_speaker *speaker = snd_pcm_substream_chip(subs); + struct wiimote_data *wdata; + struct snd_pcm_runtime *runtime = subs->runtime; + int ret, online; + unsigned long flags; + + /* runlock synchronizes with device hotplugging */ + mutex_lock(&speaker->runlock); + + spin_lock_irqsave(&speaker->lock, flags); + wdata = speaker->wdata; + online = speaker->online; + spin_unlock_irqrestore(&speaker->lock, flags); + + if (!wdata || !online) { + ret = -ENODEV; + goto unlock; + } + + spin_lock_irqsave(&wdata->state.lock, flags); + speaker->pos = 0; + speaker->subs = subs; + spin_unlock_irqrestore(&wdata->state.lock, flags); + + /* Perform speaker setup. This may take a few milliseconds and the + * handlers perform synchronous network operations so this + * may sleep. */ + switch (runtime->format) { + case SNDRV_PCM_FORMAT_S8: + ret = wiimod_speaker_setup(speaker, WIIMOD_SPEAKER_MODE_PCM8, + runtime->rate, -1); + break; + default: + ret = -EINVAL; + } + +unlock: + mutex_unlock(&speaker->runlock); + return ret; +} + +static int wiimod_speaker_playback_trigger(struct snd_pcm_substream *subs, + int cmd) +{ + struct wiimote_speaker *speaker = snd_pcm_substream_chip(subs); + struct snd_pcm_runtime *runtime = subs->runtime; + struct wiimote_data *wdata; + unsigned long flags; + __u64 ival; + + spin_lock_irqsave(&speaker->lock, flags); + + wdata = speaker->wdata; + if (!wdata || !speaker->online) + goto unlock; + + switch (cmd) { + case SNDRV_PCM_TRIGGER_START: + /* unmute device on start if not muted by user-space */ + spin_lock(&wdata->state.lock); + if (!speaker->mute) + wiiproto_req_mute(wdata, false); + spin_unlock(&wdata->state.lock); + + ival = 20U * 1000000000ULL / runtime->rate; + hrtimer_start(&speaker->timer, ktime_set(0, ival), + HRTIMER_MODE_REL); + break; + case SNDRV_PCM_TRIGGER_STOP: + /* mute device when stopping transmission */ + spin_lock(&wdata->state.lock); + wiiproto_req_mute(wdata, true); + spin_unlock(&wdata->state.lock); + + hrtimer_cancel(&speaker->timer); + break; + case SNDRV_PCM_TRIGGER_RESUME: + /* unmute device on start if not muted by user-space */ + spin_lock(&wdata->state.lock); + if (!speaker->mute) + wiiproto_req_mute(wdata, false); + spin_unlock(&wdata->state.lock); + break; + case SNDRV_PCM_TRIGGER_SUSPEND: + /* mute device when stopping transmission */ + spin_lock(&wdata->state.lock); + wiiproto_req_mute(wdata, true); + spin_unlock(&wdata->state.lock); + break; + } + +unlock: + spin_unlock_irqrestore(&speaker->lock, flags); + return 0; +} + +static snd_pcm_uframes_t wiimod_speaker_playback_pointer(struct snd_pcm_substream *subs) +{ + struct wiimote_speaker *speaker = snd_pcm_substream_chip(subs); + + return bytes_to_frames(subs->runtime, speaker->pos); +} + +static struct snd_pcm_ops wiimod_speaker_playback_ops = { + .open = wiimod_speaker_playback_open, + .close = wiimod_speaker_playback_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = wiimod_speaker_playback_hw_params, + .hw_free = wiimod_speaker_playback_hw_free, + .prepare = wiimod_speaker_playback_prepare, + .trigger = wiimod_speaker_playback_trigger, + .pointer = wiimod_speaker_playback_pointer, + .page = snd_pcm_lib_get_vmalloc_page, + .mmap = snd_pcm_lib_mmap_vmalloc, +}; + +/* volume control */ + +static int wiimod_speaker_volume_info(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *info) +{ + info->type = SNDRV_CTL_ELEM_TYPE_INTEGER; + info->count = 1; + info->value.integer.min = 0; + info->value.integer.max = 0xff; + + return 0; +} + +static int wiimod_speaker_volume_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *val) +{ + struct wiimote_speaker *speaker = snd_kcontrol_chip(kcontrol); + + val->value.integer.value[0] = speaker->volume; + + return 0; +} + +static int wiimod_speaker_volume_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *val) +{ + struct wiimote_speaker *speaker = snd_kcontrol_chip(kcontrol); + unsigned long value, flags; + + value = val->value.integer.value[0]; + if (value > 0xff) + value = 0xff; + + spin_lock_irqsave(&speaker->lock, flags); + if (speaker->wdata) + wiimod_speaker_set_volume(speaker, value); + spin_unlock_irqrestore(&speaker->lock, flags); + + return 0; +} + +static const struct snd_kcontrol_new wiimod_speaker_volume = { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "PCM Playback Volume", + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, + .info = wiimod_speaker_volume_info, + .get = wiimod_speaker_volume_get, + .put = wiimod_speaker_volume_put, +}; + +/* mute control */ + +static int wiimod_speaker_mute_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *val) +{ + struct wiimote_speaker *speaker = snd_kcontrol_chip(kcontrol); + + val->value.integer.value[0] = !speaker->mute; + + return 0; +} + +static int wiimod_speaker_mute_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *val) +{ + struct wiimote_speaker *speaker = snd_kcontrol_chip(kcontrol); + unsigned long flags; + + spin_lock_irqsave(&speaker->lock, flags); + if (speaker->wdata) + wiimod_speaker_set_mute(speaker, + !val->value.integer.value[0]); + spin_unlock_irqrestore(&speaker->lock, flags); + + return 0; +} + +static const struct snd_kcontrol_new wiimod_speaker_mute = { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "PCM Playback Switch", + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, + .info = snd_ctl_boolean_mono_info, + .get = wiimod_speaker_mute_get, + .put = wiimod_speaker_mute_put, +}; + +/* initialization and setup */ + +static int wiimod_speaker_probe(const struct wiimod_ops *ops, + struct wiimote_data *wdata) +{ + int ret; + struct wiimote_speaker *speaker; + struct snd_card *card; + struct snd_kcontrol *kcontrol; + struct snd_pcm *pcm; + + /* create sound card device */ + ret = snd_card_create(-1, NULL, THIS_MODULE, + sizeof(struct wiimote_speaker), &card); + if (ret) + return ret; + speaker = card->private_data; + + wdata->speaker = speaker; + speaker->wdata = wdata; + speaker->card = card; + speaker->mute = 1; + speaker->volume = 0xff; + strcpy(card->driver, "hid-wiimote"); + strcpy(card->shortname, "wiimote"); + strcpy(card->longname, "Nintendo Wii Remote speaker"); + + spin_lock_init(&speaker->lock); + mutex_init(&speaker->runlock); + hrtimer_init(&speaker->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); + speaker->timer.function = wiimod_speaker_tick; + tasklet_init(&speaker->tasklet, wiimod_speaker_task, + (unsigned long)speaker); + + /* create volume control */ + kcontrol = snd_ctl_new1(&wiimod_speaker_volume, speaker); + if (!kcontrol) { + ret = -ENOMEM; + goto err_free; + } + + ret = snd_ctl_add(card, kcontrol); + if (ret) { + snd_ctl_free_one(kcontrol); + goto err_free; + } + + /* create mute control */ + kcontrol = snd_ctl_new1(&wiimod_speaker_mute, speaker); + if (!kcontrol) { + ret = -ENOMEM; + goto err_free; + } + + ret = snd_ctl_add(card, kcontrol); + if (ret) { + snd_ctl_free_one(kcontrol); + goto err_free; + } + + /* create PCM sub-device for playback */ + ret = snd_pcm_new(card, "Speaker", 0, 1, 0, &pcm); + if (ret) + goto err_free; + + pcm->private_data = speaker; + snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, + &wiimod_speaker_playback_ops); + + /* register sound card */ + snd_card_set_dev(card, &wdata->hdev->dev); + ret = snd_card_register(card); + if (ret) + goto err_free; + + return 0; + +err_free: + snd_card_free(card); + wdata->speaker = NULL; + return ret; +} + +static void wiimod_speaker_remove(const struct wiimod_ops *ops, + struct wiimote_data *wdata) +{ + struct wiimote_speaker *speaker = wdata->speaker; + unsigned long flags; + + if (!speaker) + return; + + mutex_lock(&speaker->runlock); + spin_lock_irqsave(&speaker->lock, flags); + + wdata->speaker = NULL; + speaker->online = 0; + speaker->wdata = NULL; + + spin_lock(&wdata->state.lock); + wiiproto_req_mute(wdata, true); + wiiproto_req_speaker(wdata, false); + spin_unlock(&wdata->state.lock); + + spin_unlock_irqrestore(&speaker->lock, flags); + mutex_unlock(&speaker->runlock); + + hrtimer_cancel(&speaker->timer); + tasklet_kill(&speaker->tasklet); + snd_card_free_when_closed(speaker->card); +} + +const struct wiimod_ops wiimod_speaker = { + .flags = 0, + .arg = 0, + .probe = wiimod_speaker_probe, + .remove = wiimod_speaker_remove, +}; diff --git a/drivers/hid/hid-wiimote.h b/drivers/hid/hid-wiimote.h index f1474f3..63a9244 100644 --- a/drivers/hid/hid-wiimote.h +++ b/drivers/hid/hid-wiimote.h @@ -147,6 +147,7 @@ struct wiimote_data { struct input_dev *mp; struct timer_list timer; struct wiimote_debug *debug; + struct wiimote_speaker *speaker; union { struct input_dev *input; @@ -171,6 +172,7 @@ enum wiimod_module { WIIMOD_IR, WIIMOD_BUILTIN_MP, WIIMOD_NO_MP, + WIIMOD_SPEAKER, WIIMOD_NUM, WIIMOD_NULL = WIIMOD_NUM, }; @@ -207,9 +209,12 @@ enum wiiproto_reqs { WIIPROTO_REQ_LED = 0x11, WIIPROTO_REQ_DRM = 0x12, WIIPROTO_REQ_IR1 = 0x13, + WIIPROTO_REQ_SPEAKER = 0x14, WIIPROTO_REQ_SREQ = 0x15, WIIPROTO_REQ_WMEM = 0x16, WIIPROTO_REQ_RMEM = 0x17, + WIIPROTO_REQ_AUDIO = 0x18, + WIIPROTO_REQ_MUTE = 0x19, WIIPROTO_REQ_IR2 = 0x1a, WIIPROTO_REQ_STATUS = 0x20, WIIPROTO_REQ_DATA = 0x21, @@ -263,6 +268,12 @@ extern void wiiproto_req_status(struct wiimote_data *wdata); extern void wiiproto_req_accel(struct wiimote_data *wdata, __u8 accel); extern void wiiproto_req_ir1(struct wiimote_data *wdata, __u8 flags); extern void wiiproto_req_ir2(struct wiimote_data *wdata, __u8 flags); +extern void wiiproto_req_wmem(struct wiimote_data *wdata, bool eeprom, + __u32 offset, const __u8 *buf, __u8 size); +extern void wiiproto_req_speaker(struct wiimote_data *wdata, bool on); +extern void wiiproto_req_mute(struct wiimote_data *wdata, bool on); +extern size_t wiiproto_req_audio(struct wiimote_data *wdata, const __u8 *b1, + size_t len1, const __u8 *b2, size_t len2); extern int wiimote_cmd_write(struct wiimote_data *wdata, __u32 offset, const __u8 *wmem, __u8 size); extern ssize_t wiimote_cmd_read(struct wiimote_data *wdata, __u32 offset, @@ -287,6 +298,12 @@ static inline void wiidebug_deinit(void *u) { } #endif +#ifdef CONFIG_SND + +extern const struct wiimod_ops wiimod_speaker; + +#endif + /* requires the state.lock spinlock to be held */ static inline bool wiimote_cmd_pending(struct wiimote_data *wdata, int cmd, __u32 opt) -- 1.8.2.2

1 0

[alsa-devel] [RFC] Sound/HID: wiimote: add speaker support
by David Herrmann 05 May '13

05 May '13

Classic Wii Remotes provide a speaker on the device. We can stream PCM data, mute and change volume via special protocol requests and remote audio registers. The device supports several different formats, but fully understood are only signed 8-bit PCM and something that looks like 4-bit Yamaha ADPCM. Theoretically, we can set data-rates from 183Hz up to 12MHz, but a realistic range for Bluetooth l2cap is 1500-4000 Hz. Data is streamed as 20bytes blocks and must be sent in a constant rate. There is no way to read the current position. It would be way too slow, anyway. Signed-off-by: David Herrmann <dh.herrmann(a)gmail.com> --- Hi I'm reworking large parts of the HID Nintendo Wii Remote driver and wanted to add speaker support. I have never worked with the sound subsystem until now and need some help. The Wii Remote is a Bluetooth gamepad that features a small speaker on the remote. All information was gathered via reverse-engineering so I cannot tell you any specifics about the hardware, sorry. What I figured out so far is how to set up the speaker, stream data, set volume and mute the speaker. Supported formats are: signed 8-bit PCM 4-bit Yamaha ADPCM I implemented only the 8-bit PCM as I couldn't figure out whether the kernel supports the other format? The wiiproto_* helpers in hid-wiimote-core.c are used to send the requests. Data is streamed as 20-bytes packets and must be sent at a constant rate. I would really appreciate if someone can have a look at hid-wiimote-speaker.c and help me fill the gaps. I figured out how to write the basic snd_card management and PCM setup, but I am stuck with buffer management now. I have a function called wiiproto_req_audio() which sends up to 20bytes of PCM data to the device. However, I cannot figure out how to integrate that into the snd_pcm object. The problem is that all other drivers I found have large DMA buffers which are filled whenever an interrupt signals more data. However, I don't have this setup but instead I need a timer (does the sound-core provide that?) which causes the "copy" callback to be called with 20bytes of data at a constant rate. Any help welcome! And if this whole idea is stupid, please tell me! ;) Thanks David drivers/hid/Kconfig | 3 + drivers/hid/Makefile | 3 + drivers/hid/hid-wiimote-core.c | 54 +++- drivers/hid/hid-wiimote-modules.c | 5 + drivers/hid/hid-wiimote-speaker.c | 539 ++++++++++++++++++++++++++++++++++++++ drivers/hid/hid-wiimote.h | 17 ++ 6 files changed, 619 insertions(+), 2 deletions(-) create mode 100644 drivers/hid/hid-wiimote-speaker.c diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index e8ef86c..0b4d7e2 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -715,6 +715,9 @@ config HID_WIIMOTE the Wii U Gamepad) might be supported in the future. But currently support is limited to Bluetooth based devices. + If Alsa sound support (CONFIG_SND) is enabled, this driver also provides + a sound card interface for Wii Remote speakers. + If unsure, say N. To compile this driver as a module, choose M here: the diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile index 8b7106b..d149e10 100644 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile @@ -32,6 +32,9 @@ hid-wiimote-y := hid-wiimote-core.o hid-wiimote-modules.o ifdef CONFIG_DEBUG_FS hid-wiimote-y += hid-wiimote-debug.o endif +ifdef CONFIG_SND + hid-wiimote-y += hid-wiimote-speaker.o +endif obj-$(CONFIG_HID_A4TECH) += hid-a4tech.o obj-$(CONFIG_HID_ACRUX) += hid-axff.o diff --git a/drivers/hid/hid-wiimote-core.c b/drivers/hid/hid-wiimote-core.c index 906c146..53f1e88 100644 --- a/drivers/hid/hid-wiimote-core.c +++ b/drivers/hid/hid-wiimote-core.c @@ -17,6 +17,7 @@ #include <linux/module.h> #include <linux/mutex.h> #include <linux/spinlock.h> +#include <linux/uaccess.h> #include "hid-ids.h" #include "hid-wiimote.h" @@ -309,8 +310,8 @@ void wiiproto_req_ir2(struct wiimote_data *wdata, __u8 flags) #define wiiproto_req_weeprom(wdata, os, buf, sz) \ wiiproto_req_wmem((wdata), true, (os), (buf), (sz)) -static void wiiproto_req_wmem(struct wiimote_data *wdata, bool eeprom, - __u32 offset, const __u8 *buf, __u8 size) +void wiiproto_req_wmem(struct wiimote_data *wdata, bool eeprom, + __u32 offset, const __u8 *buf, __u8 size) { __u8 cmd[22]; @@ -359,6 +360,52 @@ void wiiproto_req_rmem(struct wiimote_data *wdata, bool eeprom, __u32 offset, wiimote_queue(wdata, cmd, sizeof(cmd)); } +void wiiproto_req_speaker(struct wiimote_data *wdata, bool on) +{ + __u8 cmd[2]; + + cmd[0] = WIIPROTO_REQ_SPEAKER; + cmd[1] = on ? 0x04 : 0x00; + + wiiproto_keep_rumble(wdata, &cmd[1]); + wiimote_queue(wdata, cmd, sizeof(cmd)); +} + +void wiiproto_req_mute(struct wiimote_data *wdata, bool on) +{ + __u8 cmd[2]; + + cmd[0] = WIIPROTO_REQ_MUTE; + cmd[1] = on ? 0x04 : 0x00; + + wiiproto_keep_rumble(wdata, &cmd[1]); + wiimote_queue(wdata, cmd, sizeof(cmd)); +} + +/* must not be called from atomic contexts */ +int wiiproto_req_audio_user(struct wiimote_data *wdata, + void __user *buf, size_t len) +{ + unsigned long flags; + __u8 cmd[22]; + + if (len > 20) + len = 20; + + cmd[0] = WIIPROTO_REQ_AUDIO; + cmd[1] = (len & 0xff) << 3; + + if (copy_from_user(&cmd[2], buf, len)) + return -EFAULT; + + spin_lock_irqsave(&wdata->state.lock, flags); + wiiproto_keep_rumble(wdata, &cmd[1]); + wiimote_queue(wdata, cmd, sizeof(cmd)); + spin_unlock_irqrestore(&wdata->state.lock, flags); + + return 0; +} + /* requries the cmd-mutex to be held */ int wiimote_cmd_write(struct wiimote_data *wdata, __u32 offset, const __u8 *wmem, __u8 size) @@ -570,6 +617,7 @@ static const __u8 * const wiimote_devtype_mods[WIIMOTE_DEV_NUM] = { WIIMOD_LED4, WIIMOD_ACCEL, WIIMOD_IR, + WIIMOD_SPEAKER, WIIMOD_NULL, }, [WIIMOTE_DEV_GEN10] = (const __u8[]){ @@ -582,6 +630,7 @@ static const __u8 * const wiimote_devtype_mods[WIIMOTE_DEV_NUM] = { WIIMOD_LED4, WIIMOD_ACCEL, WIIMOD_IR, + WIIMOD_SPEAKER, WIIMOD_NULL, }, [WIIMOTE_DEV_GEN20] = (const __u8[]){ @@ -595,6 +644,7 @@ static const __u8 * const wiimote_devtype_mods[WIIMOTE_DEV_NUM] = { WIIMOD_ACCEL, WIIMOD_IR, WIIMOD_BUILTIN_MP, + WIIMOD_SPEAKER, WIIMOD_NULL, }, [WIIMOTE_DEV_BALANCE_BOARD] = (const __u8[]) { diff --git a/drivers/hid/hid-wiimote-modules.c b/drivers/hid/hid-wiimote-modules.c index 4ce0e02..7acf721 100644 --- a/drivers/hid/hid-wiimote-modules.c +++ b/drivers/hid/hid-wiimote-modules.c @@ -2072,6 +2072,11 @@ const struct wiimod_ops *wiimod_table[WIIMOD_NUM] = { [WIIMOD_IR] = &wiimod_ir, [WIIMOD_BUILTIN_MP] = &wiimod_builtin_mp, [WIIMOD_NO_MP] = &wiimod_no_mp, +#ifdef CONFIG_SND + [WIIMOD_SPEAKER] = &wiimod_speaker, +#else + [WIIMOD_SPEAKER] = &wiimod_dummy, +#endif }; const struct wiimod_ops *wiimod_ext_table[WIIMOTE_EXT_NUM] = { diff --git a/drivers/hid/hid-wiimote-speaker.c b/drivers/hid/hid-wiimote-speaker.c new file mode 100644 index 0000000..ecec5d9 --- /dev/null +++ b/drivers/hid/hid-wiimote-speaker.c @@ -0,0 +1,539 @@ +/* + * Driver for audio speakers of Nintendo Wii / Wii U peripherals + * Copyright (c) 2012-2013 David Herrmann <dh.herrmann(a)gmail.com> + */ + +/* + * 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. + */ + +/* + * Audio Speakers + * Some Wii peripherals provide an audio speaker that supports 8bit PCM and + * some other mostly unknown formats. Not all setup options are known, but we + * know how to setup an 8bit PCM or 4bit ADPCM stream and adjust volume. Data + * is sent as 20bytes chunks and needs to be streamed at a constant rate. + */ + +#include <linux/device.h> +#include <linux/hid.h> +#include <linux/mutex.h> +#include <linux/spinlock.h> +#include <sound/control.h> +#include <sound/core.h> +#include <sound/initval.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include "hid-wiimote.h" + +struct wiimote_speaker { + struct snd_card *card; + unsigned int online : 1; + unsigned int mute : 1; + __u8 volume; +}; + +enum wiimod_speaker_mode { + WIIMOD_SPEAKER_MODE_PCM8, + WIIMOD_SPEAKER_MODE_ADPCM4, +}; + +static int wiimod_speaker_enable(struct wiimote_data *wdata) +{ + struct wiimote_speaker *speaker = wdata->speaker; + unsigned long flags; + + spin_lock_irqsave(&wdata->state.lock, flags); + + if (!speaker->online) { + speaker->online = 1; + wiiproto_req_speaker(wdata, true); + wiiproto_req_mute(wdata, speaker->mute); + } + + spin_unlock_irqrestore(&wdata->state.lock, flags); + + return 0; +} + +static void wiimod_speaker_disable(struct wiimote_data *wdata) +{ + struct wiimote_speaker *speaker = wdata->speaker; + unsigned long flags; + + spin_lock_irqsave(&wdata->state.lock, flags); + + if (speaker->online) { + speaker->online = 0; + wiiproto_req_speaker(wdata, false); + } + + spin_unlock_irqrestore(&wdata->state.lock, flags); +} + +static void wiimod_speaker_set_mute(struct wiimote_data *wdata, bool mute) +{ + struct wiimote_speaker *speaker = wdata->speaker; + unsigned long flags; + + spin_lock_irqsave(&wdata->state.lock, flags); + + if (speaker->mute != mute) { + speaker->mute = mute; + if (speaker->online) + wiiproto_req_mute(wdata, mute); + } + + spin_unlock_irqrestore(&wdata->state.lock, flags); +} + +static void wiimod_speaker_set_volume(struct wiimote_data *wdata, __u8 volume) +{ + struct wiimote_speaker *speaker = wdata->speaker; + unsigned long flags; + + spin_lock_irqsave(&wdata->state.lock, flags); + + if (speaker->volume != volume) { + speaker->volume = volume; + if (speaker->online) + wiiproto_req_wmem(wdata, false, 0xa20005, &volume, + sizeof(volume)); + } + + spin_unlock_irqrestore(&wdata->state.lock, flags); +} + +/* Change speaker configuration. \mode can be one of WIIMOD_SPEAKER_MODE_*, + * \rate is the PCM sample rate and \volume is the requested volume. */ +static int wiimod_speaker_setup(struct wiimote_data *wdata, + __u8 mode, __u16 rate, __s16 volume) +{ + struct wiimote_speaker *speaker = wdata->speaker; + unsigned long flags; + __u8 config[7], m, wmem; + __u16 r; + int ret; + + if (!rate) + return -EINVAL; + + switch (mode) { + case WIIMOD_SPEAKER_MODE_PCM8: + r = 12000000ULL / rate; + m = 0x40; + break; + case WIIMOD_SPEAKER_MODE_ADPCM4: + r = 6000000ULL / rate; + m = 0x00; + break; + default: + return -EINVAL; + } + + config[0] = 0x00; + config[1] = m; + config[2] = r & 0x00ff; + config[3] = (r & 0xff00) >> 8; + config[4] = volume & 0xff; + config[5] = 0x00; + config[6] = 0x00; + + wiimote_cmd_acquire_noint(wdata); + + /* mute speaker during setup and read/write volume field */ + spin_lock_irqsave(&wdata->state.lock, flags); + + wiiproto_req_mute(wdata, true); + if (volume < 0) + config[4] = speaker->volume; + else + speaker->volume = volume; + + spin_unlock_irqrestore(&wdata->state.lock, flags); + + /* power speaker */ + wmem = 0x01; + ret = wiimote_cmd_write(wdata, 0xa20009, &wmem, sizeof(wmem)); + if (ret) + goto out_unlock; + + /* prepare setup */ + wmem = 0x08; + ret = wiimote_cmd_write(wdata, 0xa20001, &wmem, sizeof(wmem)); + if (ret) + goto out_unlock; + + /* write configuration */ + ret = wiimote_cmd_write(wdata, 0xa20001, config, sizeof(config)); + if (ret) + goto out_unlock; + + /* enable speaker */ + wmem = 0x01; + ret = wiimote_cmd_write(wdata, 0xa20008, &wmem, sizeof(wmem)); + if (ret) + goto out_unlock; + + /* unmute speaker after setup if not muted */ + spin_lock_irqsave(&wdata->state.lock, flags); + if (!speaker->mute) + wiiproto_req_mute(wdata, false); + spin_unlock_irqrestore(&wdata->state.lock, flags); + +out_unlock: + wiimote_cmd_release(wdata); + return ret; +} + +/* PCM layer */ + +static const struct snd_pcm_hardware wiimod_speaker_playback_hw = { + .info = SNDRV_PCM_INFO_NONINTERLEAVED, + .formats = SNDRV_PCM_FMTBIT_S8, + .rates = SNDRV_PCM_RATE_CONTINUOUS, + .rate_min = 1500, + .rate_max = 4000, + .channels_min = 1, + .channels_max = 1, + .buffer_bytes_max = 20, + .period_bytes_min = 20, + .period_bytes_max = 20, + .periods_min = 1, + .periods_max = 1, +}; + +static int wiimod_speaker_playback_open(struct snd_pcm_substream *substream) +{ + struct wiimote_data *wdata = snd_pcm_chip(substream); + struct snd_pcm_runtime *runtime = substream->runtime; + + runtime->hw = wiimod_speaker_playback_hw; + runtime->private_data = wdata; + + return wiimod_speaker_enable(wdata); +} + +static int wiimod_speaker_playback_close(struct snd_pcm_substream *substream) +{ + struct wiimote_data *wdata = snd_pcm_chip(substream); + + wiimod_speaker_disable(wdata); + + return 0; +} + +static int wiimod_speaker_playback_hw_params(struct snd_pcm_substream *subs, + struct snd_pcm_hw_params *hw) +{ + /* TODO: anything to do here? */ + + return 0; +} + +static int wiimod_speaker_playback_hw_free(struct snd_pcm_substream *subs) +{ + return 0; +} + +static int wiimod_speaker_playback_prepare(struct snd_pcm_substream *subs) +{ + struct wiimote_data *wdata = snd_pcm_chip(subs); + struct snd_pcm_runtime *runtime = subs->runtime; + size_t buf_size, period_size, periods; + int ret; + + /* TODO: If I have set the hw-params to a fixed 20 bytes buffer, do + * I actually need to do any computations here? */ + buf_size = frames_to_bytes(runtime, runtime->buffer_size); + period_size = frames_to_bytes(runtime, runtime->period_size); + periods = runtime->periods; + + switch (runtime->format) { + case SNDRV_PCM_FMTBIT_S8: + ret = wiimod_speaker_setup(wdata, WIIMOD_SPEAKER_MODE_PCM8, + runtime->rate, -1); + break; + default: + return -EINVAL; + } + + return ret; +} + +static int wiimod_speaker_playback_trigger(struct snd_pcm_substream *subs, + int cmd) +{ + struct wiimote_data *wdata = snd_pcm_chip(subs); + struct wiimote_speaker *speaker = wdata->speaker; + unsigned long flags; + + switch (cmd) { + case SNDRV_PCM_TRIGGER_RESUME: + case SNDRV_PCM_TRIGGER_START: + /* unmute device on start if not muted by user-space */ + spin_lock_irqsave(&wdata->state.lock, flags); + if (!speaker->mute) + wiiproto_req_mute(wdata, false); + spin_unlock_irqrestore(&wdata->state.lock, flags); + break; + case SNDRV_PCM_TRIGGER_SUSPEND: + case SNDRV_PCM_TRIGGER_STOP: + /* mute device when stopping transmission */ + spin_lock_irqsave(&wdata->state.lock, flags); + wiiproto_req_mute(wdata, true); + spin_unlock_irqrestore(&wdata->state.lock, flags); + break; + } + + return 0; +} + +static snd_pcm_uframes_t wiimod_speaker_playback_pointer(struct snd_pcm_substream *subs) +{ + struct wiimote_data *wdata = snd_pcm_chip(subs); + unsigned long pos; + + /* There is no way to read the current position. Even if there was a + * way to do that, it would be so slow that it would be useless. + * TODO: Should we interpolate via a timer? Is this function actually + * needed? When is it called? */ + pos = 0; + + pos %= 20; + + return bytes_to_frames(subs->runtime, pos); +} + +static int wiimod_speaker_playback_copy(struct snd_pcm_substream *subs, + int channel, snd_pcm_uframes_t pos, + void __user *buf, + snd_pcm_uframes_t count) +{ + struct wiimote_data *wdata = snd_pcm_chip(subs); + struct snd_pcm_runtime *runtime = subs->runtime; + + count = frames_to_bytes(runtime, count); + pos = frames_to_bytes(runtime, pos); + + /* TODO: copy from "buf" "count" bytes to "protobuf + pos" + * With the given hw-params, can pos be non-zero? Can count != 20? + * If not, should I simply send a 20byte frame to the device here? */ + + return 0; +} + +static int wiimod_speaker_playback_silence(struct snd_pcm_substream *subs, + int channel, snd_pcm_uframes_t pos, + snd_pcm_uframes_t count) +{ + struct wiimote_data *wdata = snd_pcm_chip(subs); + struct snd_pcm_runtime *runtime = subs->runtime; + + count = frames_to_bytes(runtime, count); + pos = frames_to_bytes(runtime, pos); + + /* TODO: set "count" bytes of "protobuf + pos" to zero + * Can "pos" actually be non-zero with the given hw-params? If not, + * can I simply send a 20byte zeroed frame to the remote device? */ + + return 0; +} + +/* TODO: is there a reason this cannot be "const"? */ +static struct snd_pcm_ops wiimod_speaker_playback_ops = { + .open = wiimod_speaker_playback_open, + .close = wiimod_speaker_playback_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = wiimod_speaker_playback_hw_params, + .hw_free = wiimod_speaker_playback_hw_free, + .prepare = wiimod_speaker_playback_prepare, + .trigger = wiimod_speaker_playback_trigger, + .pointer = wiimod_speaker_playback_pointer, + .copy = wiimod_speaker_playback_copy, + .silence = wiimod_speaker_playback_silence, +}; + +/* volume control */ + +static int wiimod_speaker_volume_info(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *info) +{ + info->type = SNDRV_CTL_ELEM_TYPE_INTEGER; + info->count = 1; + info->value.integer.min = 0; + info->value.integer.max = 0xff; + + return 0; +} + +static int wiimod_speaker_volume_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *val) +{ + struct wiimote_data *wdata = snd_kcontrol_chip(kcontrol); + struct wiimote_speaker *speaker = wdata->speaker; + unsigned long flags; + + spin_lock_irqsave(&wdata->state.lock, flags); + val->value.integer.value[0] = speaker->volume; + spin_unlock_irqrestore(&wdata->state.lock, flags); + + return 0; +} + +static int wiimod_speaker_volume_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *val) +{ + struct wiimote_data *wdata = snd_kcontrol_chip(kcontrol); + unsigned long value; + + value = val->value.integer.value[0]; + if (value > 0xff) + value = 0xff; + + wiimod_speaker_set_volume(wdata, value); + + return 0; +} + +static const struct snd_kcontrol_new wiimod_speaker_volume = { + .iface = SNDRV_CTL_ELEM_IFACE_CARD, + .name = "PCM Playback Volume", + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, + .info = wiimod_speaker_volume_info, + .get = wiimod_speaker_volume_get, + .put = wiimod_speaker_volume_put, +}; + +/* mute control */ + +static int wiimod_speaker_mute_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *val) +{ + struct wiimote_data *wdata = snd_kcontrol_chip(kcontrol); + struct wiimote_speaker *speaker = wdata->speaker; + unsigned long flags; + + spin_lock_irqsave(&wdata->state.lock, flags); + val->value.integer.value[0] = !!speaker->mute; + spin_unlock_irqrestore(&wdata->state.lock, flags); + + return 0; +} + +static int wiimod_speaker_mute_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *val) +{ + struct wiimote_data *wdata = snd_kcontrol_chip(kcontrol); + + wiimod_speaker_set_mute(wdata, val->value.integer.value[0]); + + return 0; +} + +/* TODO: Is *_IFACE_CARD the right interface? */ +static const struct snd_kcontrol_new wiimod_speaker_mute = { + .iface = SNDRV_CTL_ELEM_IFACE_CARD, + .name = "PCM Playback Switch", + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, + .info = snd_ctl_boolean_mono_info, + .get = wiimod_speaker_mute_get, + .put = wiimod_speaker_mute_put, +}; + +/* initialization and setup */ + +static int wiimod_speaker_probe(const struct wiimod_ops *ops, + struct wiimote_data *wdata) +{ + int ret; + struct wiimote_speaker *speaker; + struct snd_card *card; + struct snd_kcontrol *kcontrol; + struct snd_pcm *pcm; + + /* create sound card device */ + ret = snd_card_create(-1, NULL, THIS_MODULE, + sizeof(struct wiimote_speaker), &card); + if (ret) + return ret; + speaker = card->private_data; + + wdata->speaker = speaker; + speaker->card = card; + speaker->mute = 1; + speaker->volume = 0xff; + strcpy(card->driver, "hid-wiimote"); + strcpy(card->shortname, "wiimote"); + strcpy(card->longname, "Nintendo Wii Remote speaker"); + + /* create volume control */ + kcontrol = snd_ctl_new1(&wiimod_speaker_volume, wdata); + if (!kcontrol) { + ret = -ENOMEM; + goto err_free; + } + + ret = snd_ctl_add(card, kcontrol); + if (ret) { + snd_ctl_free_one(kcontrol); + goto err_free; + } + + /* create mute control */ + kcontrol = snd_ctl_new1(&wiimod_speaker_mute, wdata); + if (!kcontrol) { + ret = -ENOMEM; + goto err_free; + } + + ret = snd_ctl_add(card, kcontrol); + if (ret) { + snd_ctl_free_one(kcontrol); + goto err_free; + } + + /* create PCM sub-device for playback */ + ret = snd_pcm_new(card, "Speaker", 0, 1, 0, &pcm); + if (ret) + goto err_free; + + snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, + &wiimod_speaker_playback_ops); + pcm->private_data = wdata; + + /* register sound card */ + snd_card_set_dev(card, &wdata->hdev->dev); + ret = snd_card_register(card); + if (ret) + goto err_free; + + return 0; + +err_free: + snd_card_free(card); + wdata->speaker = NULL; + return ret; +} + +static void wiimod_speaker_remove(const struct wiimod_ops *ops, + struct wiimote_data *wdata) +{ + struct wiimote_speaker *speaker = wdata->speaker; + + if (!speaker) + return; + + snd_card_free_when_closed(speaker->card); + wdata->speaker = NULL; +} + +const struct wiimod_ops wiimod_speaker = { + .flags = 0, + .arg = 0, + .probe = wiimod_speaker_probe, + .remove = wiimod_speaker_remove, +}; diff --git a/drivers/hid/hid-wiimote.h b/drivers/hid/hid-wiimote.h index 30caef5..4907bc7 100644 --- a/drivers/hid/hid-wiimote.h +++ b/drivers/hid/hid-wiimote.h @@ -148,6 +148,7 @@ struct wiimote_data { struct timer_list timer; struct wiimote_ext *ext; struct wiimote_debug *debug; + struct wiimote_speaker *speaker; union { struct input_dev *input; @@ -172,6 +173,7 @@ enum wiimod_module { WIIMOD_IR, WIIMOD_BUILTIN_MP, WIIMOD_NO_MP, + WIIMOD_SPEAKER, WIIMOD_NUM, WIIMOD_NULL = WIIMOD_NUM, }; @@ -208,9 +210,12 @@ enum wiiproto_reqs { WIIPROTO_REQ_LED = 0x11, WIIPROTO_REQ_DRM = 0x12, WIIPROTO_REQ_IR1 = 0x13, + WIIPROTO_REQ_SPEAKER = 0x14, WIIPROTO_REQ_SREQ = 0x15, WIIPROTO_REQ_WMEM = 0x16, WIIPROTO_REQ_RMEM = 0x17, + WIIPROTO_REQ_AUDIO = 0x18, + WIIPROTO_REQ_MUTE = 0x19, WIIPROTO_REQ_IR2 = 0x1a, WIIPROTO_REQ_STATUS = 0x20, WIIPROTO_REQ_DATA = 0x21, @@ -241,6 +246,12 @@ extern void wiiproto_req_status(struct wiimote_data *wdata); extern void wiiproto_req_accel(struct wiimote_data *wdata, __u8 accel); extern void wiiproto_req_ir1(struct wiimote_data *wdata, __u8 flags); extern void wiiproto_req_ir2(struct wiimote_data *wdata, __u8 flags); +extern void wiiproto_req_wmem(struct wiimote_data *wdata, bool eeprom, + __u32 offset, const __u8 *buf, __u8 size); +extern void wiiproto_req_speaker(struct wiimote_data *wdata, bool on); +extern void wiiproto_req_mute(struct wiimote_data *wdata, bool on); +extern int wiiproto_req_audio_user(struct wiimote_data *wdata, + void __user *buf, size_t len); extern int wiimote_cmd_write(struct wiimote_data *wdata, __u32 offset, const __u8 *wmem, __u8 size); extern ssize_t wiimote_cmd_read(struct wiimote_data *wdata, __u32 offset, @@ -283,6 +294,12 @@ static inline void wiidebug_deinit(void *u) { } #endif +#ifdef CONFIG_SND + +extern const struct wiimod_ops wiimod_speaker; + +#endif + /* requires the state.lock spinlock to be held */ static inline bool wiimote_cmd_pending(struct wiimote_data *wdata, int cmd, __u32 opt) -- 1.8.2.1

2 6

Re: [alsa-devel] [PATCH] ASoC: fix kernel message grepability
by Mark Brown 05 May '13

05 May '13

On Sat, May 04, 2013 at 10:21:38PM +0200, Michał Mirosław wrote: > Signed-off-by: Michał Mirosław <mirq-linux(a)rere.qmqm.pl> Applied, thanks.

1 0

[alsa-devel] [PATCH] ASoC: sgtl5000: Convert to use regmap directly
by Fabio Estevam 05 May '13

05 May '13

From: Fabio Estevam <fabio.estevam(a)freescale.com> Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- sound/soc/codecs/sgtl5000.c | 145 +++++++++++++++++++++++++++++++++---------- 1 file changed, 111 insertions(+), 34 deletions(-) diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index 92bbfec..96b65b1 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -16,6 +16,7 @@ #include <linux/pm.h> #include <linux/i2c.h> #include <linux/clk.h> +#include <linux/regmap.h> #include <linux/regulator/driver.h> #include <linux/regulator/machine.h> #include <linux/regulator/consumer.h> @@ -34,30 +35,30 @@ #define SGTL5000_MAX_REG_OFFSET 0x013A /* default value of sgtl5000 registers */ -static const u16 sgtl5000_regs[SGTL5000_MAX_REG_OFFSET] = { - [SGTL5000_CHIP_CLK_CTRL] = 0x0008, - [SGTL5000_CHIP_I2S_CTRL] = 0x0010, - [SGTL5000_CHIP_SSS_CTRL] = 0x0008, - [SGTL5000_CHIP_DAC_VOL] = 0x3c3c, - [SGTL5000_CHIP_PAD_STRENGTH] = 0x015f, - [SGTL5000_CHIP_ANA_HP_CTRL] = 0x1818, - [SGTL5000_CHIP_ANA_CTRL] = 0x0111, - [SGTL5000_CHIP_LINE_OUT_VOL] = 0x0404, - [SGTL5000_CHIP_ANA_POWER] = 0x7060, - [SGTL5000_CHIP_PLL_CTRL] = 0x5000, - [SGTL5000_DAP_BASS_ENHANCE] = 0x0040, - [SGTL5000_DAP_BASS_ENHANCE_CTRL] = 0x051f, - [SGTL5000_DAP_SURROUND] = 0x0040, - [SGTL5000_DAP_EQ_BASS_BAND0] = 0x002f, - [SGTL5000_DAP_EQ_BASS_BAND1] = 0x002f, - [SGTL5000_DAP_EQ_BASS_BAND2] = 0x002f, - [SGTL5000_DAP_EQ_BASS_BAND3] = 0x002f, - [SGTL5000_DAP_EQ_BASS_BAND4] = 0x002f, - [SGTL5000_DAP_MAIN_CHAN] = 0x8000, - [SGTL5000_DAP_AVC_CTRL] = 0x0510, - [SGTL5000_DAP_AVC_THRESHOLD] = 0x1473, - [SGTL5000_DAP_AVC_ATTACK] = 0x0028, - [SGTL5000_DAP_AVC_DECAY] = 0x0050, +static const struct reg_default sgtl5000_reg_defaults[] = { + { SGTL5000_CHIP_CLK_CTRL, 0x0008 }, + { SGTL5000_CHIP_I2S_CTRL, 0x0010 }, + { SGTL5000_CHIP_SSS_CTRL, 0x0008 }, + { SGTL5000_CHIP_DAC_VOL, 0x3c3c }, + { SGTL5000_CHIP_PAD_STRENGTH, 0x015f }, + { SGTL5000_CHIP_ANA_HP_CTRL, 0x1818 }, + { SGTL5000_CHIP_ANA_CTRL, 0x0111 }, + { SGTL5000_CHIP_LINE_OUT_VOL, 0x0404 }, + { SGTL5000_CHIP_ANA_POWER, 0x7060 }, + { SGTL5000_CHIP_PLL_CTRL, 0x5000 }, + { SGTL5000_DAP_BASS_ENHANCE, 0x0040 }, + { SGTL5000_DAP_BASS_ENHANCE_CTRL, 0x051f }, + { SGTL5000_DAP_SURROUND, 0x0040 }, + { SGTL5000_DAP_EQ_BASS_BAND0, 0x002f }, + { SGTL5000_DAP_EQ_BASS_BAND1, 0x002f }, + { SGTL5000_DAP_EQ_BASS_BAND2, 0x002f }, + { SGTL5000_DAP_EQ_BASS_BAND3, 0x002f }, + { SGTL5000_DAP_EQ_BASS_BAND4, 0x002f }, + { SGTL5000_DAP_MAIN_CHAN, 0x8000 }, + { SGTL5000_DAP_AVC_CTRL, 0x0510 }, + { SGTL5000_DAP_AVC_THRESHOLD, 0x1473 }, + { SGTL5000_DAP_AVC_ATTACK, 0x0028 }, + { SGTL5000_DAP_AVC_DECAY, 0x0050 }, }; /* regulator supplies for sgtl5000, VDDD is an optional external supply */ @@ -112,6 +113,7 @@ struct sgtl5000_priv { int fmt; /* i2s data format */ struct regulator_bulk_data supplies[SGTL5000_SUPPLY_NUM]; struct ldo_regulator *ldo; + struct regmap *regmap; }; /* @@ -958,17 +960,76 @@ static struct snd_soc_dai_driver sgtl5000_dai = { .symmetric_rates = 1, }; -static int sgtl5000_volatile_register(struct snd_soc_codec *codec, - unsigned int reg) +static bool sgtl5000_volatile(struct device *dev, unsigned int reg) { switch (reg) { case SGTL5000_CHIP_ID: case SGTL5000_CHIP_ADCDAC_CTRL: case SGTL5000_CHIP_ANA_STATUS: - return 1; + return true; } - return 0; + return false; +} + +static bool sgtl5000_readable(struct device *dev, unsigned int reg) +{ + switch (reg) { + case SGTL5000_CHIP_ID: + case SGTL5000_CHIP_DIG_POWER: + case SGTL5000_CHIP_CLK_CTRL: + case SGTL5000_CHIP_I2S_CTRL: + case SGTL5000_CHIP_SSS_CTRL: + case SGTL5000_CHIP_ADCDAC_CTRL: + case SGTL5000_CHIP_DAC_VOL: + case SGTL5000_CHIP_PAD_STRENGTH: + case SGTL5000_CHIP_ANA_ADC_CTRL: + case SGTL5000_CHIP_ANA_HP_CTRL: + case SGTL5000_CHIP_ANA_CTRL: + case SGTL5000_CHIP_LINREG_CTRL: + case SGTL5000_CHIP_REF_CTRL: + case SGTL5000_CHIP_MIC_CTRL: + case SGTL5000_CHIP_LINE_OUT_CTRL: + case SGTL5000_CHIP_LINE_OUT_VOL: + case SGTL5000_CHIP_ANA_POWER: + case SGTL5000_CHIP_PLL_CTRL: + case SGTL5000_CHIP_CLK_TOP_CTRL: + case SGTL5000_CHIP_ANA_STATUS: + case SGTL5000_CHIP_SHORT_CTRL: + case SGTL5000_CHIP_ANA_TEST2: + case SGTL5000_DAP_CTRL: + case SGTL5000_DAP_PEQ: + case SGTL5000_DAP_BASS_ENHANCE: + case SGTL5000_DAP_BASS_ENHANCE_CTRL: + case SGTL5000_DAP_AUDIO_EQ: + case SGTL5000_DAP_SURROUND: + case SGTL5000_DAP_FLT_COEF_ACCESS: + case SGTL5000_DAP_COEF_WR_B0_MSB: + case SGTL5000_DAP_COEF_WR_B0_LSB: + case SGTL5000_DAP_EQ_BASS_BAND0: + case SGTL5000_DAP_EQ_BASS_BAND1: + case SGTL5000_DAP_EQ_BASS_BAND2: + case SGTL5000_DAP_EQ_BASS_BAND3: + case SGTL5000_DAP_EQ_BASS_BAND4: + case SGTL5000_DAP_MAIN_CHAN: + case SGTL5000_DAP_MIX_CHAN: + case SGTL5000_DAP_AVC_CTRL: + case SGTL5000_DAP_AVC_THRESHOLD: + case SGTL5000_DAP_AVC_ATTACK: + case SGTL5000_DAP_AVC_DECAY: + case SGTL5000_DAP_COEF_WR_B1_MSB: + case SGTL5000_DAP_COEF_WR_B1_LSB: + case SGTL5000_DAP_COEF_WR_B2_MSB: + case SGTL5000_DAP_COEF_WR_B2_LSB: + case SGTL5000_DAP_COEF_WR_A1_MSB: + case SGTL5000_DAP_COEF_WR_A1_LSB: + case SGTL5000_DAP_COEF_WR_A2_MSB: + case SGTL5000_DAP_COEF_WR_A2_LSB: + return true; + + default: + return false; + } } #ifdef CONFIG_SUSPEND @@ -1300,7 +1361,8 @@ static int sgtl5000_probe(struct snd_soc_codec *codec) struct sgtl5000_priv *sgtl5000 = snd_soc_codec_get_drvdata(codec); /* setup i2c data ops */ - ret = snd_soc_codec_set_cache_io(codec, 16, 16, SND_SOC_I2C); + codec->control_data = sgtl5000->regmap; + ret = snd_soc_codec_set_cache_io(codec, 16, 16, SND_SOC_REGMAP); if (ret < 0) { dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); return ret; @@ -1391,11 +1453,6 @@ static struct snd_soc_codec_driver sgtl5000_driver = { .suspend = sgtl5000_suspend, .resume = sgtl5000_resume, .set_bias_level = sgtl5000_set_bias_level, - .reg_cache_size = ARRAY_SIZE(sgtl5000_regs), - .reg_word_size = sizeof(u16), - .reg_cache_step = 2, - .reg_cache_default = sgtl5000_regs, - .volatile_register = sgtl5000_volatile_register, .controls = sgtl5000_snd_controls, .num_controls = ARRAY_SIZE(sgtl5000_snd_controls), .dapm_widgets = sgtl5000_dapm_widgets, @@ -1404,6 +1461,19 @@ static struct snd_soc_codec_driver sgtl5000_driver = { .num_dapm_routes = ARRAY_SIZE(sgtl5000_dapm_routes), }; +static const struct regmap_config sgtl5000_regmap = { + .reg_bits = 16, + .val_bits = 16, + + .max_register = SGTL5000_MAX_REG_OFFSET, + .volatile_reg = sgtl5000_volatile, + .readable_reg = sgtl5000_readable, + + .cache_type = REGCACHE_RBTREE, + .reg_defaults = sgtl5000_reg_defaults, + .num_reg_defaults = ARRAY_SIZE(sgtl5000_reg_defaults), +}; + static int sgtl5000_i2c_probe(struct i2c_client *client, const struct i2c_device_id *id) { @@ -1415,6 +1485,13 @@ static int sgtl5000_i2c_probe(struct i2c_client *client, if (!sgtl5000) return -ENOMEM; + sgtl5000->regmap = devm_regmap_init_i2c(client, &sgtl5000_regmap); + if (IS_ERR(sgtl5000->regmap)) { + ret = PTR_ERR(sgtl5000->regmap); + dev_err(&client->dev, "Failed to allocate regmap: %d\n", ret); + return ret; + } + i2c_set_clientdata(client, sgtl5000); ret = snd_soc_register_codec(&client->dev, -- 1.7.9.5

2 1

Re: [alsa-devel] [RFC] ASoC: sgtl5000: Remove cache support
by Fabio Estevam 05 May '13

05 May '13

Hi Mark, On Fri, May 3, 2013 at 7:36 PM, Mark Brown <broonie(a)sirena.org.uk> wrote: > On Fri, May 03, 2013 at 04:49:09PM -0300, Fabio Estevam wrote: > >> .set_bias_level = sgtl5000_set_bias_level, >> - .reg_cache_size = ARRAY_SIZE(sgtl5000_regs), >> - .reg_word_size = sizeof(u16), >> - .reg_cache_step = 2, >> - .reg_cache_default = sgtl5000_regs, > > So, the most obvious thing here is to convert the driver to regmap. It > has a much more baked in idea of sparse register maps which should help > if nothing else, and will allow the device initialisation to be moved to > the normal device probe which is better practice. Thanks for your suggestion. I have just sent a patch converting sgtl5000 to use regmap. Unfortunately the result is the same: the codec cannot probe after a reset. > Otherwise the normal issue with this sort of thing is a failure to power > down the device properly, the LDO workaround looks suspicous here as > does the fact that the driver doesn't restore the register cache when > powering on the device in resume (nor does it makr the device as cache > only). I will try to investigate the power down and LDO workaround as suggested. Thanks, Fabio Estevam

2 2

Re: [alsa-devel] Conexant CX20588 breakage in Kernel 3.9
by Takashi Iwai 04 May '13

04 May '13

At Sat, 4 May 2013 00:56:10 +0200, Christopher K. wrote: > > Works great, thanks for the help! OK, now applied. Thanks for a quick test. Takashi > > > On Fri, May 3, 2013 at 4:58 PM, Takashi Iwai <tiwai(a)suse.de> wrote: > > > At Fri, 3 May 2013 15:51:20 +0200, > > Christopher K. wrote: > > > > > > Hi, > > > > > > Kernel 3.9 breaks audio on internal speakers for the Conexant CX20588. > > > EAPD is disabled for Node 0x1d. Enabling in hda_analyzer works fine. > > > > > > Someone already postet on > > > https://bugs.launchpad.net/ubuntu/+source/alsa-driver/+bug/1173618 > > > > > > Is this the right place to report this bug? > > > > The kernel bugzilla or in alsa-devel ML, at best with Cc to > > maintainer. > > > > Does the patch below fix your problem? If so, I'll queue it to the > > upstream and Cc to stable kernel. > > > > > > thanks, > > > > Takashi > > > > --- > > diff --git a/sound/pci/hda/patch_conexant.c > > b/sound/pci/hda/patch_conexant.c > > index 84b81c8..e08cd33 100644 > > --- a/sound/pci/hda/patch_conexant.c > > +++ b/sound/pci/hda/patch_conexant.c > > @@ -63,6 +63,7 @@ struct conexant_spec { > > > > /* extra EAPD pins */ > > unsigned int num_eapds; > > + bool dynamic_eapd; > > hda_nid_t eapds[4]; > > > > #ifdef ENABLE_CXT_STATIC_QUIRKS > > @@ -3155,7 +3156,7 @@ static void cx_auto_parse_eapd(struct hda_codec > > *codec) > > * thus it might control over all pins. > > */ > > if (spec->num_eapds > 2) > > - spec->gen.own_eapd_ctl = 1; > > + spec->dynamic_eapd = 1; > > } > > > > static void cx_auto_turn_eapd(struct hda_codec *codec, int num_pins, > > @@ -3194,10 +3195,19 @@ static int cx_auto_build_controls(struct hda_codec > > *codec) > > return 0; > > } > > > > +static int cx_auto_init(struct hda_codec *codec) > > +{ > > + struct conexant_spec *spec = codec->spec; > > + snd_hda_gen_init(codec); > > + if (!spec->dynamic_eapd) > > + cx_auto_turn_eapd(codec, spec->num_eapds, spec->eapds, > > true); > > + return 0; > > +} > > + > > static const struct hda_codec_ops cx_auto_patch_ops = { > > .build_controls = cx_auto_build_controls, > > .build_pcms = snd_hda_gen_build_pcms, > > - .init = snd_hda_gen_init, > > + .init = cx_auto_init, > > .free = snd_hda_gen_free, > > .unsol_event = snd_hda_jack_unsol_event, > > #ifdef CONFIG_PM > > @@ -3348,7 +3358,8 @@ static int patch_conexant_auto(struct hda_codec > > *codec) > > > > cx_auto_parse_beep(codec); > > cx_auto_parse_eapd(codec); > > - if (spec->gen.own_eapd_ctl) > > + spec->gen.own_eapd_ctl = 1; > > + if (spec->dynamic_eapd) > > spec->gen.vmaster_mute.hook = cx_auto_vmaster_hook; > > > > switch (codec->vendor_id) { > > > [2 <text/html; UTF-8 (quoted-printable)>] >

1 0

[alsa-devel] [PATCH] ASoC: sgtl5000: Fix comment about register addresses
by Fabio Estevam 04 May '13

04 May '13

From: Fabio Estevam <fabio.estevam(a)freescale.com> The list below the comment relates to sgtl5000 registers addresses, so change the comment to improve the description. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- sound/soc/codecs/sgtl5000.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/sgtl5000.h b/sound/soc/codecs/sgtl5000.h index 8a9f435..4b69229 100644 --- a/sound/soc/codecs/sgtl5000.h +++ b/sound/soc/codecs/sgtl5000.h @@ -12,7 +12,7 @@ #define _SGTL5000_H /* - * Register values. + * Registers addresses */ #define SGTL5000_CHIP_ID 0x0000 #define SGTL5000_CHIP_DIG_POWER 0x0002 -- 1.7.9.5

2 1

[alsa-devel] [RFC] ASoC: sgtl5000: Remove cache support
by Fabio Estevam 03 May '13

03 May '13

From: Fabio Estevam <fabio.estevam(a)freescale.com> Currently sgtl5000 driver is probed correctly after a power-on reset, but after audio is played and the board is reset, we are no longer able to probe again: sgtl5000 0-000a: Device with ID register ffff is not a sgtl5000 sgtl5000 0-000a: ASoC: failed to probe CODEC -19 imx-sgtl5000 sound.12: ASoC: failed to instantiate card -19 imx-sgtl5000 sound.12: snd_soc_register_card failed (-19) Removing the cache support mechanism allows us to probe sgtl5000 driver successfully in subsequent board resets. Tested on a mx6qsabrelite board. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- I would like to fix it properly and looking for some ideas/feedbacks as to what a proper fix would be. Should I complete the sgtl5000_regs array with all the sgtl5000 registers? Thanks! sound/soc/codecs/sgtl5000.c | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index 92bbfec..3884162 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -33,33 +33,6 @@ #define SGTL5000_DAP_REG_OFFSET 0x0100 #define SGTL5000_MAX_REG_OFFSET 0x013A -/* default value of sgtl5000 registers */ -static const u16 sgtl5000_regs[SGTL5000_MAX_REG_OFFSET] = { - [SGTL5000_CHIP_CLK_CTRL] = 0x0008, - [SGTL5000_CHIP_I2S_CTRL] = 0x0010, - [SGTL5000_CHIP_SSS_CTRL] = 0x0008, - [SGTL5000_CHIP_DAC_VOL] = 0x3c3c, - [SGTL5000_CHIP_PAD_STRENGTH] = 0x015f, - [SGTL5000_CHIP_ANA_HP_CTRL] = 0x1818, - [SGTL5000_CHIP_ANA_CTRL] = 0x0111, - [SGTL5000_CHIP_LINE_OUT_VOL] = 0x0404, - [SGTL5000_CHIP_ANA_POWER] = 0x7060, - [SGTL5000_CHIP_PLL_CTRL] = 0x5000, - [SGTL5000_DAP_BASS_ENHANCE] = 0x0040, - [SGTL5000_DAP_BASS_ENHANCE_CTRL] = 0x051f, - [SGTL5000_DAP_SURROUND] = 0x0040, - [SGTL5000_DAP_EQ_BASS_BAND0] = 0x002f, - [SGTL5000_DAP_EQ_BASS_BAND1] = 0x002f, - [SGTL5000_DAP_EQ_BASS_BAND2] = 0x002f, - [SGTL5000_DAP_EQ_BASS_BAND3] = 0x002f, - [SGTL5000_DAP_EQ_BASS_BAND4] = 0x002f, - [SGTL5000_DAP_MAIN_CHAN] = 0x8000, - [SGTL5000_DAP_AVC_CTRL] = 0x0510, - [SGTL5000_DAP_AVC_THRESHOLD] = 0x1473, - [SGTL5000_DAP_AVC_ATTACK] = 0x0028, - [SGTL5000_DAP_AVC_DECAY] = 0x0050, -}; - /* regulator supplies for sgtl5000, VDDD is an optional external supply */ enum sgtl5000_regulator_supplies { VDDA, @@ -1391,10 +1364,6 @@ static struct snd_soc_codec_driver sgtl5000_driver = { .suspend = sgtl5000_suspend, .resume = sgtl5000_resume, .set_bias_level = sgtl5000_set_bias_level, - .reg_cache_size = ARRAY_SIZE(sgtl5000_regs), - .reg_word_size = sizeof(u16), - .reg_cache_step = 2, - .reg_cache_default = sgtl5000_regs, .volatile_register = sgtl5000_volatile_register, .controls = sgtl5000_snd_controls, .num_controls = ARRAY_SIZE(sgtl5000_snd_controls), -- 1.7.9.5

1 0

[alsa-devel] [PATCH] drm/i915: Add private api for power well usage -- alignment between graphic team and audio team
by Li, Jocelyn 03 May '13

03 May '13

Hi Guys, I apologize that I may have misunderstood on the agreement we have made on power well work. I assumed that audio team is expected to create private gfx driver API to control the power well between gfx and audio for internal releases. That's why I asked Xingchao work on that. So the correct implementation approach between gfx and audio should be, #1, Daniel will work on the existing private API in gfx driver for power well control that can be used by the audio driver to enable/disable the power well. #2, Once #1 is done, Audio team will integrate Daniel's patch into audio driver and add/improve on anything that is missing Please correct me if my understanding is not correct. Thanks, Jocelyn -----Original Message----- From: Daniel Vetter [mailto:daniel.vetter@ffwll.ch] Sent: Thursday, April 25, 2013 3:52 PM To: Wang, Xingchao Cc: Zanoni, Paulo R; ville.syrjala(a)linux.intel.com; Lin, Mengdong; Girdwood, Liam R; Li, Jocelyn; intel-gfx(a)lists.freedesktop.org; alsa-devel(a)alsa-project.org; Wang Xingchao; Takashi Iwai; Barnes, Jesse; Wysocki, Rafael J Subject: Re: [PATCH] drm/i915: Add private api for power well usage On Thu, Apr 25, 2013 at 4:36 AM, Wang, Xingchao <xingchao.wang(a)intel.com> wrote: > Hi Daniel/Paulo, > > Any comments on this? > Add Jesse and Rafael in loop. Well I've figured we want to get the power well integration working before we waste time reviewing an interface which might or might not quite work. But if you want, I can drop two quick comments: - I think the functions needs some prefix like i915_ - Imo the power well should just be reference counted (the current interface name suggests it's generally useable, but actually can only cope with one request from the audio driver). - Is the spin_lock (irq-disabling even) really required for the audio driver to work? power well enabling can take up to 20ms, so this won't work as-is. Can't we just use a mutex? - I'd need to see the audio driver side of this to check how this works for coping with arbitrary module load ordering. Cheers, Daniel > > thanks > --xingchao > > >> -----Original Message----- >> From: Wang, Xingchao >> Sent: Wednesday, April 24, 2013 3:29 PM >> To: daniel.vetter(a)ffwll.ch; Zanoni, Paulo R; 'Takashi Iwai' >> Cc: ville.syrjala(a)linux.intel.com; Lin, Mengdong; Girdwood, Liam R; >> Li, Jocelyn; intel-gfx(a)lists.freedesktop.org; alsa-devel(a)alsa-project.org; 'Wang Xingchao' >> Subject: RE: [PATCH] drm/i915: Add private api for power well usage >> >> Hi Guys, >> >> Sorry I should Add Takashi and alsa maillist in loop. >> >> I tested this patch against Daniel's "drm-intel-next-queued" Branch, >> on Haswell Mobile C3 stepping machines. >> >> Test steps: >> 1. only connect one monitor through HDMI cable 2. echo 1 > >> /sys/module/i915/parameters/disable_power_well ==> I think this could >> be set as 1 by default if applied my patch. >> 3. plug out HDMI cable >> 4. cat /proc/asound/card0/codec#0 >> >> At step 3, i915 will try to disable power well but rejected as >> display audio is using power well. >> Without the patch, display audio would crash at step 4. >> >> I did not list suspend/resume test here, as during suspend sequence, >> i915 will _ENABLE_ power well, that's a BUG? >> >> For me above test case is the only one to reproduce the issue, if you >> have more ideas and need more test, please let me know. >> >> I'm afraid there's some risk because the dependency between alsa >> driver and drm driver. For example, if i915 module was not loaded, >> display audio Will call >> request_power_well() and meet symbol error. Even if i915 module >> loaded after snd-hda-intel module, there's such risk too. Any comment on this? >> >> Another risk is the pointer "power_well_device", it should be set >> NULL when >> i915 module unloaded, I added the caller but have no idea where to >> call it, if anyone has suggestion, that would be fine. >> >> thanks >> --xingchao >> >> >> > -----Original Message----- >> > From: Wang Xingchao [mailto:xingchao.wang@linux.intel.com] >> > Sent: Thursday, April 24, 2014 10:20 PM >> > To: daniel.vetter(a)ffwll.ch; Zanoni, Paulo R >> > Cc: ville.syrjala(a)linux.intel.com; Lin, Mengdong; Girdwood, Liam R; >> > Li, Jocelyn; intel-gfx(a)lists.freedesktop.org; Wang, Xingchao; Wang >> > Xingchao >> > Subject: [PATCH] drm/i915: Add private api for power well usage >> > >> > Display audio depends on power well in graphic side, it should >> > request power well before use it and release power well after use. >> > I915 will not shutdown power well if it detects audio is using. >> > This patch protects display audio crash for Intel Haswell mobile >> > C3 stepping board. >> > >> > Signed-off-by: Wang Xingchao <xingchao.wang(a)linux.intel.com> >> > --- >> > drivers/gpu/drm/i915/intel_pm.c | 73 >> > +++++++++++++++++++++++++++++++++++---- >> > include/drm/audio_drm.h | 39 +++++++++++++++++++++ >> > sound/pci/hda/hda_intel.c | 8 +++++ >> > 3 files changed, 113 insertions(+), 7 deletions(-) create mode >> > 100644 include/drm/audio_drm.h >> > >> > diff --git a/drivers/gpu/drm/i915/intel_pm.c >> > b/drivers/gpu/drm/i915/intel_pm.c index 2557926..9983f56 100644 >> > --- a/drivers/gpu/drm/i915/intel_pm.c >> > +++ b/drivers/gpu/drm/i915/intel_pm.c >> > @@ -4298,18 +4298,12 @@ bool intel_using_power_well(struct >> > drm_device >> > *dev) >> > return true; >> > } >> > >> > -void intel_set_power_well(struct drm_device *dev, bool enable) >> > +void set_power_well(struct drm_device *dev, bool enable) >> > { >> > struct drm_i915_private *dev_priv = dev->dev_private; >> > bool is_enabled, enable_requested; >> > uint32_t tmp; >> > >> > - if (!HAS_POWER_WELL(dev)) >> > - return; >> > - >> > - if (!i915_disable_power_well && !enable) >> > - return; >> > - >> > tmp = I915_READ(HSW_PWR_WELL_DRIVER); >> > is_enabled = tmp & HSW_PWR_WELL_STATE; >> > enable_requested = tmp & HSW_PWR_WELL_ENABLE; @@ -4332,6 >> > +4326,71 @@ void intel_set_power_well(struct drm_device *dev, bool >> > +enable) >> > } >> > } >> > >> > +/* Global drm_device for display audio drvier usage */ static >> > +struct drm_device *power_well_device; static bool >> > +audio_power_well_using, i915_power_well_using; >> > +/* Lock protecting power well setting */ >> > +DEFINE_SPINLOCK(powerwell_lock); >> > + >> > +void request_power_well(void) >> > +{ >> > + DRM_DEBUG_KMS("Display audio requesting power well\n"); >> > + spin_lock_irq(&powerwell_lock); >> > + if (!power_well_device) >> > + goto out; >> > + if (i915_power_well_using == false) >> > + set_power_well(power_well_device, true); >> > + audio_power_well_using = true; >> > +out: >> > + spin_unlock_irq(&powerwell_lock); >> > + return; >> > +} >> > +EXPORT_SYMBOL_GPL(request_power_well); >> > + >> > +void release_power_well(void) >> > +{ >> > + DRM_DEBUG_KMS("Display audio releasing power well\n"); >> > + spin_lock_irq(&powerwell_lock); >> > + if (!power_well_device) >> > + goto out; >> > + if (i915_power_well_using == false) >> > + set_power_well(power_well_device, false); >> > + audio_power_well_using = false; >> > +out: >> > + spin_unlock_irq(&powerwell_lock); >> > + return; >> > +} >> > +EXPORT_SYMBOL_GPL(release_power_well); >> > + >> > +/* TODO: Call this when i915 module unload */ void >> > +remove_power_well(void) { >> > + spin_lock_irq(&powerwell_lock); >> > + audio_power_well_using = false; >> > + i915_power_well_using = false; >> > + power_well_device = NULL; >> > + spin_unlock_irq(&powerwell_lock); } >> > + >> > +void intel_set_power_well(struct drm_device *dev, bool enable) { >> > + if (!HAS_POWER_WELL(dev)) >> > + return; >> > + >> > + spin_lock_irq(&powerwell_lock); >> > + power_well_device = dev; >> > + i915_power_well_using = enable; >> > + if (!enable && audio_power_well_using) >> > + goto out; >> > + >> > + if (!i915_disable_power_well && !enable) >> > + goto out; >> > + set_power_well(dev, enable); >> > +out: >> > + spin_unlock_irq(&powerwell_lock); >> > + return; >> > +} >> > + >> > /* >> > * Starting with Haswell, we have a "Power Down Well" that can be >> > turned >> off >> > * when not needed anymore. We have 4 registers that can request >> > the power well diff --git a/include/drm/audio_drm.h >> > b/include/drm/audio_drm.h new file mode 100644 index >> > 0000000..4412b36 >> > --- /dev/null >> > +++ b/include/drm/audio_drm.h >> > @@ -0,0 +1,39 @@ >> > >> +/************************************************************** >> > ******** >> > +**** >> > + * >> > + * Copyright 2013 Intel Inc. >> > + * All Rights Reserved. >> > + * >> > + * Permission is hereby granted, free of charge, to any person >> > +obtaining a >> > + * copy of this software and associated documentation files (the >> > + * "Software"), to deal in the Software without restriction, >> > +including >> > + * without limitation the rights to use, copy, modify, merge, >> > +publish, >> > + * distribute, sub license, and/or sell copies of the Software, >> > +and to >> > + * permit persons to whom the Software is furnished to do so, >> > +subject to >> > + * the following conditions: >> > + * >> > + * The above copyright notice and this permission notice >> > +(including the >> > + * next paragraph) shall be included in all copies or substantial >> > +portions >> > + * of the Software. >> > + * >> > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY >> KIND, >> > +EXPRESS OR >> > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF >> > +MERCHANTABILITY, >> > + * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO >> > EVENT >> > +SHALL >> > + * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE >> > FOR >> > +ANY CLAIM, >> > + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, >> > TORT >> > +OR >> > + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE >> > SOFTWARE >> > +OR THE >> > + * USE OR OTHER DEALINGS IN THE SOFTWARE. >> > + * >> > + * >> > + >> > >> +*************************************************************** >> > ******** >> > +***/ >> > +/* >> > + * Authors: >> > + * Wang Xingchao <xingchao.wang(a)intel.com> */ >> > + >> > +#ifndef _AUDIO_DRM_H_ >> > +#define _AUDIO_DRM_H_ >> > + >> > +extern void request_power_well(void); extern void >> > +release_power_well(void); >> > + >> > +#endif /* _AUDIO_DRM_H_ */ >> > diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c >> > index 418bfc0..59a85de 100644 >> > --- a/sound/pci/hda/hda_intel.c >> > +++ b/sound/pci/hda/hda_intel.c >> > @@ -50,6 +50,7 @@ >> > #include <linux/clocksource.h> >> > #include <linux/time.h> >> > #include <linux/completion.h> >> > +#include <drm/audio_drm.h> >> > >> > #ifdef CONFIG_X86 >> > /* for snoop control */ >> > @@ -2869,6 +2870,7 @@ static int azx_suspend(struct device *dev) >> > pci_disable_device(pci); >> > pci_save_state(pci); >> > pci_set_power_state(pci, PCI_D3hot); >> > + release_power_well(); >> > return 0; >> > } >> > >> > @@ -2881,6 +2883,7 @@ static int azx_resume(struct device *dev) >> > if (chip->disabled) >> > return 0; >> > >> > + request_power_well(); >> > pci_set_power_state(pci, PCI_D0); >> > pci_restore_state(pci); >> > if (pci_enable_device(pci) < 0) { @@ -2913,6 +2916,7 @@ static >> > int azx_runtime_suspend(struct device >> > *dev) >> > >> > azx_stop_chip(chip); >> > azx_clear_irq_pending(chip); >> > + release_power_well(); >> > return 0; >> > } >> > >> > @@ -2921,6 +2925,7 @@ static int azx_runtime_resume(struct device *dev) >> > struct snd_card *card = dev_get_drvdata(dev); >> > struct azx *chip = card->private_data; >> > >> > + request_power_well(); >> > azx_init_pci(chip); >> > azx_init_chip(chip, 1); >> > return 0; >> > @@ -3671,6 +3676,8 @@ static int azx_probe(struct pci_dev *pci, >> > return -ENOENT; >> > } >> > >> > + request_power_well(); >> > + >> > err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); >> > if (err < 0) { >> > snd_printk(KERN_ERR "hda-intel: Error creating >> > card!\n"); @@ >> > -3806,6 +3813,7 @@ static void azx_remove(struct pci_dev *pci) >> > if (card) >> > snd_card_free(card); >> > pci_set_drvdata(pci, NULL); >> > + release_power_well(); >> > } >> > >> > /* PCI IDs */ >> > -- >> > 1.7.9.5 > -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch

9 23

[alsa-devel] Conexant CX20588 breakage in Kernel 3.9
by Christopher K. 03 May '13

03 May '13

Hi, Kernel 3.9 breaks audio on internal speakers for the Conexant CX20588. EAPD is disabled for Node 0x1d. Enabling in hda_analyzer works fine. Someone already postet on https://bugs.launchpad.net/ubuntu/+source/alsa-driver/+bug/1173618 Is this the right place to report this bug? Regards, Chris

2 1

[alsa-devel] Audio miniconference (probably) moved to Edinburgh
by David Henningsson 03 May '13

03 May '13

Just to keep the wider crowd informed: We're currently discussing that we won't have any Audio miniconference on LPC (Linux Plumber's Conference) this year. Instead, we'll have an audio miniconference day in Edinburgh in October, colocated with LinuxCon Europe, Kernel Summit, ELCE and GStreamer conferences. The exact day for this miniconference has not been decided yet. The main reason for this move is proximity, as several participants are located in northern Europe. -- David Henningsson, Canonical Ltd. https://launchpad.net/~diwic

1 0

[alsa-devel] [PATCH]: x86_64, audio: Fix system panic when DMA > 40 bits
by Mike Travis 03 May '13

03 May '13

The audio driver mistakenly allows 64 bit addresses to be created for the audio driver on Nvidia GPUs. Unfortunately, the hardware normally only supports up to 40 bits of DMA. This can cause system panics as well as misdirected data when the address is > 40 bits as the upper part the address is truncated. Signed-off-by: Mike Travis <travis(a)sgi.com> Reviewed-by: Mike Habeck <habeck(a)sgi.com> --- sound/pci/hda/hda_intel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index bcd40ee..45eb165 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -615,7 +615,7 @@ enum { /* quirks for Nvidia */ #define AZX_DCAPS_PRESET_NVIDIA \ (AZX_DCAPS_NVIDIA_SNOOP | AZX_DCAPS_RIRB_DELAY | AZX_DCAPS_NO_MSI |\ - AZX_DCAPS_ALIGN_BUFSIZE) + AZX_DCAPS_ALIGN_BUFSIZE | AZX_DCAPS_NO_64BIT) #define AZX_DCAPS_PRESET_CTHDA \ (AZX_DCAPS_NO_MSI | AZX_DCAPS_POSFIX_LPIB | AZX_DCAPS_4K_BDLE_BOUNDARY) -- 1.8.2.1

4 7

[alsa-devel] ASoC updates for v3.10
by Mark Brown 03 May '13

03 May '13

The following changes since commit c1be5a5b1b355d40e6cf79cc979eb66dafa24ad1: Linux 3.9 (2013-04-28 17:36:01 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v3.10-4 for you to fetch changes up to 9631c02e240236ec206394fb52380647d0e70e4f: Merge remote-tracking branch 'asoc/fix/wm8994' into asoc-linus (2013-05-03 09:30:29 +0100) ---------------------------------------------------------------- ASoC: Updates for v3.10 A few more bug fixes, the DAPM clock fix is actually a driver specific one since currently there's only one user of the clock support due to the problems relying on the clock API. ---------------------------------------------------------------- Dan Carpenter (1): ASoC: wm8994: missing break in wm8994_aif3_hw_params() Fabio Baltieri (1): ASoC: dapm: use clk_prepare_enable and clk_disable_unprepare Marek Belisko (2): ASoC: McASP: Add pins output direction for rx clocks when configured in CBS_CFS format ASoC: McASP: Fix receive clock polarity in DAIFMT_NB_NF mode. Mark Brown (2): Merge remote-tracking branch 'asoc/fix/davinci' into asoc-linus Merge remote-tracking branch 'asoc/fix/wm8994' into asoc-linus sound/soc/codecs/wm8994.c | 1 + sound/soc/davinci/davinci-mcasp.c | 7 +++++-- sound/soc/soc-dapm.c | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-)

2 1

[alsa-devel] [PATCH -next 0/3] mop500_ab8500 fixes
by Fabio Baltieri 03 May '13

03 May '13

Hi, these are small fixes to the mop500_ab8500 asoc driver, developed on top of today's ASoC-next. The first patch is actually non ab8500 specific, but as ab8500 seems to be the only codec to use the SND_SOC_DAPM_CLOCK_SUPPLY widget I'm posting it here anyway. The other two patches sort out a mixup of card and codec controls in mop500_ab8500. Thanks, Fabio Fabio Baltieri (3): ASoC: dapm: use clk_prepare_enable and clk_disable_unprepare ASoC: ux500: move clock controls to ab8500-codec ASoC: ux500: register controls to card instead of codec sound/soc/codecs/ab8500-codec.c | 10 ++++++++++ sound/soc/soc-dapm.c | 4 ++-- sound/soc/ux500/mop500_ab8500.c | 20 +++++--------------- 3 files changed, 17 insertions(+), 17 deletions(-) -- 1.8.2

3 11

[alsa-devel] [PATCH] ASoC: McASP: Fix receive clock polarity in DAIFMT_NB_NF mode.
by Marek Belisko 03 May '13

03 May '13

According documentation bit ACLKRPOL is set to 0 (receiver samples data on falling edge) and when set to 1 (receiver samples data on rising edge). I2S data are always sampled on falling edge and valid during rising edge of bit clock. So in case of capture data transmitter sample data on falling edge and macsp must read then on rising edge. Signed-off-by: Marek Belisko <marek.belisko(a)streamunlimited.com> --- sound/soc/davinci/davinci-mcasp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index 849a187..c46112e 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/davinci/davinci-mcasp.c @@ -568,7 +568,7 @@ static int davinci_mcasp_set_dai_fmt(struct snd_soc_dai *cpu_dai, mcasp_set_bits(base + DAVINCI_MCASP_ACLKXCTL_REG, ACLKXPOL); mcasp_clr_bits(base + DAVINCI_MCASP_TXFMCTL_REG, FSXPOL); - mcasp_clr_bits(base + DAVINCI_MCASP_ACLKRCTL_REG, ACLKRPOL); + mcasp_set_bits(base + DAVINCI_MCASP_ACLKRCTL_REG, ACLKRPOL); mcasp_clr_bits(base + DAVINCI_MCASP_RXFMCTL_REG, FSRPOL); break; -- 1.7.9.5

2 1

[alsa-devel] [PATCH 1/1] ALSA: atmel: Remove redundant platform_set_drvdata()
by Sachin Kamat 03 May '13

03 May '13

Commit 0998d06310 (device-core: Ensure drvdata = NULL when no driver is bound) removes the need to set driver data field to NULL. Signed-off-by: Sachin Kamat <sachin.kamat(a)linaro.org> --- sound/atmel/abdac.c | 2 -- sound/atmel/ac97c.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/sound/atmel/abdac.c b/sound/atmel/abdac.c index 071ce1b..872d59e 100644 --- a/sound/atmel/abdac.c +++ b/sound/atmel/abdac.c @@ -583,8 +583,6 @@ static int atmel_abdac_remove(struct platform_device *pdev) free_irq(dac->irq, dac); snd_card_free(card); - platform_set_drvdata(pdev, NULL); - return 0; } diff --git a/sound/atmel/ac97c.c b/sound/atmel/ac97c.c index 6b7e2b5..ae63d22 100644 --- a/sound/atmel/ac97c.c +++ b/sound/atmel/ac97c.c @@ -1199,8 +1199,6 @@ static int atmel_ac97c_remove(struct platform_device *pdev) snd_card_set_dev(card, NULL); snd_card_free(card); - platform_set_drvdata(pdev, NULL); - return 0; } -- 1.7.9.5

4 3

[alsa-devel] [PATCH] ASoC: Added the condition for the channels_min of cpu_dai
by JongHo Kim 02 May '13

02 May '13

Only playback device, the pcm substream for capture does not need to be generated. If codec dai driver has both playback.channels_min and capture.channels_min, and cpu dai driver has only playback.channels_min, soc_new_pcm() will make the pcm substream for capture although DataIN is not connected. So added the condition for the channels_min of cpu_dai in soc_new_pcm(). Signed-off-by: JongHo Kim <furmuwon(a)gmail.com> --- sound/soc/soc-pcm.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index cf191e6..c405e39 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2018,9 +2018,11 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num) if (cpu_dai->driver->capture.channels_min) capture = 1; } else { - if (codec_dai->driver->playback.channels_min) + if (codec_dai->driver->playback.channels_min && + cpu_dai->driver->playback.channels_min) playback = 1; - if (codec_dai->driver->capture.channels_min) + if (codec_dai->driver->capture.channels_min && + cpu_dai->driver->capture.channels_min) capture = 1; } -- 1.8.1.1

2 4

[alsa-devel] [PATCH] ASoC: max98090: Fix build warning when CONFIG_PM_RUNTIME is not set
by Axel Lin 02 May '13

02 May '13

Fix below build warning when CONFIG_PM_RUNTIME is not set. CC [M] sound/soc/codecs/max98090.o sound/soc/codecs/max98090.c:2339:12: warning: 'max98090_runtime_resume' defined but not used [-Wunused-function] sound/soc/codecs/max98090.c:2350:12: warning: 'max98090_runtime_suspend' defined but not used [-Wunused-function] Signed-off-by: Axel Lin <axel.lin(a)ingics.com> --- sound/soc/codecs/max98090.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c index ce0d364..4f39a50 100644 --- a/sound/soc/codecs/max98090.c +++ b/sound/soc/codecs/max98090.c @@ -2336,6 +2336,7 @@ static int max98090_i2c_remove(struct i2c_client *client) return 0; } +#ifdef CONFIG_PM_RUNTIME static int max98090_runtime_resume(struct device *dev) { struct max98090_priv *max98090 = dev_get_drvdata(dev); @@ -2355,6 +2356,7 @@ static int max98090_runtime_suspend(struct device *dev) return 0; } +#endif static const struct dev_pm_ops max98090_pm = { SET_RUNTIME_PM_OPS(max98090_runtime_suspend, -- 1.8.1.2

2 1

[alsa-devel] [PATCH v2 1/4] ASoC: imx-sgtl5000: Do not enter the error path on success
by Fabio Estevam 02 May '13

02 May '13

From: Fabio Estevam <fabio.estevam(a)freescale.com> Return on success instead of entering the error path. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- Changes since v1: - Keep of_node_put in the success path. sound/soc/fsl/imx-sgtl5000.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sound/soc/fsl/imx-sgtl5000.c b/sound/soc/fsl/imx-sgtl5000.c index 9584e78..5a6aaa3 100644 --- a/sound/soc/fsl/imx-sgtl5000.c +++ b/sound/soc/fsl/imx-sgtl5000.c @@ -174,6 +174,11 @@ static int imx_sgtl5000_probe(struct platform_device *pdev) } platform_set_drvdata(pdev, data); + of_node_put(ssi_np); + of_node_put(codec_np); + + return 0; + clk_fail: clk_put(data->codec_clk); fail: -- 1.7.9.5

3 12

[alsa-devel] Mono output on emu10k1 with alsa broken
by Thomas Richter 01 May '13

01 May '13

Trying to configure mono (one channel) output on emu10k1 hardware using the alsa version that comes with kernel 3.9 is broken. Instead of expecting mono samples, the alsa callback expects twice as many stereo samples. Not getting the required number of samples then causes a buffer underrun, and sound gets interrupted or messed up. In fact, what the audio hardware does is that it plays not only the buffer, but also the data "behind the buffer", causing wierd noises. The channel count is setup as channels = 1; snd_pcm_hw_params_malloc(&HWParms); snd_pcm_open(&SoundStream,CardName,SND_PCM_STREAM_PLAYBACK,SND_PCM_NONBLOCK | SND_PCM_ASYNC); snd_pcm_hw_params_set_channels_min(SoundStream,HWParms,&channels); snd_pcm_hw_params_set_channels_max(SoundStream,HWParms,&channels); snd_pcm_hw_params_set_channels_first(SoundStream,HWParms,&channels); plus error checking. Then, a bit later, the number of configured channels is verified: snd_pcm_hw_params_get_channels(HWParms,&channels); channels is at this point still 1, i.e. the driver accepted the mono output, but does then not play correctly. Note that the same call sequence works for stereo, and it also works for mono for other underlying hardware drivers, i.e. mono output works on snd-hda-intel, for example. It does not on emu10k1.

1 0

[alsa-devel] [PATCH] MAINTAINERS: Add linux-samsung-soc list to all related entries
by Tomasz Figa 01 May '13

01 May '13

Several entries in MAINTAINERS file related to Samsung SoCs do not point to linux-samsung-soc mailing list, which is supposed to collect all Samsung SoC-related threads, to ease following of Samsung SoC-related work. This leads to a problem with people skipping this mailing list in their posts, even though they are related to Samsung SoCs. This patch adds pointers to linux-samsung-soc mailing list to affected entries of MAINTAINERS file. Signed-off-by: Tomasz Figa <tomasz.figa(a)gmail.com> --- MAINTAINERS | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 6c0d68b..07cb8da 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1139,6 +1139,7 @@ F: arch/arm/mach-exynos*/ ARM/SAMSUNG MOBILE MACHINE SUPPORT M: Kyungmin Park <kyungmin.park(a)samsung.com> L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) +L: linux-samsung-soc(a)vger.kernel.org (moderated for non-subscribers) S: Maintained F: arch/arm/mach-s5pv210/mach-aquila.c F: arch/arm/mach-s5pv210/mach-goni.c @@ -1150,6 +1151,7 @@ M: Kyungmin Park <kyungmin.park(a)samsung.com> M: Kamil Debski <k.debski(a)samsung.com> L: linux-arm-kernel(a)lists.infradead.org L: linux-media(a)vger.kernel.org +L: linux-samsung-soc(a)vger.kernel.org (moderated for non-subscribers) S: Maintained F: drivers/media/platform/s5p-g2d/ @@ -1158,6 +1160,7 @@ M: Kyungmin Park <kyungmin.park(a)samsung.com> M: Sylwester Nawrocki <s.nawrocki(a)samsung.com> L: linux-arm-kernel(a)lists.infradead.org L: linux-media(a)vger.kernel.org +L: linux-samsung-soc(a)vger.kernel.org (moderated for non-subscribers) S: Maintained F: arch/arm/plat-samsung/include/plat/*fimc* F: drivers/media/platform/s5p-fimc/ @@ -1168,6 +1171,7 @@ M: Kamil Debski <k.debski(a)samsung.com> M: Jeongtae Park <jtp.park(a)samsung.com> L: linux-arm-kernel(a)lists.infradead.org L: linux-media(a)vger.kernel.org +L: linux-samsung-soc(a)vger.kernel.org (moderated for non-subscribers) S: Maintained F: arch/arm/plat-samsung/s5p-dev-mfc.c F: drivers/media/platform/s5p-mfc/ @@ -1177,6 +1181,7 @@ M: Kyungmin Park <kyungmin.park(a)samsung.com> M: Tomasz Stanislawski <t.stanislaws(a)samsung.com> L: linux-arm-kernel(a)lists.infradead.org L: linux-media(a)vger.kernel.org +L: linux-samsung-soc(a)vger.kernel.org (moderated for non-subscribers) S: Maintained F: drivers/media/platform/s5p-tv/ @@ -2679,6 +2684,7 @@ M: Joonyoung Shim <jy0922.shim(a)samsung.com> M: Seung-Woo Kim <sw0312.kim(a)samsung.com> M: Kyungmin Park <kyungmin.park(a)samsung.com> L: dri-devel(a)lists.freedesktop.org +L: linux-samsung-soc(a)vger.kernel.org (moderated for non-subscribers) T: git git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git S: Supported F: drivers/gpu/drm/exynos @@ -3142,6 +3148,7 @@ F: Documentation/extcon/ EXYNOS DP DRIVER M: Jingoo Han <jg1.han(a)samsung.com> L: linux-fbdev(a)vger.kernel.org +L: linux-samsung-soc(a)vger.kernel.org (moderated for non-subscribers) S: Maintained F: drivers/video/exynos/exynos_dp* F: include/video/exynos_dp* @@ -3151,6 +3158,7 @@ M: Inki Dae <inki.dae(a)samsung.com> M: Donghwa Lee <dh09.lee(a)samsung.com> M: Kyungmin Park <kyungmin.park(a)samsung.com> L: linux-fbdev(a)vger.kernel.org +L: linux-samsung-soc(a)vger.kernel.org (moderated for non-subscribers) S: Maintained F: drivers/video/exynos/exynos_mipi* F: include/video/exynos_mipi* @@ -6892,12 +6900,14 @@ F: drivers/platform/x86/samsung-laptop.c SAMSUNG AUDIO (ASoC) DRIVERS M: Sangbeom Kim <sbkim73(a)samsung.com> L: alsa-devel(a)alsa-project.org (moderated for non-subscribers) +L: linux-samsung-soc(a)vger.kernel.org (moderated for non-subscribers) S: Supported F: sound/soc/samsung SAMSUNG FRAMEBUFFER DRIVER M: Jingoo Han <jg1.han(a)samsung.com> L: linux-fbdev(a)vger.kernel.org +L: linux-samsung-soc(a)vger.kernel.org (moderated for non-subscribers) S: Maintained F: drivers/video/s3c-fb.c @@ -7087,6 +7097,7 @@ F: drivers/mmc/host/sdhci-pltfm.[ch] SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) SAMSUNG DRIVER M: Ben Dooks <ben-linux(a)fluff.org> L: linux-mmc(a)vger.kernel.org +L: linux-samsung-soc(a)vger.kernel.org (moderated for non-subscribers) S: Maintained F: drivers/mmc/host/sdhci-s3c.c -- 1.8.2.1

4 3