Skip to content

dbdma: Interpret command lists until STOP #220

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

Merged
dingusdev merged 2 commits into from
Aug 22, 2026
+17 −66
Merged

dbdma: Interpret command lists until STOP #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6aa8ab4
dbdma: Interpret command lists until STOP
mihaip Aug 22, 2026
a930d0e
dma: Remove the old pull/push completion API
mihaip Aug 22, 2026
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
74 changes: 16 additions & 58 deletions devices/common/dbdma.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,15 @@ void DMAChannel::interpret_cmd() {
}
}

void DMAChannel::interpret_until_blocked() {
// Execute ready commands until a transfer is queued or the channel becomes idle/dead.
while (this->is_active()) {
this->interpret_cmd();
if (this->cmd_in_progress)
break;
}
}

void DMAChannel::update_cmd() {
if (this->cur_is_writable) {
if (this->cur_cmd < DBDMA_Cmd::STOP)
Expand Down Expand Up @@ -471,7 +480,7 @@ void DMAChannel::xfer_from_device() {
this->get_name().c_str());
}

this->interpret_cmd();
this->interpret_until_blocked();
}

void DMAChannel::xfer_to_device() {
Expand All @@ -488,7 +497,7 @@ void DMAChannel::xfer_to_device() {
this->finish_cmd();
}

this->interpret_cmd();
this->interpret_until_blocked();
}

void DMAChannel::xfer_retry() {
Expand Down Expand Up @@ -521,9 +530,7 @@ DmaPullResult DMAChannel::pull_data(uint32_t req_len, uint32_t *avail_len, uint8
}

// interpret DBDMA program until we get data or become idle
while ((this->ch_stat & CH_STAT_ACTIVE) && !this->queue_len) {
this->interpret_cmd();
}
this->interpret_until_blocked();

// dequeue data if any
if (this->queue_len) {
Expand Down Expand Up @@ -556,9 +563,7 @@ DmaPushResult DMAChannel::push_data(const char* src_ptr, int len) {
}

// interpret DBDMA program until we get buffer to fill in or become idle
while ((this->ch_stat & CH_STAT_ACTIVE) && !this->queue_len) {
this->interpret_cmd();
}
this->interpret_until_blocked();

if (this->queue_len) {
len = std::min((int)this->queue_len, len);
Expand All @@ -570,47 +575,12 @@ DmaPushResult DMAChannel::push_data(const char* src_ptr, int len) {

// proceed with the DBDMA program if the buffer became exhausted
if (!this->queue_len) {
this->interpret_cmd();
this->interpret_until_blocked();
}

return DmaPushResult::PushedData;
}

void DMAChannel::end_pull_data() {
if (!this->is_active()) {
// dead or idle channel? -> no more data
LOG_F(WARNING, "%s: Ending Dead/idle channel -> no more data",
this->get_name().c_str());
return;
}

if (this->queue_len) {
this->queue_len = 0;
} else {
this->ch_stat &= ~CH_STAT_FLUSH;
}

// proceed with the DBDMA program
this->interpret_cmd();
}

void DMAChannel::end_push_data() {
if (!this->is_active()) {
LOG_F(WARNING, "%s: Attempt to end push data to dead/idle channel",
this->get_name().c_str());
return;
}

if (this->queue_len) {
this->queue_len = 0;
} else {
this->ch_stat &= ~CH_STAT_FLUSH;
}

// proceed with the DBDMA program
this->interpret_cmd();
}

bool DMAChannel::is_out_active() {
return this->is_active();
}
Expand Down Expand Up @@ -646,13 +616,7 @@ void DMAChannel::start() {
if (this->start_cb)
this->start_cb();

// some DBDMA programs contain commands that don't transfer data
// between a device and memory (LOAD_QUAD, STORE_QUAD, NOP and STOP).
// We thus interprete the DBDMA program until a data transfer between
// a device and memory is queued or the channel becomes idle/dead.
while (!this->cmd_in_progress && this->is_active()) {
this->interpret_cmd();
}
this->interpret_until_blocked();
}

void DMAChannel::resume() {
Expand All @@ -664,13 +628,7 @@ void DMAChannel::resume() {

LOG_F(INFO, "%s: Resuming DMA channel", this->get_name().c_str());

// some DBDMA programs contain commands that don't transfer data
// between a device and memory (LOAD_QUAD, STORE_QUAD, NOP and STOP).
// We thus interprete the DBDMA program until a data transfer between
// a device and memory is queued or the channel becomes idle/dead.
while (!this->cmd_in_progress && this->is_active()) {
this->interpret_cmd();
}
this->interpret_until_blocked();
}

void DMAChannel::abort() {
Expand Down
5 changes: 1 addition & 4 deletions devices/common/dbdma.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,6 @@ class DMAChannel : public DmaBidirChannel, public DmaChannel {
bool is_in_active() override;
DmaPullResult pull_data(uint32_t req_len, uint32_t *avail_len, uint8_t **p_data) override;
DmaPushResult push_data(const char* src_ptr, int len) override;
int get_pull_data_remaining() override { return this->queue_len; }
int get_push_data_remaining() override { return this->queue_len; }
void end_pull_data() override;
void end_push_data() override;

bool dma_is_ready() override;
void xfer_retry() override;
Expand All @@ -141,6 +137,7 @@ class DMAChannel : public DmaBidirChannel, public DmaChannel {
protected:
DMACmd* fetch_cmd(uint32_t cmd_addr, DMACmd* p_cmd, bool *is_writable);
void interpret_cmd(void);
void interpret_until_blocked();
void update_cmd();
void finish_cmd();
void xfer_quad(bool is_store);
Expand Down
4 changes: 0 additions & 4 deletions devices/common/dmacore.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@ class DmaOutChannel {
virtual bool is_out_active() { return true; }
virtual DmaPullResult pull_data(uint32_t req_len, uint32_t *avail_len,
uint8_t **p_data) = 0;
virtual int get_pull_data_remaining() { return 1; }
virtual void end_pull_data() {}

std::string get_name(void) { return this->name; }

Expand All @@ -60,8 +58,6 @@ class DmaInChannel {

virtual bool is_in_active() { return true; }
virtual DmaPushResult push_data(const char* src_ptr, int len) = 0;
virtual int get_push_data_remaining() { return 1; }
virtual void end_push_data() {}

std::string get_name(void) { return this->name; }

Expand Down
Loading