Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[init] Remove concept of "shutdown exit flags"
Remove the concept of shutdown exit flags, and replace it with a
counter used to keep track of exposed interfaces that require devices
to remain active.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
  • Loading branch information
mcb30 committed Jan 27, 2011
1 parent 35a5039 commit 962cada
Show file tree
Hide file tree
Showing 17 changed files with 64 additions and 37 deletions.
6 changes: 3 additions & 3 deletions src/arch/i386/drivers/net/undionly.c
Expand Up @@ -114,13 +114,13 @@ struct root_device undi_root_device __root_device = {
/**
* Prepare for exit
*
* @v flags Shutdown flags
* @v booting System is shutting down for OS boot
*/
static void undionly_shutdown ( int flags ) {
static void undionly_shutdown ( int booting ) {
/* If we are shutting down to boot an OS, clear the "keep PXE
* stack" flag.
*/
if ( flags & SHUTDOWN_BOOT )
if ( booting )
preloaded_undi.flags &= ~UNDI_FL_KEEP_ALL;
}

Expand Down
2 changes: 1 addition & 1 deletion src/arch/i386/image/bzimage.c
Expand Up @@ -477,7 +477,7 @@ static int bzimage_exec ( struct image *image ) {
bzimage_update_header ( image, &bzimg, bzimg.rm_kernel );

/* Prepare for exiting */
shutdown ( SHUTDOWN_BOOT );
shutdown_boot();

DBGC ( image, "bzImage %p jumping to RM kernel at %04x:0000 "
"(stack %04x:%04zx)\n", image, ( bzimg.rm_kernel_seg + 0x20 ),
Expand Down
2 changes: 1 addition & 1 deletion src/arch/i386/image/elfboot.c
Expand Up @@ -48,7 +48,7 @@ static int elfboot_exec ( struct image *image ) {
/* An ELF image has no callback interface, so we need to shut
* down before invoking it.
*/
shutdown ( SHUTDOWN_BOOT );
shutdown_boot();

/* Jump to OS with flat physical addressing */
DBGC ( image, "ELF %p starting execution at %lx\n", image, entry );
Expand Down
2 changes: 1 addition & 1 deletion src/arch/i386/image/multiboot.c
Expand Up @@ -278,7 +278,7 @@ static int multiboot_exec ( struct image *image ) {
/* Multiboot images may not return and have no callback
* interface, so shut everything down prior to booting the OS.
*/
shutdown ( SHUTDOWN_BOOT );
shutdown_boot();

/* Build memory map after unhiding bootloader memory regions as part of
* shutting everything down.
Expand Down
2 changes: 1 addition & 1 deletion src/arch/i386/image/nbi.c
Expand Up @@ -406,7 +406,7 @@ static int nbi_exec ( struct image *image ) {
/* Shut down now if NBI image will not return */
may_return = NBI_PROGRAM_RETURNS ( imgheader.flags );
if ( ! may_return )
shutdown ( SHUTDOWN_BOOT );
shutdown_boot();

/* Execute NBI image */
if ( NBI_LINEAR_EXEC_ADDR ( imgheader.flags ) ) {
Expand Down
8 changes: 6 additions & 2 deletions src/arch/i386/interface/pcbios/int13.c
Expand Up @@ -1209,8 +1209,10 @@ static int int13_hook ( struct uri *uri, unsigned int drive ) {
int13->cylinders, int13->heads, int13->sectors_per_track );

/* Hook INT 13 vector if not already hooked */
if ( list_empty ( &int13s ) )
if ( list_empty ( &int13s ) ) {
int13_hook_vector();
devices_get();
}

/* Add to list of emulated drives */
list_add ( &int13->list, &int13s );
Expand Down Expand Up @@ -1277,8 +1279,10 @@ static void int13_unhook ( unsigned int drive ) {
DBGC ( int13, "INT13 drive %02x unregistered\n", int13->drive );

/* Unhook INT 13 vector if no more drives */
if ( list_empty ( &int13s ) )
if ( list_empty ( &int13s ) ) {
devices_put();
int13_unhook_vector();
}

/* Drop list's reference to drive */
ref_put ( &int13->refcnt );
Expand Down
2 changes: 2 additions & 0 deletions src/arch/i386/interface/pxe/pxe_call.c
Expand Up @@ -448,6 +448,7 @@ void pxe_activate ( struct net_device *netdev ) {
if ( ! int_1a_hooked ) {
hook_bios_interrupt ( 0x1a, ( unsigned int ) pxe_int_1a,
&pxe_int_1a_vector );
devices_get();
int_1a_hooked = 1;
}

Expand Down Expand Up @@ -475,6 +476,7 @@ int pxe_deactivate ( void ) {
strerror ( rc ) );
return rc;
}
devices_put();
int_1a_hooked = 0;
}

Expand Down
2 changes: 1 addition & 1 deletion src/arch/i386/interface/pxe/pxe_preboot.c
Expand Up @@ -290,7 +290,7 @@ PXENV_EXIT_t pxenv_stop_undi ( struct s_PXENV_STOP_UNDI *stop_undi ) {
pxe_deactivate();

/* Prepare for unload */
shutdown ( SHUTDOWN_BOOT );
shutdown_boot();

/* Check to see if we still have any hooked interrupts */
if ( hooked_bios_interrupts != 0 ) {
Expand Down
4 changes: 2 additions & 2 deletions src/arch/i386/interface/syslinux/comboot_call.c
Expand Up @@ -531,7 +531,7 @@ static __asmcall void int22 ( struct i386_all_regs *ix86 ) {
break;

/* Perform final cleanup */
shutdown ( SHUTDOWN_BOOT );
shutdown_boot();

/* Perform sequence of copies */
shuffle ( ix86->segs.es, ix86->regs.di, ix86->regs.cx );
Expand Down Expand Up @@ -608,7 +608,7 @@ static __asmcall void int22 ( struct i386_all_regs *ix86 ) {
break;

/* Perform final cleanup */
shutdown ( SHUTDOWN_BOOT );
shutdown_boot();

/* Perform sequence of copies */
shuffle ( ix86->segs.es, ix86->regs.di, ix86->regs.cx );
Expand Down
7 changes: 5 additions & 2 deletions src/core/device.c
Expand Up @@ -35,6 +35,9 @@ FILE_LICENCE ( GPL2_OR_LATER );
/** Registered root devices */
static LIST_HEAD ( devices );

/** Device removal inhibition counter */
int device_keep_count = 0;

/**
* Probe a root device
*
Expand Down Expand Up @@ -87,11 +90,11 @@ static void probe_devices ( void ) {
* Remove all devices
*
*/
static void remove_devices ( int flags ) {
static void remove_devices ( int booting __unused ) {
struct root_device *rootdev;
struct root_device *tmp;

if ( flags & SHUTDOWN_KEEP_DEVICES ) {
if ( device_keep_count != 0 ) {
DBG ( "Refusing to remove devices on shutdown\n" );
return;
}
Expand Down
2 changes: 1 addition & 1 deletion src/core/main.c
Expand Up @@ -85,7 +85,7 @@ __asmcall int main ( void ) {
shell();
}

shutdown ( SHUTDOWN_EXIT | shutdown_exit_flags );
shutdown_exit();

return 0;
}
6 changes: 3 additions & 3 deletions src/drivers/net/efi/snponly.c
Expand Up @@ -114,13 +114,13 @@ struct root_device snp_root_device __root_device = {
/**
* Prepare for exit
*
* @v flags Shutdown flags
* @v booting System is shutting down for OS boot
*/
static void snponly_shutdown ( int flags ) {
static void snponly_shutdown ( int booting ) {
/* If we are shutting down to boot an OS, make sure the SNP does not
* stay active.
*/
if ( flags & SHUTDOWN_BOOT )
if ( booting )
snponly_dev.removal_state = EfiSimpleNetworkStopped;
}

Expand Down
2 changes: 1 addition & 1 deletion src/image/efi_image.c
Expand Up @@ -39,7 +39,7 @@ static EFI_EVENT efi_shutdown_event;
*/
static EFIAPI void efi_shutdown_hook ( EFI_EVENT event __unused,
void *context __unused ) {
shutdown ( SHUTDOWN_BOOT );
shutdown_boot();
}

/**
Expand Down
18 changes: 18 additions & 0 deletions src/include/ipxe/device.h
Expand Up @@ -112,6 +112,24 @@ struct root_driver {
/** Declare a root device */
#define __root_device __table_entry ( ROOT_DEVICES, 01 )

extern int device_keep_count;

/**
* Prevent devices from being removed on shutdown
*
*/
static inline void devices_get ( void ) {
device_keep_count++;
}

/**
* Allow devices to be removed on shutdown
*
*/
static inline void devices_put ( void ) {
device_keep_count--;
}

extern struct device * identify_device ( struct interface *intf );
#define identify_device_TYPE( object_type ) \
typeof ( struct device * ( object_type ) )
Expand Down
30 changes: 18 additions & 12 deletions src/include/ipxe/init.h
Expand Up @@ -32,16 +32,6 @@ struct init_fn {

/** @} */

/** Shutdown flags */
enum shutdown_flags {
/** Shutdown is in order to exit (return to iPXE's caller) */
SHUTDOWN_EXIT = 0x0001,
/** Shutdown is in order to boot an OS */
SHUTDOWN_BOOT = 0x0002,
/** Do not remove devices */
SHUTDOWN_KEEP_DEVICES = 0x0004,
};

/**
* A startup/shutdown function
*
Expand All @@ -50,7 +40,7 @@ enum shutdown_flags {
*/
struct startup_fn {
void ( * startup ) ( void );
void ( * shutdown ) ( int flags );
void ( * shutdown ) ( int booting );
};

/** Startup/shutdown function table */
Expand All @@ -76,6 +66,22 @@ struct startup_fn {

extern void initialise ( void );
extern void startup ( void );
extern void shutdown ( int flags );
extern void shutdown ( int booting );

/**
* Shut down system for OS boot
*
*/
static inline void shutdown_boot ( void ) {
shutdown ( 1 );
}

/**
* Shut down system for exit back to firmware
*
*/
static inline void shutdown_exit ( void ) {
shutdown ( 0 );
}

#endif /* _IPXE_INIT_H */
2 changes: 0 additions & 2 deletions src/include/usr/autoboot.h
Expand Up @@ -12,8 +12,6 @@ FILE_LICENCE ( GPL2_OR_LATER );
#include <ipxe/in.h>
struct net_device;

extern int shutdown_exit_flags;

extern int netboot ( struct net_device *netdev );
extern int autoboot ( void );
extern int boot_next_server_and_filename ( struct in_addr next_server,
Expand Down
4 changes: 0 additions & 4 deletions src/usr/autoboot.c
Expand Up @@ -40,9 +40,6 @@ FILE_LICENCE ( GPL2_OR_LATER );
*
*/

/** Shutdown flags for exit */
int shutdown_exit_flags = 0;

/**
* Perform PXE menu boot when PXE stack is not available
*/
Expand Down Expand Up @@ -193,7 +190,6 @@ int boot_root_path ( const char *root_path ) {
if ( fetch_intz_setting ( NULL, &keep_san_setting ) != 0 ) {
printf ( "Preserving connection to SAN device %#02x\n",
drive );
shutdown_exit_flags |= SHUTDOWN_KEEP_DEVICES;
goto err_keep_san;
}

Expand Down

0 comments on commit 962cada

Please sign in to comment.