fix up 4.14 mmc patches

diff --git a/queue-4.14/mmc-block-use-generic_cmd6_time-when-modifying-inand_cmd38_arg_ext_csd.patch b/queue-4.14/mmc-block-use-generic_cmd6_time-when-modifying-inand_cmd38_arg_ext_csd.patch
index 5c4caec9e6730058d12dcdc7b0f04b1220a1621b..d77acb9e3a506d43e5720ef3ab9d6c79cfa5e6b0 100644 (file)
--- a/queue-4.14/mmc-block-use-generic_cmd6_time-when-modifying-inand_cmd38_arg_ext_csd.patch
+++ b/queue-4.14/mmc-block-use-generic_cmd6_time-when-modifying-inand_cmd38_arg_ext_csd.patch
@@ -1,10 +1,10 @@
-From foo@baz Thu May 19 04:19:37 PM CEST 2022
+From foo@baz Sat May 21 04:37:36 PM CEST 2022
 From: Florian Fainelli <f.fainelli@gmail.com>
-Date: Tue, 17 May 2022 11:27:45 -0700
+Date: Thu, 19 May 2022 12:00:29 -0700
 Subject: mmc: block: Use generic_cmd6_time when modifying INAND_CMD38_ARG_EXT_CSD
 To: stable@vger.kernel.org
 Cc: "Ulf Hansson" <ulf.hansson@linaro.org>, "Florian Fainelli" <f.fainelli@gmail.com>, "Adrian Hunter" <adrian.hunter@intel.com>, "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>, "Avri Altman" <avri.altman@wdc.com>, "Bean Huo" <beanhuo@micron.com>, "Nishad Kamdar" <nishadkamdar@gmail.com>, "Christian Löhle" <CLoehle@hyperstone.com>, linux-mmc@vger.kernel.org (open list:MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND...), linux-kernel@vger.kernel.org (open list), alcooperx@gmail.com, kdasu.kdev@gmail.com
-Message-ID: <20220517182746.252893-3-f.fainelli@gmail.com>
+Message-ID: <20220519190030.377695-3-f.fainelli@gmail.com>
 
 From: Ulf Hansson <ulf.hansson@linaro.org>
 

diff --git a/queue-4.14/mmc-core-default-to-generic_cmd6_time-as-timeout-in-__mmc_switch.patch b/queue-4.14/mmc-core-default-to-generic_cmd6_time-as-timeout-in-__mmc_switch.patch
index f8f18d0c887e0ef9ef7e5c81292fe8a1c5d779f9..28f73ac27cd86bb68dc82b5493d44b54addb9deb 100644 (file)
--- a/queue-4.14/mmc-core-default-to-generic_cmd6_time-as-timeout-in-__mmc_switch.patch
+++ b/queue-4.14/mmc-core-default-to-generic_cmd6_time-as-timeout-in-__mmc_switch.patch
@@ -1,10 +1,10 @@
-From foo@baz Thu May 19 04:19:37 PM CEST 2022
+From foo@baz Sat May 21 04:37:36 PM CEST 2022
 From: Florian Fainelli <f.fainelli@gmail.com>
-Date: Tue, 17 May 2022 11:27:46 -0700
+Date: Thu, 19 May 2022 12:00:30 -0700
 Subject: mmc: core: Default to generic_cmd6_time as timeout in __mmc_switch()
 To: stable@vger.kernel.org
 Cc: "Ulf Hansson" <ulf.hansson@linaro.org>, "Florian Fainelli" <f.fainelli@gmail.com>, "Adrian Hunter" <adrian.hunter@intel.com>, "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>, "Avri Altman" <avri.altman@wdc.com>, "Bean Huo" <beanhuo@micron.com>, "Nishad Kamdar" <nishadkamdar@gmail.com>, "Christian Löhle" <CLoehle@hyperstone.com>, linux-mmc@vger.kernel.org (open list:MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND...), linux-kernel@vger.kernel.org (open list), alcooperx@gmail.com, kdasu.kdev@gmail.com
-Message-ID: <20220517182746.252893-4-f.fainelli@gmail.com>
+Message-ID: <20220519190030.377695-4-f.fainelli@gmail.com>
 
 From: Ulf Hansson <ulf.hansson@linaro.org>
 

