From 7f2f4f8c2788611888752dba514f50b8ab9d012b Mon Sep 17 00:00:00 2001
From: Than Ngo <than@redhat.com>
Date: Mon, 13 Jan 2025 12:43:20 +0100
Subject: [PATCH] Resolves: RHEL-72514, Added Power11 support for diag_nvme

---
 ...2.7.10-diag_vnme-add-power11-support.patch | 55 +++++++++++++++++++
 ppc64-diag.spec                               |  8 ++-
 2 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 ppc64-diag-2.7.10-diag_vnme-add-power11-support.patch

diff --git a/ppc64-diag-2.7.10-diag_vnme-add-power11-support.patch b/ppc64-diag-2.7.10-diag_vnme-add-power11-support.patch
new file mode 100644
index 0000000..5b18276
--- /dev/null
+++ b/ppc64-diag-2.7.10-diag_vnme-add-power11-support.patch
@@ -0,0 +1,55 @@
+commit 6bfa2ec7a7f424b018fd2e21a70e9d2f04041832
+Author: Barnali Guha Thakurata <barnali@linux.ibm.com>
+Date:   Tue Oct 22 12:05:39 2024 +0530
+
+    Added Power11 support for diag_nvme
+    
+    Without Patch:
+    # diag_nvme nvme0
+    diag_nvme is only supported in PowerVM LPARs and at least Power10 processors
+    
+    With Patch:
+    # diag_nvme nvme0
+    Running diagnostics for nvme0
+    
+    NVMe diag command completed successfully
+    
+    Signed-off-by: Barnali Guha Thakurata <barnali@linux.ibm.com>
+    Signed-off-by: Nilay Shroff <nilay@linux.ibm.com>
+    Reviewed-by: Sathvika Vasireddy <sv@linux.ibm.com>
+    Tested-by: Sathvika Vasireddy <sv@linux.ibm.com>
+
+diff --git a/common/platform.c b/common/platform.c
+index 1359adb..801b924 100644
+--- a/common/platform.c
++++ b/common/platform.c
+@@ -96,6 +96,9 @@ get_processor(void)
+ 	case PVR_POWER10:
+ 		rc = POWER10;
+ 		break;
++	case PVR_POWER11:
++		rc = POWER11;
++		break;
+ 	default:
+ 		rc = PROCESSOR_UNKNOWN;
+ 		break;
+diff --git a/common/platform.h b/common/platform.h
+index b265d1e..ae3ea21 100644
+--- a/common/platform.h
++++ b/common/platform.h
+@@ -36,6 +36,7 @@
+ #define PVR_POWER8	0x004D
+ #define PVR_POWER9	0x004E
+ #define PVR_POWER10	0x0080
++#define PVR_POWER11	0x0082
+ 
+ enum {
+ 	PLATFORM_UNKNOWN = 0,
+@@ -56,6 +57,7 @@ enum {
+ 	POWER8,
+ 	POWER9,
+ 	POWER10,
++	POWER11,
+ };
+ 
+ extern const char *__platform_name[];
diff --git a/ppc64-diag.spec b/ppc64-diag.spec
index 1f01a8c..ed7de99 100644
--- a/ppc64-diag.spec
+++ b/ppc64-diag.spec
@@ -1,6 +1,6 @@
 Name:           ppc64-diag
 Version:        2.7.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        PowerLinux Platform Diagnostics
 URL:            https://github.com/power-ras/%{name}
 License:        GPL-2.0-only
@@ -33,6 +33,9 @@ Source5:        rtas_errd.8
 
 # fix paths and permissions
 Patch0:         ppc64-diag-2.7.9-fedora.patch
+# Upstream fixes
+# Add Power11 support for diag_nvme
+Patch10:        ppc64-diag-2.7.10-diag_vnme-add-power11-support.patch
 
 %description
 This package contains various diagnostic tools for PowerLinux.
@@ -169,6 +172,9 @@ if [ "$1" = "0" ]; then # last uninstall
 fi
 
 %changelog
+* Mon Jan 13 2025 Than Ngo <than@redhat.com> - 2.7.10-2
+- Resolves: RHEL-72514, Added Power11 support for diag_nvme
+
 * Tue Nov 19 2024 Than Ngo <than@redhat.com> - 2.7.10-1
 - Update to 2.7.10
   * Aadd support for multiple platform dumps