From patchwork Thu Oct 3 15:56:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 11172799 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D00DB13B1 for ; Thu, 3 Oct 2019 15:57:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 99B68222C7 for ; Thu, 3 Oct 2019 15:57:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730943AbfJCP50 (ORCPT ); Thu, 3 Oct 2019 11:57:26 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:38360 "EHLO mx2.mailbox.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730926AbfJCP5X (ORCPT ); Thu, 3 Oct 2019 11:57:23 -0400 Received: from smtp2.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id 9BEF9A222B; Thu, 3 Oct 2019 17:57:21 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp2.mailbox.org ([80.241.60.240]) by hefe.heinlein-support.de (hefe.heinlein-support.de [91.198.250.172]) (amavisd-new, port 10030) with ESMTP id s0MJ-1011Z41; Thu, 3 Oct 2019 17:57:18 +0200 (CEST) From: Hauke Mehrtens To: backports@vger.kernel.org Cc: johannes@sipsolutions.net, Hauke Mehrtens Subject: [PATCH 01/11] backports: patches: refresh against kernel 5.4-rc1 Date: Thu, 3 Oct 2019 17:56:32 +0200 Message-Id: <20191003155642.14909-2-hauke@hauke-m.de> In-Reply-To: <20191003155642.14909-1-hauke@hauke-m.de> References: <20191003155642.14909-1-hauke@hauke-m.de> MIME-Version: 1.0 Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org Manual modifications where needed to make the following patch apply: patches/0013-fix-makefile-includes/rtw88.patch Signed-off-by: Hauke Mehrtens --- ...0002-disable-dump-adjust-on-old-kernels.patch | 4 ++-- .../include_net_cfg80211.patch | 2 +- .../net_wireless_core.patch | 2 +- .../net_wireless_core.patch | 4 ++-- patches/0013-fix-makefile-includes/rtw88.patch | 16 ++++++++-------- .../0014-netlink_seq/net_wireless_nl80211.patch | 2 +- .../drivers_net_wireless_libertas_if_usb.patch | 4 ++-- patches/0025-usb-sg/usbnet.patch | 12 ++++++------ patches/0028-select_queue/rtl8723bs.patch | 2 +- patches/0053-possible_net_t.patch | 2 +- patches/0069-iwlwifi-pd-string-fix.patch | 2 +- patches/0071-skb-head_frag/wireless.patch | 2 +- patches/0075-ndo-stats-64/usbnet.patch | 2 +- patches/0077-genl-ro-after-init/hwsim.patch | 2 +- patches/0077-genl-ro-after-init/nl80211.patch | 2 +- patches/0079-netdev-destructor/brcmfmac.patch | 4 ++-- patches/0085-iwlwifi-pci-device-removal.patch | 4 ++-- patches/0090-remove-GRO_CONSUMED.patch | 4 ++-- patches/devcoredump.patch | 4 ++-- 19 files changed, 38 insertions(+), 38 deletions(-) diff --git a/patches/0002-disable-dump-adjust-on-old-kernels.patch b/patches/0002-disable-dump-adjust-on-old-kernels.patch index 225ef6eb..1c7ef2e5 100644 --- a/patches/0002-disable-dump-adjust-on-old-kernels.patch +++ b/patches/0002-disable-dump-adjust-on-old-kernels.patch @@ -28,7 +28,7 @@ Date: Fri Mar 1 14:03:49 2013 +0100 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -2437,6 +2437,7 @@ static int nl80211_dump_wiphy(struct sk_ +@@ -2509,6 +2509,7 @@ static int nl80211_dump_wiphy(struct sk_ cb->nlh->nlmsg_seq, NLM_F_MULTI, state); if (ret < 0) { @@ -36,7 +36,7 @@ Date: Fri Mar 1 14:03:49 2013 +0100 /* * If sending the wiphy data didn't fit (ENOBUFS * or EMSGSIZE returned), this SKB is still -@@ -2458,6 +2459,7 @@ static int nl80211_dump_wiphy(struct sk_ +@@ -2530,6 +2531,7 @@ static int nl80211_dump_wiphy(struct sk_ rtnl_unlock(); return 1; } diff --git a/patches/0003-cfg80211-wext-padding/include_net_cfg80211.patch b/patches/0003-cfg80211-wext-padding/include_net_cfg80211.patch index e5ee1e10..ab2b79ff 100644 --- a/patches/0003-cfg80211-wext-padding/include_net_cfg80211.patch +++ b/patches/0003-cfg80211-wext-padding/include_net_cfg80211.patch @@ -1,6 +1,6 @@ --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h -@@ -4433,6 +4433,9 @@ struct cfg80211_pmsr_capabilities { +@@ -4536,6 +4536,9 @@ struct cfg80211_pmsr_capabilities { struct wiphy { /* assign these fields before you register the wiphy */ diff --git a/patches/0003-cfg80211-wext-padding/net_wireless_core.patch b/patches/0003-cfg80211-wext-padding/net_wireless_core.patch index d6cb1d2a..e1eca55d 100644 --- a/patches/0003-cfg80211-wext-padding/net_wireless_core.patch +++ b/patches/0003-cfg80211-wext-padding/net_wireless_core.patch @@ -1,6 +1,6 @@ --- a/net/wireless/core.c +++ b/net/wireless/core.c -@@ -404,6 +404,17 @@ struct wiphy *wiphy_new_nm(const struct +@@ -403,6 +403,17 @@ struct wiphy *wiphy_new_nm(const struct struct cfg80211_registered_device *rdev; int alloc_size; diff --git a/patches/0010-add-wext-handlers-to-netdev/net_wireless_core.patch b/patches/0010-add-wext-handlers-to-netdev/net_wireless_core.patch index b647639b..c5d8ddf9 100644 --- a/patches/0010-add-wext-handlers-to-netdev/net_wireless_core.patch +++ b/patches/0010-add-wext-handlers-to-netdev/net_wireless_core.patch @@ -1,6 +1,6 @@ --- a/net/wireless/core.c +++ b/net/wireless/core.c -@@ -497,10 +497,6 @@ use_default_name: +@@ -496,10 +496,6 @@ use_default_name: INIT_WORK(&rdev->mlme_unreg_wk, cfg80211_mlme_unreg_wk); INIT_DELAYED_WORK(&rdev->dfs_update_channels_wk, cfg80211_dfs_channels_update_work); @@ -11,7 +11,7 @@ device_initialize(&rdev->wiphy.dev); rdev->wiphy.dev.class = &ieee80211_class; rdev->wiphy.dev.platform_data = rdev; -@@ -1299,6 +1295,15 @@ static int cfg80211_netdev_notifier_call +@@ -1295,6 +1291,15 @@ static int cfg80211_netdev_notifier_call } wdev->netdev = dev; #ifdef CONFIG_CFG80211_WEXT diff --git a/patches/0013-fix-makefile-includes/rtw88.patch b/patches/0013-fix-makefile-includes/rtw88.patch index 454c9f89..10bb1780 100644 --- a/patches/0013-fix-makefile-includes/rtw88.patch +++ b/patches/0013-fix-makefile-includes/rtw88.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/realtek/rtw88/main.c +++ b/drivers/net/wireless/realtek/rtw88/main.c -@@ -12,6 +12,7 @@ +@@ -13,6 +13,7 @@ #include "reg.h" #include "efuse.h" #include "debug.h" @@ -10,7 +10,7 @@ unsigned int rtw_debug_mask; --- a/drivers/net/wireless/realtek/rtw88/rtw8822b.c +++ b/drivers/net/wireless/realtek/rtw88/rtw8822b.c -@@ -12,6 +12,7 @@ +@@ -13,6 +13,7 @@ #include "mac.h" #include "reg.h" #include "debug.h" @@ -20,21 +20,21 @@ u8 rx_path, bool is_tx2_path); --- a/drivers/net/wireless/realtek/rtw88/rtw8822c.c +++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.c -@@ -12,6 +12,7 @@ - #include "mac.h" +@@ -14,6 +14,7 @@ #include "reg.h" #include "debug.h" + #include "util.h" +#include static void rtw8822c_config_trx_mode(struct rtw_dev *rtwdev, u8 tx_path, u8 rx_path, bool is_tx2_path); --- a/drivers/net/wireless/realtek/rtw88/pci.c +++ b/drivers/net/wireless/realtek/rtw88/pci.c -@@ -9,6 +9,7 @@ - #include "tx.h" +@@ -10,6 +10,7 @@ #include "rx.h" + #include "fw.h" #include "debug.h" +#include - static u32 rtw_pci_tx_queue_idx_addr[] = { - [RTW_TX_QUEUE_BK] = RTK_PCI_TXBD_IDX_BKQ, + static bool rtw_disable_msi; + module_param_named(disable_msi, rtw_disable_msi, bool, 0644); diff --git a/patches/0014-netlink_seq/net_wireless_nl80211.patch b/patches/0014-netlink_seq/net_wireless_nl80211.patch index 80e8c51c..fa52420b 100644 --- a/patches/0014-netlink_seq/net_wireless_nl80211.patch +++ b/patches/0014-netlink_seq/net_wireless_nl80211.patch @@ -1,6 +1,6 @@ --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -8606,7 +8606,9 @@ static int nl80211_dump_scan(struct sk_b +@@ -8727,7 +8727,9 @@ static int nl80211_dump_scan(struct sk_b if (start == 0) cfg80211_bss_expire(rdev); diff --git a/patches/0016-libertas-olpc-ec-wakeup/drivers_net_wireless_libertas_if_usb.patch b/patches/0016-libertas-olpc-ec-wakeup/drivers_net_wireless_libertas_if_usb.patch index c9cb687a..8fab382a 100644 --- a/patches/0016-libertas-olpc-ec-wakeup/drivers_net_wireless_libertas_if_usb.patch +++ b/patches/0016-libertas-olpc-ec-wakeup/drivers_net_wireless_libertas_if_usb.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/marvell/libertas/if_usb.c +++ b/drivers/net/wireless/marvell/libertas/if_usb.c -@@ -940,6 +940,7 @@ static int if_usb_suspend(struct usb_int +@@ -941,6 +941,7 @@ static int if_usb_suspend(struct usb_int goto out; } @@ -8,7 +8,7 @@ #ifdef CONFIG_OLPC if (machine_is_olpc()) { if (priv->wol_criteria == EHS_REMOVE_WAKEUP) -@@ -948,6 +949,7 @@ static int if_usb_suspend(struct usb_int +@@ -949,6 +950,7 @@ static int if_usb_suspend(struct usb_int olpc_ec_wakeup_set(EC_SCI_SRC_WLAN); } #endif diff --git a/patches/0025-usb-sg/usbnet.patch b/patches/0025-usb-sg/usbnet.patch index af20480f..30cce14f 100644 --- a/patches/0025-usb-sg/usbnet.patch +++ b/patches/0025-usb-sg/usbnet.patch @@ -1,6 +1,6 @@ --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c -@@ -1302,6 +1302,7 @@ EXPORT_SYMBOL_GPL(usbnet_tx_timeout); +@@ -1310,6 +1310,7 @@ EXPORT_SYMBOL_GPL(usbnet_tx_timeout); /*-------------------------------------------------------------------------*/ @@ -8,7 +8,7 @@ static int build_dma_sg(const struct sk_buff *skb, struct urb *urb) { unsigned num_sgs, total_len = 0; -@@ -1334,6 +1335,12 @@ static int build_dma_sg(const struct sk_ +@@ -1342,6 +1343,12 @@ static int build_dma_sg(const struct sk_ return 1; } @@ -21,7 +21,7 @@ netdev_tx_t usbnet_start_xmit (struct sk_buff *skb, struct net_device *net) -@@ -1390,12 +1397,19 @@ netdev_tx_t usbnet_start_xmit (struct sk +@@ -1398,12 +1405,19 @@ netdev_tx_t usbnet_start_xmit (struct sk if (!(info->flags & FLAG_SEND_ZLP)) { if (!(info->flags & FLAG_MULTI_PACKET)) { length++; @@ -41,7 +41,7 @@ } } else urb->transfer_flags |= URB_ZERO_PACKET; -@@ -1467,7 +1481,9 @@ not_drop: +@@ -1475,7 +1489,9 @@ not_drop: if (skb) dev_kfree_skb_any (skb); if (urb) { @@ -51,7 +51,7 @@ usb_free_urb(urb); } } else -@@ -1520,7 +1536,9 @@ static void usbnet_bh (struct timer_list +@@ -1528,7 +1544,9 @@ static void usbnet_bh (struct timer_list rx_process (dev, skb); continue; case tx_done: @@ -61,7 +61,7 @@ /* fall through */ case rx_cleanup: usb_free_urb (entry->urb); -@@ -1888,7 +1906,9 @@ int usbnet_resume (struct usb_interface +@@ -1896,7 +1914,9 @@ int usbnet_resume (struct usb_interface retval = usb_submit_urb(res, GFP_ATOMIC); if (retval < 0) { dev_kfree_skb_any(skb); diff --git a/patches/0028-select_queue/rtl8723bs.patch b/patches/0028-select_queue/rtl8723bs.patch index ab9914eb..94524bc0 100644 --- a/patches/0028-select_queue/rtl8723bs.patch +++ b/patches/0028-select_queue/rtl8723bs.patch @@ -1,6 +1,6 @@ --- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c +++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c -@@ -398,8 +398,18 @@ static unsigned int rtw_classify8021d(st +@@ -395,8 +395,18 @@ static unsigned int rtw_classify8021d(st } diff --git a/patches/0053-possible_net_t.patch b/patches/0053-possible_net_t.patch index 06873e3b..85e6c24c 100644 --- a/patches/0053-possible_net_t.patch +++ b/patches/0053-possible_net_t.patch @@ -2,7 +2,7 @@ diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 04e5785..a251da1 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h -@@ -4582,12 +4582,12 @@ struct wiphy { +@@ -4685,12 +4685,12 @@ struct wiphy { static inline struct net *wiphy_net(struct wiphy *wiphy) { diff --git a/patches/0069-iwlwifi-pd-string-fix.patch b/patches/0069-iwlwifi-pd-string-fix.patch index 3fcaec3d..563fcbd7 100644 --- a/patches/0069-iwlwifi-pd-string-fix.patch +++ b/patches/0069-iwlwifi-pd-string-fix.patch @@ -60,7 +60,7 @@ mvm->debugfs_dir, buf); --- a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c -@@ -2155,6 +2155,12 @@ void iwl_mvm_dbgfs_register(struct iwl_m +@@ -2081,6 +2081,12 @@ void iwl_mvm_dbgfs_register(struct iwl_m * Create a symlink with mac80211. It will be removed when mac80211 * exists (before the opmode exists which removes the target.) */ diff --git a/patches/0071-skb-head_frag/wireless.patch b/patches/0071-skb-head_frag/wireless.patch index 6c01890c..f6999ad5 100644 --- a/patches/0071-skb-head_frag/wireless.patch +++ b/patches/0071-skb-head_frag/wireless.patch @@ -1,6 +1,6 @@ --- a/net/wireless/util.c +++ b/net/wireless/util.c -@@ -647,7 +647,11 @@ void ieee80211_amsdu_to_8023s(struct sk_ +@@ -661,7 +661,11 @@ void ieee80211_amsdu_to_8023s(struct sk_ u8 *payload; int offset = 0, remaining; struct ethhdr eth; diff --git a/patches/0075-ndo-stats-64/usbnet.patch b/patches/0075-ndo-stats-64/usbnet.patch index bd7eb2aa..fe434459 100644 --- a/patches/0075-ndo-stats-64/usbnet.patch +++ b/patches/0075-ndo-stats-64/usbnet.patch @@ -1,6 +1,6 @@ --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c -@@ -1005,6 +1005,9 @@ void usbnet_get_stats64(struct net_devic +@@ -1013,6 +1013,9 @@ void usbnet_get_stats64(struct net_devic } } EXPORT_SYMBOL_GPL(usbnet_get_stats64); diff --git a/patches/0077-genl-ro-after-init/hwsim.patch b/patches/0077-genl-ro-after-init/hwsim.patch index 3c9c3039..5a485060 100644 --- a/patches/0077-genl-ro-after-init/hwsim.patch +++ b/patches/0077-genl-ro-after-init/hwsim.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c -@@ -3668,7 +3668,7 @@ static const struct genl_ops hwsim_ops[] +@@ -3765,7 +3765,7 @@ static const struct genl_ops hwsim_ops[] }, }; diff --git a/patches/0077-genl-ro-after-init/nl80211.patch b/patches/0077-genl-ro-after-init/nl80211.patch index 96905f7a..d2bcfc50 100644 --- a/patches/0077-genl-ro-after-init/nl80211.patch +++ b/patches/0077-genl-ro-after-init/nl80211.patch @@ -1,6 +1,6 @@ --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -14549,7 +14549,7 @@ static const struct genl_ops nl80211_ops +@@ -14712,7 +14712,7 @@ static const struct genl_ops nl80211_ops }, }; diff --git a/patches/0079-netdev-destructor/brcmfmac.patch b/patches/0079-netdev-destructor/brcmfmac.patch index e5e7935f..3ee6da62 100644 --- a/patches/0079-netdev-destructor/brcmfmac.patch +++ b/patches/0079-netdev-destructor/brcmfmac.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c -@@ -628,6 +628,23 @@ static const struct net_device_ops brcmf +@@ -629,6 +629,23 @@ static const struct net_device_ops brcmf .ndo_set_rx_mode = brcmf_netdev_set_multicast_list }; @@ -24,7 +24,7 @@ int brcmf_net_attach(struct brcmf_if *ifp, bool rtnl_locked) { struct brcmf_pub *drvr = ifp->drvr; -@@ -801,7 +818,11 @@ struct brcmf_if *brcmf_add_if(struct brc +@@ -802,7 +819,11 @@ struct brcmf_if *brcmf_add_if(struct brc if (!ndev) return ERR_PTR(-ENOMEM); diff --git a/patches/0085-iwlwifi-pci-device-removal.patch b/patches/0085-iwlwifi-pci-device-removal.patch index 43f4e4b3..f858fe99 100644 --- a/patches/0085-iwlwifi-pci-device-removal.patch +++ b/patches/0085-iwlwifi-pci-device-removal.patch @@ -2,7 +2,7 @@ diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wirel index f74281508197..3b11bd68f261 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c -@@ -1955,6 +1955,9 @@ static void iwl_trans_pcie_removal_wk(st +@@ -1998,6 +1998,9 @@ static void iwl_trans_pcie_removal_wk(st struct iwl_trans_pcie_removal *removal = container_of(wk, struct iwl_trans_pcie_removal, work); struct pci_dev *pdev = removal->pdev; @@ -12,7 +12,7 @@ index f74281508197..3b11bd68f261 100644 static char *prop[] = {"EVENT=INACCESSIBLE", NULL}; dev_err(&pdev->dev, "Device gone - attempting removal\n"); -@@ -1963,6 +1966,7 @@ static void iwl_trans_pcie_removal_wk(st +@@ -2006,6 +2009,7 @@ static void iwl_trans_pcie_removal_wk(st pci_dev_put(pdev); pci_stop_and_remove_bus_device(pdev); pci_unlock_rescan_remove(); diff --git a/patches/0090-remove-GRO_CONSUMED.patch b/patches/0090-remove-GRO_CONSUMED.patch index a2bf2cc6..b2abfa96 100644 --- a/patches/0090-remove-GRO_CONSUMED.patch +++ b/patches/0090-remove-GRO_CONSUMED.patch @@ -4,7 +4,7 @@ older kernel versions. --- a/drivers/net/wireless/ath/wil6210/txrx.c +++ b/drivers/net/wireless/ath/wil6210/txrx.c -@@ -750,7 +750,9 @@ void wil_netif_rx_any(struct sk_buff *sk +@@ -924,7 +924,9 @@ void wil_netif_rx(struct sk_buff *skb, s [GRO_HELD] = "GRO_HELD", [GRO_NORMAL] = "GRO_NORMAL", [GRO_DROP] = "GRO_DROP", @@ -13,4 +13,4 @@ older kernel versions. +#endif /* > 4.11 */ }; - wil->txrx_ops.get_netif_rx_params(skb, &cid, &security); + if (wdev->iftype == NL80211_IFTYPE_STATION) { diff --git a/patches/devcoredump.patch b/patches/devcoredump.patch index 31ac0b7e..d28ca4af 100644 --- a/patches/devcoredump.patch +++ b/patches/devcoredump.patch @@ -65,7 +65,7 @@ .class_groups = devcd_class_groups, }; -@@ -301,6 +312,11 @@ void dev_coredumpm(struct device *dev, s +@@ -292,6 +303,11 @@ void dev_coredumpm(struct device *dev, s if (device_add(&devcd->devcd_dev)) goto put_device; @@ -77,7 +77,7 @@ if (sysfs_create_link(&devcd->devcd_dev.kobj, &dev->kobj, "failing_device")) /* nothing - symlink will be missing */; -@@ -343,15 +359,13 @@ void dev_coredumpsg(struct device *dev, +@@ -334,15 +350,13 @@ void dev_coredumpsg(struct device *dev, } EXPORT_SYMBOL_GPL(dev_coredumpsg); From patchwork Thu Oct 3 15:56:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 11173017 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AE378112B for ; Thu, 3 Oct 2019 17:42:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9731C20830 for ; Thu, 3 Oct 2019 17:42:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730945AbfJCRmW (ORCPT ); Thu, 3 Oct 2019 13:42:22 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:38310 "EHLO mx2.mailbox.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730925AbfJCP5W (ORCPT ); Thu, 3 Oct 2019 11:57:22 -0400 Received: from smtp2.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id 291E2A35FD; Thu, 3 Oct 2019 17:57:21 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp2.mailbox.org ([80.241.60.240]) by spamfilter04.heinlein-hosting.de (spamfilter04.heinlein-hosting.de [80.241.56.122]) (amavisd-new, port 10030) with ESMTP id NTRCAQQyKg4b; Thu, 3 Oct 2019 17:57:18 +0200 (CEST) From: Hauke Mehrtens To: backports@vger.kernel.org Cc: johannes@sipsolutions.net, Hauke Mehrtens Subject: [PATCH 02/11] backports: pci: include linux/pci-aspm.h Date: Thu, 3 Oct 2019 17:56:33 +0200 Message-Id: <20191003155642.14909-3-hauke@hauke-m.de> In-Reply-To: <20191003155642.14909-1-hauke@hauke-m.de> References: <20191003155642.14909-1-hauke@hauke-m.de> MIME-Version: 1.0 Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org In upstream commit 7ce2e76a0420 linux/pci-aspm.h was removed and the content included into pci.h. Add an include to have the functions defined in linux/pci-aspm.h available when linux/pci.h is included. Signed-off-by: Hauke Mehrtens --- backport/backport-include/linux/pci.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/backport/backport-include/linux/pci.h b/backport/backport-include/linux/pci.h index 3a141bf3..84c4e8f6 100644 --- a/backport/backport-include/linux/pci.h +++ b/backport/backport-include/linux/pci.h @@ -3,6 +3,10 @@ #include_next #include +#if LINUX_VERSION_IS_LESS(5,4,0) +#include +#endif + #ifndef module_pci_driver /** * module_pci_driver() - Helper macro for registering a PCI driver From patchwork Thu Oct 3 15:56:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 11173011 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9506614DB for ; Thu, 3 Oct 2019 17:42:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 724FC20830 for ; Thu, 3 Oct 2019 17:42:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388418AbfJCRmR (ORCPT ); Thu, 3 Oct 2019 13:42:17 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:38374 "EHLO mx2.mailbox.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730927AbfJCP5X (ORCPT ); Thu, 3 Oct 2019 11:57:23 -0400 Received: from smtp2.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id BB1BEA3640; Thu, 3 Oct 2019 17:57:21 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp2.mailbox.org ([80.241.60.240]) by spamfilter05.heinlein-hosting.de (spamfilter05.heinlein-hosting.de [80.241.56.123]) (amavisd-new, port 10030) with ESMTP id VoutQ80boUGv; Thu, 3 Oct 2019 17:57:18 +0200 (CEST) From: Hauke Mehrtens To: backports@vger.kernel.org Cc: johannes@sipsolutions.net, Hauke Mehrtens Subject: [PATCH 03/11] backports: build_bug.h: Add static_assert() Date: Thu, 3 Oct 2019 17:56:34 +0200 Message-Id: <20191003155642.14909-4-hauke@hauke-m.de> In-Reply-To: <20191003155642.14909-1-hauke@hauke-m.de> References: <20191003155642.14909-1-hauke@hauke-m.de> MIME-Version: 1.0 Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org Add static_assert() from upstream commit 6bab69c65013 ("build_bug.h: add wrapper for _Static_assert") which is used by rtw88. Signed-off-by: Hauke Mehrtens --- backport/backport-include/linux/build_bug.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/backport/backport-include/linux/build_bug.h b/backport/backport-include/linux/build_bug.h index 13ee5d6a..c883e525 100644 --- a/backport/backport-include/linux/build_bug.h +++ b/backport/backport-include/linux/build_bug.h @@ -7,4 +7,25 @@ #include #endif /* LINUX_VERSION_IS_GEQ(4,13,0) */ +#ifndef static_assert +/** + * static_assert - check integer constant expression at build time + * + * static_assert() is a wrapper for the C11 _Static_assert, with a + * little macro magic to make the message optional (defaulting to the + * stringification of the tested expression). + * + * Contrary to BUILD_BUG_ON(), static_assert() can be used at global + * scope, but requires the expression to be an integer constant + * expression (i.e., it is not enough that __builtin_constant_p() is + * true for expr). + * + * Also note that BUILD_BUG_ON() fails the build if the condition is + * true, while static_assert() fails the build if the expression is + * false. + */ +#define static_assert(expr, ...) __static_assert(expr, ##__VA_ARGS__, #expr) +#define __static_assert(expr, msg, ...) _Static_assert(expr, msg) +#endif + #endif /* __BP_BUILD_BUG_H */ From patchwork Thu Oct 3 15:56:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 11173013 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1362117EE for ; Thu, 3 Oct 2019 17:42:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E752E21A4C for ; Thu, 3 Oct 2019 17:42:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732915AbfJCRmS (ORCPT ); Thu, 3 Oct 2019 13:42:18 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:38396 "EHLO mx2.mailbox.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730928AbfJCP5X (ORCPT ); Thu, 3 Oct 2019 11:57:23 -0400 Received: from smtp2.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id F3720A33DD; Thu, 3 Oct 2019 17:57:21 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp2.mailbox.org ([80.241.60.240]) by spamfilter04.heinlein-hosting.de (spamfilter04.heinlein-hosting.de [80.241.56.122]) (amavisd-new, port 10030) with ESMTP id Cpr35VEkpTGN; Thu, 3 Oct 2019 17:57:19 +0200 (CEST) From: Hauke Mehrtens To: backports@vger.kernel.org Cc: johannes@sipsolutions.net, Hauke Mehrtens Subject: [PATCH 04/11] backports: platform_device.h: Add devm_platform_ioremap_resource() Date: Thu, 3 Oct 2019 17:56:35 +0200 Message-Id: <20191003155642.14909-5-hauke@hauke-m.de> In-Reply-To: <20191003155642.14909-1-hauke@hauke-m.de> References: <20191003155642.14909-1-hauke@hauke-m.de> MIME-Version: 1.0 Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org Add devm_platform_ioremap_resource() from upstream kernel commit 7945f929f1a7 ("drivers: provide devm_platform_ioremap_resource()") which is now used by the mt76 driver. Signed-off-by: Hauke Mehrtens --- .../backport-include/linux/platform_device.h | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/backport/backport-include/linux/platform_device.h b/backport/backport-include/linux/platform_device.h index 5b821ee4..87142d7c 100644 --- a/backport/backport-include/linux/platform_device.h +++ b/backport/backport-include/linux/platform_device.h @@ -33,4 +33,26 @@ module_exit(__platform_driver##_exit); platform_driver_unregister) #endif +#if LINUX_VERSION_IS_LESS(5,1,0) +/** + * devm_platform_ioremap_resource - call devm_ioremap_resource() for a platform + * device + * + * @pdev: platform device to use both for memory resource lookup as well as + * resource management + * @index: resource index + */ +#ifdef CONFIG_HAS_IOMEM +#define devm_platform_ioremap_resource LINUX_BACKPORT(devm_platform_ioremap_resource) +static inline void __iomem *devm_platform_ioremap_resource(struct platform_device *pdev, + unsigned int index) +{ + struct resource *res; + + res = platform_get_resource(pdev, IORESOURCE_MEM, index); + return devm_ioremap_resource(&pdev->dev, res); +} +#endif /* CONFIG_HAS_IOMEM */ +#endif + #endif /* __BACKPORT_PLATFORM_DEVICE_H */ From patchwork Thu Oct 3 15:56:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 11173007 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F1A04112B for ; Thu, 3 Oct 2019 17:42:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DAC85222C2 for ; Thu, 3 Oct 2019 17:42:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729191AbfJCP5Z (ORCPT ); Thu, 3 Oct 2019 11:57:25 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:38538 "EHLO mx2.mailbox.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730949AbfJCP5Z (ORCPT ); Thu, 3 Oct 2019 11:57:25 -0400 Received: from smtp2.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id 9C3A8A3354; Thu, 3 Oct 2019 17:57:22 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp2.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 FBrKpf3be_i2; Thu, 3 Oct 2019 17:57:19 +0200 (CEST) From: Hauke Mehrtens To: backports@vger.kernel.org Cc: johannes@sipsolutions.net, Hauke Mehrtens Subject: [PATCH 05/11] backports: skbuf.h: Add skb_frag_off() Date: Thu, 3 Oct 2019 17:56:36 +0200 Message-Id: <20191003155642.14909-6-hauke@hauke-m.de> In-Reply-To: <20191003155642.14909-1-hauke@hauke-m.de> References: <20191003155642.14909-1-hauke@hauke-m.de> MIME-Version: 1.0 Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org Add skb_frag_off() Which was added in upstream commit 7240b60c98d6 ("linux: Add skb_frag_t page_offset accessors") which is used by the usbnet driver. Signed-off-by: Hauke Mehrtens --- backport/backport-include/linux/skbuff.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/backport/backport-include/linux/skbuff.h b/backport/backport-include/linux/skbuff.h index de943916..589d2499 100644 --- a/backport/backport-include/linux/skbuff.h +++ b/backport/backport-include/linux/skbuff.h @@ -380,4 +380,16 @@ static inline struct sk_buff *__skb_peek(const struct sk_buff_head *list_) } #endif +#if LINUX_VERSION_IS_LESS(5,4,0) +/** + * skb_frag_off() - Returns the offset of a skb fragment + * @frag: the paged fragment + */ +#define skb_frag_off LINUX_BACKPORT(skb_frag_off) +static inline unsigned int skb_frag_off(const skb_frag_t *frag) +{ + return frag->page_offset; +} +#endif + #endif /* __BACKPORT_SKBUFF_H */ From patchwork Thu Oct 3 15:56:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 11173003 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 46B1F112B for ; Thu, 3 Oct 2019 17:42:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 25F5D222C2 for ; Thu, 3 Oct 2019 17:42:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729141AbfJCRmP (ORCPT ); Thu, 3 Oct 2019 13:42:15 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:38536 "EHLO mx2.mailbox.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730948AbfJCP50 (ORCPT ); Thu, 3 Oct 2019 11:57:26 -0400 Received: from smtp2.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id A9606A35AA; Thu, 3 Oct 2019 17:57:22 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp2.mailbox.org ([80.241.60.240]) by spamfilter02.heinlein-hosting.de (spamfilter02.heinlein-hosting.de [80.241.56.116]) (amavisd-new, port 10030) with ESMTP id MEKzUV6e8Xdt; Thu, 3 Oct 2019 17:57:20 +0200 (CEST) From: Hauke Mehrtens To: backports@vger.kernel.org Cc: johannes@sipsolutions.net, Hauke Mehrtens Subject: [PATCH 06/11] backports: skbuff.h: Add skb_mac_offset() Date: Thu, 3 Oct 2019 17:56:37 +0200 Message-Id: <20191003155642.14909-7-hauke@hauke-m.de> In-Reply-To: <20191003155642.14909-1-hauke@hauke-m.de> References: <20191003155642.14909-1-hauke@hauke-m.de> MIME-Version: 1.0 Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org Add skb_mac_offset() from upstream kernel commit ea6da4fd388a ("net/skbuff: Introduce skb_mac_offset()") which is used by the wil6210 driver. Signed-off-by: Hauke Mehrtens --- backport/backport-include/linux/skbuff.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/backport/backport-include/linux/skbuff.h b/backport/backport-include/linux/skbuff.h index 589d2499..41e5724b 100644 --- a/backport/backport-include/linux/skbuff.h +++ b/backport/backport-include/linux/skbuff.h @@ -380,6 +380,14 @@ static inline struct sk_buff *__skb_peek(const struct sk_buff_head *list_) } #endif +#if LINUX_VERSION_IS_LESS(4,11,0) +#define skb_mac_offset LINUX_BACKPORT(skb_mac_offset) +static inline int skb_mac_offset(const struct sk_buff *skb) +{ + return skb_mac_header(skb) - skb->data; +} +#endif + #if LINUX_VERSION_IS_LESS(5,4,0) /** * skb_frag_off() - Returns the offset of a skb fragment From patchwork Thu Oct 3 15:56:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 11173001 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1D21D14DB for ; Thu, 3 Oct 2019 17:42:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EEDEF20830 for ; Thu, 3 Oct 2019 17:42:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728336AbfJCP50 (ORCPT ); Thu, 3 Oct 2019 11:57:26 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:38532 "EHLO mx2.mailbox.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730943AbfJCP5Z (ORCPT ); Thu, 3 Oct 2019 11:57:25 -0400 Received: from smtp2.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id 399A2A36C3; Thu, 3 Oct 2019 17:57:23 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp2.mailbox.org ([80.241.60.240]) by spamfilter06.heinlein-hosting.de (spamfilter06.heinlein-hosting.de [80.241.56.125]) (amavisd-new, port 10030) with ESMTP id Hk1g9Z3Ddxrs; Thu, 3 Oct 2019 17:57:20 +0200 (CEST) From: Hauke Mehrtens To: backports@vger.kernel.org Cc: johannes@sipsolutions.net, Hauke Mehrtens Subject: [PATCH 07/11] backports: io.h: Add __ioread32_copy() Date: Thu, 3 Oct 2019 17:56:38 +0200 Message-Id: <20191003155642.14909-8-hauke@hauke-m.de> In-Reply-To: <20191003155642.14909-1-hauke@hauke-m.de> References: <20191003155642.14909-1-hauke@hauke-m.de> MIME-Version: 1.0 Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org Add __ioread32_copy() from usptream Linux commit a9aec5881b9d ("lib/iomap_copy.c: add __ioread32_copy()") which is used by mt76 driver. Signed-off-by: Hauke Mehrtens --- backport/backport-include/linux/io.h | 5 +++++ backport/compat/backport-4.5.c | 22 ++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/backport/backport-include/linux/io.h b/backport/backport-include/linux/io.h index 78ae4650..f91085be 100644 --- a/backport/backport-include/linux/io.h +++ b/backport/backport-include/linux/io.h @@ -6,4 +6,9 @@ #define IOMEM_ERR_PTR(err) (__force void __iomem *)ERR_PTR(err) #endif +#if LINUX_VERSION_IS_LESS(4,5,0) +#define __ioread32_copy LINUX_BACKPORT(__ioread32_copy) +void __ioread32_copy(void *to, const void __iomem *from, size_t count); +#endif + #endif /* __BP_LINUX_IO_H */ diff --git a/backport/compat/backport-4.5.c b/backport/compat/backport-4.5.c index 13764dc7..b4aae624 100644 --- a/backport/compat/backport-4.5.c +++ b/backport/compat/backport-4.5.c @@ -18,6 +18,7 @@ #include #include #include +#include #if LINUX_VERSION_IS_GEQ(3,19,0) int led_set_brightness_sync(struct led_classdev *led_cdev, @@ -150,3 +151,24 @@ int devm_led_trigger_register(struct device *dev, return rc; } EXPORT_SYMBOL_GPL(devm_led_trigger_register); + +/** + * __ioread32_copy - copy data from MMIO space, in 32-bit units + * @to: destination (must be 32-bit aligned) + * @from: source, in MMIO space (must be 32-bit aligned) + * @count: number of 32-bit quantities to copy + * + * Copy data from MMIO space to kernel space, in units of 32 bits at a + * time. Order of access is not guaranteed, nor is a memory barrier + * performed afterwards. + */ +void __ioread32_copy(void *to, const void __iomem *from, size_t count) +{ + u32 *dst = to; + const u32 __iomem *src = from; + const u32 __iomem *end = src + count; + + while (src < end) + *dst++ = __raw_readl(src++); +} +EXPORT_SYMBOL_GPL(__ioread32_copy); From patchwork Thu Oct 3 15:56:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 11173009 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1DD0117EE for ; Thu, 3 Oct 2019 17:42:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0785821A4C for ; Thu, 3 Oct 2019 17:42:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730947AbfJCRmQ (ORCPT ); Thu, 3 Oct 2019 13:42:16 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:38530 "EHLO mx2.mailbox.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730945AbfJCP50 (ORCPT ); Thu, 3 Oct 2019 11:57:26 -0400 Received: from smtp2.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id 95EF3A3526; Thu, 3 Oct 2019 17:57:23 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp2.mailbox.org ([80.241.60.240]) by spamfilter04.heinlein-hosting.de (spamfilter04.heinlein-hosting.de [80.241.56.122]) (amavisd-new, port 10030) with ESMTP id 4ZV-Hl7s7SIp; Thu, 3 Oct 2019 17:57:20 +0200 (CEST) From: Hauke Mehrtens To: backports@vger.kernel.org Cc: johannes@sipsolutions.net, Hauke Mehrtens Subject: [PATCH 08/11] backports: io: Add writel_relaxed() Date: Thu, 3 Oct 2019 17:56:39 +0200 Message-Id: <20191003155642.14909-9-hauke@hauke-m.de> In-Reply-To: <20191003155642.14909-1-hauke@hauke-m.de> References: <20191003155642.14909-1-hauke@hauke-m.de> MIME-Version: 1.0 Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org Add writel_relaxed() from upstream commit 9439eb3ab9d1 ("asm-generic: io: implement relaxed accessor macros as conditional wrappers") which is used by the wil6210 driver. Signed-off-by: Hauke Mehrtens --- backport/backport-include/linux/io.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/backport/backport-include/linux/io.h b/backport/backport-include/linux/io.h index f91085be..e04305c3 100644 --- a/backport/backport-include/linux/io.h +++ b/backport/backport-include/linux/io.h @@ -11,4 +11,12 @@ void __ioread32_copy(void *to, const void __iomem *from, size_t count); #endif +#ifndef writel_relaxed +#define writel_relaxed writel_relaxed +static inline void writel_relaxed(u32 value, volatile void __iomem *addr) +{ + __raw_writel(__cpu_to_le32(value), addr); +} +#endif + #endif /* __BP_LINUX_IO_H */ From patchwork Thu Oct 3 15:56:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 11173005 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AABD1195A for ; Thu, 3 Oct 2019 17:42:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 940D921A4C for ; Thu, 3 Oct 2019 17:42:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730948AbfJCRmP (ORCPT ); Thu, 3 Oct 2019 13:42:15 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:38534 "EHLO mx2.mailbox.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730947AbfJCP50 (ORCPT ); Thu, 3 Oct 2019 11:57:26 -0400 Received: from smtp2.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id 20967A359F; Thu, 3 Oct 2019 17:57:24 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp2.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 Mgk7rPBOcsPw; Thu, 3 Oct 2019 17:57:21 +0200 (CEST) From: Hauke Mehrtens To: backports@vger.kernel.org Cc: johannes@sipsolutions.net, Hauke Mehrtens Subject: [PATCH 09/11] backports: dependencies: make ATH9K OWL depend on kernel 3.14 Date: Thu, 3 Oct 2019 17:56:40 +0200 Message-Id: <20191003155642.14909-10-hauke@hauke-m.de> In-Reply-To: <20191003155642.14909-1-hauke@hauke-m.de> References: <20191003155642.14909-1-hauke@hauke-m.de> MIME-Version: 1.0 Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org The ath9k owl driver uses pci_lock_rescan_remove() and pci_unlock_rescan_remove() which was added in kernel 3.14, only compile it on kernel >= 3.14. Signed-off-by: Hauke Mehrtens --- dependencies | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dependencies b/dependencies index 11470217..02d46ca3 100644 --- a/dependencies +++ b/dependencies @@ -52,6 +52,9 @@ ATH_TRACEPOINTS 3.1 # missigng add_hwgenerator_randomness() ATH9K_HWRNG 3.17 +# missing pci_lock_rescan_remove() +ATH9K_PCI_NO_EEPROM 3.14 + # This driver needs mmc_hw_reset() which was added in kernel version 3.2 MWIFIEX_SDIO 3.2 From patchwork Thu Oct 3 15:56:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 11172999 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4193314DB for ; Thu, 3 Oct 2019 17:42:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2AE6020830 for ; Thu, 3 Oct 2019 17:42:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731045AbfJCRmO (ORCPT ); Thu, 3 Oct 2019 13:42:14 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:38532 "EHLO mx2.mailbox.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729141AbfJCP51 (ORCPT ); Thu, 3 Oct 2019 11:57:27 -0400 Received: from smtp2.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id 6DD11A3503; Thu, 3 Oct 2019 17:57:26 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp2.mailbox.org ([80.241.60.240]) by hefe.heinlein-support.de (hefe.heinlein-support.de [91.198.250.172]) (amavisd-new, port 10030) with ESMTP id YZveSU9t0Z7l; Thu, 3 Oct 2019 17:57:21 +0200 (CEST) From: Hauke Mehrtens To: backports@vger.kernel.org Cc: johannes@sipsolutions.net, Hauke Mehrtens Subject: [PATCH 10/11] backports: lib-arc4: Do not build when activated in kernel Date: Thu, 3 Oct 2019 17:56:41 +0200 Message-Id: <20191003155642.14909-11-hauke@hauke-m.de> In-Reply-To: <20191003155642.14909-1-hauke@hauke-m.de> References: <20191003155642.14909-1-hauke@hauke-m.de> MIME-Version: 1.0 Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org Only build the own lib-arc4 version when it is not build as a module or into the kernel. Without this change it was also build when CRYPTO_LIB_ARC4 was build as a module in the kernel. Signed-off-by: Hauke Mehrtens --- backport/compat/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backport/compat/Kconfig b/backport/compat/Kconfig index e462776e..3af729a3 100644 --- a/backport/compat/Kconfig +++ b/backport/compat/Kconfig @@ -175,6 +175,6 @@ config BPAUTO_CRYPTO_LIB_ARC4 config BPAUTO_BUILD_CRYPTO_LIB_ARC4 bool default y if BPAUTO_CRYPTO_LIB_ARC4 - depends on KERNEL_4_20 || !CRYPTO_LIB_ARC4 + depends on !(CRYPTO_LIB_ARC4=y || CRYPTO_LIB_ARC4=m) #h-file crypto/arc4.h #c-file lib/crypto/arc4.c From patchwork Thu Oct 3 15:56:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 11172801 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E106513B1 for ; Thu, 3 Oct 2019 15:57:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BE70721848 for ; Thu, 3 Oct 2019 15:57:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730194AbfJCP51 (ORCPT ); Thu, 3 Oct 2019 11:57:27 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:38556 "EHLO mx2.mailbox.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730951AbfJCP50 (ORCPT ); Thu, 3 Oct 2019 11:57:26 -0400 Received: from smtp2.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id B17BAA25EC; Thu, 3 Oct 2019 17:57:24 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp2.mailbox.org ([80.241.60.240]) by spamfilter04.heinlein-hosting.de (spamfilter04.heinlein-hosting.de [80.241.56.122]) (amavisd-new, port 10030) with ESMTP id EwYUdx7ekI3h; Thu, 3 Oct 2019 17:57:22 +0200 (CEST) From: Hauke Mehrtens To: backports@vger.kernel.org Cc: johannes@sipsolutions.net, Hauke Mehrtens Subject: [PATCH 11/11] backports: ckmake: limit load to number of CPUs Date: Thu, 3 Oct 2019 17:56:42 +0200 Message-Id: <20191003155642.14909-12-hauke@hauke-m.de> In-Reply-To: <20191003155642.14909-1-hauke@hauke-m.de> References: <20191003155642.14909-1-hauke@hauke-m.de> MIME-Version: 1.0 Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org Instead of limiting the maximum load to a fixed number limit it to the number of available CPUs. This should hopefully increase the speed as less task switches are needed. Also reduce the number of treads per build to half the number of available CPUs. Normally multiple builds are done in parallel anyway. Signed-off-by: Hauke Mehrtens --- devel/ckmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devel/ckmake b/devel/ckmake index d8c16773..d16de3a7 100755 --- a/devel/ckmake +++ b/devel/ckmake @@ -152,8 +152,8 @@ def process_kernel(num, kset, cmdline_args): work_dir, ignore=ignore_patterns('.tmp*', ".git")) build = '%s/build/' % rel['full_path'] - jobs = '-j%d' % kset.build_jobs - load = '-l%d' % 50 + jobs = '-j%d' % (kset.build_jobs / 2) + load = '-l%d' % kset.build_jobs make_args = ['KLIB=%s' % build, 'KLIB_BUILD=%s' % build] nice = ['ionice', '-c', '3', 'nice', '-n', '20']