From: Sasha Levin Date: Wed, 10 Mar 2021 12:07:01 +0000 (-0500) Subject: Fixes for 4.4 X-Git-Tag: v4.4.261~3^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fa50fdcb6eedf87a96797c973347c0e546c09bec;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 4.4 Signed-off-by: Sasha Levin --- diff --git a/queue-4.4/pci-add-function-1-dma-alias-quirk-for-marvell-9215-.patch b/queue-4.4/pci-add-function-1-dma-alias-quirk-for-marvell-9215-.patch new file mode 100644 index 00000000000..34d8876a077 --- /dev/null +++ b/queue-4.4/pci-add-function-1-dma-alias-quirk-for-marvell-9215-.patch @@ -0,0 +1,37 @@ +From 4267d92b67a3fa298f14bf6457123910c2053c7d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 10 Nov 2020 16:00:57 -0600 +Subject: PCI: Add function 1 DMA alias quirk for Marvell 9215 SATA controller + +From: Bjorn Helgaas + +[ Upstream commit 059983790a4c963d92943e55a61fca55be427d55 ] + +Add function 1 DMA alias quirk for Marvell 88SS9215 PCIe SSD Controller. + +Link: https://bugzilla.kernel.org/show_bug.cgi?id=42679#c135 +Link: https://lore.kernel.org/r/20201110220516.697934-1-helgaas@kernel.org +Reported-by: John Smith +Signed-off-by: Bjorn Helgaas +Signed-off-by: Sasha Levin +--- + drivers/pci/quirks.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c +index bdaeccafa261..bc0aa0849e72 100644 +--- a/drivers/pci/quirks.c ++++ b/drivers/pci/quirks.c +@@ -3649,6 +3649,9 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL_EXT, 0x917a, + /* https://bugzilla.kernel.org/show_bug.cgi?id=42679#c46 */ + DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL_EXT, 0x91a0, + quirk_dma_func1_alias); ++/* https://bugzilla.kernel.org/show_bug.cgi?id=42679#c135 */ ++DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL_EXT, 0x9215, ++ quirk_dma_func1_alias); + /* https://bugzilla.kernel.org/show_bug.cgi?id=42679#c127 */ + DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL_EXT, 0x9220, + quirk_dma_func1_alias); +-- +2.30.1 + diff --git a/queue-4.4/platform-x86-acer-wmi-add-new-force_caps-module-para.patch b/queue-4.4/platform-x86-acer-wmi-add-new-force_caps-module-para.patch new file mode 100644 index 00000000000..38f8f942f40 --- /dev/null +++ b/queue-4.4/platform-x86-acer-wmi-add-new-force_caps-module-para.patch @@ -0,0 +1,78 @@ +From a20e794ef4a7ef8367375cb44864e52f18035dfc Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 19 Oct 2020 20:56:26 +0200 +Subject: platform/x86: acer-wmi: Add new force_caps module parameter + +From: Hans de Goede + +[ Upstream commit 39aa009bb66f9d5fbd1e58ca4aa03d6e6f2c9915 ] + +Add a new force_caps module parameter to allow overriding the drivers +builtin capability detection mechanism. + +This can be used to for example: +-Disable rfkill functionality on devices where there is an AA OEM DMI + record advertising non functional rfkill switches +-Force loading of the driver on devices with a missing AA OEM DMI record + +Note that force_caps is -1 when unset, this allows forcing the +capability field to 0, which results in acer-wmi only providing WMI +hotkey handling while disabling all other (led, rfkill, backlight) +functionality. + +Reviewed-by: Andy Shevchenko +Signed-off-by: Hans de Goede +Link: https://lore.kernel.org/r/20201019185628.264473-4-hdegoede@redhat.com +Signed-off-by: Sasha Levin +--- + drivers/platform/x86/acer-wmi.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c +index b336f2620f9d..e4f278fa6d69 100644 +--- a/drivers/platform/x86/acer-wmi.c ++++ b/drivers/platform/x86/acer-wmi.c +@@ -229,6 +229,7 @@ static int mailled = -1; + static int brightness = -1; + static int threeg = -1; + static int force_series; ++static int force_caps = -1; + static bool ec_raw_mode; + static bool has_type_aa; + static u16 commun_func_bitmap; +@@ -238,11 +239,13 @@ module_param(mailled, int, 0444); + module_param(brightness, int, 0444); + module_param(threeg, int, 0444); + module_param(force_series, int, 0444); ++module_param(force_caps, int, 0444); + module_param(ec_raw_mode, bool, 0444); + MODULE_PARM_DESC(mailled, "Set initial state of Mail LED"); + MODULE_PARM_DESC(brightness, "Set initial LCD backlight brightness"); + MODULE_PARM_DESC(threeg, "Set initial state of 3G hardware"); + MODULE_PARM_DESC(force_series, "Force a different laptop series"); ++MODULE_PARM_DESC(force_caps, "Force the capability bitmask to this value"); + MODULE_PARM_DESC(ec_raw_mode, "Enable EC raw mode"); + + struct acer_data { +@@ -2150,7 +2153,7 @@ static int __init acer_wmi_init(void) + } + /* WMID always provides brightness methods */ + interface->capability |= ACER_CAP_BRIGHTNESS; +- } else if (!wmi_has_guid(WMID_GUID2) && interface && !has_type_aa) { ++ } else if (!wmi_has_guid(WMID_GUID2) && interface && !has_type_aa && force_caps == -1) { + pr_err("No WMID device detection method found\n"); + return -ENODEV; + } +@@ -2180,6 +2183,9 @@ static int __init acer_wmi_init(void) + if (acpi_video_get_backlight_type() != acpi_backlight_vendor) + interface->capability &= ~ACER_CAP_BRIGHTNESS; + ++ if (force_caps != -1) ++ interface->capability = force_caps; ++ + if (wmi_has_guid(WMID_GUID3)) { + if (ec_raw_mode) { + if (ACPI_FAILURE(acer_wmi_enable_ec_raw())) { +-- +2.30.1 + diff --git a/queue-4.4/series b/queue-4.4/series index 10baf8f2cb0..bb692b71ce6 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -2,3 +2,5 @@ futex-fix-irq-self-deadlock-and-satisfy-assertion.patch futex-fix-spin_lock-spin_unlock_irq-imbalance.patch alsa-ctxfi-cthw20k2-fix-mask-on-conf-to-allow-4-bits.patch rsxx-return-efault-if-copy_to_user-fails.patch +platform-x86-acer-wmi-add-new-force_caps-module-para.patch +pci-add-function-1-dma-alias-quirk-for-marvell-9215-.patch