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@zytor.com> Suggested-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org> Cc: Andy Lutomirski <luto@amacapital.net> Cc: Borislav Petkov <bp@alien8.de> Cc: Brian Gerst <brgerst@gmail.com> Cc: Denys Vlasenko <dvlasenk@redhat.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: andrew.cooper3@citrix.com Cc: andriy.shevchenko@linux.intel.com Cc: boris.ostrovsky@oracle.com Cc: david.vrabel@citrix.com Cc: ffainelli@freebox.fr Cc: george.dunlap@citrix.com Cc: glin@suse.com Cc: jgross@suse.com Cc: jlee@suse.com Cc: josh@joshtriplett.org Cc: julien.grall@linaro.org Cc: konrad.wilk@oracle.com Cc: kozerkov@parallels.com Cc: lenb@kernel.org Cc: lguest@lists.ozlabs.org Cc: linux-acpi@vger.kernel.org Cc: lv.zheng@intel.com Cc: matt@codeblueprint.co.uk Cc: mbizon@freebox.fr Cc: rjw@rjwysocki.net Cc: robert.moore@intel.com Cc: rusty@rustcorp.com.au Cc: tiwai@suse.de Cc: toshi.kani@hp.com Cc: xen-devel@lists.xensource.com Link: http://lkml.kernel.org/r/1460592286-300-17-git-send-email-mcgrof@kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Родитель
f6935b7bfb
Коммит
a50b22a7a1
|
@ -17,6 +17,7 @@ void __init x86_early_init_platform_quirks(void)
|
||||||
case X86_SUBARCH_XEN:
|
case X86_SUBARCH_XEN:
|
||||||
case X86_SUBARCH_LGUEST:
|
case X86_SUBARCH_LGUEST:
|
||||||
case X86_SUBARCH_INTEL_MID:
|
case X86_SUBARCH_INTEL_MID:
|
||||||
|
case X86_SUBARCH_CE4100:
|
||||||
x86_platform.legacy.devices.pnpbios = 0;
|
x86_platform.legacy.devices.pnpbios = 0;
|
||||||
x86_platform.legacy.rtc = 0;
|
x86_platform.legacy.rtc = 0;
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -186,9 +186,6 @@ static __init int add_rtc_cmos(void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
if (of_have_populated_dt())
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
if (!x86_platform.legacy.rtc)
|
if (!x86_platform.legacy.rtc)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче