Input: elantech - fix touchpad state on resume for Lenovo N24
Subsystems (10)
Sasha Levin
maintainerPATCH 1/14 Input: elantech - fix touchpad state on resume for Lenovo N24
From: Jonathan Denose <[email protected]>
[ Upstream commit a69ce592cbe0417664bc5a075205aa75c2ec1273 ]
The Lenovo N24 on resume becomes stuck in a state where it sends incorrect packets, causing elantech_packet_check_v4 to fail. The only way for the device to resume sending the correct packets is for it to be disabled and then re-enabled.
This change adds a dmi check to trigger this behavior on resume.
--- drivers/input/mouse/elantech.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+)
drivers/input/mouse/elantech.c +31 -0
@@ -1476,16 +1476,47 @@ static void elantech_disconnect(struct psmouse *psmouse) psmouse->private =NULL ; } +/* +* Some hw_version 4 models fail to properly activate absolute mode on +* resume without going through disable/enable cycle. +*/ +static const struct dmi_system_id elantech_needs_reenable[] = { +#if defined(CONFIG_DMI) && defined(CONFIG_X86) + { +/* Lenovo N24 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"LENOVO" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"81AF" ), + }, + }, +#endif + { } +}; +/* * Put the touchpad back into absolute mode when reconnecting */ static int elantech_reconnect (struct psmouse *psmouse) { +int err; +psmouse_reset (psmouse);if (elantech_detect (psmouse,0 ))return -1 ; +if (dmi_check_system (elantech_needs_reenable)) { + err =ps2_command (&psmouse->ps2dev,NULL ,PSMOUSE_CMD_DISABLE ); +if (err) +psmouse_warn (psmouse,"failed to deactivate mouse on %s: %d\n" , + psmouse->ps2dev.serio->phys, err); + + err =ps2_command (&psmouse->ps2dev,NULL ,PSMOUSE_CMD_ENABLE ); +if (err) +psmouse_warn (psmouse,"failed to reactivate mouse on %s: %d\n" , + psmouse->ps2dev.serio->phys, err); + } +if (elantech_set_absolute_mode (psmouse)) {psmouse_err (psmouse,"failed to put touchpad back into absolute mode.\n" );
Signature · 1 line
2.43.0
Sasha Levin
maintainerPATCH 2/14 Input: i8042 - add Ayaneo Kun to i8042 quirk table
From: Tobias Jakobi <[email protected]>
[ Upstream commit 955af6355ddfe35140f9706a635838212a32513b ]
See the added comment for details. Also fix a typo in the quirk's define.
--- drivers/input/serio/i8042-acpipnpio.h | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)
drivers/input/serio/i8042-acpipnpio.h +16 -2
@@ -75,7 +75,7 @@ static inline void i8042_write_command(int val)#define SERIO_QUIRK_PROBE_DEFER BIT(5)#define SERIO_QUIRK_RESET_ALWAYS BIT(6)#define SERIO_QUIRK_RESET_NEVER BIT(7) -#define SERIO_QUIRK_DIECT BIT(8) +#define SERIO_QUIRK_DIRECT BIT(8)#define SERIO_QUIRK_DUMBKBD BIT(9)#define SERIO_QUIRK_NOLOOP BIT(10)#define SERIO_QUIRK_NOTIMEOUT BIT(11)
@@ -1235,6 +1235,20 @@ static const struct dmi_system_id i8042_dmi_quirk_table[] __initconst = { .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS | SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP) }, + { + /* + * The Ayaneo Kun is a handheld device where some the buttons + * are handled by an AT keyboard. The keyboard is usually + * detected as raw, but sometimes, usually after a cold boot, + * it is detected as translated. Make sure that the keyboard + * is always in raw mode. + */ + .matches = { + DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "AYANEO"), + DMI_MATCH(DMI_BOARD_NAME, "KUN"), + }, + .driver_data = (void *)(SERIO_QUIRK_DIRECT) + }, { } };
@@ -1553,7 +1567,7 @@ static void __init i8042_check_quirks(void)if (quirks &SERIO_QUIRK_RESET_NEVER ) i8042_reset =I8042_RESET_NEVER ; } -if (quirks &SERIO_QUIRK_DIECT ) +if (quirks &SERIO_QUIRK_DIRECT ) i8042_direct = true;if (quirks &SERIO_QUIRK_DUMBKBD ) i8042_dumbkbd = true;
Signature · 1 line
2.43.0
Sasha Levin
maintainerPATCH 3/14 bytcr_rt5640 : inverse jack detect for Archos 101 cesium
In reply to Sasha LevinFrom: Thomas GENTY <[email protected]>
[ Upstream commit e3209a1827646daaab744aa6a5767b1f57fb5385 ]
When headphones are plugged in, they appear absent; when they are removed, they appear present.
Add a specific entry in bytcr_rt5640 for this device
--- sound/soc/intel/boards/bytcr_rt5640.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
sound/soc/intel/boards/bytcr_rt5640.c +11 -0
@@ -468,6 +468,17 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = {BYT_RT5640_SSP0_AIF1 | BYT_RT5640_MCLK_EN), }, + { + .matches = { +DMI_EXACT_MATCH (DMI_SYS_VENDOR ,"ARCHOS" ), + DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "ARCHOS 101 CESIUM"), + }, + .driver_data = (void *)(BYTCR_INPUT_DEFAULTS | +BYT_RT5640_JD_NOT_INV | +BYT_RT5640_DIFF_MIC | +BYT_RT5640_SSP0_AIF1 | + BYT_RT5640_MCLK_EN), + }, { .matches = { DMI_EXACT_MATCH(DMI_SYS_VENDOR, "ARCHOS"),
Signature · 1 line
2.43.0
Sasha Levin
maintainerPATCH 4/14 ALSA: dmaengine: Synchronize dma channel after drop()
In reply to Sasha LevinFrom: Jai Luthra <[email protected]>
[ Upstream commit e8343410ddf08fc36a9b9cc7c51a4e53a262d4c6 ]
Sometimes the stream may be stopped due to XRUN events, in which case the userspace can call snd_pcm_drop() and snd_pcm_prepare() to stop and start the stream again.
In these cases, we must wait for the DMA channel to synchronize before marking the stream as prepared for playback, as the DMA channel gets stopped by drop() without any synchronization. Make sure the ALSA core synchronizes the DMA channel by adding a sync_stop() hook.
--- include/sound/dmaengine_pcm.h | 1 + sound/core/pcm_dmaengine.c | 10 ++++++++++ sound/soc/soc-generic-dmaengine-pcm.c | 8 ++++++++ 3 files changed, 19 insertions(+)
include/sound/dmaengine_pcm.h +1 -0
@@ -34,6 +34,7 @@ snd_pcm_uframes_t snd_dmaengine_pcm_pointer_no_residue(struct snd_pcm_substreamint snd_dmaengine_pcm_open (struct snd_pcm_substream *substream,struct dma_chan *chan);int snd_dmaengine_pcm_close (struct snd_pcm_substream *substream); +int snd_dmaengine_pcm_sync_stop (struct snd_pcm_substream *substream);int snd_dmaengine_pcm_open_request_chan (struct snd_pcm_substream *substream,dma_filter_fn filter_fn,void *filter_data);
sound/core/pcm_dmaengine.c +10 -0
@@ -342,6 +342,16 @@ int snd_dmaengine_pcm_open_request_chan(struct snd_pcm_substream *substream, }EXPORT_SYMBOL_GPL (snd_dmaengine_pcm_open_request_chan); +int snd_dmaengine_pcm_sync_stop (struct snd_pcm_substream *substream) +{ +struct dmaengine_pcm_runtime_data *prtd =substream_to_prtd (substream); + +dmaengine_synchronize (prtd->dma_chan); + +return 0 ; +} +EXPORT_SYMBOL_GPL (snd_dmaengine_pcm_sync_stop); +/** * snd_dmaengine_pcm_close - Close a dmaengine based PCM substream * @substream: PCM substream
sound/soc/soc-generic-dmaengine-pcm.c +8 -0
@@ -326,6 +326,12 @@ static int dmaengine_copy_user(struct snd_soc_component *component,return 0 ; } +static int dmaengine_pcm_sync_stop (struct snd_soc_component *component, +struct snd_pcm_substream *substream) +{ +return snd_dmaengine_pcm_sync_stop (substream); +} +static const struct snd_soc_component_driver dmaengine_pcm_component = { .name =SND_DMAENGINE_PCM_DRV_NAME , .probe_order =SND_SOC_COMP_ORDER_LATE ,
@@ -335,6 +341,7 @@ static const struct snd_soc_component_driver dmaengine_pcm_component = { .trigger = dmaengine_pcm_trigger, .pointer = dmaengine_pcm_pointer, .pcm_construct = dmaengine_pcm_new, + .sync_stop = dmaengine_pcm_sync_stop, };static const struct snd_soc_component_driver dmaengine_pcm_component_process = {
@@ -347,6 +354,7 @@ static const struct snd_soc_component_driver dmaengine_pcm_component_process = { .pointer = dmaengine_pcm_pointer, .copy_user = dmaengine_copy_user, .pcm_construct = dmaengine_pcm_new, + .sync_stop = dmaengine_pcm_sync_stop, };static const char *const dmaengine_pcm_dma_channel_names[] = {
Signature · 1 line
2.43.0
Sasha Levin
maintainerPATCH 5/14 ASoC: ti: davinci-mcasp: Set min period size using FIFO config
In reply to Sasha LevinFrom: Jai Luthra <[email protected]>
[ Upstream commit c5dcf8ab10606e76c1d8a0ec77f27d84a392e874 ]
The minimum period size was enforced to 64 as older devices integrating McASP with EDMA used an internal FIFO of 64 samples.
With UDMA based platforms this internal McASP FIFO is optional, as the DMA engine internally does some buffering which is already accounted for when registering the platform. So we should read the actual FIFO configuration (txnumevt/rxnumevt) instead of hardcoding frames.min to 64.
--- sound/soc/ti/davinci-mcasp.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
sound/soc/ti/davinci-mcasp.c +7 -2
@@ -1441,10 +1441,11 @@ static int davinci_mcasp_hw_rule_min_periodsize( {struct snd_interval *period_size =hw_param_interval (params,SNDRV_PCM_HW_PARAM_PERIOD_SIZE ); +u8 numevt = *((u8 *)rule->private);struct snd_interval frames;snd_interval_any (&frames); - frames.min =64 ; + frames.min = numevt; frames.integer =1 ;return snd_interval_refine (period_size, &frames);
@@ -1459,6 +1460,7 @@ static int davinci_mcasp_startup(struct snd_pcm_substream *substream,u32 max_channels =0 ;int i, dir, ret;int tdm_slots = mcasp->tdm_slots; +u8 *numevt;/* Do not allow more then one stream per direction */ if (mcasp->substreams[substream->stream])
@@ -1558,9 +1560,12 @@ static int davinci_mcasp_startup(struct snd_pcm_substream *substream,return ret; } + numevt = (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) ? + &mcasp->txnumevt : + &mcasp->rxnumevt;snd_pcm_hw_rule_add (substream->runtime,0 ,SNDRV_PCM_HW_PARAM_PERIOD_SIZE , - davinci_mcasp_hw_rule_min_periodsize,NULL , + davinci_mcasp_hw_rule_min_periodsize, numevt,SNDRV_PCM_HW_PARAM_PERIOD_SIZE ,-1 );return 0 ;
Signature · 1 line
2.43.0
Sasha Levin
maintainerPATCH 6/14 ASoC: ti: omap-hdmi: Fix too long driver name
In reply to Sasha LevinFrom: Primoz Fiser <[email protected]>
[ Upstream commit 524d3f126362b6033e92cbe107ae2158d7fbff94 ]
Set driver name to "HDMI". This simplifies the code and gets rid of the following error messages:
ASoC: driver name too long 'HDMI 58040000.encoder' -> 'HDMI_58040000_e'
--- sound/soc/ti/omap-hdmi.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
sound/soc/ti/omap-hdmi.c +1 -5
@@ -353,11 +353,7 @@ static int omap_hdmi_audio_probe(struct platform_device *pdev)if (!card)return -ENOMEM ; - card->name =devm_kasprintf (dev,GFP_KERNEL , -"HDMI %s" ,dev_name (ad->dssdev)); -if (!card->name) -return -ENOMEM ; - + card->name ="HDMI" ; card->owner =THIS_MODULE ; card->dai_link =devm_kzalloc (dev,sizeof (*(card->dai_link)),GFP_KERNEL );
Signature · 1 line
2.43.0
Sasha Levin
maintainerPATCH 7/14 can: kvaser_usb: fix return value for hif_usb_send_regout
In reply to Sasha LevinFrom: Chen Ni <[email protected]>
[ Upstream commit 0d34d8163fd87978a6abd792e2d8ad849f4c3d57 ]
As the potential failure of usb_submit_urb(), it should be better to return the err variable to catch the error.
--- drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c +1 -1
@@ -265,7 +265,7 @@ int kvaser_usb_send_cmd_async(struct kvaser_usb_net_priv *priv, void *cmd, }usb_free_urb (urb); -return 0 ; +return err; }int kvaser_usb_can_rx_over_error (struct net_device *netdev)
Signature · 1 line
2.43.0
Sasha Levin
maintainerPATCH 8/14 s390/sclp: Fix sclp_init() cleanup on failure
In reply to Sasha LevinFrom: Heiko Carstens <[email protected]>
[ Upstream commit 6434b33faaa063df500af355ee6c3942e0f8d982 ]
If sclp_init() fails it only partially cleans up: if there are multiple failing calls to sclp_init() sclp_state_change_event will be added several times to sclp_reg_list, which results in the following warning:
------------[ cut here ]------------
list_add double add: new=000003ffe1598c10, prev=000003ffe1598bf0, next=000003ffe1598c10.
WARNING: CPU: 0 PID: 1 at lib/list_debug.c:35 __list_add_valid_or_report+0xde/0xf8
CPU: 0 PID: 1 Comm: swapper/0 Not tainted 6.10.0-rc3
Krnl PSW : 0404c00180000000 000003ffe0d6076a (__list_add_valid_or_report+0xe2/0xf8)
R:0 T:1 IO:0 EX:0 Key:0 M:1 W:0 P:0 AS:3 CC:0 PM:0 RI:0 EA:3
...
Call Trace:
[<000003ffe0d6076a>] __list_add_valid_or_report+0xe2/0xf8
([<000003ffe0d60766>] __list_add_valid_or_report+0xde/0xf8)
[<000003ffe0a8d37e>] sclp_init+0x40e/0x450
[<000003ffe00009f2>] do_one_initcall+0x42/0x1e0
[<000003ffe15b77a6>] do_initcalls+0x126/0x150
[<000003ffe15b7a0a>] kernel_init_freeable+0x1ba/0x1f8
[<000003ffe0d6650e>] kernel_init+0x2e/0x180
[<000003ffe000301c>] __ret_from_fork+0x3c/0x60
[<000003ffe0d759ca>] ret_from_fork+0xa/0x30Fix this by removing sclp_state_change_event from sclp_reg_list when sclp_init() fails.
--- drivers/s390/char/sclp.c | 1 + 1 file changed, 1 insertion(+)
drivers/s390/char/sclp.c +1 -0
@@ -1208,6 +1208,7 @@ sclp_init(void) fail_unregister_reboot_notifier:unregister_reboot_notifier (&sclp_reboot_notifier); fail_init_state_uninitialized: +list_del (&sclp_state_change_event.list); sclp_init_state = sclp_init_state_uninitialized;free_page ((unsigned long ) sclp_read_sccb);free_page ((unsigned long ) sclp_init_sccb);
Signature · 1 line
2.43.0
Sasha Levin
maintainerPATCH 9/14 platform/x86: lg-laptop: Remove LGEX0815 hotkey handling
In reply to Sasha LevinFrom: Armin Wolf <[email protected]>
[ Upstream commit 413c204595ca98a4f33414a948c18d7314087342 ]
The rfkill hotkey handling is already provided by the wireless-hotkey driver. Remove the now unnecessary rfkill hotkey handling to avoid duplicating functionality.
The ACPI notify handler still prints debugging information when receiving ACPI notifications to aid in reverse-engineering.
--- drivers/platform/x86/lg-laptop.c | 8 -------- 1 file changed, 8 deletions(-)
drivers/platform/x86/lg-laptop.c +0 -8
@@ -77,7 +77,6 @@ static const struct key_entry wmi_keymap[] = {* this key both sends an event and * changes backlight level. */ - {KE_KEY, 0x80, {KEY_RFKILL} }, {KE_END, 0} };
@@ -259,14 +258,7 @@ static void wmi_input_setup(void)static void acpi_notify (struct acpi_device *device,u32 event) { -struct key_entry *key; -acpi_handle_debug (device->handle,"notify: %d\n" , event); -if (inited &INIT_SPARSE_KEYMAP ) { - key =sparse_keymap_entry_from_scancode (wmi_input_dev,0x80 ); -if (key && key->type ==KE_KEY ) -sparse_keymap_report_entry (wmi_input_dev, key,1 , true); - } } static ssize_t fan_mode_store(struct device *dev,
Signature · 1 line
2.43.0
Sasha Levin
maintainerPATCH 10/14 platform/x86: lg-laptop: Change ACPI device id
In reply to Sasha LevinFrom: Armin Wolf <[email protected]>
[ Upstream commit 58a54f27a0dac81f7fd3514be01012635219a53c ]
The LGEX0815 ACPI device id is used for handling hotkey events, but this functionality is already handled by the wireless-hotkey driver.
The LGEX0820 ACPI device id however is used to manage various platform features using the WMAB/WMBB ACPI methods. Use this ACPI device id to avoid blocking the wireless-hotkey driver from probing.
--- drivers/platform/x86/lg-laptop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/platform/x86/lg-laptop.c +1 -1
@@ -647,7 +647,7 @@ static int acpi_remove(struct acpi_device *device) }static const struct acpi_device_id device_ids[] = { - {"LGEX0815" ,0 }, + {"LGEX0820" ,0 }, {"" ,0 } };MODULE_DEVICE_TABLE (acpi, device_ids);
Signature · 1 line
2.43.0
Sasha Levin
maintainerPATCH 11/14 btrfs: qgroup: fix quota root leak after quota disable failure
In reply to Sasha LevinFrom: Filipe Manana <[email protected]>
[ Upstream commit a7e4c6a3031c74078dba7fa36239d0f4fe476c53 ]
If during the quota disable we fail when cleaning the quota tree or when deleting the root from the root tree, we jump to the 'out' label without ever dropping the reference on the quota root, resulting in a leak of the root since fs_info->quota_root is no longer pointing to the root (we have set it to NULL just before those steps).
Fix this by always doing a btrfs_put_root() call under the 'out' label. This is a problem that exists since qgroups were first added in 2012 by commit bed92eae26cc ("Btrfs: qgroup implementation and prototypes"), but back then we missed a kfree on the quota root and free_extent_buffer() calls on its root and commit root nodes, since back then roots were not yet reference counted.
--- fs/btrfs/qgroup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/btrfs/qgroup.c +2 -2
@@ -1197,7 +1197,7 @@ int btrfs_quota_enable(struct btrfs_fs_info *fs_info)int btrfs_quota_disable (struct btrfs_fs_info *fs_info) { -struct btrfs_root *quota_root; +struct btrfs_root *quota_root =NULL ;struct btrfs_trans_handle *trans =NULL ;int ret =0 ;
@@ -1290,9 +1290,9 @@ int btrfs_quota_disable(struct btrfs_fs_info *fs_info)btrfs_tree_unlock (quota_root->node);btrfs_free_tree_block (trans, quota_root, quota_root->node,0 ,1 ); -btrfs_put_root (quota_root); out: +btrfs_put_root (quota_root);mutex_unlock (&fs_info->qgroup_ioctl_lock);if (ret && trans)btrfs_end_transaction (trans);
Signature · 1 line
2.43.0
Sasha Levin
maintainerPATCH 12/14 ALSA: hda/relatek: Enable Mute LED on HP Laptop 15-gw0xxx
In reply to Sasha LevinFrom: Aivaz Latypov <[email protected]>
[ Upstream commit 1d091a98c399c17d0571fa1d91a7123a698446e4 ]
This HP Laptop uses ALC236 codec with COEF 0x07 controlling the mute LED. Enable existing quirk for this device.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -9091,6 +9091,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {SND_PCI_QUIRK (0x103c ,0x8788 ,"HP OMEN 15" ,ALC285_FIXUP_HP_MUTE_LED ),SND_PCI_QUIRK (0x103c ,0x87b7 ,"HP Laptop 14-fq0xxx" ,ALC236_FIXUP_HP_MUTE_LED_COEFBIT2 ),SND_PCI_QUIRK (0x103c ,0x87c8 ,"HP" ,ALC287_FIXUP_HP_GPIO_LED ), +SND_PCI_QUIRK (0x103c ,0x87d3 ,"HP Laptop 15-gw0xxx" ,ALC236_FIXUP_HP_MUTE_LED_COEFBIT2 ),SND_PCI_QUIRK (0x103c ,0x87e5 ,"HP ProBook 440 G8 Notebook PC" ,ALC236_FIXUP_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x87e7 ,"HP ProBook 450 G8 Notebook PC" ,ALC236_FIXUP_HP_GPIO_LED ), SND_PCI_QUIRK(0x103c, 0x87f1, "HP ProBook 630 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),
Signature · 1 line
2.43.0
Sasha Levin
maintainerPATCH 13/14 ALSA: dmaengine_pcm: terminate dmaengine before synchronize
In reply to Sasha LevinFrom: Shengjiu Wang <[email protected]>
[ Upstream commit 6a7db25aad8ce6512b366d2ce1d0e60bac00a09d ]
When dmaengine supports pause function, in suspend state, dmaengine_pause() is called instead of dmaengine_terminate_async(),
In end of playback stream, the runtime->state will go to SNDRV_PCM_STATE_DRAINING, if system suspend & resume happen at this time, application will not resume playback stream, the stream will be closed directly, the dmaengine_terminate_async() will not be called before the dmaengine_synchronize(), which violates the call sequence for dmaengine_synchronize().
This behavior also happens for capture streams, but there is no SNDRV_PCM_STATE_DRAINING state for capture. So use dmaengine_tx_status() to check the DMA status if the status is DMA_PAUSED, then call dmaengine_terminate_async() to terminate dmaengine before dmaengine_synchronize().
--- sound/core/pcm_dmaengine.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
sound/core/pcm_dmaengine.c +12 -0
@@ -359,6 +359,12 @@ EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_sync_stop);int snd_dmaengine_pcm_close (struct snd_pcm_substream *substream) {struct dmaengine_pcm_runtime_data *prtd =substream_to_prtd (substream); +struct dma_tx_state state; +enum dma_status status; + + status =dmaengine_tx_status (prtd->dma_chan, prtd->cookie, &state); +if (status ==DMA_PAUSED ) +dmaengine_terminate_async (prtd->dma_chan);dmaengine_synchronize (prtd->dma_chan);kfree (prtd);
@@ -377,6 +383,12 @@ EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_close);int snd_dmaengine_pcm_close_release_chan (struct snd_pcm_substream *substream) {struct dmaengine_pcm_runtime_data *prtd =substream_to_prtd (substream); +struct dma_tx_state state; +enum dma_status status; + + status =dmaengine_tx_status (prtd->dma_chan, prtd->cookie, &state); +if (status ==DMA_PAUSED ) +dmaengine_terminate_async (prtd->dma_chan);dmaengine_synchronize (prtd->dma_chan);dma_release_channel (prtd->dma_chan);
Signature · 1 line
2.43.0
Sasha Levin
maintainerPATCH 14/14 net: usb: qmi_wwan: add Telit FN912 compositions
In reply to Sasha LevinFrom: Daniele Palmas <[email protected]>
[ Upstream commit 77453e2b015b5ced5b3f45364dd5a72dfc3bdecb ]
Add the following Telit FN912 compositions:
0x3000: rmnet + tty (AT/NMEA) + tty (AT) + tty (diag)
T: Bus=03 Lev=01 Prnt=03 Port=07 Cnt=01 Dev#= 8 Spd=480 MxCh= 0 D: Ver= 2.01 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 P: Vendor=1bc7 ProdID=3000 Rev=05.15 S: Manufacturer=Telit Cinterion S: Product=FN912 S: SerialNumber=92c4c4d8 C: #Ifs= 4 Cfg#= 1 Atr=e0 MxPwr=500mA I: If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=50 Driver=qmi_wwan E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=82(I) Atr=03(Int.) MxPS= 8 Ivl=32ms I: If#= 1 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=60 Driver=option E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=83(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=84(I) Atr=03(Int.) MxPS= 10 Ivl=32ms I: If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=40 Driver=option E: Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=85(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=86(I) Atr=03(Int.) MxPS= 10 Ivl=32ms I: If#= 3 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=option E: Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=87(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
0x3001: rmnet + tty (AT) + tty (diag) + DPL (data packet logging) + adb
T: Bus=03 Lev=01 Prnt=03 Port=07 Cnt=01 Dev#= 7 Spd=480 MxCh= 0 D: Ver= 2.01 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 P: Vendor=1bc7 ProdID=3001 Rev=05.15 S: Manufacturer=Telit Cinterion S: Product=FN912 S: SerialNumber=92c4c4d8 C: #Ifs= 5 Cfg#= 1 Atr=e0 MxPwr=500mA I: If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=50 Driver=qmi_wwan E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=82(I) Atr=03(Int.) MxPS= 8 Ivl=32ms I: If#= 1 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=40 Driver=option E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=83(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=84(I) Atr=03(Int.) MxPS= 10 Ivl=32ms I: If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=option E: Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=85(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms I: If#= 3 Alt= 0 #EPs= 1 Cls=ff(vend.) Sub=ff Prot=80 Driver=(none) E: Ad=86(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms I: If#= 4 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=42 Prot=01 Driver=usbfs E: Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=87(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
--- drivers/net/usb/qmi_wwan.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/usb/qmi_wwan.c +2 -0
@@ -1312,6 +1312,8 @@ static const struct usb_device_id products[] = { {QMI_QUIRK_SET_DTR(0x1bc7, 0x1260, 2)}, /* Telit LE910Cx */ {QMI_QUIRK_SET_DTR(0x1bc7, 0x1261, 2)}, /* Telit LE910Cx */ {QMI_QUIRK_SET_DTR(0x1bc7, 0x1900, 1)}, /* Telit LN940 series */ + {QMI_QUIRK_SET_DTR(0x1bc7, 0x3000, 0)}, /* Telit FN912 series */ + {QMI_QUIRK_SET_DTR(0x1bc7, 0x3001, 0)}, /* Telit FN912 series */ {QMI_FIXED_INTF(0x1c9e, 0x9801, 3)}, /* Telewell TW-3G HSPA+ */ {QMI_FIXED_INTF(0x1c9e, 0x9803, 4)}, /* Telewell TW-3G HSPA+ */ {QMI_FIXED_INTF(0x1c9e, 0x9b01, 3)}, /* XS Stick W100-2 from 4G Systems */
Signature · 1 line
2.43.0
Re: [PATCH AUTOSEL 5.10 09/14] platform/x86: lg-laptop: Remove LGEX0815 hotkey handling
In reply to Sasha LevinAm 09.07.24 um 18:25 schrieb Sasha Levin:
Quoted 10 lines
From: Armin Wolf <[email protected]>
[ Upstream commit
413c204595ca98a4f33414a948c18d7314087342]The rfkill hotkey handling is already provided by the wireless-hotkey driver. Remove the now unnecessary rfkill hotkey handling to avoid duplicating functionality.
The ACPI notify handler still prints debugging information when receiving ACPI notifications to aid in reverse-engineering.
Hi,
this depends on other patches not in kernel 5.10, please do not use this patch for kernel 5.10.
Thanks,
Armin Wolf
Quoted 38 lines
Tested-by Agathe Boutmy <[email protected]>Signed-off-by Armin Wolf <[email protected]>Reviewed-by Ilpo Järvinen <[email protected]>Reviewed-by Hans de Goede <[email protected]>Signed-off-by Hans de Goede <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- drivers/platform/x86/lg-laptop.c | 8 -------- 1 file changed, 8 deletions(-)drivers/platform/x86/lg-laptop.c +0
-8@@ -77,7 +77,6 @@ static const struct key_entry wmi_keymap[] = {* this key both sends an event and * changes backlight level. */ - {KE_KEY, 0x80, {KEY_RFKILL} }, {KE_END, 0} };@@ -259,14 +258,7 @@ static void wmi_input_setup(void)static void acpi_notify (struct acpi_device *device,u32 event) { -struct key_entry *key; -acpi_handle_debug (device->handle,"notify: %d\n" , event); -if (inited &INIT_SPARSE_KEYMAP ) { - key =sparse_keymap_entry_from_scancode (wmi_input_dev,0x80 ); -if (key && key->type ==KE_KEY ) -sparse_keymap_report_entry (wmi_input_dev, key,1 , true); - } } static ssize_t fan_mode_store(struct device *dev,
Re: [PATCH AUTOSEL 5.10 10/14] platform/x86: lg-laptop: Change ACPI device id
In reply to Sasha LevinAm 09.07.24 um 18:25 schrieb Sasha Levin:
Quoted 10 lines
From: Armin Wolf <[email protected]>
[ Upstream commit
58a54f27a0dac81f7fd3514be01012635219a53c]The LGEX0815 ACPI device id is used for handling hotkey events, but this functionality is already handled by the wireless-hotkey driver.
The LGEX0820 ACPI device id however is used to manage various platform features using the WMAB/WMBB ACPI methods. Use this ACPI device id to avoid blocking the wireless-hotkey driver from probing.
Hi,
this depends on other patches not in kernel 5.10, please do not use this patch for kernel 5.10.
Thanks,
Armin Wolf
Quoted 25 lines
Tested-by Agathe Boutmy <[email protected]>Signed-off-by Armin Wolf <[email protected]>Reviewed-by Ilpo Järvinen <[email protected]>Reviewed-by Hans de Goede <[email protected]>Signed-off-by Hans de Goede <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- drivers/platform/x86/lg-laptop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/platform/x86/lg-laptop.c +1
-1@@ -647,7 +647,7 @@ static int acpi_remove(struct acpi_device *device) }static const struct acpi_device_id device_ids[] = { - {"LGEX0815" ,0 }, + {"LGEX0820" ,0 }, {"" ,0 } };MODULE_DEVICE_TABLE (acpi, device_ids);