qualcommax: fix ax18 m2 cpu bugs

LiBwrt · Apr 1, 2024 · 569c300 · 569c300
1 parent 2169363
commit 569c300
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 33 deletions.
diff --git a/target/linux/qualcommax/patches-6.6/0054-v6.8-arm64-dts-qcom-ipq6018-use-CPUFreq-NVMEM.patch b/target/linux/qualcommax/patches-6.6/0054-v6.8-arm64-dts-qcom-ipq6018-use-CPUFreq-NVMEM.patch
@@ -46,28 +46,28 @@ Signed-off-by: Bjorn Andersson <andersson@kernel.org>
  		opp-1320000000 {
  			opp-hz = /bits/ 64 <1320000000>;
  			opp-microvolt = <862500>;
-+			opp-supported-hw = <0x3>;
++			opp-supported-hw = <0xf>;
  			clock-latency-ns = <200000>;
  		};
 
  		opp-1440000000 {
  			opp-hz = /bits/ 64 <1440000000>;
  			opp-microvolt = <925000>;
-+			opp-supported-hw = <0x3>;
++			opp-supported-hw = <0xf>;
  			clock-latency-ns = <200000>;
  		};
 
  		opp-1608000000 {
  			opp-hz = /bits/ 64 <1608000000>;
  			opp-microvolt = <987500>;
-+			opp-supported-hw = <0x1>;
++			opp-supported-hw = <0xf>;
  			clock-latency-ns = <200000>;
  		};
 
  		opp-1800000000 {
  			opp-hz = /bits/ 64 <1800000000>;
  			opp-microvolt = <1062500>;
-+			opp-supported-hw = <0x1>;
++			opp-supported-hw = <0xf>;
  			clock-latency-ns = <200000>;
  		};
  	};

diff --git a/...ux/qualcommax/patches-6.6/0910-arm64-dts-qcom-ipq6018-change-voltage-to-perf-levels.patch b/...ux/qualcommax/patches-6.6/0910-arm64-dts-qcom-ipq6018-change-voltage-to-perf-levels.patch
@@ -36,30 +36,30 @@ Signed-off-by: Mantas Pucka <mantas@8devices.com>
  			opp-hz = /bits/ 64 <1320000000>;
 -			opp-microvolt = <862500>;
 +			opp-microvolt = <3>;
- 			opp-supported-hw = <0x3>;
+ 			opp-supported-hw = <0xf>;
  			clock-latency-ns = <200000>;
  		};
 
  		opp-1440000000 {
  			opp-hz = /bits/ 64 <1440000000>;
 -			opp-microvolt = <925000>;
 +			opp-microvolt = <4>;
- 			opp-supported-hw = <0x3>;
+ 			opp-supported-hw = <0xf>;
  			clock-latency-ns = <200000>;
  		};
 
  		opp-1608000000 {
  			opp-hz = /bits/ 64 <1608000000>;
 -			opp-microvolt = <987500>;
 +			opp-microvolt = <5>;
- 			opp-supported-hw = <0x1>;
+ 			opp-supported-hw = <0xf>;
  			clock-latency-ns = <200000>;
  		};
 
  		opp-1800000000 {
  			opp-hz = /bits/ 64 <1800000000>;
 -			opp-microvolt = <1062500>;
 +			opp-microvolt = <6>;
- 			opp-supported-hw = <0x1>;
+ 			opp-supported-hw = <0xf>;
  			clock-latency-ns = <200000>;
  		};
diff --git a/target/linux/qualcommax/patches-6.6/2000-drivers-pinctrl-qcom-add-ipq6000-support.patch b/target/linux/qualcommax/patches-6.6/2000-drivers-pinctrl-qcom-add-ipq6000-support.patch
@@ -9,21 +9,16 @@ Subject: [PATCH] drivers: pinctrl: qcom: add ipq6000 support
  2 files changed, 1093 insertions(+)
  create mode 100644 drivers/pinctrl/qcom/pinctrl-ipq6000.c
 
