forked from AUR/linux-vfio
4.4-4
This commit is contained in:
Dan Ziemba
parent
67cddd62ab
commit
8181ac0f9f
8
.SRCINFO
8
.SRCINFO
@ -1,8 +1,8 @@
|
||||
# Generated by mksrcinfo v8
|
||||
# Sat Jan 16 16:46:21 UTC 2016
|
||||
# Wed Jan 20 02:11:11 UTC 2016
|
||||
pkgbase = linux-vfio
|
||||
pkgver = 4.4
|
||||
pkgrel = 3
|
||||
pkgrel = 4
|
||||
url = http://www.kernel.org/
|
||||
arch = i686
|
||||
arch = x86_64
|
||||
@ -19,6 +19,8 @@ pkgbase = linux-vfio
|
||||
source = config.x86_64
|
||||
source = linux.preset
|
||||
source = change-default-console-loglevel.patch
|
||||
source = 0001-sdhci-revert.patch
|
||||
source = tpmdd-devel-v3-base-platform-fix-binding-for-drivers-without-probe-callback.patch
|
||||
source = override_for_missing_acs_capabilities.patch
|
||||
source = i915_317.patch
|
||||
sha256sums = 401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2
|
||||
@ -27,6 +29,8 @@ pkgbase = linux-vfio
|
||||
sha256sums = ddeadf2910deb0803d4d4920c4dc7f07d3fb63bca564073aeb5f6181358f20d7
|
||||
sha256sums = f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c
|
||||
sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99
|
||||
sha256sums = 5313df7cb5b4d005422bd4cd0dae956b2dadba8f3db904275aaf99ac53894375
|
||||
sha256sums = ab57037ecee0a425c612babdff47c831378bca0bff063a1308599989a350226d
|
||||
sha256sums = 975f79348119bfba8dd972a9fbfe6b38484c45bfd228f2f6d48a0c02426ba149
|
||||
sha256sums = b5a8eebbe75e1801b35d2f5197eba6f57123c224e09e97a7eb526f1fa58ac918
|
||||
|
||||
|
||||
25
0001-sdhci-revert.patch
Normal file
25
0001-sdhci-revert.patch
Normal file
@ -0,0 +1,25 @@
|
||||
index 2cadf08..b48565e 100644
|
||||
--- a/drivers/mmc/host/sdhci.c
|
||||
+++ b/drivers/mmc/host/sdhci.c
|
||||
@@ -1895,9 +1895,9 @@ static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode)
|
||||
tuning_count = host->tuning_count;
|
||||
|
||||
/*
|
||||
- * The Host Controller needs tuning only in case of SDR104 mode
|
||||
- * and for SDR50 mode when Use Tuning for SDR50 is set in the
|
||||
- * Capabilities register.
|
||||
+ * The Host Controller needs tuning in case of SDR104 and DDR50
|
||||
+ * mode, and for SDR50 mode when Use Tuning for SDR50 is set in
|
||||
+ * the Capabilities register.
|
||||
* If the Host Controller supports the HS200 mode then the
|
||||
* tuning function has to be executed.
|
||||
*/
|
||||
@@ -1917,6 +1917,7 @@ static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode)
|
||||
break;
|
||||
|
||||
case MMC_TIMING_UHS_SDR104:
|
||||
+ case MMC_TIMING_UHS_DDR50:
|
||||
break;
|
||||
|
||||
case MMC_TIMING_UHS_SDR50:
|
||||
generated by cgit v0.11.2 at 2016-01-01 22:11:38 (GMT)
|
||||
15
PKGBUILD
15
PKGBUILD
@ -3,7 +3,7 @@
|
||||
pkgbase=linux-vfio
|
||||
_srcname=linux-4.4
|
||||
pkgver=4.4
|
||||
pkgrel=3
|
||||
pkgrel=4
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://www.kernel.org/"
|
||||
license=('GPL2')
|
||||
@ -18,6 +18,8 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
|
||||
# standard config files for mkinitcpio ramdisk
|
||||
'linux.preset'
|
||||
'change-default-console-loglevel.patch'
|
||||
'0001-sdhci-revert.patch'
|
||||
'tpmdd-devel-v3-base-platform-fix-binding-for-drivers-without-probe-callback.patch'
|
||||
'override_for_missing_acs_capabilities.patch'
|
||||
'i915_317.patch')
|
||||
sha256sums=('401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2'
|
||||
@ -26,6 +28,8 @@ sha256sums=('401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2'
|
||||
'ddeadf2910deb0803d4d4920c4dc7f07d3fb63bca564073aeb5f6181358f20d7'
|
||||
'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
|
||||
'1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
|
||||
'5313df7cb5b4d005422bd4cd0dae956b2dadba8f3db904275aaf99ac53894375'
|
||||
'ab57037ecee0a425c612babdff47c831378bca0bff063a1308599989a350226d'
|
||||
'975f79348119bfba8dd972a9fbfe6b38484c45bfd228f2f6d48a0c02426ba149'
|
||||
'b5a8eebbe75e1801b35d2f5197eba6f57123c224e09e97a7eb526f1fa58ac918')
|
||||
validpgpkeys=(
|
||||
@ -44,6 +48,15 @@ prepare() {
|
||||
# add latest fixes from stable queue, if needed
|
||||
# http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
|
||||
|
||||
# revert http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=9faac7b95ea4f9e83b7a914084cc81ef1632fd91
|
||||
# fixes #47778 sdhci broken on some boards
|
||||
# https://bugzilla.kernel.org/show_bug.cgi?id=106541
|
||||
patch -Rp1 -i "${srcdir}/0001-sdhci-revert.patch"
|
||||
|
||||
# fixes #47805 kernel panics on platform modules
|
||||
# https://bugzilla.kernel.org/show_bug.cgi?id=110751
|
||||
patch -Np1 -i "${srcdir}/tpmdd-devel-v3-base-platform-fix-binding-for-drivers-without-probe-callback.patch"
|
||||
|
||||
# set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
|
||||
# remove this when a Kconfig knob is made available by upstream
|
||||
# (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
|
||||
|
||||
@ -0,0 +1,24 @@
|
||||
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
|
||||
index 1dd6d3b..176b59f 100644
|
||||
--- a/drivers/base/platform.c
|
||||
+++ b/drivers/base/platform.c
|
||||
@@ -513,10 +513,15 @@ static int platform_drv_probe(struct device *_dev)
|
||||
return ret;
|
||||
|
||||
ret = dev_pm_domain_attach(_dev, true);
|
||||
- if (ret != -EPROBE_DEFER && drv->probe) {
|
||||
- ret = drv->probe(dev);
|
||||
- if (ret)
|
||||
- dev_pm_domain_detach(_dev, true);
|
||||
+ if (ret != -EPROBE_DEFER) {
|
||||
+ if (drv->probe) {
|
||||
+ ret = drv->probe(dev);
|
||||
+ if (ret)
|
||||
+ dev_pm_domain_detach(_dev, true);
|
||||
+ } else {
|
||||
+ /* don't fail if just dev_pm_domain_attach failed */
|
||||
+ ret = 0;
|
||||
+ }
|
||||
}
|
||||
|
||||
if (drv->prevent_deferred_probe && ret == -EPROBE_DEFER) {
|
||||
Loading…
Reference in New Issue
Block a user