Ensure boot CD can be accessed
PATCH 1/1 Ensure boot CD can be accessed
Detecting BIOS CD device by INT13 "Check Extensions" (AH=42) call does not work for all BIOSes.
This patch fixes this to allow access to the boot CD.
See also thread "[PATCH] Create floppy emulation boot CD with grub-mkimage". The "(cd0" patch from Bean is not included here but should also be applied.
Christian
2008-02-10 Christian Franke <[email protected]>
* disk/i386/pc/biosdisk.c: Include <grub/machine/kernel.h>. (GRUB_MOD_INIT): Make boot CD accessible even if BIOS does not report INT13 Extensions for grub_boot_drive.
* include/grub/i386/pc/biosdisk.h (GRUB_BIOSDISK_MACHINE_CDROM_START):
Change from 0xe0 to 0x9f to cover more BIOS variants.
* include/grub/i386/pc/kernel.h (grub_boot_drive): Add EXPORT_VAR.
disk/i386/pc/biosdisk.c +11 -0
@@ -18,6 +18,7 @@#include <grub/machine/biosdisk.h> #include <grub/machine/memory.h> +#include <grub/machine/kernel.h> #include <grub/disk.h> #include <grub/dl.h> #include <grub/mm.h>
@@ -391,6 +392,16 @@ GRUB_MOD_INIT(biosdisk) } } +/* Some BIOSes do not report INT13 Extensions for the +boot CD. Ensure that the boot CD can be accessed. */ +if (! found + &&GRUB_BIOSDISK_MACHINE_CDROM_START <= grub_boot_drive + && grub_boot_drive <GRUB_BIOSDISK_MACHINE_CDROM_END ) + { + cd_start = grub_boot_drive; + found =1 ; + } + cd_count = found; }
include/grub/i386/pc/biosdisk.h +1 -1
@@ -25,7 +25,7 @@#define GRUB_BIOSDISK_FLAG_LBA 1#define GRUB_BIOSDISK_FLAG_CDROM 2 -#define GRUB_BIOSDISK_MACHINE_CDROM_START 0xe0 +#define GRUB_BIOSDISK_MACHINE_CDROM_START 0x9f#define GRUB_BIOSDISK_MACHINE_CDROM_END 0xf0struct grub_biosdisk_data
include/grub/i386/pc/kernel.h +1 -1
@@ -71,7 +71,7 @@ extern grub_int32_t grub_memdisk_image_sextern char grub_prefix[];/* The boot BIOS drive number. */ -extern grub_int32_t grub_boot_drive; +extern grub_int32_t EXPORT_VAR (grub_boot_drive );/* The root BIOS drive number. */ extern grub_int32_t grub_root_drive;
Quoted 11 lines · Christian Franke
Detecting BIOS CD device by INT13 "Check Extensions" (AH=42) call does not work for all BIOSes.
This patch fixes this to allow access to the boot CD.
See also thread "[PATCH] Create floppy emulation boot CD with grub-mkimage". The "(cd0" patch from Bean is not included here but should also be applied.
Christian
Quoted 8 lines
2008-02-10 Christian Franke <[email protected]>
*
disk/i386/pc/biosdisk.c: Include <grub/machine/kernel.h>. (GRUB_MOD_INIT): Make boot CD accessible even if BIOS does not report INT13 Extensions forgrub_boot_drive.
*include/grub/i386/pc/biosdisk.h(GRUB_BIOSDISK_MACHINE_CDROM_START):
Change from0xe0to0x9fto cover more BIOS variants.
*include/grub/i386/pc/kernel.h(grub_boot_drive): AddEXPORT_VAR.
i think we can assume grub_boot_drive as (cd0) if it's within range, and start scanning from grub_boot_drive + 1.
Signature · 1 line
Bean
Quoted 13 lines · Bean
Quoted 10 lines · Christian Franke
...
2008-02-10 Christian Franke <[email protected]>*
disk/i386/pc/biosdisk.c: Include <grub/machine/kernel.h>. (GRUB_MOD_INIT): Make boot CD accessible even if BIOS does not report INT13 Extensions forgrub_boot_drive.
*include/grub/i386/pc/biosdisk.h(GRUB_BIOSDISK_MACHINE_CDROM_START):
Change from0xe0to0x9fto cover more BIOS variants.
*include/grub/i386/pc/kernel.h(grub_boot_drive): AddEXPORT_VAR.
Quoted 4 lines
i think we can assume
grub_boot_driveas (cd0) if it's within range, and start scanning fromgrub_boot_drive+ 1.
Yes, I will provide a new patch. Should it include your init.c patch?
Christian
Quoted 14 lines · Christian Franke
Quoted 13 lines · Bean
Quoted 10 lines · Christian Franke
...
2008-02-10 Christian Franke <[email protected]>*
disk/i386/pc/biosdisk.c: Include <grub/machine/kernel.h>. (GRUB_MOD_INIT): Make boot CD accessible even if BIOS does not report INT13 Extensions forgrub_boot_drive.
*include/grub/i386/pc/biosdisk.h(GRUB_BIOSDISK_MACHINE_CDROM_START):
Change from0xe0to0x9fto cover more BIOS variants.
*include/grub/i386/pc/kernel.h(grub_boot_drive): AddEXPORT_VAR.
Quoted 6 lines
Quoted 4 lines
i think we can assume
grub_boot_driveas (cd0) if it's within range, and start scanning fromgrub_boot_drive+ 1.Yes, I will provide a new patch. Should it include your
init.cpatch?
you can include it so that the changes can be committed at the same time.
Signature · 1 line
Bean
Quoted 14 lines · Bean
Quoted 12 lines · Christian Franke
Quoted 10 lines · Bean
Quoted 2 lines · Christian Franke
...
i think we can assume
grub_boot_driveas (cd0) if it's within range, and start scanning fromgrub_boot_drive+ 1.
Quoted 6 lines
Quoted 2 lines
Yes, I will provide a new patch. Should it include your
init.cpatch?you can include it so that the changes can be committed at the same time.
New patch below.
Christian
2008-02-10 Christian Franke <[email protected]>
* disk/i386/pc/biosdisk.c: Include <grub/machine/kernel.h>. (GRUB_MOD_INIT): Make boot CD accessible even if BIOS does not report INT13 Extensions for grub_boot_drive. Start CD scanning from grub_boot_drive + 1.
* include/grub/i386/pc/biosdisk.h (GRUB_BIOSDISK_MACHINE_CDROM_START):
Change from 0xe0 to 0x9f to cover more BIOS variants.
* include/grub/i386/pc/kernel.h (grub_boot_drive): Add EXPORT_VAR.
* kern/i386/pc/init.c (make_install_device): Always set boot CD device name to "(cd0)". Patch was provided by Bean.
disk/i386/pc/biosdisk.c +14 -3
@@ -18,6 +18,7 @@#include <grub/machine/biosdisk.h> #include <grub/machine/memory.h> +#include <grub/machine/kernel.h> #include <grub/disk.h> #include <grub/dl.h> #include <grub/mm.h>
@@ -364,7 +365,8 @@ grub_disk_biosdisk_fini (void)GRUB_MOD_INIT (biosdisk) { -int drive, found =0 ; +int drive =GRUB_BIOSDISK_MACHINE_CDROM_START ; +int found =0 ;if (grub_disk_firmware_is_tainted) {
@@ -375,8 +377,17 @@ GRUB_MOD_INIT(biosdisk)grub_disk_dev_register (&grub_biosdisk_dev); -for (drive =GRUB_BIOSDISK_MACHINE_CDROM_START ; - drive <GRUB_BIOSDISK_MACHINE_CDROM_END ; drive++) +/* Some BIOSes do not report INT13 Extensions for the +boot CD. Ensure that the boot CD can be accessed. */ +if (GRUB_BIOSDISK_MACHINE_CDROM_START <= grub_boot_drive + && grub_boot_drive <GRUB_BIOSDISK_MACHINE_CDROM_END ) + { + cd_start = grub_boot_drive; + drive = grub_boot_drive +1 ; + found =1 ; + } + +for ( ; drive <GRUB_BIOSDISK_MACHINE_CDROM_END ; drive++) {if (grub_biosdisk_check_int13_extensions (drive)) {
include/grub/i386/pc/biosdisk.h +1 -1
@@ -25,7 +25,7 @@#define GRUB_BIOSDISK_FLAG_LBA 1#define GRUB_BIOSDISK_FLAG_CDROM 2 -#define GRUB_BIOSDISK_MACHINE_CDROM_START 0xe0 +#define GRUB_BIOSDISK_MACHINE_CDROM_START 0x9f#define GRUB_BIOSDISK_MACHINE_CDROM_END 0xf0struct grub_biosdisk_data
include/grub/i386/pc/kernel.h +1 -1
@@ -71,7 +71,7 @@ extern grub_int32_t grub_memdisk_image_sextern char grub_prefix[];/* The boot BIOS drive number. */ -extern grub_int32_t grub_boot_drive; +extern grub_int32_t EXPORT_VAR (grub_boot_drive );/* The root BIOS drive number. */ extern grub_int32_t grub_root_drive;
kern/i386/pc/init.c +3 -3
@@ -77,9 +77,9 @@ make_install_device (void)if (grub_root_drive ==0xFF ) grub_root_drive = grub_boot_drive; -if (grub_root_drive >=GRUB_BIOSDISK_MACHINE_CDROM_START ) -grub_sprintf (dev,"(cd%u" , - grub_root_drive -GRUB_BIOSDISK_MACHINE_CDROM_START ); +if ((grub_root_drive >=GRUB_BIOSDISK_MACHINE_CDROM_START ) && + (grub_root_drive <GRUB_BIOSDISK_MACHINE_CDROM_END )) +grub_strcpy (dev,"(cd0" );else grub_sprintf (dev, "(%cd%u", (grub_root_drive & 0x80) ? 'h' : 'f',
Quoted 3 lines · Christian Franke
...
New patch below.
Further testing outdated this patch. The boot CD appeared under the following drive numbers:
0x82 (old Toshiba Laptop with unknown BIOS)0x9f (PC with Phoenix-Award BIOS, VMware)0xe0 (VirtualBox)0xef (PC with AMI BIOS, VirtualPC)
Current CVS would only work for 0xe0, with the previous patch it works for all >= 0x9f.
This new patch also handles the case that the CD appears under the legacy controller drive number (0x82 = secondary master). It is accessed as "hd2" in this case.
Christian
2008-02-15 Christian Franke <[email protected]>
* disk/i386/pc/biosdisk.c: Include <grub/machine/kernel.h>. (grub_biosdisk_iterate): Always list boot drive. (grub_biosdisk_open): Assume CD if get diskinfo fails for boot drive not detected as CD before.
(GRUB_MOD_INIT): Make boot CD accessible even if BIOS does not report INT13 Extensions for boot drive. Start CD scanning from grub_boot_drive + 1.
* include/grub/i386/pc/biosdisk.h (GRUB_BIOSDISK_MACHINE_CDROM_START):
Change from 0xe0 to 0x9f to cover more BIOS variants.
* include/grub/i386/pc/kernel.h (grub_boot_drive): Add EXPORT_VAR.
* kern/i386/pc/init.c (make_install_device): Always set boot CD device name to "(cd0)". Patch was provided by Bean.
disk/i386/pc/biosdisk.c +44 -16
@@ -18,6 +18,7 @@#include <grub/machine/biosdisk.h> #include <grub/machine/memory.h> +#include <grub/machine/kernel.h> #include <grub/disk.h> #include <grub/dl.h> #include <grub/mm.h>
@@ -91,6 +92,11 @@ grub_biosdisk_iterate (int (*hook) (consreturn 1 ; } +/* List boot drive as hard disk if not detected as hard disk or CD. */ +if (drive <= grub_boot_drive && grub_boot_drive < cd_start) +if (grub_biosdisk_call_hook (hook, grub_boot_drive)) +return 1 ; +for (drive = cd_start; drive < cd_start + cd_count; drive++)if (grub_biosdisk_call_hook (hook, drive))return 1 ;
@@ -119,12 +125,11 @@ grub_biosdisk_open (const char *name, gr data->drive = drive; data->flags =0 ; -if (drive >= cd_start) - { - data->flags =GRUB_BIOSDISK_FLAG_LBA |GRUB_BIOSDISK_FLAG_CDROM ; - data->sectors =32 ; - total_sectors =9000000 ;/* TODO: get the correct size. */ - } +int is_cd =0 ; + +if (cd_start <= drive && drive < cd_start + cd_count) +/* INT13 Extensions or boot CD detected during init. */ + is_cd =1 ;else if (drive &0x80 ) {/* HDD */
@@ -154,19 +159,32 @@ grub_biosdisk_open (const char *name, gr } } -if (drive < cd_start) +if (! is_cd) { -if (grub_biosdisk_get_diskinfo_standard (drive, - &data->cylinders, - &data->heads, - &data->sectors) !=0 ) +if (!grub_biosdisk_get_diskinfo_standard (drive, + &data->cylinders, + &data->heads, + &data->sectors)) + { +if (! total_sectors) + total_sectors = data->cylinders * data->heads * data->sectors; + } +else if (drive == grub_boot_drive) +/* Some old BIOSes return a legacy controller drive number +for the boot CD. Ensure that the boot CD can be accessed. */ + is_cd =1 ; +else {grub_free (data);return grub_error (GRUB_ERR_BAD_DEVICE ,"cannot get C/H/S values" ); } + } -if (! total_sectors) - total_sectors = data->cylinders * data->heads * data->sectors; +if (is_cd) + { + data->flags =GRUB_BIOSDISK_FLAG_LBA |GRUB_BIOSDISK_FLAG_CDROM ; + data->sectors =32 ; + total_sectors =9000000 ;/* TODO: get the correct size. */ } disk->total_sectors = total_sectors;
@@ -364,7 +382,8 @@ grub_disk_biosdisk_fini (void)GRUB_MOD_INIT (biosdisk) { -int drive, found =0 ; +int drive =GRUB_BIOSDISK_MACHINE_CDROM_START ; +int found =0 ;if (grub_disk_firmware_is_tainted) {
@@ -375,8 +394,17 @@ GRUB_MOD_INIT(biosdisk)grub_disk_dev_register (&grub_biosdisk_dev); -for (drive =GRUB_BIOSDISK_MACHINE_CDROM_START ; - drive <GRUB_BIOSDISK_MACHINE_CDROM_END ; drive++) +/* Some BIOSes do not report INT13 Extensions for the +boot CD. Ensure that the boot CD can be accessed. */ +if (GRUB_BIOSDISK_MACHINE_CDROM_START <= grub_boot_drive + && grub_boot_drive <GRUB_BIOSDISK_MACHINE_CDROM_END ) + { + cd_start = grub_boot_drive; + drive = grub_boot_drive +1 ; + found =1 ; + } + +for ( ; drive <GRUB_BIOSDISK_MACHINE_CDROM_END ; drive++) {if (grub_biosdisk_check_int13_extensions (drive)) {
include/grub/i386/pc/biosdisk.h +1 -1
@@ -25,7 +25,7 @@#define GRUB_BIOSDISK_FLAG_LBA 1#define GRUB_BIOSDISK_FLAG_CDROM 2 -#define GRUB_BIOSDISK_MACHINE_CDROM_START 0xe0 +#define GRUB_BIOSDISK_MACHINE_CDROM_START 0x9f#define GRUB_BIOSDISK_MACHINE_CDROM_END 0xf0struct grub_biosdisk_data
include/grub/i386/pc/kernel.h +1 -1
@@ -71,7 +71,7 @@ extern grub_int32_t grub_memdisk_image_sextern char grub_prefix[];/* The boot BIOS drive number. */ -extern grub_int32_t grub_boot_drive; +extern grub_int32_t EXPORT_VAR (grub_boot_drive );/* The root BIOS drive number. */ extern grub_int32_t grub_root_drive;
kern/i386/pc/init.c +3 -3
@@ -77,9 +77,9 @@ make_install_device (void)if (grub_root_drive ==0xFF ) grub_root_drive = grub_boot_drive; -if (grub_root_drive >=GRUB_BIOSDISK_MACHINE_CDROM_START ) -grub_sprintf (dev,"(cd%u" , - grub_root_drive -GRUB_BIOSDISK_MACHINE_CDROM_START ); +if ((grub_root_drive >=GRUB_BIOSDISK_MACHINE_CDROM_START ) && + (grub_root_drive <GRUB_BIOSDISK_MACHINE_CDROM_END )) +grub_strcpy (dev,"(cd0" );else grub_sprintf (dev, "(%cd%u", (grub_root_drive & 0x80) ? 'h' : 'f',
Quoted 34 lines · Christian Franke
Quoted 3 lines · Christian Franke
...
New patch below.Further testing outdated this patch. The boot CD appeared under the following drive numbers:
0x82(old Toshiba Laptop with unknown BIOS)
0x9f(PC with Phoenix-Award BIOS, VMware)
0xe0(VirtualBox)
0xef(PC with AMI BIOS, VirtualPC)Current CVS would only work for
0xe0, with the previous patch it works for all >=0x9f.This new patch also handles the case that the CD appears under the legacy controller drive number (
0x82= secondary master). It is accessed as "hd2" in this case.Christian
2008-02-15 Christian Franke <[email protected]>
*
disk/i386/pc/biosdisk.c: Include <grub/machine/kernel.h>. (grub_biosdisk_iterate): Always list boot drive. (grub_biosdisk_open): Assume CD if get diskinfo fails for boot drive not detected as CD before.(
GRUB_MOD_INIT): Make boot CD accessible even if BIOS does not report INT13 Extensions for boot drive. Start CD scanning from
Quoted 6 lines
grub_boot_drive+ 1.
*include/grub/i386/pc/biosdisk.h(GRUB_BIOSDISK_MACHINE_CDROM_START):
Change from0xe0to0x9fto cover more BIOS variants.
*include/grub/i386/pc/kernel.h(grub_boot_drive): AddEXPORT_VAR.
*kern/i386/pc/init.c(make_install_device): Always set boot CD device name to "(cd0)". Patch was provided by Bean.
I'm thinking, is there a more generic way to test for cd drive ? also, if the cd drive can appear as (hd2), maybe we can use (hdx) for other cases as well, such as (hd96), etc. The name might be a little strange, but we can get the bios drive number quite easily, which can be useful sometimes (some boot loader need to know the boot drive number).
Signature · 1 line
Bean
Quoted 24 lines · Bean
Quoted 12 lines · Christian Franke
...
Further testing outdated this patch. The boot CD appeared under the following drive numbers:
0x82(old Toshiba Laptop with unknown BIOS)
0x9f(PC with Phoenix-Award BIOS, VMware)
0xe0(VirtualBox)
0xef(PC with AMI BIOS, VirtualPC)Current CVS would only work for
0xe0, with the previous patch it works for all >=0x9f.Quoted 8 lines
This new patch also handles the case that the CD appears under the legacy controller drive number (
0x82= secondary master). It is accessed as "hd2" in this case.Christian
...
Quoted 8 lines
I'm thinking, is there a more generic way to test for cd drive ? also, if the cd drive can appear as (hd2), maybe we can use (hdx) for other cases as well, such as (hd96), etc. The name might be a little strange, but we can get the bios drive number quite easily, which can be useful sometimes (some boot loader need to know the boot drive number).
Good point.
Besides the heuristics "(boot drive >= 0x9f) => (likely a boot CD)", there is apparently no clean method to distinguish CD from HDD on the legacy BIOS call level.
Is the special handling for CD in grub_biosdisk_rw() necessary, or can it be generalized to work with both CD and HDD? In the latter case, no actual CD detection is necessary.
So is would be probably better to remove the (cdN) device names and accept funny names like e.g. (hd111) for boot CD 0xef. It also would be easier to track down problems when the boot device number is no longer hidden behind (cd0).
BTW: None of the BIOSes I tested provided access to a second (non-boot) CD drive.
Christian
Quoted 46 lines · Christian Franke
Quoted 26 lines · Bean
Quoted 13 lines · Christian Franke
...
Further testing outdated this patch. The boot CD appeared under the following drive numbers:
0x82(old Toshiba Laptop with unknown BIOS)
0x9f(PC with Phoenix-Award BIOS, VMware)
0xe0(VirtualBox)
0xef(PC with AMI BIOS, VirtualPC)Current CVS would only work for
0xe0, with the previous patch it works for all >=0x9f.Quoted 9 lines
This new patch also handles the case that the CD appears under the legacy controller drive number (
0x82= secondary master). It is accessed as "hd2" in this case.Christian
...
Quoted 8 lines
I'm thinking, is there a more generic way to test for cd drive ? also, if the cd drive can appear as (hd2), maybe we can use (hdx) for other cases as well, such as (hd96), etc. The name might be a little strange, but we can get the bios drive number quite easily, which can be useful sometimes (some boot loader need to know the boot drive number).
Good point.
Besides the heuristics "(boot drive >=
0x9f) => (likely a boot CD)", there is apparently no clean method to distinguish CD from HDD on the legacy BIOS call level.Is the special handling for CD in
grub_biosdisk_rw()necessary, or can it be generalized to work with both CD and HDD? In the latter case, no actual CD detection is necessary.
Quoted 7 lines
So is would be probably better to remove the (cdN) device names and accept funny names like e.g. (hd111) for boot CD
0xef. It also would be easier to track down problems when the boot device number is no longer hidden behind (cd0).BTW: None of the BIOSes I tested provided access to a second (non-boot) CD drive.
I take a look at grub legacy, it uses INT 13 FUNC 4B01 to check for cdrom, maybe i can write a patch later.
Signature · 1 line
Bean