SysFSTools: lspci: fixup: improve naming and refactor a bit

[pve-common.git] / src / PVE / SysFSTools.pm

diff --git a/src/PVE/SysFSTools.pm b/src/PVE/SysFSTools.pm
index 660f94bbeae3ee6176e7eac1cfbe975f72f0041f..e83d1630f3be9cef930b9013a2da73d76f381672 100644 (file)
--- a/src/PVE/SysFSTools.pm
+++ b/src/PVE/SysFSTools.pm
@@ -11,16 +11,17 @@ my $pcisysfs = "/sys/bus/pci";
 my $pciregex = "([a-f0-9]{4}):([a-f0-9]{2}):([a-f0-9]{2})\.([a-f0-9])";
 
 sub lspci {
-    my ($filter) = @_;
+    my ($id_filter) = @_;
 
     my $devices = {};
 
     dir_glob_foreach("$pcisysfs/devices", $pciregex, sub {
             my (undef, undef, $bus, $slot, $function) = @_;
+
            my $id = "$bus:$slot";
-           return if defined($filter) && $id ne $filter;
-           my $res = { id => $id, function => $function};
-           push @{$devices->{$id}}, $res;
+           return if defined($id_filter) && $id_filter ne $id;
+
+           push @{$devices->{$id}}, { id => $id, function => $function };
     });
 
     # Entries should be sorted by functions.
@@ -33,12 +34,8 @@ sub lspci {
 }
 
 sub check_iommu_support{
-    #fixme : need to check IOMMU support
-    #http://www.linux-kvm.org/page/How_to_assign_devices_with_VT-d_in_KVM
-
-    my $iommu=1;
-    return $iommu;
-
+    # we have IOMMU support if /sys/class/iommu/ is populated
+    return PVE::Tools::dir_glob_regex('/sys/class/iommu/', "[^\.].*");
 }
 
 sub file_write {
@@ -156,4 +153,61 @@ sub pci_dev_group_bind_to_vfio {
     return 1;
 }
 
+# idea is from usbutils package (/usr/bin/usb-devices) script
+sub __scan_usb_device {
+    my ($res, $devpath, $parent, $level) = @_;
+
+    return if ! -d $devpath;
+    return if $level && $devpath !~ m/^.*[-.](\d+)$/;
+    my $port = $level ? int($1 - 1) : 0;
+
+    my $busnum = int(file_read_firstline("$devpath/busnum"));
+    my $devnum = int(file_read_firstline("$devpath/devnum"));
+
+    my $d = {
+       port => $port,
+       level => $level,
+       busnum => $busnum,
+       devnum => $devnum,
+       speed => file_read_firstline("$devpath/speed"),
+       class => hex(file_read_firstline("$devpath/bDeviceClass")),
+       vendid => file_read_firstline("$devpath/idVendor"),
+       prodid => file_read_firstline("$devpath/idProduct"),
+    };
+
+    if ($level) {
+       my $usbpath = $devpath;
+       $usbpath =~ s|^.*/\d+\-||;
+       $d->{usbpath} = $usbpath;
+    }
+
+    my $product = file_read_firstline("$devpath/product");
+    $d->{product} = $product if $product;
+
+    my $manu = file_read_firstline("$devpath/manufacturer");
+    $d->{manufacturer} = $manu if $manu;
+
+    my $serial => file_read_firstline("$devpath/serial");
+    $d->{serial} = $serial if $serial;
+
+    push @$res, $d;
+
+    foreach my $subdev (<$devpath/$busnum-*>) {
+       next if $subdev !~ m|/$busnum-[0-9]+(\.[0-9]+)*$|;
+       __scan_usb_device($res, $subdev, $devnum, $level + 1);
+    }
+
+};
+
+sub scan_usb {
+
+    my $devlist = [];
+
+    foreach my $device (</sys/bus/usb/devices/usb*>) {
+       __scan_usb_device($devlist, $device, 0, 0);
+    }
+
+    return $devlist;
+}
+
 1;