ieee1275: obdisk driver
Add a new disk driver called obdisk for IEEE1275 platforms. Currently the only platform using this disk driver is SPARC, however other IEEE1275 platforms could start using it if they so choose. While the functionality within the current IEEE1275 ofdisk driver may be suitable for PPC and x86, it presented too many problems on SPARC hardware. Within the old ofdisk, there is not a way to determine the true canonical name for the disk. Within Open Boot, the same disk can have multiple names but all reference the same disk. For example the same disk can be referenced by its SAS WWN, using this form: /pci@302/pci@2/pci@0/pci@17/LSI,sas@0/disk@w5000cca02f037d6d,0 It can also be referenced by its PHY identifier using this form: /pci@302/pci@2/pci@0/pci@17/LSI,sas@0/disk@p0 It can also be referenced by its Target identifier using this form: /pci@302/pci@2/pci@0/pci@17/LSI,sas@0/disk@0 Also, when the LUN=0, it is legal to omit the ,0 from the device name. So with the disk above, before taking into account the device aliases, there are 6 ways to reference the same disk. Then it is possible to have 0 .. n device aliases all representing the same disk. Within this new driver the true canonical name is determined using the the IEEE1275 encode-unit and decode-unit commands when address_cells == 4. This will determine the true single canonical name for the device so multiple ihandles are not opened for the same device. This is what frequently happens with the old ofdisk driver. With some devices when they are opened multiple times it causes the entire system to hang. Another problem solved with this driver is devices that do not have a device alias can be booted and used within GRUB. Within the old ofdisk, this was not possible, unless it was the original boot device. All devices behind a SAS or SCSI parent can be found. Within the old ofdisk, finding these disks relied on there being an alias defined. The alias requirement is not necessary with this new driver. It can also find devices behind a parent after they have been hot-plugged. This is something that is not possible with the old ofdisk driver. The old ofdisk driver also incorrectly assumes that the device pointing to by a device alias is in its true canonical form. This assumption is never made with this new driver. Another issue solved with this driver is that it properly caches the ihandle for all open devices. The old ofdisk tries to do this by caching the last opened ihandle. However this does not work properly because the layer above does not use a consistent device name for the same disk when calling into the driver. This is because the upper layer uses the bootpath value returned within /chosen, other times it uses the device alias, and other times it uses the value within grub.cfg. It does not have a way to figure out that these devices are the same disk. This is not a problem with this new driver. Due to the way GRUB repeatedly opens and closes the same disk. Caching the ihandle is important on SPARC. Without caching, some SAS devices can take 15 - 20 minutes to get to the GRUB menu. This ihandle caching is not possible without correctly having the canonical disk name. When available, this driver also tries to use the deblocker #blocks and a way of determining the disk size. Finally and probably most importantly, this new driver is also capable of seeing all partitions on a GPT disk. With the old driver, the GPT partition table can not be read and only the first partition on the disk can be seen. Signed-off-by: Eric Snowberg <eric.snowberg@oracle.com> Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
parent
6c5ee45548
commit
3434ddec0e
8 changed files with 1120 additions and 1 deletions
|
@ -317,6 +317,7 @@ kernel = {
|
||||||
sparc64_ieee1275 = kern/sparc64/cache.S;
|
sparc64_ieee1275 = kern/sparc64/cache.S;
|
||||||
sparc64_ieee1275 = kern/sparc64/dl.c;
|
sparc64_ieee1275 = kern/sparc64/dl.c;
|
||||||
sparc64_ieee1275 = kern/sparc64/ieee1275/ieee1275.c;
|
sparc64_ieee1275 = kern/sparc64/ieee1275/ieee1275.c;
|
||||||
|
sparc64_ieee1275 = disk/ieee1275/obdisk.c;
|
||||||
|
|
||||||
arm = kern/arm/dl.c;
|
arm = kern/arm/dl.c;
|
||||||
arm = kern/arm/dl_helper.c;
|
arm = kern/arm/dl_helper.c;
|
||||||
|
|
|
@ -66,6 +66,7 @@ get_uuid (const char *name, char **uuid, int getnative)
|
||||||
/* Firmware disks. */
|
/* Firmware disks. */
|
||||||
case GRUB_DISK_DEVICE_BIOSDISK_ID:
|
case GRUB_DISK_DEVICE_BIOSDISK_ID:
|
||||||
case GRUB_DISK_DEVICE_OFDISK_ID:
|
case GRUB_DISK_DEVICE_OFDISK_ID:
|
||||||
|
case GRUB_DISK_DEVICE_OBDISK_ID:
|
||||||
case GRUB_DISK_DEVICE_EFIDISK_ID:
|
case GRUB_DISK_DEVICE_EFIDISK_ID:
|
||||||
case GRUB_DISK_DEVICE_NAND_ID:
|
case GRUB_DISK_DEVICE_NAND_ID:
|
||||||
case GRUB_DISK_DEVICE_ARCDISK_ID:
|
case GRUB_DISK_DEVICE_ARCDISK_ID:
|
||||||
|
|
1076
grub-core/disk/ieee1275/obdisk.c
Normal file
1076
grub-core/disk/ieee1275/obdisk.c
Normal file
File diff suppressed because it is too large
Load diff
|
@ -108,6 +108,9 @@ grub_ieee1275_find_options (void)
|
||||||
if (rc >= 0)
|
if (rc >= 0)
|
||||||
{
|
{
|
||||||
char *ptr;
|
char *ptr;
|
||||||
|
|
||||||
|
if (grub_strncmp (tmp, "sun4v", 5) == 0)
|
||||||
|
grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_RAW_DEVNAMES);
|
||||||
for (ptr = tmp; ptr - tmp < actual; ptr += grub_strlen (ptr) + 1)
|
for (ptr = tmp; ptr - tmp < actual; ptr += grub_strlen (ptr) + 1)
|
||||||
{
|
{
|
||||||
if (grub_memcmp (ptr, "MacRISC", sizeof ("MacRISC") - 1) == 0
|
if (grub_memcmp (ptr, "MacRISC", sizeof ("MacRISC") - 1) == 0
|
||||||
|
|
|
@ -30,6 +30,9 @@
|
||||||
#include <grub/time.h>
|
#include <grub/time.h>
|
||||||
#include <grub/ieee1275/console.h>
|
#include <grub/ieee1275/console.h>
|
||||||
#include <grub/ieee1275/ofdisk.h>
|
#include <grub/ieee1275/ofdisk.h>
|
||||||
|
#ifdef __sparc__
|
||||||
|
#include <grub/ieee1275/obdisk.h>
|
||||||
|
#endif
|
||||||
#include <grub/ieee1275/ieee1275.h>
|
#include <grub/ieee1275/ieee1275.h>
|
||||||
#include <grub/net.h>
|
#include <grub/net.h>
|
||||||
#include <grub/offsets.h>
|
#include <grub/offsets.h>
|
||||||
|
@ -280,8 +283,11 @@ grub_machine_init (void)
|
||||||
grub_console_init_early ();
|
grub_console_init_early ();
|
||||||
grub_claim_heap ();
|
grub_claim_heap ();
|
||||||
grub_console_init_lately ();
|
grub_console_init_lately ();
|
||||||
|
#ifdef __sparc__
|
||||||
|
grub_obdisk_init ();
|
||||||
|
#else
|
||||||
grub_ofdisk_init ();
|
grub_ofdisk_init ();
|
||||||
|
#endif
|
||||||
grub_parse_cmdline ();
|
grub_parse_cmdline ();
|
||||||
|
|
||||||
#ifdef __i386__
|
#ifdef __i386__
|
||||||
|
@ -296,7 +302,11 @@ grub_machine_fini (int flags)
|
||||||
{
|
{
|
||||||
if (flags & GRUB_LOADER_FLAG_NORETURN)
|
if (flags & GRUB_LOADER_FLAG_NORETURN)
|
||||||
{
|
{
|
||||||
|
#ifdef __sparc__
|
||||||
|
grub_obdisk_fini ();
|
||||||
|
#else
|
||||||
grub_ofdisk_fini ();
|
grub_ofdisk_fini ();
|
||||||
|
#endif
|
||||||
grub_console_fini ();
|
grub_console_fini ();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -49,6 +49,7 @@ enum grub_disk_dev_id
|
||||||
GRUB_DISK_DEVICE_CBFSDISK_ID,
|
GRUB_DISK_DEVICE_CBFSDISK_ID,
|
||||||
GRUB_DISK_DEVICE_UBOOTDISK_ID,
|
GRUB_DISK_DEVICE_UBOOTDISK_ID,
|
||||||
GRUB_DISK_DEVICE_XEN,
|
GRUB_DISK_DEVICE_XEN,
|
||||||
|
GRUB_DISK_DEVICE_OBDISK_ID,
|
||||||
};
|
};
|
||||||
|
|
||||||
struct grub_disk;
|
struct grub_disk;
|
||||||
|
|
|
@ -146,6 +146,8 @@ enum grub_ieee1275_flag
|
||||||
GRUB_IEEE1275_FLAG_BROKEN_REPEAT,
|
GRUB_IEEE1275_FLAG_BROKEN_REPEAT,
|
||||||
|
|
||||||
GRUB_IEEE1275_FLAG_CURSORONOFF_ANSI_BROKEN,
|
GRUB_IEEE1275_FLAG_CURSORONOFF_ANSI_BROKEN,
|
||||||
|
|
||||||
|
GRUB_IEEE1275_FLAG_RAW_DEVNAMES,
|
||||||
};
|
};
|
||||||
|
|
||||||
extern int EXPORT_FUNC(grub_ieee1275_test_flag) (enum grub_ieee1275_flag flag);
|
extern int EXPORT_FUNC(grub_ieee1275_test_flag) (enum grub_ieee1275_flag flag);
|
||||||
|
|
25
include/grub/ieee1275/obdisk.h
Normal file
25
include/grub/ieee1275/obdisk.h
Normal file
|
@ -0,0 +1,25 @@
|
||||||
|
/*
|
||||||
|
* GRUB -- GRand Unified Bootloader
|
||||||
|
* Copyright (C) 2019 Free Software Foundation, Inc.
|
||||||
|
*
|
||||||
|
* GRUB is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* GRUB is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef GRUB_OBDISK_HEADER
|
||||||
|
#define GRUB_OBDISK_HEADER 1
|
||||||
|
|
||||||
|
extern void grub_obdisk_init (void);
|
||||||
|
extern void grub_obdisk_fini (void);
|
||||||
|
|
||||||
|
#endif
|
Loading…
Reference in a new issue