Skip to content

Commit

Permalink
kernel: bump 5.10 to 5.10.35
Browse files Browse the repository at this point in the history
Refresh kernel patches.

Built under MacOS

Run tested: x86_64 (apu2)

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
  • Loading branch information
ldir-EDB0 committed May 9, 2021
1 parent 976e659 commit f35dbef
Show file tree
Hide file tree
Showing 15 changed files with 46 additions and 98 deletions.
4 changes: 2 additions & 2 deletions include/kernel-version.mk
Expand Up @@ -7,10 +7,10 @@ ifdef CONFIG_TESTING_KERNEL
endif

LINUX_VERSION-5.4 = .117
LINUX_VERSION-5.10 = .34
LINUX_VERSION-5.10 = .35

LINUX_KERNEL_HASH-5.4.117 = 4e989b5775830092e5c76b5cca65ebff862ad0c87d0b58c3a20d415c3d4ec770
LINUX_KERNEL_HASH-5.10.34 = 6eeeb7e005bd1d4eb8b10382a35f8cd54ee6692c244ab1362590fa539f3d6582
LINUX_KERNEL_HASH-5.10.35 = ac37a19d45b77a87e58e3aae8b127a6e7eb85ed7467fc8e58474b387bfd498fd

remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
Expand Down
Expand Up @@ -22,7 +22,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com>

--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1827,6 +1827,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
@@ -1780,6 +1780,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
The command-line arguments provided by the boot loader will be
appended to the the device tree bootargs property.

Expand All @@ -42,7 +42,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com>
config CMDLINE
--- a/arch/arm/boot/compressed/atags_to_fdt.c
+++ b/arch/arm/boot/compressed/atags_to_fdt.c
@@ -4,6 +4,8 @@
@@ -5,6 +5,8 @@

