[PATCH v2 0/6] backports: Backport some ath11k runtime dependencies

[PATCH v2 0/6] backports: Backport some ath11k runtime dependencies

[Jiaxun Yang]

Backport mhi bus driver and QRTR driver.
ath11k requires them aligned with latest version at runtime.

Thanks.

v2: Make ath11k depend on 5.2 (hauke)

Jiaxun Yang (7):
  headers: Add MHI stuff to mod_devicetable
  backports: Add mhi bus driver
  backports: backport {get,set}_user_ifreq
  headers: backport sk_error_report
  backports: Add QRTR driver
  dependencies: Limit ATH11K to 5.2+
  defconfigs: Refresh for ath11k

 backport/Kconfig.sources                      |  2 +
 backport/Makefile.kernel                      |  2 +
 .../backport-include/linux/mod_devicetable.h  | 15 ++++++
 backport/backport-include/linux/netdevice.h   |  5 ++
 backport/backport-include/net/sock.h          |  8 ++++
 backport/compat/Makefile                      |  1 +
 backport/compat/backport-5.15.c               | 47 +++++++++++++++++++
 backport/compat/backport-genetlink.c          |  2 +-
 backport/defconfigs/ath11k                    | 14 ++++++
 backport/defconfigs/wifi                      |  3 ++
 copy-list                                     |  6 +++
 dependencies                                  |  9 ++++
 12 files changed, 113 insertions(+), 1 deletion(-)
 create mode 100644 backport/compat/backport-5.15.c
 create mode 100644 backport/defconfigs/ath11k

-- 
2.35.1

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

[PATCH v2 1/7] headers: Add MHI stuff to mod_devicetable

[Jiaxun Yang]

Backport from 5.7.
It is required by MHI drivers to probe modules properly.

Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
---
 backport/backport-include/linux/mod_devicetable.h | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/backport/backport-include/linux/mod_devicetable.h b/backport/backport-include/linux/mod_devicetable.h
index ec0a3e62..fc9beedb 100644
--- a/backport/backport-include/linux/mod_devicetable.h
+++ b/backport/backport-include/linux/mod_devicetable.h
@@ -14,4 +14,19 @@
 #define HID_ANY_ID                             (~0)
 #endif
 
+#if LINUX_VERSION_IS_LESS(5,7,0)
+#define MHI_DEVICE_MODALIAS_FMT "mhi:%s"
+#define MHI_NAME_SIZE 32
+
+/**
+ * struct mhi_device_id - MHI device identification
+ * @chan: MHI channel name
+ * @driver_data: driver data;
+ */
+struct mhi_device_id {
+	const char chan[MHI_NAME_SIZE];
+	kernel_ulong_t driver_data;
+};
+#endif
+
 #endif /* __BACKPORT_MOD_DEVICETABLE_H */
-- 
2.35.1

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

[PATCH v2 2/7] backports: Add mhi bus driver

[Jiaxun Yang]

Add it to copylist and wire up in Makefile and Kconfig.
Also set minimal depdency to 4.19 as it requires ida_alloc
and xarray which is too messy to be backported to earlier
versions.

Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
---
 backport/Kconfig.sources | 1 +
 backport/Makefile.kernel | 1 +
 copy-list                | 3 +++
 dependencies             | 3 +++
 4 files changed, 8 insertions(+)

diff --git a/backport/Kconfig.sources b/backport/Kconfig.sources
index 5fb44780..8f430965 100644
--- a/backport/Kconfig.sources
+++ b/backport/Kconfig.sources
@@ -4,6 +4,7 @@ source "$BACKPORT_DIR/compat/Kconfig"
 # these are copied from the kernel
 source "$BACKPORT_DIR/net/wireless/Kconfig"
 source "$BACKPORT_DIR/net/mac80211/Kconfig"
+source "$BACKPORT_DIR/drivers/bus/mhi/Kconfig"
 source "$BACKPORT_DIR/drivers/net/wireless/Kconfig"
 source "$BACKPORT_DIR/drivers/net/usb/Kconfig"
 
diff --git a/backport/Makefile.kernel b/backport/Makefile.kernel
index 62baa945..e2a1a263 100644
--- a/backport/Makefile.kernel
+++ b/backport/Makefile.kernel
@@ -39,6 +39,7 @@ obj-y += compat/
 
 obj-$(CPTCFG_CFG80211) += net/wireless/
 obj-$(CPTCFG_MAC80211) += net/mac80211/
+obj-$(CPTCFG_MHI_BUS) += drivers/bus/mhi/
 obj-$(CPTCFG_WLAN) += drivers/net/wireless/
 obj-$(CPTCFG_SSB) += drivers/ssb/
 obj-$(CPTCFG_BCMA) += drivers/bcma/