diff --git a/queue-4.14/mmc-core-specify-timeouts-for-bkops-and-cache_flush-for-emmc.patch b/queue-4.14/mmc-core-specify-timeouts-for-bkops-and-cache_flush-for-emmc.patch
index e8f121ab0243c728f46b0e9f21bfa82ee55fdccb..34d6991955751506fa5bc08eeb295c3c1ec60171 100644 (file)
--- a/queue-4.14/mmc-core-specify-timeouts-for-bkops-and-cache_flush-for-emmc.patch
+++ b/queue-4.14/mmc-core-specify-timeouts-for-bkops-and-cache_flush-for-emmc.patch
@@ -1,10 +1,10 @@
-From foo@baz Thu May 19 04:19:37 PM CEST 2022
+From foo@baz Sat May 21 04:37:36 PM CEST 2022
 From: Florian Fainelli <f.fainelli@gmail.com>
-Date: Tue, 17 May 2022 11:27:44 -0700
+Date: Thu, 19 May 2022 12:00:28 -0700
 Subject: mmc: core: Specify timeouts for BKOPS and CACHE_FLUSH for eMMC
 To: stable@vger.kernel.org
 Cc: "Ulf Hansson" <ulf.hansson@linaro.org>, "Florian Fainelli" <f.fainelli@gmail.com>, "Adrian Hunter" <adrian.hunter@intel.com>, "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>, "Avri Altman" <avri.altman@wdc.com>, "Bean Huo" <beanhuo@micron.com>, "Nishad Kamdar" <nishadkamdar@gmail.com>, "Christian Löhle" <CLoehle@hyperstone.com>, linux-mmc@vger.kernel.org (open list:MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND...), linux-kernel@vger.kernel.org (open list), alcooperx@gmail.com, kdasu.kdev@gmail.com
-Message-ID: <20220517182746.252893-2-f.fainelli@gmail.com>
+Message-ID: <20220519190030.377695-2-f.fainelli@gmail.com>
 
 From: Ulf Hansson <ulf.hansson@linaro.org>
 
@@ -37,15 +37,15 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
  static const u8 tuning_blk_pattern_4bit[] = {
        0xff, 0x0f, 0xff, 0x00, 0xff, 0xcc, 0xc3, 0xcc,
-@@ -989,7 +991,7 @@ void mmc_start_bkops(struct mmc_card *ca
-       mmc_retune_hold(card->host);
+@@ -979,7 +981,7 @@ void mmc_start_bkops(struct mmc_card *ca
  
-       err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
--                      EXT_CSD_BKOPS_START, 1, timeout, 0,
-+                      EXT_CSD_BKOPS_START, 1, MMC_BKOPS_TIMEOUT_MS, 0,
-                       use_busy_signal, true, false);
-       if (err) {
-               pr_warn("%s: Error %d starting bkops\n",
+       mmc_claim_host(card->host);
+       if (card->ext_csd.raw_bkops_status >= EXT_CSD_BKOPS_LEVEL_2) {
+-              timeout = MMC_OPS_TIMEOUT_MS;
++              timeout = MMC_BKOPS_TIMEOUT_MS;
+               use_busy_signal = true;
+       } else {
+               timeout = 0;
 @@ -1022,7 +1024,8 @@ int mmc_flush_cache(struct mmc_card *car
                        (card->ext_csd.cache_size > 0) &&
                        (card->ext_csd.cache_ctrl & 1)) {

diff --git a/queue-4.14/series b/queue-4.14/series
index fb884c71b1492e3df463985c3874ba7ca6776d18..0c4f2e3eca9e99f367917ddead13676e701b443f 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -5,9 +5,9 @@ input-stmfts-fix-reference-leak-in-stmfts_input_open.patch
 mips-lantiq-check-the-return-value-of-kzalloc.patch
 drbd-remove-usage-of-list-iterator-variable-after-lo.patch
 arm-9191-1-arm-stacktrace-kasan-silence-kasan-warnin.patch
-mmc-core-specify-timeouts-for-bkops-and-cache_flush-for-emmc.patch
-mmc-block-use-generic_cmd6_time-when-modifying-inand_cmd38_arg_ext_csd.patch
-mmc-core-default-to-generic_cmd6_time-as-timeout-in-__mmc_switch.patch
 alsa-wavefront-proper-check-of-get_user-error.patch
 perf-fix-sys_perf_event_open-race-against-self.patch
 drm-dp-mst-fix-a-possible-memory-leak-in-fetch_monitor_name.patch
+mmc-core-specify-timeouts-for-bkops-and-cache_flush-for-emmc.patch
+mmc-block-use-generic_cmd6_time-when-modifying-inand_cmd38_arg_ext_csd.patch
+mmc-core-default-to-generic_cmd6_time-as-timeout-in-__mmc_switch.patch