January 2018 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [RFC v5 0/9] Enable HDA Codec support on Intel Platforms (Series2)
by Rakesh Ughreja 03 Jan '18

03 Jan '18

Many Intel platforms (SKL, KBL) etc. in the market supports enhanced audio capabilities which also includes DSP processing. This patch carry forwards the works that is done in the previous series to enable HD Audio codecs on such platforms. This patch series adds ASoC HDA codec driver for Intel platforms. It is written by reusing the legacy HDA ALSA codec driver. Intention is to maximize the reuse and minimize the changes in the legacy HDA codec driver. I would like to receive feedback before proceeding further on this direction. INFO: - This series is tested on KBL based product (Dell XPS 13). - Basic playback is working with headset and speakers. - HDMI playback is working. - Capture operation is not tested. - Playback using legacy drivers is tested. - More platforms and use cases coverage can be added once we have basic agreement in terms of the overall approach. - With this rebase I observed that if HDMI device is not connected to the machine, the iDisp codec is not detected and so the card is not created. work around is to make sure that HDMI device is connected at driver loading time. Changes in v5: - Rebased to Mark's tree, 4.15-rc5 - Fixed issue related to hdac_hda module loading order. Changes in v4: - new field bus type is added to distinguish bus type allocated by the controller or platform drivers. - extended routines are provided in hdac_bus which are called by legacy codec driver when the bus type is ext. - hdac_hda driver is converted into a passive library. Changes in v3: - snd_hda_codec_new API is split into two, so that it can be used by legacy as well as ASoC codec drivers. API is split into two to avoid bus registration when called by ASoC drivers. - Moved the __hda_codec_driver_register and hda_codec_driver_unregister APIs into generic driver and it performs registration for ASoC codec drivers also. So now there is only one kernel image for ASoC as well as legacy codec drivers. Registration functions had to moved to generic driver to resolve the circular dependency between hdac_hda and hda_codec drivers. - There is a Kconfig entry added to compile the ASoC version of HDA codec driver. For now only the Realtek codec entry is added. Same thing needs to be done for rest of the codec drivers also. Changes in v2: - Using Topology framework to create DAIs and DAI Links - Moved most commonly used functions into a separate file for machine driver. - Implemented separate Realtek ASoC HDA Driver driver for Realtek HDA codecs. It is just a driver registration wrapper which reuses the legacy HDA codec driver. This allows the removes the limitation that was present Rakesh Ughreja (9): ASoC: Intel: Boards: Machine driver for Intel platforms ASoC: Intel: Skylake: Add entry in sst_acpi_mach for HDA codecs ASoC: Intel: Skylake: add HDA BE DAIs ASoC: Intel: Skylake: use hda_bus instead of hdac_bus ALSA: hda - split snd_hda_codec_new function ALSA: hdac: remove memory allocation from snd_hdac_ext_bus_device_init ALSA: hdac: add bus type and extended ops support in hdac_bus ASoC: hdac_hda: add asoc extension for legacy HDA codec drivers ASoC: Intel: Boards: add support for HDA codecs include/sound/hdaudio.h | 24 ++ include/sound/hdaudio_ext.h | 6 +- sound/hda/ext/hdac_ext_bus.c | 14 +- sound/hda/hdac_bus.c | 1 + sound/pci/hda/hda_bind.c | 15 + sound/pci/hda/hda_codec.c | 67 +++- sound/pci/hda/hda_codec.h | 2 + sound/soc/codecs/Kconfig | 5 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/hdac_hda.c | 517 +++++++++++++++++++++++++++ sound/soc/codecs/hdac_hda.h | 20 ++ sound/soc/intel/Kconfig | 1 + sound/soc/intel/boards/Kconfig | 10 + sound/soc/intel/boards/Makefile | 2 + sound/soc/intel/boards/skl_hda_dsp_common.c | 163 +++++++++ sound/soc/intel/boards/skl_hda_dsp_common.h | 34 ++ sound/soc/intel/boards/skl_hda_dsp_generic.c | 132 +++++++ sound/soc/intel/skylake/skl-pcm.c | 32 +- sound/soc/intel/skylake/skl.c | 87 ++++- sound/soc/intel/skylake/skl.h | 10 +- 20 files changed, 1101 insertions(+), 43 deletions(-) create mode 100644 sound/soc/codecs/hdac_hda.c create mode 100644 sound/soc/codecs/hdac_hda.h create mode 100644 sound/soc/intel/boards/skl_hda_dsp_common.c create mode 100644 sound/soc/intel/boards/skl_hda_dsp_common.h create mode 100644 sound/soc/intel/boards/skl_hda_dsp_generic.c -- 2.7.4

