[PATCH 0/8] backports: misc fixes

[PATCH 0/8] backports: misc fixes

[Hauke Mehrtens]

This fixes two problems introduced in my previous patches and also adds 
some other small functions needed to build against kernel >= 3.13.

Hauke Mehrtens (8):
  patches: export bp_usbnet_get_stats64() only if function is added
  patches: brcmfmac: Fix netdev_set_priv_destructor
  backport: add ethtool_convert_legacy_u32_to_link_mode()
  header: add IOMEM_ERR_PTR()
  header: add __get_dynamic_array_len
  header: add pm_system_wakeup()
  dependencies: make NFC_TRF7970A depend on kernel > 3.17
  dependencies: make MWIFIEX_PCIE depend on kernel > 3.16

 backport/backport-include/linux/io.h          |  9 +++++++++
 backport/backport-include/linux/netdevice.h   |  3 +--
 backport/backport-include/linux/suspend.h     | 12 ++++++++++++
 backport/backport-include/trace/ftrace.h      |  4 ++++
 backport/compat/backport-4.10.c               |  7 +++++++
 dependencies                                  |  4 ++++
 patches/0075-ndo-stats-64/usbnet.patch        | 10 ++++------
 patches/0079-netdev-destructor/brcmfmac.patch | 13 ++++++++-----
 8 files changed, 49 insertions(+), 13 deletions(-)
 create mode 100644 backport/backport-include/linux/io.h
 create mode 100644 backport/backport-include/linux/suspend.h

-- 
2.11.0

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

[PATCH 1/8] patches: export bp_usbnet_get_stats64() only if function is added

[Hauke Mehrtens]

Export the bp_usbnet_get_stats64() function only on kernel < 4.11,
because this function is only available on such kernel versions.

Fixes: 5a00d8489c7 ("patches: adapt the stat64 usage for usbnet")
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 patches/0075-ndo-stats-64/usbnet.patch | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/patches/0075-ndo-stats-64/usbnet.patch b/patches/0075-ndo-stats-64/usbnet.patch
index 09de2784..7b48bfeb 100644
--- a/patches/0075-ndo-stats-64/usbnet.patch
+++ b/patches/0075-ndo-stats-64/usbnet.patch
@@ -1,20 +1,18 @@
-diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
-index 095bcfd..6305c41 100644
 --- a/drivers/net/usb/usbnet.c
 +++ b/drivers/net/usb/usbnet.c
-@@ -1014,6 +1014,7 @@
+@@ -1014,6 +1014,9 @@ void usbnet_get_stats64(struct net_devic
  	}
  }
  EXPORT_SYMBOL_GPL(usbnet_get_stats64);
++#if LINUX_VERSION_IS_LESS(4,11,0)
 +EXPORT_SYMBOL_GPL(bp_usbnet_get_stats64);
