Skip to content

fpga: move GetAPIVersion call out of NewPort and NewFME #497

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 11, 2020
Merged

fpga: move GetAPIVersion call out of NewPort and NewFME #497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 37 additions & 25 deletions cmd/fpga_tool/fpga_tool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,14 +181,16 @@ func fpgaInfo(fname string, quiet bool) error {
}

func fmeInfo(fname string, quiet bool) error {
var f fpga.FME
var err error
f, err = fpga.NewFME(fname)
fme, err := fpga.NewFME(fname)
if err != nil {
return err
}
defer f.Close()
return printFpgaFME(f, quiet)
defer fme.Close()
// check that kernel API is compatible
if _, err := fme.GetAPIVersion(); err != nil {
return errors.Wrap(err, "kernel API mismatch")
}
return printFpgaFME(fme, quiet)
}

func printFpgaFME(f fpga.FME, quiet bool) (err error) {
Expand Down Expand Up @@ -218,28 +220,33 @@ func printFpgaFME(f fpga.FME, quiet bool) (err error) {
}

func portReleaseOrAssign(fname string, port uint, release, quiet bool) error {
var f fpga.FME
var err error
f, err = fpga.NewFME(fname)
fme, err := fpga.NewFME(fname)
if err != nil {
return err
}
defer f.Close()
defer fme.Close()
// check that kernel API is compatible
if _, err := fme.GetAPIVersion(); err != nil {
return errors.Wrap(err, "kernel API mismatch")
}
if release {
return f.PortRelease(uint32(port))
return fme.PortRelease(uint32(port))
}
return f.PortAssign(uint32(port))
return fme.PortAssign(uint32(port))
}

func portInfo(fname string, quiet bool) error {
var f fpga.Port
var err error
f, err = fpga.NewPort(fname)
port, err := fpga.NewPort(fname)
if err != nil {
return err
}
defer f.Close()
return printFpgaPort(f, quiet)
defer port.Close()
// check that kernel API is compatible
if _, err = port.GetAPIVersion(); err != nil {
return errors.Wrap(err, "kernel API mismatch")
}

return printFpgaPort(port, quiet)
}

func printFpgaPort(f fpga.Port, quiet bool) (err error) {
Expand Down Expand Up @@ -313,32 +320,37 @@ func printPCIeInfo(pci *fpga.PCIDevice, quiet bool) {
}
}

func doPR(dev, fname string, dryRun, quiet bool) (err error) {
fp, err := fpga.NewPort(dev)
func doPR(dev, fname string, dryRun, quiet bool) error {
port, err := fpga.NewPort(dev)
if err != nil {
return
return err
}
defer port.Close()
// check that kernel API is compatible
if _, err = port.GetAPIVersion(); err != nil {
return errors.Wrap(err, "kernel API mismatch")
}
defer fp.Close()

bs, err := bitstream.Open(fname)
if err != nil {
return
return err
}
defer bs.Close()

if !quiet {
fmt.Printf("Before: Interface ID: %q AFU ID: %q\n", fp.GetInterfaceUUID(), fp.GetAcceleratorTypeUUID())
fmt.Printf("Before: Interface ID: %q AFU ID: %q\n", port.GetInterfaceUUID(), port.GetAcceleratorTypeUUID())
fmt.Printf("Programming %q to port %q: ", fname, dev)
}
err = fp.PR(bs, dryRun)
err = port.PR(bs, dryRun)
if !quiet {
if err != nil {
fmt.Println("FAILED")
} else {
fmt.Println("OK")
}
fmt.Printf("After : Interface ID: %q AFU ID: %q\n", fp.GetInterfaceUUID(), fp.GetAcceleratorTypeUUID())
fmt.Printf("After : Interface ID: %q AFU ID: %q\n", port.GetInterfaceUUID(), port.GetAcceleratorTypeUUID())
}
return
return err
}

func listDevices(listFMEs, listPorts, quiet bool) error {
Expand Down
8 changes: 0 additions & 8 deletions pkg/fpga/dfl_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,6 @@ func (f *DflFME) Close() error {
// NewDflFME Opens device.
func NewDflFME(dev string) (FME, error) {
fme := &DflFME{DevPath: dev}
// check that kernel API is compatible
if _, err := fme.GetAPIVersion(); err != nil {
return nil, errors.Wrap(err, "kernel API mismatch")
}
if err := checkVendorAndClass(fme); err != nil {
return nil, err
}
Expand Down Expand Up @@ -96,10 +92,6 @@ func (f *DflPort) Close() error {
// NewDflPort Opens device.
func NewDflPort(dev string) (Port, error) {
port := &DflPort{DevPath: dev}
// check that kernel API is compatible
if _, err := port.GetAPIVersion(); err != nil {
return nil, errors.Wrap(err, "kernel API mismatch")
}
if err := checkVendorAndClass(port); err != nil {
return nil, err
}
Expand Down
9 changes: 0 additions & 9 deletions pkg/fpga/intel_fpga_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,6 @@ func (f *IntelFpgaFME) Close() error {
// NewIntelFpgaFME Opens device.
func NewIntelFpgaFME(dev string) (FME, error) {
fme := &IntelFpgaFME{DevPath: dev}
// check that kernel API is compatible
if _, err := fme.GetAPIVersion(); err != nil {
return nil, errors.Wrap(err, "kernel API mismatch")
}
if err := checkVendorAndClass(fme); err != nil {
return nil, err
}
Expand Down Expand Up @@ -90,11 +86,6 @@ func (f *IntelFpgaPort) Close() error {
// NewIntelFpgaPort Opens device.
func NewIntelFpgaPort(dev string) (Port, error) {
port := &IntelFpgaPort{DevPath: dev}
// check that kernel API is compatible
if _, err := port.GetAPIVersion(); err != nil {
port.Close()
return nil, errors.Wrap(err, "kernel API mismatch")
}
if err := checkVendorAndClass(port); err != nil {
port.Close()
return nil, err
Expand Down