From patchwork Sun Sep 23 17:45:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 10611833 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 347161803 for ; Sun, 23 Sep 2018 17:45:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 257E429FAC for ; Sun, 23 Sep 2018 17:45:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 19CEC29FC2; Sun, 23 Sep 2018 17:45:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9ABF129FAC for ; Sun, 23 Sep 2018 17:45:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726927AbeIWXoA (ORCPT ); Sun, 23 Sep 2018 19:44:00 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:40852 "EHLO mx2.mailbox.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726344AbeIWXoA (ORCPT ); Sun, 23 Sep 2018 19:44:00 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id 74CF241469; Sun, 23 Sep 2018 19:45:44 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by gerste.heinlein-support.de (gerste.heinlein-support.de [91.198.250.173]) (amavisd-new, port 10030) with ESMTP id qKkpVIDvhJhz; Sun, 23 Sep 2018 19:45:42 +0200 (CEST) From: Hauke Mehrtens To: johannes@sipsolutions.net Cc: backports@vger.kernel.org, john@phrozen.org, Hauke Mehrtens Subject: [PATCH 01/10] backports: Remove ssb and bcma Date: Sun, 23 Sep 2018 19:45:26 +0200 Message-Id: <20180923174535.16198-2-hauke@hauke-m.de> In-Reply-To: <20180923174535.16198-1-hauke@hauke-m.de> References: <20180923174535.16198-1-hauke@hauke-m.de> Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Use the versions shipped with the kernel instead. bcma and ssb didn't change much in the last few years, most of the changes were related to code only used on embedded devices. Removing this reduces the number of parts we have to backport. b43, b43legacy and brcmsmac work well with the in kernel version. Signed-off-by: Hauke Mehrtens --- backport/Kconfig.sources | 3 --- backport/Makefile.kernel | 2 -- .../linux/bcma/bcma_driver_chipcommon.h | 23 +++++++++++++++++++++ backport/defconfigs/b43 | 7 ------- backport/defconfigs/b43legacy | 5 ----- backport/defconfigs/brcmsmac | 2 -- backport/defconfigs/wifi | 6 ------ copy-list | 5 ----- dependencies | 14 ------------- patches/0051-no-wakeup_path/ssb.patch | 12 ----------- patches/0069-remove-of_irq/bcma.patch | 24 ---------------------- 11 files changed, 23 insertions(+), 80 deletions(-) create mode 100644 backport/backport-include/linux/bcma/bcma_driver_chipcommon.h delete mode 100644 patches/0051-no-wakeup_path/ssb.patch delete mode 100644 patches/0069-remove-of_irq/bcma.patch diff --git a/backport/Kconfig.sources b/backport/Kconfig.sources index 93ca3cd8..3fc674e5 100644 --- a/backport/Kconfig.sources +++ b/backport/Kconfig.sources @@ -7,9 +7,6 @@ source "$BACKPORT_DIR/net/mac80211/Kconfig" source "$BACKPORT_DIR/drivers/net/wireless/Kconfig" source "$BACKPORT_DIR/drivers/net/usb/Kconfig" -source "$BACKPORT_DIR/drivers/ssb/Kconfig" -source "$BACKPORT_DIR/drivers/bcma/Kconfig" - source "$BACKPORT_DIR/net/nfc/Kconfig" source "$BACKPORT_DIR/drivers/usb/class/Kconfig" diff --git a/backport/Makefile.kernel b/backport/Makefile.kernel index a8aad0b1..e458f6d5 100644 --- a/backport/Makefile.kernel +++ b/backport/Makefile.kernel @@ -40,8 +40,6 @@ obj-y += compat/ obj-$(CPTCFG_CFG80211) += net/wireless/ obj-$(CPTCFG_MAC80211) += net/mac80211/ obj-$(CPTCFG_WLAN) += drivers/net/wireless/ -obj-$(CPTCFG_SSB) += drivers/ssb/ -obj-$(CPTCFG_BCMA) += drivers/bcma/ obj-$(CPTCFG_USB_NET_RNDIS_WLAN) += drivers/net/usb/ obj-$(CPTCFG_NFC) += net/nfc/ obj-$(CPTCFG_NFC) += drivers/nfc/ diff --git a/backport/backport-include/linux/bcma/bcma_driver_chipcommon.h b/backport/backport-include/linux/bcma/bcma_driver_chipcommon.h new file mode 100644 index 00000000..47809853 --- /dev/null +++ b/backport/backport-include/linux/bcma/bcma_driver_chipcommon.h @@ -0,0 +1,23 @@ +#ifndef __BACKPORT_LINUX_BCMA_DRIVER_CC_H_ +#define __BACKPORT_LINUX_BCMA_DRIVER_CC_H_ +#include_next + +#ifndef BCMA_CC_PMU_CHIPCTL_ADDR +#define BCMA_CC_PMU_CHIPCTL_ADDR 0x0650 +#define BCMA_CC_PMU_CHIPCTL_DATA 0x0654 +#define BCMA_CC_PMU_REGCTL_ADDR 0x0658 +#define BCMA_CC_PMU_REGCTL_DATA 0x065C +#define BCMA_CC_PMU_PLLCTL_ADDR 0x0660 +#define BCMA_CC_PMU_PLLCTL_DATA 0x0664 +#endif + +#ifndef BCMA_CC_CAP_EXT_AOB_PRESENT +#define BCMA_CC_CAP_EXT_SECI_PRESENT 0x00000001 +#define BCMA_CC_CAP_EXT_GSIO_PRESENT 0x00000002 +#define BCMA_CC_CAP_EXT_GCI_PRESENT 0x00000004 +#define BCMA_CC_CAP_EXT_SECI_PUART_PRESENT 0x00000008 /* UART present */ +#define BCMA_CC_CAP_EXT_AOB_PRESENT 0x00000040 +#endif + + +#endif /* __BACKPORT_LINUX_BCMA_DRIVER_CC_H_ */ diff --git a/backport/defconfigs/b43 b/backport/defconfigs/b43 index 27bfb9e2..c486ca1e 100644 --- a/backport/defconfigs/b43 +++ b/backport/defconfigs/b43 @@ -11,10 +11,3 @@ CPTCFG_B43_SDIO=y CPTCFG_B43_PHY_N=y CPTCFG_B43_PHY_LP=y CPTCFG_B43_PHY_HT=y -CPTCFG_BCMA=m -CPTCFG_BCMA_HOST_PCI=y -CPTCFG_SSB=m -CPTCFG_SSB_PCIHOST=y -CPTCFG_SSB_PCMCIAHOST=y -CPTCFG_SSB_SDIOHOST=y -CPTCFG_SSB_DRIVER_PCICORE=y diff --git a/backport/defconfigs/b43legacy b/backport/defconfigs/b43legacy index 71787081..552e13b2 100644 --- a/backport/defconfigs/b43legacy +++ b/backport/defconfigs/b43legacy @@ -6,8 +6,3 @@ CPTCFG_MAC80211_LEDS=y CPTCFG_WLAN=y CPTCFG_WLAN_VENDOR_BROADCOM=y CPTCFG_B43LEGACY=m -CPTCFG_SSB=m -CPTCFG_SSB_PCIHOST=y -CPTCFG_SSB_PCMCIAHOST=y -CPTCFG_SSB_SDIOHOST=y -CPTCFG_SSB_DRIVER_PCICORE=y diff --git a/backport/defconfigs/brcmsmac b/backport/defconfigs/brcmsmac index 2c2edd23..20f429b6 100644 --- a/backport/defconfigs/brcmsmac +++ b/backport/defconfigs/brcmsmac @@ -5,5 +5,3 @@ CPTCFG_MAC80211_LEDS=y CPTCFG_WLAN=y CPTCFG_WLAN_VENDOR_BROADCOM=y CPTCFG_BRCMSMAC=m -CPTCFG_BCMA=m -CPTCFG_BCMA_HOST_PCI=y diff --git a/backport/defconfigs/wifi b/backport/defconfigs/wifi index 4034bb13..fb18e182 100644 --- a/backport/defconfigs/wifi +++ b/backport/defconfigs/wifi @@ -17,9 +17,6 @@ CPTCFG_B43=m CPTCFG_B43_PHY_HT=y CPTCFG_B43_PHY_N=y CPTCFG_B43_SDIO=y -CPTCFG_BCMA_DRIVER_GPIO=y -CPTCFG_BCMA_HOST_PCI=y -CPTCFG_BCMA=m CPTCFG_BRCMFMAC=m CPTCFG_BRCMFMAC_PCIE=y CPTCFG_BRCMFMAC_USB=y @@ -101,9 +98,6 @@ CPTCFG_RTL8723BE=m CPTCFG_RTL8821AE=m CPTCFG_RTL8XXXU=m CPTCFG_RTLWIFI=m -CPTCFG_SSB=m -CPTCFG_SSB_PCMCIAHOST=y -CPTCFG_SSB_SDIOHOST=y CPTCFG_TMD_HERMES=m CPTCFG_USB_NET_RNDIS_WLAN=m CPTCFG_USB_ZD1201=m diff --git a/copy-list b/copy-list index f9f9396c..7f552b8d 100644 --- a/copy-list +++ b/copy-list @@ -37,7 +37,6 @@ include/linux/mmc/sdio_ids.h include/linux/ath9k_platform.h include/linux/wl12xx.h include/linux/rndis.h -include/linux/bcm47xx_wdt.h include/linux/usb/usbnet.h include/linux/usb/cdc.h include/uapi/linux/usb/cdc.h @@ -87,10 +86,6 @@ include/linux/mpls.h include/uapi/linux/mpls.h drivers/net/wireless/ath/ -drivers/ssb/ -include/linux/ssb/ -drivers/bcma/ -include/linux/bcma/ drivers/net/wireless/cisco/ drivers/net/wireless/atmel/ drivers/net/wireless/broadcom/ diff --git a/dependencies b/dependencies index 628f82bd..a87802ad 100644 --- a/dependencies +++ b/dependencies @@ -48,20 +48,6 @@ NFC_ST_NCI_I2C 3.19 NFC_ST_NCI_SPI 3.19 NFC_PN544_I2C 3.19 -BCMA_DRIVER_MIPS 3.3 -SSB_DRIVER_MIPS 3.3 -# needs GPIO stuff we didn't backport -SSB_DRIVER_GPIO 4.5 - -# the irq handler in the gpio driver uses -# irq_set_chip_and_handler_name() which gets exported starting with -# kernel 3.7. This code is only compiled if BCMA_DRIVER_GPIO and -# BCMA_HOST_SOC are set. -BCMA_HOST_SOC 3.7 - -# Uses gpiochip_get_data() -BCMA_DRIVER_GPIO 4.5 - # NFC core needs PF_NFC defined in socket.h which was # only introduced in kernel 3.1 NFC 3.1 diff --git a/patches/0051-no-wakeup_path/ssb.patch b/patches/0051-no-wakeup_path/ssb.patch deleted file mode 100644 index dcebbcdf..00000000 --- a/patches/0051-no-wakeup_path/ssb.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/drivers/ssb/pcihost_wrapper.c -+++ b/drivers/ssb/pcihost_wrapper.c -@@ -33,7 +33,9 @@ static int ssb_pcihost_suspend(struct de - - /* if there is a wakeup enabled child device on ssb bus, - enable pci wakeup posibility. */ -+#if LINUX_VERSION_IS_GEQ(3,2,0) - device_set_wakeup_enable(d, d->power.wakeup_path); -+#endif /* LINUX_VERSION_IS_GEQ(3,2,0) */ - - pci_prepare_to_sleep(dev); - diff --git a/patches/0069-remove-of_irq/bcma.patch b/patches/0069-remove-of_irq/bcma.patch deleted file mode 100644 index b8a05ae8..00000000 --- a/patches/0069-remove-of_irq/bcma.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/drivers/bcma/main.c -+++ b/drivers/bcma/main.c -@@ -156,6 +156,7 @@ static struct device_node *bcma_of_find_ - return NULL; - } - -+#if LINUX_VERSION_IS_GEQ(3,13,0) - static int bcma_of_irq_parse(struct device *parent, - struct bcma_device *core, - struct of_phandle_args *out_irq, int num) -@@ -195,6 +196,13 @@ static unsigned int bcma_of_get_irq(stru - - return irq_create_of_mapping(&out_irq); - } -+#else -+static unsigned int bcma_of_get_irq(struct device *parent, -+ struct bcma_device *core, int num) -+{ -+ return 0; -+} -+#endif - - static void bcma_of_fill_device(struct device *parent, - struct bcma_device *core) From patchwork Sun Sep 23 17:45:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 10611831 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 020786CB for ; Sun, 23 Sep 2018 17:45:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E7B9D294A3 for ; Sun, 23 Sep 2018 17:45:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DAEF529FBF; Sun, 23 Sep 2018 17:45:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0E12D294A3 for ; Sun, 23 Sep 2018 17:45:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726344AbeIWXoA (ORCPT ); Sun, 23 Sep 2018 19:44:00 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:38430 "EHLO mx1.mailbox.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726384AbeIWXoA (ORCPT ); Sun, 23 Sep 2018 19:44:00 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id AD7AD49100; Sun, 23 Sep 2018 19:45:44 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter03.heinlein-hosting.de (spamfilter03.heinlein-hosting.de [80.241.56.117]) (amavisd-new, port 10030) with ESMTP id N4SJPUNYipbE; Sun, 23 Sep 2018 19:45:43 +0200 (CEST) From: Hauke Mehrtens To: johannes@sipsolutions.net Cc: backports@vger.kernel.org, john@phrozen.org, Hauke Mehrtens Subject: [PATCH 02/10] backports: Remove NFC support Date: Sun, 23 Sep 2018 19:45:27 +0200 Message-Id: <20180923174535.16198-3-hauke@hauke-m.de> In-Reply-To: <20180923174535.16198-1-hauke@hauke-m.de> References: <20180923174535.16198-1-hauke@hauke-m.de> Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP I am not aware of any user of the NFC coded in backports, at least I haven't seen any patches regarding this. Remove this code to reduce the efforts needed in the backports project. Signed-off-by: Hauke Mehrtens --- backport/Kconfig.sources | 2 -- backport/Makefile.kernel | 2 -- backport/defconfigs/nfc | 20 ------------ copy-list | 10 ------ dependencies | 41 ------------------------ patches/0013-fix-makefile-includes/mei_phy.patch | 10 ------ patches/0059-uuid-in-mei/nfc.patch | 32 ------------------ patches/0061-termios_rwsem/nfc.patch | 20 ------------ patches/0081-proto_ops-accept/nfc.patch | 16 --------- 9 files changed, 153 deletions(-) delete mode 100644 backport/defconfigs/nfc delete mode 100644 patches/0013-fix-makefile-includes/mei_phy.patch delete mode 100644 patches/0059-uuid-in-mei/nfc.patch delete mode 100644 patches/0061-termios_rwsem/nfc.patch delete mode 100644 patches/0081-proto_ops-accept/nfc.patch diff --git a/backport/Kconfig.sources b/backport/Kconfig.sources index 3fc674e5..347f1c56 100644 --- a/backport/Kconfig.sources +++ b/backport/Kconfig.sources @@ -7,8 +7,6 @@ source "$BACKPORT_DIR/net/mac80211/Kconfig" source "$BACKPORT_DIR/drivers/net/wireless/Kconfig" source "$BACKPORT_DIR/drivers/net/usb/Kconfig" -source "$BACKPORT_DIR/net/nfc/Kconfig" - source "$BACKPORT_DIR/drivers/usb/class/Kconfig" source "$BACKPORT_DIR/drivers/staging/Kconfig" diff --git a/backport/Makefile.kernel b/backport/Makefile.kernel index e458f6d5..6a9b854a 100644 --- a/backport/Makefile.kernel +++ b/backport/Makefile.kernel @@ -41,8 +41,6 @@ obj-$(CPTCFG_CFG80211) += net/wireless/ obj-$(CPTCFG_MAC80211) += net/mac80211/ obj-$(CPTCFG_WLAN) += drivers/net/wireless/ obj-$(CPTCFG_USB_NET_RNDIS_WLAN) += drivers/net/usb/ -obj-$(CPTCFG_NFC) += net/nfc/ -obj-$(CPTCFG_NFC) += drivers/nfc/ obj-$(CPTCFG_USB_WDM) += drivers/usb/class/ obj-$(CPTCFG_USB_USBNET) += drivers/net/usb/ diff --git a/backport/defconfigs/nfc b/backport/defconfigs/nfc deleted file mode 100644 index c00f10fd..00000000 --- a/backport/defconfigs/nfc +++ /dev/null @@ -1,20 +0,0 @@ -CPTCFG_NFC=m -CPTCFG_NFC_DIGITAL=m -CPTCFG_NFC_HCI=m -CPTCFG_NFC_MEI_PHY=m -CPTCFG_NFC_MICROREAD=m -CPTCFG_NFC_MICROREAD_I2C=m -CPTCFG_NFC_MICROREAD_MEI=m -CPTCFG_NFC_MRVL=m -CPTCFG_NFC_MRVL_USB=m -CPTCFG_NFC_NCI=m -CPTCFG_NFC_NCI_SPI=y -CPTCFG_NFC_PN533=m -CPTCFG_NFC_PN544=m -CPTCFG_NFC_PN544_I2C=m -CPTCFG_NFC_PN544_MEI=m -CPTCFG_NFC_PORT100=m -CPTCFG_NFC_SHDLC=y -CPTCFG_NFC_SIM=m -CPTCFG_NFC_TRF7970A=m -CPTCFG_NFC_WILINK=m diff --git a/copy-list b/copy-list index 7f552b8d..b2ec0972 100644 --- a/copy-list +++ b/copy-list @@ -124,13 +124,3 @@ drivers/net/usb/cdc_mbim.c drivers/net/usb/cdc_ncm.c drivers/net/usb/sierra_net.c drivers/net/usb/qmi_wwan.c - -# NFC core -net/nfc/ -include/net/nfc/ -include/uapi/linux/nfc.h - -# NFC drivers -drivers/nfc/ -include/linux/platform_data/nfcmrvl.h -include/linux/platform_data/nxp-nci.h diff --git a/dependencies b/dependencies index a87802ad..74f8a80f 100644 --- a/dependencies +++ b/dependencies @@ -20,17 +20,6 @@ HOSTAP 3.10 AIRO 3.9 AIRO_CS 3.9 -# missing linux/property.h -NFC_ST95HF 3.18 - -# missing devm_gpiod_get_optional() -# this needs devm_gpiod_get_optional() with 3 arguments. -NFC_PN544_I2C 3.17 -NFC_TRF7970A 3.17 - -# this needs devm_gpiod_get_index() with 4 arguments. -NFC_NXP_NCI_I2C 3.17 - # pci_error_handlers->reset_notify is missing MWIFIEX_PCIE 3.16 @@ -41,33 +30,6 @@ QTNFMAC_PEARL_PCIE 3.13 # backported properly MWIFIEX 3.18 -# this needs device_property..() functions and struct acpi_gpio_mapping -NFC_FDP_I2C 3.19 -NFC_ST21NFCA_I2C 3.19 -NFC_ST_NCI_I2C 3.19 -NFC_ST_NCI_SPI 3.19 -NFC_PN544_I2C 3.19 - -# NFC core needs PF_NFC defined in socket.h which was -# only introduced in kernel 3.1 -NFC 3.1 - -# This needs of_find_property() and devm_gpio_free() -NFC_MRVL 3.3 -NFC_MRVL_USB 3.3 -NFC_MRVL_UART 3.3 - -NFC_TRF7970A 3.4 - -INTEL_IPS 3.2 - -# needs mei_cldev_register_rx_cb -NFC_MEI_PHY 4.10 - -# missing linux/gpio/consumer.h -NFC_PN544_I2C 3.13 -NFC_FDP 3.13 - # tracing results in compile errors ATH10K_TRACING 3.4 ATH_TRACEPOINTS 3.1 @@ -84,9 +46,6 @@ IPW2200 4.3 HOSTAP 4.3 LIBERTAS 4.3 -# some prototypes changed - might be fixable but I'm lazy -NFC_WILINK 4.8 - # struct ethtool_link_ksettings is missing, I'm lazy USB_USBNET 4.6 USB_NET_RNDIS_WLAN 4.6 diff --git a/patches/0013-fix-makefile-includes/mei_phy.patch b/patches/0013-fix-makefile-includes/mei_phy.patch deleted file mode 100644 index c05f6eac..00000000 --- a/patches/0013-fix-makefile-includes/mei_phy.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/drivers/nfc/mei_phy.c -+++ b/drivers/nfc/mei_phy.c -@@ -19,6 +19,7 @@ - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include -+#include - #include - #include - diff --git a/patches/0059-uuid-in-mei/nfc.patch b/patches/0059-uuid-in-mei/nfc.patch deleted file mode 100644 index 9953c819..00000000 --- a/patches/0059-uuid-in-mei/nfc.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/drivers/nfc/microread/mei.c -+++ b/drivers/nfc/microread/mei.c -@@ -67,7 +67,13 @@ static int microread_mei_remove(struct m - } - - static struct mei_cl_device_id microread_mei_tbl[] = { -+#if LINUX_VERSION_IS_GEQ(4,4,0) - { MICROREAD_DRIVER_NAME, MEI_NFC_UUID, MEI_CL_VERSION_ANY}, -+#elif LINUX_VERSION_IS_GEQ(4,2,0) -+ { MICROREAD_DRIVER_NAME, MEI_NFC_UUID}, -+#else -+ { MICROREAD_DRIVER_NAME}, -+#endif - - /* required last entry */ - { } ---- a/drivers/nfc/pn544/mei.c -+++ b/drivers/nfc/pn544/mei.c -@@ -67,7 +67,13 @@ static int pn544_mei_remove(struct mei_c - } - - static struct mei_cl_device_id pn544_mei_tbl[] = { -+#if LINUX_VERSION_IS_GEQ(4,4,0) - { PN544_DRIVER_NAME, MEI_NFC_UUID, MEI_CL_VERSION_ANY}, -+#elif LINUX_VERSION_IS_GEQ(4,2,0) -+ { PN544_DRIVER_NAME, MEI_NFC_UUID}, -+#else -+ { PN544_DRIVER_NAME}, -+#endif - - /* required last entry */ - { } diff --git a/patches/0061-termios_rwsem/nfc.patch b/patches/0061-termios_rwsem/nfc.patch deleted file mode 100644 index c8ad8b46..00000000 --- a/patches/0061-termios_rwsem/nfc.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/net/nfc/nci/uart.c -+++ b/net/nfc/nci/uart.c -@@ -439,9 +439,17 @@ void nci_uart_set_config(struct nci_uart - if (!nu->tty) - return; - -+#if LINUX_VERSION_IS_GEQ(3,12,0) - down_read(&nu->tty->termios_rwsem); -+#else -+ mutex_lock(&nu->tty->termios_mutex); -+#endif /* if LINUX_VERSION_IS_GEQ(3,12,0) */ - new_termios = nu->tty->termios; -+#if LINUX_VERSION_IS_GEQ(3,12,0) - up_read(&nu->tty->termios_rwsem); -+#else -+ mutex_unlock(&nu->tty->termios_mutex); -+#endif /* if LINUX_VERSION_IS_GEQ(3,12,0) */ - tty_termios_encode_baud_rate(&new_termios, baudrate, baudrate); - - if (flow_ctrl) diff --git a/patches/0081-proto_ops-accept/nfc.patch b/patches/0081-proto_ops-accept/nfc.patch deleted file mode 100644 index 05b55805..00000000 --- a/patches/0081-proto_ops-accept/nfc.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/net/nfc/llcp_sock.c b/net/nfc/llcp_sock.c -index 043c6d3..5b4e44c 100644 ---- a/net/nfc/llcp_sock.c -+++ b/net/nfc/llcp_sock.c -@@ -443,7 +443,11 @@ struct sock *nfc_llcp_accept_dequeue(str - } - - static int llcp_sock_accept(struct socket *sock, struct socket *newsock, -+#if LINUX_VERSION_IS_GEQ(4,11,0) - int flags, bool kern) -+#else -+ int flags) -+#endif - { - DECLARE_WAITQUEUE(wait, current); - struct sock *sk = sock->sk, *new_sk; From patchwork Sun Sep 23 17:45:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 10611843 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 825D76CB for ; Sun, 23 Sep 2018 17:45:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 73BA7294A3 for ; Sun, 23 Sep 2018 17:45:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 67B2829FB3; Sun, 23 Sep 2018 17:45:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6A16C29FB9 for ; Sun, 23 Sep 2018 17:45:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726339AbeIWXoB (ORCPT ); Sun, 23 Sep 2018 19:44:01 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:38444 "EHLO mx1.mailbox.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726467AbeIWXoB (ORCPT ); Sun, 23 Sep 2018 19:44:01 -0400 Received: from smtp1.mailbox.org (unknown [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id 1CDA848FB8; Sun, 23 Sep 2018 19:45:44 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by gerste.heinlein-support.de (gerste.heinlein-support.de [91.198.250.173]) (amavisd-new, port 10030) with ESMTP id G-VA8OAifW6X; Sun, 23 Sep 2018 19:45:43 +0200 (CEST) From: Hauke Mehrtens To: johannes@sipsolutions.net Cc: backports@vger.kernel.org, john@phrozen.org, Hauke Mehrtens Subject: [PATCH 03/10] copy: Add crc32poly.h Date: Sun, 23 Sep 2018 19:45:28 +0200 Message-Id: <20180923174535.16198-4-hauke@hauke-m.de> In-Reply-To: <20180923174535.16198-1-hauke@hauke-m.de> References: <20180923174535.16198-1-hauke@hauke-m.de> Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This is used by the rtl8723bs driver. The implementation is completely in this header file, so it is save to copy it Signed-off-by: Hauke Mehrtens --- copy-list | 1 + 1 file changed, 1 insertion(+) diff --git a/copy-list b/copy-list index b2ec0972..9c522629 100644 --- a/copy-list +++ b/copy-list @@ -15,6 +15,7 @@ MAINTAINERS include/linux/unaligned/ include/linux/hashtable.h include/linux/fixp-arith.h +include/linux/crc32poly.h # This just defines some macros, simply take it include/linux/bitfield.h From patchwork Sun Sep 23 17:45:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 10611841 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 68A24913 for ; Sun, 23 Sep 2018 17:45:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 57AE429F90 for ; Sun, 23 Sep 2018 17:45:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4B58329FA8; Sun, 23 Sep 2018 17:45:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 43FEB29FB3 for ; Sun, 23 Sep 2018 17:45:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726934AbeIWXoB (ORCPT ); Sun, 23 Sep 2018 19:44:01 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:40874 "EHLO mx2.mailbox.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726339AbeIWXoA (ORCPT ); Sun, 23 Sep 2018 19:44:00 -0400 Received: from smtp1.mailbox.org (unknown [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id 1982841074; Sun, 23 Sep 2018 19:45:45 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter01.heinlein-hosting.de (spamfilter01.heinlein-hosting.de [80.241.56.115]) (amavisd-new, port 10030) with ESMTP id bTjzc5enud2Q; Sun, 23 Sep 2018 19:45:44 +0200 (CEST) From: Hauke Mehrtens To: johannes@sipsolutions.net Cc: backports@vger.kernel.org, john@phrozen.org, Hauke Mehrtens Subject: [PATCH 04/10] dependencies: Make RSI_COEX coexistence depend on kernel >= 4.17 Date: Sun, 23 Sep 2018 19:45:29 +0200 Message-Id: <20180923174535.16198-5-hauke@hauke-m.de> In-Reply-To: <20180923174535.16198-1-hauke@hauke-m.de> References: <20180923174535.16198-1-hauke@hauke-m.de> Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When RSI_COEX is activated the driver wants to link against the rsi_bt_ops symbol from the bluetooth driver btrsi. This driver was only added in kernel 4.17. Deactivate bluetooth coexistence support for older kernel versions. Signed-off-by: Hauke Mehrtens --- dependencies | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dependencies b/dependencies index 74f8a80f..555f31fb 100644 --- a/dependencies +++ b/dependencies @@ -53,6 +53,9 @@ USB_NET_RNDIS_WLAN 4.6 # depends on struct mmc_card::ocr RSI_SDIO 3.13 +# For Coexsitence the BT driver has to export rsi_bt_ops +RSI_COEX 4.17 + # depends on devm_led_classdev_register() MT76_CORE 4.1 MT76x2E 4.1 From patchwork Sun Sep 23 17:45:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 10611835 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4F3E915E8 for ; Sun, 23 Sep 2018 17:45:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3F7B329FA8 for ; Sun, 23 Sep 2018 17:45:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 259D229FBF; Sun, 23 Sep 2018 17:45:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 97A7829FA8 for ; Sun, 23 Sep 2018 17:45:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726944AbeIWXoB (ORCPT ); Sun, 23 Sep 2018 19:44:01 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:40906 "EHLO mx2.mailbox.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726802AbeIWXoB (ORCPT ); Sun, 23 Sep 2018 19:44:01 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id 8EA254111F; Sun, 23 Sep 2018 19:45:45 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter03.heinlein-hosting.de (spamfilter03.heinlein-hosting.de [80.241.56.117]) (amavisd-new, port 10030) with ESMTP id RUiHiRdAWw7J; Sun, 23 Sep 2018 19:45:44 +0200 (CEST) From: Hauke Mehrtens To: johannes@sipsolutions.net Cc: backports@vger.kernel.org, john@phrozen.org, Hauke Mehrtens Subject: [PATCH 05/10] dependencies: Make WIL6210 depend on kernel >= 4.8 Date: Sun, 23 Sep 2018 19:45:30 +0200 Message-Id: <20180923174535.16198-6-hauke@hauke-m.de> In-Reply-To: <20180923174535.16198-1-hauke@hauke-m.de> References: <20180923174535.16198-1-hauke@hauke-m.de> Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The WIL6210 driver now uses pci_alloc_irq_vectors() which is only available in kernel >= 4.8, only build this driver against such kernel versions. Signed-off-by: Hauke Mehrtens --- dependencies | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dependencies b/dependencies index 555f31fb..42ed0e2f 100644 --- a/dependencies +++ b/dependencies @@ -63,3 +63,6 @@ MT76x2E 4.1 # select_queue_fallback_t is missing RTL8723BS 3.14 R8188EU 3.14 + +# pci_alloc_irq_vectors is missing +WIL6210 4.8 From patchwork Sun Sep 23 17:45:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 10611837 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 89CFC913 for ; Sun, 23 Sep 2018 17:45:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7901C29F90 for ; Sun, 23 Sep 2018 17:45:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6D3B029FAC; Sun, 23 Sep 2018 17:45:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2975B29F90 for ; Sun, 23 Sep 2018 17:45:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726802AbeIWXoC (ORCPT ); Sun, 23 Sep 2018 19:44:02 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:38462 "EHLO mx1.mailbox.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726384AbeIWXoC (ORCPT ); Sun, 23 Sep 2018 19:44:02 -0400 Received: from smtp1.mailbox.org (unknown [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id 27F204924B; Sun, 23 Sep 2018 19:45:46 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter01.heinlein-hosting.de (spamfilter01.heinlein-hosting.de [80.241.56.115]) (amavisd-new, port 10030) with ESMTP id FW6eRSS8_27V; Sun, 23 Sep 2018 19:45:45 +0200 (CEST) From: Hauke Mehrtens To: johannes@sipsolutions.net Cc: backports@vger.kernel.org, john@phrozen.org, Hauke Mehrtens Subject: [PATCH 06/10] dependencies: make hostap and atmel depend on kernel >= 4.18 Date: Sun, 23 Sep 2018 19:45:31 +0200 Message-Id: <20180923174535.16198-7-hauke@hauke-m.de> In-Reply-To: <20180923174535.16198-1-hauke@hauke-m.de> References: <20180923174535.16198-1-hauke@hauke-m.de> Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The hostap and atmel wireless driver now make use of the proc_create_single_data() function which can not easily be backported. As these drivers are not used too often just deactivate them on older kernel versions for now. Signed-off-by: Hauke Mehrtens --- dependencies | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dependencies b/dependencies index 42ed0e2f..cd644df7 100644 --- a/dependencies +++ b/dependencies @@ -13,8 +13,9 @@ WLCORE 3.2 WL12XX 3.2 WL18XX 3.2 -# hostapd uses proc_remove() -HOSTAP 3.10 +# hostapd uses proc_create_single_data() +HOSTAP 4.18 +ATMEL 4.18 # This driver uses the remove_proc_subtree() function. AIRO 3.9 From patchwork Sun Sep 23 17:45:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 10611839 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0D8EC15E8 for ; Sun, 23 Sep 2018 17:45:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F2B6829F90 for ; Sun, 23 Sep 2018 17:45:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E711D29FAC; Sun, 23 Sep 2018 17:45:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9FB7229F90 for ; Sun, 23 Sep 2018 17:45:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726384AbeIWXoC (ORCPT ); Sun, 23 Sep 2018 19:44:02 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:40936 "EHLO mx2.mailbox.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726467AbeIWXoC (ORCPT ); Sun, 23 Sep 2018 19:44:02 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id 9B4C44127C; Sun, 23 Sep 2018 19:45:46 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter03.heinlein-hosting.de (spamfilter03.heinlein-hosting.de [80.241.56.117]) (amavisd-new, port 10030) with ESMTP id KSwyBhr-cdrN; Sun, 23 Sep 2018 19:45:45 +0200 (CEST) From: Hauke Mehrtens To: johannes@sipsolutions.net Cc: backports@vger.kernel.org, john@phrozen.org, Hauke Mehrtens Subject: [PATCH 07/10] patches: make mt76 use skb_pad() instead of __skb_pad() Date: Sun, 23 Sep 2018 19:45:32 +0200 Message-Id: <20180923174535.16198-8-hauke@hauke-m.de> In-Reply-To: <20180923174535.16198-1-hauke@hauke-m.de> References: <20180923174535.16198-1-hauke@hauke-m.de> Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP __skb_pad() was only added with kernel 4.13. The free_on_error parameter of __skb_pad() is set to constant true, which is also the setting used by skb_pad() so it should be save to use skb_pad() instead. This patch should be added to the mainline Linux kernel. Signed-off-by: Hauke Mehrtens --- patches/0090-use-skb_pad.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 patches/0090-use-skb_pad.patch diff --git a/patches/0090-use-skb_pad.patch b/patches/0090-use-skb_pad.patch new file mode 100644 index 00000000..086328c1 --- /dev/null +++ b/patches/0090-use-skb_pad.patch @@ -0,0 +1,11 @@ +--- a/drivers/net/wireless/mediatek/mt76/usb.c ++++ b/drivers/net/wireless/mediatek/mt76/usb.c +@@ -535,7 +535,7 @@ int mt76u_skb_dma_info(struct sk_buff *s + } + + if (unlikely(pad)) { +- if (__skb_pad(last, pad, true)) ++ if (skb_pad(last, pad)) + return -ENOMEM; + __skb_put(last, pad); + } From patchwork Sun Sep 23 17:45:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 10611849 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B26AE913 for ; Sun, 23 Sep 2018 17:45:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 52E8A294A3 for ; Sun, 23 Sep 2018 17:45:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 47A8129FA8; Sun, 23 Sep 2018 17:45:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E37A6294A3 for ; Sun, 23 Sep 2018 17:45:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726947AbeIWXoE (ORCPT ); Sun, 23 Sep 2018 19:44:04 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:38496 "EHLO mx1.mailbox.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726467AbeIWXoE (ORCPT ); Sun, 23 Sep 2018 19:44:04 -0400 Received: from smtp1.mailbox.org (unknown [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id 644C748FB8; Sun, 23 Sep 2018 19:45:48 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by gerste.heinlein-support.de (gerste.heinlein-support.de [91.198.250.173]) (amavisd-new, port 10030) with ESMTP id Bxd5MeYcf2uc; Sun, 23 Sep 2018 19:45:46 +0200 (CEST) From: Hauke Mehrtens To: johannes@sipsolutions.net Cc: backports@vger.kernel.org, john@phrozen.org, Hauke Mehrtens Subject: [PATCH 08/10] patches: remove .coredump from struct driver for kernel < 4.16 Date: Sun, 23 Sep 2018 19:45:33 +0200 Message-Id: <20180923174535.16198-9-hauke@hauke-m.de> In-Reply-To: <20180923174535.16198-1-hauke@hauke-m.de> References: <20180923174535.16198-1-hauke@hauke-m.de> Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Kernel 4.16 added a new .coredump member to the driver structure which can be implemented by drivers. Remove this member on older kernel versions as they do not support this feature. Signed-off-by: Hauke Mehrtens --- patches/0088-coredump.cocci | 93 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 patches/0088-coredump.cocci diff --git a/patches/0088-coredump.cocci b/patches/0088-coredump.cocci new file mode 100644 index 00000000..329e0315 --- /dev/null +++ b/patches/0088-coredump.cocci @@ -0,0 +1,93 @@ +@r1@ +identifier drv, fn; +@@ +static struct pci_driver drv = { + .driver = { ++#if LINUX_VERSION_IS_GEQ(4,16,0) + .coredump = fn, ++#endif + ... + }, + ... +}; + +@r11 depends on r1@ +identifier r1.fn; +@@ ++#if LINUX_VERSION_IS_GEQ(4,16,0) +fn(...) +{ + ... +} ++#endif + + +@r2@ +identifier drv, fn; +@@ + static struct pci_driver drv = { ++#if LINUX_VERSION_IS_GEQ(4,16,0) + .driver.coredump = fn, ++#endif + ... + }; + +@r21 depends on r2@ +identifier r2.fn; +@@ ++#if LINUX_VERSION_IS_GEQ(4,16,0) +fn(...) +{ + ... +} ++#endif + + +@r3@ +identifier drv, fn; +@@ +static struct usb_driver drv = { + .drvwrap.driver = { ++#if LINUX_VERSION_IS_GEQ(4,16,0) + .coredump = fn, ++#endif + ... + }, + ... +}; + + +@r31 depends on r3@ +identifier r3.fn; +@@ ++#if LINUX_VERSION_IS_GEQ(4,16,0) +fn(...) +{ + ... +} ++#endif + + +@r4@ +identifier driver, fn; +@@ + static struct sdio_driver driver = { + .drv = { ++#if LINUX_VERSION_IS_GEQ(4,16,0) + .coredump = fn, ++#endif + ... + }, + ... +}; + + +@r41 depends on r4@ +identifier r4.fn; +@@ ++#if LINUX_VERSION_IS_GEQ(4,16,0) +fn(...) +{ + ... +} ++#endif From patchwork Sun Sep 23 17:45:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 10611845 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 06F136CB for ; Sun, 23 Sep 2018 17:45:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ECCFC29FA8 for ; Sun, 23 Sep 2018 17:45:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E12EB29FAC; Sun, 23 Sep 2018 17:45:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 962AA294A3 for ; Sun, 23 Sep 2018 17:45:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726953AbeIWXoE (ORCPT ); Sun, 23 Sep 2018 19:44:04 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:38508 "EHLO mx1.mailbox.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726951AbeIWXoE (ORCPT ); Sun, 23 Sep 2018 19:44:04 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id 1587949129; Sun, 23 Sep 2018 19:45:49 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter03.heinlein-hosting.de (spamfilter03.heinlein-hosting.de [80.241.56.117]) (amavisd-new, port 10030) with ESMTP id imDP8h8AReiU; Sun, 23 Sep 2018 19:45:46 +0200 (CEST) From: Hauke Mehrtens To: johannes@sipsolutions.net Cc: backports@vger.kernel.org, john@phrozen.org, Hauke Mehrtens Subject: [PATCH 09/10] backports: Make netdev destructor spatch apply correctly again Date: Sun, 23 Sep 2018 19:45:34 +0200 Message-Id: <20180923174535.16198-10-hauke@hauke-m.de> In-Reply-To: <20180923174535.16198-1-hauke@hauke-m.de> References: <20180923174535.16198-1-hauke@hauke-m.de> Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The netdev destructor spatch did not apply to the wil6210 driver any more, because there the calls were done in a different order compared to the spatch. Add an additional rule which applies when the order is changed. Fixes: 30a378636e47 ("backports: speed up netdev destructor spatch by two orders of magnitude") Signed-off-by: Hauke Mehrtens --- patches/0079-netdev-destructor.cocci | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/patches/0079-netdev-destructor.cocci b/patches/0079-netdev-destructor.cocci index f2bea35b..8d7228ec 100644 --- a/patches/0079-netdev-destructor.cocci +++ b/patches/0079-netdev-destructor.cocci @@ -67,6 +67,38 @@ if (<+... RET ...+>) { ...> } +@r11@ +struct net_device *NDEV; +identifier D, C; +identifier TRUE =~ "true"; +@@ +C(...) +{ + <+... +- NDEV->priv_destructor = D; +- NDEV->needs_free_netdev = TRUE; ++ netdev_set_priv_destructor(NDEV, D); + ...+> +} + +@r12 depends on r11@ +identifier r11.D, r11.C; +fresh identifier E = "__" ## D; +@@ + ++#if LINUX_VERSION_IS_LESS(4,12,0) ++static void E(struct net_device *ndev) ++{ ++ D(ndev); ++ free_netdev(ndev); ++} ++#endif ++ +C(...) +{ + ... +} + @r5@ struct net_device *NDEV; identifier TRUE =~ "true"; From patchwork Sun Sep 23 17:45:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 10611847 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 38B2715E8 for ; Sun, 23 Sep 2018 17:45:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2AE2D29F90 for ; Sun, 23 Sep 2018 17:45:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1FB6229FAC; Sun, 23 Sep 2018 17:45:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C368829F90 for ; Sun, 23 Sep 2018 17:45:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726951AbeIWXoE (ORCPT ); Sun, 23 Sep 2018 19:44:04 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:40996 "EHLO mx2.mailbox.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726947AbeIWXoE (ORCPT ); Sun, 23 Sep 2018 19:44:04 -0400 Received: from smtp1.mailbox.org (unknown [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id A79F44145C; Sun, 23 Sep 2018 19:45:48 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by gerste.heinlein-support.de (gerste.heinlein-support.de [91.198.250.173]) (amavisd-new, port 10030) with ESMTP id LSjxGgQf0ppH; Sun, 23 Sep 2018 19:45:47 +0200 (CEST) From: Hauke Mehrtens To: johannes@sipsolutions.net Cc: backports@vger.kernel.org, john@phrozen.org, Hauke Mehrtens Subject: [PATCH 10/10] patches: Do not remove linux/kmemleak.h include Date: Sun, 23 Sep 2018 19:45:35 +0200 Message-Id: <20180923174535.16198-11-hauke@hauke-m.de> In-Reply-To: <20180923174535.16198-1-hauke@hauke-m.de> References: <20180923174535.16198-1-hauke@hauke-m.de> Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This driver has to include linux/kmemleak.h to get kmemleak_not_leak in kernel 4.19. I haven't seen any problem when compiling against multiple other kernels, but didn't test all the 3.X versions. Signed-off-by: Hauke Mehrtens --- patches/0085-not-include-kmemleak.patch | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 patches/0085-not-include-kmemleak.patch diff --git a/patches/0085-not-include-kmemleak.patch b/patches/0085-not-include-kmemleak.patch deleted file mode 100644 index d9f051f3..00000000 --- a/patches/0085-not-include-kmemleak.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c -+++ b/drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c -@@ -5,7 +5,7 @@ - * - ******************************************************************************/ - #define _RTL8188EU_RECV_C_ --#include -+#include - #include - #include - #include