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

[PATCH 0/6] spelling: Fix typo related to "arbitrary"
by Naoki Hayama 08 Oct '20

08 Oct '20

I found some typos related to "arbitrary". s/abitrary/arbitrary/ s/arbitary/arbitrary/ This series fixes them. These typos have been reported in the past in other codes, but correction 'abitrary||arbitrary' wasn't added to scripts/spelling.txt. Therefore, PATCH #6 adds it to spelling.txt. Naoki Hayama (6): net: tlan: Fix typo abitrary dt-bindings: pinctrl: qcom: Fix typo abitrary dt-bindings: pinctrl: sirf: Fix typo abitrary ALSA: hdspm: Fix typo arbitary drm/etnaviv: Fix typo arbitary scripts/spelling.txt: Add arbitrary correction Documentation/devicetree/bindings/pinctrl/pinctrl-atlas7.txt | 2 +- .../devicetree/bindings/pinctrl/qcom,ipq4019-pinctrl.txt | 2 +- drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 2 +- drivers/net/ethernet/ti/tlan.c | 2 +- scripts/spelling.txt | 1 + sound/pci/rme9652/hdspm.c | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) -- 2.17.1

1 0

[PATCH 0/6] Ancillary bus implementation and SOF multi-client support
by Dave Ertman 07 Oct '20

07 Oct '20

