June 2020 - Alsa-devel - mailman.alsa-project.org

[GIT PULL] ASoC fixes for v5.8
by broonie＠kernel.org 10 Jun '20

10 Jun '20

The following changes since commit a6b675a89e51a1cdad0481b809b7840d3f86e4b5: ASoC: qcom: q6asm-dai: kCFI fix (2020-06-01 12:15:53 +0100) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-fix-v5.8 for you to fetch changes up to 44ce45f866c1606f03a411fb2d2c0db4626403a6: Merge series "ASoC: Fix dailink checks for DPCM" from Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com>: (2020-06-09 15:46:20 +0100) ---------------------------------------------------------------- ASoC: Fixes for v5.8 A small pile of fixes that came in during the merge window, the DPCM fixes from Pierre are the most notable thing here. ---------------------------------------------------------------- Bard Liao (1): ASoC: core: only convert non DPCM link to DPCM link Colin Ian King (1): ASoC: meson: fix memory leak of links if allocation of ldata fails Dan Murphy (1): dt-bindings: ASoc: Fix tdm-slot documentation spelling error Hans de Goede (2): ASoC: Intel: bytcr_rt5640: Add quirk for Toshiba Encore WT10-A tablet ASoC: rt5645: Add platform-data for Asus T101HA Mark Brown (1): Merge series "ASoC: Fix dailink checks for DPCM" from Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com>: Oder Chiou (1): ASoC: rl6231: Modify the target DMIC clock rate Pavel Machek (CIP) (1): ASoC: meson: add missing free_irq() in error path Pierre-Louis Bossart (3): ASoC: soc-pcm: dpcm: fix playback/capture checks ASoC: Intel: boards: replace capture_only by dpcm_capture ASoC: SOF: nocodec: conditionally set dpcm_capture/dpcm_playback flags Shengjiu Wang (1): ASoC: fsl-asoc-card: Defer probe when fail to find codec device Steve Lee (1): ASoC: max98390: Fix potential crash during param fw loading Takashi Iwai (1): ASoC: max98390: Fix incorrect printf qualifier .../devicetree/bindings/sound/tdm-slot.txt | 4 +- sound/soc/codecs/max98390.c | 26 ++++++++++--- sound/soc/codecs/max98390.h | 3 +- sound/soc/codecs/rl6231.c | 4 +- sound/soc/codecs/rt5645.c | 14 +++++++ sound/soc/fsl/fsl-asoc-card.c | 2 +- sound/soc/intel/boards/bytcr_rt5640.c | 12 ++++++ sound/soc/intel/boards/glk_rt5682_max98357a.c | 2 +- sound/soc/intel/boards/kbl_da7219_max98927.c | 4 +- sound/soc/intel/boards/kbl_rt5663_max98927.c | 2 +- .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 2 +- sound/soc/meson/axg-fifo.c | 10 ++++- sound/soc/meson/meson-card-utils.c | 17 ++++++--- sound/soc/soc-core.c | 22 +++++++++-- sound/soc/soc-pcm.c | 44 +++++++++++++++++----- sound/soc/sof/nocodec.c | 6 ++- 16 files changed, 136 insertions(+), 38 deletions(-)

3 3

Re: [PATCH 2/5] soundwire: qcom: add support for mmio soundwire devices
by Srinivas Kandagatla 10 Jun '20

10 Jun '20