++#endif
  
  u32 usbnet_get_link (struct net_device *net)
  {
-diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h
-index 9711637..363f6b9 100644
 --- a/include/linux/usb/usbnet.h
 +++ b/include/linux/usb/usbnet.h
-@@ -283,5 +283,9 @@ extern void usbnet_status_stop(struct usbnet *dev);
+@@ -283,5 +283,9 @@ extern void usbnet_status_stop(struct us
  extern void usbnet_update_max_qlen(struct usbnet *dev);
  extern void usbnet_get_stats64(struct net_device *dev,
  			       struct rtnl_link_stats64 *stats);
-- 
2.11.0

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

[PATCH 2/8] patches: brcmfmac: Fix netdev_set_priv_destructor

[Hauke Mehrtens]

On kernel > 4.11.9 the new member priv_destructor should be set in
netdev_set_priv_destructor() and not the old destructor member any more,
it was removed.

This fixes the build on >= 4.11.9.

Fixes: 7c827d5ac9c1 ("patches: brcmfmac: fix netdev destructor")
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 backport/backport-include/linux/netdevice.h   |  3 +--
 patches/0079-netdev-destructor/brcmfmac.patch | 13 ++++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/backport/backport-include/linux/netdevice.h b/backport/backport-include/linux/netdevice.h
index 112bcf2b..9c912285 100644
--- a/backport/backport-include/linux/netdevice.h
+++ b/backport/backport-include/linux/netdevice.h
@@ -320,8 +320,7 @@ static inline void netif_trans_update(struct net_device *dev)
 }
 #endif
 
-#if LINUX_VERSION_IS_LESS(4,12,0) &&		\
-	!LINUX_VERSION_IN_RANGE(4,11,9, 4,12,0)
+#if LINUX_VERSION_IS_LESS(4,11,9)
 #define netdev_set_priv_destructor(_dev, _destructor) \
 	(_dev)->destructor = __ ## _destructor
 #define netdev_set_def_destructor(_dev) \
diff --git a/patches/0079-netdev-destructor/brcmfmac.patch b/patches/0079-netdev-destructor/brcmfmac.patch
index 3f328b26..6dae7a7a 100644
--- a/patches/0079-netdev-destructor/brcmfmac.patch
+++ b/patches/0079-netdev-destructor/brcmfmac.patch
@@ -1,14 +1,17 @@
-diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
-index b5a561b..6f5466f 100644
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
-@@ -462,6 +462,18 @@ static const struct net_device_ops brcmf_netdev_ops_pri = {
+@@ -462,6 +462,23 @@ static const struct net_device_ops brcmf
  	.ndo_set_rx_mode = brcmf_netdev_set_multicast_list
  };
  
 +#undef netdev_set_priv_destructor
++#if LINUX_VERSION_IS_LESS(4,11,9)
 +#define netdev_set_priv_destructor(_dev, _destructor) \
-+	(_dev)->destructor = _destructor
++	(_dev)->destructor = (_destructor)
++#else
++#define netdev_set_priv_destructor(_dev, _destructor) \
++	(_dev)->priv_destructor = (_destructor)
++#endif
 +
 +#if LINUX_VERSION_IS_LESS(4,12,0)
 +static void __brcmf_cfg80211_free_netdev(struct net_device *ndev)
@@ -21,7 +24,7 @@ index b5a561b..6f5466f 100644
  int brcmf_net_attach(struct brcmf_if *ifp, bool rtnl_locked)
  {
  	struct brcmf_pub *drvr = ifp->drvr;
-@@ -634,7 +646,11 @@ struct brcmf_if *brcmf_add_if(struct brcmf_pub *drvr, s32 bsscfgidx, s32 ifidx,
+@@ -634,7 +651,11 @@ struct brcmf_if *brcmf_add_if(struct brc
  		if (!ndev)
  			return ERR_PTR(-ENOMEM);
  
-- 
2.11.0

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

[PATCH 3/8] backport: add ethtool_convert_legacy_u32_to_link_mode()

[Hauke Mehrtens]

This function was added in kernel 4.7 in commit 6d62b4d5fac62 ("net:
ethtool: export conversion function between u32 and link mode") and is
used by mii_ethtool_get_link_ksettings() in the backport-4.10.c file.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 backport/compat/backport-4.10.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/backport/compat/backport-4.10.c b/backport/compat/backport-4.10.c
index 4c8125fb..44e02dd7 100644
--- a/backport/compat/backport-4.10.c
+++ b/backport/compat/backport-4.10.c
@@ -36,6 +36,13 @@ static bool ethtool_convert_link_mode_to_legacy_u32(u32 *legacy_u32,
 	*legacy_u32 = src[0];
 	return retval;
 }
+
+static void ethtool_convert_legacy_u32_to_link_mode(unsigned long *dst,
+						    u32 legacy_u32)
+{
+	bitmap_zero(dst, __ETHTOOL_LINK_MODE_MASK_NBITS);
+	dst[0] = legacy_u32;
+}
 #endif
 
 static u32 mii_get_an(struct mii_if_info *mii, u16 addr)
-- 
2.11.0

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

[PATCH 4/8] header: add IOMEM_ERR_PTR()

[Hauke Mehrtens]

This was added in kernel 3.17 in commit efd342fb0031a1 ("of: Provide a
function to request and map memory")

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 backport/backport-include/linux/io.h | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 backport/backport-include/linux/io.h

diff --git a/backport/backport-include/linux/io.h b/backport/backport-include/linux/io.h
new file mode 100644
index 00000000..78ae4650
--- /dev/null
+++ b/backport/backport-include/linux/io.h
@@ -0,0 +1,9 @@
+#ifndef __BP_LINUX_IO_H
+#define __BP_LINUX_IO_H
+#include_next <linux/io.h>
+
+#ifndef IOMEM_ERR_PTR
+#define IOMEM_ERR_PTR(err) (__force void __iomem *)ERR_PTR(err)
+#endif
+
+#endif /* __BP_LINUX_IO_H */
-- 
2.11.0

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

[PATCH 5/8] header: add __get_dynamic_array_len

[Hauke Mehrtens]

This was added in kernel 3.16 in commit beba4bb096201 ("tracing: Add
__get_dynamic_array_len() macro for trace events")

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 backport/backport-include/trace/ftrace.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/backport/backport-include/trace/ftrace.h b/backport/backport-include/trace/ftrace.h
index 5fda0ce5..2daedd55 100644
--- a/backport/backport-include/trace/ftrace.h
+++ b/backport/backport-include/trace/ftrace.h
@@ -6,4 +6,8 @@
 		ftrace_print_array_seq(p, array, count, el_size);	\
 	})
 
+#undef __get_dynamic_array_len
+#define __get_dynamic_array_len(field)	\
+		((__entry->__data_loc_##field >> 16) & 0xffff)
+
 #include_next <trace/ftrace.h>
-- 
2.11.0

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

[PATCH 6/8] header: add pm_system_wakeup()

[Hauke Mehrtens]

This function was added in kernel 3.18 in commit 068765ba7987e ("PM /
sleep: Mechanism for aborting system suspends unconditionally") In our
implementation we only call pm_system_wakeup(() and do not handle the
abortion of the current suspend process.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 backport/backport-include/linux/suspend.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 backport/backport-include/linux/suspend.h

diff --git a/backport/backport-include/linux/suspend.h b/backport/backport-include/linux/suspend.h
new file mode 100644
index 00000000..394b164b
--- /dev/null
+++ b/backport/backport-include/linux/suspend.h
@@ -0,0 +1,12 @@
+#ifndef __BP_LINUX_SUSPEND_H
+#define __BP_LINUX_SUSPEND_H
+#include_next <linux/suspend.h>
+
+#if LINUX_VERSION_IS_LESS(3,18,0)
+static inline void pm_system_wakeup(void)
+{
+	freeze_wake();
+}
+#endif
+
+#endif /* __BP_LINUX_SUSPEND_H */
-- 
2.11.0

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

[PATCH 7/8] dependencies: make NFC_TRF7970A depend on kernel > 3.17

[Hauke Mehrtens]

devm_gpiod_get_index_optional() with flags attribute was added with
kernel 3.17, do not build drivers using it on older kernel versions.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 dependencies | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dependencies b/dependencies
index 41633d72..c9827139 100644
--- a/dependencies
+++ b/dependencies
@@ -54,6 +54,7 @@ VIDEO_COBALT 3.17
 VIDEO_TVP5150 3.17
 VIDEO_EM28XX_V4L2 3.17
 NFC_PN544_I2C 3.17
+NFC_TRF7970A 3.17
 
 # this needs devm_gpiod_get_index() with 4 arguments.
 NFC_NXP_NCI_I2C 3.17
-- 
2.11.0

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

[PATCH 8/8] dependencies: make MWIFIEX_PCIE depend on kernel > 3.16

[Hauke Mehrtens]

This driver needs the reset_notify member from the struct
pci_error_handlers.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 dependencies | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dependencies b/dependencies
index c9827139..bda18659 100644
--- a/dependencies
+++ b/dependencies
@@ -59,6 +59,9 @@ 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
+
 # this needs device_property..() functions and struct acpi_gpio_mapping
 NFC_FDP_I2C 3.19
 NFC_ST21NFCA_I2C 3.19
-- 
2.11.0

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

Re: [PATCH 0/8] backports: misc fixes

[Johannes Berg]

On Mon, 2017-09-11 at 00:10 +0200, Hauke Mehrtens wrote:
> This fixes two problems introduced in my previous patches and also
> adds 
> some other small functions needed to build against kernel >= 3.13.

Thanks! I had some of this pending locally, but applied all of yours
now.

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

Re: [PATCH 6/8] header: add pm_system_wakeup()

[Johannes Berg]

On Mon, 2017-09-11 at 00:10 +0200, Hauke Mehrtens wrote:
> 
> +#if LINUX_VERSION_IS_LESS(3,18,0)
> +static inline void pm_system_wakeup(void)
> +{
> +	freeze_wake();
> +}
> +#endif

freeze_wake() was also "only" added around 3.10 or something like that,
so perhaps we should just not backport this at all but version-guard
the drivers needing it? I'm not super comfortable with the reduced
functionality anyway.

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

Re: [PATCH 6/8] header: add pm_system_wakeup()

[Hauke Mehrtens]

On 09/12/2017 11:35 AM, Johannes Berg wrote:
> On Mon, 2017-09-11 at 00:10 +0200, Hauke Mehrtens wrote:
>>
>> +#if LINUX_VERSION_IS_LESS(3,18,0)
>> +static inline void pm_system_wakeup(void)
>> +{
>> +	freeze_wake();
>> +}
>> +#endif
> 
> freeze_wake() was also "only" added around 3.10 or something like that,
> so perhaps we should just not backport this at all but version-guard
> the drivers needing it? I'm not super comfortable with the reduced
> functionality anyway.

Hi,

This is only used by mwifiex so I am also fine with making mwifiex
depend on kernel 3.18 or higher.

Will you create a patch and revert mine?

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

Re: [PATCH 6/8] header: add pm_system_wakeup()

[Johannes Berg]

On Tue, 2017-09-12 at 23:39 +0200, Hauke Mehrtens wrote:
> On 09/12/2017 11:35 AM, Johannes Berg wrote:
> > On Mon, 2017-09-11 at 00:10 +0200, Hauke Mehrtens wrote:
> > > 
> > > +#if LINUX_VERSION_IS_LESS(3,18,0)
> > > +static inline void pm_system_wakeup(void)
> > > +{
> > > +	freeze_wake();
> > > +}
> > > +#endif
> > 
> > freeze_wake() was also "only" added around 3.10 or something like
> > that,
> > so perhaps we should just not backport this at all but version-
> > guard
> > the drivers needing it? I'm not super comfortable with the reduced
> > functionality anyway.
> 
> Hi,
> 
> This is only used by mwifiex so I am also fine with making mwifiex
> depend on kernel 3.18 or higher.
> 
> Will you create a patch and revert mine?

Done.

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