From bae1972a5433eaef110bc01dd9f03e3ac25c03bb Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 4 Oct 2023 16:38:24 +0200 Subject: [PATCH] 5.4-stable patches added patches: alsa-hda-disable-power-save-for-solving-pop-issue-on-lenovo-thinkcentre-m70q.patch ata-libata-scsi-ignore-reserved-bits-for-report-supported-operation-codes.patch i2c-i801-unregister-tco_pdev-in-i801_probe-error-path.patch --- ...pop-issue-on-lenovo-thinkcentre-m70q.patch | 31 ++++++++++++++ ...for-report-supported-operation-codes.patch | 40 +++++++++++++++++++ ...er-tco_pdev-in-i801_probe-error-path.patch | 32 +++++++++++++++ queue-5.4/series | 3 ++ 4 files changed, 106 insertions(+) create mode 100644 queue-5.4/alsa-hda-disable-power-save-for-solving-pop-issue-on-lenovo-thinkcentre-m70q.patch create mode 100644 queue-5.4/ata-libata-scsi-ignore-reserved-bits-for-report-supported-operation-codes.patch create mode 100644 queue-5.4/i2c-i801-unregister-tco_pdev-in-i801_probe-error-path.patch diff --git a/queue-5.4/alsa-hda-disable-power-save-for-solving-pop-issue-on-lenovo-thinkcentre-m70q.patch b/queue-5.4/alsa-hda-disable-power-save-for-solving-pop-issue-on-lenovo-thinkcentre-m70q.patch new file mode 100644 index 00000000000..71865523759 --- /dev/null +++ b/queue-5.4/alsa-hda-disable-power-save-for-solving-pop-issue-on-lenovo-thinkcentre-m70q.patch @@ -0,0 +1,31 @@ +From 057a28ef93bdbe84326d34cdb5543afdaab49fe1 Mon Sep 17 00:00:00 2001 +From: Kailang Yang +Date: Thu, 7 Sep 2023 15:24:34 +0800 +Subject: ALSA: hda: Disable power save for solving pop issue on Lenovo ThinkCentre M70q + +From: Kailang Yang + +commit 057a28ef93bdbe84326d34cdb5543afdaab49fe1 upstream. + +Lenovo ThinkCentre M70q had boot up pop noise. +Disable power save will solve pop issue. + +Signed-off-by: Kailang Yang +Cc: +Link: https://lore.kernel.org/r/315900e2efef42fd9855eacfeb443abd@realtek.com +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/pci/hda/hda_intel.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/sound/pci/hda/hda_intel.c ++++ b/sound/pci/hda/hda_intel.c +@@ -2237,6 +2237,7 @@ static struct snd_pci_quirk power_save_b + SND_PCI_QUIRK(0x8086, 0x2068, "Intel NUC7i3BNB", 0), + /* https://bugzilla.kernel.org/show_bug.cgi?id=198611 */ + SND_PCI_QUIRK(0x17aa, 0x2227, "Lenovo X1 Carbon 3rd Gen", 0), ++ SND_PCI_QUIRK(0x17aa, 0x316e, "Lenovo ThinkCentre M70q", 0), + /* https://bugzilla.redhat.com/show_bug.cgi?id=1689623 */ + SND_PCI_QUIRK(0x17aa, 0x367b, "Lenovo IdeaCentre B550", 0), + /* https://bugzilla.redhat.com/show_bug.cgi?id=1572975 */ diff --git a/queue-5.4/ata-libata-scsi-ignore-reserved-bits-for-report-supported-operation-codes.patch b/queue-5.4/ata-libata-scsi-ignore-reserved-bits-for-report-supported-operation-codes.patch new file mode 100644 index 00000000000..4cc15c86662 --- /dev/null +++ b/queue-5.4/ata-libata-scsi-ignore-reserved-bits-for-report-supported-operation-codes.patch @@ -0,0 +1,40 @@ +From 3ef600923521616ebe192c893468ad0424de2afb Mon Sep 17 00:00:00 2001 +From: Niklas Cassel +Date: Mon, 18 Sep 2023 22:24:50 +0200 +Subject: ata: libata-scsi: ignore reserved bits for REPORT SUPPORTED OPERATION CODES + +From: Niklas Cassel + +commit 3ef600923521616ebe192c893468ad0424de2afb upstream. + +For REPORT SUPPORTED OPERATION CODES command, the service action field is +defined as bits 0-4 in the second byte in the CDB. Bits 5-7 in the second +byte are reserved. + +Only look at the service action field in the second byte when determining +if the MAINTENANCE IN opcode is a REPORT SUPPORTED OPERATION CODES command. + +This matches how we only look at the service action field in the second +byte when determining if the SERVICE ACTION IN(16) opcode is a READ +CAPACITY(16) command (reserved bits 5-7 in the second byte are ignored). + +Fixes: 7b2030942859 ("libata: Add support for SCT Write Same") +Cc: stable@vger.kernel.org +Signed-off-by: Niklas Cassel +Signed-off-by: Damien Le Moal +Signed-off-by: Greg Kroah-Hartman +--- + drivers/ata/libata-scsi.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/ata/libata-scsi.c ++++ b/drivers/ata/libata-scsi.c +@@ -4551,7 +4551,7 @@ void ata_scsi_simulate(struct ata_device + break; + + case MAINTENANCE_IN: +- if (scsicmd[1] == MI_REPORT_SUPPORTED_OPERATION_CODES) ++ if ((scsicmd[1] & 0x1f) == MI_REPORT_SUPPORTED_OPERATION_CODES) + ata_scsi_rbuf_fill(&args, ata_scsiop_maint_in); + else + ata_scsi_set_invalid_field(dev, cmd, 1, 0xff); diff --git a/queue-5.4/i2c-i801-unregister-tco_pdev-in-i801_probe-error-path.patch b/queue-5.4/i2c-i801-unregister-tco_pdev-in-i801_probe-error-path.patch new file mode 100644 index 00000000000..da3f1701532 --- /dev/null +++ b/queue-5.4/i2c-i801-unregister-tco_pdev-in-i801_probe-error-path.patch @@ -0,0 +1,32 @@ +From 3914784553f68c931fc666dbe7e86fe881aada38 Mon Sep 17 00:00:00 2001 +From: Heiner Kallweit +Date: Thu, 14 Sep 2023 23:08:44 +0200 +Subject: i2c: i801: unregister tco_pdev in i801_probe() error path + +From: Heiner Kallweit + +commit 3914784553f68c931fc666dbe7e86fe881aada38 upstream. + +We have to unregister tco_pdev also if i2c_add_adapter() fails. + +Fixes: 9424693035a5 ("i2c: i801: Create iTCO device on newer Intel PCHs") +Cc: stable@vger.kernel.org +Signed-off-by: Heiner Kallweit +Reviewed-by: Mika Westerberg +Reviewed-by: Jean Delvare +Signed-off-by: Wolfram Sang +Signed-off-by: Greg Kroah-Hartman +--- + drivers/i2c/busses/i2c-i801.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/i2c/busses/i2c-i801.c ++++ b/drivers/i2c/busses/i2c-i801.c +@@ -1873,6 +1873,7 @@ static int i801_probe(struct pci_dev *de + "SMBus I801 adapter at %04lx", priv->smba); + err = i2c_add_adapter(&priv->adapter); + if (err) { ++ platform_device_unregister(priv->tco_pdev); + i801_acpi_remove(priv); + return err; + } diff --git a/queue-5.4/series b/queue-5.4/series index ef165ac1067..d08c5680f39 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -75,3 +75,6 @@ smack-retrieve-transmuting-information-in-smack_inod.patch smack-use-overlay-inode-label-in-smack_inode_copy_up.patch serial-8250_port-check-irq-data-before-use.patch nilfs2-fix-potential-use-after-free-in-nilfs_gccache_submit_read_data.patch +alsa-hda-disable-power-save-for-solving-pop-issue-on-lenovo-thinkcentre-m70q.patch +ata-libata-scsi-ignore-reserved-bits-for-report-supported-operation-codes.patch +i2c-i801-unregister-tco_pdev-in-i801_probe-error-path.patch -- 2.47.3