On 09/06/2020 12:04, Jonathan Marek wrote: > On 6/9/20 5:19 AM, Srinivas Kandagatla wrote: >> >> >> On 08/06/2020 21:43, Jonathan Marek wrote: >>> Adds support for qcom soundwire devices with memory mapped IO registers. >>> >>> Signed-off-by: Jonathan Marek <jonathan(a)marek.ca> >>> --- >> >> In general patch itself looks pretty trivial, but I would like to see >> what 1.5.1 controller provides in terms of error reporting of >> SoundWire slave register reads/writes. On WCD based controller we did >> not have a mechanism to report things like if the read is ignored or >> not. I was hoping that this version of controller would be able to >> report that. >> >> I will be nice to those patches if that is something which is >> supported in this version. >> >> --srini >> > > It does seem to support additional error reporting (it gets an error > during enumeration after finding the 2 WSA slaves). However the > downstream driver seems to disable this by setting BIT(31) in > FIFO_CFG_ADDR (the comment says "For SWR master version 1.5.1, continue > execute on command ignore"). Outside of the initial enumeration, it > doesn't seem to produce any extra errors (still relying on the timeout > mechanism to know if read/write is ignored). 1.5.* versions support reporting CMD_NACKED in FIFO_STATUS register, so you should use that instead of timeout mechanism which is used for 1.3.0 which did not have support for this. thanks, srini > >>> drivers/soundwire/qcom.c | 25 +++++++++++++++++++++++-- >>> 1 file changed, 23 insertions(+), 2 deletions(-) >>> >>> diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c >>> index f38d1fd3679f..628747df1c75 100644 >>> --- a/drivers/soundwire/qcom.c >>> +++ b/drivers/soundwire/qcom.c >>> @@ -90,6 +90,7 @@ struct qcom_swrm_ctrl { >>> struct sdw_bus bus; >>> struct device *dev; >>> struct regmap *regmap; >>> + void __iomem *mmio; >>> struct completion *comp; >>> struct work_struct slave_work; >>> /* read/write lock */ >>> @@ -154,6 +155,20 @@ static int qcom_swrm_ahb_reg_write(struct >>> qcom_swrm_ctrl *ctrl, >>> return SDW_CMD_OK; >>> } >>> +static int qcom_swrm_cpu_reg_read(struct qcom_swrm_ctrl *ctrl, int reg, >>> + u32 *val) >>> +{ >>> + *val = readl(ctrl->mmio + reg); >>> + return SDW_CMD_OK; >>> +} >>> + >>> +static int qcom_swrm_cpu_reg_write(struct qcom_swrm_ctrl *ctrl, int >>> reg, >>> + int val) >>> +{ >>> + writel(val, ctrl->mmio + reg); >>> + return SDW_CMD_OK; >>> +} >>> + >>> static int qcom_swrm_cmd_fifo_wr_cmd(struct qcom_swrm_ctrl *ctrl, >>> u8 cmd_data, >>> u8 dev_addr, u16 reg_addr) >>> { >>> @@ -746,6 +761,7 @@ static int qcom_swrm_probe(struct platform_device >>> *pdev) >>> struct sdw_master_prop *prop; >>> struct sdw_bus_params *params; >>> struct qcom_swrm_ctrl *ctrl; >>> + struct resource *res; >>> int ret; >>> u32 val; >>> @@ -760,8 +776,13 @@ static int qcom_swrm_probe(struct >>> platform_device *pdev) >>> if (!ctrl->regmap) >>> return -EINVAL; >>> } else { >>> - /* Only WCD based SoundWire controller is supported */ >>> - return -ENOTSUPP; >>> + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); >>> + >>> + ctrl->reg_read = qcom_swrm_cpu_reg_read; >>> + ctrl->reg_write = qcom_swrm_cpu_reg_write; >>> + ctrl->mmio = devm_ioremap_resource(dev, res); >>> + if (IS_ERR(ctrl->mmio)) >>> + return PTR_ERR(ctrl->mmio); >>> } >>> ctrl->irq = of_irq_get(dev->of_node, 0); >>>

1 0

[sound:topic/dma-fix 149/152] sound/core/sgbuf.c:63:11: warning: variable 'prot' set but not used
by kernel test robot 10 Jun '20

10 Jun '20

