Skip to content

Commit

Permalink
kernel: bump 5.10 to 5.10.204 (#11721)
Browse files Browse the repository at this point in the history
  • Loading branch information
Beginner-Go authored Dec 19, 2023
1 parent b36db4e commit ba3c8ab
Show file tree
Hide file tree
Showing 28 changed files with 43 additions and 146 deletions.
4 changes: 2 additions & 2 deletions include/kernel-5.10
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
LINUX_VERSION-5.10 = .201
LINUX_KERNEL_HASH-5.10.201 = 6afc06598fa8e3bc907cff75f995f372df51d40a284e260de78a3421b1f18218
LINUX_VERSION-5.10 = .204
LINUX_KERNEL_HASH-5.10.204 = ff950750b1060f65c0dde7d4d89238937d80faddf3bcf9ba28189d917daccaee
Original file line number Diff line number Diff line change
Expand Up @@ -740,7 +740,7 @@ SVN-Revision: 35130
EXPORT_SYMBOL(xfrm_parse_spi);
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -4147,14 +4147,16 @@ static bool tcp_parse_aligned_timestamp(
@@ -4151,14 +4151,16 @@ static bool tcp_parse_aligned_timestamp(
{
const __be32 *ptr = (const __be32 *)(th + 1);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Signed-off-by: Jason A. Donenfeld <[email protected]>

--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -2089,7 +2089,7 @@ config CPU_MIPS32
@@ -2091,7 +2091,7 @@ config CPU_MIPS32
config CPU_MIPS64
bool
default y if CPU_MIPS64_R1 || CPU_MIPS64_R2 || CPU_MIPS64_R5 || \
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -1036,7 +1036,7 @@ Signed-off-by: David S. Miller <[email protected]>
u32 mahr = ravb_read(ndev, MAHR);
u32 malr = ravb_read(ndev, MALR);

@@ -2191,7 +2193,7 @@ static int ravb_probe(struct platform_de
@@ -2202,7 +2204,7 @@ static int ravb_probe(struct platform_de
priv->msg_enable = RAVB_DEF_MSG_ENABLE;

/* Read and set MAC address */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos <[email protected]>

--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1171,6 +1171,10 @@ config MIPS_MSC
@@ -1172,6 +1172,10 @@ config MIPS_MSC
config SYNC_R4K
bool

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ Signed-off-by: John Crispin <[email protected]>
{
--- a/drivers/gpio/gpiolib-sysfs.c
+++ b/drivers/gpio/gpiolib-sysfs.c
@@ -572,7 +572,7 @@ static struct class gpio_class = {
@@ -575,7 +575,7 @@ static struct class gpio_class = {
*
* Returns zero on success, else an error.
*/
Expand All @@ -138,7 +138,7 @@ Signed-off-by: John Crispin <[email protected]>
{
struct gpio_chip *chip;
struct gpio_device *gdev;
@@ -634,6 +634,8 @@ int gpiod_export(struct gpio_desc *desc,
@@ -637,6 +637,8 @@ int gpiod_export(struct gpio_desc *desc,
offset = gpio_chip_hwgpio(desc);
if (chip->names && chip->names[offset])
ioname = chip->names[offset];
Expand All @@ -147,7 +147,7 @@ Signed-off-by: John Crispin <[email protected]>

dev = device_create_with_groups(&gpio_class, &gdev->dev,
MKDEV(0, 0), data, gpio_groups,
@@ -655,6 +657,12 @@ err_unlock:
@@ -658,6 +660,12 @@ err_unlock:
gpiod_dbg(desc, "%s: status %d\n", __func__, status);
return status;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -1055,6 +1055,9 @@ int __init early_init_dt_scan_chosen(uns
@@ -1054,6 +1054,9 @@ int __init early_init_dt_scan_chosen(uns
p = of_get_flat_dt_prop(node, "bootargs", &l);
if (p != NULL && l > 0)
strlcpy(data, p, min(l, COMMAND_LINE_SIZE));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Acked-by: Rob Landley <[email protected]>
---
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1086,9 +1086,6 @@ config FW_ARC
@@ -1087,9 +1087,6 @@ config FW_ARC
config ARCH_MAY_HAVE_PC_FDC
bool

Expand All @@ -19,7 +19,7 @@ Acked-by: Rob Landley <[email protected]>
config CEVT_BCM1480
bool

@@ -3183,6 +3180,18 @@ choice
@@ -3185,6 +3182,18 @@ choice
bool "Extend builtin kernel arguments with bootloader arguments"
endchoice

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ Cc: [email protected]

--- a/drivers/pci/controller/dwc/pcie-tegra194.c
+++ b/drivers/pci/controller/dwc/pcie-tegra194.c
@@ -997,11 +997,6 @@ static int tegra_pcie_dw_link_up(struct
@@ -996,11 +996,6 @@ static int tegra_pcie_dw_link_up(struct
return !!(val & PCI_EXP_LNKSTA_DLLLA);
}

Expand All @@ -102,15 +102,15 @@ Cc: [email protected]
static int tegra_pcie_dw_start_link(struct dw_pcie *pci)
{
struct tegra_pcie_dw *pcie = to_tegra_pcie(pci);
@@ -1026,7 +1021,6 @@ static const struct dw_pcie_ops tegra_dw
@@ -1025,7 +1020,6 @@ static const struct dw_pcie_ops tegra_dw

static struct dw_pcie_host_ops tegra_pcie_dw_host_ops = {
.host_init = tegra_pcie_dw_host_init,
- .set_num_vectors = tegra_pcie_set_msi_vec_num,
};

static void tegra_pcie_disable_phy(struct tegra_pcie_dw *pcie)
@@ -2011,6 +2005,7 @@ static int tegra_pcie_dw_probe(struct pl
@@ -2010,6 +2004,7 @@ static int tegra_pcie_dw_probe(struct pl
pci->n_fts[1] = FTS_VAL;

pp = &pci->pp;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ Cc: [email protected]
if (ret) {
--- a/drivers/pci/controller/dwc/pcie-tegra194.c
+++ b/drivers/pci/controller/dwc/pcie-tegra194.c
@@ -1561,14 +1561,6 @@ static int tegra_pcie_config_rp(struct t
@@ -1560,14 +1560,6 @@ static int tegra_pcie_config_rp(struct t
char *name;
int ret;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,7 @@ Cc: [email protected]
static int qcom_pcie_probe(struct platform_device *pdev)
--- a/drivers/pci/controller/dwc/pcie-tegra194.c
+++ b/drivers/pci/controller/dwc/pcie-tegra194.c
@@ -1556,7 +1556,6 @@ static int tegra_pcie_deinit_controller(
@@ -1555,7 +1555,6 @@ static int tegra_pcie_deinit_controller(

static int tegra_pcie_config_rp(struct tegra_pcie_dw *pcie)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ Cc: [email protected]
static int spear13xx_pcie_link_up(struct dw_pcie *pci)
--- a/drivers/pci/controller/dwc/pcie-tegra194.c
+++ b/drivers/pci/controller/dwc/pcie-tegra194.c
@@ -768,8 +768,6 @@ static void tegra_pcie_enable_msi_interr
@@ -767,8 +767,6 @@ static void tegra_pcie_enable_msi_interr
struct tegra_pcie_dw *pcie = to_tegra_pcie(pci);
u32 val;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Acked-by: Stephen Boyd <[email protected]>

--- a/drivers/clk/qcom/gcc-ipq8074.c
+++ b/drivers/clk/qcom/gcc-ipq8074.c
@@ -4790,6 +4790,7 @@ static const struct qcom_reset_map gcc_i
@@ -4784,6 +4784,7 @@ static const struct qcom_reset_map gcc_i
[GCC_PCIE1_AXI_SLAVE_ARES] = { 0x76040, 4 },
[GCC_PCIE1_AHB_ARES] = { 0x76040, 5 },
[GCC_PCIE1_AXI_MASTER_STICKY_ARES] = { 0x76040, 6 },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Signed-off-by: Baruch Siach <[email protected]>

--- a/drivers/pci/controller/dwc/pcie-tegra194.c
+++ b/drivers/pci/controller/dwc/pcie-tegra194.c
@@ -193,12 +193,6 @@
@@ -194,12 +194,6 @@
#define GEN3_EQ_CONTROL_OFF_PSET_REQ_VEC_MASK GENMASK(23, 8)
#define GEN3_EQ_CONTROL_OFF_FB_MODE_MASK GENMASK(3, 0)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Signed-off-by: Rajkumar Ayyasamy <[email protected]>
};
--- a/drivers/clk/qcom/gcc-ipq8074.c
+++ b/drivers/clk/qcom/gcc-ipq8074.c
@@ -3183,6 +3183,24 @@ static struct clk_branch gcc_nss_ptp_ref
@@ -3177,6 +3177,24 @@ static struct clk_branch gcc_nss_ptp_ref
},
};

Expand All @@ -59,7 +59,7 @@ Signed-off-by: Rajkumar Ayyasamy <[email protected]>
static struct clk_branch gcc_nssnoc_ce_apb_clk = {
.halt_reg = 0x6830c,
.clkr = {
@@ -4608,6 +4626,7 @@ static struct clk_regmap *gcc_ipq8074_cl
@@ -4602,6 +4620,7 @@ static struct clk_regmap *gcc_ipq8074_cl
[GCC_CMN_12GPLL_AHB_CLK] = &gcc_cmn_12gpll_ahb_clk.clkr,
[GCC_CMN_12GPLL_SYS_CLK] = &gcc_cmn_12gpll_sys_clk.clkr,
[GCC_MDIO_AHB_CLK] = &gcc_mdio_ahb_clk.clkr,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Signed-off-by: Rajkumar Ayyasamy <[email protected]>
static struct clk_alpha_pll gpll0_main = {
.offset = 0x21000,
.regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT],
@@ -963,6 +979,12 @@ static const struct freq_tbl ftbl_pcie_a
@@ -957,6 +973,12 @@ static const struct freq_tbl ftbl_pcie_a
{ }
};

Expand All @@ -50,7 +50,7 @@ Signed-off-by: Rajkumar Ayyasamy <[email protected]>
static struct clk_rcg2 pcie0_axi_clk_src = {
.cmd_rcgr = 0x75054,
.freq_tbl = ftbl_pcie_axi_clk_src,
@@ -2022,6 +2044,78 @@ static struct clk_rcg2 gp3_clk_src = {
@@ -2016,6 +2038,78 @@ static struct clk_rcg2 gp3_clk_src = {
},
};

Expand Down Expand Up @@ -129,7 +129,7 @@ Signed-off-by: Rajkumar Ayyasamy <[email protected]>
static struct clk_branch gcc_blsp1_ahb_clk = {
.halt_reg = 0x01008,
.clkr = {
@@ -4353,13 +4447,7 @@ static struct clk_branch gcc_gp3_clk = {
@@ -4347,13 +4441,7 @@ static struct clk_branch gcc_gp3_clk = {
},
};

Expand All @@ -144,7 +144,7 @@ Signed-off-by: Rajkumar Ayyasamy <[email protected]>
.cmd_rcgr = 0x75070,
.freq_tbl = ftbl_pcie_rchng_clk_src,
.hid_width = 5,
@@ -4435,6 +4523,114 @@ static const struct alpha_pll_config nss
@@ -4429,6 +4517,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 <[email protected]>
static struct clk_hw *gcc_ipq8074_hws[] = {
&gpll0_out_main_div2.hw,
&gpll6_out_main_div2.hw,
@@ -4443,6 +4639,7 @@ static struct clk_hw *gcc_ipq8074_hws[]
@@ -4437,6 +4633,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[] = {
@@ -4674,6 +4871,15 @@ static struct clk_regmap *gcc_ipq8074_cl
@@ -4668,6 +4865,15 @@ static struct clk_regmap *gcc_ipq8074_cl
[GCC_PCIE0_RCHNG_CLK_SRC] = &pcie0_rchng_clk_src.clkr,
[GCC_PCIE0_RCHNG_CLK] = &gcc_pcie0_rchng_clk.clkr,
[GCC_PCIE0_AXI_S_BRIDGE_CLK] = &gcc_pcie0_axi_s_bridge_clk.clkr,
Expand All @@ -283,7 +283,7 @@ Signed-off-by: Rajkumar Ayyasamy <[email protected]>
};

static const struct qcom_reset_map gcc_ipq8074_resets[] = {
@@ -4810,6 +5016,20 @@ static const struct qcom_reset_map gcc_i
@@ -4804,6 +5010,20 @@ static const struct qcom_reset_map gcc_i
[GCC_PCIE1_AHB_ARES] = { 0x76040, 5 },
[GCC_PCIE1_AXI_MASTER_STICKY_ARES] = { 0x76040, 6 },
[GCC_WCSSAON_RESET] = { 0x59010, 0 },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Signed-off-by: Selvam Sathappan Periakaruppan <[email protected]>

--- a/drivers/clk/qcom/gcc-ipq8074.c
+++ b/drivers/clk/qcom/gcc-ipq8074.c
@@ -4524,10 +4524,10 @@ static const struct alpha_pll_config nss
@@ -4518,10 +4518,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 <[email protected]>
.enable_mask = BIT(0),
.hw.init = &(struct clk_init_data){
.name = "gcc_snoc_bus_timeout2_ahb_clk",
@@ -4542,10 +4542,10 @@ static struct clk_branch gcc_snoc_bus_ti
@@ -4536,10 +4536,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 @@ -15,7 +15,7 @@ Change-Id: I17beca334be79d738a35587860847aa0b1f96fa9

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Signed-off-by: Abhishek Sahu <[email protected]>

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

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
@@ -2118,9 +2118,10 @@ struct clk_rcg2 adss_pwm_clk_src = {
@@ -2112,9 +2112,10 @@ struct clk_rcg2 adss_pwm_clk_src = {

static struct clk_branch gcc_blsp1_ahb_clk = {
.halt_reg = 0x01008,
Expand Down
Loading

0 comments on commit ba3c8ab

Please sign in to comment.