Changes in 4.9.207 arm64: tegra: Fix 'active-low' warning for Jetson TX1 regulator usb: gadget: u_serial: add missing port entry locking tty: serial: fsl_lpuart: use the sg count from dma_map_sg tty: serial: msm_serial: Fix flow control serial: pl011: Fix DMA ->flush_buffer() serial: serial_core: Perform NULL checks for break_ctl ops serial: ifx6x60: add missed pm_runtime_disable autofs: fix a leak in autofs_expire_indirect() RDMA/hns: Correct the value of HNS_ROCE_HEM_CHUNK_LEN exportfs_decode_fh(): negative pinned may become positive without the parent locked audit_get_nd(): don't unlock parent too early NFC: nxp-nci: Fix NULL pointer dereference after I2C communication error Input: cyttsp4_core - fix use after free bug ALSA: pcm: Fix stream lock usage in snd_pcm_period_elapsed() rsxx: add missed destroy_workqueue calls in remove net: ep93xx_eth: fix mismatch of request_mem_region in remove serial: core: Allow processing sysrq at port unlock time cxgb4vf: fix memleak in mac_hlist initialization iwlwifi: mvm: Send non offchannel traffic via AP sta ARM: 8813/1: Make aligned 2-byte getuser()/putuser() atomic on ARMv6+ net/mlx5: Release resource on error flow extcon: max8997: Fix lack of path setting in USB device mode clk: rockchip: fix rk3188 sclk_smc gate data clk: rockchip: fix rk3188 sclk_mac_lbtest parameter ordering ARM: dts: rockchip: Fix rk3288-rock2 vcc_flash name dlm: fix missing idr_destroy for recover_idr MIPS: SiByte: Enable ZONE_DMA32 for LittleSur scsi: zfcp: drop default switch case which might paper over missing case pinctrl: qcom: ssbi-gpio: fix gpio-hog related boot issues Staging: iio: adt7316: Fix i2c data reading, set the data field regulator: Fix return value of _set_load() stub MIPS: OCTEON: octeon-platform: fix typing math-emu/soft-fp.h: (_FP_ROUND_ZERO) cast 0 to void to fix warning rtc: max8997: Fix the returned value in case of error in 'max8997_rtc_read_alarm()' rtc: dt-binding: abx80x: fix resistance scale ARM: dts: exynos: Use Samsung SoC specific compatible for DWC2 module media: pulse8-cec: return 0 when invalidating the logical address dmaengine: coh901318: Fix a double-lock bug dmaengine: coh901318: Remove unused variable usb: dwc3: don't log probe deferrals; but do log other error codes ACPI: fix acpi_find_child_device() invocation in acpi_preset_companion() dma-mapping: fix return type of dma_set_max_seg_size() altera-stapl: check for a null key before strcasecmp'ing it serial: imx: fix error handling in console_setup i2c: imx: don't print error message on probe defer dlm: NULL check before kmem_cache_destroy is not needed ARM: debug: enable UART1 for socfpga Cyclone5 nfsd: fix a warning in __cld_pipe_upcall() ARM: OMAP1/2: fix SoC name printing net/x25: fix called/calling length calculation in x25_parse_address_block net/x25: fix null_x25_address handling ARM: dts: mmp2: fix the gpio interrupt cell number ARM: dts: realview-pbx: Fix duplicate regulator nodes tcp: fix off-by-one bug on aborting window-probing socket tcp: fix SNMP TCP timeout under-estimation modpost: skip ELF local symbols during section mismatch check kbuild: fix single target build for external module mtd: fix mtd_oobavail() incoherent returned value ARM: dts: pxa: clean up USB controller nodes clk: sunxi-ng: h3/h5: Fix CSI_MCLK parent ARM: dts: realview: Fix some more duplicate regulator nodes dlm: fix invalid cluster name warning net/mlx4_core: Fix return codes of unsupported operations powerpc/math-emu: Update macros from GCC MIPS: OCTEON: cvmx_pko_mem_debug8: use oldest forward compatible definition nfsd: Return EPERM, not EACCES, in some SETATTR cases tty: Don't block on IO when ldisc change is pending media: stkwebcam: Bugfix for wrong return values mlx4: Use snprintf instead of complicated strcpy ARM: dts: sunxi: Fix PMU compatible strings sched/fair: Scale bandwidth quota and period without losing quota/period ratio precision fuse: verify nlink fuse: verify attributes ALSA: pcm: oss: Avoid potential buffer overflows Input: goodix - add upside-down quirk for Teclast X89 tablet coresight: etm4x: Fix input validation for sysfs. x86/PCI: Avoid AMD FCH XHCI USB PME# from D0 defect CIFS: Fix NULL-pointer dereference in smb2_push_mandatory_locks CIFS: Fix SMB2 oplock break processing tty: vt: keyboard: reject invalid keycodes can: slcan: Fix use-after-free Read in slcan_open jbd2: Fix possible overflow in jbd2_log_space_left() drm/i810: Prevent underflow in ioctl KVM: x86: do not modify masked bits of shared MSRs KVM: x86: fix presentation of TSX feature in ARCH_CAPABILITIES crypto: crypto4xx - fix double-free in crypto4xx_destroy_sdr crypto: ccp - fix uninitialized list head crypto: ecdh - fix big endian bug in ECC library crypto: user - fix memory leak in crypto_report spi: atmel: Fix CS high support RDMA/qib: Validate ->show()/store() callbacks before calling them thermal: Fix deadlock in thermal thermal_zone_device_check KVM: x86: fix out-of-bounds write in KVM_GET_EMULATED_CPUID (CVE-2019-19332) appletalk: Fix potential NULL pointer dereference in unregister_snap_client appletalk: Set error code if register_snap_client failed usb: gadget: configfs: Fix missing spin_lock_init() USB: uas: honor flag to avoid CAPACITY16 USB: uas: heed CAPACITY_HEURISTICS usb: Allow USB device to be warm reset in suspended state staging: rtl8188eu: fix interface sanity check staging: rtl8712: fix interface sanity check staging: gigaset: fix general protection fault on probe staging: gigaset: fix illegal free on probe errors staging: gigaset: add endpoint-type sanity check xhci: Increase STS_HALT timeout in xhci_suspend() ARM: dts: pandora-common: define wl1251 as child node of mmc3 iio: humidity: hdc100x: fix IIO_HUMIDITYRELATIVE channel reporting USB: atm: ueagle-atm: add missing endpoint check USB: idmouse: fix interface sanity checks USB: serial: io_edgeport: fix epic endpoint lookup USB: adutux: fix interface sanity check usb: core: urb: fix URB structure initialization function usb: mon: Fix a deadlock in usbmon between mmap and read mtd: spear_smi: Fix Write Burst mode virtio-balloon: fix managed page counts when migrating pages between zones btrfs: check page->mapping when loading free space cache btrfs: Remove btrfs_bio::flags member Btrfs: send, skip backreference walking for extents with many references btrfs: record all roots for rename exchange on a subvol rtlwifi: rtl8192de: Fix missing code to retrieve RX buffer address rtlwifi: rtl8192de: Fix missing callback that tests for hw release of buffer rtlwifi: rtl8192de: Fix missing enable interrupt flag lib: raid6: fix awk build warnings ALSA: hda - Fix pending unsol events at shutdown workqueue: Fix spurious sanity check failures in destroy_workqueue() workqueue: Fix pwq ref leak in rescuer_thread() ASoC: Jack: Fix NULL pointer dereference in snd_soc_jack_report blk-mq: avoid sysfs buffer overflow with too many CPU cores cgroup: pids: use atomic64_t for pids->limit ar5523: check NULL before memcpy() in ar5523_cmd() media: bdisp: fix memleak on release media: radio: wl1273: fix interrupt masking on release cpuidle: Do not unset the driver if it is there already PM / devfreq: Lock devfreq in trans_stat_show ACPI: OSL: only free map once in osl.c ACPI: bus: Fix NULL pointer check in acpi_bus_get_private_data() ACPI: PM: Avoid attaching ACPI PM domain to certain devices pinctrl: samsung: Fix device node refcount leaks in S3C24xx wakeup controller init pinctrl: samsung: Fix device node refcount leaks in init code mmc: host: omap_hsmmc: add code for special init of wl1251 to get rid of pandora_wl1251_init_card ppdev: fix PPGETTIME/PPSETTIME ioctls powerpc: Allow 64bit VDSO __kernel_sync_dicache to work across ranges >4GB video/hdmi: Fix AVI bar unpack quota: Check that quota is not dirty before release ext2: check err when partial != NULL quota: fix livelock in dquot_writeback_dquots scsi: zfcp: trace channel log even for FCP command responses usb: xhci: only set D3hot for pci device xhci: Fix memory leak in xhci_add_in_port() xhci: make sure interrupts are restored to correct state iio: adis16480: Add debugfs_reg_access entry Btrfs: fix negative subv_writers counter and data space leak after buffered write omap: pdata-quirks: remove openpandora quirks for mmc3 and wl1251 scsi: lpfc: Cap NPIV vports to 256 e100: Fix passing zero to 'PTR_ERR' warning in e100_load_ucode_wait x86/MCE/AMD: Turn off MC4_MISC thresholding on all family 0x15 models x86/MCE/AMD: Carve out the MC4_MISC thresholding quirk ath10k: fix fw crash by moving chip reset after napi disabled ARM: dts: omap3-tao3530: Fix incorrect MMC card detection GPIO polarity pinctrl: samsung: Fix device node refcount leaks in S3C64xx wakeup controller init scsi: qla2xxx: Fix DMA unmap leak scsi: qla2xxx: Fix session lookup in qlt_abort_work() scsi: qla2xxx: Fix qla24xx_process_bidir_cmd() scsi: qla2xxx: Always check the qla2x00_wait_for_hba_online() return value powerpc: Fix vDSO clock_getres() reiserfs: fix extended attributes on the root directory firmware: qcom: scm: Ensure 'a0' status code is treated as signed mm/shmem.c: cast the type of unmap_start to u64 ext4: fix a bug in ext4_wait_for_tail_page_commit blk-mq: make sure that line break can be printed workqueue: Fix missing kfree(rescuer) in destroy_workqueue() sunrpc: fix crash when cache_head become valid before update net/mlx5e: Fix SFF 8472 eeprom length kernel/module.c: wakeup processes in module_wq on module unload nvme: host: core: fix precedence of ternary operator net: bridge: deny dev_set_mac_address() when unregistering net: ethernet: ti: cpsw: fix extra rx interrupt openvswitch: support asymmetric conntrack tcp: md5: fix potential overestimation of TCP option space tipc: fix ordering of tipc module init and exit routine inet: protect against too small mtu values. tcp: fix rejected syncookies due to stale timestamps tcp: tighten acceptance of ACKs not matching a child socket tcp: Protect accesses to .ts_recent_stamp with {READ,WRITE}_ONCE() Revert "regulator: Defer init completion for a while after late_initcall" PCI: Fix Intel ACS quirk UPDCR register address PCI/MSI: Fix incorrect MSI-X masking on resume xtensa: fix TLB sanity checker CIFS: Respect O_SYNC and O_DIRECT flags during reconnect ARM: dts: s3c64xx: Fix init order of clock providers ARM: tegra: Fix FLOW_CTLR_HALT register clobbering by tegra_resume() vfio/pci: call irq_bypass_unregister_producer() before freeing irq dma-buf: Fix memory leak in sync_file_merge() dm btree: increase rebalance threshold in __rebalance2() scsi: iscsi: Fix a potential deadlock in the timeout handler drm/radeon: fix r1xx/r2xx register checker for POT textures xhci: fix USB3 device initiated resume race with roothub autosuspend net: stmmac: use correct DMA buffer size in the RX descriptor net: stmmac: don't stop NAPI processing when dropping a packet Linux 4.9.207 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
181 lines
5.7 KiB
C
181 lines
5.7 KiB
C
/*
|
|
* Linear conversion Plug-In
|
|
* Copyright (c) 1999 by Jaroslav Kysela <perex@perex.cz>,
|
|
* Abramo Bagnara <abramo@alsa-project.org>
|
|
*
|
|
*
|
|
* This library is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU Library General Public License as
|
|
* published by the Free Software Foundation; either version 2 of
|
|
* the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU Library General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Library General Public
|
|
* License along with this library; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*
|
|
*/
|
|
|
|
#include <linux/time.h>
|
|
#include <sound/core.h>
|
|
#include <sound/pcm.h>
|
|
#include "pcm_plugin.h"
|
|
|
|
/*
|
|
* Basic linear conversion plugin
|
|
*/
|
|
|
|
struct linear_priv {
|
|
int cvt_endian; /* need endian conversion? */
|
|
unsigned int src_ofs; /* byte offset in source format */
|
|
unsigned int dst_ofs; /* byte soffset in destination format */
|
|
unsigned int copy_ofs; /* byte offset in temporary u32 data */
|
|
unsigned int dst_bytes; /* byte size of destination format */
|
|
unsigned int copy_bytes; /* bytes to copy per conversion */
|
|
unsigned int flip; /* MSB flip for signeness, done after endian conv */
|
|
};
|
|
|
|
static inline void do_convert(struct linear_priv *data,
|
|
unsigned char *dst, unsigned char *src)
|
|
{
|
|
unsigned int tmp = 0;
|
|
unsigned char *p = (unsigned char *)&tmp;
|
|
|
|
memcpy(p + data->copy_ofs, src + data->src_ofs, data->copy_bytes);
|
|
if (data->cvt_endian)
|
|
tmp = swab32(tmp);
|
|
tmp ^= data->flip;
|
|
memcpy(dst, p + data->dst_ofs, data->dst_bytes);
|
|
}
|
|
|
|
static void convert(struct snd_pcm_plugin *plugin,
|
|
const struct snd_pcm_plugin_channel *src_channels,
|
|
struct snd_pcm_plugin_channel *dst_channels,
|
|
snd_pcm_uframes_t frames)
|
|
{
|
|
struct linear_priv *data = (struct linear_priv *)plugin->extra_data;
|
|
int channel;
|
|
int nchannels = plugin->src_format.channels;
|
|
for (channel = 0; channel < nchannels; ++channel) {
|
|
char *src;
|
|
char *dst;
|
|
int src_step, dst_step;
|
|
snd_pcm_uframes_t frames1;
|
|
if (!src_channels[channel].enabled) {
|
|
if (dst_channels[channel].wanted)
|
|
snd_pcm_area_silence(&dst_channels[channel].area, 0, frames, plugin->dst_format.format);
|
|
dst_channels[channel].enabled = 0;
|
|
continue;
|
|
}
|
|
dst_channels[channel].enabled = 1;
|
|
src = src_channels[channel].area.addr + src_channels[channel].area.first / 8;
|
|
dst = dst_channels[channel].area.addr + dst_channels[channel].area.first / 8;
|
|
src_step = src_channels[channel].area.step / 8;
|
|
dst_step = dst_channels[channel].area.step / 8;
|
|
frames1 = frames;
|
|
while (frames1-- > 0) {
|
|
do_convert(data, dst, src);
|
|
src += src_step;
|
|
dst += dst_step;
|
|
}
|
|
}
|
|
}
|
|
|
|
static snd_pcm_sframes_t linear_transfer(struct snd_pcm_plugin *plugin,
|
|
const struct snd_pcm_plugin_channel *src_channels,
|
|
struct snd_pcm_plugin_channel *dst_channels,
|
|
snd_pcm_uframes_t frames)
|
|
{
|
|
if (snd_BUG_ON(!plugin || !src_channels || !dst_channels))
|
|
return -ENXIO;
|
|
if (frames == 0)
|
|
return 0;
|
|
#ifdef CONFIG_SND_DEBUG
|
|
{
|
|
unsigned int channel;
|
|
for (channel = 0; channel < plugin->src_format.channels; channel++) {
|
|
if (snd_BUG_ON(src_channels[channel].area.first % 8 ||
|
|
src_channels[channel].area.step % 8))
|
|
return -ENXIO;
|
|
if (snd_BUG_ON(dst_channels[channel].area.first % 8 ||
|
|
dst_channels[channel].area.step % 8))
|
|
return -ENXIO;
|
|
}
|
|
}
|
|
#endif
|
|
if (frames > dst_channels[0].frames)
|
|
frames = dst_channels[0].frames;
|
|
convert(plugin, src_channels, dst_channels, frames);
|
|
return frames;
|
|
}
|
|
|
|
static void init_data(struct linear_priv *data,
|
|
snd_pcm_format_t src_format, snd_pcm_format_t dst_format)
|
|
{
|
|
int src_le, dst_le, src_bytes, dst_bytes;
|
|
|
|
src_bytes = snd_pcm_format_width(src_format) / 8;
|
|
dst_bytes = snd_pcm_format_width(dst_format) / 8;
|
|
src_le = snd_pcm_format_little_endian(src_format) > 0;
|
|
dst_le = snd_pcm_format_little_endian(dst_format) > 0;
|
|
|
|
data->dst_bytes = dst_bytes;
|
|
data->cvt_endian = src_le != dst_le;
|
|
data->copy_bytes = src_bytes < dst_bytes ? src_bytes : dst_bytes;
|
|
if (src_le) {
|
|
data->copy_ofs = 4 - data->copy_bytes;
|
|
data->src_ofs = src_bytes - data->copy_bytes;
|
|
} else
|
|
data->src_ofs = snd_pcm_format_physical_width(src_format) / 8 -
|
|
src_bytes;
|
|
if (dst_le)
|
|
data->dst_ofs = 4 - data->dst_bytes;
|
|
else
|
|
data->dst_ofs = snd_pcm_format_physical_width(dst_format) / 8 -
|
|
dst_bytes;
|
|
if (snd_pcm_format_signed(src_format) !=
|
|
snd_pcm_format_signed(dst_format)) {
|
|
if (dst_le)
|
|
data->flip = (__force u32)cpu_to_le32(0x80000000);
|
|
else
|
|
data->flip = (__force u32)cpu_to_be32(0x80000000);
|
|
}
|
|
}
|
|
|
|
int snd_pcm_plugin_build_linear(struct snd_pcm_substream *plug,
|
|
struct snd_pcm_plugin_format *src_format,
|
|
struct snd_pcm_plugin_format *dst_format,
|
|
struct snd_pcm_plugin **r_plugin)
|
|
{
|
|
int err;
|
|
struct linear_priv *data;
|
|
struct snd_pcm_plugin *plugin;
|
|
|
|
if (snd_BUG_ON(!r_plugin))
|
|
return -ENXIO;
|
|
*r_plugin = NULL;
|
|
|
|
if (snd_BUG_ON(src_format->rate != dst_format->rate))
|
|
return -ENXIO;
|
|
if (snd_BUG_ON(src_format->channels != dst_format->channels))
|
|
return -ENXIO;
|
|
if (snd_BUG_ON(!snd_pcm_format_linear(src_format->format) ||
|
|
!snd_pcm_format_linear(dst_format->format)))
|
|
return -ENXIO;
|
|
|
|
err = snd_pcm_plugin_build(plug, "linear format conversion",
|
|
src_format, dst_format,
|
|
sizeof(struct linear_priv), &plugin);
|
|
if (err < 0)
|
|
return err;
|
|
data = (struct linear_priv *)plugin->extra_data;
|
|
init_data(data, src_format->format, dst_format->format);
|
|
plugin->transfer = linear_transfer;
|
|
*r_plugin = plugin;
|
|
return 0;
|
|
}
|