tree: https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git topic/dma-fix head: cef734d7e27e6c8ecfabdc5596647ed3405ab43f commit: f3ed524c87951046aed8fde9db74c1d66c2e6000 [149/152] ALSA: pcm: Avoid vmap() for device SG-buffers config: i386-randconfig-s002-20200607 (attached as .config) compiler: gcc-9 (Debian 9.3.0-13) 9.3.0 reproduce: # apt-get install sparse # sparse version: v0.6.1-247-gcadbd124-dirty git checkout f3ed524c87951046aed8fde9db74c1d66c2e6000 # save the attached .config to linux build tree make W=1 C=1 ARCH=i386 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' If you fix the issue, kindly add following tag as appropriate Reported-by: kernel test robot <lkp(a)intel.com> All warnings (new ones prefixed by >>, old ones prefixed by <<): sound/core/sgbuf.c: In function 'snd_malloc_sgbuf_pages': >> sound/core/sgbuf.c:63:11: warning: variable 'prot' set but not used [-Wunused-but-set-variable] 63 | pgprot_t prot = PAGE_KERNEL; | ^~~~ vim +/prot +63 sound/core/sgbuf.c 51e9f2e665bf2b Takashi Iwai 2008-07-30 52 f3ed524c879510 Takashi Iwai 2020-06-09 53 int snd_malloc_sgbuf_pages(struct device *device, ^1da177e4c3f41 Linus Torvalds 2005-04-16 54 size_t size, struct snd_dma_buffer *dmab, ^1da177e4c3f41 Linus Torvalds 2005-04-16 55 size_t *res_size) ^1da177e4c3f41 Linus Torvalds 2005-04-16 56 { ^1da177e4c3f41 Linus Torvalds 2005-04-16 57 struct snd_sg_buf *sgbuf; 51e9f2e665bf2b Takashi Iwai 2008-07-30 58 unsigned int i, pages, chunk, maxpages; ^1da177e4c3f41 Linus Torvalds 2005-04-16 59 struct snd_dma_buffer tmpb; 51e9f2e665bf2b Takashi Iwai 2008-07-30 60 struct snd_sg_page *table; 51e9f2e665bf2b Takashi Iwai 2008-07-30 61 struct page **pgtable; 42e748a0b3251c Takashi Iwai 2018-08-08 62 int type = SNDRV_DMA_TYPE_DEV; 42e748a0b3251c Takashi Iwai 2018-08-08 @63 pgprot_t prot = PAGE_KERNEL; ^1da177e4c3f41 Linus Torvalds 2005-04-16 64 ^1da177e4c3f41 Linus Torvalds 2005-04-16 65 dmab->area = NULL; ^1da177e4c3f41 Linus Torvalds 2005-04-16 66 dmab->addr = 0; 59feddb25f9d92 Panagiotis Issaris 2006-07-25 67 dmab->private_data = sgbuf = kzalloc(sizeof(*sgbuf), GFP_KERNEL); ^1da177e4c3f41 Linus Torvalds 2005-04-16 68 if (! sgbuf) f3ed524c879510 Takashi Iwai 2020-06-09 69 return -ENOMEM; 42e748a0b3251c Takashi Iwai 2018-08-08 70 if (dmab->dev.type == SNDRV_DMA_TYPE_DEV_UC_SG) { 42e748a0b3251c Takashi Iwai 2018-08-08 71 type = SNDRV_DMA_TYPE_DEV_UC; 42e748a0b3251c Takashi Iwai 2018-08-08 72 #ifdef pgprot_noncached 42e748a0b3251c Takashi Iwai 2018-08-08 73 prot = pgprot_noncached(PAGE_KERNEL); 42e748a0b3251c Takashi Iwai 2018-08-08 74 #endif 42e748a0b3251c Takashi Iwai 2018-08-08 75 } ^1da177e4c3f41 Linus Torvalds 2005-04-16 76 sgbuf->dev = device; ^1da177e4c3f41 Linus Torvalds 2005-04-16 77 pages = snd_sgbuf_aligned_pages(size); ^1da177e4c3f41 Linus Torvalds 2005-04-16 78 sgbuf->tblsize = sgbuf_align_table(pages); 51e9f2e665bf2b Takashi Iwai 2008-07-30 79 table = kcalloc(sgbuf->tblsize, sizeof(*table), GFP_KERNEL); 51e9f2e665bf2b Takashi Iwai 2008-07-30 80 if (!table) ^1da177e4c3f41 Linus Torvalds 2005-04-16 81 goto _failed; 51e9f2e665bf2b Takashi Iwai 2008-07-30 82 sgbuf->table = table; 51e9f2e665bf2b Takashi Iwai 2008-07-30 83 pgtable = kcalloc(sgbuf->tblsize, sizeof(*pgtable), GFP_KERNEL); 51e9f2e665bf2b Takashi Iwai 2008-07-30 84 if (!pgtable) ^1da177e4c3f41 Linus Torvalds 2005-04-16 85 goto _failed; 51e9f2e665bf2b Takashi Iwai 2008-07-30 86 sgbuf->page_table = pgtable; ^1da177e4c3f41 Linus Torvalds 2005-04-16 87 51e9f2e665bf2b Takashi Iwai 2008-07-30 88 /* allocate pages */ 51e9f2e665bf2b Takashi Iwai 2008-07-30 89 maxpages = MAX_ALLOC_PAGES; 51e9f2e665bf2b Takashi Iwai 2008-07-30 90 while (pages > 0) { 51e9f2e665bf2b Takashi Iwai 2008-07-30 91 chunk = pages; 51e9f2e665bf2b Takashi Iwai 2008-07-30 92 /* don't be too eager to take a huge chunk */ 51e9f2e665bf2b Takashi Iwai 2008-07-30 93 if (chunk > maxpages) 51e9f2e665bf2b Takashi Iwai 2008-07-30 94 chunk = maxpages; 51e9f2e665bf2b Takashi Iwai 2008-07-30 95 chunk <<= PAGE_SHIFT; 42e748a0b3251c Takashi Iwai 2018-08-08 96 if (snd_dma_alloc_pages_fallback(type, device, 51e9f2e665bf2b Takashi Iwai 2008-07-30 97 chunk, &tmpb) < 0) { 51e9f2e665bf2b Takashi Iwai 2008-07-30 98 if (!sgbuf->pages) c810f9039f0406 Takashi Iwai 2012-08-03 99 goto _failed; 51e9f2e665bf2b Takashi Iwai 2008-07-30 100 if (!res_size) ^1da177e4c3f41 Linus Torvalds 2005-04-16 101 goto _failed; 51e9f2e665bf2b Takashi Iwai 2008-07-30 102 size = sgbuf->pages * PAGE_SIZE; ^1da177e4c3f41 Linus Torvalds 2005-04-16 103 break; ^1da177e4c3f41 Linus Torvalds 2005-04-16 104 } 51e9f2e665bf2b Takashi Iwai 2008-07-30 105 chunk = tmpb.bytes >> PAGE_SHIFT; 51e9f2e665bf2b Takashi Iwai 2008-07-30 106 for (i = 0; i < chunk; i++) { 51e9f2e665bf2b Takashi Iwai 2008-07-30 107 table->buf = tmpb.area; 51e9f2e665bf2b Takashi Iwai 2008-07-30 108 table->addr = tmpb.addr; 51e9f2e665bf2b Takashi Iwai 2008-07-30 109 if (!i) 51e9f2e665bf2b Takashi Iwai 2008-07-30 110 table->addr |= chunk; /* mark head */ 51e9f2e665bf2b Takashi Iwai 2008-07-30 111 table++; 51e9f2e665bf2b Takashi Iwai 2008-07-30 112 *pgtable++ = virt_to_page(tmpb.area); 51e9f2e665bf2b Takashi Iwai 2008-07-30 113 tmpb.area += PAGE_SIZE; 51e9f2e665bf2b Takashi Iwai 2008-07-30 114 tmpb.addr += PAGE_SIZE; 51e9f2e665bf2b Takashi Iwai 2008-07-30 115 } 51e9f2e665bf2b Takashi Iwai 2008-07-30 116 sgbuf->pages += chunk; 51e9f2e665bf2b Takashi Iwai 2008-07-30 117 pages -= chunk; 51e9f2e665bf2b Takashi Iwai 2008-07-30 118 if (chunk < maxpages) 51e9f2e665bf2b Takashi Iwai 2008-07-30 119 maxpages = chunk; ^1da177e4c3f41 Linus Torvalds 2005-04-16 120 } ^1da177e4c3f41 Linus Torvalds 2005-04-16 121 ^1da177e4c3f41 Linus Torvalds 2005-04-16 122 sgbuf->size = size; f3ed524c879510 Takashi Iwai 2020-06-09 123 dmab->addr = -1UL; /* some non-NULL value as validity */ 51e9f2e665bf2b Takashi Iwai 2008-07-30 124 if (res_size) 51e9f2e665bf2b Takashi Iwai 2008-07-30 125 *res_size = sgbuf->size; f3ed524c879510 Takashi Iwai 2020-06-09 126 return 0; ^1da177e4c3f41 Linus Torvalds 2005-04-16 127 ^1da177e4c3f41 Linus Torvalds 2005-04-16 128 _failed: ^1da177e4c3f41 Linus Torvalds 2005-04-16 129 snd_free_sgbuf_pages(dmab); /* free the table */ f3ed524c879510 Takashi Iwai 2020-06-09 130 return -ENOMEM; ^1da177e4c3f41 Linus Torvalds 2005-04-16 131 } 9d069dc00b02b8 Takashi Iwai 2012-09-20 132 :::::: The code at line 63 was first introduced by commit :::::: 42e748a0b3251cca0de2c269ca106884907eb289 ALSA: memalloc: Add non-cached buffer type :::::: TO: Takashi Iwai <tiwai(a)suse.de> :::::: CC: Takashi Iwai <tiwai(a)suse.de> --- 0-DAY CI Kernel Test Service, Intel Corporation https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org

