Skip to content

XDMA support for Embedded plus #9471

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

Open
karthdmg-xilinx wants to merge 1 commit into
base: master
Choose a base branch
from
Open

XDMA support for Embedded plus #9471

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
10 changes: 10 additions & 0 deletions src/runtime_src/core/pcie/driver/linux/xocl/devices.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3443,6 +3443,7 @@ struct xocl_subdev_map {
{ XOCL_PCI_DEVID(0x10EE, 0x50B0, PCI_ANY_ID, V70_MGMT_RAPTOR2) }, \
{ XOCL_PCI_DEVID(0x10EE, 0x50B4, PCI_ANY_ID, V80_MGMT_RAPTOR2) }, \
{ XOCL_PCI_DEVID(0x10EE, 0x5700, PCI_ANY_ID, RAVE_MGMT_RAPTOR2) }, \
{ XOCL_PCI_DEVID(0x10EE, 0x5710, PCI_ANY_ID, RAVE_MGMT_RAPTOR2) }, \
{ XOCL_PCI_DEVID(0x10EE, 0x6098, PCI_ANY_ID, VCK190_MGMT_RAPTOR2) }, \
{ XOCL_PCI_DEVID(0x10EE, 0xE098, PCI_ANY_ID, XBB_MFG_VCK190) }, \
{ XOCL_PCI_DEVID(0x10EE, 0x5078, PCI_ANY_ID, VERSAL_MGMT_RAPTOR2) }, \
Expand Down Expand Up @@ -3518,6 +3519,7 @@ struct xocl_subdev_map {
{ XOCL_PCI_DEVID(0x10EE, 0x50B1, PCI_ANY_ID, V70_USER_RAPTOR2_ES3) }, \
{ XOCL_PCI_DEVID(0x10EE, 0x50B5, PCI_ANY_ID, V80_USER_RAPTOR2_ES3) }, \
{ XOCL_PCI_DEVID(0x10EE, 0x5701, PCI_ANY_ID, RAVE_USER_RAPTOR2_ES3) }, \
{ XOCL_PCI_DEVID(0x10EE, 0x5711, PCI_ANY_ID, RAVE_USER_RAPTOR2_ES3) }, \
{ XOCL_PCI_DEVID(0x10EE, 0x6099, PCI_ANY_ID, VCK190_USER_RAPTOR2) }, \
{ XOCL_PCI_DEVID(0x10EE, 0x5079, PCI_ANY_ID, VERSAL_USER_RAPTOR2) }, \
{ XOCL_PCI_DEVID(0x10EE, 0x5099, PCI_ANY_ID, AVALON_USER_RAPTOR2) }
Expand Down Expand Up @@ -3617,6 +3619,14 @@ struct xocl_subdev_map {
.vbnv = "emb-plus", \
.priv_data = &XOCL_BOARD_RAVE_USER_RAPTOR2_ES3, \
.type = XOCL_DSAMAP_RAPTOR2 }, \
{ 0x10EE, 0x5710, PCI_ANY_ID, \
.vbnv = "emb-plus", \
.priv_data = &XOCL_BOARD_RAVE_MGMT_RAPTOR2, \
.type = XOCL_DSAMAP_RAPTOR2 }, \
{ 0x10EE, 0x5711, PCI_ANY_ID, \
.vbnv = "emb-plus", \
.priv_data = &XOCL_BOARD_RAVE_USER_RAPTOR2_ES3, \
.type = XOCL_DSAMAP_RAPTOR2 }, \
{ 0x10EE, 0x6098, PCI_ANY_ID, \
.vbnv = "xilinx_vck190", \
.priv_data = &XOCL_BOARD_VCK190_MGMT_RAPTOR2, \
Expand Down
11 changes: 9 additions & 2 deletions src/runtime_src/core/pcie/driver/linux/xocl/lib/libxdma.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2068,11 +2068,18 @@ static resource_size_t map_single_bar(struct xdma_dev *xdev,
*/
xocl_pr_info("map bar %d, len %lld\n", idx, bar_len);
/* do not map BARs with length 0. Note that start MAY be 0! */
if (!bar_len || bar_len >= (1 << 25)) {
xocl_pr_info("BAR #%d is not present - skipping\n", idx);
if (!bar_len) {
pr_info("BAR #%d is not present - skipping\n", idx);
return 0;
}

/* BAR size exceeds maximum desired mapping? */
if (bar_len > INT_MAX) {
pr_info("Limit BAR %d mapping from %llu to %d bytes\n", idx,
(u64)bar_len, INT_MAX);
map_len = (resource_size_t)INT_MAX;
}

/*
* bail out if the bar is mapped
*/
Expand Down
Loading