Skip to content

Commit

Permalink
Revert "Workaround to limit Aperture Size Limit as part of QDMA Queue…
Browse files Browse the repository at this point in the history
…s for SOFT QDMA IP. (Xilinx#7979)"

Reverting the changes since the work around has been handled as part of QDMA driver.
This reverts commit cc30690.
  • Loading branch information
karthdmg-xilinx committed May 28, 2024
1 parent a68d179 commit b83ded0
Showing 1 changed file with 2 additions and 21 deletions.
23 changes: 2 additions & 21 deletions src/runtime_src/core/pcie/driver/linux/xocl/subdev/qdma.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,6 @@

#define QDMA_REQ_TIMEOUT_MS 10000

/* This is a temporary workaround in limiting the aperture size
* until the block size issue in SOFT QDMA IP is fixed.
*/
#define QDMA_WA_APERTURE_SIZE 0x8000

/* Module Parameters */
unsigned int qdma_max_channel = 8;
module_param(qdma_max_channel, uint, 0644);
Expand Down Expand Up @@ -488,11 +483,10 @@ static int set_max_chan(struct xocl_qdma *qdma, u32 count)
struct platform_device *pdev = qdma->pdev;
struct qdma_queue_conf *qconf;
struct mm_channel *chan;
struct qdma_version_info ver_info;
u32 write, qidx;
char ebuf[MM_EBUF_LEN + 1];
int i, ret, rv;
bool reset = false, is_soft_qdma = false;
int i, ret;
bool reset = false;

if (count > sizeof(qdma->channel_bitmap[0]) * 8) {
xocl_info(&pdev->dev, "Invalide number of channels set %d", count);
Expand Down Expand Up @@ -525,14 +519,6 @@ static int set_max_chan(struct xocl_qdma *qdma, u32 count)
}
}

rv = qdma_device_version_info(qdma->dma_hndl, &ver_info);

if (rv < 0) {
xocl_err(&pdev->dev, "qdma_device_version_info failed: %d", rv);
goto failed_create_queue;
}
is_soft_qdma = (strcmp(ver_info.ip_str, "EQDMA5.0 Soft IP") == 0)? true : false;

for (i = 0; i < qdma->channel * 2; i++) {
write = i / qdma->channel;
qidx = i % qdma->channel;
Expand All @@ -555,11 +541,6 @@ static int set_max_chan(struct xocl_qdma *qdma, u32 count)
qconf->qidx = qidx;
qconf->irq_en = (qdma->dev_conf.qdma_drv_mode == POLL_MODE) ?
0 : 1;
if (is_soft_qdma)
{
/* This is a temporary workaround to limit aperture size until we have a fix in SOFT IP */
qconf->aperture_size = QDMA_WA_APERTURE_SIZE;
}

ret = qdma_queue_add(qdma->dma_hndl, qconf, &chan->queue,
ebuf, MM_EBUF_LEN);
Expand Down

0 comments on commit b83ded0

Please sign in to comment.