diff options
| -rw-r--r-- | PKGBUILD | 13 | ||||
| -rw-r--r-- | config | 14 | ||||
| -rw-r--r-- | config.x86_64 | 12 | ||||
| -rw-r--r-- | poweroff-quirk-workaround.patch | 32 |
4 files changed, 53 insertions, 18 deletions
@@ -6,8 +6,8 @@ pkgbase=linux-macbook # Build kernel with a different name _kernelname=-macbook _srcname=linux-4.7 -pkgver=4.7.2 -pkgrel=2 +pkgver=4.7.3 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.kernel.org/" license=('GPL2') @@ -23,18 +23,20 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz" 'linux-macbook.preset' 'apple-gmux.patch' 'macbook-suspend.patch' + 'poweroff-quirk-workaround.patch' 'intel-pstate-backport.patch' 'change-default-console-loglevel.patch') sha256sums=('5190c3d1209aeda04168145bf50569dc0984f80467159b1dc50ad731e3285f10' 'SKIP' - '031cb0e7b86f2ef2cc4d0dde9d73495f68e8d23e4c41f50f7f95b065ee33a71d' + '826b96e794d325abf430e8d6c3279a21e97e3ec321a3962b9dd6966693b14d88' 'SKIP' - 'd588b025cd5106c3d15b5b2ef89feb1f14d635af3dd2b09994dcb33bb7fdc23c' - 'fb8fdfd81384d98ffe6dd1bfe187639c264f20f6c33834baa4c583442f03571a' + '55083afe584da6218b7db9ce1b7c3c20aef6f31f8c55b53864bcf7d45eb81b26' + '64e99c3339734f7d58e390d71a4dde706640cb0bca857ac4e637b962d50a010d' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' 'bb8af32880059e681396a250d8e78f600f248da8ad4f0e76d7923badb5ee8b42' '4d4a622733c2ba742256f369c32a1e98fc216966589f260c7457d299dbb55971' + '09189eb269a9fd16898cf90a477df23306236fb897791e8d04e5a75d5007bbff' '7094cbcfd657dbc1c17721d4f248f9f98511d803bc4be6d66637388801afdebc' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99') validpgpkeys=( @@ -60,6 +62,7 @@ prepare() { patch -p1 -F3 -i "${srcdir}/apple-gmux.patch" patch -p1 -F3 -i "${srcdir}/macbook-suspend.patch" + patch -p1 -F3 -i "${srcdir}/poweroff-quirk-workaround.patch" patch -p1 -F3 -i "${srcdir}/intel-pstate-backport.patch" if [ "${CARCH}" = "x86_64" ]; then @@ -733,7 +733,7 @@ CONFIG_PCIEASPM_DEFAULT=y # CONFIG_PCIEASPM_POWERSAVE is not set # CONFIG_PCIEASPM_PERFORMANCE is not set CONFIG_PCIE_PME=y -CONFIG_PCIE_DPC=m +CONFIG_PCIE_DPC=y CONFIG_PCI_MSI=y CONFIG_PCI_MSI_IRQ_DOMAIN=y # CONFIG_PCI_DEBUG is not set @@ -1634,7 +1634,7 @@ CONFIG_BT_ATH3K=m CONFIG_BT_WILINK=m CONFIG_AF_RXRPC=m # CONFIG_AF_RXRPC_DEBUG is not set -# CONFIG_RXKAD is not set +CONFIG_RXKAD=y CONFIG_AF_KCM=m CONFIG_FIB_RULES=y CONFIG_WIRELESS=y @@ -2688,8 +2688,8 @@ CONFIG_NETXEN_NIC=m CONFIG_QED=m CONFIG_QED_SRIOV=y CONFIG_QEDE=m -# CONFIG_QEDE_VXLAN is not set -# CONFIG_QEDE_GENEVE is not set +CONFIG_QEDE_VXLAN=y +CONFIG_QEDE_GENEVE=y CONFIG_NET_VENDOR_QUALCOMM=y CONFIG_QCA7000=m CONFIG_NET_VENDOR_REALTEK=y @@ -6063,8 +6063,8 @@ CONFIG_UWB_WHCI=m CONFIG_UWB_I1480U=m CONFIG_MMC=m # CONFIG_MMC_DEBUG is not set -# CONFIG_PWRSEQ_EMMC is not set -# CONFIG_PWRSEQ_SIMPLE is not set +CONFIG_PWRSEQ_EMMC=m +CONFIG_PWRSEQ_SIMPLE=m # # MMC/SD/SDIO Card Drivers @@ -7259,7 +7259,7 @@ CONFIG_EFI_ESRT=y CONFIG_EFI_RUNTIME_MAP=y # CONFIG_EFI_FAKE_MEMMAP is not set CONFIG_EFI_RUNTIME_WRAPPERS=y -# CONFIG_EFI_CAPSULE_LOADER is not set +CONFIG_EFI_CAPSULE_LOADER=m CONFIG_UEFI_CPER=y # diff --git a/config.x86_64 b/config.x86_64 index f341afd05264..fbd7a0227269 100644 --- a/config.x86_64 +++ b/config.x86_64 @@ -745,7 +745,7 @@ CONFIG_PCIEASPM_DEFAULT=y # CONFIG_PCIEASPM_POWERSAVE is not set # CONFIG_PCIEASPM_PERFORMANCE is not set CONFIG_PCIE_PME=y -CONFIG_PCIE_DPC=m +CONFIG_PCIE_DPC=y CONFIG_PCI_BUS_ADDR_T_64BIT=y CONFIG_PCI_MSI=y CONFIG_PCI_MSI_IRQ_DOMAIN=y @@ -1633,7 +1633,7 @@ CONFIG_BT_ATH3K=m CONFIG_BT_WILINK=m CONFIG_AF_RXRPC=m # CONFIG_AF_RXRPC_DEBUG is not set -# CONFIG_RXKAD is not set +CONFIG_RXKAD=y CONFIG_AF_KCM=m CONFIG_FIB_RULES=y CONFIG_WIRELESS=y @@ -2639,8 +2639,8 @@ CONFIG_NETXEN_NIC=m CONFIG_QED=m CONFIG_QED_SRIOV=y CONFIG_QEDE=m -# CONFIG_QEDE_VXLAN is not set -# CONFIG_QEDE_GENEVE is not set +CONFIG_QEDE_VXLAN=y +CONFIG_QEDE_GENEVE=y CONFIG_NET_VENDOR_QUALCOMM=y CONFIG_NET_VENDOR_REALTEK=y CONFIG_ATP=m @@ -5941,7 +5941,7 @@ CONFIG_LEDS_BLINKM=m CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_ONESHOT=m -# CONFIG_LEDS_TRIGGER_MTD is not set +CONFIG_LEDS_TRIGGER_MTD=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LEDS_TRIGGER_BACKLIGHT=m CONFIG_LEDS_TRIGGER_CPU=y @@ -6991,7 +6991,7 @@ CONFIG_EFI_ESRT=y CONFIG_EFI_RUNTIME_MAP=y # CONFIG_EFI_FAKE_MEMMAP is not set CONFIG_EFI_RUNTIME_WRAPPERS=y -# CONFIG_EFI_CAPSULE_LOADER is not set +CONFIG_EFI_CAPSULE_LOADER=m CONFIG_UEFI_CPER=y # diff --git a/poweroff-quirk-workaround.patch b/poweroff-quirk-workaround.patch new file mode 100644 index 000000000000..c43bc4bc131f --- /dev/null +++ b/poweroff-quirk-workaround.patch @@ -0,0 +1,32 @@ +diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c +index 37ff015..47b303a 100644 +--- a/drivers/pci/quirks.c ++++ b/drivers/pci/quirks.c +@@ -2776,6 +2776,27 @@ static void quirk_hotplug_bridge(struct pci_dev *dev) + DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_HINT, 0x0020, quirk_hotplug_bridge); + + /* ++ * Apple: Avoid programming the memory/io aperture of 00:1c.0 ++ * ++ * BIOS does not declare any resource for 00:1c.0, but with ++ * hotplug flag set, thus OS allocate: ++ * [mem 0x7fa00000 - 0x7fbfffff] ++ * [mem 0x7fc00000-0x7fdfffff 64bit pref] ++ * which is conflict with an unreported device, which ++ * causes unpredictable result such as accessing io port. ++ * So clear the hotplug flag to work around it. ++ */ ++static void quirk_apple_mbp_poweroff(struct pci_dev *dev) ++{ ++ if (dmi_match(DMI_BOARD_VENDOR, "Apple Inc.") && ++ dmi_match(DMI_PRODUCT_NAME, "MacBookPro11,4") || ++ dmi_match(DMI_PRODUCT_NAME, "MacBookPro11,5")) ++ dev->is_hotplug_bridge = 0; ++} ++ ++DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x8c10, quirk_apple_mbp_poweroff); ++ ++/* + * This is a quirk for the Ricoh MMC controller found as a part of + * some mulifunction chips. + |