From: Sasha Levin Date: Thu, 30 Jan 2020 11:55:18 +0000 (-0500) Subject: fixes for 4.14 X-Git-Tag: v5.5.1~15^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1bf7ef62dcd437c1d7b536ab02c1b06220253bc3;p=thirdparty%2Fkernel%2Fstable-queue.git fixes for 4.14 Signed-off-by: Sasha Levin --- diff --git a/queue-4.14/arc-eznps-fix-allmodconfig-kconfig-warning.patch b/queue-4.14/arc-eznps-fix-allmodconfig-kconfig-warning.patch new file mode 100644 index 00000000000..5022b6bd35d --- /dev/null +++ b/queue-4.14/arc-eznps-fix-allmodconfig-kconfig-warning.patch @@ -0,0 +1,42 @@ +From 6ec952aa89ca374834a24cb9723f3f54e5ca4f63 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 26 Nov 2019 17:54:09 -0800 +Subject: arc: eznps: fix allmodconfig kconfig warning + +From: Randy Dunlap + +[ Upstream commit 1928b36cfa4df1aeedf5f2644d0c33f3a1fcfd7b ] + +Fix kconfig warning for arch/arc/plat-eznps/Kconfig allmodconfig: + +WARNING: unmet direct dependencies detected for CLKSRC_NPS + Depends on [n]: GENERIC_CLOCKEVENTS [=y] && !PHYS_ADDR_T_64BIT [=y] + Selected by [y]: + - ARC_PLAT_EZNPS [=y] + +Signed-off-by: Randy Dunlap +Cc: Vineet Gupta +Cc: Ofer Levi +Cc: linux-snps-arc@lists.infradead.org +Signed-off-by: Vineet Gupta +Signed-off-by: Sasha Levin +--- + arch/arc/plat-eznps/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arc/plat-eznps/Kconfig b/arch/arc/plat-eznps/Kconfig +index 8eff057efcaeb..ce908e2c52824 100644 +--- a/arch/arc/plat-eznps/Kconfig ++++ b/arch/arc/plat-eznps/Kconfig +@@ -7,7 +7,7 @@ + menuconfig ARC_PLAT_EZNPS + bool "\"EZchip\" ARC dev platform" + select CPU_BIG_ENDIAN +- select CLKSRC_NPS ++ select CLKSRC_NPS if !PHYS_ADDR_T_64BIT + select EZNPS_GIC + select EZCHIP_NPS_MANAGEMENT_ENET if ETHERNET + help +-- +2.20.1 + diff --git a/queue-4.14/atm-eni-fix-uninitialized-variable-warning.patch b/queue-4.14/atm-eni-fix-uninitialized-variable-warning.patch new file mode 100644 index 00000000000..0268b22c6f5 --- /dev/null +++ b/queue-4.14/atm-eni-fix-uninitialized-variable-warning.patch @@ -0,0 +1,52 @@ +From acce34d3a7a1b8e496a454da1a5bda31222a4645 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 7 Jan 2020 21:43:59 +0100 +Subject: atm: eni: fix uninitialized variable warning + +From: Arnd Bergmann + +[ Upstream commit 30780d086a83332adcd9362281201cee7c3d9d19 ] + +With -O3, gcc has found an actual unintialized variable stored +into an mmio register in two instances: + +drivers/atm/eni.c: In function 'discard': +drivers/atm/eni.c:465:13: error: 'dma[1]' is used uninitialized in this function [-Werror=uninitialized] + writel(dma[i*2+1],eni_dev->rx_dma+dma_wr*8+4); + ^ +drivers/atm/eni.c:465:13: error: 'dma[3]' is used uninitialized in this function [-Werror=uninitialized] + +Change the code to always write zeroes instead. + +Signed-off-by: Arnd Bergmann +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/atm/eni.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c +index ce47eb17901d0..a106d15f6def0 100644 +--- a/drivers/atm/eni.c ++++ b/drivers/atm/eni.c +@@ -372,7 +372,7 @@ static int do_rx_dma(struct atm_vcc *vcc,struct sk_buff *skb, + here = (eni_vcc->descr+skip) & (eni_vcc->words-1); + dma[j++] = (here << MID_DMA_COUNT_SHIFT) | (vcc->vci + << MID_DMA_VCI_SHIFT) | MID_DT_JK; +- j++; ++ dma[j++] = 0; + } + here = (eni_vcc->descr+size+skip) & (eni_vcc->words-1); + if (!eff) size += skip; +@@ -445,7 +445,7 @@ static int do_rx_dma(struct atm_vcc *vcc,struct sk_buff *skb, + if (size != eff) { + dma[j++] = (here << MID_DMA_COUNT_SHIFT) | + (vcc->vci << MID_DMA_VCI_SHIFT) | MID_DT_JK; +- j++; ++ dma[j++] = 0; + } + if (!j || j > 2*RX_DMA_BUF) { + printk(KERN_CRIT DEV_LABEL "!j or j too big!!!\n"); +-- +2.20.1 + diff --git a/queue-4.14/drivers-net-b44-change-to-non-atomic-bit-operations-.patch b/queue-4.14/drivers-net-b44-change-to-non-atomic-bit-operations-.patch new file mode 100644 index 00000000000..7fb87d3041f --- /dev/null +++ b/queue-4.14/drivers-net-b44-change-to-non-atomic-bit-operations-.patch @@ -0,0 +1,66 @@ +From 6ce3d3fd7bef1787af2cac8dcd275d3dca87ad8a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 2 Jan 2020 13:27:06 -0800 +Subject: drivers/net/b44: Change to non-atomic bit operations on pwol_mask + +From: Fenghua Yu + +[ Upstream commit f11421ba4af706cb4f5703de34fa77fba8472776 ] + +Atomic operations that span cache lines are super-expensive on x86 +(not just to the current processor, but also to other processes as all +memory operations are blocked until the operation completes). Upcoming +x86 processors have a switch to cause such operations to generate a #AC +trap. It is expected that some real time systems will enable this mode +in BIOS. + +In preparation for this, it is necessary to fix code that may execute +atomic instructions with operands that cross cachelines because the #AC +trap will crash the kernel. + +Since "pwol_mask" is local and never exposed to concurrency, there is +no need to set bits in pwol_mask using atomic operations. + +Directly operate on the byte which contains the bit instead of using +__set_bit() to avoid any big endian concern due to type cast to +unsigned long in __set_bit(). + +Suggested-by: Peter Zijlstra +Signed-off-by: Fenghua Yu +Signed-off-by: Tony Luck +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/broadcom/b44.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/drivers/net/ethernet/broadcom/b44.c b/drivers/net/ethernet/broadcom/b44.c +index a1125d10c8255..8b9a0ce1d29f5 100644 +--- a/drivers/net/ethernet/broadcom/b44.c ++++ b/drivers/net/ethernet/broadcom/b44.c +@@ -1521,8 +1521,10 @@ static int b44_magic_pattern(u8 *macaddr, u8 *ppattern, u8 *pmask, int offset) + int ethaddr_bytes = ETH_ALEN; + + memset(ppattern + offset, 0xff, magicsync); +- for (j = 0; j < magicsync; j++) +- set_bit(len++, (unsigned long *) pmask); ++ for (j = 0; j < magicsync; j++) { ++ pmask[len >> 3] |= BIT(len & 7); ++ len++; ++ } + + for (j = 0; j < B44_MAX_PATTERNS; j++) { + if ((B44_PATTERN_SIZE - len) >= ETH_ALEN) +@@ -1534,7 +1536,8 @@ static int b44_magic_pattern(u8 *macaddr, u8 *ppattern, u8 *pmask, int offset) + for (k = 0; k< ethaddr_bytes; k++) { + ppattern[offset + magicsync + + (j * ETH_ALEN) + k] = macaddr[k]; +- set_bit(len++, (unsigned long *) pmask); ++ pmask[len >> 3] |= BIT(len & 7); ++ len++; + } + } + return len - 1; +-- +2.20.1 + diff --git a/queue-4.14/gpio-max77620-add-missing-dependency-on-gpiolib_irqc.patch b/queue-4.14/gpio-max77620-add-missing-dependency-on-gpiolib_irqc.patch new file mode 100644 index 00000000000..a96476a8a2d --- /dev/null +++ b/queue-4.14/gpio-max77620-add-missing-dependency-on-gpiolib_irqc.patch @@ -0,0 +1,41 @@ +From 1fcd81f4417eeed5f19df2e2e7f2002a050d4027 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 6 Jan 2020 04:51:54 +0300 +Subject: gpio: max77620: Add missing dependency on GPIOLIB_IRQCHIP +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Dmitry Osipenko + +[ Upstream commit c5706c7defc79de68a115b5536376298a8fef111 ] + +Driver fails to compile in a minimized kernel's configuration because of +the missing dependency on GPIOLIB_IRQCHIP. + + error: ‘struct gpio_chip’ has no member named ‘irq’ + 44 | virq = irq_find_mapping(gpio->gpio_chip.irq.domain, offset); + +Signed-off-by: Dmitry Osipenko +Link: https://lore.kernel.org/r/20200106015154.12040-1-digetx@gmail.com +Signed-off-by: Linus Walleij +Signed-off-by: Sasha Levin +--- + drivers/gpio/Kconfig | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig +index 2357d2f73c1ad..8d2ab77c6581d 100644 +--- a/drivers/gpio/Kconfig ++++ b/drivers/gpio/Kconfig +@@ -990,6 +990,7 @@ config GPIO_LP87565 + config GPIO_MAX77620 + tristate "GPIO support for PMIC MAX77620 and MAX20024" + depends on MFD_MAX77620 ++ select GPIOLIB_IRQCHIP + help + GPIO driver for MAX77620 and MAX20024 PMIC from Maxim Semiconductor. + MAX77620 PMIC has 8 pins that can be configured as GPIOs. The +-- +2.20.1 + diff --git a/queue-4.14/hid-ite-add-usb-id-match-for-acer-sw5-012-keyboard-d.patch b/queue-4.14/hid-ite-add-usb-id-match-for-acer-sw5-012-keyboard-d.patch new file mode 100644 index 00000000000..84931de032b --- /dev/null +++ b/queue-4.14/hid-ite-add-usb-id-match-for-acer-sw5-012-keyboard-d.patch @@ -0,0 +1,56 @@ +From 2f2afc863180979ceac6f4770cc50f5c198aed1b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 19 Nov 2019 15:57:11 +0100 +Subject: HID: ite: Add USB id match for Acer SW5-012 keyboard dock + +From: Hans de Goede + +[ Upstream commit 8f18eca9ebc57d6b150237033f6439242907e0ba ] + +The Acer SW5-012 2-in-1 keyboard dock uses a Synaptics S91028 touchpad +which is connected to an ITE 8595 USB keyboard controller chip. + +This keyboard has the same quirk for its rfkill / airplane mode hotkey as +other keyboards with the ITE 8595 chip, it only sends a single release +event when pressed and released, it never sends a press event. + +This commit adds this keyboards USB id to the hid-ite id-table, fixing +the rfkill key not working on this keyboard. + +Signed-off-by: Hans de Goede +Signed-off-by: Jiri Kosina +Signed-off-by: Sasha Levin +--- + drivers/hid/hid-ids.h | 1 + + drivers/hid/hid-ite.c | 3 +++ + 2 files changed, 4 insertions(+) + +diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h +index 1e2e6e58256ad..9d372fa7c298c 100644 +--- a/drivers/hid/hid-ids.h ++++ b/drivers/hid/hid-ids.h +@@ -1024,6 +1024,7 @@ + #define USB_DEVICE_ID_SYNAPTICS_LTS2 0x1d10 + #define USB_DEVICE_ID_SYNAPTICS_HD 0x0ac3 + #define USB_DEVICE_ID_SYNAPTICS_QUAD_HD 0x1ac3 ++#define USB_DEVICE_ID_SYNAPTICS_ACER_SWITCH5_012 0x2968 + #define USB_DEVICE_ID_SYNAPTICS_TP_V103 0x5710 + + #define USB_VENDOR_ID_TEXAS_INSTRUMENTS 0x2047 +diff --git a/drivers/hid/hid-ite.c b/drivers/hid/hid-ite.c +index 98b059d79bc89..2ce1eb0c92125 100644 +--- a/drivers/hid/hid-ite.c ++++ b/drivers/hid/hid-ite.c +@@ -43,6 +43,9 @@ static int ite_event(struct hid_device *hdev, struct hid_field *field, + static const struct hid_device_id ite_devices[] = { + { HID_USB_DEVICE(USB_VENDOR_ID_ITE, USB_DEVICE_ID_ITE8595) }, + { HID_USB_DEVICE(USB_VENDOR_ID_258A, USB_DEVICE_ID_258A_6A88) }, ++ /* ITE8595 USB kbd ctlr, with Synaptics touchpad connected to it. */ ++ { HID_USB_DEVICE(USB_VENDOR_ID_SYNAPTICS, ++ USB_DEVICE_ID_SYNAPTICS_ACER_SWITCH5_012) }, + { } + }; + MODULE_DEVICE_TABLE(hid, ite_devices); +-- +2.20.1 + diff --git a/queue-4.14/net-wan-sdla-fix-cast-from-pointer-to-integer-of-dif.patch b/queue-4.14/net-wan-sdla-fix-cast-from-pointer-to-integer-of-dif.patch new file mode 100644 index 00000000000..ccc809e1d3b --- /dev/null +++ b/queue-4.14/net-wan-sdla-fix-cast-from-pointer-to-integer-of-dif.patch @@ -0,0 +1,43 @@ +From 008de6276379945bf483d02f48eddf2367d420e5 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 4 Jan 2020 15:31:43 +0100 +Subject: net: wan: sdla: Fix cast from pointer to integer of different size +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Krzysztof Kozlowski + +[ Upstream commit 00c0688cecadbf7ac2f5b4cdb36d912a2d3f0cca ] + +Since net_device.mem_start is unsigned long, it should not be cast to +int right before casting to pointer. This fixes warning (compile +testing on alpha architecture): + + drivers/net/wan/sdla.c: In function ‘sdla_transmit’: + drivers/net/wan/sdla.c:711:13: warning: + cast to pointer from integer of different size [-Wint-to-pointer-cast] + +Signed-off-by: Krzysztof Kozlowski +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/wan/sdla.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/wan/sdla.c b/drivers/net/wan/sdla.c +index 236c625380368..1eb329fc72413 100644 +--- a/drivers/net/wan/sdla.c ++++ b/drivers/net/wan/sdla.c +@@ -711,7 +711,7 @@ static netdev_tx_t sdla_transmit(struct sk_buff *skb, + + spin_lock_irqsave(&sdla_lock, flags); + SDLA_WINDOW(dev, addr); +- pbuf = (void *)(((int) dev->mem_start) + (addr & SDLA_ADDR_MASK)); ++ pbuf = (void *)(dev->mem_start + (addr & SDLA_ADDR_MASK)); + __sdla_write(dev, pbuf->buf_addr, skb->data, skb->len); + SDLA_WINDOW(dev, addr); + pbuf->opp_flag = 1; +-- +2.20.1 + diff --git a/queue-4.14/pci-add-dma-alias-quirk-for-intel-vca-ntb.patch b/queue-4.14/pci-add-dma-alias-quirk-for-intel-vca-ntb.patch new file mode 100644 index 00000000000..c3e0c4f2b08 --- /dev/null +++ b/queue-4.14/pci-add-dma-alias-quirk-for-intel-vca-ntb.patch @@ -0,0 +1,80 @@ +From cbfceebeec9b90c9a5b5d1a4f8021d3c8a7d493d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 17 Sep 2019 09:20:48 +0000 +Subject: PCI: Add DMA alias quirk for Intel VCA NTB + +From: Slawomir Pawlowski + +[ Upstream commit 56b4cd4b7da9ee95778eb5c8abea49f641ebfd91 ] + +Intel Visual Compute Accelerator (VCA) is a family of PCIe add-in devices +exposing computational units via Non Transparent Bridges (NTB, PEX 87xx). + +Similarly to MIC x200, we need to add DMA aliases to allow buffer access +when IOMMU is enabled. + +Add aliases to allow computational unit access to host memory. These +aliases mark the whole VCA device as one IOMMU group. + +All possible slot numbers (0x20) are used, since we are unable to tell what +slot is used on other side. This quirk is intended for both host and +computational unit sides. The VCA devices have up to five functions: four +for DMA channels and one additional. + +Link: https://lore.kernel.org/r/5683A335CC8BE1438C3C30C49DCC38DF637CED8E@IRSMSX102.ger.corp.intel.com +Signed-off-by: Slawomir Pawlowski +Signed-off-by: Przemek Kitszel +Signed-off-by: Bjorn Helgaas +Signed-off-by: Sasha Levin +--- + drivers/pci/quirks.c | 34 ++++++++++++++++++++++++++++++++++ + 1 file changed, 34 insertions(+) + +diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c +index 90df085e9f925..e7ed051ec125e 100644 +--- a/drivers/pci/quirks.c ++++ b/drivers/pci/quirks.c +@@ -4019,6 +4019,40 @@ static void quirk_mic_x200_dma_alias(struct pci_dev *pdev) + DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2260, quirk_mic_x200_dma_alias); + DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2264, quirk_mic_x200_dma_alias); + ++/* ++ * Intel Visual Compute Accelerator (VCA) is a family of PCIe add-in devices ++ * exposing computational units via Non Transparent Bridges (NTB, PEX 87xx). ++ * ++ * Similarly to MIC x200, we need to add DMA aliases to allow buffer access ++ * when IOMMU is enabled. These aliases allow computational unit access to ++ * host memory. These aliases mark the whole VCA device as one IOMMU ++ * group. ++ * ++ * All possible slot numbers (0x20) are used, since we are unable to tell ++ * what slot is used on other side. This quirk is intended for both host ++ * and computational unit sides. The VCA devices have up to five functions ++ * (four for DMA channels and one additional). ++ */ ++static void quirk_pex_vca_alias(struct pci_dev *pdev) ++{ ++ const unsigned int num_pci_slots = 0x20; ++ unsigned int slot; ++ ++ for (slot = 0; slot < num_pci_slots; slot++) { ++ pci_add_dma_alias(pdev, PCI_DEVFN(slot, 0x0)); ++ pci_add_dma_alias(pdev, PCI_DEVFN(slot, 0x1)); ++ pci_add_dma_alias(pdev, PCI_DEVFN(slot, 0x2)); ++ pci_add_dma_alias(pdev, PCI_DEVFN(slot, 0x3)); ++ pci_add_dma_alias(pdev, PCI_DEVFN(slot, 0x4)); ++ } ++} ++DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2954, quirk_pex_vca_alias); ++DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2955, quirk_pex_vca_alias); ++DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2956, quirk_pex_vca_alias); ++DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2958, quirk_pex_vca_alias); ++DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2959, quirk_pex_vca_alias); ++DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x295A, quirk_pex_vca_alias); ++ + /* + * The IOMMU and interrupt controller on Broadcom Vulcan/Cavium ThunderX2 are + * associated not at the root bus, but at a bridge below. This quirk avoids +-- +2.20.1 + diff --git a/queue-4.14/phy-cpcap-usb-prevent-usb-line-glitches-from-waking-.patch b/queue-4.14/phy-cpcap-usb-prevent-usb-line-glitches-from-waking-.patch new file mode 100644 index 00000000000..028216eb1c1 --- /dev/null +++ b/queue-4.14/phy-cpcap-usb-prevent-usb-line-glitches-from-waking-.patch @@ -0,0 +1,94 @@ +From fa8e4860fa3a82d14a714db9843363198bb74b79 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 22 Dec 2019 10:17:02 -0800 +Subject: phy: cpcap-usb: Prevent USB line glitches from waking up modem + +From: Tony Lindgren + +[ Upstream commit 63078b6ba09e842f09df052c5728857389fddcd2 ] + +The micro-USB connector on Motorola Mapphone devices can be muxed between +the SoC and the mdm6600 modem. But even when used for the SoC, configuring +the PHY with ID pin grounded will wake up the modem from idle state. Looks +like the issue is probably caused by line glitches. + +We can prevent the glitches by using a previously unknown mode of the +GPIO mux to prevent the USB lines from being connected to the moden while +configuring the USB PHY, and enable the USB lines after configuring the +PHY. + +Note that this only prevents waking up mdm6600 as regular USB A-host mode, +and does not help when connected to a lapdock. The lapdock specific issue +still needs to be debugged separately. + +Cc: Merlijn Wajer +Cc: Pavel Machek +Cc: Sebastian Reichel +Acked-by: Pavel Machek +Signed-off-by: Tony Lindgren +Signed-off-by: Kishon Vijay Abraham I +Signed-off-by: Sasha Levin +--- + drivers/phy/motorola/phy-cpcap-usb.c | 18 +++++++++++++++--- + 1 file changed, 15 insertions(+), 3 deletions(-) + +diff --git a/drivers/phy/motorola/phy-cpcap-usb.c b/drivers/phy/motorola/phy-cpcap-usb.c +index 4ba3634009afc..593c77dbde2eb 100644 +--- a/drivers/phy/motorola/phy-cpcap-usb.c ++++ b/drivers/phy/motorola/phy-cpcap-usb.c +@@ -115,7 +115,7 @@ struct cpcap_usb_ints_state { + enum cpcap_gpio_mode { + CPCAP_DM_DP, + CPCAP_MDM_RX_TX, +- CPCAP_UNKNOWN, ++ CPCAP_UNKNOWN_DISABLED, /* Seems to disable USB lines */ + CPCAP_OTG_DM_DP, + }; + +@@ -379,7 +379,8 @@ static int cpcap_usb_set_uart_mode(struct cpcap_phy_ddata *ddata) + { + int error; + +- error = cpcap_usb_gpio_set_mode(ddata, CPCAP_DM_DP); ++ /* Disable lines to prevent glitches from waking up mdm6600 */ ++ error = cpcap_usb_gpio_set_mode(ddata, CPCAP_UNKNOWN_DISABLED); + if (error) + goto out_err; + +@@ -406,6 +407,11 @@ static int cpcap_usb_set_uart_mode(struct cpcap_phy_ddata *ddata) + if (error) + goto out_err; + ++ /* Enable UART mode */ ++ error = cpcap_usb_gpio_set_mode(ddata, CPCAP_DM_DP); ++ if (error) ++ goto out_err; ++ + return 0; + + out_err: +@@ -418,7 +424,8 @@ static int cpcap_usb_set_usb_mode(struct cpcap_phy_ddata *ddata) + { + int error; + +- error = cpcap_usb_gpio_set_mode(ddata, CPCAP_OTG_DM_DP); ++ /* Disable lines to prevent glitches from waking up mdm6600 */ ++ error = cpcap_usb_gpio_set_mode(ddata, CPCAP_UNKNOWN_DISABLED); + if (error) + return error; + +@@ -458,6 +465,11 @@ static int cpcap_usb_set_usb_mode(struct cpcap_phy_ddata *ddata) + if (error) + goto out_err; + ++ /* Enable USB mode */ ++ error = cpcap_usb_gpio_set_mode(ddata, CPCAP_OTG_DM_DP); ++ if (error) ++ goto out_err; ++ + return 0; + + out_err: +-- +2.20.1 + diff --git a/queue-4.14/series b/queue-4.14/series index 7e8eb381424..12f551d01a0 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -15,3 +15,15 @@ ath9k-fix-storage-endpoint-lookup.patch brcmfmac-fix-interface-sanity-check.patch rtl8xxxu-fix-interface-sanity-check.patch zd1211rw-fix-storage-endpoint-lookup.patch +arc-eznps-fix-allmodconfig-kconfig-warning.patch +hid-ite-add-usb-id-match-for-acer-sw5-012-keyboard-d.patch +phy-cpcap-usb-prevent-usb-line-glitches-from-waking-.patch +watchdog-max77620_wdt-fix-potential-build-errors.patch +watchdog-rn5t618_wdt-fix-module-aliases.patch +spi-spi-dw-add-lock-protect-dw_spi-rx-tx-to-prevent-.patch +drivers-net-b44-change-to-non-atomic-bit-operations-.patch +net-wan-sdla-fix-cast-from-pointer-to-integer-of-dif.patch +gpio-max77620-add-missing-dependency-on-gpiolib_irqc.patch +atm-eni-fix-uninitialized-variable-warning.patch +pci-add-dma-alias-quirk-for-intel-vca-ntb.patch +usb-storage-disable-uas-on-jmicron-sata-enclosure.patch diff --git a/queue-4.14/spi-spi-dw-add-lock-protect-dw_spi-rx-tx-to-prevent-.patch b/queue-4.14/spi-spi-dw-add-lock-protect-dw_spi-rx-tx-to-prevent-.patch new file mode 100644 index 00000000000..1abde3f7aca --- /dev/null +++ b/queue-4.14/spi-spi-dw-add-lock-protect-dw_spi-rx-tx-to-prevent-.patch @@ -0,0 +1,135 @@ +From a9109e408c71d295cbaae8cace23e276fdcd39b7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 1 Jan 2020 11:39:41 +0800 +Subject: spi: spi-dw: Add lock protect dw_spi rx/tx to prevent concurrent + calls + +From: wuxu.wu + +[ Upstream commit 19b61392c5a852b4e8a0bf35aecb969983c5932d ] + +dw_spi_irq() and dw_spi_transfer_one concurrent calls. + +I find a panic in dw_writer(): txw = *(u8 *)(dws->tx), when dw->tx==null, +dw->len==4, and dw->tx_end==1. + +When tpm driver's message overtime dw_spi_irq() and dw_spi_transfer_one +may concurrent visit dw_spi, so I think dw_spi structure lack of protection. + +Otherwise dw_spi_transfer_one set dw rx/tx buffer and then open irq, +store dw rx/tx instructions and other cores handle irq load dw rx/tx +instructions may out of order. + + [ 1025.321302] Call trace: + ... + [ 1025.321319] __crash_kexec+0x98/0x148 + [ 1025.321323] panic+0x17c/0x314 + [ 1025.321329] die+0x29c/0x2e8 + [ 1025.321334] die_kernel_fault+0x68/0x78 + [ 1025.321337] __do_kernel_fault+0x90/0xb0 + [ 1025.321346] do_page_fault+0x88/0x500 + [ 1025.321347] do_translation_fault+0xa8/0xb8 + [ 1025.321349] do_mem_abort+0x68/0x118 + [ 1025.321351] el1_da+0x20/0x8c + [ 1025.321362] dw_writer+0xc8/0xd0 + [ 1025.321364] interrupt_transfer+0x60/0x110 + [ 1025.321365] dw_spi_irq+0x48/0x70 + ... + +Signed-off-by: wuxu.wu +Link: https://lore.kernel.org/r/1577849981-31489-1-git-send-email-wuxu.wu@huawei.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + drivers/spi/spi-dw.c | 15 ++++++++++++--- + drivers/spi/spi-dw.h | 1 + + 2 files changed, 13 insertions(+), 3 deletions(-) + +diff --git a/drivers/spi/spi-dw.c b/drivers/spi/spi-dw.c +index b217c22ff72fe..b461200871f89 100644 +--- a/drivers/spi/spi-dw.c ++++ b/drivers/spi/spi-dw.c +@@ -180,9 +180,11 @@ static inline u32 rx_max(struct dw_spi *dws) + + static void dw_writer(struct dw_spi *dws) + { +- u32 max = tx_max(dws); ++ u32 max; + u16 txw = 0; + ++ spin_lock(&dws->buf_lock); ++ max = tx_max(dws); + while (max--) { + /* Set the tx word if the transfer's original "tx" is not null */ + if (dws->tx_end - dws->len) { +@@ -194,13 +196,16 @@ static void dw_writer(struct dw_spi *dws) + dw_write_io_reg(dws, DW_SPI_DR, txw); + dws->tx += dws->n_bytes; + } ++ spin_unlock(&dws->buf_lock); + } + + static void dw_reader(struct dw_spi *dws) + { +- u32 max = rx_max(dws); ++ u32 max; + u16 rxw; + ++ spin_lock(&dws->buf_lock); ++ max = rx_max(dws); + while (max--) { + rxw = dw_read_io_reg(dws, DW_SPI_DR); + /* Care rx only if the transfer's original "rx" is not null */ +@@ -212,6 +217,7 @@ static void dw_reader(struct dw_spi *dws) + } + dws->rx += dws->n_bytes; + } ++ spin_unlock(&dws->buf_lock); + } + + static void int_error_stop(struct dw_spi *dws, const char *msg) +@@ -284,18 +290,20 @@ static int dw_spi_transfer_one(struct spi_master *master, + { + struct dw_spi *dws = spi_master_get_devdata(master); + struct chip_data *chip = spi_get_ctldata(spi); ++ unsigned long flags; + u8 imask = 0; + u16 txlevel = 0; + u32 cr0; + int ret; + + dws->dma_mapped = 0; +- ++ spin_lock_irqsave(&dws->buf_lock, flags); + dws->tx = (void *)transfer->tx_buf; + dws->tx_end = dws->tx + transfer->len; + dws->rx = transfer->rx_buf; + dws->rx_end = dws->rx + transfer->len; + dws->len = transfer->len; ++ spin_unlock_irqrestore(&dws->buf_lock, flags); + + spi_enable_chip(dws, 0); + +@@ -486,6 +494,7 @@ int dw_spi_add_host(struct device *dev, struct dw_spi *dws) + dws->type = SSI_MOTO_SPI; + dws->dma_inited = 0; + dws->dma_addr = (dma_addr_t)(dws->paddr + DW_SPI_DR); ++ spin_lock_init(&dws->buf_lock); + + ret = request_irq(dws->irq, dw_spi_irq, IRQF_SHARED, dev_name(dev), + master); +diff --git a/drivers/spi/spi-dw.h b/drivers/spi/spi-dw.h +index 5c07cf8f19e00..45fbf3ad591cc 100644 +--- a/drivers/spi/spi-dw.h ++++ b/drivers/spi/spi-dw.h +@@ -117,6 +117,7 @@ struct dw_spi { + size_t len; + void *tx; + void *tx_end; ++ spinlock_t buf_lock; + void *rx; + void *rx_end; + int dma_mapped; +-- +2.20.1 + diff --git a/queue-4.14/usb-storage-disable-uas-on-jmicron-sata-enclosure.patch b/queue-4.14/usb-storage-disable-uas-on-jmicron-sata-enclosure.patch new file mode 100644 index 00000000000..9fb9ad27850 --- /dev/null +++ b/queue-4.14/usb-storage-disable-uas-on-jmicron-sata-enclosure.patch @@ -0,0 +1,47 @@ +From c10aad6b3c90df20e10c8ea9548f015268edcdcb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 8 Sep 2015 09:53:38 -0700 +Subject: usb-storage: Disable UAS on JMicron SATA enclosure + +From: Laura Abbott + +[ Upstream commit bc3bdb12bbb3492067c8719011576370e959a2e6 ] + +Steve Ellis reported incorrect block sizes and alignement +offsets with a SATA enclosure. Adding a quirk to disable +UAS fixes the problems. + +Reported-by: Steven Ellis +Cc: Pacho Ramos +Signed-off-by: Laura Abbott +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Sasha Levin +--- + drivers/usb/storage/unusual_uas.h | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/drivers/usb/storage/unusual_uas.h b/drivers/usb/storage/unusual_uas.h +index f15aa47c54a9d..0eb8c67ee1382 100644 +--- a/drivers/usb/storage/unusual_uas.h ++++ b/drivers/usb/storage/unusual_uas.h +@@ -163,12 +163,15 @@ UNUSUAL_DEV(0x2537, 0x1068, 0x0000, 0x9999, + USB_SC_DEVICE, USB_PR_DEVICE, NULL, + US_FL_IGNORE_UAS), + +-/* Reported-by: Takeo Nakayama */ ++/* ++ * Initially Reported-by: Takeo Nakayama ++ * UAS Ignore Reported by Steven Ellis ++ */ + UNUSUAL_DEV(0x357d, 0x7788, 0x0000, 0x9999, + "JMicron", + "JMS566", + USB_SC_DEVICE, USB_PR_DEVICE, NULL, +- US_FL_NO_REPORT_OPCODES), ++ US_FL_NO_REPORT_OPCODES | US_FL_IGNORE_UAS), + + /* Reported-by: Hans de Goede */ + UNUSUAL_DEV(0x4971, 0x1012, 0x0000, 0x9999, +-- +2.20.1 + diff --git a/queue-4.14/watchdog-max77620_wdt-fix-potential-build-errors.patch b/queue-4.14/watchdog-max77620_wdt-fix-potential-build-errors.patch new file mode 100644 index 00000000000..2d8fa39afab --- /dev/null +++ b/queue-4.14/watchdog-max77620_wdt-fix-potential-build-errors.patch @@ -0,0 +1,37 @@ +From c932e6a8f944985cc292cbe99cd2ccfe6f7c39d8 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 27 Nov 2019 09:46:17 +0100 +Subject: watchdog: max77620_wdt: fix potential build errors + +From: David Engraf + +[ Upstream commit da9e3f4e30a53cd420cf1e6961c3b4110f0f21f0 ] + +max77620_wdt uses watchdog core functions. Enable CONFIG_WATCHDOG_CORE +to fix potential build errors. + +Signed-off-by: David Engraf +Reviewed-by: Guenter Roeck +Link: https://lore.kernel.org/r/20191127084617.16937-1-david.engraf@sysgo.com +Signed-off-by: Guenter Roeck +Signed-off-by: Wim Van Sebroeck +Signed-off-by: Sasha Levin +--- + drivers/watchdog/Kconfig | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig +index f55328a316298..fa15a683ae2d4 100644 +--- a/drivers/watchdog/Kconfig ++++ b/drivers/watchdog/Kconfig +@@ -563,6 +563,7 @@ config MAX63XX_WATCHDOG + config MAX77620_WATCHDOG + tristate "Maxim Max77620 Watchdog Timer" + depends on MFD_MAX77620 || COMPILE_TEST ++ select WATCHDOG_CORE + help + This is the driver for the Max77620 watchdog timer. + Say 'Y' here to enable the watchdog timer support for +-- +2.20.1 + diff --git a/queue-4.14/watchdog-rn5t618_wdt-fix-module-aliases.patch b/queue-4.14/watchdog-rn5t618_wdt-fix-module-aliases.patch new file mode 100644 index 00000000000..8229cd60d76 --- /dev/null +++ b/queue-4.14/watchdog-rn5t618_wdt-fix-module-aliases.patch @@ -0,0 +1,37 @@ +From 739b69f165bc8fd0e422be1b032a8dc0829798da Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 13 Dec 2019 22:48:02 +0100 +Subject: watchdog: rn5t618_wdt: fix module aliases + +From: Andreas Kemnade + +[ Upstream commit a76dfb859cd42df6e3d1910659128ffcd2fb6ba2 ] + +Platform device aliases were missing so module autoloading +did not work. + +Signed-off-by: Andreas Kemnade +Reviewed-by: Guenter Roeck +Link: https://lore.kernel.org/r/20191213214802.22268-1-andreas@kemnade.info +Signed-off-by: Guenter Roeck +Signed-off-by: Wim Van Sebroeck +Signed-off-by: Sasha Levin +--- + drivers/watchdog/rn5t618_wdt.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/watchdog/rn5t618_wdt.c b/drivers/watchdog/rn5t618_wdt.c +index e60f55702ab79..d2e79cf70e774 100644 +--- a/drivers/watchdog/rn5t618_wdt.c ++++ b/drivers/watchdog/rn5t618_wdt.c +@@ -193,6 +193,7 @@ static struct platform_driver rn5t618_wdt_driver = { + + module_platform_driver(rn5t618_wdt_driver); + ++MODULE_ALIAS("platform:rn5t618-wdt"); + MODULE_AUTHOR("Beniamino Galvani "); + MODULE_DESCRIPTION("RN5T618 watchdog driver"); + MODULE_LICENSE("GPL v2"); +-- +2.20.1 +