1 0

Re: [PATCH 3/5] soundwire: qcom: add v1.5.1 compatible
by Srinivas Kandagatla 10 Jun '20

10 Jun '20

On 09/06/2020 12:17, Jonathan Marek wrote: > On 6/9/20 1:26 AM, Vinod Koul wrote: >> On 08-06-20, 16:43, Jonathan Marek wrote: >>> Add a compatible string for HW version v1.5.1 on sm8250 SoCs. >> >> Please document this new compatible >> > > Does it really need to be documented? The documentation already says the > compatible should be "qcom,soundwire-v<MAJOR>.<MINOR>.<STEP>". It gives > "qcom,soundwire-v1.5.0" as an example, which is not actually a supported > compatible, so my understanding is we don't need to update the list of > examples with every possible compatible. checkpatch should have reported about this, and in future once we convert to yaml and list the compatible strings then dt_binding_check would fail too. So there is no harm in adding an additional compatible string for this new entry. --srini

1 0

[sound:topic/dma-fix2 150/150] sound/core/pcm_memory.c:44:45: error: lvalue required as left operand of assignment
by kernel test robot 10 Jun '20

10 Jun '20

tree: https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git topic/dma-fix2 head: de846f4c8c865ca0fe3952ee80ad165f4c64ea34 commit: de846f4c8c865ca0fe3952ee80ad165f4c64ea34 [150/150] ALSA: pcm: Use SG-buffer only when direct DMA is available config: nios2-allyesconfig (attached as .config) compiler: nios2-linux-gcc (GCC) 9.3.0 reproduce (this is a W=1 build): wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross git checkout de846f4c8c865ca0fe3952ee80ad165f4c64ea34 # save the attached .config to linux build tree COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=nios2 If you fix the issue, kindly add following tag as appropriate Reported-by: kernel test robot <lkp(a)intel.com> All error/warnings (new ones prefixed by >>, old ones prefixed by <<): sound/core/pcm_memory.c: In function 'do_alloc_pages': >> sound/core/pcm_memory.c:44:45: error: lvalue required as left operand of assignment 44 | (type == SNDRV_DMA_TYPE_DEV_SG || type = SNDRV_DMA_TYPE_DEV_UC_SG) && | ^ >> sound/core/pcm_memory.c:45:6: error: implicit declaration of function 'dma_is_direct'; did you mean 'io_is_direct'? [-Werror=implicit-function-declaration] 45 | dma_is_direct(get_dma_ops(dev))) { | ^~~~~~~~~~~~~ | io_is_direct >> sound/core/pcm_memory.c:45:20: error: implicit declaration of function 'get_dma_ops' [-Werror=implicit-function-declaration] 45 | dma_is_direct(get_dma_ops(dev))) { | ^~~~~~~~~~~ In file included from include/linux/printk.h:326, from include/linux/kernel.h:15, from include/asm-generic/bug.h:19, from ./arch/nios2/include/generated/asm/bug.h:1, from include/linux/bug.h:5, from include/linux/io.h:11, from sound/core/pcm_memory.c:7: >> sound/core/pcm_memory.c:47:11: error: 'device' undeclared (first use in this function) 47 | dev_dbg(device, "Use continuous page allocatorn"); | ^~~~~~ include/linux/dynamic_debug.h:125:15: note: in definition of macro '__dynamic_func_call' 125 | func(&id, ##__VA_ARGS__); | ^~~~~~~~~~~ include/linux/dynamic_debug.h:157:2: note: in expansion of macro '_dynamic_func_call' 157 | _dynamic_func_call(fmt,__dynamic_dev_dbg, | ^~~~~~~~~~~~~~~~~~ include/linux/dev_printk.h:114:2: note: in expansion of macro 'dynamic_dev_dbg' 114 | dynamic_dev_dbg(dev, dev_fmt(fmt), ##__VA_ARGS__) | ^~~~~~~~~~~~~~~ >> sound/core/pcm_memory.c:47:3: note: in expansion of macro 'dev_dbg' 47 | dev_dbg(device, "Use continuous page allocatorn"); | ^~~~~~~ sound/core/pcm_memory.c:47:11: note: each undeclared identifier is reported only once for each function it appears in 47 | dev_dbg(device, "Use continuous page allocatorn"); | ^~~~~~ include/linux/dynamic_debug.h:125:15: note: in definition of macro '__dynamic_func_call' 125 | func(&id, ##__VA_ARGS__); | ^~~~~~~~~~~ include/linux/dynamic_debug.h:157:2: note: in expansion of macro '_dynamic_func_call' 157 | _dynamic_func_call(fmt,__dynamic_dev_dbg, | ^~~~~~~~~~~~~~~~~~ include/linux/dev_printk.h:114:2: note: in expansion of macro 'dynamic_dev_dbg' 114 | dynamic_dev_dbg(dev, dev_fmt(fmt), ##__VA_ARGS__) | ^~~~~~~~~~~~~~~ >> sound/core/pcm_memory.c:47:3: note: in expansion of macro 'dev_dbg' 47 | dev_dbg(device, "Use continuous page allocatorn"); | ^~~~~~~ cc1: some warnings being treated as errors vim +44 sound/core/pcm_memory.c 33 34 static int do_alloc_pages(struct snd_card *card, int type, struct device *dev, 35 size_t size, struct snd_dma_buffer *dmab) 36 { 37 int err; 38 39 if (max_alloc_per_card && 40 card->total_pcm_alloc_bytes + size > max_alloc_per_card) 41 return -ENOMEM; 42 43 if (IS_ENABLED(CONFIG_SND_DMA_SGBUF) && > 44 (type == SNDRV_DMA_TYPE_DEV_SG || type = SNDRV_DMA_TYPE_DEV_UC_SG) && > 45 dma_is_direct(get_dma_ops(dev))) { 46 /* mutate to continuous page allocation */ > 47 dev_dbg(device, "Use continuous page allocator\n"); 48 if (type == SNDRV_DMA_TYPE_DEV_SG) 49 type = SNDRV_DMA_TYPE_DEV; 50 else 51 type = SNDRV_DMA_TYPE_DEV_UC; 52 } 53 54 err = snd_dma_alloc_pages(type, dev, size, dmab); 55 if (!err) { 56 mutex_lock(&card->memory_mutex); 57 card->total_pcm_alloc_bytes += dmab->bytes; 58 mutex_unlock(&card->memory_mutex); 59 } 60 return err; 61 } 62 --- 0-DAY CI Kernel Test Service, Intel Corporation https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org

