From: Greg Kroah-Hartman Date: Mon, 12 Oct 2020 12:01:55 +0000 (+0200) Subject: 4.14-stable patches X-Git-Tag: v4.4.239~13 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e2a6dba8ea90b8a00fb382b7dd0b0ff19fec912b;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: i2c-imx-fix-reset-of-i2sr_ial-flag.patch mm-khugepaged-recalculate-min_free_kbytes-after-memory-hotplug-as-expected-by-khugepaged.patch --- diff --git a/queue-4.14/i2c-imx-fix-reset-of-i2sr_ial-flag.patch b/queue-4.14/i2c-imx-fix-reset-of-i2sr_ial-flag.patch new file mode 100644 index 00000000000..194abe7921d --- /dev/null +++ b/queue-4.14/i2c-imx-fix-reset-of-i2sr_ial-flag.patch @@ -0,0 +1,71 @@ +From fa4d30556883f2eaab425b88ba9904865a4d00f3 Mon Sep 17 00:00:00 2001 +From: Christian Eggers +Date: Wed, 7 Oct 2020 10:45:22 +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 fa4d30556883f2eaab425b88ba9904865a4d00f3 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 +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 +@@ -412,6 +412,19 @@ static void i2c_imx_dma_free(struct imx_ + dma->chan_using = NULL; + } + ++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 W1C and Vybrid uses W0C. ++ */ ++ 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; +@@ -424,8 +437,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; + } + +@@ -583,9 +595,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.14/mm-khugepaged-recalculate-min_free_kbytes-after-memory-hotplug-as-expected-by-khugepaged.patch b/queue-4.14/mm-khugepaged-recalculate-min_free_kbytes-after-memory-hotplug-as-expected-by-khugepaged.patch new file mode 100644 index 00000000000..a66bee89b3d --- /dev/null +++ b/queue-4.14/mm-khugepaged-recalculate-min_free_kbytes-after-memory-hotplug-as-expected-by-khugepaged.patch @@ -0,0 +1,114 @@ +From 4aab2be0983031a05cb4a19696c9da5749523426 Mon Sep 17 00:00:00 2001 +From: Vijay Balakrishna +Date: Sat, 10 Oct 2020 23:16:40 -0700 +Subject: mm: khugepaged: recalculate min_free_kbytes after memory hotplug as expected by khugepaged + +From: Vijay Balakrishna + +commit 4aab2be0983031a05cb4a19696c9da5749523426 upstream. + +When memory is hotplug added or removed the min_free_kbytes should be +recalculated based on what is expected by khugepaged. Currently after +hotplug, min_free_kbytes will be set to a lower default and higher +default set when THP enabled is lost. + +This change restores min_free_kbytes as expected for THP consumers. + +[vijayb@linux.microsoft.com: v5] + Link: https://lkml.kernel.org/r/1601398153-5517-1-git-send-email-vijayb@linux.microsoft.com + +Fixes: f000565adb77 ("thp: set recommended min free kbytes") +Signed-off-by: Vijay Balakrishna +Signed-off-by: Andrew Morton +Reviewed-by: Pavel Tatashin +Acked-by: Michal Hocko +Cc: Allen Pais +Cc: Andrea Arcangeli +Cc: "Kirill A. Shutemov" +Cc: Oleg Nesterov +Cc: Song Liu +Cc: +Link: https://lkml.kernel.org/r/1600305709-2319-2-git-send-email-vijayb@linux.microsoft.com +Link: https://lkml.kernel.org/r/1600204258-13683-1-git-send-email-vijayb@linux.microsoft.com +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + include/linux/khugepaged.h | 5 +++++ + mm/khugepaged.c | 13 +++++++++++-- + mm/page_alloc.c | 3 +++ + 3 files changed, 19 insertions(+), 2 deletions(-) + +--- a/include/linux/khugepaged.h ++++ b/include/linux/khugepaged.h +@@ -15,6 +15,7 @@ extern int __khugepaged_enter(struct mm_ + extern void __khugepaged_exit(struct mm_struct *mm); + extern int khugepaged_enter_vma_merge(struct vm_area_struct *vma, + unsigned long vm_flags); ++extern void khugepaged_min_free_kbytes_update(void); + + #define khugepaged_enabled() \ + (transparent_hugepage_flags & \ +@@ -73,6 +74,10 @@ static inline int khugepaged_enter_vma_m + { + return 0; + } ++ ++static inline void khugepaged_min_free_kbytes_update(void) ++{ ++} + #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ + + #endif /* _LINUX_KHUGEPAGED_H */ +--- a/mm/khugepaged.c ++++ b/mm/khugepaged.c +@@ -53,6 +53,9 @@ enum scan_result { + #define CREATE_TRACE_POINTS + #include + ++static struct task_struct *khugepaged_thread __read_mostly; ++static DEFINE_MUTEX(khugepaged_mutex); ++ + /* default scan 8*512 pte (or vmas) every 30 second */ + static unsigned int khugepaged_pages_to_scan __read_mostly; + static unsigned int khugepaged_pages_collapsed; +@@ -1949,8 +1952,6 @@ static void set_recommended_min_free_kby + + int start_stop_khugepaged(void) + { +- static struct task_struct *khugepaged_thread __read_mostly; +- static DEFINE_MUTEX(khugepaged_mutex); + int err = 0; + + mutex_lock(&khugepaged_mutex); +@@ -1977,3 +1978,11 @@ fail: + mutex_unlock(&khugepaged_mutex); + return err; + } ++ ++void khugepaged_min_free_kbytes_update(void) ++{ ++ mutex_lock(&khugepaged_mutex); ++ if (khugepaged_enabled() && khugepaged_thread) ++ set_recommended_min_free_kbytes(); ++ mutex_unlock(&khugepaged_mutex); ++} +--- a/mm/page_alloc.c ++++ b/mm/page_alloc.c +@@ -67,6 +67,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -7021,6 +7022,8 @@ int __meminit init_per_zone_wmark_min(vo + setup_min_slab_ratio(); + #endif + ++ khugepaged_min_free_kbytes_update(); ++ + return 0; + } + postcore_initcall(init_per_zone_wmark_min) diff --git a/queue-4.14/series b/queue-4.14/series index 128ba336957..34eb4b9045c 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -66,3 +66,5 @@ rxrpc-fix-some-missing-_bh-annotations-on-locking-co.patch rxrpc-fix-server-keyring-leak.patch perf-fix-task_function_call-error-handling.patch mmc-core-don-t-set-limits.discard_granularity-as-0.patch +mm-khugepaged-recalculate-min_free_kbytes-after-memory-hotplug-as-expected-by-khugepaged.patch +i2c-imx-fix-reset-of-i2sr_ial-flag.patch