Skip to content

F
FPGA Configuration Space
Commit f5c56bcb authored by Manohar Vanga's avatar Manohar Vanga
Browse files
Options

simulation: cleaned up registration in fake_wb_bus 

Signed-off-by: 's avatarManohar Vanga <manohar.vanga@cern.ch>
parent 10f87c78
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 71 deletions
simulation/fake_wb_bus.c
View file @ f5c56bcb
......@@ -34,29 +34,39 @@ int spec_device = 0xbabe;
module_param(spec_vendor, int, S_IRUGO);
module_param(spec_device, int, S_IRUGO);
static int ndev;
const struct firmware *wb_fw;
LIST_HEAD(spec_devices);
static struct mutex list_lock;
void *fake_read_cfg(wb_addr_t addr, void *buf, size_t len)
{
if (wb_fw->size < addr + len)
return NULL;
memcpy(buf, &wb_fw[addr], len);
return buf;
}
struct wb_ops fake_wb_ops = {
.read_cfg = fake_read_cfg,
};
struct wb_bus fake_wb_bus = {
.name = "fake_wb_bus",
.owner = THIS_MODULE,
.ops = &fake_wb_ops,
.sdwb_header_base = 0,
};
static int fake_wbbus_probe(struct device *dev)
{
char fwname[64];
unsigned int header_addr = 0; /* Normally read from the BAR */
struct sdwb_head *header;
struct sdwb_wbid *id;
struct sdwb_wbd *wbd;
struct wb_device *wbdev, *next;
/*
* load firmware with wishbone address map. In the real driver,
* we would first load the bitstream into the fpga and then read
* the header from its appropriate location.
*
* For loading the bitstream, we read the bitstream ID off
* an eeprom on the board or some similar way.
*
* Below, we just use the PCI bus and slot number to get the firmware
* file.
*/
......@@ -67,61 +77,21 @@ static int fake_wbbus_probe(struct device *dev)
return -1;
}
header = (struct sdwb_head *)&wb_fw->data[header_addr];
if (header->magic != SDWB_HEAD_MAGIC) {
pr_err(KBUILD_MODNAME ": invalid sdwb header at %p "
"(magic %llx)\n", header, header->magic);
goto head_fail;
if (wb_register_bus(&fake_wb_bus) < 0) {
goto bus_register_fail;
}
id = (struct sdwb_wbid *)&wb_fw->data[header->wbid_address];
pr_info(KBUILD_MODNAME ": found sdwb bistream: 0x%llx\n",
id->bstream_type);
wbd = (struct sdwb_wbd *)&wb_fw->data[header->wbd_address];
while (wbd->wbd_magic == SDWB_WBD_MAGIC) {
wbdev = kzalloc(sizeof(struct wb_device), GFP_KERNEL);
if (!wbdev)
goto register_fail;
memcpy(&wbdev->wbd, wbd, sizeof(struct sdwb_wbd));
if (wb_register_device(wbdev) < 0)
goto register_fail;
mutex_lock(&list_lock);
list_add(&wbdev->list, &spec_devices);
ndev++;
mutex_unlock(&list_lock);
wbd++;
}
pr_info(KBUILD_MODNAME ": found %d wishbone devices\n", ndev);
return 0;
register_fail:
kfree(wbdev);
mutex_lock(&list_lock);
list_for_each_entry_safe(wbdev, next, &spec_devices, list) {
list_del(&wbdev->list);
wb_unregister_device(wbdev);
kfree(wbdev);
}
mutex_unlock(&list_lock);
head_fail:
bus_register_fail:
release_firmware(wb_fw);
return -1;
return -ENODEV;
}
static void fake_wbbus_release(struct device *dev)
{
struct wb_device *wbdev, *next;
wb_unregister_bus(&fake_wb_bus);
release_firmware(wb_fw);
mutex_lock(&list_lock);
list_for_each_entry_safe(wbdev, next, &spec_devices, list) {
list_del(&wbdev->list);
wb_unregister_device(wbdev);
kfree(wbdev);
}
mutex_unlock(&list_lock);
}
static struct device fake_wbbus_device = {
......
simulation/include/linux/wishbone.h
View file @ f5c56bcb
......@@ -54,6 +54,8 @@
#define wb_read_cfg(bus, addr, buf, len) \
bus->ops->read_cfg(addr, buf, len)
typedef uint64_t wb_addr_t;
struct wb_device;
struct wb_device_id {
......@@ -101,17 +103,17 @@ struct wb_device {
#define to_wb_device(dev) container_of(dev, struct wb_device, dev);
struct wb_ops {
uint8_t (*read8)(uint64_t);
uint16_t (*read16)(uint64_t);
uint32_t (*read32)(uint64_t);
uint64_t (*read64)(uint64_t);
void (*write8)(uint64_t, uint8_t);
void (*write16)(uint64_t, uint16_t);
void (*write32)(uint64_t, uint32_t);
void (*write64)(uint64_t, uint64_t);
void * (*memcpy_from_wb) (uint64_t addr, void *buf, size_t len);
void * (*memcpy_to_wb) (uint64_t addr, const void *buf, size_t len);
void * (*read_cfg)(uint64_t addr, void *buf, size_t len);
uint8_t (*read8)(wb_addr_t);
uint16_t (*read16)(wb_addr_t);
uint32_t (*read32)(wb_addr_t);
uint64_t (*read64)(wb_addr_t);
void (*write8)(wb_addr_t, uint8_t);
void (*write16)(wb_addr_t, uint16_t);
void (*write32)(wb_addr_t, uint32_t);
void (*write64)(wb_addr_t, uint64_t);
void * (*memcpy_from_wb) (wb_addr_t addr, void *buf, size_t len);
void * (*memcpy_to_wb) (wb_addr_t addr, const void *buf, size_t len);
void * (*read_cfg)(wb_addr_t addr, void *buf, size_t len);
};
struct wb_bus {
......@@ -119,7 +121,7 @@ struct wb_bus {
char *name;
struct module *owner;
struct device dev;
uint64_t sdwb_header_base;
wb_addr_t sdwb_header_base;
struct wb_ops *ops;
struct list_head devices;
struct mutex dev_lock;
......@@ -133,8 +135,5 @@ void wb_unregister_driver(struct wb_driver *driver);
int wb_register_bus(struct wb_bus *bus);
void wb_unregister_bus(struct wb_bus *bus);
int wb_register_device(struct wb_device *wbdev);
void wb_unregister_device(struct wb_device *wbdev);
#endif /* _LINUX_WISHBONE_H */
simulation/wishbone.c
View file @ f5c56bcb
......@@ -121,7 +121,7 @@ void wb_unregister_driver(struct wb_driver *driver)
}
EXPORT_SYMBOL(wb_unregister_driver);
static struct wb_device *wb_get_next_device(struct wb_bus *bus, uint64_t wb_ptr)
static struct wb_device *wb_get_next_device(struct wb_bus *bus, wb_addr_t wb_ptr)
{
struct sdwb_wbd wbd;
struct wb_device *wbdev;
......@@ -145,7 +145,7 @@ static struct wb_device *wb_get_next_device(struct wb_bus *bus, uint64_t wb_ptr)
int wb_scan_bus(struct wb_bus *bus)
{
int ret;
uint64_t wbd_ptr;
wb_addr_t wbd_ptr;
struct sdwb_head head;
struct sdwb_wbid wbid;
struct wb_device *wbdev;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment