From 06cc982c789d77b6932f45f8b75f0809743141c5 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Thu, 5 Nov 2020 09:35:16 -0600 Subject: Linux v5.9.5 Signed-off-by: Justin M. Forbes --- ...avoid-removing-an-event-channel-while-han.patch | 161 --------------------- brcmfmac-BCM4329-Fixes-and-improvement.patch | 118 --------------- .../generic/CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND | 2 +- .../generic/CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL | 2 +- .../fedora/generic/powerpc/CONFIG_PPC_RTAS_FILTER | 1 + kernel-aarch64-debug-fedora.config | 4 +- kernel-aarch64-fedora.config | 4 +- kernel-armv7hl-debug-fedora.config | 4 +- kernel-armv7hl-fedora.config | 4 +- kernel-armv7hl-lpae-debug-fedora.config | 4 +- kernel-armv7hl-lpae-fedora.config | 4 +- kernel-i686-debug-fedora.config | 4 +- kernel-i686-fedora.config | 4 +- kernel-ppc64le-debug-fedora.config | 5 +- kernel-ppc64le-fedora.config | 5 +- kernel-s390x-debug-fedora.config | 4 +- kernel-s390x-fedora.config | 4 +- kernel-x86_64-debug-fedora.config | 4 +- kernel-x86_64-fedora.config | 4 +- kernel.spec | 9 +- memory-tegra-Remove-GPU-from-DRM-IOMMU-group.patch | 113 --------------- sources | 2 +- 22 files changed, 38 insertions(+), 428 deletions(-) delete mode 100644 0001-xen-events-avoid-removing-an-event-channel-while-han.patch create mode 100644 configs/fedora/generic/powerpc/CONFIG_PPC_RTAS_FILTER delete mode 100644 memory-tegra-Remove-GPU-from-DRM-IOMMU-group.patch diff --git a/0001-xen-events-avoid-removing-an-event-channel-while-han.patch b/0001-xen-events-avoid-removing-an-event-channel-while-han.patch deleted file mode 100644 index cd4ac3df3..000000000 --- a/0001-xen-events-avoid-removing-an-event-channel-while-han.patch +++ /dev/null @@ -1,161 +0,0 @@ -From 073d0552ead5bfc7a3a9c01de590e924f11b5dd2 Mon Sep 17 00:00:00 2001 -From: Juergen Gross -Date: Mon, 7 Sep 2020 15:47:27 +0200 -Subject: [PATCH] xen/events: avoid removing an event channel while handling it -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Today it can happen that an event channel is being removed from the -system while the event handling loop is active. This can lead to a -race resulting in crashes or WARN() splats when trying to access the -irq_info structure related to the event channel. - -Fix this problem by using a rwlock taken as reader in the event -handling loop and as writer when deallocating the irq_info structure. - -As the observed problem was a NULL dereference in evtchn_from_irq() -make this function more robust against races by testing the irq_info -pointer to be not NULL before dereferencing it. - -And finally make all accesses to evtchn_to_irq[row][col] atomic ones -in order to avoid seeing partial updates of an array element in irq -handling. Note that irq handling can be entered only for event channels -which have been valid before, so any not populated row isn't a problem -in this regard, as rows are only ever added and never removed. - -This is XSA-331. - -Cc: stable@vger.kernel.org -Reported-by: Marek Marczykowski-Górecki -Reported-by: Jinoh Kang -Signed-off-by: Juergen Gross -Reviewed-by: Stefano Stabellini -Reviewed-by: Wei Liu ---- - drivers/xen/events/events_base.c | 41 ++++++++++++++++++++++++++++---- - 1 file changed, 36 insertions(+), 5 deletions(-) - -diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c -index 6f02c18fa65c..407741ece084 100644 ---- a/drivers/xen/events/events_base.c -+++ b/drivers/xen/events/events_base.c -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - - #ifdef CONFIG_X86 - #include -@@ -71,6 +72,23 @@ const struct evtchn_ops *evtchn_ops; - */ - static DEFINE_MUTEX(irq_mapping_update_lock); - -+/* -+ * Lock protecting event handling loop against removing event channels. -+ * Adding of event channels is no issue as the associated IRQ becomes active -+ * only after everything is setup (before request_[threaded_]irq() the handler -+ * can't be entered for an event, as the event channel will be unmasked only -+ * then). -+ */ -+static DEFINE_RWLOCK(evtchn_rwlock); -+ -+/* -+ * Lock hierarchy: -+ * -+ * irq_mapping_update_lock -+ * evtchn_rwlock -+ * IRQ-desc lock -+ */ -+ - static LIST_HEAD(xen_irq_list_head); - - /* IRQ <-> VIRQ mapping. */ -@@ -105,7 +123,7 @@ static void clear_evtchn_to_irq_row(unsigned row) - unsigned col; - - for (col = 0; col < EVTCHN_PER_ROW; col++) -- evtchn_to_irq[row][col] = -1; -+ WRITE_ONCE(evtchn_to_irq[row][col], -1); - } - - static void clear_evtchn_to_irq_all(void) -@@ -142,7 +160,7 @@ static int set_evtchn_to_irq(evtchn_port_t evtchn, unsigned int irq) - clear_evtchn_to_irq_row(row); - } - -- evtchn_to_irq[row][col] = irq; -+ WRITE_ONCE(evtchn_to_irq[row][col], irq); - return 0; - } - -@@ -152,7 +170,7 @@ int get_evtchn_to_irq(evtchn_port_t evtchn) - return -1; - if (evtchn_to_irq[EVTCHN_ROW(evtchn)] == NULL) - return -1; -- return evtchn_to_irq[EVTCHN_ROW(evtchn)][EVTCHN_COL(evtchn)]; -+ return READ_ONCE(evtchn_to_irq[EVTCHN_ROW(evtchn)][EVTCHN_COL(evtchn)]); - } - - /* Get info for IRQ */ -@@ -261,10 +279,14 @@ static void xen_irq_info_cleanup(struct irq_info *info) - */ - evtchn_port_t evtchn_from_irq(unsigned irq) - { -- if (WARN(irq >= nr_irqs, "Invalid irq %d!\n", irq)) -+ const struct irq_info *info = NULL; -+ -+ if (likely(irq < nr_irqs)) -+ info = info_for_irq(irq); -+ if (!info) - return 0; - -- return info_for_irq(irq)->evtchn; -+ return info->evtchn; - } - - unsigned int irq_from_evtchn(evtchn_port_t evtchn) -@@ -440,16 +462,21 @@ static int __must_check xen_allocate_irq_gsi(unsigned gsi) - static void xen_free_irq(unsigned irq) - { - struct irq_info *info = info_for_irq(irq); -+ unsigned long flags; - - if (WARN_ON(!info)) - return; - -+ write_lock_irqsave(&evtchn_rwlock, flags); -+ - list_del(&info->list); - - set_info_for_irq(irq, NULL); - - WARN_ON(info->refcnt > 0); - -+ write_unlock_irqrestore(&evtchn_rwlock, flags); -+ - kfree(info); - - /* Legacy IRQ descriptors are managed by the arch. */ -@@ -1233,6 +1260,8 @@ static void __xen_evtchn_do_upcall(void) - struct vcpu_info *vcpu_info = __this_cpu_read(xen_vcpu); - int cpu = smp_processor_id(); - -+ read_lock(&evtchn_rwlock); -+ - do { - vcpu_info->evtchn_upcall_pending = 0; - -@@ -1243,6 +1272,8 @@ static void __xen_evtchn_do_upcall(void) - virt_rmb(); /* Hypervisor can set upcall pending. */ - - } while (vcpu_info->evtchn_upcall_pending); -+ -+ read_unlock(&evtchn_rwlock); - } - - void xen_evtchn_do_upcall(struct pt_regs *regs) --- -2.28.0 - diff --git a/brcmfmac-BCM4329-Fixes-and-improvement.patch b/brcmfmac-BCM4329-Fixes-and-improvement.patch index b492f82c9..cd1886d10 100644 --- a/brcmfmac-BCM4329-Fixes-and-improvement.patch +++ b/brcmfmac-BCM4329-Fixes-and-improvement.patch @@ -1,121 +1,3 @@ -From patchwork Sun Aug 30 19:14:37 2020 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Dmitry Osipenko -X-Patchwork-Id: 11745283 -X-Patchwork-Delegate: kvalo@adurom.com -Return-Path: -Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org - [172.30.200.123]) - by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 02F8E722 - for ; - Sun, 30 Aug 2020 19:15:31 +0000 (UTC) -Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) - by mail.kernel.org (Postfix) with ESMTP id D325020757 - for ; - Sun, 30 Aug 2020 19:15:30 +0000 (UTC) -Authentication-Results: mail.kernel.org; - dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com - header.b="XOye4I75" -Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand - id S1726492AbgH3TPQ (ORCPT - ); - Sun, 30 Aug 2020 15:15:16 -0400 -Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36382 "EHLO - lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org - with ESMTP id S1726178AbgH3TPH (ORCPT - ); - Sun, 30 Aug 2020 15:15:07 -0400 -Received: from mail-lf1-x143.google.com (mail-lf1-x143.google.com - [IPv6:2a00:1450:4864:20::143]) - by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7B885C061575; - Sun, 30 Aug 2020 12:15:06 -0700 (PDT) -Received: by mail-lf1-x143.google.com with SMTP id y2so951774lfy.10; - Sun, 30 Aug 2020 12:15:06 -0700 (PDT) -DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; - d=gmail.com; s=20161025; - h=from:to:cc:subject:date:message-id:in-reply-to:references - :mime-version:content-transfer-encoding; - bh=hzL71nqb/6BZxUitP92QceAo8sdBLgT31i3ar+cwVk4=; - b=XOye4I75cIfJ4wkN4RaeluIx+/YAJsxlMpAnP498/xZTl1BTh8eSlfQif5JouocnSh - 14l3fBQ+A+yleGcThqMh1IaJriMgqMbIE00NyGf7Vle0M2E7WLVo9PlrLCn9vtgowgLt - Lr4Mu7V/lWdptapsH5tCqMvP1g5ir1mEsMMokwajMTno6GR0SBVHl/7ypVl5YA3p4HoF - fFymnbrHgHbTrzQ/PoyTHfJ+z2cr7zsyoWJ2DNueWkIQjuS/8ueDks4amJJKs+KgB+yp - +XRynXf/t0fyF8u1wenwv3sbeaCt3sIPLNePGmjRYeaXo5pTqEUgNHd6MH2PGfsDTuU0 - 5MTg== -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:in-reply-to - :references:mime-version:content-transfer-encoding; - bh=hzL71nqb/6BZxUitP92QceAo8sdBLgT31i3ar+cwVk4=; - b=j8AOqXUrl/hkYHnFrnNd2FRUeIHMr2dpaVrKcJBXuHajNJC8b3YN2G9F2K+lkC+ZxC - w1B7sH1DNxY8u4wIuHketyNteuSdFH9vC+VZhu5DY5Bz0snrsLK43fS/8InrBWMd9/OZ - 3bt86DxIWv9szZELmV5sCnwAh5U9CKk95vI5k+mKJLfv8mmqgyJ2rbPBZO0xNWbyRMp3 - Bu+B+ze0mY9xjnOSwXK8dUvlTpRNr9zOeXmzjtWsb3xFgFN1PZ5wiD3bQ5m7XoYqQEXb - Ah+zOiBL3P2mZUM54OyHP+HolPq8/V0zKDuw06na41SW1cJNuZUIG6W1m/x75S6hJO4D - 2lJg== -X-Gm-Message-State: AOAM533MF2BJ56mP1JcVq45SsbuqEwSox1UmefQdmOHheDJSUx5w2LUC - ca86fl0ZnPg4zrXg3bFav48= -X-Google-Smtp-Source: - ABdhPJx6cYCkNqBsgfZJn1WvrwBAiI7kWYd9Yi9pQ5L2953d0O0W457Bcur/fqHaFOJeiOQAPpwzwg== -X-Received: by 2002:a19:f510:: with SMTP id j16mr337056lfb.169.1598814904892; - Sun, 30 Aug 2020 12:15:04 -0700 (PDT) -Received: from localhost.localdomain (109-252-170-211.dynamic.spd-mgts.ru. - [109.252.170.211]) - by smtp.gmail.com with ESMTPSA id - e23sm1409709lfj.80.2020.08.30.12.15.04 - (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); - Sun, 30 Aug 2020 12:15:04 -0700 (PDT) -From: Dmitry Osipenko -To: Arend van Spriel , - Franky Lin , - Hante Meuleman , - Chi-Hsien Lin , - Wright Feng , - Kalle Valo -Cc: linux-wireless@vger.kernel.org, - brcm80211-dev-list.pdl@broadcom.com, - brcm80211-dev-list@cypress.com, netdev@vger.kernel.org, - linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org -Subject: [PATCH v3 1/3] brcmfmac: increase F2 watermark for BCM4329 -Date: Sun, 30 Aug 2020 22:14:37 +0300 -Message-Id: <20200830191439.10017-2-digetx@gmail.com> -X-Mailer: git-send-email 2.27.0 -In-Reply-To: <20200830191439.10017-1-digetx@gmail.com> -References: <20200830191439.10017-1-digetx@gmail.com> -MIME-Version: 1.0 -Sender: linux-wireless-owner@vger.kernel.org -Precedence: bulk -List-ID: -X-Mailing-List: linux-wireless@vger.kernel.org - -This patch fixes SDHCI CRC errors during of RX throughput testing on -BCM4329 chip if SDIO BUS is clocked above 25MHz. In particular the -checksum problem is observed on NVIDIA Tegra20 SoCs. The good watermark -value is borrowed from downstream BCMDHD driver and it's matching to the -value that is already used for the BCM4339 chip, hence let's re-use it -for BCM4329. - -Reviewed-by: Arend van Spriel -Signed-off-by: Dmitry Osipenko ---- - drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c -index d1b96bad2718..b16944a898f9 100644 ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c -@@ -4278,6 +4278,7 @@ static void brcmf_sdio_firmware_callback(struct device *dev, int err, - brcmf_sdiod_writeb(sdiod, SBSDIO_FUNC1_MESBUSYCTRL, - CY_43012_MESBUSYCTRL, &err); - break; -+ case SDIO_DEVICE_ID_BROADCOM_4329: - case SDIO_DEVICE_ID_BROADCOM_4339: - brcmf_dbg(INFO, "set F2 watermark to 0x%x*4 bytes for 4339\n", - CY_4339_F2_WATERMARK); - From patchwork Sun Aug 30 19:14:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 diff --git a/configs/fedora/generic/CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND b/configs/fedora/generic/CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND index 2a186347d..39bec5884 100644 --- a/configs/fedora/generic/CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND +++ b/configs/fedora/generic/CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND @@ -1 +1 @@ -CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set diff --git a/configs/fedora/generic/CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL b/configs/fedora/generic/CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL index c08cd0d5d..97dc33b34 100644 --- a/configs/fedora/generic/CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL +++ b/configs/fedora/generic/CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL @@ -1 +1 @@ -# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y diff --git a/configs/fedora/generic/powerpc/CONFIG_PPC_RTAS_FILTER b/configs/fedora/generic/powerpc/CONFIG_PPC_RTAS_FILTER new file mode 100644 index 000000000..7470f4d4f --- /dev/null +++ b/configs/fedora/generic/powerpc/CONFIG_PPC_RTAS_FILTER @@ -0,0 +1 @@ +CONFIG_PPC_RTAS_FILTER=y diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 874f98236..a9b5d4f5e 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -1116,10 +1116,10 @@ CONFIG_CP15_BARRIER_EMULATION=y # CONFIG_CPU5_WDT is not set # CONFIG_CPU_BIG_ENDIAN is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set -CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set CONFIG_CPUFREQ_DT=m CONFIG_CPUFREQ_DT_PLATDEV=y diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index fdef9e50f..4ea8e7aa3 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -1116,10 +1116,10 @@ CONFIG_CP15_BARRIER_EMULATION=y # CONFIG_CPU5_WDT is not set # CONFIG_CPU_BIG_ENDIAN is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set -CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set CONFIG_CPUFREQ_DT=m CONFIG_CPUFREQ_DT_PLATDEV=y diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index fc808427a..98fc6464f 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -1112,10 +1112,10 @@ CONFIG_CORTINA_PHY=m # CONFIG_CPU_BIG_ENDIAN is not set # CONFIG_CPU_BPREDICT_DISABLE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set -CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set CONFIG_CPUFREQ_DT=m CONFIG_CPUFREQ_DT_PLATDEV=y diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 42594820e..f919629bc 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -1112,10 +1112,10 @@ CONFIG_CORTINA_PHY=m # CONFIG_CPU_BIG_ENDIAN is not set # CONFIG_CPU_BPREDICT_DISABLE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set -CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set CONFIG_CPUFREQ_DT=m CONFIG_CPUFREQ_DT_PLATDEV=y diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index edc82bff7..d4e80dd8a 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -1083,10 +1083,10 @@ CONFIG_CORTINA_PHY=m # CONFIG_CPU_BIG_ENDIAN is not set # CONFIG_CPU_BPREDICT_DISABLE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set -CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set CONFIG_CPUFREQ_DT=m CONFIG_CPUFREQ_DT_PLATDEV=y diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 9da69b9fb..e7bd34357 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -1083,10 +1083,10 @@ CONFIG_CORTINA_PHY=m # CONFIG_CPU_BIG_ENDIAN is not set # CONFIG_CPU_BPREDICT_DISABLE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set -CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set CONFIG_CPUFREQ_DT=m CONFIG_CPUFREQ_DT_PLATDEV=y diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index 11da30a5a..e4530998e 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -909,10 +909,10 @@ CONFIG_CORTINA_PHY=m # CONFIG_CPU5_WDT is not set # CONFIG_CPU_BIG_ENDIAN is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set -CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set # CONFIG_CPUFREQ_DT is not set CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 3560087e3..3becfc86e 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -908,10 +908,10 @@ CONFIG_CORTINA_PHY=m # CONFIG_CPU5_WDT is not set # CONFIG_CPU_BIG_ENDIAN is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set -CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set # CONFIG_CPUFREQ_DT is not set CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index a327bde94..d6d3bf931 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -837,10 +837,10 @@ CONFIG_CORTINA_PHY=m # CONFIG_CPU5_WDT is not set # CONFIG_CPU_BIG_ENDIAN is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set -CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set # CONFIG_CPUFREQ_DT is not set CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y @@ -4258,6 +4258,7 @@ CONFIG_PPC_PSERIES=y # CONFIG_PPC_QUEUED_SPINLOCKS is not set CONFIG_PPC_RADIX_MMU_DEFAULT=y CONFIG_PPC_RADIX_MMU=y +CONFIG_PPC_RTAS_FILTER=y CONFIG_PPC_SMLPAR=y CONFIG_PPC_SPLPAR=y CONFIG_PPC_SUBPAGE_PROT=y diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index d815b6c49..3fbfcfc11 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -836,10 +836,10 @@ CONFIG_CORTINA_PHY=m # CONFIG_CPU5_WDT is not set # CONFIG_CPU_BIG_ENDIAN is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set -CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set # CONFIG_CPUFREQ_DT is not set CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y @@ -4238,6 +4238,7 @@ CONFIG_PPC_PSERIES=y # CONFIG_PPC_QUEUED_SPINLOCKS is not set CONFIG_PPC_RADIX_MMU_DEFAULT=y CONFIG_PPC_RADIX_MMU=y +CONFIG_PPC_RTAS_FILTER=y CONFIG_PPC_SMLPAR=y CONFIG_PPC_SPLPAR=y CONFIG_PPC_SUBPAGE_PROT=y diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index c5406cc7d..6ba4f8021 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -843,10 +843,10 @@ CONFIG_CORTINA_PHY=m # CONFIG_CPU5_WDT is not set CONFIG_CPU_BIG_ENDIAN=y # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set -CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set # CONFIG_CPUFREQ_DT is not set CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 3bf88d07f..c887c0710 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -842,10 +842,10 @@ CONFIG_CORTINA_PHY=m # CONFIG_CPU5_WDT is not set CONFIG_CPU_BIG_ENDIAN=y # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set -CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set # CONFIG_CPUFREQ_DT is not set CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 13dd98c13..1a2c57752 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -921,10 +921,10 @@ CONFIG_CORTINA_PHY=m # CONFIG_CPU5_WDT is not set # CONFIG_CPU_BIG_ENDIAN is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set -CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set # CONFIG_CPUFREQ_DT is not set CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index cdf1b97c4..96c6241f2 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -920,10 +920,10 @@ CONFIG_CORTINA_PHY=m # CONFIG_CPU5_WDT is not set # CONFIG_CPU_BIG_ENDIAN is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set -CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set # CONFIG_CPUFREQ_DT is not set CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y diff --git a/kernel.spec b/kernel.spec index ec448145c..40a7ecf11 100644 --- a/kernel.spec +++ b/kernel.spec @@ -92,7 +92,7 @@ Summary: The Linux kernel %if 0%{?released_kernel} # Do we have a -stable update to apply? -%define stable_update 4 +%define stable_update 5 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -845,7 +845,6 @@ Patch102: arm64-dts-rockchip-disable-USB-type-c-DisplayPort.patch # Tegra fixes Patch105: 0001-PCI-Add-MCFG-quirks-for-Tegra194-host-controllers.patch Patch106: arm64-tegra-Use-valid-PWM-period-for-VDD_GPU-on-Tegra210.patch -Patch107: memory-tegra-Remove-GPU-from-DRM-IOMMU-group.patch # https://www.spinics.net/lists/linux-tegra/msg53605.html Patch108: iommu-tegra-smmu-Fix-TLB-line-for-Tegra210.patch @@ -866,9 +865,6 @@ Patch130: arm64-dts-allwinner-h5-OrangePi-PC2-Fix-ethernet-node.patch # https://patchwork.kernel.org/project/linux-arm-kernel/patch/20201023194902.368239-1-jernej.skrabec@siol.net/ Patch131: arm64-dts-allwinner-h6-Pine-H64-Fix-ethernet-node.patch -# CVE-2020-27675 rhbz 1891114 1891115 -Patch132: 0001-xen-events-avoid-removing-an-event-channel-while-han.patch - # END OF PATCH DEFINITIONS %endif @@ -2982,6 +2978,9 @@ fi # # %changelog +* Thu Nov 5 09:08:36 CST 2020 Justin M. Forbes - 5.9.5-300 +- Linux v5.9.5 + * Wed Nov 4 17:08:50 CST 2020 Justin M. Forbes - 5.9.4-300 - Linux v5.9.4 - Fixes CVE-2020-25668 (rhbz 1893287 1893288) diff --git a/memory-tegra-Remove-GPU-from-DRM-IOMMU-group.patch b/memory-tegra-Remove-GPU-from-DRM-IOMMU-group.patch deleted file mode 100644 index 7b30b78b2..000000000 --- a/memory-tegra-Remove-GPU-from-DRM-IOMMU-group.patch +++ /dev/null @@ -1,113 +0,0 @@ -From patchwork Tue Sep 1 15:32:48 2020 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Thierry Reding -X-Patchwork-Id: 1355200 -Return-Path: -X-Original-To: incoming@patchwork.ozlabs.org -Delivered-To: patchwork-incoming@bilbo.ozlabs.org -Authentication-Results: ozlabs.org; - spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org - (client-ip=23.128.96.18; helo=vger.kernel.org; - envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) -Authentication-Results: ozlabs.org; - dmarc=pass (p=none dis=none) header.from=gmail.com -Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; - unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 - header.s=20161025 header.b=InCwqcJT; dkim-atps=neutral -Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) - by ozlabs.org (Postfix) with ESMTP id 4BgrgN1Rpfz9sWM - for ; Wed, 2 Sep 2020 01:33:04 +1000 (AEST) -Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand - id S1729968AbgIAPdC (ORCPT ); - Tue, 1 Sep 2020 11:33:02 -0400 -Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54580 "EHLO - lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org - with ESMTP id S1729209AbgIAPc4 (ORCPT - ); Tue, 1 Sep 2020 11:32:56 -0400 -Received: from mail-ej1-x642.google.com (mail-ej1-x642.google.com - [IPv6:2a00:1450:4864:20::642]) - by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D7BF6C061244; - Tue, 1 Sep 2020 08:32:54 -0700 (PDT) -Received: by mail-ej1-x642.google.com with SMTP id d11so2241288ejt.13; - Tue, 01 Sep 2020 08:32:54 -0700 (PDT) -DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; - h=from:to:cc:subject:date:message-id:mime-version - :content-transfer-encoding; - bh=zEPKP0AU97R+PVYnTVD02jf9E8X+9qMRm9ouiwdoWWA=; - b=InCwqcJTR/4A4+EuZFsM5xaKx0nFq9NH/7wDwaCpNHNzYmfW1s67o66afdrgjeT+42 - 3/IBsOzuQmvbcTIMqzeilMo8jynJopsDvJ04YORoFPrNoteMPeOR9CGnYRn5sTCTx/F8 - MExLqETfRiiBnfdt5p4S8Fw+UhsQjMtDLGVO+SktivIJKL0jgOtiulaSQfPNJxhuvalA - YnMxjXkFrVLYsf7Q9rHbGANzrB4pQCOFOXTTolGhIm/OgJ1H1t2modzQdKwRXUsADB8L - Wr95PT8IW7Kyqe+GrX2iD2azK1Ul6M6Ln7WgHWIYOkYGFRrhvMpSiRjMe9w0F1HwAjjO - 5qzQ== -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:mime-version - :content-transfer-encoding; - bh=zEPKP0AU97R+PVYnTVD02jf9E8X+9qMRm9ouiwdoWWA=; - b=kZZAjUtuN3hiPdfltUcr+jhnrz7c9rru5yMEq/CkI9aBm/ETez84EH3hV1B78K5P7L - hNmGrJSHJ5IWuxDnUZQfaEPySWbcOwFUhahKgCeHLV/pbdTdosT0dhbnN1YfuCqO0dzc - iPOvOI7WM/A19xKHKPCspaPpluPkBiUabwFLCWWVb06ZBUUNgVhy/7Dx7Ju8GP3kNUaA - Pt0XvSw/Mp/rm2gKvnuDO9QKteP66lw5hvCUTUEIh76d8jMRMY8378JiysKz2wdaz8Fd - BYHMvMGbdRy6TAA/Uez3CT9nV1OyhEST03ttXC1lJTpyHbNiA34oKyeRtqCxxOXza5yA - k22g== -X-Gm-Message-State: AOAM5312YM/x/KVL6Su0HEVLMkmVlAUpCOSazQK4PIdtRtPsaThSHihn - RPsOkzFPKcz36DsW5eZOFaE= -X-Google-Smtp-Source: ABdhPJx8pgbFxwX4+nQIkeKINcUC4+itTbYvBBHcPVcN6ZtaYmSEFVcT5J21t8xvkFqrlVQX3t3VOg== -X-Received: by 2002:a17:907:9c3:: with SMTP id - bx3mr2005039ejc.164.1598974373583; - Tue, 01 Sep 2020 08:32:53 -0700 (PDT) -Received: from localhost ([62.96.65.119]) by smtp.gmail.com with ESMTPSA id - r23sm1371455edt.57.2020.09.01.08.32.52 - (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); - Tue, 01 Sep 2020 08:32:52 -0700 (PDT) -From: Thierry Reding -To: Krzysztof Kozlowski , - Thierry Reding -Cc: Jonathan Hunter , Dmitry Osipenko , - linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, - Matias Zuniga -Subject: [PATCH] memory: tegra: Remove GPU from DRM IOMMU group -Date: Tue, 1 Sep 2020 17:32:48 +0200 -Message-Id: <20200901153248.1831263-1-thierry.reding@gmail.com> -X-Mailer: git-send-email 2.28.0 -MIME-Version: 1.0 -Sender: linux-tegra-owner@vger.kernel.org -Precedence: bulk -List-ID: -X-Mailing-List: linux-tegra@vger.kernel.org - -From: Thierry Reding - -Commit 63a613fdb16c ("memory: tegra: Add gr2d and gr3d to DRM IOMMU -group") added the GPU to the DRM IOMMU group, which doesn't make any -sense. This causes problems when Nouveau tries to attach to the SMMU -and causes it to fall back to using the DMA API. - -Remove the GPU from the DRM groups to restore the old behaviour. The -GPU should always have its own IOMMU domain to make sure it can map -buffers into contiguous chunks (for big page support) without getting -in the way of mappings from the DRM group. - -Fixes: 63a613fdb16c ("memory: tegra: Add gr2d and gr3d to DRM IOMMU group") -Reported-by: Matias Zuniga -Signed-off-by: Thierry Reding -Reviewed-by: Dmitry Osipenko ---- - drivers/memory/tegra/tegra124.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/drivers/memory/tegra/tegra124.c b/drivers/memory/tegra/tegra124.c -index 493b5dc3a4b3..0cede24479bf 100644 ---- a/drivers/memory/tegra/tegra124.c -+++ b/drivers/memory/tegra/tegra124.c -@@ -957,7 +957,6 @@ static const struct tegra_smmu_swgroup tegra124_swgroups[] = { - static const unsigned int tegra124_group_drm[] = { - TEGRA_SWGROUP_DC, - TEGRA_SWGROUP_DCB, -- TEGRA_SWGROUP_GPU, - TEGRA_SWGROUP_VIC, - }; - diff --git a/sources b/sources index 45c7d907c..783f5ea50 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (linux-5.9.tar.xz) = cafd463ca0c9b256479b7dd774f908cedef6d265c44f99de075558ab923808ddfacda1377ae000ce02730c6611527bddffbfc4421bbc4f44fd8e59d97cbc4363 -SHA512 (patch-5.9.4.xz) = cbf45c5c4dd1397b06d94197a1ad7ec2539943adbd91b7f84039648b3595bf2f40cb7ab5e5bd551eca902a7246268698359c238737a038416e8b3fdfa6c7970b +SHA512 (patch-5.9.5.xz) = 7ee5078adee6ba870fa2805a23547bcab2c2020a2a80da48e086d5a01f9c85481e955b06bdab1cf901c6d7f6c03f385e9358efda6a613b0c949c0235c3f3baf8 -- cgit