kernel: support for newer eMMC modules

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/lfs/linux b/lfs/linux
index 19d27293437c215c6a133e7707ddb7a90145dd1a..d7b21e6d17021663a73e7693d24f42978b9a0ec4 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2016  IPFire Team <info@ipfire.org>                      #
+# Copyright (C) 2007-2017  IPFire Team <info@ipfire.org>                      #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -173,6 +173,9 @@ endif
        # update the queued trim blacklist from kernel 4.2rc1
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.43_new_qtrim_blacklist.patch
 
+       # remove eMMC EXT_CSD revision check to use newer eMMC modules
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.79_mmc_remove_EXT_CSD_revision_check.patch
+
        # Hyper-V patches
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0001-Drivers-net-hyperv-Get-rid-of-the-rndis_filter_packe.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/0002-Drivers-net-hyperv-Cleanup-the-receive-path.patch

diff --git a/src/patches/linux-3.14.79_mmc_remove_EXT_CSD_revision_check.patch b/src/patches/linux-3.14.79_mmc_remove_EXT_CSD_revision_check.patch
new file mode 100644 (file)
index 0000000..fbade3a
--- /dev/null
+++ b/src/patches/linux-3.14.79_mmc_remove_EXT_CSD_revision_check.patch
@@ -0,0 +1,16 @@
+diff -Naur linux-3.14.79.org/drivers/mmc/core/mmc.c linux-3.14.79/drivers/mmc/core/mmc.c
+--- linux-3.14.79.org/drivers/mmc/core/mmc.c   2016-09-11 10:00:18.000000000 +0200
++++ linux-3.14.79/drivers/mmc/core/mmc.c       2017-01-19 18:15:07.940781595 +0100
+@@ -297,12 +297,6 @@
+       }
+ 
+       card->ext_csd.rev = ext_csd[EXT_CSD_REV];
+-      if (card->ext_csd.rev > 7) {
+-              pr_err("%s: unrecognised EXT_CSD revision %d\n",
+-                      mmc_hostname(card->host), card->ext_csd.rev);
+-              err = -EINVAL;
+-              goto out;
+-      }
+ 
+       card->ext_csd.raw_sectors[0] = ext_csd[EXT_CSD_SEC_CNT + 0];
+       card->ext_csd.raw_sectors[1] = ext_csd[EXT_CSD_SEC_CNT + 1];