From patchwork Tue Mar 26 15:11: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: 10871357 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 A58B8186D for ; Tue, 26 Mar 2019 15:11:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8F5A928E35 for ; Tue, 26 Mar 2019 15:11:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 83BD428F88; Tue, 26 Mar 2019 15:11:57 +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 CAF7628F82 for ; Tue, 26 Mar 2019 15:11:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731509AbfCZPLz (ORCPT ); Tue, 26 Mar 2019 11:11:55 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:18476 "EHLO mx2.mailbox.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731475AbfCZPLz (ORCPT ); Tue, 26 Mar 2019 11:11:55 -0400 Received: from smtp1.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 672F7A1569; Tue, 26 Mar 2019 16:11:53 +0100 (CET) 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 P8azzxYQp1Ty; Tue, 26 Mar 2019 16:11:47 +0100 (CET) From: Hauke Mehrtens To: backports@vger.kernel.org Cc: Hauke Mehrtens Subject: [PATCH 1/4] backports: Add rhashtable_lookup_get_insert_fast() Date: Tue, 26 Mar 2019 16:11:35 +0100 Message-Id: <20190326151138.4141-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 X-Virus-Scanned: ClamAV using ClamSMTP rhashtable_lookup_get_insert_fast() was added in kernel 4.12 in Linux upstream commit f9fe1c12d12 ("rhashtable: Add rhashtable_lookup_get_insert_fast") It is now used by mac80211. For kernel < 4.9 we already backport the complete rhashtable implementation, so this is only needed for kernels more recent than 4.9. This is copied from upstreamn Linux kernel. Signed-off-by: Hauke Mehrtens --- backport/backport-include/linux/rhashtable.h | 31 ++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 backport/backport-include/linux/rhashtable.h diff --git a/backport/backport-include/linux/rhashtable.h b/backport/backport-include/linux/rhashtable.h new file mode 100644 index 00000000..8e493bc5 --- /dev/null +++ b/backport/backport-include/linux/rhashtable.h @@ -0,0 +1,31 @@ +#ifndef __BACKPORT_RHASHTABLE_H +#define __BACKPORT_RHASHTABLE_H +#include_next +#include + +#if LINUX_VERSION_IS_LESS(4,12,0) +/** + * rhashtable_lookup_get_insert_fast - lookup and insert object into hash table + * @ht: hash table + * @obj: pointer to hash head inside object + * @params: hash table parameters + * + * Just like rhashtable_lookup_insert_fast(), but this function returns the + * object if it exists, NULL if it did not and the insertion was successful, + * and an ERR_PTR otherwise. + */ +#define rhashtable_lookup_get_insert_fast LINUX_BACKPORT(rhashtable_lookup_get_insert_fast) +static inline void *rhashtable_lookup_get_insert_fast( + struct rhashtable *ht, struct rhash_head *obj, + const struct rhashtable_params params) +{ + const char *key = rht_obj(ht, obj); + + BUG_ON(ht->p.obj_hashfn); + + return __rhashtable_insert_fast(ht, key + ht->p.key_offset, obj, params, + false); +} +#endif + +#endif /* __BACKPORT_RHASHTABLE_H */ From patchwork Tue Mar 26 15:11: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: 10871361 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 4A2E314DE for ; Tue, 26 Mar 2019 15:12:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3654C28E59 for ; Tue, 26 Mar 2019 15:12:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3354228F7A; Tue, 26 Mar 2019 15:12:01 +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 E1A0E28F4F for ; Tue, 26 Mar 2019 15:12:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726177AbfCZPMA (ORCPT ); Tue, 26 Mar 2019 11:12:00 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:29178 "EHLO mx1.mailbox.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727492AbfCZPMA (ORCPT ); Tue, 26 Mar 2019 11:12:00 -0400 Received: from smtp1.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 mx1.mailbox.org (Postfix) with ESMTPS id 81E4C4CCF4; Tue, 26 Mar 2019 16:11:58 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.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 0RoWybzKThAx; Tue, 26 Mar 2019 16:11:47 +0100 (CET) From: Hauke Mehrtens To: backports@vger.kernel.org Cc: Hauke Mehrtens Subject: [PATCH 2/4] backports: Add smp_acquire__after_ctrl_dep() Date: Tue, 26 Mar 2019 16:11:36 +0100 Message-Id: <20190326151138.4141-2-hauke@hauke-m.de> In-Reply-To: <20190326151138.4141-1-hauke@hauke-m.de> References: <20190326151138.4141-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 X-Virus-Scanned: ClamAV using ClamSMTP smp_acquire__after_ctrl_dep() was introduced in kernel 4.8 in upstream Linux commit 33ac279677d ("locking/barriers: Introduce smp_acquire__after_ctrl_dep()") and is used by backports lib-refcount.c implementation now. This just adds the default implementation to backports. Signed-off-by: Hauke Mehrtens --- backport/backport-include/asm/barrier.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/backport/backport-include/asm/barrier.h b/backport/backport-include/asm/barrier.h index 9e1e1f11..bca05588 100644 --- a/backport/backport-include/asm/barrier.h +++ b/backport/backport-include/asm/barrier.h @@ -19,4 +19,8 @@ #define smp_mb__after_atomic smp_mb__after_clear_bit #endif +#ifndef smp_acquire__after_ctrl_dep +#define smp_acquire__after_ctrl_dep() smp_rmb() +#endif + #endif /* __BACKPORT_ASM_BARRIER_H */ From patchwork Tue Mar 26 15:11: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: 10871359 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 C1A6914DE for ; Tue, 26 Mar 2019 15:11:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AD1CA28E12 for ; Tue, 26 Mar 2019 15:11:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AB5E928F91; Tue, 26 Mar 2019 15:11:57 +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 59FC528E34 for ; Tue, 26 Mar 2019 15:11:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726261AbfCZPL4 (ORCPT ); Tue, 26 Mar 2019 11:11:56 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:28746 "EHLO mx1.mailbox.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727492AbfCZPLz (ORCPT ); Tue, 26 Mar 2019 11:11:55 -0400 Received: from smtp1.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 mx1.mailbox.org (Postfix) with ESMTPS id 213B64CA9E; Tue, 26 Mar 2019 16:11:53 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.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 qkzi4uAUSGwM; Tue, 26 Mar 2019 16:11:47 +0100 (CET) From: Hauke Mehrtens To: backports@vger.kernel.org Cc: Hauke Mehrtens Subject: [PATCH 3/4] backports: Add missing include for brcmfmac Date: Tue, 26 Mar 2019 16:11:37 +0100 Message-Id: <20190326151138.4141-3-hauke@hauke-m.de> In-Reply-To: <20190326151138.4141-1-hauke@hauke-m.de> References: <20190326151138.4141-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 X-Virus-Scanned: ClamAV using ClamSMTP When building against kernel 4.8, 3.14 and older, brcmfmac failed because struct sk_buff was not declared in brcmfmac/bus.h. This is used in the brcmf_bus_ops.txdata() callback. I do not know why this was working before. Signed-off-by: Hauke Mehrtens --- patches/0013-fix-makefile-includes/brcmfmac.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 patches/0013-fix-makefile-includes/brcmfmac.patch diff --git a/patches/0013-fix-makefile-includes/brcmfmac.patch b/patches/0013-fix-makefile-includes/brcmfmac.patch new file mode 100644 index 00000000..9147c80f --- /dev/null +++ b/patches/0013-fix-makefile-includes/brcmfmac.patch @@ -0,0 +1,13 @@ +brcmf_bus_ops.txdata() uses a paramater of type struct sk_buff which +was not declared here when compiling against kernele 4.8 and older. + +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h +@@ -17,6 +17,7 @@ + #ifndef BRCMFMAC_BUS_H + #define BRCMFMAC_BUS_H + ++#include + #include "debug.h" + + /* IDs of the 6 default common rings of msgbuf protocol */ From patchwork Tue Mar 26 15:11: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: 10871355 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 D841C14DE for ; Tue, 26 Mar 2019 15:11:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C57DE28DD5 for ; Tue, 26 Mar 2019 15:11:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C3B8028F81; Tue, 26 Mar 2019 15:11:56 +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 58B0128DD5 for ; Tue, 26 Mar 2019 15:11:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731495AbfCZPLy (ORCPT ); Tue, 26 Mar 2019 11:11:54 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:18442 "EHLO mx2.mailbox.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726261AbfCZPLy (ORCPT ); Tue, 26 Mar 2019 11:11:54 -0400 Received: from smtp1.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 CEE51A1484; Tue, 26 Mar 2019 16:11:52 +0100 (CET) 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 zv7Ar2E2Y0hc; Tue, 26 Mar 2019 16:11:47 +0100 (CET) From: Hauke Mehrtens To: backports@vger.kernel.org Cc: Hauke Mehrtens Subject: [PATCH 4/4] backports: Build CONFIG_MT7603E only for kernel >= 4.2 Date: Tue, 26 Mar 2019 16:11:38 +0100 Message-Id: <20190326151138.4141-4-hauke@hauke-m.de> In-Reply-To: <20190326151138.4141-1-hauke@hauke-m.de> References: <20190326151138.4141-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 X-Virus-Scanned: ClamAV using ClamSMTP The mt76 core driver makes use of struct page_frag_cache which was only added with kernel 4.2, deactivate all modules of the mt76 driver on older kernel versions. CONFIG_MT7603E was newly added in this kernel version. Signed-off-by: Hauke Mehrtens --- dependencies | 1 + 1 file changed, 1 insertion(+) diff --git a/dependencies b/dependencies index 7361e60d..b2edad81 100644 --- a/dependencies +++ b/dependencies @@ -75,6 +75,7 @@ MT76x0U 4.2 MT76x0E 4.2 MT76x2E 4.2 MT76x2U 4.2 +MT7603E 4.2 # select_queue_fallback_t is missing RTL8723BS 3.14