Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Leap:15.2:PowerPC
lshw
lshw-nvme.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File lshw-nvme.patch of Package lshw
From 7b1863bd61c1751a67b020820f4243a4df4b379a Mon Sep 17 00:00:00 2001 From: Harry Mallon <harry.mallon@codex.online> Date: Mon, 25 Mar 2019 19:44:14 +0000 Subject: [PATCH] add support for /dev/nvmeX NVMe controllers * Added nvme scanning for controllers /dev/nvme[0-9]+ * Added nvme scanning for namespaces /dev/nvme[0-9]+n[0-9]+ * Fill in namespaces as disks * Teach partition scanning about nvme partitions /dev/nvme[0-9]+n[0-9]+p[0-9]+ --- src/core/Makefile | 5 +- src/core/main.cc | 4 ++ src/core/nvme.cc | 156 +++++++++++++++++++++++++++++++++++++++++ src/core/nvme.h | 7 ++ src/core/partitions.cc | 17 +++-- src/core/sysfs.cc | 15 ++++ src/core/sysfs.h | 3 + 7 files changed, 199 insertions(+), 8 deletions(-) create mode 100644 src/core/nvme.cc create mode 100644 src/core/nvme.h Index: lshw-B.02.18+git.20191228/src/core/Makefile =================================================================== --- lshw-B.02.18+git.20191228.orig/src/core/Makefile +++ lshw-B.02.18+git.20191228/src/core/Makefile @@ -8,7 +8,7 @@ LDFLAGS= LDSTATIC= LIBS= -OBJS = hw.o main.o print.o mem.o dmi.o device-tree.o cpuinfo.o osutils.o pci.o version.o cpuid.o ide.o cdrom.o pcmcia-legacy.o scsi.o s390.o disk.o spd.o network.o isapnp.o pnp.o fb.o options.o usb.o sysfs.o display.o heuristics.o parisc.o cpufreq.o partitions.o blockio.o lvm.o ideraid.o pcmcia.o volumes.o mounts.o smp.o abi.o jedec.o dump.o fat.o virtio.o vio.o +OBJS = hw.o main.o print.o mem.o dmi.o device-tree.o cpuinfo.o osutils.o pci.o version.o cpuid.o ide.o cdrom.o pcmcia-legacy.o scsi.o nvme.o s390.o disk.o spd.o network.o isapnp.o pnp.o fb.o options.o usb.o sysfs.o display.o heuristics.o parisc.o cpufreq.o partitions.o blockio.o lvm.o ideraid.o pcmcia.o volumes.o mounts.o smp.o abi.o jedec.o dump.o fat.o virtio.o vio.o ifeq ($(SQLITE), 1) OBJS+= db.o endif @@ -23,7 +23,7 @@ lib$(PACKAGENAME).a: $(OBJS) $(AR) rs $@ $^ install: all - + clean: rm -f $(OBJS) lib$(PACKAGENAME).a @@ -51,6 +51,7 @@ ide.o: version.h cpuinfo.h hw.h osutils. cdrom.o: version.h cdrom.h hw.h partitions.h pcmcia-legacy.o: version.h pcmcia-legacy.h hw.h osutils.h scsi.o: version.h mem.h hw.h cdrom.h disk.h osutils.h heuristics.h sysfs.h +nvme.o: version.h hw.h disk.h osutils.h sysfs.h disk.o: version.h disk.h hw.h osutils.h heuristics.h partitions.h spd.o: version.h spd.h hw.h osutils.h network.o: version.h config.h network.h hw.h osutils.h sysfs.h options.h Index: lshw-B.02.18+git.20191228/src/core/main.cc =================================================================== --- lshw-B.02.18+git.20191228.orig/src/core/main.cc +++ lshw-B.02.18+git.20191228/src/core/main.cc @@ -29,6 +29,7 @@ #include "pcmcia-legacy.h" #include "ide.h" #include "scsi.h" +#include "nvme.h" #include "spd.h" #include "network.h" #include "isapnp.h" @@ -132,6 +133,9 @@ bool scan_system(hwNode & system) status("SCSI"); if (enabled("scsi")) scan_scsi(computer); + status("NVMe"); + if (enabled("nvme")) + scan_nvme(computer); status("S/390 devices"); if (enabled("s390")) scan_s390_devices(computer); Index: lshw-B.02.18+git.20191228/src/core/nvme.cc =================================================================== --- /dev/null +++ lshw-B.02.18+git.20191228/src/core/nvme.cc @@ -0,0 +1,156 @@ +#include "version.h" +#include "disk.h" +#include "osutils.h" +#include "sysfs.h" +#include "hw.h" +#include <glob.h> +#include <libgen.h> + +#include <string> + +__ID("@(#) $Id$"); + +#define CLASS_NVME "nvme" +#define NVMEX "/dev/nvme[0-9]*" +#define NVMEXNX "/dev/nvme[0-9]*n[0-9]*" + +static void scan_controllers(hwNode & n) +{ + glob_t entries; + size_t j; + + if(glob(NVMEX, 0, NULL, &entries) == 0) + { + for(j=0; j < entries.gl_pathc; j++) + { + if(matches(entries.gl_pathv[j], "^/dev/nvme[[:digit:]]+$")) + { + string businfo = ""; + string logicalname = ""; + hwNode *device = NULL; + + logicalname = basename(entries.gl_pathv[j]); + if (logicalname.empty()) + continue; + + businfo = sysfs::entry::byClass(CLASS_NVME, logicalname).businfo(); + + if (!businfo.empty()) + device = n.findChildByBusInfo(businfo); + + if (!device) + device = n.findChildByLogicalName(logicalname); + + if (!device) + { + hwNode *core = n.getChild("core"); + + if (core) + device = n.getChild("nvme"); + + if (core && !device) + device = core->addChild(hwNode("nvme", hw::storage)); + } + + if (!device) + device = n.addChild(hwNode("nvme", hw::storage)); + + if (device) + { + if(device->getBusInfo().empty()) + device->setBusInfo(businfo); + device->setLogicalName(logicalname); + device->claim(); + } + } + } + + globfree(&entries); + } +} + +static void scan_namespaces(hwNode & n) +{ + glob_t entries; + size_t j; + + if(glob(NVMEXNX, 0, NULL, &entries) == 0) + { + for(j=0; j < entries.gl_pathc; j++) + { + if(matches(entries.gl_pathv[j], "^/dev/nvme[[:digit:]]+n[[:digit:]]+$")) + { + // We get this information from sysfs rather than doing an NVMe Identify command + // so they may not all be available from all kernels. + string path = entries.gl_pathv[j]; + string logicalname = ""; + string parentlogicalname = ""; + string model; + string serial; + string firmware_rev; + hwNode *parent = NULL; + hwNode device = hwNode("disk", hw::disk); + + logicalname = basename(entries.gl_pathv[j]); + if (logicalname.empty()) + continue; + + parentlogicalname = path.substr(0, path.find_last_of("n")); + + sysfs::entry e = sysfs::entry::byClass("block", logicalname); + + model = e.model(); + serial = e.serial(); + firmware_rev = e.firmware_rev(); + + device.setDescription("NVMe disk"); + device.setLogicalName(logicalname); + device.claim(); + + if (!model.empty()) + device.setProduct(model); + if (!serial.empty()) + device.setSerial(serial); + if (!firmware_rev.empty()) + device.setVersion(firmware_rev); + + scan_disk(device); + + if (!parentlogicalname.empty()) + parent = n.findChildByLogicalName(parentlogicalname); + + if (!parent) + { + hwNode *core = n.getChild("core"); + + if (core) + parent = n.getChild("nvme"); + + if (core && !parent) + parent = core->addChild(hwNode("nvme", hw::storage)); + } + + if (!parent) + parent = n.addChild(hwNode("nvme", hw::storage)); + + if (parent) + { + parent->addChild(device); + parent->claim(); + } + } + } + + globfree(&entries); + } + +} + +bool scan_nvme(hwNode & n) +{ + scan_controllers(n); + + scan_namespaces(n); + + return false; +} Index: lshw-B.02.18+git.20191228/src/core/nvme.h =================================================================== --- /dev/null +++ lshw-B.02.18+git.20191228/src/core/nvme.h @@ -0,0 +1,7 @@ +#ifndef _NVME_H_ +#define _NVME_H_ + +#include "hw.h" + +bool scan_nvme(hwNode & n); +#endif Index: lshw-B.02.18+git.20191228/src/core/partitions.cc =================================================================== --- lshw-B.02.18+git.20191228.orig/src/core/partitions.cc +++ lshw-B.02.18+git.20191228/src/core/partitions.cc @@ -295,6 +295,7 @@ static bool guess_logicalname(source & s struct stat buf; char name[10]; int dev = 0; + string devname; snprintf(name, sizeof(name), "%d", n); if(disk.getBusInfo()!="") @@ -304,9 +305,16 @@ static bool guess_logicalname(source & s if(!S_ISBLK(buf.st_mode)) return false; if(s.diskname!="") - dev = open_dev(buf.st_rdev + n, S_IFBLK, s.diskname+string(name)); + devname = s.diskname; else - dev = open_dev(buf.st_rdev + n, S_IFBLK, disk.getLogicalName()+string(name)); + devname = disk.getLogicalName(); + + // NVMe partitions are like /dev/nvme0n1p2 + if(matches(devname, "^/dev/nvme[[:digit:]]+n[[:digit:]]+$")) + devname += "p"; + devname += string(name); + + dev = open_dev(buf.st_rdev + n, S_IFBLK, devname); if(dev>=0) { @@ -330,10 +338,7 @@ static bool guess_logicalname(source & s if(memcmp(buffer1, buffer2, BLOCKSIZE)==0) { partition.claim(); - if(s.diskname!="") - partition.setLogicalName(s.diskname+string(name)); - else - partition.setLogicalName(disk.getLogicalName()+string(name)); + partition.setLogicalName(devname); return true; } } Index: lshw-B.02.18+git.20191228/src/core/sysfs.cc =================================================================== --- lshw-B.02.18+git.20191228.orig/src/core/sysfs.cc +++ lshw-B.02.18+git.20191228/src/core/sysfs.cc @@ -368,6 +368,21 @@ string entry::vendor() const return get_string(This->devpath+"/vendor"); } +string entry::model() const +{ + return get_string(This->devpath+"/model"); +} + +string entry::serial() const +{ + return get_string(This->devpath+"/serial"); +} + +string entry::firmware_rev() const +{ + return get_string(This->devpath+"/firmware_rev"); +} + vector < entry > sysfs::entries_by_bus(const string & busname) { vector < entry > result; Index: lshw-B.02.18+git.20191228/src/core/sysfs.h =================================================================== --- lshw-B.02.18+git.20191228.orig/src/core/sysfs.h +++ lshw-B.02.18+git.20191228/src/core/sysfs.h @@ -28,6 +28,9 @@ namespace sysfs string modalias() const; string device() const; string vendor() const; + string model() const; + string serial() const; + string firmware_rev() const; entry parent() const; string name_in_class(const string &) const; string string_attr(const string & name, const string & def = "") const;
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
