From: Greg Kroah-Hartman Date: Wed, 9 Dec 2020 11:03:22 +0000 (+0100) Subject: 4.4-stable patches X-Git-Tag: v5.9.14~35 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0c17945e168bd7435e725b8c540afd581778064f;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: arm64-assembler-make-adr_l-work-in-modules-under-kaslr.patch i2c-imx-check-for-i2sr_ial-after-every-byte.patch i2c-imx-fix-reset-of-i2sr_ial-flag.patch --- diff --git a/queue-4.4/arm64-assembler-make-adr_l-work-in-modules-under-kaslr.patch b/queue-4.4/arm64-assembler-make-adr_l-work-in-modules-under-kaslr.patch new file mode 100644 index 00000000000..c1b73f80efa --- /dev/null +++ b/queue-4.4/arm64-assembler-make-adr_l-work-in-modules-under-kaslr.patch @@ -0,0 +1,121 @@ +From foo@baz Wed Dec 9 12:01:20 PM CET 2020 +From: dann frazier +Date: Mon, 7 Dec 2020 18:10:34 -0700 +Subject: arm64: assembler: make adr_l work in modules under KASLR +To: stable@vger.kernel.org, Michael Schaller , Ard Biesheuvel , Greg Kroah-Hartman +Cc: Matthew Garrett , Jeremy Kerr , linux-efi@vger.kernel.org +Message-ID: <20201208011034.3015079-1-dann.frazier@canonical.com> + +From: Ard Biesheuvel + +commit 41c066f2c4d436c535616fe182331766c57838f0 upstream + +When CONFIG_RANDOMIZE_MODULE_REGION_FULL=y, the offset between loaded +modules and the core kernel may exceed 4 GB, putting symbols exported +by the core kernel out of the reach of the ordinary adrp/add instruction +pairs used to generate relative symbol references. So make the adr_l +macro emit a movz/movk sequence instead when executing in module context. + +While at it, remove the pointless special case for the stack pointer. + +Acked-by: Mark Rutland +Acked-by: Will Deacon +Signed-off-by: Ard Biesheuvel +Signed-off-by: Catalin Marinas +[ dannf: backported to v4.4 by replacing the 3-arg adr_l macro in head.S + with it's output, as this commit drops the 3-arg variant ] +Fixes: c042dd600f4e ("crypto: arm64/sha - avoid non-standard inline asm tricks") +Signed-off-by: dann frazier +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm64/include/asm/assembler.h | 36 +++++++++++++++++++++++++++--------- + arch/arm64/kernel/head.S | 3 ++- + 2 files changed, 29 insertions(+), 10 deletions(-) + +--- a/arch/arm64/include/asm/assembler.h ++++ b/arch/arm64/include/asm/assembler.h +@@ -148,22 +148,25 @@ lr .req x30 // link register + + /* + * Pseudo-ops for PC-relative adr/ldr/str , where +- * is within the range +/- 4 GB of the PC. ++ * is within the range +/- 4 GB of the PC when running ++ * in core kernel context. In module context, a movz/movk sequence ++ * is used, since modules may be loaded far away from the kernel ++ * when KASLR is in effect. + */ + /* + * @dst: destination register (64 bit wide) + * @sym: name of the symbol +- * @tmp: optional scratch register to be used if == sp, which +- * is not allowed in an adrp instruction + */ +- .macro adr_l, dst, sym, tmp= +- .ifb \tmp ++ .macro adr_l, dst, sym ++#ifndef MODULE + adrp \dst, \sym + add \dst, \dst, :lo12:\sym +- .else +- adrp \tmp, \sym +- add \dst, \tmp, :lo12:\sym +- .endif ++#else ++ movz \dst, #:abs_g3:\sym ++ movk \dst, #:abs_g2_nc:\sym ++ movk \dst, #:abs_g1_nc:\sym ++ movk \dst, #:abs_g0_nc:\sym ++#endif + .endm + + /* +@@ -174,6 +177,7 @@ lr .req x30 // link register + * the address + */ + .macro ldr_l, dst, sym, tmp= ++#ifndef MODULE + .ifb \tmp + adrp \dst, \sym + ldr \dst, [\dst, :lo12:\sym] +@@ -181,6 +185,15 @@ lr .req x30 // link register + adrp \tmp, \sym + ldr \dst, [\tmp, :lo12:\sym] + .endif ++#else ++ .ifb \tmp ++ adr_l \dst, \sym ++ ldr \dst, [\dst] ++ .else ++ adr_l \tmp, \sym ++ ldr \dst, [\tmp] ++ .endif ++#endif + .endm + + /* +@@ -190,8 +203,13 @@ lr .req x30 // link register + * while needs to be preserved. + */ + .macro str_l, src, sym, tmp ++#ifndef MODULE + adrp \tmp, \sym + str \src, [\tmp, :lo12:\sym] ++#else ++ adr_l \tmp, \sym ++ str \src, [\tmp] ++#endif + .endm + + /* +--- a/arch/arm64/kernel/head.S ++++ b/arch/arm64/kernel/head.S +@@ -424,7 +424,8 @@ __mmap_switched: + str xzr, [x6], #8 // Clear BSS + b 1b + 2: +- adr_l sp, initial_sp, x4 ++ adrp x4, initial_sp ++ add sp, x4, :lo12:initial_sp + str_l x21, __fdt_pointer, x5 // Save FDT pointer + str_l x24, memstart_addr, x6 // Save PHYS_OFFSET + mov x29, #0 diff --git a/queue-4.4/i2c-imx-check-for-i2sr_ial-after-every-byte.patch b/queue-4.4/i2c-imx-check-for-i2sr_ial-after-every-byte.patch new file mode 100644 index 00000000000..ffa58ec8254 --- /dev/null +++ b/queue-4.4/i2c-imx-check-for-i2sr_ial-after-every-byte.patch @@ -0,0 +1,46 @@ +From 1de67a3dee7a279ebe4d892b359fe3696938ec15 Mon Sep 17 00:00:00 2001 +From: Christian Eggers +Date: Fri, 9 Oct 2020 13:03:19 +0200 +Subject: i2c: imx: Check for I2SR_IAL after every byte + +From: Christian Eggers + +commit 1de67a3dee7a279ebe4d892b359fe3696938ec15 upstream. + +Arbitration Lost (IAL) can happen after every single byte transfer. If +arbitration is lost, the I2C hardware will autonomously switch from +master mode to slave. If a transfer is not aborted in this state, +consecutive transfers will not be executed by the hardware and will +timeout. + +Signed-off-by: Christian Eggers +Tested (not extensively) on Vybrid VF500 (Toradex VF50): +Tested-by: Krzysztof Kozlowski +Acked-by: Oleksij Rempel +Cc: stable@vger.kernel.org +Signed-off-by: Wolfram Sang +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/i2c/busses/i2c-imx.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +--- a/drivers/i2c/busses/i2c-imx.c ++++ b/drivers/i2c/busses/i2c-imx.c +@@ -472,6 +472,16 @@ static int i2c_imx_trx_complete(struct i + dev_dbg(&i2c_imx->adapter.dev, "<%s> Timeout\n", __func__); + return -ETIMEDOUT; + } ++ ++ /* check for arbitration lost */ ++ if (i2c_imx->i2csr & I2SR_IAL) { ++ dev_dbg(&i2c_imx->adapter.dev, "<%s> Arbitration lost\n", __func__); ++ i2c_imx_clear_irq(i2c_imx, I2SR_IAL); ++ ++ i2c_imx->i2csr = 0; ++ return -EAGAIN; ++ } ++ + dev_dbg(&i2c_imx->adapter.dev, "<%s> TRX complete\n", __func__); + i2c_imx->i2csr = 0; + return 0; diff --git a/queue-4.4/i2c-imx-fix-reset-of-i2sr_ial-flag.patch b/queue-4.4/i2c-imx-fix-reset-of-i2sr_ial-flag.patch new file mode 100644 index 00000000000..fc5bc8548a8 --- /dev/null +++ b/queue-4.4/i2c-imx-fix-reset-of-i2sr_ial-flag.patch @@ -0,0 +1,72 @@ +From 384a9565f70a876c2e78e58c5ca0bbf0547e4f6d Mon Sep 17 00:00:00 2001 +From: Christian Eggers +Date: Fri, 9 Oct 2020 13:03:18 +0200 +Subject: i2c: imx: Fix reset of I2SR_IAL flag +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Christian Eggers + +commit 384a9565f70a876c2e78e58c5ca0bbf0547e4f6d upstream. + +According to the "VFxxx Controller Reference Manual" (and the comment +block starting at line 97), Vybrid requires writing a one for clearing +an interrupt flag. Syncing the method for clearing I2SR_IIF in +i2c_imx_isr(). + +Signed-off-by: Christian Eggers +Fixes: 4b775022f6fd ("i2c: imx: add struct to hold more configurable quirks") +Reviewed-by: Uwe Kleine-König +Acked-by: Oleksij Rempel +Cc: stable@vger.kernel.org +Signed-off-by: Wolfram Sang +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/i2c/busses/i2c-imx.c | 20 +++++++++++++++----- + 1 file changed, 15 insertions(+), 5 deletions(-) + +--- a/drivers/i2c/busses/i2c-imx.c ++++ b/drivers/i2c/busses/i2c-imx.c +@@ -420,6 +420,19 @@ static void i2c_imx_dma_free(struct imx_ + /** Functions for IMX I2C adapter driver *************************************** + *******************************************************************************/ + ++static void i2c_imx_clear_irq(struct imx_i2c_struct *i2c_imx, unsigned int bits) ++{ ++ unsigned int temp; ++ ++ /* ++ * i2sr_clr_opcode is the value to clear all interrupts. Here we want to ++ * clear only , so we write ~i2sr_clr_opcode with just ++ * toggled. This is required because i.MX needs W0C and Vybrid uses W1C. ++ */ ++ temp = ~i2c_imx->hwdata->i2sr_clr_opcode ^ bits; ++ imx_i2c_write_reg(temp, i2c_imx, IMX_I2C_I2SR); ++} ++ + static int i2c_imx_bus_busy(struct imx_i2c_struct *i2c_imx, int for_busy) + { + unsigned long orig_jiffies = jiffies; +@@ -432,8 +445,7 @@ static int i2c_imx_bus_busy(struct imx_i + + /* check for arbitration lost */ + if (temp & I2SR_IAL) { +- temp &= ~I2SR_IAL; +- imx_i2c_write_reg(temp, i2c_imx, IMX_I2C_I2SR); ++ i2c_imx_clear_irq(i2c_imx, I2SR_IAL); + return -EAGAIN; + } + +@@ -595,9 +607,7 @@ static irqreturn_t i2c_imx_isr(int irq, + if (temp & I2SR_IIF) { + /* save status register */ + i2c_imx->i2csr = temp; +- temp &= ~I2SR_IIF; +- temp |= (i2c_imx->hwdata->i2sr_clr_opcode & I2SR_IIF); +- imx_i2c_write_reg(temp, i2c_imx, IMX_I2C_I2SR); ++ i2c_imx_clear_irq(i2c_imx, I2SR_IIF); + wake_up(&i2c_imx->queue); + return IRQ_HANDLED; + } diff --git a/queue-4.4/series b/queue-4.4/series index f2f2299316d..f2addd25266 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -24,3 +24,6 @@ alsa-hda-realtek-add-new-codec-supported-for-alc897.patch alsa-hda-generic-add-option-to-enforce-preferred_dacs-pairs.patch tty-fix-session-locking.patch cifs-fix-potential-use-after-free-in-cifs_echo_request.patch +i2c-imx-fix-reset-of-i2sr_ial-flag.patch +i2c-imx-check-for-i2sr_ial-after-every-byte.patch +arm64-assembler-make-adr_l-work-in-modules-under-kaslr.patch