1 0

Re: [PATCH 4/5] soundwire: qcom: avoid dependency on CONFIG_SLIMBUS
by Srinivas Kandagatla 10 Jun '20

10 Jun '20

On 09/06/2020 12:33, Jonathan Marek wrote: > On 6/9/20 5:52 AM, Srinivas Kandagatla wrote: >> >> >> On 08/06/2020 21:43, Jonathan Marek wrote: >>> The driver may be used without slimbus, so don't depend on slimbus. >>> >>> Signed-off-by: Jonathan Marek <jonathan(a)marek.ca> >>> --- >>> drivers/soundwire/Kconfig | 1 - >>> drivers/soundwire/qcom.c | 5 +++++ >>> 2 files changed, 5 insertions(+), 1 deletion(-) >>> >>> diff --git a/drivers/soundwire/Kconfig b/drivers/soundwire/Kconfig >>> index fa2b4ab92ed9..d121cf739090 100644 >>> --- a/drivers/soundwire/Kconfig >>> +++ b/drivers/soundwire/Kconfig >>> @@ -33,7 +33,6 @@ config SOUNDWIRE_INTEL >>> config SOUNDWIRE_QCOM >>> tristate "Qualcomm SoundWire Master driver" >>> - depends on SLIMBUS >>> depends on SND_SOC >> >> Why not move this to imply SLIMBUS this will give more flexibility! >> >> > > If you mean to change it to "select SLIMBUS", I'd prefer not to, because > this would increase code size unnecessarily in my kernel. imply is week select, which means that this driver can be built without SLIMBus selected. So removing reference to slimbus_bus is necessary in this case. On the other hand, SLIMBus is going to be used sm8250 for BT audio, so this would not be unnecessary. Also mostly these are build as modules, so not sure why kernel size will increase here! Am not 100% sure if SLIMBus will be kept on all SoCs, but keeping depends or imply in place would enforce or spell out some level of dependency on this. > >>> help >>> SoundWire Qualcomm Master driver. >>> diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c >>> index 14334442615f..ac81c64768ea 100644 >>> --- a/drivers/soundwire/qcom.c >>> +++ b/drivers/soundwire/qcom.c >>> @@ -769,13 +769,18 @@ static int qcom_swrm_probe(struct >>> platform_device *pdev) >>> if (!ctrl) >>> return -ENOMEM; >>> +#ifdef CONFIG_SLIMBUS >>> if (dev->parent->bus == &slimbus_bus) { >>> +#else >>> + if (false) { >>> +#endif >> >> May be you can do bit more cleanup here, which could endup like: >> >> >> ctrl->regmap = dev_get_regmap(dev->parent, NULL); >> if (!ctrl->regmap) { >> res = platform_get_resource(pdev, IORESOURCE_MEM, 0); >> if (res) { >> ctrl->mmio = devm_ioremap_resource(dev, res); >> if (IS_ERR(ctrl->mmio)) { >> dev_err(dev, "No valid mem resource found\n"); >> return PTR_ERR(ctrl->mmio); >> } >> >> ctrl->reg_read = qcom_swrm_cpu_reg_read; >> ctrl->reg_write = qcom_swrm_cpu_reg_write; >> } else { >> dev_err(dev, "No valid slim resource found\n"); >> return -EINVAL; >> } >> } else { >> ctrl->reg_read = qcom_swrm_ahb_reg_read; >> ctrl->reg_write = qcom_swrm_ahb_reg_write; >> } >> >> >> >> thanks, >> srini > > I don't think this is better, it feels more obfuscated, and I think its > possible we may end up with the mmio sdw having a parent with a regmap. > (it is not how I did things up in my upstream stack, but in downstream > the sdw nodes are inside the "macro" codec nodes) > > I understand the '#ifdef CONFIG_SLIMBUS'/'dev->parent->bus == > &slimbus_bus' is ugly, but at least its clear what's going on. Unless > you have a better suggestion? Other suggestion I had in my mind was to use compatible strings to get reg_read, reg_write callbacks + some flags like (if_type) populated. This can help looking up resources correctly. Thanks, srini > >>> ctrl->reg_read = qcom_swrm_ahb_reg_read; >>> ctrl->reg_write = qcom_swrm_ahb_reg_write; >>> ctrl->regmap = dev_get_regmap(dev->parent, NULL); >>> if (!ctrl->regmap) >>> return -EINVAL; >>> } else { >>> + >>> res = platform_get_resource(pdev, IORESOURCE_MEM, 0); >>> ctrl->reg_read = qcom_swrm_cpu_reg_read; >>>