1 9

[alsa-devel] [PATCH -next] soundwire: Fix typo in return value check of sdw_read()
by Wei Yongjun 03 Jan '18

03 Jan '18

Fix the typo, 'status' should be instead of 'status2'. Fixes: b0a9c37b0178 ("soundwire: Add slave status handling") Signed-off-by: Wei Yongjun <weiyongjun1(a)huawei.com> --- drivers/soundwire/bus.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/soundwire/bus.c b/drivers/soundwire/bus.c index 4c34519..266d2b3 100644 --- a/drivers/soundwire/bus.c +++ b/drivers/soundwire/bus.c @@ -671,8 +671,8 @@ static int sdw_handle_dp0_interrupt(struct sdw_slave *slave, u8 *slave_status) status2 = sdw_read(slave, SDW_DP0_INT); if (status2 < 0) { dev_err(slave->bus->dev, - "SDW_DP0_INT read failed:%d", status); - return status; + "SDW_DP0_INT read failed:%d", status2); + return status2; } status &= status2; @@ -741,10 +741,10 @@ static int sdw_handle_port_interrupt(struct sdw_slave *slave, /* Read DPN interrupt again */ status2 = sdw_read(slave, addr); - if (status < 0) { + if (status2 < 0) { dev_err(slave->bus->dev, - "SDW_DPN_INT read failed:%d", status); - return status; + "SDW_DPN_INT read failed:%d", status2); + return status2; } status &= status2;

3 2

[alsa-devel] Cherry Trail + RT5645 devices analog microphone not working.
by Hans de Goede 02 Jan '18

02 Jan '18

Hi Bard, I've been looking into getting the microphone to work on some Cherry Trail + RT5645 devices with what appears to be a simple analog microphone. You can see the microphone on one of the models I'm trying to get it to work on soldered onto the right side of the PCB here: https://i.imgur.com/bJzBQWe.jpg I'm using this ucm config: https://fedorapeople.org/~jwrdegoede/chtrt5645/ Which is basically Pierre-Louis Bossart's config from: https://github.com/plbossart/UCM Adjusted because the devices all have a mono speaker. I've been trying to get this to work myself and I can get some sound while recording by adding: cset "name='RECMIXL BST2 Switch' on" cset "name='RECMIXR BST2 Switch' on" But then I mainly get noise, I do get some sound from the microphone if I talk really really loudly, but it is barely above the noise-floor. I've the feeling that BST2 is only picking up the microphone via cross-talk and that BST1 indeed is the correct input, but for some reason I get complete silence when recording when only BST1 is selected in the RECMIXR, and yes I've checked / set the "IN1 boost volume". TL;DR: I'm trying to get an analog mic to work on 3 different models Cherry Trail + RT5645 devices and I've been unable to get this to work. I've put a registerdump of the rt5645 with gnome-sound-recorder running here: https://fedorapeople.org/~jwrdegoede/rt5645-mic-red.dump Any insights / help with this would be very much welcome. Regards, Hans

2 10

[alsa-devel] [RFC 0/1] conf/ucm: Add chtrt5645-mono-speaker-analog-mic configuration
by Hans de Goede 02 Jan '18

02 Jan '18

Hi All, Here is a patch which adds a configuration for Cherry Trail boards which use a rt5645 codec connected to a mono speaker and with an analog mic on IN2N + IN2P. The chtrt5645-mono-speaker-analog-mic/HiFi.conf for this is based on the latest version from https://github.com/plbossart/UCM/tree/master/chtrt5645 with all the unused input options removed and some changes made to make the analog mic work. This patch is currently RFC and should not be applied (yet) because it depends on a new "Int Analog Mic" DAPM widget for which kernel patches are pending upstream. Once the "Int Analog Mic" DAPM widget name is finalized this patch can be merged. This has been tested on the following devices: GPD win GPD pocket Teclast X80 Pro Regards, Hans

1 1

[alsa-devel] [PATCH 0/6] slimbus: sparse and CoverityScan fixes
by srinivas.kandagatla＠linaro.org 02 Jan '18

02 Jan '18

From: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> Hi Greg, Here are few patches which are submitted in the list few days back, these also fix some of the sparse errors reported. Thanks, Srini Colin Ian King (3): slimbus: avoid null pointer dereference on msg slimbus: fix retries comparison to correctly identify failed allocation slimbus: make functions slim_ack_txn and slim_alloc_txbuf static Wei Yongjun (3): slimbus: Use GFP_ATOMIC under spin lock slimbus: Fix missing unlock on error in slim_msg_response() slimbus: qcom: Fix return value check in qcom_slim_probe() drivers/slimbus/messaging.c | 8 +++++--- drivers/slimbus/qcom-ctrl.c | 13 +++++++------ 2 files changed, 12 insertions(+), 9 deletions(-) -- 2.15.0

1 6

[alsa-devel] [alsa-lib][PATCH] topology: Fix to skip writing of header for compound elements
by Guneshwor Singh 02 Jan '18

02 Jan '18

From: GuruprasadX Pawse <guruprasadx.pawse(a)intel.com> While calculating the size of data to be written into the topology binary file, the size of the compound elements is added as well. This results in wrong file offset calculation and topology build failure. The compound elements shouldn't be written to the topology as these are already embedded as part of other elements. So, skip adding the size of compound elements to the file offset size calculation. Signed-off-by: GuruprasadX Pawse <guruprasadx.pawse(a)intel.com> Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty(a)intel.com> Signed-off-by: Guneshwor Singh <guneshwor.o.singh(a)intel.com> --- src/topology/builder.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/topology/builder.c b/src/topology/builder.c index 997df0c7..5ae3ae89 100644 --- a/src/topology/builder.c +++ b/src/topology/builder.c @@ -95,6 +95,10 @@ static int write_elem_block(snd_tplg_t *tplg, list_for_each(pos, base) { /* find elems with the same index to make a block */ elem = list_entry(pos, struct tplg_elem, list); + + if (elem->compound_elem) + continue; + elem_next = list_entry(pos->next, struct tplg_elem, list); block_size += elem->size; count++; -- 2.15.1

2 1

[alsa-devel] [PATCH] ALSA: pcm: Set config update bits only when really changed
by Takashi Iwai 02 Jan '18

02 Jan '18

The PCM config space refine codes touch the parameter rmask and cmask bits when the given config parameter is changed. But in most places it checks only whether the changed value is non-zero or not, and they don't consider whether a negative error value is returned. This will lead to the incorrect update bits set upon the error path. Fix the codes to check properly the return code whether it's really updated or an error. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- This was found during looking at the hw_params WARN_ON() with aloop. It's likely harmless, but certainly a bug. sound/core/oss/pcm_oss.c | 10 +++++----- sound/core/pcm_lib.c | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c index e49f448ee04f..5d131088ac7c 100644 --- a/sound/core/oss/pcm_oss.c +++ b/sound/core/oss/pcm_oss.c @@ -186,7 +186,7 @@ static int _snd_pcm_hw_param_mask(struct snd_pcm_hw_params *params, { int changed; changed = snd_mask_refine(hw_param_mask(params, var), val); - if (changed) { + if (changed > 0) { params->cmask |= 1 << var; params->rmask |= 1 << var; } @@ -233,7 +233,7 @@ static int _snd_pcm_hw_param_min(struct snd_pcm_hw_params *params, val, open); else return -EINVAL; - if (changed) { + if (changed > 0) { params->cmask |= 1 << var; params->rmask |= 1 << var; } @@ -294,7 +294,7 @@ static int _snd_pcm_hw_param_max(struct snd_pcm_hw_params *params, val, open); else return -EINVAL; - if (changed) { + if (changed > 0) { params->cmask |= 1 << var; params->rmask |= 1 << var; } @@ -500,7 +500,7 @@ static int _snd_pcm_hw_param_set(struct snd_pcm_hw_params *params, } } else return -EINVAL; - if (changed) { + if (changed > 0) { params->cmask |= 1 << var; params->rmask |= 1 << var; } @@ -540,7 +540,7 @@ static int _snd_pcm_hw_param_setinteger(struct snd_pcm_hw_params *params, { int changed; changed = snd_interval_setinteger(hw_param_interval(params, var)); - if (changed) { + if (changed > 0) { params->cmask |= 1 << var; params->rmask |= 1 << var; } diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index 10e7ef7a8804..bfff8d001466 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c @@ -1603,7 +1603,7 @@ static int _snd_pcm_hw_param_first(struct snd_pcm_hw_params *params, changed = snd_interval_refine_first(hw_param_interval(params, var)); else return -EINVAL; - if (changed) { + if (changed > 0) { params->cmask |= 1 << var; params->rmask |= 1 << var; } @@ -1649,7 +1649,7 @@ static int _snd_pcm_hw_param_last(struct snd_pcm_hw_params *params, changed = snd_interval_refine_last(hw_param_interval(params, var)); else return -EINVAL; - if (changed) { + if (changed > 0) { params->cmask |= 1 << var; params->rmask |= 1 << var; } -- 2.15.1

1 0

[alsa-devel] [PATCH] ALSA: pcm: Remove incorrect snd_BUG_ON() usages
by Takashi Iwai 02 Jan '18

02 Jan '18

syzkaller triggered kernel warnings through PCM OSS emulation at closing a stream: WARNING: CPU: 0 PID: 3502 at sound/core/pcm_lib.c:1635 snd_pcm_hw_param_first+0x289/0x690 sound/core/pcm_lib.c:1635 Call Trace: .... snd_pcm_hw_param_near.constprop.27+0x78d/0x9a0 sound/core/oss/pcm_oss.c:457 snd_pcm_oss_change_params+0x17d3/0x3720 sound/core/oss/pcm_oss.c:969 snd_pcm_oss_make_ready+0xaa/0x130 sound/core/oss/pcm_oss.c:1128 snd_pcm_oss_sync+0x257/0x830 sound/core/oss/pcm_oss.c:1638 snd_pcm_oss_release+0x20b/0x280 sound/core/oss/pcm_oss.c:2431 __fput+0x327/0x7e0 fs/file_table.c:210 .... This happens while it tries to open and set up the aloop device concurrently. The warning above (invoked from snd_BUG_ON() macro) is to detect the unexpected logical error where snd_pcm_hw_refine() call shouldn't fail. The theory is true for the case where the hw_params config rules are static. But for an aloop device, the hw_params rule condition does vary dynamically depending on the connected target; when another device is opened and changes the parameters, the device connected in another side is also affected, and it caused the error from snd_pcm_hw_refine(). That is, the simplest "solution" for this is to remove the incorrect assumption of static rules, and treat such an error as a normal error path. As there are a couple of other places using snd_BUG_ON() incorrectly, this patch removes these spurious snd_BUG_ON() calls. Reported-by: syzbot+6f11c7e2a1b91d466432(a)syzkaller.appspotmail.com Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/core/oss/pcm_oss.c | 1 - sound/core/pcm_lib.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c index e49f448ee04f..ceaa51f76591 100644 --- a/sound/core/oss/pcm_oss.c +++ b/sound/core/oss/pcm_oss.c @@ -455,7 +455,6 @@ static int snd_pcm_hw_param_near(struct snd_pcm_substream *pcm, v = snd_pcm_hw_param_last(pcm, params, var, dir); else v = snd_pcm_hw_param_first(pcm, params, var, dir); - snd_BUG_ON(v < 0); return v; } diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index 10e7ef7a8804..db7894bb028c 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c @@ -1632,7 +1632,7 @@ int snd_pcm_hw_param_first(struct snd_pcm_substream *pcm, return changed; if (params->rmask) { int err = snd_pcm_hw_refine(pcm, params); - if (snd_BUG_ON(err < 0)) + if (err < 0) return err; } return snd_pcm_hw_param_value(params, var, dir); @@ -1678,7 +1678,7 @@ int snd_pcm_hw_param_last(struct snd_pcm_substream *pcm, return changed; if (params->rmask) { int err = snd_pcm_hw_refine(pcm, params); - if (snd_BUG_ON(err < 0)) + if (err < 0) return err; } return snd_pcm_hw_param_value(params, var, dir); -- 2.15.1

1 0

[alsa-devel] WARNING in snd_pcm_hw_param_first
by syzbot 02 Jan '18

02 Jan '18

Hello, syzkaller hit the following crash on 71ee203389f7cb1c1927eab22b95baa01405791c git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/master compiler: gcc (GCC) 7.1.1 20170620 .config is attached Raw console output is attached. C reproducer is attached syzkaller reproducer is attached. See https://goo.gl/kgGztJ for information about syzkaller reproducers IMPORTANT: if you fix the bug, please add the following tag to the commit: Reported-by: syzbot+6f11c7e2a1b91d466432(a)syzkaller.appspotmail.com It will help syzbot understand when the bug is fixed. See footer for details. If you forward the report, please keep this part and the footer. audit: type=1400 audit(1514740357.837:7): avc: denied { map } for pid=3502 comm="syzkaller781065" path="/root/syzkaller781065961" dev="sda1" ino=16481 scontext=unconfined_u:system_r:insmod_t:s0-s0:c0.c1023 tcontext=unconfined_u:object_r:user_home_t:s0 tclass=file permissive=1 WARNING: CPU: 0 PID: 3502 at sound/core/pcm_lib.c:1635 snd_pcm_hw_param_first+0x289/0x690 sound/core/pcm_lib.c:1635 Kernel panic - not syncing: panic_on_warn set ... CPU: 0 PID: 3502 Comm: syzkaller781065 Not tainted 4.15.0-rc5+ #154 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: __dump_stack lib/dump_stack.c:17 [inline] dump_stack+0x194/0x257 lib/dump_stack.c:53 panic+0x1e4/0x41c kernel/panic.c:183 __warn+0x1dc/0x200 kernel/panic.c:547 report_bug+0x211/0x2d0 lib/bug.c:184 fixup_bug.part.11+0x37/0x80 arch/x86/kernel/traps.c:178 fixup_bug arch/x86/kernel/traps.c:247 [inline] do_error_trap+0x2d7/0x3e0 arch/x86/kernel/traps.c:296 do_invalid_op+0x1b/0x20 arch/x86/kernel/traps.c:315 invalid_op+0x22/0x40 arch/x86/entry/entry_64.S:1079 RIP: 0010:snd_pcm_hw_param_first+0x289/0x690 sound/core/pcm_lib.c:1635 RSP: 0018:ffff8801c013f1a0 EFLAGS: 00010293 RAX: ffff8801c03bc3c0 RBX: ffff8801bff08dc0 RCX: ffffffff841bee19 RDX: 0000000000000000 RSI: 00000000ffffffea RDI: ffffed0038027e28 RBP: ffff8801c013f1f0 R08: ffffed0038027d63 R09: ffff8801c013eb10 R10: 0000000000000001 R11: ffffed0038027d62 R12: 000000000000000d R13: 00000000ffffffea R14: 0000000000000005 R15: 0000000000002000 snd_pcm_hw_param_near.constprop.27+0x78d/0x9a0 sound/core/oss/pcm_oss.c:457 snd_pcm_oss_change_params+0x17d3/0x3720 sound/core/oss/pcm_oss.c:969 snd_pcm_oss_make_ready+0xaa/0x130 sound/core/oss/pcm_oss.c:1128 snd_pcm_oss_sync+0x257/0x830 sound/core/oss/pcm_oss.c:1638 snd_pcm_oss_release+0x20b/0x280 sound/core/oss/pcm_oss.c:2431 __fput+0x327/0x7e0 fs/file_table.c:210 ____fput+0x15/0x20 fs/file_table.c:244 task_work_run+0x199/0x270 kernel/task_work.c:113 exit_task_work include/linux/task_work.h:22 [inline] do_exit+0x9bb/0x1ad0 kernel/exit.c:865 do_group_exit+0x149/0x400 kernel/exit.c:968 SYSC_exit_group kernel/exit.c:979 [inline] SyS_exit_group+0x1d/0x20 kernel/exit.c:977 do_syscall_32_irqs_on arch/x86/entry/common.c:327 [inline] do_fast_syscall_32+0x3ee/0xf9d arch/x86/entry/common.c:389 entry_SYSENTER_compat+0x54/0x63 arch/x86/entry/entry_64_compat.S:129 RIP: 0023:0xf7f4ec79 RSP: 002b:00000000ffc2c18c EFLAGS: 00000292 ORIG_RAX: 00000000000000fc RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00000000080f0298 RDX: 0000000000000000 RSI: 00000000080d9b78 RDI: 00000000080f02a0 RBP: 0000000000000001 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000000000 R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000 Dumping ftrace buffer: (ftrace buffer empty) Kernel Offset: disabled Rebooting in 86400 seconds.. --- This bug is generated by a dumb bot. It may contain errors. See https://goo.gl/tpsmEJ for details. Direct all questions to syzkaller(a)googlegroups.com. syzbot will keep track of this bug report. If you forgot to add the Reported-by tag, once the fix for this bug is merged into any tree, please reply to this email with: #syz fix: exact-commit-title If you want to test a patch for this bug, please reply with: #syz test: git://repo/address.git branch and provide the patch inline or as an attachment. To mark this as a duplicate of another syzbot report, please reply with: #syz dup: exact-subject-of-another-report If it's a one-off invalid bug report, please reply with: #syz invalid Note: if the crash happens again, it will cause creation of a new bug report. Note: all commands must start from beginning of the line in the email body.

3 4

[alsa-devel] [PATCH] slimbus: qcom-ctrl: use normal allocation
by Arnd Bergmann 02 Jan '18

02 Jan '18

The previous patch addressed a warning but not the cause: drivers/slimbus/qcom-ctrl.c: In function 'qcom_slim_probe': drivers/slimbus/qcom-ctrl.c:584:9: error: passing argument 3 of 'dmam_alloc_coherent' from incompatible pointer type [-Werror=incompatible-pointer-types] There are two things wrong here: - The naming is very confusing, we now have a member named 'phys' that doesn't refer to a phys_addr_t but a dma_addr_t. If we needed a dma address, it should be named 'dma' to avoid confusion, and to make it less likely that someone passes it into a function that expects a physical address. - The dma address is not used at all at this point. It may have been designed to support DMA in the future, but today it doesn't, so the only effect right now is to make transfers artificially slower by using uncached memory instead of cached memory for a temporary buffer. This removes the unused structure member and instead changes the code to call devm_kcalloc(), which matches the usage of the 'base' pointer as an array of temporary buffers. Fixes: db809859c8ce ("slimbus: qcom: fix incompatible pointer warning") Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- drivers/slimbus/qcom-ctrl.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/slimbus/qcom-ctrl.c b/drivers/slimbus/qcom-ctrl.c index f51de1277912..fb1a5e0eb8dd 100644 --- a/drivers/slimbus/qcom-ctrl.c +++ b/drivers/slimbus/qcom-ctrl.c @@ -13,7 +13,6 @@ #include <linux/delay.h> #include <linux/clk.h> #include <linux/of.h> -#include <linux/dma-mapping.h> #include <linux/pm_runtime.h> #include "slimbus.h" @@ -93,7 +92,6 @@ struct slim_ctrl_buf { void *base; - dma_addr_t phy; spinlock_t lock; int head; int tail; @@ -579,17 +577,15 @@ static int qcom_slim_probe(struct platform_device *pdev) if (ret) goto err_rclk_enable_failed; - ctrl->tx.base = dmam_alloc_coherent(&pdev->dev, - (ctrl->tx.sl_sz * ctrl->tx.n), - &ctrl->tx.phy, GFP_KERNEL); + ctrl->tx.base = devm_kcalloc(&pdev->dev, ctrl->tx.n, ctrl->tx.sl_sz, + GFP_KERNEL); if (!ctrl->tx.base) { ret = -ENOMEM; goto err; } - ctrl->rx.base = dmam_alloc_coherent(&pdev->dev, - (ctrl->rx.sl_sz * ctrl->rx.n), - &ctrl->rx.phy, GFP_KERNEL); + ctrl->rx.base = devm_kcalloc(&pdev->dev,ctrl->rx.n, ctrl->rx.sl_sz, + GFP_KERNEL); if (!ctrl->rx.base) { ret = -ENOMEM; goto err; -- 2.9.0

1 0