i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel/dma_resource: Fix tracing.

Browse Source
This commit is contained in:
Augustin Cavalier
2023-05-30 14:00:44 -04:00
parent 197e4b5a6a
commit 92b8f3e74c
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/device_manager/dma_resources.cpp
+10 -10
View File
@@ -431,7 +431,7 @@ DMAResource::TranslateNext(IORequest* request, IOOperation* operation,
generic_io_vec* vecs = NULL; generic_io_vec* vecs = NULL;
uint32 segmentCount = 0; uint32 segmentCount = 0;
TRACE(" offset %Ld, remaining size: %lu, block size %lu -> partial: %lu\n", TRACE(" offset %" B_PRIdOFF ", remaining size: %lu, block size %lu -> partial: %lu\n",
offset, request->RemainingBytes(), fBlockSize, partialBegin); offset, request->RemainingBytes(), fBlockSize, partialBegin);
if (buffer->IsVirtual()) { if (buffer->IsVirtual()) {
@@ -487,7 +487,7 @@ DMAResource::TranslateNext(IORequest* request, IOOperation* operation,
} }
#ifdef TRACE_DMA_RESOURCE #ifdef TRACE_DMA_RESOURCE
TRACE(" physical count %lu\n", segmentCount); TRACE(" physical count %" B_PRIu32 "\n", segmentCount);
for (uint32 i = 0; i < segmentCount; i++) { for (uint32 i = 0; i < segmentCount; i++) {
TRACE(" [%" B_PRIu32 "] %#" B_PRIxGENADDR ", %" B_PRIxGENADDR "\n", TRACE(" [%" B_PRIu32 "] %#" B_PRIxGENADDR ", %" B_PRIxGENADDR "\n",
i, vecs[vecIndex + i].base, vecs[vecIndex + i].length); i, vecs[vecIndex + i].base, vecs[vecIndex + i].length);
@@ -540,7 +540,7 @@ DMAResource::TranslateNext(IORequest* request, IOOperation* operation,
else else
transferLeft = 0; transferLeft = 0;
TRACE(" partial begin, using bounce buffer: offset: %lld, length: " TRACE(" partial begin, using bounce buffer: offset: %" B_PRIdOFF ", length: "
"%lu\n", offset, length); "%lu\n", offset, length);
} }
@@ -566,7 +566,7 @@ DMAResource::TranslateNext(IORequest* request, IOOperation* operation,
if (dmaLength + length > fRestrictions.max_transfer_size) { if (dmaLength + length > fRestrictions.max_transfer_size) {
length = fRestrictions.max_transfer_size - dmaLength; length = fRestrictions.max_transfer_size - dmaLength;
TRACE(" vec %lu: restricting length to %lu due to transfer size " TRACE(" vec %" B_PRIu32 ": restricting length to %lu due to transfer size "
"limit\n", i, length); "limit\n", i, length);
} }
_RestrictBoundaryAndSegmentSize(base, length); _RestrictBoundaryAndSegmentSize(base, length);
@@ -577,11 +577,11 @@ DMAResource::TranslateNext(IORequest* request, IOOperation* operation,
// Check alignment: if not aligned, use bounce buffer for complete vec. // Check alignment: if not aligned, use bounce buffer for complete vec.
if (base < fRestrictions.low_address) { if (base < fRestrictions.low_address) {
useBounceBufferSize = fRestrictions.low_address - base; useBounceBufferSize = fRestrictions.low_address - base;
TRACE(" vec %lu: below low address, using bounce buffer: %lu\n", i, TRACE(" vec %" B_PRIu32 ": below low address, using bounce buffer: %lu\n", i,
useBounceBufferSize); useBounceBufferSize);
} else if (base & (fRestrictions.alignment - 1)) { } else if (base & (fRestrictions.alignment - 1)) {
useBounceBufferSize = length; useBounceBufferSize = length;
TRACE(" vec %lu: misalignment, using bounce buffer: %lu\n", i, TRACE(" vec %" B_PRIu32 ": misalignment, using bounce buffer: %lu\n", i,
useBounceBufferSize); useBounceBufferSize);
} }
@@ -599,7 +599,7 @@ DMAResource::TranslateNext(IORequest* request, IOOperation* operation,
if (length == 0) { if (length == 0) {
length = maxLength; length = maxLength;
useBounceBufferSize = length; useBounceBufferSize = length;
TRACE(" vec %lu: 0 length, using bounce buffer: %lu\n", i, TRACE(" vec %" B_PRIu32 ": 0 length, using bounce buffer: %lu\n", i,
useBounceBufferSize); useBounceBufferSize);
} }
@@ -611,14 +611,14 @@ DMAResource::TranslateNext(IORequest* request, IOOperation* operation,
length = _AddBounceBuffer(*dmaBuffer, physicalBounceBuffer, length = _AddBounceBuffer(*dmaBuffer, physicalBounceBuffer,
bounceLeft, useBounceBufferSize, false); bounceLeft, useBounceBufferSize, false);
if (length == 0) { if (length == 0) {
TRACE(" vec %lu: out of bounce buffer space\n", i); TRACE(" vec %" B_PRIu32 ": out of bounce buffer space\n", i);
// We don't have any bounce buffer space left, we need to move // We don't have any bounce buffer space left, we need to move
// this request to the next I/O operation. // this request to the next I/O operation.
break; break;
} }
TRACE(" vec %lu: final bounce length: %lu\n", i, length); TRACE(" vec %" B_PRIu32 ": final bounce length: %lu\n", i, length);
} else { } else {
TRACE(" vec %lu: final length restriction: %lu\n", i, length); TRACE(" vec %" B_PRIu32 ": final length restriction: %lu\n", i, length);
dmaBuffer->AddVec(base, length); dmaBuffer->AddVec(base, length);
} }