diff --git a/copy-list b/copy-list
index be8539d4..1be2285e 100644
--- a/copy-list
+++ b/copy-list
@@ -91,6 +91,9 @@ net/mac80211/
 include/linux/mpls.h
 include/uapi/linux/mpls.h
 
+drivers/bus/mhi/
+include/linux/mhi.h
+
 drivers/net/wireless/ath/
 drivers/ssb/
 include/linux/ssb/
diff --git a/dependencies b/dependencies
index d8c3f106..623763a2 100644
--- a/dependencies
+++ b/dependencies
@@ -37,3 +37,6 @@ NL80211_TESTMODE 4.18
 
 # Needs aes_expandkey() and aes_encrypt()
 RTL8723BS 5.4
+
+# ida_alloc(), xarray
+MHI_BUS 4.19
-- 
2.35.1

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

[PATCH v2 3/7] backports: backport {get,set}_user_ifreq

[Jiaxun Yang]

Backport them from 5.15, they are required by QRTR.

Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
---
 backport/backport-include/linux/netdevice.h |  5 +++
 backport/compat/Makefile                    |  1 +
 backport/compat/backport-5.15.c             | 47 +++++++++++++++++++++
 3 files changed, 53 insertions(+)
 create mode 100644 backport/compat/backport-5.15.c

diff --git a/backport/backport-include/linux/netdevice.h b/backport/backport-include/linux/netdevice.h
index 22942398..4e553791 100644
--- a/backport/backport-include/linux/netdevice.h
+++ b/backport/backport-include/linux/netdevice.h
@@ -152,6 +152,11 @@ bp_dev_get_tstats64(struct net_device *dev, struct rtnl_link_stats64 *s);
 #endif /* < 4.11 */
 
 #if LINUX_VERSION_IS_LESS(5,15,0)
+#define get_user_ifreq LINUX_BACKPORT(get_user_ifreq)
+int get_user_ifreq(struct ifreq *ifr, void __user **ifrdata, void __user *arg);
+#define put_user_ifreq LINUX_BACKPORT(put_user_ifreq)
+int put_user_ifreq(struct ifreq *ifr, void __user *arg);
+
 static inline void backport_dev_put(struct net_device *dev)
 {
 	if (dev)
diff --git a/backport/compat/Makefile b/backport/compat/Makefile
index 2761e5f5..b9f1dee9 100644
--- a/backport/compat/Makefile
+++ b/backport/compat/Makefile
@@ -20,6 +20,7 @@ compat-$(CPTCFG_KERNEL_5_5) += backport-5.5.o
 compat-$(CPTCFG_KERNEL_5_10) += backport-5.10.o
 compat-$(CPTCFG_KERNEL_5_11) += backport-5.11.o
 compat-$(CPTCFG_KERNEL_5_13) += backport-5.13.o
+compat-$(CPTCFG_KERNEL_5_15) += backport-5.15.o
 
 compat-$(CPTCFG_BPAUTO_BUILD_SYSTEM_DATA_VERIFICATION) += verification/verify.o
 compat-$(CPTCFG_BPAUTO_BUILD_SYSTEM_DATA_VERIFICATION) += verification/pkcs7.asn1.o
diff --git a/backport/compat/backport-5.15.c b/backport/compat/backport-5.15.c
new file mode 100644
index 00000000..cc0a48fd
--- /dev/null
+++ b/backport/compat/backport-5.15.c
@@ -0,0 +1,47 @@
+// SPDX-License-Identifier: GPL-2.0
+
+#include <linux/compat.h>
+#include <linux/export.h>
+#include <linux/uaccess.h>
+#include <linux/netdevice.h>
+
+#include <uapi/linux/if.h>
+
+int get_user_ifreq(struct ifreq *ifr, void __user **ifrdata, void __user *arg)
+{
+	if (in_compat_syscall()) {
+		struct compat_ifreq *ifr32 = (struct compat_ifreq *)ifr;
+
+		memset(ifr, 0, sizeof(*ifr));
+		if (copy_from_user(ifr32, arg, sizeof(*ifr32)))
+			return -EFAULT;
+
+		if (ifrdata)
+			*ifrdata = compat_ptr(ifr32->ifr_data);
+
+		return 0;
+	}
+
+	if (copy_from_user(ifr, arg, sizeof(*ifr)))
+		return -EFAULT;
+
+	if (ifrdata)
+		*ifrdata = ifr->ifr_data;
+
+	return 0;
+}
+EXPORT_SYMBOL(get_user_ifreq);
+
+int put_user_ifreq(struct ifreq *ifr, void __user *arg)
+{
+	size_t size = sizeof(*ifr);
+
+	if (in_compat_syscall())
+		size = sizeof(struct compat_ifreq);
+
+	if (copy_to_user(arg, ifr, size))
+		return -EFAULT;
+
+	return 0;
+}
+EXPORT_SYMBOL(put_user_ifreq);
-- 
2.35.1

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

[PATCH v2 4/7] headers: backport sk_error_report

[Jiaxun Yang]

It is required by QRTR.
Backproted from 5.14 and dropped trace_event part as the event
doesn't exist in earlier versions and it won't have functional
impact.

Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
---
 backport/backport-include/net/sock.h | 8 ++++++++
 backport/compat/backport-genetlink.c | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/backport/backport-include/net/sock.h b/backport/backport-include/net/sock.h
index d99ef794..06a76aec 100644
--- a/backport/backport-include/net/sock.h
+++ b/backport/backport-include/net/sock.h
@@ -32,4 +32,12 @@ static inline void sk_pacing_shift_update(struct sock *sk, int val)
 }
 #endif /* < 4.16 */
 
