linux-kernel - [tip:x86/boot] x86/init: Disable pnpbios and rtc for X86_SUBARCH

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Fri, 22 Apr 2016 02:54:59 -0700
From:	"tip-bot for Luis R. Rodriguez" <tipbot@...or.com>
To:	linux-tip-commits@...r.kernel.org
Cc:	mcgrof@...nel.org, peterz@...radead.org, dvlasenk@...hat.com,
	brgerst@...il.com, mingo@...nel.org, bp@...en8.de,
	tglx@...utronix.de, bigeasy@...utronix.de,
	linux-kernel@...r.kernel.org, hpa@...or.com,
	torvalds@...ux-foundation.org, luto@...capital.net
Subject: [tip:x86/boot] x86/init: Disable pnpbios and rtc for
 X86_SUBARCH_CE4100

Commit-ID:  a50b22a7a1e60c48ca26cada362076b54823c501
Gitweb:     http://git.kernel.org/tip/a50b22a7a1e60c48ca26cada362076b54823c501
Author:     Luis R. Rodriguez <mcgrof@...nel.org>
AuthorDate: Wed, 13 Apr 2016 17:04:46 -0700
Committer:  Ingo Molnar <mingo@...nel.org>
CommitDate: Fri, 22 Apr 2016 10:29:09 +0200

x86/init: Disable pnpbios and rtc for X86_SUBARCH_CE4100

As per hpa CE4100 platforms can also disable pnpbios:

  http://lkml.kernel.org/r/5702B5C2.7070101@zytor.com

Then Sebastian also recently noted that CE4100 also disables
RTC probe, to do that Sebastian had long ago added the RTC
of_have_populated_dt() check, he noted that it was meant to
skip the RTC probe on all OF platforms but as of now, CE4100
was the only x86 DT using this.

We can just fold this requirement into the platform quirk
then. This now means that all of these  match platform quirks
for pnpbios and RTC preferences:

  * X86_SUBARCH_XEN
  * X86_SUBARCH_LGUEST
  * X86_SUBARCH_INTEL_MID
  * X86_SUBARCH_CE4100

Also see:

  http://lkml.kernel.org/r/570B52EA.60300@linutronix.de

Suggested-by: H. Peter Anvin <hpa@...or.com>
Suggested-by: Sebastian Andrzej Siewior <bigeasy@...utronix.de>
Signed-off-by: Luis R. Rodriguez <mcgrof@...nel.org>
Cc: Andy Lutomirski <luto@...capital.net>
Cc: Borislav Petkov <bp@...en8.de>
Cc: Brian Gerst <brgerst@...il.com>
Cc: Denys Vlasenko <dvlasenk@...hat.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: andrew.cooper3@...rix.com
Cc: andriy.shevchenko@...ux.intel.com
Cc: boris.ostrovsky@...cle.com
Cc: david.vrabel@...rix.com
Cc: ffainelli@...ebox.fr
Cc: george.dunlap@...rix.com
Cc: glin@...e.com
Cc: jgross@...e.com
Cc: jlee@...e.com
Cc: josh@...htriplett.org
Cc: julien.grall@...aro.org
Cc: konrad.wilk@...cle.com
Cc: kozerkov@...allels.com
Cc: lenb@...nel.org
Cc: lguest@...ts.ozlabs.org
Cc: linux-acpi@...r.kernel.org
Cc: lv.zheng@...el.com
Cc: matt@...eblueprint.co.uk
Cc: mbizon@...ebox.fr
Cc: rjw@...ysocki.net
Cc: robert.moore@...el.com
Cc: rusty@...tcorp.com.au
Cc: tiwai@...e.de
Cc: toshi.kani@...com
Cc: xen-devel@...ts.xensource.com
Link: http://lkml.kernel.org/r/1460592286-300-17-git-send-email-mcgrof@kernel.org
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
 arch/x86/kernel/platform-quirks.c | 1 +
 arch/x86/kernel/rtc.c             | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/arch/x86/kernel/platform-quirks.c b/arch/x86/kernel/platform-quirks.c
index 8539194..b2f8a33 100644
--- a/arch/x86/kernel/platform-quirks.c
+++ b/arch/x86/kernel/platform-quirks.c
@@ -17,6 +17,7 @@ void __init x86_early_init_platform_quirks(void)
 	case X86_SUBARCH_XEN:
 	case X86_SUBARCH_LGUEST:
 	case X86_SUBARCH_INTEL_MID:
+	case X86_SUBARCH_CE4100:
 		x86_platform.legacy.devices.pnpbios = 0;
 		x86_platform.legacy.rtc = 0;
 		break;
diff --git a/arch/x86/kernel/rtc.c b/arch/x86/kernel/rtc.c
index ff4f418..eceaa08 100644
--- a/arch/x86/kernel/rtc.c
+++ b/arch/x86/kernel/rtc.c
@@ -186,9 +186,6 @@ static __init int add_rtc_cmos(void)
 		}
 	}
 #endif
-	if (of_have_populated_dt())
-		return 0;
-
 	if (!x86_platform.legacy.rtc)
 		return -ENODEV;