Skip to content

Fix gdma not checking ownership and clearing the owner bit correctly. (QEMU-280) #142

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
a159x36 wants to merge 1 commit into
base: esp-develop
Choose a base branch
from
Open

Fix gdma not checking ownership and clearing the owner bit correctly. (QEMU-280) #142

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
6 changes: 3 additions & 3 deletions hw/dma/esp_gdma.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,10 +307,10 @@ bool esp_gdma_read_channel(ESPGdmaState *s, uint32_t chan, uint8_t* buffer, uint
uint32_t out_addr = ((ESP_GDMA_RAM_ADDR >> 20) << 20) | FIELD_EX32(state->link, GDMA_OUT_LINK, ADDR);

/* Boolean to mark whether we need to check the owner for in and out buffers */
const bool owner_check_out = FIELD_EX32(state[ESP_GDMA_OUT_IDX].conf1, GDMA_OUT_CONF1, CHECK_OWNER);
const bool owner_check_out = FIELD_EX32(state->conf1, GDMA_OUT_CONF1, CHECK_OWNER);

/* Boolean to mark whether the transmit (out) buffers must have their owner bit cleared here */
const bool clear_out = FIELD_EX32(state[ESP_GDMA_OUT_IDX].conf0, GDMA_OUT_CONF0, AUTO_WRBACK);
const bool clear_out = FIELD_EX32(state->conf0, GDMA_OUT_CONF0, AUTO_WRBACK);

/* Pointer to the lists that will be browsed by the loop below */
GdmaLinkedList out_list;
Expand Down Expand Up @@ -360,7 +360,7 @@ bool esp_gdma_read_channel(ESPGdmaState *s, uint32_t chan, uint8_t* buffer, uint
out_list.config.owner = 0;

/* Write back the modified descriptor, should always be valid */
valid = esp_gdma_read_descr(s, out_addr, &out_list);
valid = esp_gdma_write_descr(s, out_addr, &out_list);
assert(valid);
}

Expand Down