Backports Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH v3 0/3] backports: to make iwlwifi backported from v5.1-rc1 can be compiled
@ 2019-03-27  3:00 AceLan Kao
  2019-03-27  3:00 ` [PATCH v3 1/3] backports: remove mt76.patch AceLan Kao
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: AceLan Kao @ 2019-03-27  3:00 UTC (permalink / raw)
  To: hauke, mcgrof, backports

Trying to backport iwlwifi driver from v5.1-rc1, and did some necessary
modifications.

== ckmake-report.log ==

1   3.10.108            [  FAIL  ]
2   3.11.10             [  FAIL  ]
3   3.12.74             [  FAIL  ]
4   3.13.11             [  FAIL  ]
5   3.14.79             [  FAIL  ]
6   3.15.10             [  FAIL  ]
7   3.16.63             [  FAIL  ]
8   3.17.8              [  FAIL  ]
9   3.18.136            [  FAIL  ]
10  3.19.8              [  FAIL  ]
11  4.0.9               [  FAIL  ]
12  4.1.52              [  FAIL  ]
13  4.2.8               [  LINK  ]
14  4.3.6               [  LINK  ]
15  4.4.176             [  OK  ]
16  4.5.7               [  OK  ]
17  4.6.7               [  FAIL  ]
18  4.7.10              [  FAIL  ]
19  4.8.17              [  FAIL  ]
20  4.9.162             [  FAIL  ]
21  4.10.17             [  FAIL  ]
22  4.11.12             [  FAIL  ]
23  4.12.14             [  OK  ]
24  4.13.16             [  OK  ]
25  4.14.105            [  OK  ]
26  4.15.18             [  OK  ]
27  4.16.18             [  OK  ]
28  4.17.19             [  OK  ]
29  4.18.20             [  OK  ]
30  4.19.28             [  OK  ]
31  4.20.15             [  OK  ]
32  5.0.1               [  OK  ]

AceLan Kao (3):
  backports: remove mt76.patch
  backports: update backport/backport-include/net/netlink.h
  backports: fix compilation error against v4.4 kernel

 backport/backport-include/net/netlink.h       | 18 +++++++++++++-----
 patches/0013-fix-makefile-includes/mt76.patch | 10 ----------
 patches/lib-refcount.patch                    |  6 +++++-
 3 files changed, 18 insertions(+), 16 deletions(-)
 delete mode 100644 patches/0013-fix-makefile-includes/mt76.patch

-- 
2.17.1

--
To unsubscribe from this list: send the line "unsubscribe backports" in

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH v3 1/3] backports: remove mt76.patch
  2019-03-27  3:00 [PATCH v3 0/3] backports: to make iwlwifi backported from v5.1-rc1 can be compiled AceLan Kao
@ 2019-03-27  3:00 ` AceLan Kao
  2019-03-27  3:00 ` [PATCH v3 2/3] backports: update backport/backport-include/net/netlink.h AceLan Kao
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: AceLan Kao @ 2019-03-27  3:00 UTC (permalink / raw)
  To: hauke, mcgrof, backports

The patch patches/0013-fix-makefile-includes/mt76.patch was added in
upstream Linux commit 85b7e2acd31b ("mt76: Add missing include of
linux/module.h") which was added in v5.1-rc1

Signed-off-by: AceLan Kao <acelan.kao@canonical.com>
---
 patches/0013-fix-makefile-includes/mt76.patch | 10 ----------
 1 file changed, 10 deletions(-)
 delete mode 100644 patches/0013-fix-makefile-includes/mt76.patch

diff --git a/patches/0013-fix-makefile-includes/mt76.patch b/patches/0013-fix-makefile-includes/mt76.patch
deleted file mode 100644
index 4f122c46..00000000
--- a/patches/0013-fix-makefile-includes/mt76.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/drivers/net/wireless/mediatek/mt76/mt76x0/usb_mcu.c
-+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/usb_mcu.c
-@@ -15,6 +15,7 @@
-  */
- #include <linux/kernel.h>
- #include <linux/firmware.h>
-+#include <linux/module.h>
- 
- #include "mt76x0.h"
- #include "mcu.h"
-- 
2.17.1

--
To unsubscribe from this list: send the line "unsubscribe backports" in

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH v3 2/3] backports: update backport/backport-include/net/netlink.h
  2019-03-27  3:00 [PATCH v3 0/3] backports: to make iwlwifi backported from v5.1-rc1 can be compiled AceLan Kao
  2019-03-27  3:00 ` [PATCH v3 1/3] backports: remove mt76.patch AceLan Kao