-diff --git a/drivers/pinctrl/qcom/Makefile b/drivers/pinctrl/qcom/Makefile
-index 5910e08c84ce..866cf7fafc22 100644
 --- a/drivers/pinctrl/qcom/Makefile
 +++ b/drivers/pinctrl/qcom/Makefile
-@@ -8,6 +8,7 @@ obj-$(CONFIG_PINCTRL_IPQ5018)	+= pinctrl-ipq5018.o
+@@ -8,6 +8,7 @@ obj-$(CONFIG_PINCTRL_IPQ5018)	+= pinctrl
  obj-$(CONFIG_PINCTRL_IPQ8064)	+= pinctrl-ipq8064.o
  obj-$(CONFIG_PINCTRL_IPQ5332)	+= pinctrl-ipq5332.o
  obj-$(CONFIG_PINCTRL_IPQ8074)	+= pinctrl-ipq8074.o
 +obj-$(CONFIG_PINCTRL_IPQ6018)	+= pinctrl-ipq6000.o
  obj-$(CONFIG_PINCTRL_IPQ6018)	+= pinctrl-ipq6018.o
  obj-$(CONFIG_PINCTRL_IPQ9574)	+= pinctrl-ipq9574.o
  obj-$(CONFIG_PINCTRL_MSM8226)	+= pinctrl-msm8226.o
-diff --git a/drivers/pinctrl/qcom/pinctrl-ipq6000.c b/drivers/pinctrl/qcom/pinctrl-ipq6000.c
-new file mode 100644
-index 000000000000..f889bdc4f82b
 --- /dev/null
 +++ b/drivers/pinctrl/qcom/pinctrl-ipq6000.c
 @@ -0,0 +1,1092 @@
@@ -1119,6 +1114,3 @@ index 000000000000..f889bdc4f82b
 +MODULE_DESCRIPTION("QTI ipq6000 pinctrl driver");
 +MODULE_LICENSE("GPL v2");
 +MODULE_DEVICE_TABLE(of, ipq6018_pinctrl_of_match);
--- 
-2.43.0
-
diff --git a/target/linux/qualcommax/patches-6.6/2600-1-qca-nss-ecm-support-CORE.patch b/target/linux/qualcommax/patches-6.6/2600-1-qca-nss-ecm-support-CORE.patch
@@ -687,7 +687,7 @@
  out:
  	fib6_info_release(rt);
  	return err;
