Skip to content

Commit

Permalink
fix bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
breeze303 committed Apr 30, 2024
1 parent caee2be commit 5770d31
Show file tree
Hide file tree
Showing 12 changed files with 55 additions and 38 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
static const struct freq_tbl ftbl_apss_ahb_clk_src[] = {
F(24000000, P_XO, 1, 0, 0),
F(25000000, P_GPLL0_DIV2, 16, 0, 0),
@@ -1892,6 +1918,19 @@ static struct clk_rcg2 system_noc_bfdcd_
@@ -1890,6 +1916,19 @@ static struct clk_rcg2 system_noc_bfdcd_
},
};

Expand All @@ -74,7 +74,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
static const struct freq_tbl ftbl_ubi32_mem_noc_bfdcd_clk_src[] = {
F(24000000, P_XO, 1, 0, 0),
F(307670000, P_BIAS_PLL_NSS_NOC, 1.5, 0, 0),
@@ -1926,6 +1965,19 @@ static struct clk_rcg2 ubi32_mem_noc_bfd
@@ -1924,6 +1963,19 @@ static struct clk_rcg2 ubi32_mem_noc_bfd
},
};

Expand All @@ -94,7 +94,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
static struct clk_branch gcc_apss_axi_clk = {
.halt_reg = 0x46020,
.halt_check = BRANCH_HALT_VOTED,
@@ -2683,6 +2735,454 @@ static struct clk_rcg2 lpass_q6_axim_clk
@@ -2681,6 +2733,454 @@ static struct clk_rcg2 lpass_q6_axim_clk
},
};

Expand Down Expand Up @@ -549,7 +549,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
static struct freq_tbl ftbl_rbcpr_wcss_clk_src[] = {
F(24000000, P_XO, 1, 0, 0),
F(50000000, P_GPLL0, 16, 0, 0),
@@ -2702,6 +3202,23 @@ static struct clk_rcg2 rbcpr_wcss_clk_sr
@@ -2700,6 +3200,23 @@ static struct clk_rcg2 rbcpr_wcss_clk_sr
},
};

