diff --git a/pkg/fpga/dfl_linux.go b/pkg/fpga/dfl_linux.go index b8a23813..942c0522 100644 --- a/pkg/fpga/dfl_linux.go +++ b/pkg/fpga/dfl_linux.go @@ -56,7 +56,7 @@ func (f *DflFME) Close() error { // NewDflFME Opens device. func NewDflFME(dev string) (FME, error) { fme := &DflFME{DevPath: dev} - if err := checkVendorAndClass(fme); err != nil { + if err := checkPCIDeviceType(fme); err != nil { return nil, err } if err := fme.updateProperties(); err != nil { @@ -92,7 +92,7 @@ func (f *DflPort) Close() error { // NewDflPort Opens device. func NewDflPort(dev string) (Port, error) { port := &DflPort{DevPath: dev} - if err := checkVendorAndClass(port); err != nil { + if err := checkPCIDeviceType(port); err != nil { return nil, err } if err := port.updateProperties(); err != nil { diff --git a/pkg/fpga/intel_fpga_linux.go b/pkg/fpga/intel_fpga_linux.go index a6af04af..ef2fe94c 100644 --- a/pkg/fpga/intel_fpga_linux.go +++ b/pkg/fpga/intel_fpga_linux.go @@ -53,7 +53,7 @@ func (f *IntelFpgaFME) Close() error { // NewIntelFpgaFME Opens device. func NewIntelFpgaFME(dev string) (FME, error) { fme := &IntelFpgaFME{DevPath: dev} - if err := checkVendorAndClass(fme); err != nil { + if err := checkPCIDeviceType(fme); err != nil { return nil, err } if err := fme.updateProperties(); err != nil { @@ -86,7 +86,7 @@ func (f *IntelFpgaPort) Close() error { // NewIntelFpgaPort Opens device. func NewIntelFpgaPort(dev string) (Port, error) { port := &IntelFpgaPort{DevPath: dev} - if err := checkVendorAndClass(port); err != nil { + if err := checkPCIDeviceType(port); err != nil { port.Close() return nil, err } diff --git a/pkg/fpga/pci_linux.go b/pkg/fpga/pci_linux.go index 25d149aa..bdc58a1d 100644 --- a/pkg/fpga/pci_linux.go +++ b/pkg/fpga/pci_linux.go @@ -29,7 +29,6 @@ import ( const ( pciAddressRegex = `^([[:xdigit:]]{4}):([[:xdigit:]]{2}):([[:xdigit:]]{2})\.([[:xdigit:]])$` - vendorIntel = "0x8086" fpgaClass = "0x120000" ) diff --git a/pkg/fpga/utils.go b/pkg/fpga/utils.go index 851c8e85..6ac3808c 100644 --- a/pkg/fpga/utils.go +++ b/pkg/fpga/utils.go @@ -62,13 +62,14 @@ func cleanBasename(name string) string { } // check that FPGA device is a compatible PCI device. -func checkVendorAndClass(dev commonFpgaAPI) error { +func checkPCIDeviceType(dev commonFpgaAPI) error { pci, err := dev.GetPCIDevice() if err != nil { return err } - if pci.Vendor != vendorIntel || pci.Class != fpgaClass { - return errors.Errorf("unsupported PCI device %s VID=%s PID=%s Class=%s", pci.BDF, pci.Vendor, pci.Device, pci.Class) + + if pci.Class != fpgaClass { + return errors.Errorf("unsupported PCI class device %s VID=%s PID=%s Class=%s", pci.BDF, pci.Vendor, pci.Device, pci.Class) } return nil }