From: Greg Kroah-Hartman Date: Tue, 17 Jan 2023 12:44:57 +0000 (+0100) Subject: fuzz cleanup for 5.4 X-Git-Tag: v4.14.303~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=80ea51b57d042a561cd49e2c720358b64749a552;p=thirdparty%2Fkernel%2Fstable-queue.git fuzz cleanup for 5.4 --- diff --git a/queue-5.4/rtc-snvs-allow-a-time-difference-on-clock-register-r.patch b/queue-5.4/rtc-snvs-allow-a-time-difference-on-clock-register-r.patch index b32061cb596..f7b044d2da5 100644 --- a/queue-5.4/rtc-snvs-allow-a-time-difference-on-clock-register-r.patch +++ b/queue-5.4/rtc-snvs-allow-a-time-difference-on-clock-register-r.patch @@ -30,11 +30,9 @@ Link: https://lore.kernel.org/r/20221106115915.7930-1-francesco@dolcini.it Signed-off-by: Alexandre Belloni Signed-off-by: Sasha Levin --- - drivers/rtc/rtc-snvs.c | 16 ++++++++++++++-- + drivers/rtc/rtc-snvs.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) -diff --git a/drivers/rtc/rtc-snvs.c b/drivers/rtc/rtc-snvs.c -index 757f4daa7181..0f1e544ac8db 100644 --- a/drivers/rtc/rtc-snvs.c +++ b/drivers/rtc/rtc-snvs.c @@ -33,6 +33,14 @@ @@ -52,7 +50,7 @@ index 757f4daa7181..0f1e544ac8db 100644 struct snvs_rtc_data { struct rtc_device *rtc; struct regmap *regmap; -@@ -57,6 +65,7 @@ static u64 rtc_read_lpsrt(struct snvs_rtc_data *data) +@@ -57,6 +65,7 @@ static u64 rtc_read_lpsrt(struct snvs_rt static u32 rtc_read_lp_counter(struct snvs_rtc_data *data) { u64 read1, read2; @@ -60,7 +58,7 @@ index 757f4daa7181..0f1e544ac8db 100644 unsigned int timeout = 100; /* As expected, the registers might update between the read of the LSB -@@ -67,7 +76,8 @@ static u32 rtc_read_lp_counter(struct snvs_rtc_data *data) +@@ -67,7 +76,8 @@ static u32 rtc_read_lp_counter(struct sn do { read2 = read1; read1 = rtc_read_lpsrt(data); @@ -70,7 +68,7 @@ index 757f4daa7181..0f1e544ac8db 100644 if (!timeout) dev_err(&data->rtc->dev, "Timeout trying to get valid LPSRT Counter read\n"); -@@ -79,13 +89,15 @@ static u32 rtc_read_lp_counter(struct snvs_rtc_data *data) +@@ -79,13 +89,15 @@ static u32 rtc_read_lp_counter(struct sn static int rtc_read_lp_counter_lsb(struct snvs_rtc_data *data, u32 *lsb) { u32 count1, count2; @@ -87,6 +85,3 @@ index 757f4daa7181..0f1e544ac8db 100644 if (!timeout) { dev_err(&data->rtc->dev, "Timeout trying to get valid LPSRT Counter read\n"); return -ETIMEDOUT; --- -2.35.1 - diff --git a/queue-5.4/soc-qcom-select-remap_mmio-for-llcc-driver.patch b/queue-5.4/soc-qcom-select-remap_mmio-for-llcc-driver.patch index a21a6b18004..d774ff754b7 100644 --- a/queue-5.4/soc-qcom-select-remap_mmio-for-llcc-driver.patch +++ b/queue-5.4/soc-qcom-select-remap_mmio-for-llcc-driver.patch @@ -35,4 +35,4 @@ Signed-off-by: Greg Kroah-Hartman + select REGMAP_MMIO help Qualcomm Technologies, Inc. platform specific - Last Level Cache Controller(LLCC) driver for platforms such as, + Last Level Cache Controller(LLCC) driver. This provides interfaces