Drop pcm-lspci

pcm-lspci is obsolete and only supports SKX/CLX. In comparison, pcm-iio -list provides better output.

Author: Alexander Antonov

pcm.spec

@@ -72,7 +72,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/pcm-core
 %{_sbindir}/pcm-iio
 %{_sbindir}/pcm-latency
-%{_sbindir}/pcm-lspci
 %{_sbindir}/pcm-memory
 %{_sbindir}/pcm-msr
 %{_sbindir}/pcm-mmio

src/CMakeLists.txt

@@ -4,7 +4,7 @@
 include(FindOpenSSL)
 
 # All pcm-* executables
-set(PROJECT_NAMES pcm pcm-numa pcm-latency pcm-power pcm-msr pcm-memory pcm-tsx pcm-pcie pcm-core pcm-iio pcm-lspci pcm-pcicfg pcm-mmio pcm-tpmi pcm-raw pcm-accel)
+set(PROJECT_NAMES pcm pcm-numa pcm-latency pcm-power pcm-msr pcm-memory pcm-tsx pcm-pcie pcm-core pcm-iio pcm-pcicfg pcm-mmio pcm-tpmi pcm-raw pcm-accel)
 
 set(MINIMUM_OPENSSL_VERSION 1.1.1)
 

src/lspci.cpp

@@ -94,26 +94,6 @@ bool probe_pci(struct pci *p)
     return p->exist;
 }
 
-void print_pci(struct pci p, const PCIDB & pciDB)
-{
-    printf("Parent bridge info:");
-    printf("%x:%x.%d [%04x:%04x] %s %s %d P:%x S:%x S:%x ",
-            p.bdf.busno, p.bdf.devno, p.bdf.funcno,
-            p.vendor_id, p.device_id,
-            (pciDB.first.count(p.vendor_id) > 0)?pciDB.first.at(p.vendor_id).c_str():"unknown vendor",
-            (pciDB.second.count(p.vendor_id) > 0 && pciDB.second.at(p.vendor_id).count(p.device_id) > 0)?pciDB.second.at(p.vendor_id).at(p.device_id).c_str():"unknown device",
-            p.header_type,
-            p.primary_bus_number, p.secondary_bus_number, p.subordinate_bus_number);
-    printf("Device info:");
-    printf("%x:%x.%d [%04x:%04x] %s %s %d Gen%d x%d\n",
-            p.bdf.busno, p.bdf.devno, p.bdf.funcno,
-            p.vendor_id, p.device_id,
-            (pciDB.first.count(p.vendor_id) > 0)?pciDB.first.at(p.vendor_id).c_str():"unknown vendor",
-            (pciDB.second.count(p.vendor_id) > 0 && pciDB.second.at(p.vendor_id).count(p.device_id) > 0)?pciDB.second.at(p.vendor_id).at(p.device_id).c_str():"unknown device",
-            p.header_type,
-            p.link_speed, p.link_width);
-}
-
 void load_PCIDB(PCIDB & pciDB)
 {
     std::ifstream in(PCI_IDS_PATH);

src/lspci.h

@@ -242,20 +242,6 @@ struct pci {
     bool isIntelDeviceById(uint16_t device_id) const { return (isIntelDevice() && (this->device_id == device_id)); }
 };
 
-struct iio_skx {
-    struct {
-        struct {
-            struct pci root_pci_dev;   /* single device represent root port */
-            std::vector<struct pci> child_pci_devs; /* Contain child switch and end-point devices */
-        } parts[4]{}; /* part 0, 1, 2, 3 */
-        uint8_t busno{}; /* holding busno for each IIO stack */
-        std::string stack_name{};
-        std::vector<uint64_t> values{};
-        bool flipped = false;
-    } stacks[6]; /* iio stack 0, 1, 2, 3, 4, 5 */
-    uint32_t socket_id{};
-};
-
 struct iio_bifurcated_part {
     int part_id{0};
     /* single device represent root port */
@@ -296,8 +282,6 @@ bool probe_pci(struct pci *p);
  */
 typedef std::pair< std::map<int, std::string> ,std::map< int, std::map<int, std::string> > > PCIDB;
 
-void print_pci(struct pci p, const PCIDB & pciDB);
-
 void load_PCIDB(PCIDB & pciDB);
 
 } // namespace pcm