-@@ -6336,6 +6346,20 @@ static int ip6_route_dev_notify(struct n
+@@ -6329,6 +6339,20 @@ static int ip6_route_dev_notify(struct n
  	return NOTIFY_OK;
  }
 

diff --git a/target/linux/qualcommax/patches-6.6/2613-netfilter_optional_tcp_window_check.patc.patch b/target/linux/qualcommax/patches-6.6/2613-netfilter_optional_tcp_window_check.patc.patch
@@ -17,8 +17,6 @@ Signed-off-by: Ram Chandra Jangir <quic_rjangir@quicinc.com>
  net/netfilter/nf_conntrack_standalone.c | 10 ++++++++++
  3 files changed, 19 insertions(+), 1 deletion(-)
 
-diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
-index 1f463b3957c7..2af4f8d24282 100644
 --- a/include/net/netns/conntrack.h
 +++ b/include/net/netns/conntrack.h
 @@ -26,6 +26,7 @@ struct nf_tcp_net {
@@ -29,11 +27,9 @@ index 1f463b3957c7..2af4f8d24282 100644
  	u8 tcp_max_retrans;
  	u8 tcp_ignore_invalid_rst;
  #if IS_ENABLED(CONFIG_NF_FLOW_TABLE)
-diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c
-index 3ac1af6f59fc..0a2badd52b54 100644
 --- a/net/netfilter/nf_conntrack_proto_tcp.c
 +++ b/net/netfilter/nf_conntrack_proto_tcp.c
-@@ -513,11 +513,15 @@ tcp_in_window(struct nf_conn *ct, enum ip_conntrack_dir dir,
+@@ -515,11 +515,15 @@ tcp_in_window(struct nf_conn *ct, enum i
  	struct ip_ct_tcp *state = &ct->proto.tcp;
  	struct ip_ct_tcp_state *sender = &state->seen[dir];
  	struct ip_ct_tcp_state *receiver = &state->seen[!dir];
@@ -49,7 +45,7 @@ index 3ac1af6f59fc..0a2badd52b54 100644
  	/*
  	 * Get the required data from the packet.
  	 */
-@@ -1257,7 +1261,7 @@ int nf_conntrack_tcp_packet(struct nf_conn *ct,
+@@ -1285,7 +1289,7 @@ int nf_conntrack_tcp_packet(struct nf_co
  		 IP_CT_TCP_FLAG_DATA_UNACKNOWLEDGED &&
  		 timeouts[new_state] > timeouts[TCP_CONNTRACK_UNACK])
  		timeout = timeouts[TCP_CONNTRACK_UNACK];
@@ -58,7 +54,7 @@ index 3ac1af6f59fc..0a2badd52b54 100644
  		 timeouts[new_state] > timeouts[TCP_CONNTRACK_RETRANS])
  		timeout = timeouts[TCP_CONNTRACK_RETRANS];
  	else
-@@ -1573,6 +1577,9 @@ void nf_conntrack_tcp_init_net(struct net *net)
+@@ -1601,6 +1605,9 @@ void nf_conntrack_tcp_init_net(struct ne
  	 */
  	tn->tcp_be_liberal = 0;
 
@@ -68,19 +64,17 @@ index 3ac1af6f59fc..0a2badd52b54 100644
  	/* If it's non-zero, we turn off RST sequence number check */
  	tn->tcp_ignore_invalid_rst = 0;
 
-diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
-index e9654169b005..84b8e28f0782 100644
 --- a/net/netfilter/nf_conntrack_standalone.c
 +++ b/net/netfilter/nf_conntrack_standalone.c
-@@ -637,6 +637,7 @@ enum nf_ct_sysctl_index {
+@@ -633,6 +633,7 @@ enum nf_ct_sysctl_index {
  #endif
  	NF_SYSCTL_CT_PROTO_TCP_LOOSE,
  	NF_SYSCTL_CT_PROTO_TCP_LIBERAL,
 +	NF_SYSCTL_CT_PROTO_TCP_NO_WINDOW_CHECK,
  	NF_SYSCTL_CT_PROTO_TCP_IGNORE_INVALID_RST,
  	NF_SYSCTL_CT_PROTO_TCP_MAX_RETRANS,
  	NF_SYSCTL_CT_PROTO_TIMEOUT_UDP,
-@@ -844,6 +845,14 @@ static struct ctl_table nf_ct_sysctl_table[] = {
+@@ -840,6 +841,14 @@ static struct ctl_table nf_ct_sysctl_tab
  		.extra1 	= SYSCTL_ZERO,
  		.extra2 	= SYSCTL_ONE,
  	},
@@ -95,14 +89,11 @@ index e9654169b005..84b8e28f0782 100644
  	[NF_SYSCTL_CT_PROTO_TCP_IGNORE_INVALID_RST] = {
  		.procname	= "nf_conntrack_tcp_ignore_invalid_rst",
  		.maxlen		= sizeof(u8),
-@@ -1054,6 +1063,7 @@ static void nf_conntrack_standalone_init_tcp_sysctl(struct net *net,
+@@ -1050,6 +1059,7 @@ static void nf_conntrack_standalone_init
 
  	XASSIGN(LOOSE, &tn->tcp_loose);
  	XASSIGN(LIBERAL, &tn->tcp_be_liberal);
 +	XASSIGN(NO_WINDOW_CHECK, &tn->tcp_no_window_check);
  	XASSIGN(MAX_RETRANS, &tn->tcp_max_retrans);
  	XASSIGN(IGNORE_INVALID_RST, &tn->tcp_ignore_invalid_rst);
  #undef XASSIGN
--- 
-2.17.1
-