Expand All @@ -573,7 +573,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
static struct clk_branch gcc_lpass_core_axim_clk = {
.halt_reg = 0x1F028,
.clkr = {
@@ -4215,6 +4732,9 @@ static struct clk_hw *gcc_ipq6018_hws[]
@@ -4213,6 +4730,9 @@ static struct clk_hw *gcc_ipq6018_hws[]
&gpll6_out_main_div2.hw,
&qdss_dap_sync_clk_src.hw,
&qdss_tsctr_div2_clk_src.hw,
Expand All @@ -583,7 +583,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
};

static struct clk_regmap *gcc_ipq6018_clks[] = {
@@ -4420,9 +4940,35 @@ static struct clk_regmap *gcc_ipq6018_cl
@@ -4418,9 +4938,35 @@ static struct clk_regmap *gcc_ipq6018_cl
[PCIE0_RCHNG_CLK_SRC] = &pcie0_rchng_clk_src.clkr,
[GCC_PCIE0_AXI_S_BRIDGE_CLK] = &gcc_pcie0_axi_s_bridge_clk.clkr,
[PCIE0_RCHNG_CLK] = &gcc_pcie0_rchng_clk.clkr,
Expand Down Expand Up @@ -619,7 +619,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
[GCC_LPASS_CORE_AXIM_CLK] = &gcc_lpass_core_axim_clk.clkr,
[LPASS_CORE_AXIM_CLK_SRC] = &lpass_core_axim_clk_src.clkr,
[GCC_LPASS_SNOC_CFG_CLK] = &gcc_lpass_snoc_cfg_clk.clkr,
@@ -4438,6 +4984,9 @@ static struct clk_regmap *gcc_ipq6018_cl
@@ -4436,6 +4982,9 @@ static struct clk_regmap *gcc_ipq6018_cl
[GCC_MEM_NOC_UBI32_CLK] = &gcc_mem_noc_ubi32_clk.clkr,
[GCC_MEM_NOC_LPASS_CLK] = &gcc_mem_noc_lpass_clk.clkr,
[GCC_SNOC_LPASS_CFG_CLK] = &gcc_snoc_lpass_cfg_clk.clkr,
Expand All @@ -629,7 +629,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
[QDSS_STM_CLK_SRC] = &qdss_stm_clk_src.clkr,
[QDSS_TRACECLKIN_CLK_SRC] = &qdss_traceclkin_clk_src.clkr,
};
@@ -4619,6 +5168,10 @@ static const struct qcom_cc_desc gcc_ipq
@@ -4617,6 +5166,10 @@ static const struct qcom_cc_desc gcc_ipq
static int gcc_ipq6018_probe(struct platform_device *pdev)
{
struct regmap *regmap;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,21 @@ 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
@@ -8,6 +8,7 @@ obj-$(CONFIG_PINCTRL_IPQ5018) += pinctrl-ipq5018.o
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 @@
Expand Down Expand Up @@ -1114,3 +1119,6 @@ Subject: [PATCH] drivers: pinctrl: qcom: add ipq6000 support
+MODULE_DESCRIPTION("QTI ipq6000 pinctrl driver");
+MODULE_LICENSE("GPL v2");
+MODULE_DEVICE_TABLE(of, ipq6018_pinctrl_of_match);
--
2.43.0

Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Signed-off-by: Rajkumar Ayyasamy <arajkuma@codeaurora.org>
static struct clk_rcg2 pcie0_axi_clk_src = {
.cmd_rcgr = 0x75054,
.freq_tbl = ftbl_pcie_axi_clk_src,
@@ -2031,6 +2053,78 @@ static struct clk_rcg2 gp3_clk_src = {
@@ -2029,6 +2051,78 @@ static struct clk_rcg2 gp3_clk_src = {
},
};

Expand Down Expand Up @@ -129,7 +129,7 @@ Signed-off-by: Rajkumar Ayyasamy <arajkuma@codeaurora.org>
static struct clk_branch gcc_blsp1_ahb_clk = {
.halt_reg = 0x01008,
.clkr = {
@@ -4226,13 +4320,7 @@ static struct clk_branch gcc_gp3_clk = {
@@ -4224,13 +4318,7 @@ static struct clk_branch gcc_gp3_clk = {
},
};

Expand All @@ -144,7 +144,7 @@ Signed-off-by: Rajkumar Ayyasamy <arajkuma@codeaurora.org>
.cmd_rcgr = 0x75070,
.freq_tbl = ftbl_pcie_rchng_clk_src,
.hid_width = 5,
@@ -4324,6 +4412,114 @@ static const struct alpha_pll_config nss
@@ -4322,6 +4410,114 @@ static const struct alpha_pll_config nss
.alpha_en_mask = BIT(24),
};

Expand Down Expand Up @@ -259,15 +259,15 @@ Signed-off-by: Rajkumar Ayyasamy <arajkuma@codeaurora.org>
static struct clk_hw *gcc_ipq8074_hws[] = {
&gpll0_out_main_div2.hw,
&gpll6_out_main_div2.hw,
@@ -4332,6 +4528,7 @@ static struct clk_hw *gcc_ipq8074_hws[]
@@ -4330,6 +4526,7 @@ static struct clk_hw *gcc_ipq8074_hws[]
&gcc_xo_div4_clk_src.hw,
&nss_noc_clk_src.hw,
&nss_ppe_cdiv_clk_src.hw,
+ &qdss_dap_sync_clk_src.hw,
};

static struct clk_regmap *gcc_ipq8074_clks[] = {
@@ -4563,6 +4760,15 @@ static struct clk_regmap *gcc_ipq8074_cl
@@ -4561,6 +4758,15 @@ static struct clk_regmap *gcc_ipq8074_cl
[GCC_PCIE0_RCHNG_CLK] = &gcc_pcie0_rchng_clk.clkr,
[GCC_PCIE0_AXI_S_BRIDGE_CLK] = &gcc_pcie0_axi_s_bridge_clk.clkr,
[GCC_CRYPTO_PPE_CLK] = &gcc_crypto_ppe_clk.clkr,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Signed-off-by: Selvam Sathappan Periakaruppan <speriaka@codeaurora.org>

--- a/drivers/clk/qcom/gcc-ipq8074.c
+++ b/drivers/clk/qcom/gcc-ipq8074.c
@@ -4413,10 +4413,10 @@ static const struct alpha_pll_config nss
@@ -4411,10 +4411,10 @@ static const struct alpha_pll_config nss
};

static struct clk_branch gcc_snoc_bus_timeout2_ahb_clk = {
Expand All @@ -29,7 +29,7 @@ Signed-off-by: Selvam Sathappan Periakaruppan <speriaka@codeaurora.org>
.enable_mask = BIT(0),
.hw.init = &(struct clk_init_data){
.name = "gcc_snoc_bus_timeout2_ahb_clk",
@@ -4431,10 +4431,10 @@ static struct clk_branch gcc_snoc_bus_ti
@@ -4429,10 +4429,10 @@ static struct clk_branch gcc_snoc_bus_ti
};

static struct clk_branch gcc_snoc_bus_timeout3_ahb_clk = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Change-Id: I505cb560b31ad27a02c165fbe13bb33a2fc7d230

--- a/drivers/clk/qcom/gcc-ipq8074.c
+++ b/drivers/clk/qcom/gcc-ipq8074.c
@@ -2127,9 +2127,10 @@ struct clk_rcg2 adss_pwm_clk_src = {
@@ -2125,9 +2125,10 @@ struct clk_rcg2 adss_pwm_clk_src = {

static struct clk_branch gcc_blsp1_ahb_clk = {
.halt_reg = 0x01008,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@

--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -518,4 +518,9 @@ int if6_proc_init(void);
@@ -514,4 +514,9 @@ int if6_proc_init(void);
void if6_proc_exit(void);
#endif

Expand Down Expand Up @@ -687,7 +687,7 @@
out:
fib6_info_release(rt);
return err;
@@ -6329,6 +6339,20 @@ static int ip6_route_dev_notify(struct n
@@ -6336,6 +6346,20 @@ static int ip6_route_dev_notify(struct n
return NOTIFY_OK;
}

Expand Down Expand Up @@ -728,7 +728,7 @@

static void
ipv6_link_dev_addr(struct inet6_dev *idev, struct inet6_ifaddr *ifp)
@@ -2069,6 +2070,36 @@ struct inet6_ifaddr *ipv6_get_ifaddr(str
@@ -2068,6 +2069,36 @@ struct inet6_ifaddr *ipv6_get_ifaddr(str

return result;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -762,6 +762,7 @@ typedef unsigned char *sk_buff_data_t;
@@ -764,6 +764,7 @@ typedef unsigned char *sk_buff_data_t;
* @offload_fwd_mark: Packet was L2-forwarded in hardware
* @offload_l3_fwd_mark: Packet was L3-forwarded in hardware
* @tc_skip_classify: do not classify packet. set by IFB device
+ * @tc_skip_classify_offload: do not classify packet set by offload IFB device
* @tc_at_ingress: used within tc_classify to distinguish in/egress
* @redirected: packet was redirected by packet classifier
* @from_ingress: packet was redirected from the ingress path
@@ -939,6 +940,8 @@ struct sk_buff {
@@ -944,6 +945,8 @@ struct sk_buff {
#ifdef CONFIG_NET_XGRESS
__u8 tc_at_ingress:1; /* See TC_AT_INGRESS_MASK */
__u8 tc_skip_classify:1;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
__u32 flags; /* tunnel flags */
--- a/include/net/ip_tunnels.h
+++ b/include/net/ip_tunnels.h
@@ -591,4 +591,9 @@ static inline void ip_tunnel_info_opts_s
@@ -558,4 +558,9 @@ static inline void ip_tunnel_info_opts_s

#endif /* CONFIG_INET */

Expand All @@ -22,7 +22,7 @@
#endif /* __NET_IP_TUNNELS_H */
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -2412,6 +2412,26 @@ nla_put_failure:
@@ -2411,6 +2411,26 @@ nla_put_failure:
return -EMSGSIZE;
}

Expand Down Expand Up @@ -51,7 +51,7 @@
struct ip6_tnl *tunnel = netdev_priv(dev);
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -1734,6 +1734,23 @@ nla_put_failure:
@@ -1733,6 +1733,23 @@ nla_put_failure:
return -EMSGSIZE;
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -2418,7 +2418,7 @@ nla_put_failure:
@@ -2417,7 +2417,7 @@ nla_put_failure:
*/
void ip6_update_offload_stats(struct net_device *dev, void *ptr)
{
Expand All @@ -11,7 +11,7 @@

--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -1737,7 +1737,7 @@ nla_put_failure:
@@ -1736,7 +1736,7 @@ nla_put_failure:
/* QCA NSS Clients Support - Start */
void ipip6_update_offload_stats(struct net_device *dev, void *ptr)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
int nbp_backup_change(struct net_bridge_port *p, struct net_device *backup_dev);

/* br_input.c */
+int br_pass_frame_up(struct sk_buff *skb); /* QCA qca-mcs support */
+int br_pass_frame_up(struct sk_buff *skb, bool promisc); /* QCA qca-mcs support */
int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb);
rx_handler_func_t *br_get_rx_handler(const struct net_device *dev);

Expand Down Expand Up @@ -126,8 +126,8 @@
return netif_receive_skb(skb);
}

-static int br_pass_frame_up(struct sk_buff *skb)
+int br_pass_frame_up(struct sk_buff *skb)
-static int br_pass_frame_up(struct sk_buff *skb, bool promisc)
+int br_pass_frame_up(struct sk_buff *skb, bool promisc)
{
struct net_device *indev, *brdev = BR_INPUT_SKB_CB(skb)->brdev;
struct net_bridge *br = netdev_priv(brdev);
Expand All @@ -140,7 +140,7 @@
/* note: already called with rcu_read_lock */
int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb)
@@ -84,6 +95,11 @@ int br_handle_frame_finish(struct net *n
struct net_bridge *br;
bool promisc;
u16 vid = 0;
u8 state;
+ /* QCA qca-mcs support - Start */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ Signed-off-by: Andrea Righi <andrea.righi@canonical.com>

--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -500,6 +500,9 @@ int ip6_forward(struct sk_buff *skb)
@@ -498,6 +498,9 @@ int ip6_forward(struct sk_buff *skb)
u32 mtu;

idev = __in6_dev_get_safely(dev_get_by_index_rcu(net, IP6CB(skb)->iif));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ 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 {
Expand All @@ -27,9 +29,11 @@ Signed-off-by: Ram Chandra Jangir <quic_rjangir@quicinc.com>
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
@@ -515,11 +515,15 @@ tcp_in_window(struct nf_conn *ct, enum i
@@ -513,11 +513,15 @@ tcp_in_window(struct nf_conn *ct, enum ip_conntrack_dir dir,
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];
Expand All @@ -45,7 +49,7 @@ Signed-off-by: Ram Chandra Jangir <quic_rjangir@quicinc.com>
/*
* Get the required data from the packet.
*/
@@ -1285,7 +1289,7 @@ int nf_conntrack_tcp_packet(struct nf_co
@@ -1257,7 +1261,7 @@ int nf_conntrack_tcp_packet(struct nf_conn *ct,
IP_CT_TCP_FLAG_DATA_UNACKNOWLEDGED &&
timeouts[new_state] > timeouts[TCP_CONNTRACK_UNACK])
timeout = timeouts[TCP_CONNTRACK_UNACK];
Expand All @@ -54,7 +58,7 @@ Signed-off-by: Ram Chandra Jangir <quic_rjangir@quicinc.com>
timeouts[new_state] > timeouts[TCP_CONNTRACK_RETRANS])
timeout = timeouts[TCP_CONNTRACK_RETRANS];
else
@@ -1601,6 +1605,9 @@ void nf_conntrack_tcp_init_net(struct ne
@@ -1573,6 +1577,9 @@ void nf_conntrack_tcp_init_net(struct net *net)
*/
tn->tcp_be_liberal = 0;

Expand All @@ -64,17 +68,19 @@ Signed-off-by: Ram Chandra Jangir <quic_rjangir@quicinc.com>
/* 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
@@ -633,6 +633,7 @@ enum nf_ct_sysctl_index {
@@ -637,6 +637,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,
@@ -840,6 +841,14 @@ static struct ctl_table nf_ct_sysctl_tab
@@ -844,6 +845,14 @@ static struct ctl_table nf_ct_sysctl_table[] = {
.extra1 = SYSCTL_ZERO,
.extra2 = SYSCTL_ONE,
},
Expand All @@ -89,11 +95,14 @@ Signed-off-by: Ram Chandra Jangir <quic_rjangir@quicinc.com>
[NF_SYSCTL_CT_PROTO_TCP_IGNORE_INVALID_RST] = {
.procname = "nf_conntrack_tcp_ignore_invalid_rst",
.maxlen = sizeof(u8),
@@ -1050,6 +1059,7 @@ static void nf_conntrack_standalone_init
@@ -1054,6 +1063,7 @@ static void nf_conntrack_standalone_init_tcp_sysctl(struct net *net,

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

0 comments on commit 5770d31

Please sign in to comment.