5.10-stable patches

added patches:
	asoc-intel-sof_sdw-include-rt711.h-for-rt711-jd-mode.patch
	mm-hwpoison-fix-printing-of-page-flags.patch

diff --git a/queue-5.10/asoc-intel-sof_sdw-include-rt711.h-for-rt711-jd-mode.patch b/queue-5.10/asoc-intel-sof_sdw-include-rt711.h-for-rt711-jd-mode.patch
new file mode 100644 (file)
index 0000000..82823d9
--- /dev/null
+++ b/queue-5.10/asoc-intel-sof_sdw-include-rt711.h-for-rt711-jd-mode.patch
@@ -0,0 +1,140 @@
+From 8e6c00f1fdea9fdf727969d7485d417240d2a1f9 Mon Sep 17 00:00:00 2001
+From: Bard Liao <yung-chuan.liao@linux.intel.com>
+Date: Mon, 12 Jul 2021 15:32:39 -0500
+Subject: ASoC: Intel: sof_sdw: include rt711.h for RT711 JD mode
+
+From: Bard Liao <yung-chuan.liao@linux.intel.com>
+
+commit 8e6c00f1fdea9fdf727969d7485d417240d2a1f9 upstream.
+
+We don't need to redefine enum rt711_jd_src.
+
+Reviewed-by: Rander Wang <rander.wang@intel.com>
+Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
+Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
+Link: https://lore.kernel.org/r/20210712203240.46960-7-pierre-louis.bossart@linux.intel.com
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Cc: Philip Müller <philm@manjaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ sound/soc/intel/boards/sof_sdw.c        |   23 ++++++++++++-----------
+ sound/soc/intel/boards/sof_sdw_common.h |    5 -----
+ 2 files changed, 12 insertions(+), 16 deletions(-)
+
+--- a/sound/soc/intel/boards/sof_sdw.c
++++ b/sound/soc/intel/boards/sof_sdw.c
+@@ -13,8 +13,9 @@
+ #include <sound/soc.h>
+ #include <sound/soc-acpi.h>
+ #include "sof_sdw_common.h"
++#include "../../codecs/rt711.h"
+ 
+-unsigned long sof_sdw_quirk = SOF_RT711_JD_SRC_JD1;
++unsigned long sof_sdw_quirk = RT711_JD1;
+ static int quirk_override = -1;
+ module_param_named(quirk, quirk_override, int, 0444);
+ MODULE_PARM_DESC(quirk, "Board-specific quirk override");
+@@ -63,7 +64,7 @@ static const struct dmi_system_id sof_sd
+                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),
+                       DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "09C6")
+               },
+-              .driver_data = (void *)(SOF_RT711_JD_SRC_JD2 |
++              .driver_data = (void *)(RT711_JD2 |
+                                       SOF_RT715_DAI_ID_FIX),
+       },
+       {
+@@ -73,7 +74,7 @@ static const struct dmi_system_id sof_sd
+                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),
+                       DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0983")
+               },
+-              .driver_data = (void *)(SOF_RT711_JD_SRC_JD2 |
++              .driver_data = (void *)(RT711_JD2 |
+                                       SOF_RT715_DAI_ID_FIX),
+       },
+       {
+@@ -82,7 +83,7 @@ static const struct dmi_system_id sof_sd
+                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),
+                       DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "098F"),
+               },
+-              .driver_data = (void *)(SOF_RT711_JD_SRC_JD2 |
++              .driver_data = (void *)(RT711_JD2 |
+                                       SOF_RT715_DAI_ID_FIX |
+                                       SOF_SDW_FOUR_SPK),
+       },
+@@ -92,7 +93,7 @@ static const struct dmi_system_id sof_sd
+                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),
+                       DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0990"),
+               },
+-              .driver_data = (void *)(SOF_RT711_JD_SRC_JD2 |
++              .driver_data = (void *)(RT711_JD2 |
+                                       SOF_RT715_DAI_ID_FIX |
+                                       SOF_SDW_FOUR_SPK),
+       },
+@@ -114,7 +115,7 @@ static const struct dmi_system_id sof_sd
+                                 "Tiger Lake Client Platform"),
+               },
+               .driver_data = (void *)(SOF_SDW_TGL_HDMI |
+-                                      SOF_RT711_JD_SRC_JD1 |
++                                      RT711_JD1 |
+                                       SOF_SDW_PCH_DMIC |
+                                       SOF_SSP_PORT(SOF_I2S_SSP2)),
+       },
+@@ -125,7 +126,7 @@ static const struct dmi_system_id sof_sd
+                       DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0A3E")
+               },
+               .driver_data = (void *)(SOF_SDW_TGL_HDMI |
+-                                      SOF_RT711_JD_SRC_JD2 |
++                                      RT711_JD2 |
+                                       SOF_RT715_DAI_ID_FIX),
+       },
+       {
+@@ -135,7 +136,7 @@ static const struct dmi_system_id sof_sd
+                       DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0A5E")
+               },
+               .driver_data = (void *)(SOF_SDW_TGL_HDMI |
+-                                      SOF_RT711_JD_SRC_JD2 |
++                                      RT711_JD2 |
+                                       SOF_RT715_DAI_ID_FIX |
+                                       SOF_SDW_FOUR_SPK),
+       },
+@@ -173,7 +174,7 @@ static const struct dmi_system_id sof_sd
+               },
+               .driver_data = (void *)(SOF_SDW_TGL_HDMI |
+                                       SOF_SDW_PCH_DMIC |
+-                                      SOF_RT711_JD_SRC_JD2),
++                                      RT711_JD2),
+       },
+       /* TigerLake-SDCA devices */
+       {
+@@ -183,7 +184,7 @@ static const struct dmi_system_id sof_sd
+                       DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0A32")
+               },
+               .driver_data = (void *)(SOF_SDW_TGL_HDMI |
+-                                      SOF_RT711_JD_SRC_JD2 |
++                                      RT711_JD2 |
+                                       SOF_RT715_DAI_ID_FIX |
+                                       SOF_SDW_FOUR_SPK),
+       },
+@@ -194,7 +195,7 @@ static const struct dmi_system_id sof_sd
+                       DMI_MATCH(DMI_SYS_VENDOR, "Intel Corporation"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Alder Lake Client Platform"),
+               },
+-              .driver_data = (void *)(SOF_RT711_JD_SRC_JD1 |
++              .driver_data = (void *)(RT711_JD1 |
+                                       SOF_SDW_TGL_HDMI |
+                                       SOF_RT715_DAI_ID_FIX |
+                                       SOF_SDW_PCH_DMIC),
+--- a/sound/soc/intel/boards/sof_sdw_common.h
++++ b/sound/soc/intel/boards/sof_sdw_common.h
+@@ -23,11 +23,6 @@
+ #define SDW_MAX_GROUPS 9
+ 
+ enum {
+-      SOF_RT711_JD_SRC_JD1 = 1,
+-      SOF_RT711_JD_SRC_JD2 = 2,
+-};
+-
+-enum {
+       SOF_PRE_TGL_HDMI_COUNT = 3,
+       SOF_TGL_HDMI_COUNT = 4,
+ };

diff --git a/queue-5.10/mm-hwpoison-fix-printing-of-page-flags.patch b/queue-5.10/mm-hwpoison-fix-printing-of-page-flags.patch
new file mode 100644 (file)
index 0000000..330bbb2
--- /dev/null
+++ b/queue-5.10/mm-hwpoison-fix-printing-of-page-flags.patch
@@ -0,0 +1,36 @@
+From 6696d2a6f38c0beedf03c381edfc392ecf7631b4 Mon Sep 17 00:00:00 2001
+From: Oscar Salvador <osalvador@suse.de>
+Date: Tue, 12 Jan 2021 15:49:30 -0800
+Subject: mm,hwpoison: fix printing of page flags
+
+From: Oscar Salvador <osalvador@suse.de>
+
+commit 6696d2a6f38c0beedf03c381edfc392ecf7631b4 upstream.
+
+Format %pG expects a lower case 'p' in order to print the flags.
+Fix it.
+
+Link: https://lkml.kernel.org/r/20210108085202.4506-1-osalvador@suse.de
+Fixes: 8295d535e2aa ("mm,hwpoison: refactor get_any_page")
+Signed-off-by: Oscar Salvador <osalvador@suse.de>
+Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
+Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com>
+Acked-by: Naoya Horiguchi <naoya.horiguchi@nec.com>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ mm/memory-failure.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/mm/memory-failure.c
++++ b/mm/memory-failure.c
+@@ -1928,7 +1928,7 @@ retry:
+                       ret = -EBUSY;
+               }
+       } else if (ret == -EIO) {
+-              pr_info("%s: %#lx: unknown page type: %lx (%pGP)\n",
++              pr_info("%s: %#lx: unknown page type: %lx (%pGp)\n",
+                        __func__, pfn, page->flags, &page->flags);
+       }
+ 

diff --git a/queue-5.10/series b/queue-5.10/series
index cd884719def5605b095348c4cd8f477711193f84..e6cdb6d1e90d7878c075d6e66101419bb9474fac 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -80,3 +80,5 @@ mm-hwpoison-refactor-get_any_page.patch
 mm-fix-page-reference-leak-in-soft_offline_page.patch
 mm-memory-failure-kill-soft_offline_free_page.patch
 mm-memory-failure-fix-unexpected-return-value-in-sof.patch
+asoc-intel-sof_sdw-include-rt711.h-for-rt711-jd-mode.patch
+mm-hwpoison-fix-printing-of-page-flags.patch