[kernel] r22656 - in dists/jessie/linux/debian: . patches patches/bugfix/all patches/bugfix/arm
Ben Hutchings
benh at moszumanska.debian.org
Sun May 17 22:59:18 UTC 2015
Author: benh
Date: Sun May 17 22:59:18 2015
New Revision: 22656
Log:
Fix error messages at boot on systems without an RTC (Closes: #784146)
Added:
dists/jessie/linux/debian/patches/bugfix/all/rtc-hctosys-do-not-treat-lack-of-rtc-device-as-error.patch
dists/jessie/linux/debian/patches/bugfix/all/rtc-hctosys-use-function-name-in-the-error-log.patch
dists/jessie/linux/debian/patches/bugfix/arm/arm-mvebu-armada-xp-openblocks-ax3-4-disable-interna.patch
Modified:
dists/jessie/linux/debian/changelog
dists/jessie/linux/debian/patches/series
Modified: dists/jessie/linux/debian/changelog
==============================================================================
--- dists/jessie/linux/debian/changelog Sun May 17 22:55:04 2015 (r22655)
+++ dists/jessie/linux/debian/changelog Sun May 17 22:59:18 2015 (r22656)
@@ -150,6 +150,10 @@
[ Ben Hutchings ]
* debian.py,gencontrol.py: Fix the version sanity checks for backports
and security/LTS uploads
+ * Fix error messages at boot on systems without an RTC (Closes: #784146):
+ - [armhf] mvebu: armada-xp-openblocks-ax3-4: Disable internal RTC
+ - rtc: hctosys: do not treat lack of RTC device as error
+ - rtc: hctosys: use function name in the error log
[ Ian Campbell ]
* [armhf] Enable support for Freescale SNVS RTC. (Closes: #782364)
Added: dists/jessie/linux/debian/patches/bugfix/all/rtc-hctosys-do-not-treat-lack-of-rtc-device-as-error.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/jessie/linux/debian/patches/bugfix/all/rtc-hctosys-do-not-treat-lack-of-rtc-device-as-error.patch Sun May 17 22:59:18 2015 (r22656)
@@ -0,0 +1,37 @@
+From: Floris Bos <bos at je-eigen-domein.nl>
+Date: Thu, 16 Apr 2015 12:45:12 -0700
+Subject: rtc: hctosys: do not treat lack of RTC device as error
+Origin: https://git.kernel.org/linus/aed98b9a1be6fcf1685dfd37f0a3e78e92a21f7d
+Bug-Debian: https://bugs.debian.org/784146
+
+When using device trees on the ARM platform, it is not certain at compile
+time whether or not the system will have a RTC.
+
+If one enables CONFIG_HCTOSYS just in case the system booted has a RTC,
+and it turns out not to be, this will result in a big fat "unable to open
+rtc device" error being printed to console, even when "quiet" is set in
+the kernel cmdline.
+
+Fix this by outputting the message with loglevel info instead.
+
+Signed-off-by: Floris Bos <bos at je-eigen-domein.nl>
+Cc: Alessandro Zummo <a.zummo at towertech.it>
+Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+---
+ drivers/rtc/hctosys.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/rtc/hctosys.c b/drivers/rtc/hctosys.c
+index 6c719f2..fb4251d 100644
+--- a/drivers/rtc/hctosys.c
++++ b/drivers/rtc/hctosys.c
+@@ -32,7 +32,7 @@ static int __init rtc_hctosys(void)
+ struct rtc_device *rtc = rtc_class_open(CONFIG_RTC_HCTOSYS_DEVICE);
+
+ if (rtc == NULL) {
+- pr_err("%s: unable to open rtc device (%s)\n",
++ pr_info("%s: unable to open rtc device (%s)\n",
+ __FILE__, CONFIG_RTC_HCTOSYS_DEVICE);
+ goto err_open;
+ }
Added: dists/jessie/linux/debian/patches/bugfix/all/rtc-hctosys-use-function-name-in-the-error-log.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/jessie/linux/debian/patches/bugfix/all/rtc-hctosys-use-function-name-in-the-error-log.patch Sun May 17 22:59:18 2015 (r22656)
@@ -0,0 +1,30 @@
+From: Aaro Koskinen <aaro.koskinen at iki.fi>
+Date: Thu, 16 Apr 2015 12:45:54 -0700
+Subject: rtc: hctosys: use function name in the error log
+Origin: https://git.kernel.org/linus/521fca18e828cddc94535a1ea5ac33460f1de679
+Bug-Debian: https://bugs.debian.org/784146
+
+Use function name in the error log instead of __FILE__.
+
+Signed-off-by: Aaro Koskinen <aaro.koskinen at iki.fi>
+Cc: Alexandre Belloni <alexandre.belloni at free-electrons.com>
+Cc: Alessandro Zummo <a.zummo at towertech.it>
+Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+---
+ drivers/rtc/hctosys.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/rtc/hctosys.c b/drivers/rtc/hctosys.c
+index fb4251d..91fb5f3 100644
+--- a/drivers/rtc/hctosys.c
++++ b/drivers/rtc/hctosys.c
+@@ -33,7 +33,7 @@ static int __init rtc_hctosys(void)
+
+ if (rtc == NULL) {
+ pr_info("%s: unable to open rtc device (%s)\n",
+- __FILE__, CONFIG_RTC_HCTOSYS_DEVICE);
++ __func__, CONFIG_RTC_HCTOSYS_DEVICE);
+ goto err_open;
+ }
+
Added: dists/jessie/linux/debian/patches/bugfix/arm/arm-mvebu-armada-xp-openblocks-ax3-4-disable-interna.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/jessie/linux/debian/patches/bugfix/arm/arm-mvebu-armada-xp-openblocks-ax3-4-disable-interna.patch Sun May 17 22:59:18 2015 (r22656)
@@ -0,0 +1,32 @@
+From: Gregory CLEMENT <gregory.clement at free-electrons.com>
+Date: Tue, 14 Apr 2015 11:50:13 +0200
+Subject: ARM: mvebu: armada-xp-openblocks-ax3-4: Disable internal RTC
+Origin: https://git.kernel.org/linus/750e30d4076ae5e02ad13a376e96c95a2627742c
+Bug-Debian: https://bugs.debian.org/784146
+
+There is no crystal connected to the internal RTC on the Open Block
+AX3. So let's disable it in order to prevent the kernel probing the
+driver uselessly. Eventually this patches removes the following
+warning message from the boot log:
+"rtc-mv d0010300.rtc: internal RTC not ticking"
+
+Acked-by: Andrew Lunn <andrew at lunn.ch>
+Signed-off-by: Gregory CLEMENT <gregory.clement at free-electrons.com>
+Cc: <stable at vger.kernel.org> # v3.8 +
+---
+ arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
++++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
+@@ -71,6 +71,10 @@
+ };
+
+ internal-regs {
++ rtc at 10300 {
++ /* No crystal connected to the internal RTC */
++ status = "disabled";
++ };
+ serial at 12000 {
+ status = "okay";
+ };
Modified: dists/jessie/linux/debian/patches/series
==============================================================================
--- dists/jessie/linux/debian/patches/series Sun May 17 22:55:04 2015 (r22655)
+++ dists/jessie/linux/debian/patches/series Sun May 17 22:59:18 2015 (r22656)
@@ -586,3 +586,6 @@
bugfix/all/access_once/0011-kernel-tighten-rules-for-ACCESS-ONCE.patch
bugfix/all/access_once/0012-next-sh-Fix-compile-error.patch
bugfix/all/access_once/0013-kernel-Change-ASSIGN_ONCE-val-x-to-WRITE_ONCE-x-val.patch
+bugfix/arm/arm-mvebu-armada-xp-openblocks-ax3-4-disable-interna.patch
+bugfix/all/rtc-hctosys-do-not-treat-lack-of-rtc-device-as-error.patch
+bugfix/all/rtc-hctosys-use-function-name-in-the-error-log.patch
More information about the Kernel-svn-changes
mailing list