Skip to content

Removed check for neg. address and changed offset calculation in mmio.cc, as it limits ZYNQ-7 boards #1525

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
DirkStober wants to merge 1 commit into
base: image_v3.1.3
Choose a base branch
from
Open

Removed check for neg. address and changed offset calculation in mmio.cc, as it limits ZYNQ-7 boards #1525

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
8 changes: 4 additions & 4 deletions sdbuild/boot/meta-pynq/recipes-apps/pynq-cpp/files/cpp/mmio.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
MMIO::MMIO(off_t base_address, size_t length_p)
: mem_fd(-1), virt_base(0), virt_offset(0), length(0), mapped_base(nullptr)
{
if (base_address < 0 || length_p < 0)
if (length_p < 0)
{
std::cerr << "Error: Base address or length cannot be negative." << std::endl;
std::cerr << "Error: Length cannot be negative." << std::endl;
return;
}
mem_fd = open("/dev/mem", O_RDWR | O_SYNC);
Expand All @@ -17,7 +17,7 @@ MMIO::MMIO(off_t base_address, size_t length_p)
return;
}
virt_base = base_address & ~(4096 - 1);
virt_offset = base_address - virt_base;
virt_offset = base_address & (4096 - 1);
length = length_p;

mapped_base = mmap(nullptr, length + virt_offset, PROT_READ | PROT_WRITE, MAP_SHARED, mem_fd, virt_base);
Expand Down Expand Up @@ -70,4 +70,4 @@ void MMIO::write(uint32_t data, uint64_t offset)
std::cout << "MMIO Write to " << static_cast<void *>(mapped_base) << " Data: " << data << " Offset: " << offset << std::endl;
#endif
ptr[idx] = data;
}
}