On Tue, Jan 10, 2012 at 08:10:53PM +0000, Cihula, Joseph wrote: > ACK, but tboot_sleep() calls tboot_shutdown() and there are error conditions in that which you are not reflecting upward--i.e. you should make tboot_shutdown() return an 'int' and propagate its errors through tboot_sleep(). Hey Joe, Thanks for looking at the patches. Right now [with this patch applied] the code looks as so: 297 298 tboot_shutdown(acpi_shutdown_map[sleep_state]); 299 return 0; 300 } If we do make tboot_shutdown() return an int, there will be a need to modify other callers: native_machine_emergency_restart, native_machine_halt, native_machine_power_off, and native_play_dead as well. Perhaps that could be done in another patch and leave this one as is where the 'tboot_sleep' would just return 0 instead of 'return tboot_shutdown(...)' ? Perhaps another way to do this is to extract the common code of tboot_sleep and tboot_shutdown? > > Joe > > > -----Original Message----- > > From: Konrad Rzeszutek Wilk [mailto:konrad.wilk@xxxxxxxxxx] > > Sent: Friday, December 16, 2011 2:38 PM > > To: linux-kernel@xxxxxxxxxxxxxxx; rjw@xxxxxxx; x86@xxxxxxxxxx; Brown, Len; Cihula, Joseph; linux- > > pm@xxxxxxxxxxxxxxxxxxxxxxxxxx; tboot-devel@xxxxxxxxxxxxxxxxxxxxx; linux-acpi@xxxxxxxxxxxxxxx; > > liang.tang@xxxxxxxxxx > > Cc: hpa@xxxxxxxxx; Konrad Rzeszutek Wilk > > Subject: [PATCH 2/7] tboot: Add return values for tboot_sleep > > > > . as appropiately. As tboot_sleep now returns values. > > remove tboot_sleep_wrapper. > > > > Suggested-by: "Rafael J. Wysocki" <rjw@xxxxxxx> > > CC: Joseph Cihula <joseph.cihula@xxxxxxxxx> > > [v1: Return -1/0/+1 instead of ACPI_xx values] > > Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx> > > --- > > arch/x86/kernel/tboot.c | 13 ++++--------- > > 1 files changed, 4 insertions(+), 9 deletions(-) > > > > diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c index 1a4ab7d..6410744 100644 > > --- a/arch/x86/kernel/tboot.c > > +++ b/arch/x86/kernel/tboot.c > > @@ -272,7 +272,7 @@ static void tboot_copy_fadt(const struct acpi_table_fadt *fadt) > > offsetof(struct acpi_table_facs, firmware_waking_vector); } > > > > -void tboot_sleep(u8 sleep_state, u32 pm1a_control, u32 pm1b_control) > > +static int tboot_sleep(u8 sleep_state, u32 pm1a_control, u32 > > +pm1b_control) > > { > > static u32 acpi_shutdown_map[ACPI_S_STATE_COUNT] = { > > /* S0,1,2: */ -1, -1, -1, > > @@ -281,7 +281,7 @@ void tboot_sleep(u8 sleep_state, u32 pm1a_control, u32 pm1b_control) > > /* S5: */ TB_SHUTDOWN_S5 }; > > > > if (!tboot_enabled()) > > - return; > > + return 0; > > > > tboot_copy_fadt(&acpi_gbl_FADT); > > tboot->acpi_sinfo.pm1a_cnt_val = pm1a_control; @@ -292,15 +292,10 @@ void tboot_sleep(u8 > > sleep_state, u32 pm1a_control, u32 pm1b_control) > > if (sleep_state >= ACPI_S_STATE_COUNT || > > acpi_shutdown_map[sleep_state] == -1) { > > pr_warning("unsupported sleep state 0x%x\n", sleep_state); > > - return; > > + return -1; > > } > > > > tboot_shutdown(acpi_shutdown_map[sleep_state]); > > -} > > -static int tboot_sleep_wrapper(u8 sleep_state, u32 pm1a_control, > > - u32 pm1b_control) > > -{ > > - tboot_sleep(sleep_state, pm1a_control, pm1b_control); > > return 0; > > } > > > > @@ -352,7 +347,7 @@ static __init int tboot_late_init(void) > > atomic_set(&ap_wfs_count, 0); > > register_hotcpu_notifier(&tboot_cpu_notifier); > > > > - acpi_os_set_prepare_sleep(&tboot_sleep_wrapper); > > + acpi_os_set_prepare_sleep(&tboot_sleep); > > return 0; > > } > > > > -- > > 1.7.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
