summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2020-09-01 13:57:36 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2020-09-01 13:57:36 -0500
commit50137282fa79d92b77e94e4e6573b07c5ca50adc (patch)
treeecb32fef0c1db64b13ad23b8ca0015c958f2b7de
parent0338eb127a5171ecaee1eb5d7c62add37e1f3812 (diff)
downloadkernel-50137282fa79d92b77e94e4e6573b07c5ca50adc.tar.gz
kernel-50137282fa79d92b77e94e4e6573b07c5ca50adc.tar.xz
kernel-50137282fa79d92b77e94e4e6573b07c5ca50adc.zip
kernel-5.9.0-0.rc3.20200901gitb51594df17d0.1
* Tue Sep 01 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc3.20200901gitb51594df17d0.1] - b51594df17d0 rebase - Fedora filter update ("Justin M. Forbes") - Config update for Fedora ("Justin M. Forbes") - Updated changelog for the release based on v5.9-rc3 (Fedora Kernel Team) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
-rw-r--r--kernel-armv7hl-debug-fedora.config3
-rw-r--r--kernel-armv7hl-fedora.config3
-rw-r--r--kernel-armv7hl-lpae-debug-fedora.config3
-rw-r--r--kernel-armv7hl-lpae-fedora.config3
-rw-r--r--kernel.spec22
-rw-r--r--media-ti-vpe-cal-Fix-compilation-on-32-bit-ARM.patch87
-rw-r--r--sources6
7 files changed, 113 insertions, 14 deletions
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index c16df8833..d201db760 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -5118,6 +5118,7 @@ CONFIG_POWER_RESET=y
# CONFIG_POWER_SUPPLY_DEBUG is not set
CONFIG_POWER_SUPPLY_HWMON=y
CONFIG_POWER_SUPPLY=y
+# CONFIG_PPC_PROT_SAO_LPAR is not set
# CONFIG_PPC_PTDUMP is not set
# CONFIG_PPC_QUEUED_SPINLOCKS is not set
CONFIG_PPDEV=m
@@ -8041,7 +8042,7 @@ CONFIG_VIDEO_SUNXI_CEDRUS=m
CONFIG_VIDEO_SUNXI=y
CONFIG_VIDEO_TEGRA_HDMI_CEC=m
CONFIG_VIDEO_TEGRA=m
-# CONFIG_VIDEO_TI_CAL is not set
+CONFIG_VIDEO_TI_CAL=m
# CONFIG_VIDEO_TI_VPE_DEBUG is not set
CONFIG_VIDEO_TI_VPE=m
CONFIG_VIDEO_TM6000_ALSA=m
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index b27f46cb9..d0dab36f0 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -5100,6 +5100,7 @@ CONFIG_POWER_RESET=y
# CONFIG_POWER_SUPPLY_DEBUG is not set
CONFIG_POWER_SUPPLY_HWMON=y
CONFIG_POWER_SUPPLY=y
+# CONFIG_PPC_PROT_SAO_LPAR is not set
# CONFIG_PPC_PTDUMP is not set
# CONFIG_PPC_QUEUED_SPINLOCKS is not set
CONFIG_PPDEV=m
@@ -8021,7 +8022,7 @@ CONFIG_VIDEO_SUNXI_CEDRUS=m
CONFIG_VIDEO_SUNXI=y
CONFIG_VIDEO_TEGRA_HDMI_CEC=m
CONFIG_VIDEO_TEGRA=m
-# CONFIG_VIDEO_TI_CAL is not set
+CONFIG_VIDEO_TI_CAL=m
# CONFIG_VIDEO_TI_VPE_DEBUG is not set
CONFIG_VIDEO_TI_VPE=m
CONFIG_VIDEO_TM6000_ALSA=m
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index 8c86199b3..88bafaa32 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -4987,6 +4987,7 @@ CONFIG_POWER_RESET=y
# CONFIG_POWER_SUPPLY_DEBUG is not set
CONFIG_POWER_SUPPLY_HWMON=y
CONFIG_POWER_SUPPLY=y
+# CONFIG_PPC_PROT_SAO_LPAR is not set
# CONFIG_PPC_PTDUMP is not set
# CONFIG_PPC_QUEUED_SPINLOCKS is not set
CONFIG_PPDEV=m
@@ -7768,7 +7769,7 @@ CONFIG_VIDEO_SUNXI_CEDRUS=m
CONFIG_VIDEO_SUNXI=y
CONFIG_VIDEO_TEGRA_HDMI_CEC=m
CONFIG_VIDEO_TEGRA=m
-# CONFIG_VIDEO_TI_CAL is not set
+CONFIG_VIDEO_TI_CAL=m
# CONFIG_VIDEO_TI_VPE_DEBUG is not set
CONFIG_VIDEO_TI_VPE=m
CONFIG_VIDEO_TM6000_ALSA=m
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 3e6f9db29..5d5f9e2e9 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -4969,6 +4969,7 @@ CONFIG_POWER_RESET=y
# CONFIG_POWER_SUPPLY_DEBUG is not set
CONFIG_POWER_SUPPLY_HWMON=y
CONFIG_POWER_SUPPLY=y
+# CONFIG_PPC_PROT_SAO_LPAR is not set
# CONFIG_PPC_PTDUMP is not set
# CONFIG_PPC_QUEUED_SPINLOCKS is not set
CONFIG_PPDEV=m
@@ -7748,7 +7749,7 @@ CONFIG_VIDEO_SUNXI_CEDRUS=m
CONFIG_VIDEO_SUNXI=y
CONFIG_VIDEO_TEGRA_HDMI_CEC=m
CONFIG_VIDEO_TEGRA=m
-# CONFIG_VIDEO_TI_CAL is not set
+CONFIG_VIDEO_TI_CAL=m
# CONFIG_VIDEO_TI_VPE_DEBUG is not set
CONFIG_VIDEO_TI_VPE=m
CONFIG_VIDEO_TM6000_ALSA=m
diff --git a/kernel.spec b/kernel.spec
index d36de6b3b..aeb933537 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -30,7 +30,7 @@ Summary: The Linux kernel
# For a stable, released kernel, released_kernel should be 1.
%global released_kernel 0
-%global distro_build 0.rc3.1
+%global distro_build 0.rc3.20200901gitb51594df17d0.1
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -69,13 +69,13 @@ Summary: The Linux kernel
%endif
%define rpmversion 5.9.0
-%define pkgrelease 0.rc3.1
+%define pkgrelease 0.rc3.20200901gitb51594df17d0.1
# This is needed to do merge window version magic
%define patchlevel 9
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc3.1%{?buildid}%{?dist}
+%define specrelease 0.rc3.20200901gitb51594df17d0.1%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -166,7 +166,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
# The kernel tarball/base version
%define kversion 5.9
@@ -567,7 +567,7 @@ BuildRequires: asciidoc
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.9-rc3.tar.xz
+Source0: linux-20200901gitb51594df17d0.tar.xz
Source1: Makefile.rhelver
@@ -789,6 +789,7 @@ Patch71: 0001-arch-x86-Remove-vendor-specific-CPU-ID-checks.patch
Patch72: 0001-Fixes-acpi-prefer-booting-with-ACPI-over-DTS-to-be-R.patch
Patch73: 0001-Work-around-for-gcc-bug-https-gcc.gnu.org-bugzilla-s.patch
Patch74: 0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch
+Patch75: media-ti-vpe-cal-Fix-compilation-on-32-bit-ARM.patch
%endif
@@ -1284,8 +1285,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.9-rc3 -c
-mv linux-5.9-rc3 linux-%{KVERREL}
+%setup -q -n kernel-20200901gitb51594df17d0 -c
+mv linux-20200901gitb51594df17d0 linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
@@ -1365,6 +1366,7 @@ ApplyOptionalPatch 0001-arch-x86-Remove-vendor-specific-CPU-ID-checks.patch
ApplyOptionalPatch 0001-Fixes-acpi-prefer-booting-with-ACPI-over-DTS-to-be-R.patch
ApplyOptionalPatch 0001-Work-around-for-gcc-bug-https-gcc.gnu.org-bugzilla-s.patch
ApplyOptionalPatch 0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch
+ApplyOptionalPatch media-ti-vpe-cal-Fix-compilation-on-32-bit-ARM.patch
%endif
@@ -2793,6 +2795,12 @@ fi
#
#
%changelog
+* Tue Sep 01 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc3.20200901gitb51594df17d0.1]
+- b51594df17d0 rebase
+- Fedora filter update ("Justin M. Forbes")
+- Config update for Fedora ("Justin M. Forbes")
+- Updated changelog for the release based on v5.9-rc3 (Fedora Kernel Team)
+
* Mon Aug 31 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc3.1]
- v5.9-rc3 rebase
- Updated changelog for the release based on 1127b219ce94 (Fedora Kernel Team)
diff --git a/media-ti-vpe-cal-Fix-compilation-on-32-bit-ARM.patch b/media-ti-vpe-cal-Fix-compilation-on-32-bit-ARM.patch
new file mode 100644
index 000000000..7b3106d43
--- /dev/null
+++ b/media-ti-vpe-cal-Fix-compilation-on-32-bit-ARM.patch
@@ -0,0 +1,87 @@
+From patchwork Sun Aug 23 05:02:57 2020
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+X-Patchwork-Submitter: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+X-Patchwork-Id: 11731393
+Return-Path: <SRS0=AvQq=CB=vger.kernel.org=linux-media-owner@kernel.org>
+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 6A6B8722
+ for <patchwork-linux-media@patchwork.kernel.org>;
+ Sun, 23 Aug 2020 05:03:38 +0000 (UTC)
+Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
+ by mail.kernel.org (Postfix) with ESMTP id 4BE052078D
+ for <patchwork-linux-media@patchwork.kernel.org>;
+ Sun, 23 Aug 2020 05:03:38 +0000 (UTC)
+Authentication-Results: mail.kernel.org;
+ dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com
+ header.b="wna3R5am"
+Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
+ id S1725830AbgHWFDb (ORCPT
+ <rfc822;patchwork-linux-media@patchwork.kernel.org>);
+ Sun, 23 Aug 2020 01:03:31 -0400
+Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34518 "EHLO
+ lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
+ with ESMTP id S1725139AbgHWFDa (ORCPT
+ <rfc822;linux-media@vger.kernel.org>);
+ Sun, 23 Aug 2020 01:03:30 -0400
+Received: from perceval.ideasonboard.com (perceval.ideasonboard.com
+ [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])
+ by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 207F3C061573
+ for <linux-media@vger.kernel.org>;
+ Sat, 22 Aug 2020 22:03:29 -0700 (PDT)
+Received: from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])
+ by perceval.ideasonboard.com (Postfix) with ESMTPSA id A2664279;
+ Sun, 23 Aug 2020 07:03:19 +0200 (CEST)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;
+ s=mail; t=1598158999;
+ bh=pCzlECsGsGlZ009xXDAzUUxxYRXREdIH2Vxcu2J4NoA=;
+ h=From:To:Cc:Subject:Date:From;
+ b=wna3R5amAoR1l5Bmtiiw+v3SgMfm4JGvJoymrg8wCxrgljpMw51vRaGS5lfqlBLAx
+ SkDqbTJZUQJjKa0GsXajUzf8ZHpISmrWLNVuWuw66UhpZoZGzNy7aGhZEvT6bHCD8a
+ 87cN/DkwIVoRggoROSztWe6nUCcHqFElhdsy6oGA=
+From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+To: linux-media@vger.kernel.org
+Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>,
+ Benoit Parrot <bparrot@ti.com>
+Subject: [PATCH] media: ti-vpe: cal: Fix compilation on 32-bit ARM
+Date: Sun, 23 Aug 2020 08:02:57 +0300
+Message-Id: <20200823050257.564-1-laurent.pinchart@ideasonboard.com>
+X-Mailer: git-send-email 2.27.0
+MIME-Version: 1.0
+Sender: linux-media-owner@vger.kernel.org
+Precedence: bulk
+List-ID: <linux-media.vger.kernel.org>
+X-Mailing-List: linux-media@vger.kernel.org
+
+When compiled on 32-bit ARM, the CAL driver fails with the FIELD_PREP()
+macro complaining that the mask is not constant. While all callers of
+the inline cal_write_field() function pass a constant mask, the mask
+parameter itself is a variable, which likely doesn't please the
+compiler.
+
+Fix it by replacing FIELD_PREP() with a manual implementation.
+
+Fixes: 50797fb30b95 ("media: ti-vpe: cal: Turn reg_(read|write)_field() into inline functions")
+Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+Reviewed-by: Sakari Ailus <sakari.ailus@linux.intel.com>
+Reported-by: Sakari Ailus <sakari.ailus@linux.intel.com>
+Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
+---
+ drivers/media/platform/ti-vpe/cal.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/media/platform/ti-vpe/cal.h b/drivers/media/platform/ti-vpe/cal.h
+index e496083715d2..4123405ee0cf 100644
+--- a/drivers/media/platform/ti-vpe/cal.h
++++ b/drivers/media/platform/ti-vpe/cal.h
+@@ -226,7 +226,7 @@ static inline void cal_write_field(struct cal_dev *cal, u32 offset, u32 value,
+ u32 val = cal_read(cal, offset);
+
+ val &= ~mask;
+- val |= FIELD_PREP(mask, value);
++ val |= (value << __ffs(mask)) & mask;
+ cal_write(cal, offset, val);
+ }
+
diff --git a/sources b/sources
index 08422567b..43120b893 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.9-rc3.tar.xz) = 2e03e9a24d87c4cd7017e37ecdf00c9f60fc2c7dcf0f2f206329b496d73a851e6521141561029643fc6975342bcaf4ec7071453c36708298ef52c7fd1fad46a3
-SHA512 (kernel-abi-whitelists-5.9.0-0.rc3.1.tar.bz2) = e63350f5fceccddf80e7d61dc4d04438fcc721e2f9e01e2a9a86ce46849a97f48f52a6b0a3ab43cec8984007ac3476ff0c34b0e9702ec92b47eb407891b1a50e
-SHA512 (kernel-kabi-dw-5.9.0-0.rc3.1.tar.bz2) = 70532f17e25ed57c1256b4af7bbb60f02713f3ddc07111a737fe85bf713665883ae9acab610bbcfea8fbbfd5638b72306d6b4c1fae93f91c4e7150a652593744
+SHA512 (linux-20200901gitb51594df17d0.tar.xz) = 1e8d531d664decb6fd2f3551653fcf70fa37ccf0829d6f0b07e926d05a2db140b8306f21c406ad34fb60268dbd2a6004be4336fd8cb554c3bf32fa5a35a040b0
+SHA512 (kernel-abi-whitelists-5.9.0-0.rc3.20200901gitb51594df17d0.1.tar.bz2) = a316cc3bd337cc50af752d67b564d2bc9065a15d9f77a27655ff3bc96b06f00bb1dbb57fcee25e7da7a64eb2412f340643bfabc2c165ccccddd1973d6f785b72
+SHA512 (kernel-kabi-dw-5.9.0-0.rc3.20200901gitb51594df17d0.1.tar.bz2) = 282572842fd64c20efd5b338e080f34909c801814ee1c0f8f4fd0e3011b45885cb8d2ab77a99caf6b33f9c74203c304be74abf12bdf5d94801148d8017ab81fe