943cb82413
- Use %doc for older products for compatibility, or may end up with unsuccessful build result * grub2.spec - Revert grub2-ieee1275-open-raw-mode.patch for regression of crashing lvm on multipath SAN (bsc#1113702) * deleted grub2-ieee1275-open-raw-mode.patch - Add exception handling to FCP lun enumeration (bsc#1113702) * grub2-ieee1275-FCP-methods-for-WWPN-and-LUNs.patch OBS-URL: https://build.opensuse.org/request/show/686299 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=331
142 lines
4.2 KiB
Diff
142 lines
4.2 KiB
Diff
From a7a3ad361b4a75d052e9b4389b44a9f3848f3b9f Mon Sep 17 00:00:00 2001
|
|
From: Diego Domingos <diegodo@linux.vnet.ibm.com>
|
|
Date: Fri, 10 Aug 2018 16:29:50 -0400
|
|
Subject: [PATCH] ieee1275: implement FCP methods for WWPN and LUNs
|
|
|
|
This patch enables the fcp-targets and fcp-luns methods which are
|
|
responsible to get WWPNs and LUNs for fibre channel devices.
|
|
|
|
Those methods are specially necessary if the boot directory and grub
|
|
installation are in different FCP disks, allowing the dev_iterate()
|
|
to find the WWPNs and LUNs when called by searchfs.uuid tool.
|
|
|
|
Signed-off-by: Diego Domingos <diegodo@linux.vnet.ibm.com>
|
|
---
|
|
grub-core/disk/ieee1275/ofdisk.c | 109 ++++++++++++++++++++++++++++++++++++++-
|
|
1 file changed, 108 insertions(+), 1 deletion(-)
|
|
|
|
Index: grub-2.02/grub-core/disk/ieee1275/ofdisk.c
|
|
===================================================================
|
|
--- grub-2.02.orig/grub-core/disk/ieee1275/ofdisk.c
|
|
+++ grub-2.02/grub-core/disk/ieee1275/ofdisk.c
|
|
@@ -209,7 +209,118 @@ dev_iterate_real (const char *name, cons
|
|
static void
|
|
dev_iterate (const struct grub_ieee1275_devalias *alias)
|
|
{
|
|
- if (grub_strcmp (alias->type, "vscsi") == 0)
|
|
+ if (grub_strcmp (alias->type, "fcp") == 0){
|
|
+
|
|
+ /* If we are dealing with fcp devices, we need
|
|
+ * to find the WWPNs and LUNs to iterate them */
|
|
+ grub_ieee1275_ihandle_t ihandle;
|
|
+ grub_uint64_t *ptr_targets, *ptr_luns;
|
|
+ unsigned int i, j, pos;
|
|
+ char *buf, *bufptr;
|
|
+
|
|
+ struct set_fcp_targets_args
|
|
+ {
|
|
+ struct grub_ieee1275_common_hdr common;
|
|
+ grub_ieee1275_cell_t method;
|
|
+ grub_ieee1275_cell_t ihandle;
|
|
+ grub_ieee1275_cell_t catch_result;
|
|
+ grub_ieee1275_cell_t nentries;
|
|
+ grub_ieee1275_cell_t table;
|
|
+ } args_targets;
|
|
+
|
|
+ struct set_fcp_luns_args
|
|
+ {
|
|
+ struct grub_ieee1275_common_hdr common;
|
|
+ grub_ieee1275_cell_t method;
|
|
+ grub_ieee1275_cell_t ihandle;
|
|
+ grub_ieee1275_cell_t wwpn_h;
|
|
+ grub_ieee1275_cell_t wwpn_l;
|
|
+ grub_ieee1275_cell_t catch_result;
|
|
+ grub_ieee1275_cell_t nentries;
|
|
+ grub_ieee1275_cell_t table;
|
|
+ } args_luns;
|
|
+
|
|
+ if(grub_ieee1275_open (alias->path, &ihandle))
|
|
+ {
|
|
+ grub_dprintf("disk", "failed to open the disk while iterating FCP disk path=%s\n", alias->path);
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ INIT_IEEE1275_COMMON (&args_targets.common, "call-method", 2, 3);
|
|
+ args_targets.method = (grub_ieee1275_cell_t) "fcp-targets";
|
|
+ args_targets.ihandle = ihandle;
|
|
+ args_targets.table = 0;
|
|
+ args_targets.nentries = 0;
|
|
+
|
|
+ INIT_IEEE1275_COMMON (&args_luns.common, "call-method", 4, 3);
|
|
+ args_luns.method = (grub_ieee1275_cell_t) "fcp-luns";
|
|
+ args_luns.ihandle = ihandle;
|
|
+ args_luns.table = 0;
|
|
+ args_luns.nentries = 0;
|
|
+
|
|
+ if (IEEE1275_CALL_ENTRY_FN (&args_targets) == -1)
|
|
+ {
|
|
+ grub_dprintf("disk", "failed to get the targets while iterating FCP disk path=%s\n", alias->path);
|
|
+ grub_ieee1275_close(ihandle);
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ buf = grub_malloc (grub_strlen (alias->path) + 32 + 32);
|
|
+
|
|
+ if (!buf)
|
|
+ {
|
|
+ grub_ieee1275_close(ihandle);
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ bufptr = grub_stpcpy (buf, alias->path);
|
|
+
|
|
+ /* For each WWPN discovered we need to find his associated LUNS
|
|
+ * calling the fcp-luns method */
|
|
+ for (i=0; i< args_targets.nentries; i++)
|
|
+ {
|
|
+ ptr_targets = *(grub_uint64_t **) (args_targets.table + 4 + 8 * i);
|
|
+ while(*ptr_targets)
|
|
+ {
|
|
+ args_luns.wwpn_l = (grub_ieee1275_cell_t) (*ptr_targets);
|
|
+ args_luns.wwpn_h = (grub_ieee1275_cell_t) (*ptr_targets >> 32);
|
|
+ pos=grub_snprintf (bufptr, 32, "/disk@%" PRIxGRUB_UINT64_T,
|
|
+ *ptr_targets++);
|
|
+
|
|
+ if (IEEE1275_CALL_ENTRY_FN (&args_luns) == -1)
|
|
+ {
|
|
+ grub_dprintf("disk", "failed to get the LUNS while iterating FCP disk path=%s\n", buf);
|
|
+ grub_ieee1275_close (ihandle);
|
|
+ grub_free (buf);
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ for(j=0;j<args_luns.nentries; j++)
|
|
+ {
|
|
+ ptr_luns = *(grub_uint64_t **) (args_luns.table + 4 + 8*j);
|
|
+
|
|
+ do
|
|
+ {
|
|
+ if (*ptr_luns == 0)
|
|
+ {
|
|
+ dev_iterate_real(buf,buf);
|
|
+ ptr_luns++;
|
|
+ continue;
|
|
+ }
|
|
+ grub_snprintf (&bufptr[pos], 30, ",%" PRIxGRUB_UINT64_T,
|
|
+ *ptr_luns++);
|
|
+ dev_iterate_real(buf,buf);
|
|
+ } while(*ptr_luns);
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+
|
|
+ grub_ieee1275_close (ihandle);
|
|
+ grub_free (buf);
|
|
+ return;
|
|
+
|
|
+ }
|
|
+ else if (grub_strcmp (alias->type, "vscsi") == 0)
|
|
{
|
|
static grub_ieee1275_ihandle_t ihandle;
|
|
struct set_color_args
|