Skip to content
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

Jump to bottom

Fix for CB data structure when Channel ID does not match array index #126

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

Fix for CB data structure when Channel ID does not match array index #126

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
2 changes: 2 additions & 0 deletions driver/axidma.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ void axidma_get_num_channels(struct axidma_device *dev,
struct axidma_num_channels *num_chans);
void axidma_get_channel_info(struct axidma_device *dev,
struct axidma_channel_info *chan_info);
static int axidma_get_chan_index(struct axidma_device *dev,
int channel_id);
int axidma_set_signal(struct axidma_device *dev, int signal);
int axidma_read_transfer(struct axidma_device *dev,
struct axidma_transaction *trans);
Expand Down
25 changes: 21 additions & 4 deletions driver/axidma_dma.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,23 @@ static struct axidma_chan *axidma_get_chan(struct axidma_device *dev,
return NULL;
}

static int axidma_get_chan_index(struct axidma_device *dev,
int channel_id)
{
int i;
struct axidma_chan *chan;

// Find the channel with the given ID that matches the type and direction
for (i = 0; i < dev->num_chans; i++)
{
chan = &dev->channels[i];
if (chan->channel_id == channel_id) {
return i;
}
}
return -1;
}

static void axidma_dma_callback(void *data)
{
struct axidma_cb_data *cb_data;
Expand Down Expand Up @@ -385,7 +402,7 @@ int axidma_read_transfer(struct axidma_device *dev,
rx_tfr.channel_id = trans->channel_id;
rx_tfr.notify_signal = dev->notify_signal;
rx_tfr.process = get_current();
rx_tfr.cb_data = &dev->cb_data[trans->channel_id];
rx_tfr.cb_data = &dev->cb_data[axidma_get_chan_index(dev, trans->channel_id)];

// Prepare the receive transfer
rc = axidma_prep_transfer(rx_chan, &rx_tfr);
Expand Down Expand Up @@ -435,7 +452,7 @@ int axidma_write_transfer(struct axidma_device *dev,
tx_tfr.channel_id = trans->channel_id;
tx_tfr.notify_signal = dev->notify_signal;
tx_tfr.process = get_current();
tx_tfr.cb_data = &dev->cb_data[trans->channel_id];
tx_tfr.cb_data = &dev->cb_data[axidma_get_chan_index(dev, trans->channel_id)];

// Prepare the transmit transfer
rc = axidma_prep_transfer(tx_chan, &tx_tfr);
Expand Down Expand Up @@ -500,7 +517,7 @@ int axidma_rw_transfer(struct axidma_device *dev,
tx_tfr.channel_id = trans->tx_channel_id,
tx_tfr.notify_signal = dev->notify_signal,
tx_tfr.process = get_current(),
tx_tfr.cb_data = &dev->cb_data[trans->tx_channel_id];
tx_tfr.cb_data = &dev->cb_data[axidma_get_chan_index(dev, trans->channel_id)];

// Add in the frame information for VDMA transfers
if (tx_chan->type == AXIDMA_VDMA) {
Expand All @@ -515,7 +532,7 @@ int axidma_rw_transfer(struct axidma_device *dev,
rx_tfr.channel_id = trans->rx_channel_id,
rx_tfr.notify_signal = dev->notify_signal,
rx_tfr.process = get_current(),
rx_tfr.cb_data = &dev->cb_data[trans->rx_channel_id];
rx_tfr.cb_data = &dev->cb_data[axidma_get_chan_index(dev, trans->channel_id)];

// Add in the frame information for VDMA transfers
if (tx_chan->type == AXIDMA_VDMA) {
Expand Down