December 2017 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] slimbus: make functions slim_ack_txn and slim_alloc_txbuf static
by Colin King 22 Dec '17

22 Dec '17

From: Colin Ian King <colin.king(a)canonical.com> The functions slim_ack_txn and slim_alloc_txbuf are local to the source and do not need to be in global scope, so make them static. Cleans up sparse warnings: symbol 'slim_ack_txn' was not declared. Should it be static? symbol 'slim_alloc_txbuf' was not declared. Should it be static? Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- drivers/slimbus/qcom-ctrl.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/slimbus/qcom-ctrl.c b/drivers/slimbus/qcom-ctrl.c index 9b7846f1f8c3..f24293a8aea8 100644 --- a/drivers/slimbus/qcom-ctrl.c +++ b/drivers/slimbus/qcom-ctrl.c @@ -148,7 +148,7 @@ static void *slim_alloc_rxbuf(struct qcom_slim_ctrl *ctrl) return ctrl->rx.base + (idx * ctrl->rx.sl_sz); } -void slim_ack_txn(struct qcom_slim_ctrl *ctrl, int err) +static void slim_ack_txn(struct qcom_slim_ctrl *ctrl, int err) { struct completion *comp; unsigned long flags; @@ -301,8 +301,9 @@ static int qcom_clk_pause_wakeup(struct slim_controller *sctrl) return 0; } -void *slim_alloc_txbuf(struct qcom_slim_ctrl *ctrl, struct slim_msg_txn *txn, - struct completion *done) +static void *slim_alloc_txbuf(struct qcom_slim_ctrl *ctrl, + struct slim_msg_txn *txn, + struct completion *done) { unsigned long flags; int idx; -- 2.14.1

1 0

[alsa-devel] [PATCH][next] slimbus: fix retries comparison to correctly identify failed allocation
by Colin King 22 Dec '17

22 Dec '17

From: Colin Ian King <colin.king(a)canonical.com> Currently the check for too many retries fails because retries is actually -1 when the retry loop terminates if no pbuf can be allocated because of the post decrement on retries. Fix this by not comparing retries with zero but instead check if it is negative. Detected by CoverityScan, CID#1463143 ("Logically dead code") and CID#1463144 ("Dereference after null check") Fixes: ad7fcbc308b0 ("slimbus: qcom: Add Qualcomm Slimbus controller driver") Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- drivers/slimbus/qcom-ctrl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/slimbus/qcom-ctrl.c b/drivers/slimbus/qcom-ctrl.c index 35ad70dbfe3a..9b7846f1f8c3 100644 --- a/drivers/slimbus/qcom-ctrl.c +++ b/drivers/slimbus/qcom-ctrl.c @@ -347,7 +347,7 @@ static int qcom_xfer_msg(struct slim_controller *sctrl, } } - if (!retries && !pbuf) + if (retries < 0 && !pbuf) return -ENOMEM; puc = (u8 *)pbuf; -- 2.14.1

1 0

[alsa-devel] [PATCH][next] slimbus: avoid null pointer dereference on msg
by Colin King 22 Dec '17

22 Dec '17

From: Colin Ian King <colin.king(a)canonical.com> The pointer msg is checked to see if it is null at the start of the function and jumps to the error exit label reterr that then dereferences msg when it prints a dev_err error message. Avoid this potential null pointer dereference by only printing the error message if msg is not null. Detected by CoverityScan, CID#1463141 ("Dereference after null check") Fixes: afbdcc7c384b ("slimbus: Add messaging APIs to slimbus framework") Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- drivers/slimbus/messaging.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/slimbus/messaging.c b/drivers/slimbus/messaging.c index 755462a4c75e..8b2c77f516b9 100644 --- a/drivers/slimbus/messaging.c +++ b/drivers/slimbus/messaging.c @@ -170,8 +170,9 @@ static int slim_val_inf_sanity(struct slim_controller *ctrl, break; } reterr: - dev_err(ctrl->dev, "Sanity check failed:msg:offset:0x%x, mc:%d\n", - msg->start_offset, mc); + if (msg) + dev_err(ctrl->dev, "Sanity check failed:msg:offset:0x%x, mc:%d\n", + msg->start_offset, mc); return -EINVAL; } -- 2.14.1

1 0

[alsa-devel] ASoC: fsl_ssi: Bringing up the SSI port in multi-channel TDM mode
by Caleb Crome 21 Dec '17

21 Dec '17

Hi, I just posted a little write up for helping people get started with the Freescale SSI port in TDM mode. https://medium.com/@caleb_22836/how-to-get-the-mx6-ssi-port-up-and-running-… I'm just posting here in case anybody is searching the google for this information and finds this post. (Also, it assumes that v4.15 will be released by the time anybody actually uses it...) -Caleb

1 0

[alsa-devel] [PATCH v10 00/13] Introduce framework for SLIMbus device driver
by srinivas.kandagatla＠linaro.org 21 Dec '17

21 Dec '17

From: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> SLIMbus (Serial Low Power Interchip Media Bus) is a specification developed by MIPI (Mobile Industry Processor Interface) alliance. SLIMbus is a 2-wire implementation, which is used to communicate with peripheral components like audio-codec. SLIMbus uses Time-Division-Multiplexing to accommodate multiple data channels, and control channel. Control channel has messages to do device-enumeration, messages to send/receive control-data to/from SLIMbus devices, messages for port/channel management, and messages to do bandwidth allocation. Framework is introduced to support multiple instances of the bus (1 controller per bus), and multiple slave devices per controller. SPI and I2C frameworks, and comments from last time when I submitted the patches were referred-to while working on this framework. These patchsets introduce device-management, OF helpers, and messaging APIs, controller driver for Qualcomm's SLIMbus controller, and clock-pause feature for entering/exiting low-power mode for SLIMbus. Framework patches to do channel, port and bandwidth management are work-in-progress and will be sent out once these initial patches are accepted. These patchsets were tested on IFC6410 board with Qualcomm APQ8064 processor using the controller driver, and a WCD9310 codec. v9: https://lkml.org/lkml/2017/12/7/289 Changes from v9 to v10: * Added kernel-doc reference into slimbus driver api doc suggested by Jonathan Corbet Sagar Dharia (9): Documentation: Add SLIMbus summary dt-bindings: Add SLIMbus bindings slimbus: Add SLIMbus bus type slimbus: core: Add slim controllers support slimbus: Add messaging APIs to slimbus framework slimbus: Add support for 'clock-pause' feature dt-bindings: Add qcom slimbus controller bindings slimbus: qcom: Add Qualcomm Slimbus controller driver slimbus: qcom: Add runtime-pm support using clock-pause Srinivas Kandagatla (4): slimbus: core: add support to device tree helper regmap: add SLIMbus support slimbus: core: add common defines required for controllers MAINTAINERS: Add SLIMbus maintainer Documentation/devicetree/bindings/slimbus/bus.txt | 50 ++ .../devicetree/bindings/slimbus/slim-qcom-ctrl.txt | 39 ++ Documentation/driver-api/index.rst | 1 + Documentation/driver-api/slimbus.rst | 127 ++++ MAINTAINERS | 8 + drivers/Kconfig | 2 + drivers/Makefile | 1 + drivers/base/regmap/Kconfig | 4 + drivers/base/regmap/Makefile | 1 + drivers/base/regmap/regmap-slimbus.c | 80 +++ drivers/slimbus/Kconfig | 23 + drivers/slimbus/Makefile | 10 + drivers/slimbus/core.c | 480 +++++++++++++ drivers/slimbus/messaging.c | 330 +++++++++ drivers/slimbus/qcom-ctrl.c | 750 +++++++++++++++++++++ drivers/slimbus/sched.c | 121 ++++ drivers/slimbus/slimbus.h | 261 +++++++ include/linux/mod_devicetable.h | 13 + include/linux/regmap.h | 18 + include/linux/slimbus.h | 164 +++++ 20 files changed, 2483 insertions(+) create mode 100644 Documentation/devicetree/bindings/slimbus/bus.txt create mode 100644 Documentation/devicetree/bindings/slimbus/slim-qcom-ctrl.txt create mode 100644 Documentation/driver-api/slimbus.rst create mode 100644 drivers/base/regmap/regmap-slimbus.c create mode 100644 drivers/slimbus/Kconfig create mode 100644 drivers/slimbus/Makefile create mode 100644 drivers/slimbus/core.c create mode 100644 drivers/slimbus/messaging.c create mode 100644 drivers/slimbus/qcom-ctrl.c create mode 100644 drivers/slimbus/sched.c create mode 100644 drivers/slimbus/slimbus.h create mode 100644 include/linux/slimbus.h -- 2.15.0

7 24

[alsa-devel] [PATCH v4 00/11] ASoC: fsl_ssi: Clean up - coding style level
by Nicolin Chen 21 Dec '17

21 Dec '17

==Changelog== v3->v4 * Revised PATCH-03 "Refine all comments" by adding Timur's inputs * Rebased all other patches v2->v3 * Added Tested-by and Reviewed-by from Maciej * Revised PATCH-03 "Refine all comments" by adding Maciej's advice * Revised PATCH-05 "Refine indentations and wrappings" * Rebased all other patches v1->v2 * Dropped one patch to remove "struct device" * Revised PATCH-03 "Refine all comments" * Revised PATCH-05 "Refine indentations and wrappings" * Rebased all other patches * Added PATCH-10 "Rename i2smode to i2s_net" * Added PATCH-11 "Define ternary macros to simplify code" # Detialed changes are described in each updated patch. Nicolin Chen (11): ASoC: fsl_ssi: Rename fsl_ssi_private to fsl_ssi ASoC: fsl_ssi: Cache pdev->dev pointer ASoC: fsl_ssi: Refine all comments ASoC: fsl_ssi: Rename registers and fields macros ASoC: fsl_ssi: Refine indentations and wrappings ASoC: fsl_ssi: Refine printk outputs ASoC: fsl_ssi: Rename cpu_dai parameter to dai ASoC: fsl_ssi: Rename scr_val to scr ASoC: fsl_ssi: Replace fsl_ssi_rxtx_reg_val with fsl_ssi_regvals ASoC: fsl_ssi: Rename i2smode to i2s_net ASoC: fsl_ssi: Define ternary macros to simplify code sound/soc/fsl/fsl_ssi.c | 1380 +++++++++++++++++++------------------------ sound/soc/fsl/fsl_ssi.h | 427 +++++++------ sound/soc/fsl/fsl_ssi_dbg.c | 59 +- 3 files changed, 896 insertions(+), 970 deletions(-) -- 2.7.4

5 24

[alsa-devel] [PATCH] ASoC: rl6231: remove never matched if condition
by Bard Liao 21 Dec '17

21 Dec '17

(in_t < 0) will never be true since in_t is unsigned. Signed-off-by: Bard Liao <bardliao(a)realtek.com> --- sound/soc/codecs/rl6231.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sound/soc/codecs/rl6231.c b/sound/soc/codecs/rl6231.c index 33690e9..7ef3b54 100644 --- a/sound/soc/codecs/rl6231.c +++ b/sound/soc/codecs/rl6231.c @@ -178,8 +178,6 @@ int rl6231_pll_calc(const unsigned int freq_in, for (n_t = 0; n_t <= max_n; n_t++) { in_t = f_in * (n_t + 2); pll_out = f_out * (k_t + 2); - if (in_t < 0) - continue; if (in_t == pll_out) { bypass = true; n = n_t; -- 2.7.4

2 1

[alsa-devel] [PATCH] ASoC: hdac_hdmi: Add vendor id for Cannonlake HDMI codec
by Guneshwor Singh 21 Dec '17

21 Dec '17

Cannonlake HDMI codec has the same nid as Geminilake. This adds the vendor id for Cannonlake in hdmi device id list. Signed-off-by: Guneshwor Singh <guneshwor.o.singh(a)intel.com> --- sound/soc/codecs/hdac_hdmi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c index 68a4a6b4e68e..69d7404dfbc4 100644 --- a/sound/soc/codecs/hdac_hdmi.c +++ b/sound/soc/codecs/hdac_hdmi.c @@ -2184,6 +2184,8 @@ static const struct hda_device_id hdmi_list[] = { HDA_CODEC_EXT_ENTRY(0x80862809, 0x100000, "Skylake HDMI", 0), HDA_CODEC_EXT_ENTRY(0x8086280a, 0x100000, "Broxton HDMI", 0), HDA_CODEC_EXT_ENTRY(0x8086280b, 0x100000, "Kabylake HDMI", 0), + HDA_CODEC_EXT_ENTRY(0x8086280c, 0x100000, "Cannonlake HDMI", + &intel_glk_drv_data), HDA_CODEC_EXT_ENTRY(0x8086280d, 0x100000, "Geminilake HDMI", &intel_glk_drv_data), {} -- 2.15.1

3 2

[alsa-devel] [RFC PATCH 0/2] select master clock in wm8994 driver based on DT clocks configuration
by Olivier Moysan 21 Dec '17

21 Dec '17

Hello, This RFC follows a previous RFC related to master clock issues with Wolfson wm8994 codec: http://mailman.alsa-project.org/pipermail/alsa-devel/2017-March/118834.html This RFC provides a new proposal regarding master clock selection in wm8994 driver. Below is a reminder of the problem: Use case: CPU DAI and codec are managed through audio graph card. Wolson codec wm8994 is set as slave of CPU DAI and CPU DAI feeds codec with master clock. Master clock is derived from mclk-fs property and provided to CPU DAI and codec through snd_soc_dai_set_sysclk API. Analysis: The audio graph card sets clock id to 0, while wm8994 codec driver expects a clock id in the range [1..4]. (MCLK1, MCLK2 ..) Proposal: Wolfson wm8994 codec bindings exposes MCLK1 and MCLK1 clocks. It seems that these clocks are not supported in wm8994 driver, yet. First patch adds support of these clocks. Second patch sets master clock according to clocks provided in DT. The patch assumes that MCLK1 and MCLK2 are linked to aif1 and aif2 interfaces respectively. If MCLKx is defined, is it used as source clock for aifx interface. Otherwise clock id parameter is used as usual. By default clock rate is requested from clock framework. This is not convenient, when mclk clock frequency is computed for mclk-fs ratio, as codec set_sysclk() is called before cpu set_sysclk() callback. In this case frequency provided by set_sysclk() must be used. So, if MCLKx rate is 0, frequency parameter provided by wm8994_set_dai_sysclk() is used. I have a limited view of potential side effects here, so any comments are welcome. If some adaptations are required to make this change more generic, please let me know. Regards Olivier Olivier Moysan (2): ASoC: add support of mclk clock providers in wm8894 driver ASoC: select sysclk clock from mlck clock provider in wm8994 driver drivers/mfd/wm8994-core.c | 9 +++++++++ include/linux/mfd/wm8994/pdata.h | 6 ++++++ sound/soc/codecs/wm8994.c | 20 +++++++++++++++++++- 3 files changed, 34 insertions(+), 1 deletion(-) -- 1.9.1

3 11

[alsa-devel] [PATCH v4 34/36] ALSA/dummy: Replace tasklet with softirq hrtimer
by Anna-Maria Gleixner 21 Dec '17

21 Dec '17

From: Thomas Gleixner <tglx(a)linutronix.de> The tasklet is used to defer the execution of snd_pcm_period_elapsed() to the softirq context. Using the HRTIMER_MODE_SOFT mode invokes the timer callback in softirq context as well which renders the tasklet useless. [o-takashi: avoid stall due to a call of hrtimer_cancel() on a callback of hrtimer] Signed-off-by: Thomas Gleixner <tglx(a)linutronix.de> Signed-off-by: Anna-Maria Gleixner <anna-maria(a)linutronix.de> Reviewed-by: Takashi Iwai <tiwai(a)suse.de> Cc: alsa-devel(a)alsa-project.org Cc: Takashi Iwai <tiwai(a)suse.com> Cc: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> Cc: Jaroslav Kysela <perex(a)perex.cz> Link: http://lkml.kernel.org/r/20170905161820.jtysvxtfleunbbmf@breakpoint.cc --- sound/drivers/dummy.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c index 7b2b1f766b00..6ad2ff57833d 100644 --- a/sound/drivers/dummy.c +++ b/sound/drivers/dummy.c @@ -375,17 +375,9 @@ struct dummy_hrtimer_pcm { ktime_t period_time; atomic_t running; struct hrtimer timer; - struct tasklet_struct tasklet; struct snd_pcm_substream *substream; }; -static void dummy_hrtimer_pcm_elapsed(unsigned long priv) -{ - struct dummy_hrtimer_pcm *dpcm = (struct dummy_hrtimer_pcm *)priv; - if (atomic_read(&dpcm->running)) - snd_pcm_period_elapsed(dpcm->substream); -} - static enum hrtimer_restart dummy_hrtimer_callback(struct hrtimer *timer) { struct dummy_hrtimer_pcm *dpcm; @@ -393,7 +385,14 @@ static enum hrtimer_restart dummy_hrtimer_callback(struct hrtimer *timer) dpcm = container_of(timer, struct dummy_hrtimer_pcm, timer); if (!atomic_read(&dpcm->running)) return HRTIMER_NORESTART; - tasklet_schedule(&dpcm->tasklet); + /* + * In cases of XRUN and draining, this calls .trigger to stop PCM + * substream. + */ + snd_pcm_period_elapsed(dpcm->substream); + if (!atomic_read(&dpcm->running)) + return HRTIMER_NORESTART; + hrtimer_forward_now(timer, dpcm->period_time); return HRTIMER_RESTART; } @@ -403,7 +402,7 @@ static int dummy_hrtimer_start(struct snd_pcm_substream *substream) struct dummy_hrtimer_pcm *dpcm = substream->runtime->private_data; dpcm->base_time = hrtimer_cb_get_time(&dpcm->timer); - hrtimer_start(&dpcm->timer, dpcm->period_time, HRTIMER_MODE_REL); + hrtimer_start(&dpcm->timer, dpcm->period_time, HRTIMER_MODE_REL_SOFT); atomic_set(&dpcm->running, 1); return 0; } @@ -413,14 +412,14 @@ static int dummy_hrtimer_stop(struct snd_pcm_substream *substream) struct dummy_hrtimer_pcm *dpcm = substream->runtime->private_data; atomic_set(&dpcm->running, 0); - hrtimer_cancel(&dpcm->timer); + if (!hrtimer_callback_running(&dpcm->timer)) + hrtimer_cancel(&dpcm->timer); return 0; } static inline void dummy_hrtimer_sync(struct dummy_hrtimer_pcm *dpcm) { hrtimer_cancel(&dpcm->timer); - tasklet_kill(&dpcm->tasklet); } static snd_pcm_uframes_t @@ -465,12 +464,10 @@ static int dummy_hrtimer_create(struct snd_pcm_substream *substream) if (!dpcm) return -ENOMEM; substream->runtime->private_data = dpcm; - hrtimer_init(&dpcm->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); + hrtimer_init(&dpcm->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL_SOFT); dpcm->timer.function = dummy_hrtimer_callback; dpcm->substream = substream; atomic_set(&dpcm->running, 0); - tasklet_init(&dpcm->tasklet, dummy_hrtimer_pcm_elapsed, - (unsigned long)dpcm); return 0; } -- 2.11.0

1 0