Brief history of Ancillary Bus ============================== The ancillary bus code was originally submitted upstream as virtual bus, and was submitted through the netdev tree.  This process generated up to v4.  This discussion can be found here: https://lore.kernel.org/netdev/0200520070227.3392100-2-jeffrey.t.kirsher@in… At this point, GregKH requested that we take the review and revision process to an internal mailing list and garner the buy-in of a respected kernel contributor. The ancillary bus (then known as virtual bus) was originally submitted along with implementation code for the ice driver and irdma drive, causing the complication of also having dependencies in the rdma tree. This new submission is utilizing an ancillary bus consumer in only the sound driver tree to create the initial implementation and a single user. Since implementation work has started on this patch set, there have been multiple inquiries about the time frame of its completion. It appears that there will be numerous consumers of this functionality. The process of internal review and implementation using the sound drivers generated 19 internal versions.  The changes, including the name change from virtual bus to ancillary bus, from these versions can be summarized as the following: - Fixed compilation and checkpatch errors - Improved documentation to address the motivation for virtual bus. - Renamed virtual bus to ancillary bus - increased maximum device name size - Correct order in Kconfig and Makefile - removed the mid-layer adev->release layer for device unregister - pushed adev->id management to parent driver - all error paths out of ancillary_device_register return error code - all error paths out of ancillary_device_register use put_device - added adev->name element - modname in register cannot be NULL - added KBUILD_MODNAME as prefix for match_name - push adev->id responsibility to registering driver - uevent now parses adev->dev name - match_id function now parses adev->dev name - changed drivers probe function to also take an ancillary_device_id param - split ancillary_device_register into device_initialize and device_add - adjusted what is done in device_initialize and device_add - change adev to ancildev and adrv to ancildrv - change adev to ancildev in documentation This submission is the first time that this patch set will be sent to the alsa-devel mailing list, so it is currently being submitted as version 1. ========================== Introduces the ancillary bus implementation along with the example usage in the Sound Open Firmware(SOF) audio driver. In some subsystems, the functionality of the core device (PCI/ACPI/other) may be too complex for a single device to be managed as a monolithic block or a part of the functionality might need to be exposed to a different subsystem. Splitting the functionality into smaller orthogonal devices makes it easier to manage data, power management and domain-specific communication with the hardware. Also, common ancillary_device functionality across primary devices can be handled by a common ancillary_device. A key requirement for such a split is that there is no dependency on a physical bus, device, register accesses or regmap support. These individual devices split from the core cannot live on the platform bus as they are not physical devices that are controlled by DT/ACPI. The same argument applies for not using MFD in this scenario as it relies on individual function devices being physical devices that are DT enumerated. An example for this kind of requirement is the audio subsystem where a single IP handles multiple entities such as HDMI, Soundwire, local devices such as mics/speakers etc. The split for the core's functionality can be arbitrary or be defined by the DSP firmware topology and include hooks for test/debug. This allows for the audio core device to be minimal and tightly coupled with handling the hardware-specific logic and communication. The ancillary bus is intended to be minimal, generic and avoid domain-specific assumptions. Each ancillary bus device represents a part of its parent functionality. The generic behavior can be extended and specialized as needed by encapsulating an ancillary bus device within other domain-specific structures and the use of .ops callbacks. The SOF driver adopts the ancillary bus for implementing the multi-client support. A client in the context of the SOF driver represents a part of the core device's functionality. It is not a physical device but rather an ancillary device that needs to communicate with the DSP via IPCs. With multi-client support,the sound card can be separated into multiple orthogonal ancillary devices for local devices (mic/speakers etc), HDMI, sensing, probes, debug etc. In this series, we demonstrate the usage of the ancillary bus with the help of the IPC test client which is used for testing the serialization of IPCs when multiple clients talk to the DSP at the same time. Dave Ertman (1): Add ancillary bus support Fred Oh (1): ASoC: SOF: debug: Remove IPC flood test support in SOF core Ranjani Sridharan (4): ASoC: SOF: Introduce descriptors for SOF client ASoC: SOF: Create client driver for IPC test ASoC: SOF: ops: Add ops for client registration ASoC: SOF: Intel: Define ops for client registration Documentation/driver-api/ancillary_bus.rst | 230 +++++++++++++++ Documentation/driver-api/index.rst | 1 + drivers/bus/Kconfig | 3 + drivers/bus/Makefile | 3 + drivers/bus/ancillary.c | 191 +++++++++++++ include/linux/ancillary_bus.h | 58 ++++ include/linux/mod_devicetable.h | 8 + scripts/mod/devicetable-offsets.c | 3 + scripts/mod/file2alias.c | 8 + sound/soc/sof/Kconfig | 29 +- sound/soc/sof/Makefile | 7 + sound/soc/sof/core.c | 12 + sound/soc/sof/debug.c | 230 --------------- sound/soc/sof/intel/Kconfig | 9 + sound/soc/sof/intel/Makefile | 3 + sound/soc/sof/intel/apl.c | 18 ++ sound/soc/sof/intel/bdw.c | 18 ++ sound/soc/sof/intel/byt.c | 22 ++ sound/soc/sof/intel/cnl.c | 18 ++ sound/soc/sof/intel/intel-client.c | 49 ++++ sound/soc/sof/intel/intel-client.h | 26 ++ sound/soc/sof/ops.h | 14 + sound/soc/sof/sof-client.c | 117 ++++++++ sound/soc/sof/sof-client.h | 65 +++++ sound/soc/sof/sof-ipc-test-client.c | 314 +++++++++++++++++++++ sound/soc/sof/sof-priv.h | 16 +- 26 files changed, 1233 insertions(+), 239 deletions(-) create mode 100644 Documentation/driver-api/ancillary_bus.rst create mode 100644 drivers/bus/ancillary.c create mode 100644 include/linux/ancillary_bus.h create mode 100644 sound/soc/sof/intel/intel-client.c create mode 100644 sound/soc/sof/intel/intel-client.h create mode 100644 sound/soc/sof/sof-client.c create mode 100644 sound/soc/sof/sof-client.h create mode 100644 sound/soc/sof/sof-ipc-test-client.c -- 2.26.2

12 98

[PATCH] ALSA: bebob: potential info leak in hwdep_read()
by Dan Carpenter 07 Oct '20

07 Oct '20

