48 lines
1.6 KiB
Diff
48 lines
1.6 KiB
Diff
From f35826423ed9e7618696c382e062de60bb655569 Mon Sep 17 00:00:00 2001
|
|
From: Eric Snowberg <eric.snowberg@oracle.com>
|
|
Date: Thu, 1 Mar 2018 19:25:09 -0800
|
|
Subject: [PATCH] sparc64: Limit nvme of_path_of_nvme to just SPARC
|
|
|
|
Limit NVMe of_path_of_nvme to just SPARC hardware for now. It has been
|
|
found that non-Open Firmware hardware platforms can some how access
|
|
this function.
|
|
|
|
Signed-off-by: Eric Snowberg <eric.snowberg@oracle.com>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
---
|
|
grub-core/osdep/linux/ofpath.c | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/grub-core/osdep/linux/ofpath.c b/grub-core/osdep/linux/ofpath.c
|
|
index 61806212e83..a6153d35954 100644
|
|
--- a/grub-core/osdep/linux/ofpath.c
|
|
+++ b/grub-core/osdep/linux/ofpath.c
|
|
@@ -350,6 +350,7 @@ of_path_of_ide(const char *sys_devname __attribute__((unused)), const char *devi
|
|
return ret;
|
|
}
|
|
|
|
+#ifdef __sparc__
|
|
static char *
|
|
of_path_of_nvme(const char *sys_devname __attribute__((unused)),
|
|
const char *device,
|
|
@@ -396,6 +397,7 @@ of_path_of_nvme(const char *sys_devname __attribute__((unused)),
|
|
free (sysfs_path);
|
|
return of_path;
|
|
}
|
|
+#endif
|
|
|
|
static int
|
|
vendor_is_ATA(const char *path)
|
|
@@ -728,9 +730,11 @@ grub_util_devname_to_ofpath (const char *sys_devname)
|
|
/* All the models I've seen have a devalias "floppy".
|
|
New models have no floppy at all. */
|
|
ofpath = xstrdup ("floppy");
|
|
+#ifdef __sparc__
|
|
else if (device[0] == 'n' && device[1] == 'v' && device[2] == 'm'
|
|
&& device[3] == 'e')
|
|
ofpath = of_path_of_nvme (name_buf, device, devnode, devicenode);
|
|
+#endif
|
|
else
|
|
{
|
|
grub_util_warn (_("unknown device type %s"), device);
|