| Message ID | 1459987594-5434-9-git-send-email-mcgrof@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 04/06/2016 08:06 PM, Luis R. Rodriguez wrote: > There is already a check for apm_info.bios == 0, the > apm_info.bios is set from the boot_params.apm_bios_info. > Both Xen and lguest, which are also the only ones that set > paravirt_enabled to true, never set the apm_bios.info. The > > Xen folks are sure force disable to 0 is not needed, Because apm_info lives in .bss (which we recently made sure is cleared on Xen PV). May be worth mentioning in the commit message so that we don't forget why this is not needed. I think you also have this statement in other patches. -boris > we > recently forced disabled this on lguest. With this in place > the paravirt_enabled() check is simply not needed anymore. > > Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org> > --- > arch/x86/kernel/apm_32.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c > index 9307f182fe30..c7364bd633e1 100644 > --- a/arch/x86/kernel/apm_32.c > +++ b/arch/x86/kernel/apm_32.c > @@ -2267,7 +2267,7 @@ static int __init apm_init(void) > > dmi_check_system(apm_dmi_table); > > - if (apm_info.bios.version == 0 || paravirt_enabled() || machine_is_olpc()) { > + if (apm_info.bios.version == 0 || machine_is_olpc()) { > printk(KERN_INFO "apm: BIOS not found.\n"); > return -ENODEV; > }
On Thu, Apr 07, 2016 at 09:08:36AM -0400, Boris Ostrovsky wrote: > On 04/06/2016 08:06 PM, Luis R. Rodriguez wrote: > >There is already a check for apm_info.bios == 0, the > >apm_info.bios is set from the boot_params.apm_bios_info. > >Both Xen and lguest, which are also the only ones that set > >paravirt_enabled to true, never set the apm_bios.info. The > > > >Xen folks are sure force disable to 0 is not needed, > > Because apm_info lives in .bss (which we recently made sure is > cleared on Xen PV). May be worth mentioning in the commit message so > that we don't forget why this is not needed. Thanks, I'll change that last paragraph with: Xen folks are sure force disable to 0 is not needed because apm_info lives in .bss, we recently forced disabled this on lguest, and on the Xen side just to be sure Boris zeroed out the .bss for PV guests through commit 04b6b4a56884327c1648 ("xen/x86: Zero out .bss for PV guests"). With this care taken into consideration the paravirt_enabled() check is simply not needed anymore. > I think you also have this statement in other patches. Indeed, I'll highlight this on the tboot commit log as well. Luis
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c index 9307f182fe30..c7364bd633e1 100644 --- a/arch/x86/kernel/apm_32.c +++ b/arch/x86/kernel/apm_32.c @@ -2267,7 +2267,7 @@ static int __init apm_init(void) dmi_check_system(apm_dmi_table); - if (apm_info.bios.version == 0 || paravirt_enabled() || machine_is_olpc()) { + if (apm_info.bios.version == 0 || machine_is_olpc()) { printk(KERN_INFO "apm: BIOS not found.\n"); return -ENODEV; }
There is already a check for apm_info.bios == 0, the apm_info.bios is set from the boot_params.apm_bios_info. Both Xen and lguest, which are also the only ones that set paravirt_enabled to true, never set the apm_bios.info. The Xen folks are sure force disable to 0 is not needed, we recently forced disabled this on lguest. With this in place the paravirt_enabled() check is simply not needed anymore. Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org> --- arch/x86/kernel/apm_32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)