Skip to content

Commit ccf6a1d

Browse files
committed
Merge tag '2024-01-03' into push-2024-01-03
Change-Id: Ib16776ead44a061400f1e637a46bab2396e6f84c
2 parents b589a20 + fa605e3 commit ccf6a1d

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

src/mmio.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,10 @@ MMIORange::MMIORange(uint64 baseAddr_, uint64 size_, bool readonly_) :
226226
if (mmapAddr == MAP_FAILED)
227227
{
228228
std::cerr << "mmap failed: errno is " << errno << " (" << strerror(errno) << ")\n";
229+
if (1 == errno)
230+
{
231+
std::cerr << "Try to add 'iomem=relaxed' parameter to the kernel boot command line and reboot.\n";
232+
}
229233
throw std::exception();
230234
}
231235
}

src/pcm-accel-common.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ void readAccelCounters(SystemCounterState& sycs_)
305305
pcm->setNumberofAccelCounters(dev_count*counter_nb);
306306
uint32_t ctr_index = 0;
307307
// accel_content accel_results(ACCEL_MAX, dev_content(ACCEL_IP_DEV_COUNT_MAX, ctr_data()));
308-
sycs_.accel_counters.resize(dev_count*counter_nb);
308+
sycs_.accel_counters.resize(size_t(dev_count) * size_t(counter_nb));
309309
SimpleCounterState *currState = new SimpleCounterState[dev_count*counter_nb];
310310
// programAccelCounters(m, accel, ctrs);
311311

src/pcm-iio.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1227,7 +1227,7 @@ bool EagleStreamPlatformMapping::pciTreeDiscover(std::vector<struct iio_stacks_o
12271227

12281228
void IPlatformMapping::probeDeviceRange(std::vector<struct pci> &pci_devs, int domain, int secondary, int subordinate)
12291229
{
1230-
for (uint8_t bus = secondary; bus <= subordinate; bus++) {
1230+
for (uint8_t bus = secondary; int(bus) <= subordinate; bus++) {
12311231
for (uint8_t device = 0; device < 32; device++) {
12321232
for (uint8_t function = 0; function < 8; function++) {
12331233
struct pci child_dev;

0 commit comments

Comments
 (0)