@ 2019-03-27  3:00 ` AceLan Kao
  2019-03-27  3:00 ` [PATCH v3 3/3] backports: fix compilation error against v4.4 kernel AceLan Kao
  2019-03-28 15:02 ` [PATCH v3 0/3] backports: to make iwlwifi backported from v5.1-rc1 can be compiled Hauke Mehrtens
  3 siblings, 0 replies; 5+ messages in thread
From: AceLan Kao @ 2019-03-27  3:00 UTC (permalink / raw)
  To: hauke, mcgrof, backports

Add new macros introduced from v5.1-rc1
   23323289b154 netlink: reduce NLA_POLICY_NESTED{,_ARRAY} arguments

v3: Fix v4.20 compilation error

Signed-off-by: AceLan Kao <acelan.kao@canonical.com>
---
 backport/backport-include/net/netlink.h | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/backport/backport-include/net/netlink.h b/backport/backport-include/net/netlink.h
index 4af73631..d8237f10 100644
--- a/backport/backport-include/net/netlink.h
+++ b/backport/backport-include/net/netlink.h
@@ -4,6 +4,19 @@
 #include <linux/version.h>
 #include <linux/in6.h>
 
+#if LINUX_VERSION_IS_LESS(5,1,0)
+#undef NLA_POLICY_NESTED
+#undef NLA_POLICY_NESTED_ARRAY
+#define _NLA_POLICY_NESTED(maxattr, policy) \
+	{ .type = NLA_NESTED, .validation_data = policy, .len = maxattr }
+#define _NLA_POLICY_NESTED_ARRAY(maxattr, policy) \
+	{ .type = NLA_NESTED_ARRAY, .validation_data = policy, .len = maxattr }
+#define NLA_POLICY_NESTED(policy) \
+	_NLA_POLICY_NESTED(ARRAY_SIZE(policy) - 1, policy)
+#define NLA_POLICY_NESTED_ARRAY(policy) \
+	_NLA_POLICY_NESTED_ARRAY(ARRAY_SIZE(policy) - 1, policy)
+#endif /* < 5.1 */
+
 #if LINUX_VERSION_IS_LESS(4,20,0)
 /* can't backport using the enum - need to override */
 #define NLA_UNSPEC		0
@@ -59,11 +72,6 @@ struct backport_nla_policy {
 #define NLA_POLICY_ETH_ADDR		NLA_POLICY_EXACT_LEN(ETH_ALEN)
 #define NLA_POLICY_ETH_ADDR_COMPAT	NLA_POLICY_EXACT_LEN_WARN(ETH_ALEN)
 
-#define NLA_POLICY_NESTED(maxattr, policy) \
-	{ .type = NLA_NESTED, .validation_data = policy, .len = maxattr }
-#define NLA_POLICY_NESTED_ARRAY(maxattr, policy) \
-	{ .type = NLA_NESTED_ARRAY, .validation_data = policy, .len = maxattr }
-
 #define __NLA_ENSURE(condition) (sizeof(char[1 - 2*!(condition)]) - 1)
 #define NLA_ENSURE_INT_TYPE(tp)				\
 	(__NLA_ENSURE(tp == NLA_S8 || tp == NLA_U8 ||	\
-- 
2.17.1

--
To unsubscribe from this list: send the line "unsubscribe backports" in

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH v3 3/3] backports: fix compilation error against v4.4 kernel
  2019-03-27  3:00 [PATCH v3 0/3] backports: to make iwlwifi backported from v5.1-rc1 can be compiled AceLan Kao
  2019-03-27  3:00 ` [PATCH v3 1/3] backports: remove mt76.patch AceLan Kao
  2019-03-27  3:00 ` [PATCH v3 2/3] backports: update backport/backport-include/net/netlink.h AceLan Kao
@ 2019-03-27  3:00 ` AceLan Kao
  2019-03-28 15:02 ` [PATCH v3 0/3] backports: to make iwlwifi backported from v5.1-rc1 can be compiled Hauke Mehrtens
  3 siblings, 0 replies; 5+ messages in thread
From: AceLan Kao @ 2019-03-27  3:00 UTC (permalink / raw)
  To: hauke, mcgrof, backports

Add the smp_acquire__after_ctrl_dep macro to compat/lib-refcount.c to
fix the compilation error

/tmp/tmp.Z85sMNyuzD/backports-5.1-rc1-test1/backports-5.1-rc1/compat/lib-refcount.c:
In function 'backport_refcount_sub_and_test_checked':
/tmp/tmp.Z85sMNyuzD/backports-5.1-rc1-test1/backports-5.1-rc1/compat/lib-refcount.c:198:3:
error: implicit declaration of function 'smp_acquire__after_ctrl_dep'
[-Werror=implicit-function-declaration]
   smp_acquire__after_ctrl_dep();
   ^

Signed-off-by: AceLan Kao <acelan.kao@canonical.com>
---
 patches/lib-refcount.patch | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/patches/lib-refcount.patch b/patches/lib-refcount.patch
index 28106342..ae568f8d 100644
--- a/patches/lib-refcount.patch
+++ b/patches/lib-refcount.patch
@@ -2,11 +2,15 @@ diff --git a/compat/lib-refcount.c b/compat/lib-refcount.c
 index 5d0582a..8d108f9 100644
 --- a/compat/lib-refcount.c
 +++ b/compat/lib-refcount.c
-@@ -39,6 +39,7 @@
+@@ -42,6 +42,11 @@
  #include <linux/refcount.h>
  #include <linux/spinlock.h>
  #include <linux/bug.h>
 +#include <linux/export.h>
++
++#ifndef smp_acquire__after_ctrl_dep
++#define smp_acquire__after_ctrl_dep()           smp_rmb()
++#endif
  
  /**
   * refcount_add_not_zero_checked - add a value to a refcount unless it is 0
-- 
2.17.1

--
To unsubscribe from this list: send the line "unsubscribe backports" in

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH v3 0/3] backports: to make iwlwifi backported from v5.1-rc1 can be compiled
  2019-03-27  3:00 [PATCH v3 0/3] backports: to make iwlwifi backported from v5.1-rc1 can be compiled AceLan Kao
                   ` (2 preceding siblings ...)
  2019-03-27  3:00 ` [PATCH v3 3/3] backports: fix compilation error against v4.4 kernel AceLan Kao
@ 2019-03-28 15:02 ` Hauke Mehrtens
  3 siblings, 0 replies; 5+ messages in thread
