Skip to content

Commit 6670876

Browse files
authored
kernel: 5.10: refresh all patches (#10005)
Rmove: target/linux/ipq807x/patches-5.10/147-clk-ipq8074-defer-from-disabling-gcc_sleep_clk_src.patch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/drivers/clk/qcom/gcc-ipq8074.c?h=v5.10.138&id=6b90ab952401bd6c1a321dcfc0e0df080f2bc905 Signed-off-by: José Hwong <[email protected]>
1 parent 3e87e5f commit 6670876

8 files changed

+16
-48
lines changed

target/linux/generic/hack-5.10/952-net-conntrack-events-support-multiple-registrant.patch

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ Signed-off-by: Zhi Chen <[email protected]>
274274
int nf_ct_expect_register_notifier(struct net *net,
275275
--- a/net/netfilter/nf_conntrack_netlink.c
276276
+++ b/net/netfilter/nf_conntrack_netlink.c
277-
@@ -706,13 +706,20 @@ static size_t ctnetlink_nlmsg_size(const
277+
@@ -701,12 +701,19 @@ static size_t ctnetlink_nlmsg_size(const
278278
}
279279

280280
static int
@@ -287,15 +287,14 @@ Signed-off-by: Zhi Chen <[email protected]>
287287
const struct nf_conntrack_zone *zone;
288288
struct net *net;
289289
struct nlmsghdr *nlh;
290-
struct nfgenmsg *nfmsg;
291290
struct nlattr *nest_parms;
292291
+#ifdef CONFIG_NF_CONNTRACK_CHAIN_EVENTS
293292
+ struct nf_ct_event *item = (struct nf_ct_event *)ptr;
294293
+#endif
295294
struct nf_conn *ct = item->ct;
296295
struct sk_buff *skb;
297296
unsigned int type;
298-
@@ -3787,9 +3794,15 @@ static int ctnetlink_stat_exp_cpu(struct
297+
@@ -3752,9 +3759,15 @@ static int ctnetlink_stat_exp_cpu(struct
299298
}
300299

301300
#ifdef CONFIG_NF_CONNTRACK_EVENTS

target/linux/ipq807x/patches-5.10/109-clk-qcom-Add-WCSSAON-reset.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Acked-by: Stephen Boyd <[email protected]>
1515

1616
--- a/drivers/clk/qcom/gcc-ipq8074.c
1717
+++ b/drivers/clk/qcom/gcc-ipq8074.c
18-
@@ -4789,6 +4789,7 @@ static const struct qcom_reset_map gcc_i
18+
@@ -4790,6 +4790,7 @@ static const struct qcom_reset_map gcc_i
1919
[GCC_PCIE1_AXI_SLAVE_ARES] = { 0x76040, 4 },
2020
[GCC_PCIE1_AHB_ARES] = { 0x76040, 5 },
2121
[GCC_PCIE1_AXI_MASTER_STICKY_ARES] = { 0x76040, 6 },

target/linux/ipq807x/patches-5.10/125-ipq8074-gcc-Added-support-for-NSS-clocks.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Signed-off-by: Rajkumar Ayyasamy <[email protected]>
3434
};
3535
--- a/drivers/clk/qcom/gcc-ipq8074.c
3636
+++ b/drivers/clk/qcom/gcc-ipq8074.c
37-
@@ -3182,6 +3182,24 @@ static struct clk_branch gcc_nss_ptp_ref
37+
@@ -3183,6 +3183,24 @@ static struct clk_branch gcc_nss_ptp_ref
3838
},
3939
};
4040

@@ -59,7 +59,7 @@ Signed-off-by: Rajkumar Ayyasamy <[email protected]>
5959
static struct clk_branch gcc_nssnoc_ce_apb_clk = {
6060
.halt_reg = 0x6830c,
6161
.clkr = {
62-
@@ -4607,6 +4625,7 @@ static struct clk_regmap *gcc_ipq8074_cl
62+
@@ -4608,6 +4626,7 @@ static struct clk_regmap *gcc_ipq8074_cl
6363
[GCC_CMN_12GPLL_AHB_CLK] = &gcc_cmn_12gpll_ahb_clk.clkr,
6464
[GCC_CMN_12GPLL_SYS_CLK] = &gcc_cmn_12gpll_sys_clk.clkr,
6565
[GCC_MDIO_AHB_CLK] = &gcc_mdio_ahb_clk.clkr,

target/linux/ipq807x/patches-5.10/126-clk-ipq8074-Support-added-for-necessary-clocks-and-r.patch

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Signed-off-by: Rajkumar Ayyasamy <[email protected]>
3737
static struct clk_alpha_pll gpll0_main = {
3838
.offset = 0x21000,
3939
.regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT],
40-
@@ -962,6 +978,12 @@ static const struct freq_tbl ftbl_pcie_a
40+
@@ -963,6 +979,12 @@ static const struct freq_tbl ftbl_pcie_a
4141
{ }
4242
};
4343

@@ -50,7 +50,7 @@ Signed-off-by: Rajkumar Ayyasamy <[email protected]>
5050
static struct clk_rcg2 pcie0_axi_clk_src = {
5151
.cmd_rcgr = 0x75054,
5252
.freq_tbl = ftbl_pcie_axi_clk_src,
53-
@@ -2021,6 +2043,78 @@ static struct clk_rcg2 gp3_clk_src = {
53+
@@ -2022,6 +2044,78 @@ static struct clk_rcg2 gp3_clk_src = {
5454
},
5555
};
5656

@@ -129,7 +129,7 @@ Signed-off-by: Rajkumar Ayyasamy <[email protected]>
129129
static struct clk_branch gcc_blsp1_ahb_clk = {
130130
.halt_reg = 0x01008,
131131
.clkr = {
132-
@@ -4352,13 +4446,7 @@ static struct clk_branch gcc_gp3_clk = {
132+
@@ -4353,13 +4447,7 @@ static struct clk_branch gcc_gp3_clk = {
133133
},
134134
};
135135

@@ -144,7 +144,7 @@ Signed-off-by: Rajkumar Ayyasamy <[email protected]>
144144
.cmd_rcgr = 0x75070,
145145
.freq_tbl = ftbl_pcie_rchng_clk_src,
146146
.hid_width = 5,
147-
@@ -4434,6 +4522,114 @@ static struct clk_branch gcc_pcie0_axi_s
147+
@@ -4435,6 +4523,114 @@ static struct clk_branch gcc_pcie0_axi_s
148148
.alpha_en_mask = BIT(24),
149149
};
150150

@@ -259,15 +259,15 @@ Signed-off-by: Rajkumar Ayyasamy <[email protected]>
259259
static struct clk_hw *gcc_ipq8074_hws[] = {
260260
&gpll0_out_main_div2.hw,
261261
&gpll6_out_main_div2.hw,
262-
@@ -4442,6 +4638,7 @@ static struct clk_hw *gcc_ipq8074_hws[]
262+
@@ -4443,6 +4639,7 @@ static struct clk_hw *gcc_ipq8074_hws[]
263263
&gcc_xo_div4_clk_src.hw,
264264
&nss_noc_clk_src.hw,
265265
&nss_ppe_cdiv_clk_src.hw,
266266
+ &qdss_dap_sync_clk_src.hw,
267267
};
268268

269269
static struct clk_regmap *gcc_ipq8074_clks[] = {
270-
@@ -4673,6 +4870,15 @@ static struct clk_regmap *gcc_ipq8074_cl
270+
@@ -4674,6 +4871,15 @@ static struct clk_regmap *gcc_ipq8074_cl
271271
[GCC_PCIE0_RCHNG_CLK_SRC] = &pcie0_rchng_clk_src.clkr,
272272
[GCC_PCIE0_RCHNG_CLK] = &gcc_pcie0_rchng_clk.clkr,
273273
[GCC_PCIE0_AXI_S_BRIDGE_CLK] = &gcc_pcie0_axi_s_bridge_clk.clkr,
@@ -283,7 +283,7 @@ Signed-off-by: Rajkumar Ayyasamy <[email protected]>
283283
};
284284

285285
static const struct qcom_reset_map gcc_ipq8074_resets[] = {
286-
@@ -4809,6 +5015,20 @@ static const struct qcom_reset_map gcc_i
286+
@@ -4810,6 +5016,20 @@ static const struct qcom_reset_map gcc_i
287287
[GCC_PCIE1_AHB_ARES] = { 0x76040, 5 },
288288
[GCC_PCIE1_AXI_MASTER_STICKY_ARES] = { 0x76040, 6 },
289289
[GCC_WCSSAON_RESET] = { 0x59010, 0 },

target/linux/ipq807x/patches-5.10/127-clk-qcom-ipq8074-Fix-gcc_snoc_bus_timeout_ahb_clk-of.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Signed-off-by: Selvam Sathappan Periakaruppan <[email protected]>
1616

1717
--- a/drivers/clk/qcom/gcc-ipq8074.c
1818
+++ b/drivers/clk/qcom/gcc-ipq8074.c
19-
@@ -4523,10 +4523,10 @@ static struct clk_branch gcc_pcie0_axi_s
19+
@@ -4524,10 +4524,10 @@ static struct clk_branch gcc_pcie0_axi_s
2020
};
2121

2222
static struct clk_branch gcc_snoc_bus_timeout2_ahb_clk = {
@@ -29,7 +29,7 @@ Signed-off-by: Selvam Sathappan Periakaruppan <[email protected]>
2929
.enable_mask = BIT(0),
3030
.hw.init = &(struct clk_init_data){
3131
.name = "gcc_snoc_bus_timeout2_ahb_clk",
32-
@@ -4541,10 +4541,10 @@ static struct clk_branch gcc_snoc_bus_ti
32+
@@ -4542,10 +4542,10 @@ static struct clk_branch gcc_snoc_bus_ti
3333
};
3434

3535
static struct clk_branch gcc_snoc_bus_timeout3_ahb_clk = {

target/linux/ipq807x/patches-5.10/145-clk-qcom-ipq8074-disable-SW_COLLAPSE-for-USB-GDSCR-s.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Change-Id: I17beca334be79d738a35587860847aa0b1f96fa9
1515

1616
--- a/drivers/clk/qcom/gcc-ipq8074.c
1717
+++ b/drivers/clk/qcom/gcc-ipq8074.c
18-
@@ -5066,6 +5066,11 @@ static int gcc_ipq8074_probe(struct plat
18+
@@ -5067,6 +5067,11 @@ static int gcc_ipq8074_probe(struct plat
1919
/* SW Workaround for UBI32 Huayra PLL */
2020
regmap_update_bits(regmap, 0x2501c, BIT(26), BIT(26));
2121

target/linux/ipq807x/patches-5.10/146-clk-qcom-ipq8074-SW-workaround-for-UBI-PLL-lock.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Signed-off-by: Abhishek Sahu <[email protected]>
3434

3535
--- a/drivers/clk/qcom/gcc-ipq8074.c
3636
+++ b/drivers/clk/qcom/gcc-ipq8074.c
37-
@@ -5071,6 +5071,9 @@ static int gcc_ipq8074_probe(struct plat
37+
@@ -5072,6 +5072,9 @@ static int gcc_ipq8074_probe(struct plat
3838
/* Disable SW_COLLAPSE for USB1 GDSCR */
3939
regmap_update_bits(regmap, 0x3f078, BIT(0), 0x0);
4040

target/linux/ipq807x/patches-5.10/147-clk-ipq8074-defer-from-disabling-gcc_sleep_clk_src.patch

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)