From b0d8b6c41cf092e01e546ae30d5a150a218ace69 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 27 Nov 2018 10:47:59 +0000 Subject: [PATCH 01/13] enable Amlogic Meson GX series pinctrl drivers for arm64 --- configs/fedora/generic/CONFIG_PINCTRL_MESON_GXBB | 1 - configs/fedora/generic/CONFIG_PINCTRL_MESON_GXL | 1 - configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_MESON_GXBB | 1 + configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_MESON_GXL | 1 + kernel-aarch64-debug.config | 4 ++-- kernel-aarch64.config | 4 ++-- kernel-armv7hl-debug.config | 2 -- kernel-armv7hl-lpae-debug.config | 2 -- kernel-armv7hl-lpae.config | 2 -- kernel-armv7hl.config | 2 -- kernel-i686-debug.config | 2 -- kernel-i686.config | 2 -- kernel-ppc64le-debug.config | 2 -- kernel-ppc64le.config | 2 -- kernel-s390x-debug.config | 2 -- kernel-s390x.config | 2 -- kernel-x86_64-debug.config | 2 -- kernel-x86_64.config | 2 -- 18 files changed, 6 insertions(+), 30 deletions(-) delete mode 100644 configs/fedora/generic/CONFIG_PINCTRL_MESON_GXBB delete mode 100644 configs/fedora/generic/CONFIG_PINCTRL_MESON_GXL create mode 100644 configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_MESON_GXBB create mode 100644 configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_MESON_GXL diff --git a/configs/fedora/generic/CONFIG_PINCTRL_MESON_GXBB b/configs/fedora/generic/CONFIG_PINCTRL_MESON_GXBB deleted file mode 100644 index 1c1b910ae..000000000 --- a/configs/fedora/generic/CONFIG_PINCTRL_MESON_GXBB +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_PINCTRL_MESON_GXBB is not set diff --git a/configs/fedora/generic/CONFIG_PINCTRL_MESON_GXL b/configs/fedora/generic/CONFIG_PINCTRL_MESON_GXL deleted file mode 100644 index 5e0dcb654..000000000 --- a/configs/fedora/generic/CONFIG_PINCTRL_MESON_GXL +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_PINCTRL_MESON_GXL is not set diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_MESON_GXBB b/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_MESON_GXBB new file mode 100644 index 000000000..b64b69064 --- /dev/null +++ b/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_MESON_GXBB @@ -0,0 +1 @@ +CONFIG_PINCTRL_MESON_GXBB=y diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_MESON_GXL b/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_MESON_GXL new file mode 100644 index 000000000..50fc3e35a --- /dev/null +++ b/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_MESON_GXL @@ -0,0 +1 @@ +CONFIG_PINCTRL_MESON_GXL=y diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 3c01292c0..3cb056fba 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -4393,8 +4393,8 @@ CONFIG_PINCTRL_MAX77620=m # CONFIG_PINCTRL_MESON8 is not set CONFIG_PINCTRL_MESON_AXG=y CONFIG_PINCTRL_MESON_G12A=y -# CONFIG_PINCTRL_MESON_GXBB is not set -# CONFIG_PINCTRL_MESON_GXL is not set +CONFIG_PINCTRL_MESON_GXBB=y +CONFIG_PINCTRL_MESON_GXL=y # CONFIG_PINCTRL_MSM8660 is not set CONFIG_PINCTRL_MSM8916=y # CONFIG_PINCTRL_MSM8960 is not set diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 8b449689d..a26ed74fa 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -4372,8 +4372,8 @@ CONFIG_PINCTRL_MAX77620=m # CONFIG_PINCTRL_MESON8 is not set CONFIG_PINCTRL_MESON_AXG=y CONFIG_PINCTRL_MESON_G12A=y -# CONFIG_PINCTRL_MESON_GXBB is not set -# CONFIG_PINCTRL_MESON_GXL is not set +CONFIG_PINCTRL_MESON_GXBB=y +CONFIG_PINCTRL_MESON_GXL=y # CONFIG_PINCTRL_MSM8660 is not set CONFIG_PINCTRL_MSM8916=y # CONFIG_PINCTRL_MSM8960 is not set diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 4ae589a0d..da015a4af 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -4637,8 +4637,6 @@ CONFIG_PINCTRL_IMX6SL=y # CONFIG_PINCTRL_MDM9615 is not set # CONFIG_PINCTRL_MESON8B is not set # CONFIG_PINCTRL_MESON8 is not set -# CONFIG_PINCTRL_MESON_GXBB is not set -# CONFIG_PINCTRL_MESON_GXL is not set CONFIG_PINCTRL_MSM8660=m CONFIG_PINCTRL_MSM8916=m CONFIG_PINCTRL_MSM8960=m diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 12dbceccb..0be7f93ca 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -4413,8 +4413,6 @@ CONFIG_PINCTRL_DOVE=y # CONFIG_PINCTRL_MDM9615 is not set # CONFIG_PINCTRL_MESON8B is not set # CONFIG_PINCTRL_MESON8 is not set -# CONFIG_PINCTRL_MESON_GXBB is not set -# CONFIG_PINCTRL_MESON_GXL is not set # CONFIG_PINCTRL_MSM8994 is not set # CONFIG_PINCTRL_MSM8996 is not set CONFIG_PINCTRL_MSM8998=m diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 13dce1e14..43fcb7d8b 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -4393,8 +4393,6 @@ CONFIG_PINCTRL_DOVE=y # CONFIG_PINCTRL_MDM9615 is not set # CONFIG_PINCTRL_MESON8B is not set # CONFIG_PINCTRL_MESON8 is not set -# CONFIG_PINCTRL_MESON_GXBB is not set -# CONFIG_PINCTRL_MESON_GXL is not set # CONFIG_PINCTRL_MSM8994 is not set # CONFIG_PINCTRL_MSM8996 is not set CONFIG_PINCTRL_MSM8998=m diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 04fa47295..dea404d2a 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -4617,8 +4617,6 @@ CONFIG_PINCTRL_IMX6SL=y # CONFIG_PINCTRL_MDM9615 is not set # CONFIG_PINCTRL_MESON8B is not set # CONFIG_PINCTRL_MESON8 is not set -# CONFIG_PINCTRL_MESON_GXBB is not set -# CONFIG_PINCTRL_MESON_GXL is not set CONFIG_PINCTRL_MSM8660=m CONFIG_PINCTRL_MSM8916=m CONFIG_PINCTRL_MSM8960=m diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 71702fbb5..4beb3b1e4 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -4190,8 +4190,6 @@ CONFIG_PINCTRL_ICELAKE=m # CONFIG_PINCTRL_IPQ8074 is not set CONFIG_PINCTRL_LEWISBURG=m # CONFIG_PINCTRL_MCP23S08 is not set -# CONFIG_PINCTRL_MESON_GXBB is not set -# CONFIG_PINCTRL_MESON_GXL is not set # CONFIG_PINCTRL_QCS404 is not set CONFIG_PINCTRL_RK805=m # CONFIG_PINCTRL_SDM660 is not set diff --git a/kernel-i686.config b/kernel-i686.config index e25738ad2..29ca874d0 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -4170,8 +4170,6 @@ CONFIG_PINCTRL_ICELAKE=m # CONFIG_PINCTRL_IPQ8074 is not set CONFIG_PINCTRL_LEWISBURG=m # CONFIG_PINCTRL_MCP23S08 is not set -# CONFIG_PINCTRL_MESON_GXBB is not set -# CONFIG_PINCTRL_MESON_GXL is not set # CONFIG_PINCTRL_QCS404 is not set CONFIG_PINCTRL_RK805=m # CONFIG_PINCTRL_SDM660 is not set diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 3609079ca..efa16f89c 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -3904,8 +3904,6 @@ CONFIG_PINCTRL_CEDARFORK=m # CONFIG_PINCTRL_IPQ8074 is not set # CONFIG_PINCTRL is not set # CONFIG_PINCTRL_MCP23S08 is not set -# CONFIG_PINCTRL_MESON_GXBB is not set -# CONFIG_PINCTRL_MESON_GXL is not set # CONFIG_PINCTRL_QCS404 is not set CONFIG_PINCTRL_RK805=m # CONFIG_PINCTRL_SDM660 is not set diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index fde0cee38..845d49b48 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -3882,8 +3882,6 @@ CONFIG_PINCTRL_CEDARFORK=m # CONFIG_PINCTRL_IPQ8074 is not set # CONFIG_PINCTRL is not set # CONFIG_PINCTRL_MCP23S08 is not set -# CONFIG_PINCTRL_MESON_GXBB is not set -# CONFIG_PINCTRL_MESON_GXL is not set # CONFIG_PINCTRL_QCS404 is not set CONFIG_PINCTRL_RK805=m # CONFIG_PINCTRL_SDM660 is not set diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index ffffe917f..0e40b4a29 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -3835,8 +3835,6 @@ CONFIG_PINCTRL_CEDARFORK=m # CONFIG_PINCTRL_IPQ8074 is not set # CONFIG_PINCTRL is not set # CONFIG_PINCTRL_MCP23S08 is not set -# CONFIG_PINCTRL_MESON_GXBB is not set -# CONFIG_PINCTRL_MESON_GXL is not set # CONFIG_PINCTRL_QCS404 is not set CONFIG_PINCTRL_RK805=m # CONFIG_PINCTRL_SDM660 is not set diff --git a/kernel-s390x.config b/kernel-s390x.config index 9885a593d..aa6d4011f 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -3813,8 +3813,6 @@ CONFIG_PINCTRL_CEDARFORK=m # CONFIG_PINCTRL_IPQ8074 is not set # CONFIG_PINCTRL is not set # CONFIG_PINCTRL_MCP23S08 is not set -# CONFIG_PINCTRL_MESON_GXBB is not set -# CONFIG_PINCTRL_MESON_GXL is not set # CONFIG_PINCTRL_QCS404 is not set CONFIG_PINCTRL_RK805=m # CONFIG_PINCTRL_SDM660 is not set diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index c6957e197..5661b8133 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -4228,8 +4228,6 @@ CONFIG_PINCTRL_ICELAKE=m # CONFIG_PINCTRL_IPQ8074 is not set CONFIG_PINCTRL_LEWISBURG=m # CONFIG_PINCTRL_MCP23S08 is not set -# CONFIG_PINCTRL_MESON_GXBB is not set -# CONFIG_PINCTRL_MESON_GXL is not set # CONFIG_PINCTRL_QCS404 is not set CONFIG_PINCTRL_RK805=m # CONFIG_PINCTRL_SDM660 is not set diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 76734e468..3755c9241 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -4208,8 +4208,6 @@ CONFIG_PINCTRL_ICELAKE=m # CONFIG_PINCTRL_IPQ8074 is not set CONFIG_PINCTRL_LEWISBURG=m # CONFIG_PINCTRL_MCP23S08 is not set -# CONFIG_PINCTRL_MESON_GXBB is not set -# CONFIG_PINCTRL_MESON_GXL is not set # CONFIG_PINCTRL_QCS404 is not set CONFIG_PINCTRL_RK805=m # CONFIG_PINCTRL_SDM660 is not set From 1288f313f9dde43c12a7f3bb3b82d7515838217e Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 28 Nov 2018 15:44:05 -0600 Subject: [PATCH 02/13] Linux v4.20-rc4-35-g121b018f8c74 --- gitrev | 2 +- hwmon-rpi-Fix-initial-notify.patch | 112 ----------------------------- kernel.spec | 11 +-- sources | 1 + 4 files changed, 8 insertions(+), 118 deletions(-) delete mode 100644 hwmon-rpi-Fix-initial-notify.patch diff --git a/gitrev b/gitrev index b6f51a307..7d9b01d7d 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -2e6e902d185027f8e3cb8b7305238f7e35d6a436 +121b018f8c74b4e0ba81b4b8ee73a82db3f24b7b diff --git a/hwmon-rpi-Fix-initial-notify.patch b/hwmon-rpi-Fix-initial-notify.patch deleted file mode 100644 index eb6ad7c78..000000000 --- a/hwmon-rpi-Fix-initial-notify.patch +++ /dev/null @@ -1,112 +0,0 @@ -From patchwork Sun Nov 11 12:01:11 2018 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 8bit -X-Patchwork-Submitter: Stefan Wahren -X-Patchwork-Id: 10677591 -Return-Path: -Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org - [172.30.200.125]) - by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1554014DB - for ; - Sun, 11 Nov 2018 12:02:21 +0000 (UTC) -Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) - by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EF81F2AAE1 - for ; - Sun, 11 Nov 2018 12:02:20 +0000 (UTC) -Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) - id DD04A2AAF4; Sun, 11 Nov 2018 12:02:20 +0000 (UTC) -X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on - pdx-wl-mail.web.codeaurora.org -X-Spam-Level: -X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, - RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 -Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) - by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4F86D2AAE1 - for ; - Sun, 11 Nov 2018 12:02:20 +0000 (UTC) -Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand - id S1727510AbeKKVum (ORCPT - ); - Sun, 11 Nov 2018 16:50:42 -0500 -Received: from mout.kundenserver.de ([212.227.17.13]:56911 "EHLO - mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org - with ESMTP id S1727492AbeKKVum (ORCPT - ); - Sun, 11 Nov 2018 16:50:42 -0500 -Received: from localhost.localdomain ([37.4.249.153]) by - mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) - id 1N5W0q-1fPBCS2EFm-016xot; Sun, 11 Nov 2018 13:01:38 +0100 -From: Stefan Wahren -To: Eric Anholt , - Florian Fainelli , - Jean Delvare , - Guenter Roeck , - Greg Kroah-Hartman -Cc: linux-rpi-kernel@lists.infradead.org, linux-hwmon@vger.kernel.org, - linux-kernel@vger.kernel.org, - Stefan Wahren -Subject: [PATCH] hwmon: rpi: Fix initial notify -Date: Sun, 11 Nov 2018 13:01:11 +0100 -Message-Id: <1541937671-26385-1-git-send-email-stefan.wahren@i2se.com> -X-Mailer: git-send-email 2.7.4 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -X-Provags-ID: V03:K1:HEVIdEl0kizgBdNf0M5wstvyz7s6HdToU1mddQPsbGgHjkiBWSZ - SKazwNvgO6cbViYoUW17vGwM+wtH3UvfMleX6l3XXOJUwGoJIZP7C9iMFyqzOhl1AlaWRQ+ - nGjpMnsO6ZoiSjYhxMPB911ALciozsvmmLqnauqOofp2A/Y1/Tcfzfrv2IhQJICMhDSNaco - akAN1etmFdi29Cdupykhw== -X-UI-Out-Filterresults: notjunk:1;V01:K0:tzezqudV+18=:I+avf+CPQCA+RPEHvwv55R - iJN07WrrHGCkxDyTa1k+J8anYCg6oDlByPsB4O51GNXOi1XH2wPejZd6QJflDwV0IjWsd1mfU - xmQwbUh5YsPt6czgCadtNhv89tCiiHGxGyLiNjZpXICCRYxcY9szc+T27wAi6tAeQsahSk7Zc - P7+RqK/K3qtckuZiInGDWLzDvbMkItVWmxB/86m6NH4QbXCqJo/m0F6yZWCq1t/ocW/NmK9nH - 3sFSBLGNA+DGHqRLq1Tp+a+Xf1XuQlWwVYusgY3z9tNBdbTG9fQhBwac+oBJ+ZnF8S5WtdcSk - T31iv44dd2DkPTXqRuzSBWKnMQIZbabtWOYI9paJgywle7kdbJJlWx/kHONkEeKdjM7+MCUVn - 9iAWGJiu9tZ+i+FxYqUlLGOlZZW/sJiXzizD+WQYXdDiNh9lU2926j9Ydc+vF5fF1DzwaLsTf - 7cvqwTu8gBFVOffZhsHT5+loV6D5WvJjY3JUPmhraz4ioeagBG6+s34gN3LtPYnUYNJO/Cd3Z - CLnkDRAoKUNCeqhqsifSzcy49XV5h8YPrkSBWWBek7gAzU/DVI1mXLgcESMoe77NdlLeCqLUm - 0W+phul1X1/9/WPqPkr6j9E7MjgIbo7XcPtmy+treFmpnZWz5766NVHRJ+RPCN9RVFocCcILy - +n2ryGG9Llo5cGCbUU+eSWsigfVGTGmQzvatSRpt262UKg3EyZrqtedY+GLnKMMvAqra/GKvs - 0SObqg+2lnFLxgOSq/dM7hz7QuKk2JFmfuuXu0T+aMTpc9ZZx90sE6kMjBz8cF+hBFutqehUk - 10cHzngQFaS21pN/PQ2gpU1ZlGFfqQ3gEjQz8zF7KGhTS5FiYY= -Sender: linux-hwmon-owner@vger.kernel.org -Precedence: bulk -List-ID: -X-Mailing-List: linux-hwmon@vger.kernel.org -X-Virus-Scanned: ClamAV using ClamSMTP - -In case an under-voltage happens before probing the driver wont -write the critical warning into the kernel log. So don't init -of last_throttled during probe and fix this issue. - -Fixes: 74d1e007915f ("hwmon: Add support for RPi voltage sensor") -Reported-by: "Noralf Trønnes" -Signed-off-by: Stefan Wahren ---- - drivers/hwmon/raspberrypi-hwmon.c | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/drivers/hwmon/raspberrypi-hwmon.c b/drivers/hwmon/raspberrypi-hwmon.c -index be5ba46..0d04572 100644 ---- a/drivers/hwmon/raspberrypi-hwmon.c -+++ b/drivers/hwmon/raspberrypi-hwmon.c -@@ -115,7 +115,6 @@ static int rpi_hwmon_probe(struct platform_device *pdev) - { - struct device *dev = &pdev->dev; - struct rpi_hwmon_data *data; -- int ret; - - data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL); - if (!data) -@@ -124,11 +123,6 @@ static int rpi_hwmon_probe(struct platform_device *pdev) - /* Parent driver assure that firmware is correct */ - data->fw = dev_get_drvdata(dev->parent); - -- /* Init throttled */ -- ret = rpi_firmware_property(data->fw, RPI_FIRMWARE_GET_THROTTLED, -- &data->last_throttled, -- sizeof(data->last_throttled)); -- - data->hwmon_dev = devm_hwmon_device_register_with_info(dev, "rpi_volt", - data, - &rpi_chip_info, diff --git a/kernel.spec b/kernel.spec index 1d7f61cb6..d57af3a6a 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 4 # The git snapshot level -%define gitrev 0 +%define gitrev 1 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -122,7 +122,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 # Kernel headers are being split out into a separate package %if 0%{?fedora} @@ -586,9 +586,6 @@ Patch331: bcm283x-drm-vc4-set-is_yuv-to-false-when-num_planes-1.patch # https://patchwork.kernel.org/patch/10686407/ Patch332: raspberrypi-Fix-firmware-calls-with-large-buffers.patch -# https://patchwork.kernel.org/patch/10677591/ -Patch333: hwmon-rpi-Fix-initial-notify.patch - # Patches enabling device specific brcm firmware nvram # https://www.spinics.net/lists/linux-wireless/msg178827.html Patch340: brcmfmac-Remove-firmware-loading-code-duplication.patch @@ -1883,6 +1880,10 @@ fi # # %changelog +* Wed Nov 28 2018 Justin M. Forbes - 4.20.0-0.rc4.git1.1 +- Linux v4.20-rc4-35-g121b018f8c74 +- Reenable debugging options. + * Mon Nov 26 2018 Justin M. Forbes - 4.20.0-0.rc4.git0.1 - Linux v4.20-rc4 - Disable debugging options. diff --git a/sources b/sources index 16902e5ec..f8f07dea8 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ SHA512 (linux-4.19.tar.xz) = ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4 SHA512 (patch-4.20-rc4.xz) = 6cd5063110b286fa61f0d96ca675d5235debe7ac9e21ce2d709bdb299af897448048650e7d5497b9b2de474c42b120f89ed6cc5b5d38f71762263ad5a8ee9999 +SHA512 (patch-4.20-rc4-git1.xz) = 1279689ea4090d75ef7deb5a5b9a10152bded506c655a3746cd8efa30c9431fb26065720153e94911a76e292a8c58be24e8508fa93cda4ccc940eaed7fa41157 From 7f66c536530505c1558e53f9d7e9c19b755bed85 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Fri, 30 Nov 2018 10:04:13 -0600 Subject: [PATCH 03/13] Linux v4.20-rc4-156-g94f371cb7394 --- gitrev | 2 +- kernel-i686-debug.config | 1 + kernel-i686.config | 1 + kernel-x86_64-debug.config | 1 + kernel-x86_64.config | 1 + kernel.spec | 5 ++++- sources | 2 +- 7 files changed, 10 insertions(+), 3 deletions(-) diff --git a/gitrev b/gitrev index 7d9b01d7d..641166a04 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -121b018f8c74b4e0ba81b4b8ee73a82db3f24b7b +94f371cb73944b410a269d570d6946c042f2ddd0 diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 4beb3b1e4..d62f0c8e2 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -5356,6 +5356,7 @@ CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m +CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y CONFIG_SND_SOC_INTEL_SKYLAKE=m CONFIG_SND_SOC_INTEL_SST_ACPI=m CONFIG_SND_SOC_INTEL_SST=m diff --git a/kernel-i686.config b/kernel-i686.config index 29ca874d0..779de80f9 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -5334,6 +5334,7 @@ CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m +CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y CONFIG_SND_SOC_INTEL_SKYLAKE=m CONFIG_SND_SOC_INTEL_SST_ACPI=m CONFIG_SND_SOC_INTEL_SST=m diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 5661b8133..5f4c56754 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -5399,6 +5399,7 @@ CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m +CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y CONFIG_SND_SOC_INTEL_SKYLAKE=m CONFIG_SND_SOC_INTEL_SST_ACPI=m CONFIG_SND_SOC_INTEL_SST=m diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 3755c9241..5127faddf 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -5377,6 +5377,7 @@ CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m +CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y CONFIG_SND_SOC_INTEL_SKYLAKE=m CONFIG_SND_SOC_INTEL_SST_ACPI=m CONFIG_SND_SOC_INTEL_SST=m diff --git a/kernel.spec b/kernel.spec index d57af3a6a..2156f24c6 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 4 # The git snapshot level -%define gitrev 1 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -1880,6 +1880,9 @@ fi # # %changelog +* Fri Nov 30 2018 Justin M. Forbes - 4.20.0-0.rc4.git2.1 +- Linux v4.20-rc4-156-g94f371cb7394 + * Wed Nov 28 2018 Justin M. Forbes - 4.20.0-0.rc4.git1.1 - Linux v4.20-rc4-35-g121b018f8c74 - Reenable debugging options. diff --git a/sources b/sources index f8f07dea8..870a2fbab 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (linux-4.19.tar.xz) = ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4 SHA512 (patch-4.20-rc4.xz) = 6cd5063110b286fa61f0d96ca675d5235debe7ac9e21ce2d709bdb299af897448048650e7d5497b9b2de474c42b120f89ed6cc5b5d38f71762263ad5a8ee9999 -SHA512 (patch-4.20-rc4-git1.xz) = 1279689ea4090d75ef7deb5a5b9a10152bded506c655a3746cd8efa30c9431fb26065720153e94911a76e292a8c58be24e8508fa93cda4ccc940eaed7fa41157 +SHA512 (patch-4.20-rc4-git2.xz) = 99b2e09f1378a48431faf341c3dbdb1d39c6799c7edef8bf89904ad8fceb845676f3d2404f0be26148124ca86e9755dd572c67452ab53a1d49a8bae043a3c419 From f8216ee47abe1997e9fc7efb3d819d6105d898f5 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 30 Nov 2018 14:05:53 -0500 Subject: [PATCH 04/13] Enable CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT This makes it so users don't have to do mem_encrypt=1 to enable SEV VMs. Signed-off-by: Peter Jones --- .../generic/x86/x86_64/CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT | 2 +- kernel-x86_64-debug.config | 2 +- kernel-x86_64.config | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/fedora/generic/x86/x86_64/CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT b/configs/fedora/generic/x86/x86_64/CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT index e41f0cf8f..be1de779f 100644 --- a/configs/fedora/generic/x86/x86_64/CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT +++ b/configs/fedora/generic/x86/x86_64/CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT @@ -1 +1 @@ -# CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT is not set +CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT=y diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 5f4c56754..39be4b932 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -215,7 +215,7 @@ CONFIG_AMD8111_ETH=m # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_IOMMU_V2=m CONFIG_AMD_IOMMU=y -# CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT is not set +CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT=y CONFIG_AMD_MEM_ENCRYPT=y CONFIG_AMD_NUMA=y CONFIG_AMD_PHY=m diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 5127faddf..6eabdf973 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -215,7 +215,7 @@ CONFIG_AMD8111_ETH=m # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_IOMMU_V2=m CONFIG_AMD_IOMMU=y -# CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT is not set +CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT=y CONFIG_AMD_MEM_ENCRYPT=y CONFIG_AMD_NUMA=y CONFIG_AMD_PHY=m From fe9e33a8873b2c30e54ac7b1f34e8aab081f35cf Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 30 Nov 2018 14:36:02 -0500 Subject: [PATCH 05/13] Re-enable CONFIG_CRYPTO_DEV_SP_PSP so I can work on SEV stuff. Waaay back in October, we saw some issues with various system firmware talking to the AMD SP PSP devices (the secure processor feature), and so CONFIG_CRYPTO_DEV_SP_PSP got disabled in all of our kernel trees, as Laura noted here: https://bugzilla.redhat.com/show_bug.cgi?id=1608242#c44 . I'm trying to use it, and this obviously makes that impossible to do, so I'm going to re-enable it in rawhide, because the timeout that's being discussed in that bugzilla thread is already there, and so this firmware bugs people saw before shouldn't make things completely unusable. If you *do* see debilitating stalls on AMD EPYC hardware starting after the next rawhide build, make some noise so we can disable it again. (I've also posted this to kernel@l.fp.o: https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org/thread/22XCMRU4R75M4D5OSXE7YMWYVOBQIU2M/ ) Signed-off-by: Peter Jones --- configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_DEV_SP_PSP | 2 +- kernel-x86_64-debug.config | 2 +- kernel-x86_64.config | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_DEV_SP_PSP b/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_DEV_SP_PSP index ee59b965f..7b0c6490a 100644 --- a/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_DEV_SP_PSP +++ b/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_DEV_SP_PSP @@ -1 +1 @@ -# CONFIG_CRYPTO_DEV_SP_PSP is not set +CONFIG_CRYPTO_DEV_SP_PSP=y diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 39be4b932..6f1034377 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -976,7 +976,7 @@ CONFIG_CRYPTO_DEV_QAT_C62XVF=m CONFIG_CRYPTO_DEV_QAT_DH895xCC=m CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m # CONFIG_CRYPTO_DEV_SP_CCP is not set -# CONFIG_CRYPTO_DEV_SP_PSP is not set +CONFIG_CRYPTO_DEV_SP_PSP=y CONFIG_CRYPTO_DEV_VIRTIO=m CONFIG_CRYPTO_DH=y CONFIG_CRYPTO_DRBG_CTR=y diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 6eabdf973..5dd8d004c 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -975,7 +975,7 @@ CONFIG_CRYPTO_DEV_QAT_C62XVF=m CONFIG_CRYPTO_DEV_QAT_DH895xCC=m CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m # CONFIG_CRYPTO_DEV_SP_CCP is not set -# CONFIG_CRYPTO_DEV_SP_PSP is not set +CONFIG_CRYPTO_DEV_SP_PSP=y CONFIG_CRYPTO_DEV_VIRTIO=m CONFIG_CRYPTO_DH=y CONFIG_CRYPTO_DRBG_CTR=y From b9bb3eb2c708782789133d8fdd71fc6552d3dcee Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 3 Dec 2018 07:29:43 +0000 Subject: [PATCH 06/13] minor config cleanups --- configs/fedora/generic/CONFIG_IR_IMG | 1 - configs/fedora/generic/CONFIG_SND_SOC_HDAC_HDA | 1 + .../fedora/generic/CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC | 1 + configs/fedora/generic/{ => x86}/CONFIG_SND_PCSP | 0 kernel-aarch64-debug.config | 4 ++-- kernel-aarch64.config | 4 ++-- kernel-armv7hl-debug.config | 4 ++-- kernel-armv7hl-lpae-debug.config | 4 ++-- kernel-armv7hl-lpae.config | 4 ++-- kernel-armv7hl.config | 4 ++-- kernel-i686-debug.config | 2 +- kernel-i686.config | 2 +- kernel-ppc64le-debug.config | 4 ++-- kernel-ppc64le.config | 4 ++-- kernel-s390x-debug.config | 4 ++-- kernel-s390x.config | 4 ++-- kernel-x86_64-debug.config | 2 +- kernel-x86_64.config | 2 +- 18 files changed, 26 insertions(+), 25 deletions(-) delete mode 100644 configs/fedora/generic/CONFIG_IR_IMG create mode 100644 configs/fedora/generic/CONFIG_SND_SOC_HDAC_HDA create mode 100644 configs/fedora/generic/CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC rename configs/fedora/generic/{ => x86}/CONFIG_SND_PCSP (100%) diff --git a/configs/fedora/generic/CONFIG_IR_IMG b/configs/fedora/generic/CONFIG_IR_IMG deleted file mode 100644 index 392034a18..000000000 --- a/configs/fedora/generic/CONFIG_IR_IMG +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_IR_IMG is not set diff --git a/configs/fedora/generic/CONFIG_SND_SOC_HDAC_HDA b/configs/fedora/generic/CONFIG_SND_SOC_HDAC_HDA new file mode 100644 index 000000000..b5009c40d --- /dev/null +++ b/configs/fedora/generic/CONFIG_SND_SOC_HDAC_HDA @@ -0,0 +1 @@ +CONFIG_SND_SOC_HDAC_HDA=m diff --git a/configs/fedora/generic/CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC b/configs/fedora/generic/CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC new file mode 100644 index 000000000..e109ab25a --- /dev/null +++ b/configs/fedora/generic/CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC @@ -0,0 +1 @@ +CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y diff --git a/configs/fedora/generic/CONFIG_SND_PCSP b/configs/fedora/generic/x86/CONFIG_SND_PCSP similarity index 100% rename from configs/fedora/generic/CONFIG_SND_PCSP rename to configs/fedora/generic/x86/CONFIG_SND_PCSP diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 3cb056fba..40cc994dd 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -2657,7 +2657,6 @@ CONFIG_IR_GPIO_TX=m CONFIG_IR_HIX5HD2=m CONFIG_IR_IGORPLUGUSB=m CONFIG_IR_IGUANA=m -# CONFIG_IR_IMG is not set CONFIG_IR_IMON_DECODER=m CONFIG_IR_IMON=m CONFIG_IR_IMON_RAW=m @@ -5599,7 +5598,6 @@ CONFIG_SND_PCI=y CONFIG_SND_PCM_OSS=m CONFIG_SND_PCM_OSS_PLUGINS=y CONFIG_SND_PCM_XRUN_DEBUG=y -CONFIG_SND_PCSP=m CONFIG_SND_PCXHR=m CONFIG_SND_PORTMAN2X4=m CONFIG_SND_RIPTIDE=m @@ -5669,12 +5667,14 @@ CONFIG_SND_SOC_ES8328_SPI=m # CONFIG_SND_SOC_FSL_SSI is not set CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y # CONFIG_SND_SOC_GTM601 is not set +CONFIG_SND_SOC_HDAC_HDA=m CONFIG_SND_SOC_HDAC_HDMI=m CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_IMG is not set # CONFIG_SND_SOC_IMX_AUDMUX is not set # CONFIG_SND_SOC_IMX_ES8328 is not set # CONFIG_SND_SOC_INNO_RK3036 is not set +CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y CONFIG_SND_SOC=m CONFIG_SND_SOC_MAX9759=m CONFIG_SND_SOC_MAX98088=m diff --git a/kernel-aarch64.config b/kernel-aarch64.config index a26ed74fa..e259613bf 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -2640,7 +2640,6 @@ CONFIG_IR_GPIO_TX=m CONFIG_IR_HIX5HD2=m CONFIG_IR_IGORPLUGUSB=m CONFIG_IR_IGUANA=m -# CONFIG_IR_IMG is not set CONFIG_IR_IMON_DECODER=m CONFIG_IR_IMON=m CONFIG_IR_IMON_RAW=m @@ -5576,7 +5575,6 @@ CONFIG_SND_PCI=y # CONFIG_SND_PCMCIA is not set CONFIG_SND_PCM_OSS=m CONFIG_SND_PCM_OSS_PLUGINS=y -CONFIG_SND_PCSP=m CONFIG_SND_PCXHR=m CONFIG_SND_PORTMAN2X4=m CONFIG_SND_RIPTIDE=m @@ -5646,12 +5644,14 @@ CONFIG_SND_SOC_ES8328_SPI=m # CONFIG_SND_SOC_FSL_SSI is not set CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y # CONFIG_SND_SOC_GTM601 is not set +CONFIG_SND_SOC_HDAC_HDA=m CONFIG_SND_SOC_HDAC_HDMI=m CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_IMG is not set # CONFIG_SND_SOC_IMX_AUDMUX is not set # CONFIG_SND_SOC_IMX_ES8328 is not set # CONFIG_SND_SOC_INNO_RK3036 is not set +CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y CONFIG_SND_SOC=m CONFIG_SND_SOC_MAX9759=m CONFIG_SND_SOC_MAX98088=m diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index da015a4af..350c47bc0 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -2784,7 +2784,6 @@ CONFIG_IR_GPIO_TX=m CONFIG_IR_HIX5HD2=m CONFIG_IR_IGORPLUGUSB=m CONFIG_IR_IGUANA=m -# CONFIG_IR_IMG is not set CONFIG_IR_IMON_DECODER=m CONFIG_IR_IMON=m CONFIG_IR_IMON_RAW=m @@ -5923,7 +5922,6 @@ CONFIG_SND_PCI=y CONFIG_SND_PCM_OSS=m CONFIG_SND_PCM_OSS_PLUGINS=y CONFIG_SND_PCM_XRUN_DEBUG=y -CONFIG_SND_PCSP=m CONFIG_SND_PCXHR=m CONFIG_SND_PORTMAN2X4=m CONFIG_SND_PXA910_SOC=m @@ -6003,6 +6001,7 @@ CONFIG_SND_SOC_FSL_SSI=m CONFIG_SND_SOC_FSL_UTILS=m CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y # CONFIG_SND_SOC_GTM601 is not set +CONFIG_SND_SOC_HDAC_HDA=m CONFIG_SND_SOC_HDAC_HDMI=m CONFIG_SND_SOC_HDMI_CODEC=m CONFIG_SND_SOC_I2C_AND_SPI=m @@ -6016,6 +6015,7 @@ CONFIG_SND_SOC_IMX_SGTL5000=m CONFIG_SND_SOC_IMX_SPDIF=m CONFIG_SND_SOC_IMX_SSI=m # CONFIG_SND_SOC_INNO_RK3036 is not set +CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y CONFIG_SND_SOC_LPASS_CPU=m CONFIG_SND_SOC_LPASS_PLATFORM=m CONFIG_SND_SOC=m diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 0be7f93ca..df25b876d 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -2655,7 +2655,6 @@ CONFIG_IR_GPIO_TX=m CONFIG_IR_HIX5HD2=m CONFIG_IR_IGORPLUGUSB=m CONFIG_IR_IGUANA=m -# CONFIG_IR_IMG is not set CONFIG_IR_IMON_DECODER=m CONFIG_IR_IMON=m CONFIG_IR_IMON_RAW=m @@ -5591,7 +5590,6 @@ CONFIG_SND_PCI=y CONFIG_SND_PCM_OSS=m CONFIG_SND_PCM_OSS_PLUGINS=y CONFIG_SND_PCM_XRUN_DEBUG=y -CONFIG_SND_PCSP=m CONFIG_SND_PCXHR=m CONFIG_SND_PORTMAN2X4=m CONFIG_SND_RIPTIDE=m @@ -5664,12 +5662,14 @@ CONFIG_SND_SOC_ES8328_SPI=m # CONFIG_SND_SOC_FSL_SSI is not set CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y # CONFIG_SND_SOC_GTM601 is not set +CONFIG_SND_SOC_HDAC_HDA=m CONFIG_SND_SOC_HDAC_HDMI=m CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_IMG is not set # CONFIG_SND_SOC_IMX_AUDMUX is not set # CONFIG_SND_SOC_IMX_ES8328 is not set # CONFIG_SND_SOC_INNO_RK3036 is not set +CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y CONFIG_SND_SOC=m CONFIG_SND_SOC_MAX9759=m CONFIG_SND_SOC_MAX98088=m diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 43fcb7d8b..2f6851f35 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -2639,7 +2639,6 @@ CONFIG_IR_GPIO_TX=m CONFIG_IR_HIX5HD2=m CONFIG_IR_IGORPLUGUSB=m CONFIG_IR_IGUANA=m -# CONFIG_IR_IMG is not set CONFIG_IR_IMON_DECODER=m CONFIG_IR_IMON=m CONFIG_IR_IMON_RAW=m @@ -5569,7 +5568,6 @@ CONFIG_SND_PCI=y # CONFIG_SND_PCMCIA is not set CONFIG_SND_PCM_OSS=m CONFIG_SND_PCM_OSS_PLUGINS=y -CONFIG_SND_PCSP=m CONFIG_SND_PCXHR=m CONFIG_SND_PORTMAN2X4=m CONFIG_SND_RIPTIDE=m @@ -5642,12 +5640,14 @@ CONFIG_SND_SOC_ES8328_SPI=m # CONFIG_SND_SOC_FSL_SSI is not set CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y # CONFIG_SND_SOC_GTM601 is not set +CONFIG_SND_SOC_HDAC_HDA=m CONFIG_SND_SOC_HDAC_HDMI=m CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_IMG is not set # CONFIG_SND_SOC_IMX_AUDMUX is not set # CONFIG_SND_SOC_IMX_ES8328 is not set # CONFIG_SND_SOC_INNO_RK3036 is not set +CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y CONFIG_SND_SOC=m CONFIG_SND_SOC_MAX9759=m CONFIG_SND_SOC_MAX98088=m diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index dea404d2a..955ab0ef8 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -2768,7 +2768,6 @@ CONFIG_IR_GPIO_TX=m CONFIG_IR_HIX5HD2=m CONFIG_IR_IGORPLUGUSB=m CONFIG_IR_IGUANA=m -# CONFIG_IR_IMG is not set CONFIG_IR_IMON_DECODER=m CONFIG_IR_IMON=m CONFIG_IR_IMON_RAW=m @@ -5901,7 +5900,6 @@ CONFIG_SND_PCI=y # CONFIG_SND_PCMCIA is not set CONFIG_SND_PCM_OSS=m CONFIG_SND_PCM_OSS_PLUGINS=y -CONFIG_SND_PCSP=m CONFIG_SND_PCXHR=m CONFIG_SND_PORTMAN2X4=m CONFIG_SND_PXA910_SOC=m @@ -5981,6 +5979,7 @@ CONFIG_SND_SOC_FSL_SSI=m CONFIG_SND_SOC_FSL_UTILS=m CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y # CONFIG_SND_SOC_GTM601 is not set +CONFIG_SND_SOC_HDAC_HDA=m CONFIG_SND_SOC_HDAC_HDMI=m CONFIG_SND_SOC_HDMI_CODEC=m CONFIG_SND_SOC_I2C_AND_SPI=m @@ -5994,6 +5993,7 @@ CONFIG_SND_SOC_IMX_SGTL5000=m CONFIG_SND_SOC_IMX_SPDIF=m CONFIG_SND_SOC_IMX_SSI=m # CONFIG_SND_SOC_INNO_RK3036 is not set +CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y CONFIG_SND_SOC_LPASS_CPU=m CONFIG_SND_SOC_LPASS_PLATFORM=m CONFIG_SND_SOC=m diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index d62f0c8e2..2bb47f1ef 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -2528,7 +2528,6 @@ CONFIG_IR_GPIO_TX=m CONFIG_IR_HIX5HD2=m CONFIG_IR_IGORPLUGUSB=m CONFIG_IR_IGUANA=m -# CONFIG_IR_IMG is not set CONFIG_IR_IMON_DECODER=m CONFIG_IR_IMON=m CONFIG_IR_IMON_RAW=m @@ -5323,6 +5322,7 @@ CONFIG_SND_SOC_ES8328_SPI=m # CONFIG_SND_SOC_FSL_SSI is not set CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y # CONFIG_SND_SOC_GTM601 is not set +CONFIG_SND_SOC_HDAC_HDA=m CONFIG_SND_SOC_HDAC_HDMI=m CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_IMG is not set diff --git a/kernel-i686.config b/kernel-i686.config index 779de80f9..677b3797d 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -2510,7 +2510,6 @@ CONFIG_IR_GPIO_TX=m CONFIG_IR_HIX5HD2=m CONFIG_IR_IGORPLUGUSB=m CONFIG_IR_IGUANA=m -# CONFIG_IR_IMG is not set CONFIG_IR_IMON_DECODER=m CONFIG_IR_IMON=m CONFIG_IR_IMON_RAW=m @@ -5301,6 +5300,7 @@ CONFIG_SND_SOC_ES8328_SPI=m # CONFIG_SND_SOC_FSL_SSI is not set CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y # CONFIG_SND_SOC_GTM601 is not set +CONFIG_SND_SOC_HDAC_HDA=m CONFIG_SND_SOC_HDAC_HDMI=m CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_IMG is not set diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index efa16f89c..dacbfb3e0 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -2314,7 +2314,6 @@ CONFIG_IR_GPIO_TX=m CONFIG_IR_HIX5HD2=m CONFIG_IR_IGORPLUGUSB=m CONFIG_IR_IGUANA=m -# CONFIG_IR_IMG is not set CONFIG_IR_IMON_DECODER=m CONFIG_IR_IMON=m CONFIG_IR_IMON_RAW=m @@ -4983,7 +4982,6 @@ CONFIG_SND_PCI=y CONFIG_SND_PCM_OSS=m CONFIG_SND_PCM_OSS_PLUGINS=y CONFIG_SND_PCM_XRUN_DEBUG=y -CONFIG_SND_PCSP=m CONFIG_SND_PCXHR=m CONFIG_SND_PORTMAN2X4=m CONFIG_SND_PPC=y @@ -5050,12 +5048,14 @@ CONFIG_SND_SOC_ES7134=m # CONFIG_SND_SOC_FSL_SSI is not set CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y # CONFIG_SND_SOC_GTM601 is not set +CONFIG_SND_SOC_HDAC_HDA=m CONFIG_SND_SOC_HDAC_HDMI=m CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_IMG is not set # CONFIG_SND_SOC_IMX_AUDMUX is not set # CONFIG_SND_SOC_IMX_ES8328 is not set # CONFIG_SND_SOC_INNO_RK3036 is not set +CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y # CONFIG_SND_SOC is not set CONFIG_SND_SOC_MAX9759=m CONFIG_SND_SOC_MAX98088=m diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 845d49b48..960d1b2af 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -2296,7 +2296,6 @@ CONFIG_IR_GPIO_TX=m CONFIG_IR_HIX5HD2=m CONFIG_IR_IGORPLUGUSB=m CONFIG_IR_IGUANA=m -# CONFIG_IR_IMG is not set CONFIG_IR_IMON_DECODER=m CONFIG_IR_IMON=m CONFIG_IR_IMON_RAW=m @@ -4959,7 +4958,6 @@ CONFIG_SND_PCI=y # CONFIG_SND_PCMCIA is not set CONFIG_SND_PCM_OSS=m CONFIG_SND_PCM_OSS_PLUGINS=y -CONFIG_SND_PCSP=m CONFIG_SND_PCXHR=m CONFIG_SND_PORTMAN2X4=m CONFIG_SND_PPC=y @@ -5026,12 +5024,14 @@ CONFIG_SND_SOC_ES7134=m # CONFIG_SND_SOC_FSL_SSI is not set CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y # CONFIG_SND_SOC_GTM601 is not set +CONFIG_SND_SOC_HDAC_HDA=m CONFIG_SND_SOC_HDAC_HDMI=m CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_IMG is not set # CONFIG_SND_SOC_IMX_AUDMUX is not set # CONFIG_SND_SOC_IMX_ES8328 is not set # CONFIG_SND_SOC_INNO_RK3036 is not set +CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y # CONFIG_SND_SOC is not set CONFIG_SND_SOC_MAX9759=m CONFIG_SND_SOC_MAX98088=m diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 0e40b4a29..d9f1f07e3 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -2265,7 +2265,6 @@ CONFIG_IR_GPIO_TX=m CONFIG_IR_HIX5HD2=m CONFIG_IR_IGORPLUGUSB=m CONFIG_IR_IGUANA=m -# CONFIG_IR_IMG is not set CONFIG_IR_IMON_DECODER=m CONFIG_IR_IMON=m CONFIG_IR_IMON_RAW=m @@ -4879,7 +4878,6 @@ CONFIG_SND_PCI=y CONFIG_SND_PCM_OSS=m CONFIG_SND_PCM_OSS_PLUGINS=y CONFIG_SND_PCM_XRUN_DEBUG=y -CONFIG_SND_PCSP=m CONFIG_SND_PCXHR=m CONFIG_SND_PORTMAN2X4=m CONFIG_SND_RIPTIDE=m @@ -4945,12 +4943,14 @@ CONFIG_SND_SOC_ES7134=m # CONFIG_SND_SOC_FSL_SSI is not set CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y # CONFIG_SND_SOC_GTM601 is not set +CONFIG_SND_SOC_HDAC_HDA=m CONFIG_SND_SOC_HDAC_HDMI=m CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_IMG is not set # CONFIG_SND_SOC_IMX_AUDMUX is not set # CONFIG_SND_SOC_IMX_ES8328 is not set # CONFIG_SND_SOC_INNO_RK3036 is not set +CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y CONFIG_SND_SOC=m CONFIG_SND_SOC_MAX9759=m CONFIG_SND_SOC_MAX98088=m diff --git a/kernel-s390x.config b/kernel-s390x.config index aa6d4011f..b5f547050 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -2247,7 +2247,6 @@ CONFIG_IR_GPIO_TX=m CONFIG_IR_HIX5HD2=m CONFIG_IR_IGORPLUGUSB=m CONFIG_IR_IGUANA=m -# CONFIG_IR_IMG is not set CONFIG_IR_IMON_DECODER=m CONFIG_IR_IMON=m CONFIG_IR_IMON_RAW=m @@ -4855,7 +4854,6 @@ CONFIG_SND_PCI=y # CONFIG_SND_PCMCIA is not set CONFIG_SND_PCM_OSS=m CONFIG_SND_PCM_OSS_PLUGINS=y -CONFIG_SND_PCSP=m CONFIG_SND_PCXHR=m CONFIG_SND_PORTMAN2X4=m CONFIG_SND_RIPTIDE=m @@ -4921,12 +4919,14 @@ CONFIG_SND_SOC_ES7134=m # CONFIG_SND_SOC_FSL_SSI is not set CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y # CONFIG_SND_SOC_GTM601 is not set +CONFIG_SND_SOC_HDAC_HDA=m CONFIG_SND_SOC_HDAC_HDMI=m CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_IMG is not set # CONFIG_SND_SOC_IMX_AUDMUX is not set # CONFIG_SND_SOC_IMX_ES8328 is not set # CONFIG_SND_SOC_INNO_RK3036 is not set +CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y CONFIG_SND_SOC=m CONFIG_SND_SOC_MAX9759=m CONFIG_SND_SOC_MAX98088=m diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 6f1034377..6f5da3409 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -2580,7 +2580,6 @@ CONFIG_IR_GPIO_TX=m CONFIG_IR_HIX5HD2=m CONFIG_IR_IGORPLUGUSB=m CONFIG_IR_IGUANA=m -# CONFIG_IR_IMG is not set CONFIG_IR_IMON_DECODER=m CONFIG_IR_IMON=m CONFIG_IR_IMON_RAW=m @@ -5366,6 +5365,7 @@ CONFIG_SND_SOC_ES8328_SPI=m # CONFIG_SND_SOC_FSL_SSI is not set CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y # CONFIG_SND_SOC_GTM601 is not set +CONFIG_SND_SOC_HDAC_HDA=m CONFIG_SND_SOC_HDAC_HDMI=m CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_IMG is not set diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 5dd8d004c..ba227ef3f 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -2562,7 +2562,6 @@ CONFIG_IR_GPIO_TX=m CONFIG_IR_HIX5HD2=m CONFIG_IR_IGORPLUGUSB=m CONFIG_IR_IGUANA=m -# CONFIG_IR_IMG is not set CONFIG_IR_IMON_DECODER=m CONFIG_IR_IMON=m CONFIG_IR_IMON_RAW=m @@ -5344,6 +5343,7 @@ CONFIG_SND_SOC_ES8328_SPI=m # CONFIG_SND_SOC_FSL_SSI is not set CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y # CONFIG_SND_SOC_GTM601 is not set +CONFIG_SND_SOC_HDAC_HDA=m CONFIG_SND_SOC_HDAC_HDMI=m CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_IMG is not set From 26c1fe50a0a11f0026c86bd8475b6d85d62f81b2 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 3 Dec 2018 17:34:30 +0100 Subject: [PATCH 07/13] Fix non functional hotkeys on Asus FX503VD (#1645070) --- asus-fx503-keyb.patch | 99 +++++++++++++++++++++++++++++++++++++++++++ kernel.spec | 6 +++ 2 files changed, 105 insertions(+) create mode 100644 asus-fx503-keyb.patch diff --git a/asus-fx503-keyb.patch b/asus-fx503-keyb.patch new file mode 100644 index 000000000..ae1b4076f --- /dev/null +++ b/asus-fx503-keyb.patch @@ -0,0 +1,99 @@ +From 330c27ee59fb76db02c671ac4cb32914565aa609 Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Fri, 23 Nov 2018 13:31:00 +0100 +Subject: [PATCH 1/2] HID: asus: Add event handler to catch unmapped Asus + Vendor UsagePage codes + +Various Asus devices generate HID events using the Asus Vendor specific +UsagePage 0xff31 and hid-asus will map these in its input_mapping for all +devices to which it binds (independent of any quirks). + +Add an event callback which check for unmapped (because sofar unknown) +usages within the Asus Vendor UsagePage and log a warning for these. + +The purpose of this patch is to help debugging / find such unmapped codes +and add them to the asus_input_mapping() function. + +Signed-off-by: Hans de Goede +--- + drivers/hid/hid-asus.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c +index a1fa2fc8c9b5..043120cc4b97 100644 +--- a/drivers/hid/hid-asus.c ++++ b/drivers/hid/hid-asus.c +@@ -241,6 +241,17 @@ static int asus_report_input(struct asus_drvdata *drvdat, u8 *data, int size) + return 1; + } + ++static int asus_event(struct hid_device *hdev, struct hid_field *field, ++ struct hid_usage *usage, __s32 value) ++{ ++ if ((usage->hid & HID_USAGE_PAGE) == 0xff310000 && !usage->type) { ++ hid_warn(hdev, "Unmapped Asus vendor usagepage code 0x%02x\n", ++ usage->hid & HID_USAGE); ++ } ++ ++ return 0; ++} ++ + static int asus_raw_event(struct hid_device *hdev, + struct hid_report *report, u8 *data, int size) + { +@@ -832,6 +843,7 @@ static struct hid_driver asus_driver = { + #ifdef CONFIG_PM + .reset_resume = asus_reset_resume, + #endif ++ .event = asus_event, + .raw_event = asus_raw_event + }; + module_hid_driver(asus_driver); +-- +2.19.1 + +From 71256aaf9979072c9bd99fb08db586731e3ccf55 Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Fri, 23 Nov 2018 13:44:27 +0100 +Subject: [PATCH 2/2] HID: asus: Add USB-id for the ASUS FX503VD laptop + +The ASUS FX503VD laptop uses an USB keyboard with several hotkeys +which use the Asus Vendor specific UsagePage. + +At the USB-id for this keyboard to the hid-asus driver so that these +custom usages get properly mapped. + +Signed-off-by: Hans de Goede +--- + drivers/hid/hid-asus.c | 2 ++ + drivers/hid/hid-ids.h | 1 + + 2 files changed, 3 insertions(+) + +diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c +index 043120cc4b97..6e9470e00c69 100644 +--- a/drivers/hid/hid-asus.c ++++ b/drivers/hid/hid-asus.c +@@ -806,6 +806,8 @@ static __u8 *asus_report_fixup(struct hid_device *hdev, __u8 *rdesc, + } + + static const struct hid_device_id asus_devices[] = { ++ { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, ++ USB_DEVICE_ID_ASUSTEK_FX503VD_KEYBOARD) }, + { HID_I2C_DEVICE(USB_VENDOR_ID_ASUSTEK, + USB_DEVICE_ID_ASUSTEK_I2C_KEYBOARD), I2C_KEYBOARD_QUIRKS}, + { HID_I2C_DEVICE(USB_VENDOR_ID_ASUSTEK, +diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h +index c0d668944dbe..5ae1db6fa5c8 100644 +--- a/drivers/hid/hid-ids.h ++++ b/drivers/hid/hid-ids.h +@@ -190,6 +190,7 @@ + #define USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD1 0x1854 + #define USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD2 0x1837 + #define USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD3 0x1822 ++#define USB_DEVICE_ID_ASUSTEK_FX503VD_KEYBOARD 0x1869 + + #define USB_VENDOR_ID_ATEN 0x0557 + #define USB_DEVICE_ID_ATEN_UC100KM 0x2004 +-- +2.19.1 + diff --git a/kernel.spec b/kernel.spec index 2156f24c6..21638e587 100644 --- a/kernel.spec +++ b/kernel.spec @@ -608,6 +608,9 @@ Patch502: input-rmi4-remove-the-need-for-artifical-IRQ.patch # rhbz 1526312 (accelerometer part of the bug), patches pending upstream Patch504: iio-accel-kxcjk1013-Add-more-hardware-ids.patch +# rhbz 1645070 patch queued upstream for merging into 4.21 +Patch505: asus-fx503-keyb.patch + # END OF PATCH DEFINITIONS %endif @@ -1880,6 +1883,9 @@ fi # # %changelog +* Mon Dec 3 2018 Hans de Goede +- Fix non functional hotkeys on Asus FX503VD (#1645070) + * Fri Nov 30 2018 Justin M. Forbes - 4.20.0-0.rc4.git2.1 - Linux v4.20-rc4-156-g94f371cb7394 From c85b42d5d91142f7b67cdd41347f3b12c303f7f5 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 3 Dec 2018 11:00:53 -0600 Subject: [PATCH 08/13] Disable debugging options. --- kernel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kernel.spec b/kernel.spec index 21638e587..c4d1bbfa4 100644 --- a/kernel.spec +++ b/kernel.spec @@ -122,7 +122,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 0 +%define debugbuildsenabled 1 # Kernel headers are being split out into a separate package %if 0%{?fedora} @@ -1883,6 +1883,9 @@ fi # # %changelog +* Mon Dec 03 2018 Justin M. Forbes +- Disable debugging options. + * Mon Dec 3 2018 Hans de Goede - Fix non functional hotkeys on Asus FX503VD (#1645070) From 10c4e09883189d404febea5524a3732676d5eee3 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 3 Dec 2018 12:02:17 -0600 Subject: [PATCH 09/13] Linux v4.20-rc5 --- arm64-96boards-Rock960-CE-board-support.patch | 139 ------------------ .../generic/CONFIG_PSI_DEFAULT_DISABLED | 1 + .../arm/aarch64/CONFIG_ARM64_ERRATUM_1286807 | 1 + ...CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC | 1 + gitrev | 2 +- kernel-aarch64-debug.config | 2 + kernel-aarch64.config | 2 + kernel-armv7hl-debug.config | 1 + kernel-armv7hl-lpae-debug.config | 1 + kernel-armv7hl-lpae.config | 1 + kernel-armv7hl.config | 1 + kernel-i686-debug.config | 1 + kernel-i686.config | 1 + kernel-ppc64le-debug.config | 1 + kernel-ppc64le.config | 1 + kernel-s390x-debug.config | 1 + kernel-s390x.config | 1 + kernel-x86_64-debug.config | 1 + kernel-x86_64.config | 1 + kernel.spec | 9 +- sources | 3 +- 21 files changed, 26 insertions(+), 146 deletions(-) delete mode 100644 arm64-96boards-Rock960-CE-board-support.patch create mode 100644 configs/fedora/generic/CONFIG_PSI_DEFAULT_DISABLED create mode 100644 configs/fedora/generic/arm/aarch64/CONFIG_ARM64_ERRATUM_1286807 create mode 100644 configs/fedora/generic/x86/CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC diff --git a/arm64-96boards-Rock960-CE-board-support.patch b/arm64-96boards-Rock960-CE-board-support.patch deleted file mode 100644 index 2d0186abb..000000000 --- a/arm64-96boards-Rock960-CE-board-support.patch +++ /dev/null @@ -1,139 +0,0 @@ -From patchwork Tue Oct 16 14:00:20 2018 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Daniel Lezcano -X-Patchwork-Id: 1000432 -Return-Path: -Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) - by smtp.lore.kernel.org (Postfix) with ESMTP id 41BB8C04EBD - for ; Tue, 16 Oct 2018 14:01:24 +0000 (UTC) -Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) - by mail.kernel.org (Postfix) with ESMTP id 032862089E - for ; Tue, 16 Oct 2018 14:01:24 +0000 (UTC) -Authentication-Results: mail.kernel.org; - dkim=pass (1024-bit key) header.d=linaro.org header.i=@linaro.org - header.b="OwrJnI6D" -DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 032862089E -Authentication-Results: mail.kernel.org; - dmarc=fail (p=none dis=none) header.from=linaro.org -Authentication-Results: mail.kernel.org; - spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org -Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand - id S1727241AbeJPVv6 (ORCPT - ); - Tue, 16 Oct 2018 17:51:58 -0400 -Received: from mail-wr1-f68.google.com ([209.85.221.68]:43800 "EHLO - mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org - with ESMTP id S1727149AbeJPVv6 (ORCPT - ); - Tue, 16 Oct 2018 17:51:58 -0400 -Received: by mail-wr1-f68.google.com with SMTP id n1-v6so25672615wrt.10 - for ; - Tue, 16 Oct 2018 07:01:21 -0700 (PDT) -DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; - d=linaro.org; s=google; - h=from:to:cc:subject:date:message-id; - bh=AyjUgKMFmAFThaK4GvWsdrdl4JZ3kTa6zVPrOmGMjOA=; - b=OwrJnI6D/huHRM5jiagiGiKBxUHFUlMvwe1t2GexoIKOTqtFGY3vwPCkrAUWdnT5+f - n+wvqEq+enR14QpmLTY3VNYAsxMcDtJOZ2R2Cw0rRdiHypMeUGRanfszUimV9omTlSGH - ApMgMERT+Pim+X1tp/uH775sDaVLHsJDyJb2Y= -X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; - d=1e100.net; s=20161025; - h=x-gm-message-state:from:to:cc:subject:date:message-id; - bh=AyjUgKMFmAFThaK4GvWsdrdl4JZ3kTa6zVPrOmGMjOA=; - b=DO/kT4iXCQgCsPC53FV7CMKKHaDQNQtZUIfHfJGQ2iRgCRNsZSYU6JYHxxjsqWSLyq - c46PNGLDG4qPZf/tveVt9wc9SPdKTk3klyT5NnQvdlNY8uv5/GTXINOWmNE0xD9hqvaP - ml6yJRUA51/KJU73p7XhGvWlMmEuStLUtXa4rlqKgush6lllYhSFpca2xkiKFhqcd+Bc - HHXRh2i0OVgTdmdb0+lSKyLXm74UHrhv1WEbgjGm+Mharwz/qsidTCXfqKPC7izgstBS - L+mjOACqna60eEsABW/p2nH9vxXAsU2ArAnmB714yeh9uckl1uRzYmMQCSD1LmmBN0q4 - 4UvQ== -X-Gm-Message-State: ABuFfojBZLkXjdlBc4AIjobar5Yk+68lR2+TEpPVGjsScLNzcmIj5eYO - yyEhPWYj3vc1MHjUcMfQLt7ahg== -X-Google-Smtp-Source: - ACcGV614RNSZy+OjIvsEaE9ONlZaDAeI1a8EpD+wP5Gt58g75Bh8DJgL6KJJ2ZjTenoZPwHLydiQBg== -X-Received: by 2002:adf:cd0c:: with SMTP id - w12-v6mr19534363wrm.67.1539698480294; - Tue, 16 Oct 2018 07:01:20 -0700 (PDT) -Received: from localhost.localdomain (221.56.88.92.rev.sfr.net. - [92.88.56.221]) - by smtp.gmail.com with ESMTPSA id - b81-v6sm10195012wmh.47.2018.10.16.07.01.18 - (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); - Tue, 16 Oct 2018 07:01:19 -0700 (PDT) -From: Daniel Lezcano -To: heiko@sntech.de -Cc: linux-kernel@vger.kernel.org, Rob Herring , - Mark Rutland , - Vicente Bergas , - Shawn Lin , - Ezequiel Garcia , - Enric Balletbo i Serra , - Manivannan Sadhasivam , - devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED - DEVICE TREE BINDINGS), - linux-arm-kernel@lists.infradead.org (moderated list:ARM/Rockchip SoC - support), - linux-rockchip@lists.infradead.org (open list:ARM/Rockchip SoC - support) -Subject: [PATCH] DT: rockchip: Fix stability issues with the 'performance' - governor on rock960 -Date: Tue, 16 Oct 2018 16:00:20 +0200 -Message-Id: <1539698431-12616-1-git-send-email-daniel.lezcano@linaro.org> -X-Mailer: git-send-email 2.7.4 -Sender: linux-kernel-owner@vger.kernel.org -Precedence: bulk -List-ID: -X-Mailing-List: linux-kernel@vger.kernel.org - -When the performance governor is set as default, the rock960 hangs -around one minute after booting, whatever the activity is (idle, key -pressed, loaded, ...). - -Based on the commit log found at https://patchwork.kernel.org/patch/10092377/ - -"vdd_log has no consumer and therefore will not be set to a specific -voltage. Still the PWM output pin gets configured and thence the vdd_log -output voltage will changed from it's default. Depending on the idle -state of the PWM this will slightly over or undervoltage the logic supply -of the RK3399 and cause instability with GbE (undervoltage) and PCIe -(overvoltage). Since the default value set by a voltage divider is the -correct supply voltage and we don't need to change it during runtime we -remove the rail from the devicetree completely so the PWM pin will not -be configured." - -After removing the vdd-log from the rock960's specific DT, the board -does no longer hang and shows a stable behavior. - -Apply the same change for the rock960 by removing the vdd-log from the -DT. - -Signed-off-by: Daniel Lezcano -Tested-by: Manivannan Sadhasivam ---- - arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi | 12 ------------ - 1 file changed, 12 deletions(-) - -diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi -index 6c8c4ab..56abbb0 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi -+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi -@@ -57,18 +57,6 @@ - regulator-always-on; - vin-supply = <&vcc_sys>; - }; -- -- vdd_log: vdd-log { -- compatible = "pwm-regulator"; -- pwms = <&pwm2 0 25000 0>; -- regulator-name = "vdd_log"; -- regulator-min-microvolt = <800000>; -- regulator-max-microvolt = <1400000>; -- regulator-always-on; -- regulator-boot-on; -- vin-supply = <&vcc_sys>; -- }; -- - }; - - &cpu_l0 { diff --git a/configs/fedora/generic/CONFIG_PSI_DEFAULT_DISABLED b/configs/fedora/generic/CONFIG_PSI_DEFAULT_DISABLED new file mode 100644 index 000000000..d45ac4831 --- /dev/null +++ b/configs/fedora/generic/CONFIG_PSI_DEFAULT_DISABLED @@ -0,0 +1 @@ +# CONFIG_PSI_DEFAULT_DISABLED is not set diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_ARM64_ERRATUM_1286807 b/configs/fedora/generic/arm/aarch64/CONFIG_ARM64_ERRATUM_1286807 new file mode 100644 index 000000000..e35f85669 --- /dev/null +++ b/configs/fedora/generic/arm/aarch64/CONFIG_ARM64_ERRATUM_1286807 @@ -0,0 +1 @@ +CONFIG_ARM64_ERRATUM_1286807=y diff --git a/configs/fedora/generic/x86/CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC b/configs/fedora/generic/x86/CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC new file mode 100644 index 000000000..e109ab25a --- /dev/null +++ b/configs/fedora/generic/x86/CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC @@ -0,0 +1 @@ +CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y diff --git a/gitrev b/gitrev index 641166a04..656d96f33 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -94f371cb73944b410a269d570d6946c042f2ddd0 +2595646791c319cadfdbf271563aac97d0843dc7 diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 40cc994dd..b1aa5358f 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -283,6 +283,7 @@ CONFIG_ARM64_CNP=y CONFIG_ARM64_CRYPTO=y CONFIG_ARM64_ERRATUM_1024718=y CONFIG_ARM64_ERRATUM_1188873=y +CONFIG_ARM64_ERRATUM_1286807=y CONFIG_ARM64_ERRATUM_819472=y CONFIG_ARM64_ERRATUM_824069=y CONFIG_ARM64_ERRATUM_826319=y @@ -4514,6 +4515,7 @@ CONFIG_PROFILING=y CONFIG_PROVE_LOCKING=y CONFIG_PROVE_RCU=y CONFIG_PSAMPLE=m +# CONFIG_PSI_DEFAULT_DISABLED is not set CONFIG_PSI=y # CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set CONFIG_PSTORE_842_COMPRESS=y diff --git a/kernel-aarch64.config b/kernel-aarch64.config index e259613bf..0dfb2f643 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -283,6 +283,7 @@ CONFIG_ARM64_CNP=y CONFIG_ARM64_CRYPTO=y CONFIG_ARM64_ERRATUM_1024718=y CONFIG_ARM64_ERRATUM_1188873=y +CONFIG_ARM64_ERRATUM_1286807=y CONFIG_ARM64_ERRATUM_819472=y CONFIG_ARM64_ERRATUM_824069=y CONFIG_ARM64_ERRATUM_826319=y @@ -4492,6 +4493,7 @@ CONFIG_PROC_VMCORE=y CONFIG_PROFILING=y # CONFIG_PROVE_LOCKING is not set CONFIG_PSAMPLE=m +# CONFIG_PSI_DEFAULT_DISABLED is not set CONFIG_PSI=y # CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set CONFIG_PSTORE_842_COMPRESS=y diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 350c47bc0..319083f92 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -4763,6 +4763,7 @@ CONFIG_PROFILING=y CONFIG_PROVE_LOCKING=y CONFIG_PROVE_RCU=y CONFIG_PSAMPLE=m +# CONFIG_PSI_DEFAULT_DISABLED is not set CONFIG_PSI=y # CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set CONFIG_PSTORE_842_COMPRESS=y diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index df25b876d..4a4072856 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -4528,6 +4528,7 @@ CONFIG_PROFILING=y CONFIG_PROVE_LOCKING=y CONFIG_PROVE_RCU=y CONFIG_PSAMPLE=m +# CONFIG_PSI_DEFAULT_DISABLED is not set CONFIG_PSI=y # CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set CONFIG_PSTORE_842_COMPRESS=y diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 2f6851f35..b6f491343 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -4507,6 +4507,7 @@ CONFIG_PROC_VMCORE=y CONFIG_PROFILING=y # CONFIG_PROVE_LOCKING is not set CONFIG_PSAMPLE=m +# CONFIG_PSI_DEFAULT_DISABLED is not set CONFIG_PSI=y # CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set CONFIG_PSTORE_842_COMPRESS=y diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 955ab0ef8..6356fb84a 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -4742,6 +4742,7 @@ CONFIG_PROC_VMCORE=y CONFIG_PROFILING=y # CONFIG_PROVE_LOCKING is not set CONFIG_PSAMPLE=m +# CONFIG_PSI_DEFAULT_DISABLED is not set CONFIG_PSI=y # CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set CONFIG_PSTORE_842_COMPRESS=y diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 2bb47f1ef..cb9403d42 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -4289,6 +4289,7 @@ CONFIG_PROVE_LOCKING=y CONFIG_PROVE_RCU=y # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set CONFIG_PSAMPLE=m +# CONFIG_PSI_DEFAULT_DISABLED is not set CONFIG_PSI=y # CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set CONFIG_PSTORE_842_COMPRESS=y diff --git a/kernel-i686.config b/kernel-i686.config index 677b3797d..396b55931 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -4268,6 +4268,7 @@ CONFIG_PROFILING=y # CONFIG_PROVE_LOCKING is not set # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set CONFIG_PSAMPLE=m +# CONFIG_PSI_DEFAULT_DISABLED is not set CONFIG_PSI=y # CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set CONFIG_PSTORE_842_COMPRESS=y diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index dacbfb3e0..f4fcec154 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -4037,6 +4037,7 @@ CONFIG_PROVE_RCU=y CONFIG_PSAMPLE=m CONFIG_PSERIES_CPUIDLE=y CONFIG_PSERIES_ENERGY=m +# CONFIG_PSI_DEFAULT_DISABLED is not set CONFIG_PSI=y # CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set CONFIG_PSTORE_842_COMPRESS=y diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 960d1b2af..d4a7c8633 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -4014,6 +4014,7 @@ CONFIG_PROFILING=y CONFIG_PSAMPLE=m CONFIG_PSERIES_CPUIDLE=y CONFIG_PSERIES_ENERGY=m +# CONFIG_PSI_DEFAULT_DISABLED is not set CONFIG_PSI=y # CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set CONFIG_PSTORE_842_COMPRESS=y diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index d9f1f07e3..38bc24f3a 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -3925,6 +3925,7 @@ CONFIG_PROFILING=y CONFIG_PROVE_LOCKING=y CONFIG_PROVE_RCU=y CONFIG_PSAMPLE=m +# CONFIG_PSI_DEFAULT_DISABLED is not set CONFIG_PSI=y # CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set CONFIG_PSTORE_842_COMPRESS=y diff --git a/kernel-s390x.config b/kernel-s390x.config index b5f547050..b0d0fbc99 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -3902,6 +3902,7 @@ CONFIG_PROC_VMCORE=y CONFIG_PROFILING=y # CONFIG_PROVE_LOCKING is not set CONFIG_PSAMPLE=m +# CONFIG_PSI_DEFAULT_DISABLED is not set CONFIG_PSI=y # CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set CONFIG_PSTORE_842_COMPRESS=y diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 6f5da3409..d6130d162 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -4324,6 +4324,7 @@ CONFIG_PROVE_LOCKING=y CONFIG_PROVE_RCU=y CONFIG_PROVIDE_OHCI1394_DMA_INIT=y CONFIG_PSAMPLE=m +# CONFIG_PSI_DEFAULT_DISABLED is not set CONFIG_PSI=y # CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set CONFIG_PSTORE_842_COMPRESS=y diff --git a/kernel-x86_64.config b/kernel-x86_64.config index ba227ef3f..7e04bf109 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -4303,6 +4303,7 @@ CONFIG_PROFILING=y # CONFIG_PROVE_LOCKING is not set CONFIG_PROVIDE_OHCI1394_DMA_INIT=y CONFIG_PSAMPLE=m +# CONFIG_PSI_DEFAULT_DISABLED is not set CONFIG_PSI=y # CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set CONFIG_PSTORE_842_COMPRESS=y diff --git a/kernel.spec b/kernel.spec index c4d1bbfa4..65ce830a8 100644 --- a/kernel.spec +++ b/kernel.spec @@ -67,9 +67,9 @@ Summary: The Linux kernel # The next upstream release sublevel (base_sublevel+1) %define upstream_sublevel %(echo $((%{base_sublevel} + 1))) # The rc snapshot level -%global rcrev 4 +%global rcrev 5 # The git snapshot level -%define gitrev 2 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -577,8 +577,6 @@ Patch305: qcom-msm89xx-fixes.patch # https://patchwork.kernel.org/project/linux-mmc/list/?submitter=71861 Patch306: arm-sdhci-esdhc-imx-fixes.patch -Patch307: arm64-96boards-Rock960-CE-board-support.patch - Patch330: bcm2835-cpufreq-add-CPU-frequency-control-driver.patch Patch331: bcm283x-drm-vc4-set-is_yuv-to-false-when-num_planes-1.patch @@ -1883,6 +1881,9 @@ fi # # %changelog +* Mon Dec 03 2018 Justin M. Forbes - 4.20.0-0.rc5.git0.1 +- Linux v4.20-rc5 + * Mon Dec 03 2018 Justin M. Forbes - Disable debugging options. diff --git a/sources b/sources index 870a2fbab..51aee29ae 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ SHA512 (linux-4.19.tar.xz) = ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4 -SHA512 (patch-4.20-rc4.xz) = 6cd5063110b286fa61f0d96ca675d5235debe7ac9e21ce2d709bdb299af897448048650e7d5497b9b2de474c42b120f89ed6cc5b5d38f71762263ad5a8ee9999 -SHA512 (patch-4.20-rc4-git2.xz) = 99b2e09f1378a48431faf341c3dbdb1d39c6799c7edef8bf89904ad8fceb845676f3d2404f0be26148124ca86e9755dd572c67452ab53a1d49a8bae043a3c419 +SHA512 (patch-4.20-rc5.xz) = 389daea25e1a19050fa2e7f4eb7cc8e462a83560a06b43b5bd8458bfcf3754c987660c2b42f9adeacd956342f4520c45d2982fbee4cfd2b8825f9153db06aaa9 From b385dc200562634fa6c74afe06593138aeefaf59 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 4 Dec 2018 04:16:34 +0000 Subject: [PATCH 10/13] remove obsolete option --- .../fedora/generic/CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC | 1 - kernel-aarch64-debug.config | 1 - kernel-aarch64.config | 1 - kernel-armv7hl-debug.config | 1 - kernel-armv7hl-lpae-debug.config | 1 - kernel-armv7hl-lpae.config | 1 - kernel-armv7hl.config | 1 - kernel-ppc64le-debug.config | 1 - kernel-ppc64le.config | 1 - kernel-s390x-debug.config | 1 - kernel-s390x.config | 1 - 11 files changed, 11 deletions(-) delete mode 100644 configs/fedora/generic/CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC diff --git a/configs/fedora/generic/CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC b/configs/fedora/generic/CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC deleted file mode 100644 index e109ab25a..000000000 --- a/configs/fedora/generic/CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index b1aa5358f..3700e4c4a 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -5676,7 +5676,6 @@ CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_IMX_AUDMUX is not set # CONFIG_SND_SOC_IMX_ES8328 is not set # CONFIG_SND_SOC_INNO_RK3036 is not set -CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y CONFIG_SND_SOC=m CONFIG_SND_SOC_MAX9759=m CONFIG_SND_SOC_MAX98088=m diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 0dfb2f643..95927c991 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -5653,7 +5653,6 @@ CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_IMX_AUDMUX is not set # CONFIG_SND_SOC_IMX_ES8328 is not set # CONFIG_SND_SOC_INNO_RK3036 is not set -CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y CONFIG_SND_SOC=m CONFIG_SND_SOC_MAX9759=m CONFIG_SND_SOC_MAX98088=m diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 319083f92..cbab408fe 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -6016,7 +6016,6 @@ CONFIG_SND_SOC_IMX_SGTL5000=m CONFIG_SND_SOC_IMX_SPDIF=m CONFIG_SND_SOC_IMX_SSI=m # CONFIG_SND_SOC_INNO_RK3036 is not set -CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y CONFIG_SND_SOC_LPASS_CPU=m CONFIG_SND_SOC_LPASS_PLATFORM=m CONFIG_SND_SOC=m diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 4a4072856..613ab32f8 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -5670,7 +5670,6 @@ CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_IMX_AUDMUX is not set # CONFIG_SND_SOC_IMX_ES8328 is not set # CONFIG_SND_SOC_INNO_RK3036 is not set -CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y CONFIG_SND_SOC=m CONFIG_SND_SOC_MAX9759=m CONFIG_SND_SOC_MAX98088=m diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index b6f491343..300edada0 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -5648,7 +5648,6 @@ CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_IMX_AUDMUX is not set # CONFIG_SND_SOC_IMX_ES8328 is not set # CONFIG_SND_SOC_INNO_RK3036 is not set -CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y CONFIG_SND_SOC=m CONFIG_SND_SOC_MAX9759=m CONFIG_SND_SOC_MAX98088=m diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 6356fb84a..b0d4ac78e 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -5994,7 +5994,6 @@ CONFIG_SND_SOC_IMX_SGTL5000=m CONFIG_SND_SOC_IMX_SPDIF=m CONFIG_SND_SOC_IMX_SSI=m # CONFIG_SND_SOC_INNO_RK3036 is not set -CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y CONFIG_SND_SOC_LPASS_CPU=m CONFIG_SND_SOC_LPASS_PLATFORM=m CONFIG_SND_SOC=m diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index f4fcec154..44124180a 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -5056,7 +5056,6 @@ CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_IMX_AUDMUX is not set # CONFIG_SND_SOC_IMX_ES8328 is not set # CONFIG_SND_SOC_INNO_RK3036 is not set -CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y # CONFIG_SND_SOC is not set CONFIG_SND_SOC_MAX9759=m CONFIG_SND_SOC_MAX98088=m diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index d4a7c8633..80a02d4d5 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -5032,7 +5032,6 @@ CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_IMX_AUDMUX is not set # CONFIG_SND_SOC_IMX_ES8328 is not set # CONFIG_SND_SOC_INNO_RK3036 is not set -CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y # CONFIG_SND_SOC is not set CONFIG_SND_SOC_MAX9759=m CONFIG_SND_SOC_MAX98088=m diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 38bc24f3a..99926a907 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -4951,7 +4951,6 @@ CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_IMX_AUDMUX is not set # CONFIG_SND_SOC_IMX_ES8328 is not set # CONFIG_SND_SOC_INNO_RK3036 is not set -CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y CONFIG_SND_SOC=m CONFIG_SND_SOC_MAX9759=m CONFIG_SND_SOC_MAX98088=m diff --git a/kernel-s390x.config b/kernel-s390x.config index b0d0fbc99..1f1c8bd1d 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -4927,7 +4927,6 @@ CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_IMX_AUDMUX is not set # CONFIG_SND_SOC_IMX_ES8328 is not set # CONFIG_SND_SOC_INNO_RK3036 is not set -CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y CONFIG_SND_SOC=m CONFIG_SND_SOC_MAX9759=m CONFIG_SND_SOC_MAX98088=m From 4d43220d694eee2fc3a09a8323bfb27d1efa6727 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Tue, 4 Dec 2018 16:49:41 -0600 Subject: [PATCH 11/13] Linux v4.20-rc5-21-g0072a0c14d5b --- gitrev | 2 +- kernel.spec | 8 ++++++-- sources | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gitrev b/gitrev index 656d96f33..c3fc9b484 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -2595646791c319cadfdbf271563aac97d0843dc7 +0072a0c14d5b7cb72c611d396f143f5dcd73ebe2 diff --git a/kernel.spec b/kernel.spec index 65ce830a8..717c41c19 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 5 # The git snapshot level -%define gitrev 0 +%define gitrev 1 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -122,7 +122,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 # Kernel headers are being split out into a separate package %if 0%{?fedora} @@ -1881,6 +1881,10 @@ fi # # %changelog +* Tue Dec 04 2018 Justin M. Forbes - 4.20.0-0.rc5.git1.1 +- Linux v4.20-rc5-21-g0072a0c14d5b +- Reenable debugging options. + * Mon Dec 03 2018 Justin M. Forbes - 4.20.0-0.rc5.git0.1 - Linux v4.20-rc5 diff --git a/sources b/sources index 51aee29ae..49ccccf2e 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ SHA512 (linux-4.19.tar.xz) = ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4 SHA512 (patch-4.20-rc5.xz) = 389daea25e1a19050fa2e7f4eb7cc8e462a83560a06b43b5bd8458bfcf3754c987660c2b42f9adeacd956342f4520c45d2982fbee4cfd2b8825f9153db06aaa9 +SHA512 (patch-4.20-rc5-git1.xz) = f1f493c506582ed2a853cc69a1b657b9d238cad48e40446d9abc783a5568e244b61cda9bcd1909bc8a433ed531b1083dfe59f73bae9a7c481a78cb8f26d9d70e From c0dbaa3cc58c41175d5889120d83e60b53b83af4 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Wed, 5 Dec 2018 09:48:42 -0500 Subject: [PATCH 12/13] Fix corruption bug in direct dispatch for blk-mq --- blk-mq-fix-corruption-with-direct-issue.patch | 99 +++++++++++++++++++ kernel.spec | 6 ++ 2 files changed, 105 insertions(+) create mode 100644 blk-mq-fix-corruption-with-direct-issue.patch diff --git a/blk-mq-fix-corruption-with-direct-issue.patch b/blk-mq-fix-corruption-with-direct-issue.patch new file mode 100644 index 000000000..71b9da110 --- /dev/null +++ b/blk-mq-fix-corruption-with-direct-issue.patch @@ -0,0 +1,99 @@ +From ffe81d45322cc3cb140f0db080a4727ea284661e Mon Sep 17 00:00:00 2001 +From: Jens Axboe +Date: Tue, 4 Dec 2018 20:06:48 -0700 +Subject: [PATCH] blk-mq: fix corruption with direct issue + +If we attempt a direct issue to a SCSI device, and it returns BUSY, then +we queue the request up normally. However, the SCSI layer may have +already setup SG tables etc for this particular command. If we later +merge with this request, then the old tables are no longer valid. Once +we issue the IO, we only read/write the original part of the request, +not the new state of it. + +This causes data corruption, and is most often noticed with the file +system complaining about the just read data being invalid: + +[ 235.934465] EXT4-fs error (device sda1): ext4_iget:4831: inode #7142: comm dpkg-query: bad extra_isize 24937 (inode size 256) + +because most of it is garbage... + +This doesn't happen from the normal issue path, as we will simply defer +the request to the hardware queue dispatch list if we fail. Once it's on +the dispatch list, we never merge with it. + +Fix this from the direct issue path by flagging the request as +REQ_NOMERGE so we don't change the size of it before issue. + +See also: + https://bugzilla.kernel.org/show_bug.cgi?id=201685 + +Tested-by: Guenter Roeck +Fixes: 6ce3dd6eec1 ("blk-mq: issue directly if hw queue isn't busy in case of 'none'") +Cc: stable@vger.kernel.org +Signed-off-by: Jens Axboe +Signed-off-by: Jeremy Cline +--- + block/blk-mq.c | 26 +++++++++++++++++++++++++- + 1 file changed, 25 insertions(+), 1 deletion(-) + +diff --git a/block/blk-mq.c b/block/blk-mq.c +index 3f91c6e5b17a..3262d83b9e07 100644 +--- a/block/blk-mq.c ++++ b/block/blk-mq.c +@@ -1715,6 +1715,15 @@ static blk_status_t __blk_mq_issue_directly(struct blk_mq_hw_ctx *hctx, + break; + case BLK_STS_RESOURCE: + case BLK_STS_DEV_RESOURCE: ++ /* ++ * If direct dispatch fails, we cannot allow any merging on ++ * this IO. Drivers (like SCSI) may have set up permanent state ++ * for this request, like SG tables and mappings, and if we ++ * merge to it later on then we'll still only do IO to the ++ * original part. ++ */ ++ rq->cmd_flags |= REQ_NOMERGE; ++ + blk_mq_update_dispatch_busy(hctx, true); + __blk_mq_requeue_request(rq); + break; +@@ -1727,6 +1736,18 @@ static blk_status_t __blk_mq_issue_directly(struct blk_mq_hw_ctx *hctx, + return ret; + } + ++/* ++ * Don't allow direct dispatch of anything but regular reads/writes, ++ * as some of the other commands can potentially share request space ++ * with data we need for the IO scheduler. If we attempt a direct dispatch ++ * on those and fail, we can't safely add it to the scheduler afterwards ++ * without potentially overwriting data that the driver has already written. ++ */ ++static bool blk_rq_can_direct_dispatch(struct request *rq) ++{ ++ return req_op(rq) == REQ_OP_READ || req_op(rq) == REQ_OP_WRITE; ++} ++ + static blk_status_t __blk_mq_try_issue_directly(struct blk_mq_hw_ctx *hctx, + struct request *rq, + blk_qc_t *cookie, +@@ -1748,7 +1769,7 @@ static blk_status_t __blk_mq_try_issue_directly(struct blk_mq_hw_ctx *hctx, + goto insert; + } + +- if (q->elevator && !bypass_insert) ++ if (!blk_rq_can_direct_dispatch(rq) || (q->elevator && !bypass_insert)) + goto insert; + + if (!blk_mq_get_dispatch_budget(hctx)) +@@ -1810,6 +1831,9 @@ void blk_mq_try_issue_list_directly(struct blk_mq_hw_ctx *hctx, + struct request *rq = list_first_entry(list, struct request, + queuelist); + ++ if (!blk_rq_can_direct_dispatch(rq)) ++ break; ++ + list_del_init(&rq->queuelist); + ret = blk_mq_request_issue_directly(rq); + if (ret != BLK_STS_OK) { +-- +2.19.2 + diff --git a/kernel.spec b/kernel.spec index 717c41c19..ba693a61e 100644 --- a/kernel.spec +++ b/kernel.spec @@ -609,6 +609,9 @@ Patch504: iio-accel-kxcjk1013-Add-more-hardware-ids.patch # rhbz 1645070 patch queued upstream for merging into 4.21 Patch505: asus-fx503-keyb.patch +# https://bugzilla.kernel.org/show_bug.cgi?id=201685 +Patch506: blk-mq-fix-corruption-with-direct-issue.patch + # END OF PATCH DEFINITIONS %endif @@ -1881,6 +1884,9 @@ fi # # %changelog +* Wed Dec 05 2018 Jeremy Cline +- Fix corruption bug in direct dispatch for blk-mq + * Tue Dec 04 2018 Justin M. Forbes - 4.20.0-0.rc5.git1.1 - Linux v4.20-rc5-21-g0072a0c14d5b - Reenable debugging options. From 22c4d677f9b880069df8789d65629b27c153c269 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 5 Dec 2018 14:01:46 -0600 Subject: [PATCH 13/13] Linux v4.20-rc5-44-gd08970904582 --- gitrev | 2 +- kernel.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gitrev b/gitrev index c3fc9b484..5d60e8028 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -0072a0c14d5b7cb72c611d396f143f5dcd73ebe2 +d0897090458211f9c6b2d7f5af87f4d3b0403f69 diff --git a/kernel.spec b/kernel.spec index ba693a61e..fbd132010 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 5 # The git snapshot level -%define gitrev 1 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -1884,6 +1884,9 @@ fi # # %changelog +* Wed Dec 05 2018 Justin M. Forbes - 4.20.0-0.rc5.git2.1 +- Linux v4.20-rc5-44-gd08970904582 + * Wed Dec 05 2018 Jeremy Cline - Fix corruption bug in direct dispatch for blk-mq diff --git a/sources b/sources index 49ccccf2e..d5e02b370 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (linux-4.19.tar.xz) = ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4 SHA512 (patch-4.20-rc5.xz) = 389daea25e1a19050fa2e7f4eb7cc8e462a83560a06b43b5bd8458bfcf3754c987660c2b42f9adeacd956342f4520c45d2982fbee4cfd2b8825f9153db06aaa9 -SHA512 (patch-4.20-rc5-git1.xz) = f1f493c506582ed2a853cc69a1b657b9d238cad48e40446d9abc783a5568e244b61cda9bcd1909bc8a433ed531b1083dfe59f73bae9a7c481a78cb8f26d9d70e +SHA512 (patch-4.20-rc5-git2.xz) = 7f7c2f053d314ced612c773a023b171f24c60a7f41878557d77e307239b88b0d12d7532e3ba0b377959a12570fd639d5ad71960e87fdd1d21ff22296c4ea4167