mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
Merge branch 'android11-5.4-lts' of https://android.googlesource.com/kernel/common into android13-5.4-lahaina
* 'android11-5.4-lts' of https://android.googlesource.com/kernel/common: Revert "genirq: Provide new interfaces for affinity hints" Revert "i40e: Use irq_update_affinity_hint()" Revert "i40e: fix IRQ freeing in i40e_vsi_request_irq_msix error path" Linux 5.4.300 mm/hugetlb: fix folio is still mapped when deleted i40e: add mask to apply valid bits for itr_idx i40e: fix validation of VF state in get resources i40e: fix idx validation in config queues msg i40e: add validation for ring_len param i40e: increase max descriptors for XL710 mm/migrate_device: don't add folio to be freed to LRU in migrate_device_finalize() fbcon: Fix OOB access in font allocation fbcon: fix integer overflow in fbcon_do_set_font i40e: add max boundary check for VF filters i40e: fix input validation logic for action_meta i40e: fix idx validation in i40e_validate_queue_map drm/gma500: Fix null dereference in hdmi teardown can: peak_usb: fix shift-out-of-bounds issue can: mcba_usb: populate ndo_change_mtu() to prevent buffer overflow can: sun4i_can: populate ndo_change_mtu() to prevent buffer overflow can: hi311x: populate ndo_change_mtu() to prevent buffer overflow can: rcar_can: rcar_can_resume(): fix s2ram with PSCI IB/mlx5: Fix obj_type mismatch for SRQ event subscriptions usb: core: Add 0x prefix to quirks debug output ALSA: usb-audio: Fix build with CONFIG_INPUT=n ALSA: usb-audio: Convert comma to semicolon ALSA: usb-audio: Add mixer quirk for Sony DualSense PS5 ALSA: usb-audio: Remove unneeded wmb() in mixer_quirks ALSA: usb-audio: Simplify NULL comparison in mixer_quirks ALSA: usb-audio: Avoid multiple assignments in mixer_quirks ALSA: usb-audio: Fix block comments in mixer_quirks KVM: SVM: Sync TPR from LAPIC into VMCB::V_TPR even if AVIC is active net: rfkill: gpio: Fix crash due to dereferencering uninitialized pointer net: rfkill: gpio: add DT support serial: sc16is7xx: fix bug in flow control levels init USB: gadget: dummy-hcd: Fix locking bug in RT-enabled kernels usb: gadget: dummy_hcd: remove usage of list iterator past the loop body ASoC: SOF: Intel: hda-stream: Fix incorrect variable used in error message ASoC: wm8974: Correct PLL rate rounding ASoC: wm8940: Correct typo in control name rds: ib: Increment i_fastreg_wrs before bailing out mmc: mvsdio: Fix dma_unmap_sg() nents value power: supply: bq27xxx: restrict no-battery detection to bq27000 power: supply: bq27xxx: fix error return in case of no bq27000 hdq battery nilfs2: fix CFI failure when accessing /sys/fs/nilfs2/features/* cnic: Fix use-after-free bugs in cnic_delete_task net: liquidio: fix overflow in octeon_init_instr_queue() Revert "net/mlx5e: Update and set Xon/Xoff upon port speed set" tcp: Clear tcp_sk(sk)->fastopen_rsk in tcp_disconnect(). i40e: remove redundant memory barrier when cleaning Tx descs net: natsemi: fix `rx_dropped` double accounting on `netif_rx()` failure cgroup: split cgroup_destroy_wq into 3 workqueues pcmcia: omap_cf: Mark driver struct with __refdata to prevent section mismatch wifi: mac80211: fix incorrect type for ret ALSA: firewire-motu: drop EPOLLOUT from poll return values as write is not supported mm/memory-failure: fix VM_BUG_ON_PAGE(PagePoisoned(page)) when unpoison memory soc: qcom: mdt_loader: Deal with zero e_shentsize phy: ti-pipe3: fix device leak at unbind dmaengine: qcom: bam_dma: Fix DT error handling for num-channels/ees dmaengine: ti: edma: Fix memory allocation size for queue_priority_map can: j1939: j1939_local_ecu_get(): undo increment when j1939_local_ecu_get() fails can: j1939: j1939_sk_bind(): call j1939_priv_put() immediately when j1939_local_ecu_get() failed i40e: fix IRQ freeing in i40e_vsi_request_irq_msix error path i40e: Use irq_update_affinity_hint() genirq: Provide new interfaces for affinity hints genirq: Export affinity setter for modules genirq/affinity: Add irq_update_affinity_desc() igb: fix link test skipping when interface is admin down net: fec: Fix possible NPD in fec_enet_phy_reset_after_clk_enable() USB: serial: option: add Telit Cinterion LE910C4-WWX new compositions USB: serial: option: add Telit Cinterion FN990A w/audio compositions tty: hvc_console: Call hvc_kick in hvc_write unconditionally mtd: nand: raw: atmel: Respect tAR, tCLR in read setup timing mtd: nand: raw: atmel: Fix comment in timings preparation mtd: rawnand: stm32_fmc2: avoid overlapping mappings on ECC buffer mm/khugepaged: fix the address passed to notifier on testing young fuse: prevent overflow in copy_file_range return value fuse: check if copy_file_range() returns larger than requested size mtd: rawnand: stm32_fmc2: fix ECC overwrite ocfs2: fix recursive semaphore deadlock in fiemap call EDAC/altera: Delete an inappropriate dma_free_coherent() call tcp_bpf: Call sk_msg_free() when tcp_bpf_send_verdict() fails to allocate psock->cork. NFSv4: Don't clear capabilities that won't be reset net: Fix null-ptr-deref by sock_lock_init_class_and_name() and rmmod. usb: hub: Fix flushing of delayed work used for post resume purposes Change-Id: I9cbae559320c1ca8d46d8443b8ce47f1c9a50f4b
This commit is contained in:
Michael Bestas
commit
b4aa467048
64 changed files with 766 additions and 225 deletions
|
|
@ -73,7 +73,7 @@ static __poll_t hwdep_poll(struct snd_hwdep *hwdep, struct file *file,
|
|||
events = 0;
|
||||
spin_unlock_irq(&motu->lock);
|
||||
|
||||
return events | EPOLLOUT;
|
||||
return events;
|
||||
}
|
||||
|
||||
static int hwdep_get_info(struct snd_motu *motu, void __user *arg)
|
||||
|
|
|
|||
|
|
@ -218,7 +218,7 @@ static const struct snd_kcontrol_new wm8940_snd_controls[] = {
|
|||
SOC_SINGLE_TLV("Digital Capture Volume", WM8940_ADCVOL,
|
||||
0, 255, 0, wm8940_adc_tlv),
|
||||
SOC_ENUM("Mic Bias Level", wm8940_mic_bias_level_enum),
|
||||
SOC_SINGLE_TLV("Capture Boost Volue", WM8940_ADCBOOST,
|
||||
SOC_SINGLE_TLV("Capture Boost Volume", WM8940_ADCBOOST,
|
||||
8, 1, 0, wm8940_capture_boost_vol_tlv),
|
||||
SOC_SINGLE_TLV("Speaker Playback Volume", WM8940_SPKVOL,
|
||||
0, 63, 0, wm8940_spk_vol_tlv),
|
||||
|
|
|
|||
|
|
@ -427,10 +427,14 @@ static int wm8974_update_clocks(struct snd_soc_dai *dai)
|
|||
fs256 = 256 * priv->fs;
|
||||
|
||||
f = wm8974_get_mclkdiv(priv->mclk, fs256, &mclkdiv);
|
||||
|
||||
if (f != priv->mclk) {
|
||||
/* The PLL performs best around 90MHz */
|
||||
fpll = wm8974_get_mclkdiv(22500000, fs256, &mclkdiv);
|
||||
if (fs256 % 8000)
|
||||
f = 22579200;
|
||||
else
|
||||
f = 24576000;
|
||||
|
||||
fpll = wm8974_get_mclkdiv(f, fs256, &mclkdiv);
|
||||
}
|
||||
|
||||
wm8974_set_dai_pll(dai, 0, 0, priv->mclk, fpll);
|
||||
|
|
|
|||
|
|
@ -655,7 +655,7 @@ int hda_dsp_stream_init(struct snd_sof_dev *sdev)
|
|||
|
||||
if (num_capture >= SOF_HDA_CAPTURE_STREAMS) {
|
||||
dev_err(sdev->dev, "error: too many capture streams %d\n",
|
||||
num_playback);
|
||||
num_capture);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@
|
|||
|
||||
#include <linux/hid.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/input.h>
|
||||
#include <linux/math64.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/usb.h>
|
||||
|
|
@ -75,7 +76,8 @@ static int snd_create_std_mono_ctl_offset(struct usb_mixer_interface *mixer,
|
|||
cval->idx_off = idx_off;
|
||||
|
||||
/* get_min_max() is called only for integer volumes later,
|
||||
* so provide a short-cut for booleans */
|
||||
* so provide a short-cut for booleans
|
||||
*/
|
||||
cval->min = 0;
|
||||
cval->max = 1;
|
||||
cval->res = 0;
|
||||
|
|
@ -124,7 +126,7 @@ static int snd_create_std_mono_table(struct usb_mixer_interface *mixer,
|
|||
{
|
||||
int err;
|
||||
|
||||
while (t->name != NULL) {
|
||||
while (t->name) {
|
||||
err = snd_create_std_mono_ctl(mixer, t->unitid, t->control,
|
||||
t->cmask, t->val_type, t->name, t->tlv_callback);
|
||||
if (err < 0)
|
||||
|
|
@ -206,7 +208,6 @@ static void snd_usb_soundblaster_remote_complete(struct urb *urb)
|
|||
if (code == rc->mute_code)
|
||||
snd_usb_mixer_notify_id(mixer, rc->mute_mixer_id);
|
||||
mixer->rc_code = code;
|
||||
wmb();
|
||||
wake_up(&mixer->rc_waitq);
|
||||
}
|
||||
|
||||
|
|
@ -526,6 +527,265 @@ static int snd_emu0204_controls_create(struct usb_mixer_interface *mixer)
|
|||
&snd_emu0204_control, NULL);
|
||||
}
|
||||
|
||||
#if IS_REACHABLE(CONFIG_INPUT)
|
||||
/*
|
||||
* Sony DualSense controller (PS5) jack detection
|
||||
*
|
||||
* Since this is an UAC 1 device, it doesn't support jack detection.
|
||||
* However, the controller hid-playstation driver reports HP & MIC
|
||||
* insert events through a dedicated input device.
|
||||
*/
|
||||
|
||||
#define SND_DUALSENSE_JACK_OUT_TERM_ID 3
|
||||
#define SND_DUALSENSE_JACK_IN_TERM_ID 4
|
||||
|
||||
struct dualsense_mixer_elem_info {
|
||||
struct usb_mixer_elem_info info;
|
||||
struct input_handler ih;
|
||||
struct input_device_id id_table[2];
|
||||
bool connected;
|
||||
};
|
||||
|
||||
static void snd_dualsense_ih_event(struct input_handle *handle,
|
||||
unsigned int type, unsigned int code,
|
||||
int value)
|
||||
{
|
||||
struct dualsense_mixer_elem_info *mei;
|
||||
struct usb_mixer_elem_list *me;
|
||||
|
||||
if (type != EV_SW)
|
||||
return;
|
||||
|
||||
mei = container_of(handle->handler, struct dualsense_mixer_elem_info, ih);
|
||||
me = &mei->info.head;
|
||||
|
||||
if ((me->id == SND_DUALSENSE_JACK_OUT_TERM_ID && code == SW_HEADPHONE_INSERT) ||
|
||||
(me->id == SND_DUALSENSE_JACK_IN_TERM_ID && code == SW_MICROPHONE_INSERT)) {
|
||||
mei->connected = !!value;
|
||||
snd_ctl_notify(me->mixer->chip->card, SNDRV_CTL_EVENT_MASK_VALUE,
|
||||
&me->kctl->id);
|
||||
}
|
||||
}
|
||||
|
||||
static bool snd_dualsense_ih_match(struct input_handler *handler,
|
||||
struct input_dev *dev)
|
||||
{
|
||||
struct dualsense_mixer_elem_info *mei;
|
||||
struct usb_device *snd_dev;
|
||||
char *input_dev_path, *usb_dev_path;
|
||||
size_t usb_dev_path_len;
|
||||
bool match = false;
|
||||
|
||||
mei = container_of(handler, struct dualsense_mixer_elem_info, ih);
|
||||
snd_dev = mei->info.head.mixer->chip->dev;
|
||||
|
||||
input_dev_path = kobject_get_path(&dev->dev.kobj, GFP_KERNEL);
|
||||
if (!input_dev_path) {
|
||||
dev_warn(&snd_dev->dev, "Failed to get input dev path\n");
|
||||
return false;
|
||||
}
|
||||
|
||||
usb_dev_path = kobject_get_path(&snd_dev->dev.kobj, GFP_KERNEL);
|
||||
if (!usb_dev_path) {
|
||||
dev_warn(&snd_dev->dev, "Failed to get USB dev path\n");
|
||||
goto free_paths;
|
||||
}
|
||||
|
||||
/*
|
||||
* Ensure the VID:PID matched input device supposedly owned by the
|
||||
* hid-playstation driver belongs to the actual hardware handled by
|
||||
* the current USB audio device, which implies input_dev_path being
|
||||
* a subpath of usb_dev_path.
|
||||
*
|
||||
* This verification is necessary when there is more than one identical
|
||||
* controller attached to the host system.
|
||||
*/
|
||||
usb_dev_path_len = strlen(usb_dev_path);
|
||||
if (usb_dev_path_len >= strlen(input_dev_path))
|
||||
goto free_paths;
|
||||
|
||||
usb_dev_path[usb_dev_path_len] = '/';
|
||||
match = !memcmp(input_dev_path, usb_dev_path, usb_dev_path_len + 1);
|
||||
|
||||
free_paths:
|
||||
kfree(input_dev_path);
|
||||
kfree(usb_dev_path);
|
||||
|
||||
return match;
|
||||
}
|
||||
|
||||
static int snd_dualsense_ih_connect(struct input_handler *handler,
|
||||
struct input_dev *dev,
|
||||
const struct input_device_id *id)
|
||||
{
|
||||
struct input_handle *handle;
|
||||
int err;
|
||||
|
||||
handle = kzalloc(sizeof(*handle), GFP_KERNEL);
|
||||
if (!handle)
|
||||
return -ENOMEM;
|
||||
|
||||
handle->dev = dev;
|
||||
handle->handler = handler;
|
||||
handle->name = handler->name;
|
||||
|
||||
err = input_register_handle(handle);
|
||||
if (err)
|
||||
goto err_free;
|
||||
|
||||
err = input_open_device(handle);
|
||||
if (err)
|
||||
goto err_unregister;
|
||||
|
||||
return 0;
|
||||
|
||||
err_unregister:
|
||||
input_unregister_handle(handle);
|
||||
err_free:
|
||||
kfree(handle);
|
||||
return err;
|
||||
}
|
||||
|
||||
static void snd_dualsense_ih_disconnect(struct input_handle *handle)
|
||||
{
|
||||
input_close_device(handle);
|
||||
input_unregister_handle(handle);
|
||||
kfree(handle);
|
||||
}
|
||||
|
||||
static void snd_dualsense_ih_start(struct input_handle *handle)
|
||||
{
|
||||
struct dualsense_mixer_elem_info *mei;
|
||||
struct usb_mixer_elem_list *me;
|
||||
int status = -1;
|
||||
|
||||
mei = container_of(handle->handler, struct dualsense_mixer_elem_info, ih);
|
||||
me = &mei->info.head;
|
||||
|
||||
if (me->id == SND_DUALSENSE_JACK_OUT_TERM_ID &&
|
||||
test_bit(SW_HEADPHONE_INSERT, handle->dev->swbit))
|
||||
status = test_bit(SW_HEADPHONE_INSERT, handle->dev->sw);
|
||||
else if (me->id == SND_DUALSENSE_JACK_IN_TERM_ID &&
|
||||
test_bit(SW_MICROPHONE_INSERT, handle->dev->swbit))
|
||||
status = test_bit(SW_MICROPHONE_INSERT, handle->dev->sw);
|
||||
|
||||
if (status >= 0) {
|
||||
mei->connected = !!status;
|
||||
snd_ctl_notify(me->mixer->chip->card, SNDRV_CTL_EVENT_MASK_VALUE,
|
||||
&me->kctl->id);
|
||||
}
|
||||
}
|
||||
|
||||
static int snd_dualsense_jack_get(struct snd_kcontrol *kctl,
|
||||
struct snd_ctl_elem_value *ucontrol)
|
||||
{
|
||||
struct dualsense_mixer_elem_info *mei = snd_kcontrol_chip(kctl);
|
||||
|
||||
ucontrol->value.integer.value[0] = mei->connected;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct snd_kcontrol_new snd_dualsense_jack_control = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_CARD,
|
||||
.access = SNDRV_CTL_ELEM_ACCESS_READ,
|
||||
.info = snd_ctl_boolean_mono_info,
|
||||
.get = snd_dualsense_jack_get,
|
||||
};
|
||||
|
||||
static int snd_dualsense_resume_jack(struct usb_mixer_elem_list *list)
|
||||
{
|
||||
snd_ctl_notify(list->mixer->chip->card, SNDRV_CTL_EVENT_MASK_VALUE,
|
||||
&list->kctl->id);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void snd_dualsense_mixer_elem_free(struct snd_kcontrol *kctl)
|
||||
{
|
||||
struct dualsense_mixer_elem_info *mei = snd_kcontrol_chip(kctl);
|
||||
|
||||
if (mei->ih.event)
|
||||
input_unregister_handler(&mei->ih);
|
||||
|
||||
snd_usb_mixer_elem_free(kctl);
|
||||
}
|
||||
|
||||
static int snd_dualsense_jack_create(struct usb_mixer_interface *mixer,
|
||||
const char *name, bool is_output)
|
||||
{
|
||||
struct dualsense_mixer_elem_info *mei;
|
||||
struct input_device_id *idev_id;
|
||||
struct snd_kcontrol *kctl;
|
||||
int err;
|
||||
|
||||
mei = kzalloc(sizeof(*mei), GFP_KERNEL);
|
||||
if (!mei)
|
||||
return -ENOMEM;
|
||||
|
||||
snd_usb_mixer_elem_init_std(&mei->info.head, mixer,
|
||||
is_output ? SND_DUALSENSE_JACK_OUT_TERM_ID :
|
||||
SND_DUALSENSE_JACK_IN_TERM_ID);
|
||||
|
||||
mei->info.head.resume = snd_dualsense_resume_jack;
|
||||
mei->info.val_type = USB_MIXER_BOOLEAN;
|
||||
mei->info.channels = 1;
|
||||
mei->info.min = 0;
|
||||
mei->info.max = 1;
|
||||
|
||||
kctl = snd_ctl_new1(&snd_dualsense_jack_control, mei);
|
||||
if (!kctl) {
|
||||
kfree(mei);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
strscpy(kctl->id.name, name, sizeof(kctl->id.name));
|
||||
kctl->private_free = snd_dualsense_mixer_elem_free;
|
||||
|
||||
err = snd_usb_mixer_add_control(&mei->info.head, kctl);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
idev_id = &mei->id_table[0];
|
||||
idev_id->flags = INPUT_DEVICE_ID_MATCH_VENDOR | INPUT_DEVICE_ID_MATCH_PRODUCT |
|
||||
INPUT_DEVICE_ID_MATCH_EVBIT | INPUT_DEVICE_ID_MATCH_SWBIT;
|
||||
idev_id->vendor = USB_ID_VENDOR(mixer->chip->usb_id);
|
||||
idev_id->product = USB_ID_PRODUCT(mixer->chip->usb_id);
|
||||
idev_id->evbit[BIT_WORD(EV_SW)] = BIT_MASK(EV_SW);
|
||||
if (is_output)
|
||||
idev_id->swbit[BIT_WORD(SW_HEADPHONE_INSERT)] = BIT_MASK(SW_HEADPHONE_INSERT);
|
||||
else
|
||||
idev_id->swbit[BIT_WORD(SW_MICROPHONE_INSERT)] = BIT_MASK(SW_MICROPHONE_INSERT);
|
||||
|
||||
mei->ih.event = snd_dualsense_ih_event;
|
||||
mei->ih.match = snd_dualsense_ih_match;
|
||||
mei->ih.connect = snd_dualsense_ih_connect;
|
||||
mei->ih.disconnect = snd_dualsense_ih_disconnect;
|
||||
mei->ih.start = snd_dualsense_ih_start;
|
||||
mei->ih.name = name;
|
||||
mei->ih.id_table = mei->id_table;
|
||||
|
||||
err = input_register_handler(&mei->ih);
|
||||
if (err) {
|
||||
dev_warn(&mixer->chip->dev->dev,
|
||||
"Could not register input handler: %d\n", err);
|
||||
mei->ih.event = NULL;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int snd_dualsense_controls_create(struct usb_mixer_interface *mixer)
|
||||
{
|
||||
int err;
|
||||
|
||||
err = snd_dualsense_jack_create(mixer, "Headphone Jack", true);
|
||||
if (err < 0)
|
||||
return err;
|
||||
|
||||
return snd_dualsense_jack_create(mixer, "Headset Mic Jack", false);
|
||||
}
|
||||
#endif /* IS_REACHABLE(CONFIG_INPUT) */
|
||||
|
||||
/* ASUS Xonar U1 / U3 controls */
|
||||
|
||||
static int snd_xonar_u1_switch_get(struct snd_kcontrol *kcontrol,
|
||||
|
|
@ -1591,7 +1851,8 @@ static int snd_microii_spdif_default_put(struct snd_kcontrol *kcontrol,
|
|||
unsigned int pval, pval_old;
|
||||
int err;
|
||||
|
||||
pval = pval_old = kcontrol->private_value;
|
||||
pval = kcontrol->private_value;
|
||||
pval_old = pval;
|
||||
pval &= 0xfffff0f0;
|
||||
pval |= (ucontrol->value.iec958.status[1] & 0x0f) << 8;
|
||||
pval |= (ucontrol->value.iec958.status[0] & 0x0f);
|
||||
|
|
@ -2380,6 +2641,13 @@ int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer)
|
|||
err = snd_emu0204_controls_create(mixer);
|
||||
break;
|
||||
|
||||
#if IS_REACHABLE(CONFIG_INPUT)
|
||||
case USB_ID(0x054c, 0x0ce6): /* Sony DualSense controller (PS5) */
|
||||
case USB_ID(0x054c, 0x0df2): /* Sony DualSense Edge controller (PS5) */
|
||||
err = snd_dualsense_controls_create(mixer);
|
||||
break;
|
||||
#endif /* IS_REACHABLE(CONFIG_INPUT) */
|
||||
|
||||
case USB_ID(0x0763, 0x2030): /* M-Audio Fast Track C400 */
|
||||
case USB_ID(0x0763, 0x2031): /* M-Audio Fast Track C400 */
|
||||
err = snd_c400_create_mixer(mixer);
|
||||
|
|
@ -2502,7 +2770,8 @@ static void snd_dragonfly_quirk_db_scale(struct usb_mixer_interface *mixer,
|
|||
struct snd_kcontrol *kctl)
|
||||
{
|
||||
/* Approximation using 10 ranges based on output measurement on hw v1.2.
|
||||
* This seems close to the cubic mapping e.g. alsamixer uses. */
|
||||
* This seems close to the cubic mapping e.g. alsamixer uses.
|
||||
*/
|
||||
static const DECLARE_TLV_DB_RANGE(scale,
|
||||
0, 1, TLV_DB_MINMAX_ITEM(-5300, -4970),
|
||||
2, 5, TLV_DB_MINMAX_ITEM(-4710, -4160),
|
||||
|
|
|
|||
Loading…
Reference in a new issue