+#if LINUX_VERSION_IS_LESS(5,14,0)
+static inline void backport_sk_error_report(struct sock *sk)
+{
+	sk->sk_error_report(sk);
+}
+#define sk_error_report LINUX_BACKPORT(sk_error_report)
+#endif /* <= 5.14 */
+
 #endif /* __BACKPORT_NET_SOCK_H */
diff --git a/backport/compat/backport-genetlink.c b/backport/compat/backport-genetlink.c
index 89cdd9c0..6ba31b6e 100644
--- a/backport/compat/backport-genetlink.c
+++ b/backport/compat/backport-genetlink.c
@@ -86,7 +86,7 @@ static void extack_netlink_ack(struct sk_buff *in_skb, struct nlmsghdr *nlh,
 	skb = nlmsg_new(payload + tlvlen, GFP_KERNEL);
 	if (!skb) {
 		NETLINK_CB(in_skb).sk->sk_err = ENOBUFS;
-		NETLINK_CB(in_skb).sk->sk_error_report(NETLINK_CB(in_skb).sk);
+		sk_error_report(NETLINK_CB(in_skb).sk);
 		return;
 	}
 
-- 
2.35.1

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

[PATCH v2 5/7] backports: Add QRTR driver

[Jiaxun Yang]

 Add it to copylist and wire up in Makefile and Kconfig.
 Also set minimal depdency to 5.2.

Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
---
 backport/Kconfig.sources | 1 +
 backport/Makefile.kernel | 1 +
 copy-list                | 3 +++
 dependencies             | 3 +++
 4 files changed, 8 insertions(+)

diff --git a/backport/Kconfig.sources b/backport/Kconfig.sources
index 8f430965..87ffca94 100644
--- a/backport/Kconfig.sources
+++ b/backport/Kconfig.sources
@@ -4,6 +4,7 @@ source "$BACKPORT_DIR/compat/Kconfig"
 # these are copied from the kernel
 source "$BACKPORT_DIR/net/wireless/Kconfig"
 source "$BACKPORT_DIR/net/mac80211/Kconfig"
+source "$BACKPORT_DIR/net/qrtr/Kconfig"
 source "$BACKPORT_DIR/drivers/bus/mhi/Kconfig"
 source "$BACKPORT_DIR/drivers/net/wireless/Kconfig"
 source "$BACKPORT_DIR/drivers/net/usb/Kconfig"
diff --git a/backport/Makefile.kernel b/backport/Makefile.kernel
index e2a1a263..373fed96 100644
--- a/backport/Makefile.kernel
+++ b/backport/Makefile.kernel
@@ -39,6 +39,7 @@ obj-y += compat/
 
 obj-$(CPTCFG_CFG80211) += net/wireless/
 obj-$(CPTCFG_MAC80211) += net/mac80211/
+obj-$(CPTCFG_QRTR) += net/qrtr/
 obj-$(CPTCFG_MHI_BUS) += drivers/bus/mhi/
 obj-$(CPTCFG_WLAN) += drivers/net/wireless/
 obj-$(CPTCFG_SSB) += drivers/ssb/
diff --git a/copy-list b/copy-list
index 1be2285e..480a9fb3 100644
--- a/copy-list
+++ b/copy-list
@@ -36,6 +36,8 @@ include/linux/wireless.h
 include/uapi/linux/wireless.h
 include/linux/ieee80211.h
 include/linux/pci_ids.h
+include/uapi/linux/qrtr.h
+include/trace/events/qrtr.h
 include/uapi/linux/pci_regs.h
 include/linux/mmc/sdio_ids.h
 include/linux/ath9k_platform.h
@@ -83,6 +85,7 @@ crypto/asymmetric_keys/x509_public_key.c -> compat/verification/x509_public_key.
 
 net/Makefile
 net/Kconfig
+net/qrtr/
 net/wireless/
 net/mac80211/
 # MPLS labels, checked on skb->protocol on the
diff --git a/dependencies b/dependencies
index 623763a2..5de1bbe1 100644
--- a/dependencies
+++ b/dependencies
@@ -40,3 +40,6 @@ RTL8723BS 5.4
 
 # ida_alloc(), xarray
 MHI_BUS 4.19
+
+# sock_gettstamp()
+QRTR 5.2
-- 
2.35.1

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

[PATCH v2 6/7] dependencies: Limit ATH11K to 5.2+

[Jiaxun Yang]

As it's runtime dependency QRTR requires 5.2+.

Suggested-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
---
 dependencies | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dependencies b/dependencies
index 5de1bbe1..5bb9c563 100644
--- a/dependencies
+++ b/dependencies
@@ -43,3 +43,6 @@ MHI_BUS 4.19
 
 # sock_gettstamp()
 QRTR 5.2
+
+# QRTR
+ATH11K 5.2
-- 
2.35.1

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

[PATCH v2 7/7] defconfigs: Refresh for ath11k

[Jiaxun Yang]

Add defconfig for ath11k, also add ath11k runtime dependencies to
wifi defconfig.

Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
---
 backport/defconfigs/ath11k | 14 ++++++++++++++
 backport/defconfigs/wifi   |  3 +++
 2 files changed, 17 insertions(+)
 create mode 100644 backport/defconfigs/ath11k

diff --git a/backport/defconfigs/ath11k b/backport/defconfigs/ath11k
new file mode 100644
index 00000000..9ca4b310
--- /dev/null
+++ b/backport/defconfigs/ath11k
@@ -0,0 +1,14 @@
+CPTCFG_MHI_BUS=m
+CPTCFG_QRTR=m
+CPTCFG_QRTR_MHI=m
+CPTCFG_CFG80211=m
+CPTCFG_CFG80211_WEXT=y
+CPTCFG_MAC80211=m
+CPTCFG_MAC80211_LEDS=y
+CPTCFG_MAC80211_MESH=y
+CPTCFG_WLAN=y
+CPTCFG_WLAN_VENDOR_ATH=y
+CPTCFG_ATH11K_PCI=m
+CPTCFG_ATH11K=m
+CPTCFG_ATH11K_DEBUG=y
+CPTCFG_ATH11K_DEBUGFS=y
diff --git a/backport/defconfigs/wifi b/backport/defconfigs/wifi
index 936203d9..774b0823 100644
--- a/backport/defconfigs/wifi
+++ b/backport/defconfigs/wifi
@@ -58,6 +58,7 @@ CPTCFG_MAC80211_HWSIM=m
 CPTCFG_MAC80211_LEDS=y
 CPTCFG_MAC80211=m
 CPTCFG_MAC80211_MESH=y
+CPTCFG_MHI_BUS=m
 CPTCFG_MT7601U=m
 CPTCFG_MT7603E=m
 CPTCFG_MT7615E=m
@@ -86,6 +87,8 @@ CPTCFG_PCMCIA_ATMEL=m
 CPTCFG_PCMCIA_HERMES=m
 CPTCFG_PCMCIA_SPECTRUM=m
 CPTCFG_PLX_HERMES=m
+CPTCFG_QRTR=m
+CPTCFG_QRTR_MHI=m
 CPTCFG_QTNFMAC_PCIE=m
 CPTCFG_R8188EU=m
 CPTCFG_RSI_91X=m
-- 
2.35.1

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

Re: [PATCH v2 3/7] backports: backport {get,set}_user_ifreq

[Hauke Mehrtens]

On 2/7/22 12:33, Jiaxun Yang wrote:
> Backport them from 5.15, they are required by QRTR.
> 
> Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
> ---
>   backport/backport-include/linux/netdevice.h |  5 +++
>   backport/compat/Makefile                    |  1 +
>   backport/compat/backport-5.15.c             | 47 +++++++++++++++++++++
>   3 files changed, 53 insertions(+)
>   create mode 100644 backport/compat/backport-5.15.c
> 
> diff --git a/backport/backport-include/linux/netdevice.h b/backport/backport-include/linux/netdevice.h
> index 22942398..4e553791 100644
> --- a/backport/backport-include/linux/netdevice.h
> +++ b/backport/backport-include/linux/netdevice.h
> @@ -152,6 +152,11 @@ bp_dev_get_tstats64(struct net_device *dev, struct rtnl_link_stats64 *s);
>   #endif /* < 4.11 */
>   
>   #if LINUX_VERSION_IS_LESS(5,15,0)
> +#define get_user_ifreq LINUX_BACKPORT(get_user_ifreq)
> +int get_user_ifreq(struct ifreq *ifr, void __user **ifrdata, void __user *arg);
> +#define put_user_ifreq LINUX_BACKPORT(put_user_ifreq)
> +int put_user_ifreq(struct ifreq *ifr, void __user *arg);
> +
>   static inline void backport_dev_put(struct net_device *dev)
>   {
>   	if (dev)
> diff --git a/backport/compat/Makefile b/backport/compat/Makefile
> index 2761e5f5..b9f1dee9 100644
> --- a/backport/compat/Makefile
> +++ b/backport/compat/Makefile
> @@ -20,6 +20,7 @@ compat-$(CPTCFG_KERNEL_5_5) += backport-5.5.o
>   compat-$(CPTCFG_KERNEL_5_10) += backport-5.10.o
>   compat-$(CPTCFG_KERNEL_5_11) += backport-5.11.o
>   compat-$(CPTCFG_KERNEL_5_13) += backport-5.13.o
> +compat-$(CPTCFG_KERNEL_5_15) += backport-5.15.o
>   
>   compat-$(CPTCFG_BPAUTO_BUILD_SYSTEM_DATA_VERIFICATION) += verification/verify.o
>   compat-$(CPTCFG_BPAUTO_BUILD_SYSTEM_DATA_VERIFICATION) += verification/pkcs7.asn1.o
> diff --git a/backport/compat/backport-5.15.c b/backport/compat/backport-5.15.c
> new file mode 100644
> index 00000000..cc0a48fd
> --- /dev/null
> +++ b/backport/compat/backport-5.15.c
> @@ -0,0 +1,47 @@
> +// SPDX-License-Identifier: GPL-2.0
> +
> +#include <linux/compat.h>
> +#include <linux/export.h>
> +#include <linux/uaccess.h>
> +#include <linux/netdevice.h>
> +
> +#include <uapi/linux/if.h>
> +
> +int get_user_ifreq(struct ifreq *ifr, void __user **ifrdata, void __user *arg)
> +{
> +	if (in_compat_syscall()) {

in_compat_syscall() is not available on kernel <= 4.5 and the 
compilation fails.
get_user_ifreq() and put_user_ifreq() are only needed for QRTR which is 
only added for kernel >= 5.2.

Please add "#if LINUX_VERSION_IS_GEQ(4,6,0)" here and "#if 
LINUX_VERSION_IN_RANGE(4,6,0, 5,15,0)" to the header file.

I will do it when applying the patch.

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

Re: [PATCH v2 0/6] backports: Backport some ath11k runtime dependencies

[Hauke Mehrtens]

On 2/7/22 12:33, Jiaxun Yang wrote:
> Backport mhi bus driver and QRTR driver.
> ath11k requires them aligned with latest version at runtime.
> 
> Thanks.
> 
> v2: Make ath11k depend on 5.2 (hauke)
> 
> Jiaxun Yang (7):
>    headers: Add MHI stuff to mod_devicetable
>    backports: Add mhi bus driver
>    backports: backport {get,set}_user_ifreq
>    headers: backport sk_error_report
>    backports: Add QRTR driver
>    dependencies: Limit ATH11K to 5.2+
>    defconfigs: Refresh for ath11k
> 
>   backport/Kconfig.sources                      |  2 +
>   backport/Makefile.kernel                      |  2 +
>   .../backport-include/linux/mod_devicetable.h  | 15 ++++++
>   backport/backport-include/linux/netdevice.h   |  5 ++
>   backport/backport-include/net/sock.h          |  8 ++++
>   backport/compat/Makefile                      |  1 +
>   backport/compat/backport-5.15.c               | 47 +++++++++++++++++++
>   backport/compat/backport-genetlink.c          |  2 +-
>   backport/defconfigs/ath11k                    | 14 ++++++
>   backport/defconfigs/wifi                      |  3 ++
>   copy-list                                     |  6 +++
>   dependencies                                  |  9 ++++
>   12 files changed, 113 insertions(+), 1 deletion(-)
>   create mode 100644 backport/compat/backport-5.15.c
>   create mode 100644 backport/defconfigs/ath11k
> 

Thank you for your patches, I applied them to master with small changes.

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