The "count" variable needs to be capped on every path so that we don't copy too much information to the user. Fixes: 618eabeae711 ("ALSA: bebob: Add hwdep interface") Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> --- sound/firewire/bebob/bebob_hwdep.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/firewire/bebob/bebob_hwdep.c b/sound/firewire/bebob/bebob_hwdep.c index 45b740f44c45..c362eb38ab90 100644 --- a/sound/firewire/bebob/bebob_hwdep.c +++ b/sound/firewire/bebob/bebob_hwdep.c @@ -36,12 +36,11 @@ hwdep_read(struct snd_hwdep *hwdep, char __user *buf, long count, } memset(&event, 0, sizeof(event)); + count = min_t(long, count, sizeof(event.lock_status)); if (bebob->dev_lock_changed) { event.lock_status.type = SNDRV_FIREWIRE_EVENT_LOCK_STATUS; event.lock_status.status = (bebob->dev_lock_count > 0); bebob->dev_lock_changed = false; - - count = min_t(long, count, sizeof(event.lock_status)); } spin_unlock_irq(&bebob->lock); -- 2.28.0

3 3

[PATCH] ALSA: hda/realtek: Enable audio jacks of ASUS D700SA with ALC887
by Jian-Hong Pan 07 Oct '20

07 Oct '20

The ASUS D700SA desktop's audio (1043:2390) with ALC887 cannot detect the headset microphone and another headphone jack until ALC887_FIXUP_ASUS_HMIC and ALC887_FIXUP_ASUS_AUDIO quirks are applied. The NID 0x15 maps as the headset microphone and NID 0x19 maps as another headphone jack. Also need the function like alc887_fixup_asus_jack to enable the audio jacks. Signed-off-by: Jian-Hong Pan <jhp(a)endlessos.org> Signed-off-by: Kailang Yang <kailang(a)realtek.com> --- sound/pci/hda/patch_realtek.c | 41 +++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index d4f17b465892..8d0928bdc9ff 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -1929,6 +1929,8 @@ enum { ALC1220_FIXUP_CLEVO_P950, ALC1220_FIXUP_CLEVO_PB51ED, ALC1220_FIXUP_CLEVO_PB51ED_PINS, + ALC887_FIXUP_ASUS_AUDIO, + ALC887_FIXUP_ASUS_HMIC, }; static void alc889_fixup_coef(struct hda_codec *codec, @@ -2141,6 +2143,30 @@ static void alc1220_fixup_clevo_pb51ed(struct hda_codec *codec, alc_fixup_headset_mode_no_hp_mic(codec, fix, action); } +static void alc887_asus_hp_automute_hook(struct hda_codec *codec, + struct hda_jack_callback *jack) +{ + struct alc_spec *spec = codec->spec; + int vref; + + snd_hda_gen_hp_automute(codec, jack); + + vref = spec->gen.hp_jack_present ? 0xc4 : 0xc0; + snd_hda_codec_write(codec, 0x19, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, + vref); +} + +static void alc887_fixup_asus_jack(struct hda_codec *codec, + const struct hda_fixup *fix, int action) +{ + struct alc_spec *spec = codec->spec; + if (action != HDA_FIXUP_ACT_PROBE) + return; + snd_hda_codec_write(codec, 0x1b, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, + 0xc0); + spec->gen.hp_automute_hook = alc887_asus_hp_automute_hook; +} + static const struct hda_fixup alc882_fixups[] = { [ALC882_FIXUP_ABIT_AW9D_MAX] = { .type = HDA_FIXUP_PINS, @@ -2398,6 +2424,20 @@ static const struct hda_fixup alc882_fixups[] = { .chained = true, .chain_id = ALC1220_FIXUP_CLEVO_PB51ED, }, + [ALC887_FIXUP_ASUS_AUDIO] = { + .type = HDA_FIXUP_PINS, + .v.pins = (const struct hda_pintbl[]) { + { 0x15, 0x02a14150 }, /* use as headset mic, without its own jack detect */ + { 0x19, 0x22219420 }, + {} + }, + }, + [ALC887_FIXUP_ASUS_HMIC] = { + .type = HDA_FIXUP_FUNC, + .v.func = alc887_fixup_asus_jack, + .chained = true, + .chain_id = ALC887_FIXUP_ASUS_AUDIO, + }, }; static const struct snd_pci_quirk alc882_fixup_tbl[] = { @@ -2431,6 +2471,7 @@ static const struct snd_pci_quirk alc882_fixup_tbl[] = { SND_PCI_QUIRK(0x1043, 0x13c2, "Asus A7M", ALC882_FIXUP_EAPD), SND_PCI_QUIRK(0x1043, 0x1873, "ASUS W90V", ALC882_FIXUP_ASUS_W90V), SND_PCI_QUIRK(0x1043, 0x1971, "Asus W2JC", ALC882_FIXUP_ASUS_W2JC), + SND_PCI_QUIRK(0x1043, 0x2390, "Asus D700SA", ALC887_FIXUP_ASUS_HMIC), SND_PCI_QUIRK(0x1043, 0x835f, "Asus Eee 1601", ALC888_FIXUP_EEE1601), SND_PCI_QUIRK(0x1043, 0x84bc, "ASUS ET2700", ALC887_FIXUP_ASUS_BASS), SND_PCI_QUIRK(0x1043, 0x8691, "ASUS ROG Ranger VIII", ALC882_FIXUP_GPIO3), -- 2.28.0

