FPGA/corundum
1
0
Fork 0
mirror of https://github.com/corundum/corundum.git synced 2025-02-06 08:38:23 +08:00
Code Issues Projects Releases Wiki Activity

Support application and RAM bars

Browse Source
This commit is contained in:
Alex Forencich 2021-09-09 17:50:44 -07:00
parent d0976f193b
commit 2442ff65c5
2 changed files with 52 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/mqnic/mqnic.h
View File

@ -86,6 +86,14 @@ struct mqnic_dev {
u8 __iomem *hw_addr; u8 __iomem *hw_addr;
u8 __iomem *phc_hw_addr; u8 __iomem *phc_hw_addr;
resource_size_t app_hw_regs_size;
phys_addr_t app_hw_regs_phys;
u8 __iomem *app_hw_addr;
resource_size_t ram_hw_regs_size;
phys_addr_t ram_hw_regs_phys;
u8 __iomem *ram_hw_addr;
struct mutex state_lock; struct mutex state_lock;
int mac_count; int mac_count;

45
modules/mqnic/mqnic_main.c
View File

@ -202,21 +202,50 @@ static int mqnic_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent
mqnic->hw_regs_size = pci_resource_len(pdev, 0); mqnic->hw_regs_size = pci_resource_len(pdev, 0);
mqnic->hw_regs_phys = pci_resource_start(pdev, 0); mqnic->hw_regs_phys = pci_resource_start(pdev, 0);
mqnic->app_hw_regs_size = pci_resource_len(pdev, 2);
mqnic->app_hw_regs_phys = pci_resource_start(pdev, 2);
mqnic->ram_hw_regs_size = pci_resource_len(pdev, 4);
mqnic->ram_hw_regs_phys = pci_resource_start(pdev, 4);
// Map BAR // Map BARs
dev_info(dev, "Control BAR size: %llu", mqnic->hw_regs_size);
mqnic->hw_addr = pci_ioremap_bar(pdev, 0); mqnic->hw_addr = pci_ioremap_bar(pdev, 0);
if (!mqnic->hw_addr) if (!mqnic->hw_addr)
{ {
ret = -ENOMEM; ret = -ENOMEM;
dev_err(dev, "Failed to map BARs"); dev_err(dev, "Failed to map control BAR");
goto fail_map_bars; goto fail_map_bars;
} }
if (mqnic->app_hw_regs_size)
{
dev_info(dev, "Application BAR size: %llu", mqnic->app_hw_regs_size);
mqnic->app_hw_addr = pci_ioremap_bar(pdev, 2);
if (!mqnic->app_hw_addr)
{
ret = -ENOMEM;
dev_err(dev, "Failed to map application BAR");
goto fail_map_bars;
}
}
if (mqnic->ram_hw_regs_size)
{
dev_info(dev, "RAM BAR size: %llu", mqnic->ram_hw_regs_size);
mqnic->ram_hw_addr = pci_ioremap_bar(pdev, 4);
if (!mqnic->ram_hw_addr)
{
ret = -ENOMEM;
dev_err(dev, "Failed to map RAM BAR");
goto fail_map_bars;
}
}
// Check if device needs to be reset // Check if device needs to be reset
if (ioread32(mqnic->hw_addr) == 0xffffffff) if (ioread32(mqnic->hw_addr) == 0xffffffff)
{ {
ret = -EIO; ret = -EIO;
dev_err(dev, "Deivce needs to be reset"); dev_err(dev, "Device needs to be reset");
goto fail_map_bars; goto fail_map_bars;
} }
@ -356,7 +385,12 @@ fail_board:
fail_irq: fail_irq:
pci_free_irq_vectors(pdev); pci_free_irq_vectors(pdev);
fail_map_bars: fail_map_bars:
if (mqnic->hw_addr)
pci_iounmap(pdev, mqnic->hw_addr); pci_iounmap(pdev, mqnic->hw_addr);
if (mqnic->app_hw_addr)
pci_iounmap(pdev, mqnic->app_hw_addr);
if (mqnic->ram_hw_addr)
pci_iounmap(pdev, mqnic->ram_hw_addr);
pci_release_regions(pdev); pci_release_regions(pdev);
fail_regions: fail_regions:
pci_disable_device(pdev); pci_disable_device(pdev);
@ -398,7 +432,12 @@ static void mqnic_pci_remove(struct pci_dev *pdev)
pci_free_irq(pdev, k, mqnic); pci_free_irq(pdev, k, mqnic);
} }
pci_free_irq_vectors(pdev); pci_free_irq_vectors(pdev);
if (mqnic->hw_addr)
pci_iounmap(pdev, mqnic->hw_addr); pci_iounmap(pdev, mqnic->hw_addr);
if (mqnic->app_hw_addr)
pci_iounmap(pdev, mqnic->app_hw_addr);
if (mqnic->ram_hw_addr)
pci_iounmap(pdev, mqnic->ram_hw_addr);
pci_release_regions(pdev); pci_release_regions(pdev);
pci_disable_device(pdev); pci_disable_device(pdev);
} }