From: Hauke Mehrtens @ 2019-03-28 15:02 UTC (permalink / raw)
  To: AceLan Kao, mcgrof, backports

On 3/27/19 4:00 AM, AceLan Kao wrote:
> Trying to backport iwlwifi driver from v5.1-rc1, and did some necessary
> modifications.
> 
> == ckmake-report.log ==
> 
> 1   3.10.108            [  FAIL  ]
> 2   3.11.10             [  FAIL  ]
> 3   3.12.74             [  FAIL  ]
> 4   3.13.11             [  FAIL  ]
> 5   3.14.79             [  FAIL  ]
> 6   3.15.10             [  FAIL  ]
> 7   3.16.63             [  FAIL  ]
> 8   3.17.8              [  FAIL  ]
> 9   3.18.136            [  FAIL  ]
> 10  3.19.8              [  FAIL  ]
> 11  4.0.9               [  FAIL  ]
> 12  4.1.52              [  FAIL  ]
> 13  4.2.8               [  LINK  ]
> 14  4.3.6               [  LINK  ]
> 15  4.4.176             [  OK  ]
> 16  4.5.7               [  OK  ]
> 17  4.6.7               [  FAIL  ]
> 18  4.7.10              [  FAIL  ]
> 19  4.8.17              [  FAIL  ]
> 20  4.9.162             [  FAIL  ]
> 21  4.10.17             [  FAIL  ]
> 22  4.11.12             [  FAIL  ]
> 23  4.12.14             [  OK  ]
> 24  4.13.16             [  OK  ]
> 25  4.14.105            [  OK  ]
> 26  4.15.18             [  OK  ]
> 27  4.16.18             [  OK  ]
> 28  4.17.19             [  OK  ]
> 29  4.18.20             [  OK  ]
> 30  4.19.28             [  OK  ]
> 31  4.20.15             [  OK  ]
> 32  5.0.1               [  OK  ]
> 
> AceLan Kao (3):
>   backports: remove mt76.patch
>   backports: update backport/backport-include/net/netlink.h
>   backports: fix compilation error against v4.4 kernel
> 
>  backport/backport-include/net/netlink.h       | 18 +++++++++++++-----
>  patches/0013-fix-makefile-includes/mt76.patch | 10 ----------
>  patches/lib-refcount.patch                    |  6 +++++-
>  3 files changed, 18 insertions(+), 16 deletions(-)
>  delete mode 100644 patches/0013-fix-makefile-includes/mt76.patch
> 

Thank you I applied your first 2 patches and took my version instead of
your 3. patch.

Hauke
--
To unsubscribe from this list: send the line "unsubscribe backports" in

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, back to index

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-27  3:00 [PATCH v3 0/3] backports: to make iwlwifi backported from v5.1-rc1 can be compiled AceLan Kao
2019-03-27  3:00 ` [PATCH v3 1/3] backports: remove mt76.patch AceLan Kao
2019-03-27  3:00 ` [PATCH v3 2/3] backports: update backport/backport-include/net/netlink.h AceLan Kao
2019-03-27  3:00 ` [PATCH v3 3/3] backports: fix compilation error against v4.4 kernel AceLan Kao
2019-03-28 15:02 ` [PATCH v3 0/3] backports: to make iwlwifi backported from v5.1-rc1 can be compiled Hauke Mehrtens

Backports Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/backports/0 backports/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 backports backports/ https://lore.kernel.org/backports \
		backports@vger.kernel.org backports@archiver.kernel.org
	public-inbox-index backports


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.backports


AGPL code for this site: git clone https://public-inbox.org/ public-inbox