File remove-version-from-list.patch of Package nvme-cli

Overview Repositories Revisions Requests Users Attributes Meta

File remove-version-from-list.patch of Package nvme-cli (Revision 0ae88c1e30e9464168f3f6632db3c525)

Currently displaying revision 0ae88c1e30e9464168f3f6632db3c525 , Show latest

From 6ab2e9ef204053d82c1eb40e514119286749cefe Mon Sep 17 00:00:00 2001
From: Keith Busch <keith.busch@intel.com>
Date: Tue, 30 Aug 2016 08:49:19 -0600
Subject: [PATCH] Remove version from list
Git-commit: 6ab2e9ef204053d82c1eb40e514119286749cefe
References: boo#986891

We can't reliably map controller registers due to kernel memory
protections added in kernel commit 90a545e98, so we are removing its
dependency for the 'list' command to run.

Signed-off-by: Keith Busch <keith.busch@intel.com>
Acked-by: Johannes Thumshirn <jthumshirn@suse.de>
---
 nvme.c |   30 ++++++------------------------
 1 file changed, 6 insertions(+), 24 deletions(-)

--- a/nvme.c
+++ b/nvme.c
@@ -710,23 +710,9 @@ struct list_item {
 	int                 nsid;
 	struct nvme_id_ns   ns;
 	unsigned            block;
-	__le32              ver;
 };
 
 #ifdef LIBUDEV_EXISTS
-/* For pre NVMe 1.2 devices we must get the version from the BAR, not the
- * ctrl_id.*/
-static void get_version(struct list_item* list_item)
-{
-	struct nvme_bar *bar;
-
-	list_item->ver = list_item->ctrl.ver;
-	if (list_item->ctrl.ver)
-		return;
-	get_registers(&bar);
-	list_item->ver = bar->vs;
-}
-
 static void print_list_item(struct list_item list_item)
 {
 
@@ -748,25 +734,22 @@ static void print_list_item(struct list_
 	char format[128];
 	sprintf(format,"%3.0f %2sB + %2d B", (double)lba, l_suffix,
 		list_item.ns.lbaf[(list_item.ns.flbas & 0x0f)].ms);
-	char version[128];
-	sprintf(version,"%d.%d", (list_item.ver >> 16),
-		(list_item.ver >> 8) & 0xff);
 
-	printf("%-16s %-*.*s %-*.*s %-8s %-9d %-26s %-16s %-.*s\n", list_item.node,
+	printf("%-16s %-*.*s %-*.*s %-9d %-26s %-16s %-.*s\n", list_item.node,
             (int)sizeof(list_item.ctrl.sn), (int)sizeof(list_item.ctrl.sn), list_item.ctrl.sn,
             (int)sizeof(list_item.ctrl.mn), (int)sizeof(list_item.ctrl.mn), list_item.ctrl.mn,
-            version, list_item.nsid, usage, format, (int)sizeof(list_item.ctrl.fr), list_item.ctrl.fr);
+            list_item.nsid, usage, format, (int)sizeof(list_item.ctrl.fr), list_item.ctrl.fr);
 }
 
 static void print_list_items(struct list_item *list_items, unsigned len)
 {
 	unsigned i;
 
-	printf("%-16s %-20s %-40s %-8s %-9s %-26s %-16s %-8s\n",
-	    "Node", "SN", "Model", "Version", "Namespace", "Usage", "Format", "FW Rev");
-	printf("%-16s %-20s %-40s %-8s %-9s %-26s %-16s %-8s\n",
+	printf("%-16s %-20s %-40s %-9s %-26s %-16s %-8s\n",
+	    "Node", "SN", "Model", "Namespace", "Usage", "Format", "FW Rev");
+	printf("%-16s %-20s %-40s %-9s %-26s %-16s %-8s\n",
             "----------------", "--------------------", "----------------------------------------",
-            "--------", "---------", "--------------------------", "----------------", "--------");
+            "---------", "--------------------------", "----------------", "--------");
 	for (i = 0 ; i < len ; i++)
 		print_list_item(list_items[i]);
 
@@ -833,7 +816,6 @@ static int list(int argc, char **argv, s
 				return err;
 			strcpy(list_items[count].node, node);
 			list_items[count].block = S_ISBLK(nvme_stat.st_mode);
-			get_version(&list_items[count]);
 			count++;
 		}
 	}

Places

File remove-version-from-list.patch of Package nvme-cli (Revision 0ae88c1e30e9464168f3f6632db3c525)

Places