1 0

We were woken up with POLLOUT set
by Stuart Naylor 09 Jun '20

09 Jun '20

Yeah pulseaudio is doing the same on Raspbian with USB devices. Sent from Mail<https://go.microsoft.com/fwlink/?LinkId=550986> for Windows 10 From: alsa-devel-request(a)alsa-project.org<mailto:alsa-devel-request@alsa-project.org> Sent: 09 June 2020 22:40 To: alsa-devel(a)alsa-project.org<mailto:alsa-devel@alsa-project.org> Subject: Alsa-devel Digest, Vol 160, Issue 72 Send Alsa-devel mailing list submissions to alsa-devel(a)alsa-project.org To subscribe or unsubscribe via the World Wide Web, visit https://mailman.alsa-project.org/mailman/listinfo/alsa-devel or, via email, send a message with subject or body 'help' to alsa-devel-request(a)alsa-project.org You can reach the person managing the list at alsa-devel-owner(a)alsa-project.org When replying, please edit your Subject line so it is more specific than "Re: Contents of Alsa-devel digest..." Today's Topics: 1. Re: [RFC PATCH 0/2] TAS2563 DSP Firmware Loader (Dan Murphy) 2. Re: [RFC PATCH 0/2] TAS2563 DSP Firmware Loader (Mark Brown) 3. Re: [RFC PATCH 1/2] dt-bindings: tas2562: Add firmware support for tas2563 (Mark Brown) 4. Re: [RFC PATCH 1/2] dt-bindings: tas2562: Add firmware support for tas2563 (Dan Murphy) 5. We were woken up with POLLOUT set -- however a subsequent snd_pcm_avail() returned 0 or another value < min_avail. Jun 09 14:31:33 elrond pulseaudio[11933]: Most likely this is a bug in the ALSA driver 'snd_usb_audio'. Please report this issue to the ALSA developers. Jun 09 14:31:33 elrond pulseaudio[11933]: ALSA woke us up to write new data to the device, but there was actually nothing to write. (GitHub issues - opened) 6. We were woken up with POLLOUT set -- however a subsequent snd_pcm_avail() returned 0 or another value < min_avail. Jun 09 14:31:33 elrond pulseaudio[11933]: Most likely this is a bug in the ALSA driver 'snd_usb_audio'. Please report this issue to the ALSA developers. Jun 09 14:31:33 elrond pulseaudio[11933]: ALSA woke us up to write new data to the device, but there was actually nothing to write. (GitHub issues - edited) 7. ALSA journalctl error. (GitHub issues - edited) 8. ALSA journalctl Error (GitHub issues - edited) ---------------------------------------------------------------------- Message: 1 Date: Tue, 9 Jun 2020 13:07:50 -0500 From: Dan Murphy <dmurphy(a)ti.com> To: Mark Brown <broonie(a)kernel.org> Cc: robh(a)kernel.org, alsa-devel(a)alsa-project.org, devicetree(a)vger.kernel.org, linux-kernel(a)vger.kernel.org, tiwai(a)suse.com, lgirdwood(a)gmail.com Subject: Re: [RFC PATCH 0/2] TAS2563 DSP Firmware Loader Message-ID: <6d6aaed3-dac8-e1ec-436c-9b04273df2b3(a)ti.com> Content-Type: text/plain; charset="windows-1252"; format=flowed Mark On 6/9/20 12:52 PM, Mark Brown wrote: > On Tue, Jun 09, 2020 at 12:28:39PM -0500, Dan Murphy wrote: > >> These programs and configurations are selectable via files under the I2C dev >> node. There may be a better way to select this through ALSA controls but I was >> unable to find a good example of this. This is why this is an RFC patchset. > I think you can just use enums for most of this - what you want to do I > think is parse the firmware, build templates for the controls and then > add them with snd_soc_add_component_controls(). Userspace *should* cope > with controls being hotplugged. Yes this was my concern if userspace could cope with dynamic controls. Dan ------------------------------ Message: 2 Date: Tue, 9 Jun 2020 19:16:15 +0100 From: Mark Brown <broonie(a)kernel.org> To: Dan Murphy <dmurphy(a)ti.com> Cc: robh(a)kernel.org, alsa-devel(a)alsa-project.org, devicetree(a)vger.kernel.org, linux-kernel(a)vger.kernel.org, tiwai(a)suse.com, lgirdwood(a)gmail.com Subject: Re: [RFC PATCH 0/2] TAS2563 DSP Firmware Loader Message-ID: <20200609181615.GR4583(a)sirena.org.uk> Content-Type: text/plain; charset="us-ascii" On Tue, Jun 09, 2020 at 01:07:50PM -0500, Dan Murphy wrote: > On 6/9/20 12:52 PM, Mark Brown wrote: > > I think you can just use enums for most of this - what you want to do I > > think is parse the firmware, build templates for the controls and then > > add them with snd_soc_add_component_controls(). Userspace *should* cope > > with controls being hotplugged. > Yes this was my concern if userspace could cope with dynamic controls. Things like alsactl definitely do, and obviously anything that starts after the firmware loads will be fine too.