#if defined(CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND)
#define do_extend_cmdline 1
Expand All @@ -51,7 +51,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com>
#else
#define do_extend_cmdline 0
#endif
@@ -67,6 +69,80 @@ static uint32_t get_cell_size(const void
@@ -69,6 +71,80 @@ static uint32_t get_cell_size(const void
return cell_size;
}

Expand Down Expand Up @@ -132,7 +132,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com>
static void merge_fdt_bootargs(void *fdt, const char *fdt_cmdline)
{
char cmdline[COMMAND_LINE_SIZE];
@@ -86,12 +162,21 @@ static void merge_fdt_bootargs(void *fdt
@@ -88,12 +164,21 @@ static void merge_fdt_bootargs(void *fdt

/* and append the ATAG_CMDLINE */
if (fdt_cmdline) {
Expand All @@ -154,7 +154,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com>
}
*ptr = '\0';

@@ -166,7 +251,9 @@ int atags_to_fdt(void *atag_list, void *
@@ -168,7 +253,9 @@ int atags_to_fdt(void *atag_list, void *
else
setprop_string(fdt, "/chosen", "bootargs",
atag->u.cmdline.cmdline);
Expand All @@ -165,7 +165,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com>
if (memcount >= sizeof(mem_reg_property)/4)
continue;
if (!atag->u.mem.size)
@@ -210,6 +297,10 @@ int atags_to_fdt(void *atag_list, void *
@@ -212,6 +299,10 @@ int atags_to_fdt(void *atag_list, void *
setprop(fdt, "/memory", "reg", mem_reg_property,
4 * memcount * memsize);
}
Expand All @@ -178,9 +178,9 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com>
}
--- a/init/main.c
+++ b/init/main.c
@@ -104,6 +104,10 @@
#define CREATE_TRACE_POINTS
#include <trace/events/initcall.h>
@@ -110,6 +110,10 @@

#include <kunit/test.h>

+#if defined(CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_MANGLE)
+#include <linux/of.h>
Expand All @@ -189,8 +189,8 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com>
static int kernel_init(void *);

extern void init_IRQ(void);
@@ -633,6 +637,18 @@ asmlinkage __visible void __init start_k
pr_notice("Kernel command line: %s\n", boot_command_line);
@@ -905,6 +909,18 @@ asmlinkage __visible void __init __no_sa
pr_notice("Kernel command line: %s\n", saved_command_line);
/* parameters may set static keys */
jump_label_init();
+
Expand Down
Expand Up @@ -674,7 +674,7 @@
pcie0: pci@1b500000 {
compatible = "qcom,pcie-ipq8064";
reg = <0x1b500000 0x1000
@@ -751,6 +1344,59 @@
@@ -739,6 +1332,59 @@
status = "disabled";
};

Expand Down Expand Up @@ -734,7 +734,7 @@
vsdcc_fixed: vsdcc-regulator {
compatible = "regulator-fixed";
regulator-name = "SDCC Power";
@@ -826,4 +1472,17 @@
@@ -814,4 +1460,17 @@
};
};
};
Expand Down
Expand Up @@ -19,7 +19,7 @@ Link: https://lore.kernel.org/linux-mtd/20210104041137.113075-3-manivannan.sadha

--- a/drivers/mtd/parsers/Kconfig
+++ b/drivers/mtd/parsers/Kconfig
@@ -186,6 +186,14 @@ config MTD_REDBOOT_PARTS_READONLY
@@ -196,6 +196,14 @@ config MTD_REDBOOT_PARTS_READONLY

endif # MTD_REDBOOT_PARTS

Expand All @@ -36,7 +36,7 @@ Link: https://lore.kernel.org/linux-mtd/20210104041137.113075-3-manivannan.sadha
depends on MTD && OF
--- a/drivers/mtd/parsers/Makefile
+++ b/drivers/mtd/parsers/Makefile
@@ -12,4 +12,5 @@ obj-$(CONFIG_MTD_AFS_PARTS) += afs.o
@@ -13,4 +13,5 @@ obj-$(CONFIG_MTD_AFS_PARTS) += afs.o
obj-$(CONFIG_MTD_PARSER_TRX) += parser_trx.o
obj-$(CONFIG_MTD_SHARPSL_PARTS) += sharpslpart.o
obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
Expand Down
Expand Up @@ -16,8 +16,6 @@ Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
drivers/thermal/qcom/tsens.h | 4 +-
2 files changed, 124 insertions(+), 30 deletions(-)

diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c
index d8ce3a687b80..9a7e991d4bd2 100644
--- a/drivers/thermal/qcom/tsens.c
+++ b/drivers/thermal/qcom/tsens.c
@@ -12,6 +12,7 @@
Expand All @@ -28,7 +26,7 @@ index d8ce3a687b80..9a7e991d4bd2 100644
#include <linux/platform_device.h>
#include <linux/pm.h>
#include <linux/regmap.h>
@@ -515,6 +516,15 @@ static irqreturn_t tsens_irq_thread(int irq, void *data)
@@ -515,6 +516,15 @@ static irqreturn_t tsens_irq_thread(int
dev_dbg(priv->dev, "[%u] %s: no violation: %d\n",
hw_id, __func__, temp);
}
Expand All @@ -44,7 +42,7 @@ index d8ce3a687b80..9a7e991d4bd2 100644
}

return IRQ_HANDLED;
@@ -530,6 +540,13 @@ static int tsens_set_trips(void *_sensor, int low, int high)
@@ -530,6 +540,13 @@ static int tsens_set_trips(void *_sensor
int high_val, low_val, cl_high, cl_low;
u32 hw_id = s->hw_id;

Expand All @@ -58,7 +56,7 @@ index d8ce3a687b80..9a7e991d4bd2 100644
dev_dbg(dev, "[%u] %s: proposed thresholds: (%d:%d)\n",
hw_id, __func__, low, high);

@@ -584,18 +601,21 @@ int get_temp_tsens_valid(const struct tsens_sensor *s, int *temp)
@@ -584,18 +601,21 @@ int get_temp_tsens_valid(const struct ts
u32 valid;
int ret;

Expand Down Expand Up @@ -89,7 +87,7 @@ index d8ce3a687b80..9a7e991d4bd2 100644
}

/* Valid bit is set, OK to read the temperature */
@@ -608,15 +628,29 @@ int get_temp_common(const struct tsens_sensor *s, int *temp)
@@ -608,15 +628,29 @@ int get_temp_common(const struct tsens_s
{
struct tsens_priv *priv = s->priv;
int hw_id = s->hw_id;
Expand Down Expand Up @@ -125,7 +123,7 @@ index d8ce3a687b80..9a7e991d4bd2 100644
}

#ifdef CONFIG_DEBUG_FS
@@ -738,19 +772,34 @@ int __init init_common(struct tsens_priv *priv)
@@ -738,19 +772,34 @@ int __init init_common(struct tsens_priv
priv->tm_offset = 0x1000;
}

Expand Down Expand Up @@ -168,7 +166,7 @@ index d8ce3a687b80..9a7e991d4bd2 100644
if (tsens_version(priv) > VER_0_1) {
for (i = VER_MAJOR; i <= VER_STEP; i++) {
priv->rf[i] = devm_regmap_field_alloc(dev, priv->srot_map,
@@ -769,6 +818,10 @@ int __init init_common(struct tsens_priv *priv)
@@ -769,6 +818,10 @@ int __init init_common(struct tsens_priv
ret = PTR_ERR(priv->rf[TSENS_EN]);
goto err_put_device;
}
Expand All @@ -179,7 +177,7 @@ index d8ce3a687b80..9a7e991d4bd2 100644
ret = regmap_field_read(priv->rf[TSENS_EN], &enabled);
if (ret)
goto err_put_device;
@@ -791,6 +844,19 @@ int __init init_common(struct tsens_priv *priv)
@@ -791,6 +844,19 @@ int __init init_common(struct tsens_priv
goto err_put_device;
}

Expand All @@ -199,7 +197,7 @@ index d8ce3a687b80..9a7e991d4bd2 100644
/* This loop might need changes if enum regfield_ids is reordered */
for (j = LAST_TEMP_0; j <= UP_THRESH_15; j += 16) {
for (i = 0; i < priv->feat->max_sensors; i++) {
@@ -806,7 +872,7 @@ int __init init_common(struct tsens_priv *priv)
@@ -806,7 +872,7 @@ int __init init_common(struct tsens_priv
}
}

Expand All @@ -208,7 +206,7 @@ index d8ce3a687b80..9a7e991d4bd2 100644
/* Loop might need changes if enum regfield_ids is reordered */
for (j = CRITICAL_STATUS_0; j <= CRIT_THRESH_15; j += 16) {
for (i = 0; i < priv->feat->max_sensors; i++) {
@@ -844,7 +910,11 @@ int __init init_common(struct tsens_priv *priv)
@@ -844,7 +910,11 @@ int __init init_common(struct tsens_priv
}

spin_lock_init(&priv->ul_lock);
Expand All @@ -221,7 +219,7 @@ index d8ce3a687b80..9a7e991d4bd2 100644
tsens_debug_init(op);

err_put_device:
@@ -943,10 +1013,19 @@ static int tsens_register_irq(struct tsens_priv *priv, char *irqname,
@@ -943,10 +1013,19 @@ static int tsens_register_irq(struct tse
if (irq == -ENXIO)
ret = 0;
} else {
Expand All @@ -245,7 +243,7 @@ index d8ce3a687b80..9a7e991d4bd2 100644
if (ret)
dev_err(&pdev->dev, "%s: failed to get irq\n",
__func__);
@@ -975,6 +1054,19 @@ static int tsens_register(struct tsens_priv *priv)
@@ -975,6 +1054,19 @@ static int tsens_register(struct tsens_p
priv->ops->enable(priv, i);
}

Expand All @@ -265,8 +263,6 @@ index d8ce3a687b80..9a7e991d4bd2 100644
ret = tsens_register_irq(priv, "uplow", tsens_irq_thread);
if (ret < 0)
return ret;
diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h
index f40b625f897e..8e6c1fd3ccf5 100644
--- a/drivers/thermal/qcom/tsens.h
+++ b/drivers/thermal/qcom/tsens.h
@@ -13,6 +13,7 @@
Expand All @@ -287,6 +283,3 @@ index f40b625f897e..8e6c1fd3ccf5 100644
VER_1_X,
VER_2_X,
};
--
2.30.2

Expand Up @@ -14,11 +14,9 @@ Reviewed-by: Thara Gopinath <thara.gopinath@linaro.org>
drivers/thermal/qcom/tsens.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c
index 9a7e991d4bd2..38b9936def1a 100644
--- a/drivers/thermal/qcom/tsens.c
+++ b/drivers/thermal/qcom/tsens.c
@@ -86,7 +86,8 @@ void compute_intercept_slope(struct tsens_priv *priv, u32 *p1,
@@ -86,7 +86,8 @@ void compute_intercept_slope(struct tsen
"%s: sensor%d - data_point1:%#x data_point2:%#x\n",
__func__, i, p1[i], p2[i]);

Expand All @@ -28,6 +26,3 @@ index 9a7e991d4bd2..38b9936def1a 100644
if (mode == TWO_PT_CALIB) {
/*
* slope (m) = adc_code2 - adc_code1 (y2 - y1)/
--
2.30.2

Expand Up @@ -12,8 +12,6 @@ Acked-by: Thara Gopinath <thara.gopinath@linaro.org>
drivers/thermal/qcom/tsens-8960.c | 80 ++++++++++++++++++++++++++++++-
1 file changed, 79 insertions(+), 1 deletion(-)

diff --git a/drivers/thermal/qcom/tsens-8960.c b/drivers/thermal/qcom/tsens-8960.c
index 2a28a5af209e..3f4fc1ffe679 100644
--- a/drivers/thermal/qcom/tsens-8960.c
+++ b/drivers/thermal/qcom/tsens-8960.c
@@ -51,11 +51,22 @@
Expand All @@ -40,7 +38,7 @@ index 2a28a5af209e..3f4fc1ffe679 100644
static int suspend_8960(struct tsens_priv *priv)
{
int ret;
@@ -269,6 +280,71 @@ static int get_temp_8960(const struct tsens_sensor *s, int *temp)
@@ -269,6 +280,71 @@ static int get_temp_8960(const struct ts
return -ETIMEDOUT;
}

Expand Down Expand Up @@ -112,13 +110,10 @@ index 2a28a5af209e..3f4fc1ffe679 100644
static const struct tsens_ops ops_8960 = {
.init = init_8960,
.calibrate = calibrate_8960,
@@ -282,4 +358,6 @@ static const struct tsens_ops ops_8960 = {
@@ -282,4 +358,6 @@ static const struct tsens_ops ops_8960 =
struct tsens_plat_data data_8960 = {
.num_sensors = 11,
.ops = &ops_8960,
+ .feat = &tsens_8960_feat,
+ .fields = tsens_8960_regfields,
};
--
2.30.2

Expand Up @@ -11,11 +11,9 @@ Reviewed-by: Thara Gopinath <thara.gopinath@linaro.org>
drivers/thermal/qcom/tsens-8960.c | 52 +------------------------------
1 file changed, 1 insertion(+), 51 deletions(-)

diff --git a/drivers/thermal/qcom/tsens-8960.c b/drivers/thermal/qcom/tsens-8960.c
index 3f4fc1ffe679..86585f439985 100644
--- a/drivers/thermal/qcom/tsens-8960.c
+++ b/drivers/thermal/qcom/tsens-8960.c
@@ -173,56 +173,6 @@ static void disable_8960(struct tsens_priv *priv)
@@ -173,56 +173,6 @@ static void disable_8960(struct tsens_pr
regmap_write(priv->tm_map, CNTL_ADDR, reg_cntl);
}

Expand Down Expand Up @@ -72,7 +70,7 @@ index 3f4fc1ffe679..86585f439985 100644
static int calibrate_8960(struct tsens_priv *priv)
{
int i;
@@ -346,7 +296,7 @@ static const struct reg_field tsens_8960_regfields[MAX_REGFIELDS] = {
@@ -346,7 +296,7 @@ static const struct reg_field tsens_8960
};

static const struct tsens_ops ops_8960 = {
Expand All @@ -81,6 +79,3 @@ index 3f4fc1ffe679..86585f439985 100644
.calibrate = calibrate_8960,
.get_temp = get_temp_8960,
.enable = enable_8960,
--
2.30.2

Expand Up @@ -14,8 +14,6 @@ Acked-by: Thara Gopinath <thara.gopinath@linaro.org>
drivers/thermal/qcom/tsens-8960.c | 23 ++++++++++++++++++++---
1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/drivers/thermal/qcom/tsens-8960.c b/drivers/thermal/qcom/tsens-8960.c
index 86585f439985..95fcccafae14 100644
--- a/drivers/thermal/qcom/tsens-8960.c
+++ b/drivers/thermal/qcom/tsens-8960.c
@@ -27,9 +27,9 @@
Expand All @@ -29,7 +27,7 @@ index 86585f439985..95fcccafae14 100644
#define SENSOR0_SHIFT 3

/* INT_STATUS_ADDR bitmasks */
@@ -126,17 +126,34 @@ static int resume_8960(struct tsens_priv *priv)
@@ -126,17 +126,34 @@ static int resume_8960(struct tsens_priv
static int enable_8960(struct tsens_priv *priv, int id)
{
int ret;
Expand Down Expand Up @@ -66,6 +64,3 @@ index 86585f439985..95fcccafae14 100644
if (priv->num_sensors > 1)
reg |= mask | SLP_CLK_ENA | EN;
else
--
2.30.2

0 comments on commit f35dbef

Please sign in to comment.