2 3

[PATCH] ALSA: usb-audio: ignore broken processing/extension unit
by tom.ty89＠gmail.com 07 Oct '20

07 Oct '20

From: Tom Yan <tom.ty89(a)gmail.com> Some devices have broken extension unit where getting current value doesn't work. Attempt that once when creating mixer control for it. If it fails, just ignore it, so that it won't cripple the device entirely (and/or make the error floods). Signed-off-by: Tom Yan <tom.ty89(a)gmail.com> --- sound/usb/mixer.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index eab0fd4fd7c3..e0b7174c1043 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -2367,7 +2367,7 @@ static int build_audio_procunit(struct mixer_build *state, int unitid, int num_ins; struct usb_mixer_elem_info *cval; struct snd_kcontrol *kctl; - int i, err, nameid, type, len; + int i, err, nameid, type, len, val; const struct procunit_info *info; const struct procunit_value_info *valinfo; const struct usbmix_name_map *map; @@ -2470,6 +2470,12 @@ static int build_audio_procunit(struct mixer_build *state, int unitid, break; } + err = get_cur_ctl_value(cval, cval->control << 8, &val); + if (err < 0) { + usb_mixer_elem_info_free(cval); + return -EINVAL; + } + kctl = snd_ctl_new1(&mixer_procunit_ctl, cval); if (!kctl) { usb_mixer_elem_info_free(cval); -- 2.28.0

3 2

[PATCH] ASoC: omap-mcbsp: Fix use of uninitialised pointer
by Alex Dewar 07 Oct '20

07 Oct '20

Commit 9c34d023dc35 ("ASoC: omap-mcbsp: Re-arrange files for core McBSP and Sidetone function split"), in rearranging various files, also replaced calls to platform_get_resource_by_name() + devm_ioremap_resource() with a single call to devm_platform_ioremap_resource_byname(). However, the struct resource is needed as we access its members so at present a null pointer is dereferenced. Fix by doing things the old way. Addresses-Coverity-ID: 1497530 ("Memory - illegal accesses") Fixes: 9c34d023dc35 ("ASoC: omap-mcbsp: Re-arrange files for core McBSP and Sidetone function split") Signed-off-by: Alex Dewar <alex.dewar90(a)gmail.com> --- sound/soc/ti/omap-mcbsp.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sound/soc/ti/omap-mcbsp.c b/sound/soc/ti/omap-mcbsp.c index 186cea91076f..6025b30bbe77 100644 --- a/sound/soc/ti/omap-mcbsp.c +++ b/sound/soc/ti/omap-mcbsp.c @@ -620,7 +620,11 @@ static int omap_mcbsp_init(struct platform_device *pdev) spin_lock_init(&mcbsp->lock); mcbsp->free = true; - mcbsp->io_base = devm_platform_ioremap_resource_byname(pdev, "mpu"); + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mpu"); + if (!res) + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + + mcbsp->io_base = devm_ioremap_resource(&pdev->dev, res); if (IS_ERR(mcbsp->io_base)) return PTR_ERR(mcbsp->io_base); -- 2.28.0

3 2

[PATCH v10 0/7] Qualcomm's lpass-hdmi ASoC driver to support audio over dp port
by Srinivasa Rao Mandadapu 07 Oct '20

07 Oct '20

These patches are to support audio over DP port on Qualcomm's SC7180 LPASS Asoc. It includes machine driver, cpu driver, platform driver updates for HDMI path support, device tree documention, lpass variant structure optimization and configuration changes. These patches depends on the DP patch series https://patchwork.kernel.org/project/dri-devel/list/?series=332029 https://lore.kernel.org/patchwork/project/lkml/list/?series=464856 changes since V9: -- Removed unused structures lpass_hdmi.h changes since V8: -- Removed redundant structure wrapper for reg map field memebrs -- Updated lpass_hdmi_regmap_volatile API with appropriate registers as true and others as false. changes since V7: -- Fixed typo errors -- Created Separate patch for buffer size change changes since V6: -- Removed compile time define flag, which used for enabling HDMI code, based on corresponding config param is included. -- Updated reg map alloc API with reg map bulk API. -- Removed unnecessary line splits changes since V5: -- Removed unused struct regmap *map in lpass_platform_alloc_hdmidmactl_fields. -- DMA alloc and free API signature change in lpass-apq8016.c, lpass-ipq806x.c -- Keeping API "irqreturn_t lpass_platform_hdmiif_irq" under ifdef macro Changes Since v4: -- Updated with single compatible node for both I2S and HDMI. Changes Since v3: -- Removed id in lpass variant structure and used snd_soc_dai_driver id. Changes Since v2: -- Audio buffer size(i.e. LPASS_PLATFORM_BUFFER_SIZE) in lpass-platform.c increased. Changes Since v1: -- Commit messages are updated -- Addressed Rob Herring review comments V Sujith Kumar Reddy (8): ASoC: Add sc7180-lpass binding header hdmi define ASoC: dt-bindings: Add dt binding for lpass hdmi Asoc:qcom:lpass-cpu:Update dts property read API Asoc: qcom: lpass:Update lpaif_dmactl members order ASoC: qcom: Add support for lpass hdmi driver Asoc: qcom: lpass-platform : Increase buffer size ASoC: qcom: sc7180: Add support for audio over DP .../devicetree/bindings/sound/qcom,lpass-cpu.yaml | 74 +++- include/dt-bindings/sound/sc7180-lpass.h | 1 + sound/soc/qcom/Kconfig | 5 + sound/soc/qcom/Makefile | 2 + sound/soc/qcom/lpass-apq8016.c | 4 +- sound/soc/qcom/lpass-cpu.c | 53 ++- sound/soc/qcom/lpass-hdmi.c | 468 +++++++++++++++++++++ sound/soc/qcom/lpass-hdmi.h | 106 +++++ sound/soc/qcom/lpass-ipq806x.c | 4 +- sound/soc/qcom/lpass-lpaif-reg.h | 52 ++- sound/soc/qcom/lpass-platform.c | 403 ++++++++++++++---- sound/soc/qcom/lpass-sc7180.c | 116 ++++- sound/soc/qcom/lpass.h | 119 +++++- 13 files changed, 1262 insertions(+), 145 deletions(-) create mode 100644 sound/soc/qcom/lpass-hdmi.c create mode 100644 sound/soc/qcom/lpass-hdmi.h -- Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc., is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.

2 9

Fwd: [alsa-devel] trying to get an eleven rack to work
by Jerzy Dubin 07 Oct '20

07 Oct '20

Hello Clemens, any news in this topics : https://mailman.alsa-project.org/pipermail/alsa-devel/2012-April/050944.html https://www.alsa-project.org/pipermail/alsa-devel/2012-March/050649.html I tried to get it work and added in sound/usb/quirks-table.h |USB_DEVICE_VENDOR_SPEC(0x0dba, 0xb011), .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { .vendor_name = "Digidesign", .product_name = "Eleven Rack", .ifnum = QUIRK_ANY_INTERFACE, .type = QUIRK_COMPOSITE, .data = & (const struct snd_usb_audio_quirk[]) { { .ifnum = 1, .type = QUIRK_AUDIO_STANDARD_MIXER }, { .ifnum = 3, .type = QUIRK_AUDIO_STANDARD_INTERFACE }, { .ifnum = 4, .type = QUIRK_AUDIO_STANDARD_INTERFACE }, { .ifnum = -1 } } } } Then there was problem with sample rates(|||unable to retrieve number of sample rates| ) so i modified |sound/usb/format.c (i have checked sample rates on device): |if (ret < 0) { switch (chip->usb_id) { case USB_ID(0x0dba, 0xb011): /* Eleven Rack */ dev_info(&dev->dev, "%s(): Eleven Rack: unable to retrieve number of sample rates. Set it to default value (clock %d).\n",__func__, clock); fp->nr_rates = 1; fp->rate_min = 44100; fp->rate_max = 44100; fp->rates = SNDRV_PCM_RATE_44100; fp->rate_table = kmalloc(sizeof(int), GFP_KERNEL); if (!fp->rate_table) { ret = -ENOMEM; goto err_free; } fp->rate_table[0] = 44100; return 0; default: dev_err(&dev->dev, "%s(): unable to retrieve number of sample rates (clock %d)\n", __func__, clock); goto err; } } Now im getting : ||[ 152.114655] usb 1-4: new high-speed USB device number 6 using xhci_hcd [ 152.268388] usb 1-4: New USB device found, idVendor=0dba, idProduct=b011, bcdDevice=20.01 [ 152.268393] usb 1-4: New USB device strings: Mfr=1, Product=2, SerialNumber=0 [ 152.268395] usb 1-4: Product: Eleven Rack [ 152.268397] usb 1-4: Manufacturer: Digidesign [ 152.311112] usb 1-4: parse_audio_format_rates_v2v3(): Eleven Rack: unable to retrieve number of sample rates. Set it to default value (clock 129). [ 152.312918] usb 1-4: 4:1: cannot set enable PITCH (v2) [ 152.316184] usbcore: registered new interface driver snd-usb-audio [ 152.364920] usb 1-4: 4:1: cannot set enable PITCH (v2) [ 152.366262] usb 1-4: 4:1: cannot set enable PITCH (v2) [ 152.366991] usb 1-4: 4:1: cannot set enable PITCH (v2) [ 152.367432] usb 1-4: 4:1: cannot set enable PITCH (v2) [ 152.368070] usb 1-4: 4:1: cannot set enable PITCH (v2) [ 152.371067] usb 1-4: 4:1: cannot set enable PITCH (v2) [ 152.372155] usb 1-4: 4:1: cannot set enable PITCH (v2) [ 152.372496] usb 1-4: 4:1: cannot set enable PITCH (v2) [ 152.373180] usb 1-4: 4:1: cannot set enable PITCH (v2) [ 152.373894] usb 1-4: 4:1: cannot set enable PITCH (v2) [ 152.376748] usb 1-4: 4:1: cannot set enable PITCH (v2) [ 152.377498] usb 1-4: 4:1: cannot set enable PITCH (v2) [ 152.378690] usb 1-4: 4:1: cannot set enable PITCH (v2) Should i still wait for backend infrastructure ? Or there is something what i can do here ? Regards, Jurek |||||

1 0

[PATCH 1/2] ASoC: fsl: fsl_ssi: add ac97 fixed mode support
by Primoz Fiser 07 Oct '20

07 Oct '20

SSI supports "variable" and "fixed" mode of operation in AC'97 mode. Up to now, driver always configured SSI port to operate in "variable" AC'97 mode which is known to be unreliable with some CODECs, see: commit 01ca485171e3 ("ASoC: fsl_ssi: only enable proper channel slots in AC'97 mode") for more information on issues related to spurious SLOTREQ bits. But in summary, when SSI operates in AC'97 variable mode of operation, CODECs can sometimes send SLOTREQ bits for non-existent audio slots which then "stick" in SSI and completely break audio output. Contrary when operating SSI in AC'97 fixed mode, described issues were completely gone! Thus add support for operating SSI in AC'97 Fixed Mode of operation which provides better audio reliability when compared to AC'97 Variable Mode with some CODECs. Signed-off-by: Primoz Fiser <primoz.fiser(a)norik.com> --- sound/soc/fsl/fsl_ssi.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index 404be27c15fe..3b89785f6de8 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -243,6 +243,7 @@ struct fsl_ssi_soc_data { * @dma_maxburst: Max number of words to transfer in one go. So far, * this is always the same as fifo_watermark. * @ac97_reg_lock: Mutex lock to serialize AC97 register access operations + * @ac97_fixed_mode: SSI in AC97 fixed mode of operation */ struct fsl_ssi { struct regmap *regs; @@ -287,6 +288,7 @@ struct fsl_ssi { u32 dma_maxburst; struct mutex ac97_reg_lock; + bool ac97_fixed_mode; }; /* @@ -616,7 +618,12 @@ static void fsl_ssi_setup_ac97(struct fsl_ssi *ssi) regmap_write(regs, REG_SSI_SRCCR, SSI_SxCCR_WL(17) | SSI_SxCCR_DC(13)); /* Enable AC97 mode and startup the SSI */ - regmap_write(regs, REG_SSI_SACNT, SSI_SACNT_AC97EN | SSI_SACNT_FV); + if (ssi->ac97_fixed_mode) { + regmap_write(regs, REG_SSI_SACNT, SSI_SACNT_AC97EN); + regmap_write(regs, REG_SSI_SATAG, 0x9800); + } else + regmap_write(regs, REG_SSI_SACNT, + SSI_SACNT_AC97EN | SSI_SACNT_FV); /* AC97 has to communicate with codec before starting a stream */ regmap_update_bits(regs, REG_SSI_SCR, @@ -1092,8 +1099,10 @@ static int fsl_ssi_trigger(struct snd_pcm_substream *substream, int cmd, * send valid data to slots other than normal playback slots. * * To be safe, configure SACCST right before TX starts. + * + * Above applies only when SSI operates in AC97 Variable Mode. */ - if (tx && fsl_ssi_is_ac97(ssi)) + if (tx && fsl_ssi_is_ac97(ssi) && !ssi->ac97_fixed_mode) fsl_ssi_tx_ac97_saccst_setup(ssi); fsl_ssi_config_enable(ssi, tx); break; @@ -1437,6 +1446,11 @@ static int fsl_ssi_probe_from_dt(struct fsl_ssi *ssi) ssi->synchronous = true; } + /* Check AC97 mode of operation */ + sprop = of_get_property(np, "fsl,ac97-mode", NULL); + if (sprop && !strcmp(sprop, "fixed")) + ssi->ac97_fixed_mode = true; + /* Select DMA or FIQ */ ssi->use_dma = !of_property_read_bool(np, "fsl,fiq-stream-filter"); -- 2.25.1

5 10

Re: linux-next: Tree for Oct 6 (sound/soc/intel/catpt/device.c)
by Randy Dunlap 06 Oct '20

06 Oct '20

On 10/6/20 5:12 AM, Stephen Rothwell wrote: > Hi all, > > Changes since 20201002: > on x86_64 or i386: when CONFIG_MODULES is not set/enabled: ../sound/soc/intel/catpt/device.c: In function ‘catpt_resume’: ../sound/soc/intel/catpt/device.c:84:7: error: implicit declaration of function ‘module_is_live’; did you mean ‘module_driver’? [-Werror=implicit-function-declaration] if (!module_is_live(dev->driver->owner)) { ^~~~~~~~~~~~~~ module_driver You could see commit cdb685cb9158fa67f6f4584ea39279ed7ae39253 Author: Danil Kipnis <danil.kipnis(a)cloud.ionos.com> Date: Thu May 21 20:59:09 2020 +0200 RDMA/rnbd: Fix compilation error when CONFIG_MODULES is disabled for a possible fix. -- ~Randy Reported-by: Randy Dunlap <rdunlap(a)infradead.org>

1 1