1 0

ALSA journalctl Error
by GitHub issues - edited 09 Jun '20

09 Jun '20

alsa-project/alsa-lib issue #57 was edited from danieloppenlander: I ran across an error in my journalctl on Ubuntu 20.04. It said to report a bug. Here is my alsa-info.sh output: http://alsa-project.org/db/?f=6b505aa5138f2a974037ab5c3a89e1605807df97 Here is the journalctl message: ``` pulseaudio[11933]: We were woken up with POLLOUT set -- however a subsequent snd_pcm_avail() returned 0 or another value < min_avail. pulseaudio[11933]: Most likely this is a bug in the ALSA driver 'snd_usb_audio'. Please report this issue to the ALSA developers. pulseaudio[11933]: ALSA woke us up to write new data to the device, but there was actually nothing to write. ``` Issue URL : https://github.com/alsa-project/alsa-lib/issues/57 Repository URL: https://github.com/alsa-project/alsa-lib

1 0

ALSA journalctl Error
by GitHub issues - edited 09 Jun '20

09 Jun '20

alsa-project/alsa-lib issue #57 was edited from danieloppenlander: I ran across an error in my journalctl on Ubuntu 20.04. It said to report a bug. Here is my alsa-info.sh output: http://alsa-project.org/db/?f=6b505aa5138f2a974037ab5c3a89e1605807df97 Here is the journalctl message: ``` We were woken up with POLLOUT set -- however a subsequent snd_pcm_avail() returned 0 or another value < min_avail. Jun 09 14:31:33 elrond pulseaudio[11933]: Most likely this is a bug in the ALSA driver 'snd_usb_audio'. Please report this issue to the ALSA developers. Jun 09 14:31:33 elrond pulseaudio[11933]: ALSA woke us up to write new data to the device, but there was actually nothing to write. ``` Issue URL : https://github.com/alsa-project/alsa-lib/issues/57 Repository URL: https://github.com/alsa-project/alsa-lib

1 0

ALSA journalctl error.
by GitHub issues - edited 09 Jun '20

09 Jun '20

alsa-project/alsa-lib issue #57 was edited from danieloppenlander: I ran across an error in my journalctl on Ubuntu 20.04. It said to report a bug. Here is my alsa-info.sh output: http://alsa-project.org/db/?f=6b505aa5138f2a974037ab5c3a89e1605807df97 Here is the journalctl message: ``` We were woken up with POLLOUT set -- however a subsequent snd_pcm_avail() returned 0 or another value < min_avail. Jun 09 14:31:33 elrond pulseaudio[11933]: Most likely this is a bug in the ALSA driver 'snd_usb_audio'. Please report this issue to the ALSA developers. Jun 09 14:31:33 elrond pulseaudio[11933]: ALSA woke us up to write new data to the device, but there was actually nothing to write. ``` Issue URL : https://github.com/alsa-project/alsa-lib/issues/57 Repository URL: https://github.com/alsa-project/alsa-lib

1 0