From d57472f3302dea7441f1e063b0a3f53513b9bbc1 Mon Sep 17 00:00:00 2001
From: Gary Lin <glin@suse.com>
Date: Thu, 4 Oct 2018 10:32:07 +0800
Subject: [PATCH 028/272] linux/getroot: Support NVDIMM device names

There are two types of NVDIMM block devices in linux: fsdax and blk.
For fsdax, the device name would be /dev/pmemXpY, /dev/pmemXsY,
/dev/pmemX.YpZ, or /dev/pmemX.YsZ.
For blk, the name would be /dev/ndblkX.YpZ or /dev/ndblkX.YsZ
---
 grub-core/osdep/linux/getroot.c | 44 +++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c
index 0c6c12945..8b33d7f6f 100644
--- a/grub-core/osdep/linux/getroot.c
+++ b/grub-core/osdep/linux/getroot.c
@@ -967,6 +967,50 @@ grub_util_part_to_disk (const char *os_dev, struct stat *st,
 	  *pp = '\0';
 	  return path;
 	}
+
+      /* If this is a NVDIMM device in fsdax mode */
+      if (strncmp ("pmem", p, 4) == 0 && p[4] >= '0' && p[4] <= '9')
+	{
+	  /* /dev/pmem[0-9]+(\.[0-9]+)?((p[0-9]+)?|s[0-9]*) */
+	  char *pp = strchr (p + 4, 'p');
+	  if (pp)
+	    {
+	      *is_part = 1;
+	      *pp = '\0';
+	    }
+	  else
+	    {
+	      pp = strchr (p + 4, 's');
+	      if (pp && pp[1] >= '0' && pp[1] <= '9')
+		{
+		  *is_part = 1;
+		  pp[1] = '\0';
+		}
+	    }
+	  return path;
+	}
+
+      /* If this is a NVDIMM device in block mode */
+      if (strncmp ("ndblk", p, 5) == 0 && p[5] >= '0' && p[5] <= '9')
+	{
+	  /* /dev/ndblk[0-9]+\.[0-9]+((p[0-9]+)?|s[0-9]*) */
+	  char *pp = strchr (p + 5, 'p');
+	  if (pp)
+	    {
+	      *is_part = 1;
+	      *pp = '\0';
+	    }
+	  else
+	    {
+	      pp = strchr (p + 5, 's');
+	      if (pp && pp[1] >= '0' && pp[1] <= '9')
+		{
+		  *is_part = 1;
+		  pp[1] = '\0';
+		}
+	    }
+	  return path;
+	}
     }
 
   return path;
-- 
2.41.0