Page MenuHomeFreeBSD
Files F107753929

D36751.diff
No OneTemporary
Actions

D36751.diff
View Options

diff --git a/sys/dev/ntb/ntb_hw/ntb_hw_amd.c b/sys/dev/ntb/ntb_hw/ntb_hw_amd.c
--- a/sys/dev/ntb/ntb_hw/ntb_hw_amd.c
+++ b/sys/dev/ntb/ntb_hw/ntb_hw_amd.c
@@ -1112,10 +1112,10 @@
print_map_success(struct amd_ntb_softc *ntb, struct amd_ntb_pci_bar_info *bar,
const char *kind)
{
- amd_ntb_printf(0, "Mapped BAR%d v:[%p-%p] p:[%p-%p] (0x%jx bytes) (%s)\n",
+ amd_ntb_printf(0, "Mapped BAR%d v:[%p-%p] p:[0x%jx-0x%jx] (0x%jx bytes) (%s)\n",
PCI_RID2BAR(bar->pci_resource_id), bar->vbase,
- (char *)bar->vbase + bar->size - 1, (void *)bar->pbase,
- (void *)(bar->pbase + bar->size - 1), (uintmax_t)bar->size, kind);
+ (char *)bar->vbase + bar->size - 1, (uintmax_t)bar->pbase,
+ (uintmax_t)(bar->pbase + bar->size - 1), (uintmax_t)bar->size, kind);
}
static void
diff --git a/sys/dev/ntb/ntb_hw/ntb_hw_intel.c b/sys/dev/ntb/ntb_hw/ntb_hw_intel.c
--- a/sys/dev/ntb/ntb_hw/ntb_hw_intel.c
+++ b/sys/dev/ntb/ntb_hw/ntb_hw_intel.c
@@ -925,10 +925,10 @@
{
device_printf(ntb->device,
- "Mapped BAR%d v:[%p-%p] p:[%p-%p] (0x%jx bytes) (%s)\n",
+ "Mapped BAR%d v:[%p-%p] p:[0x%jx-0x%jx] (0x%jx bytes) (%s)\n",
PCI_RID2BAR(bar->pci_resource_id), bar->vbase,
(char *)bar->vbase + bar->size - 1,
- (void *)bar->pbase, (void *)(bar->pbase + bar->size - 1),
+ (uintmax_t)bar->pbase, (uintmax_t)(bar->pbase + bar->size - 1),
(uintmax_t)bar->size, kind);
}
@@ -1012,19 +1012,21 @@
if (rc == 0) {
bar->map_mode = mapmode;
device_printf(ntb->device,
- "Marked BAR%d v:[%p-%p] p:[%p-%p] as "
+ "Marked BAR%d v:[%p-%p] p:[0x%jx-0x%jx] as "
"%s.\n",
PCI_RID2BAR(bar->pci_resource_id), bar->vbase,
(char *)bar->vbase + bar->size - 1,
- (void *)bar->pbase, (void *)(bar->pbase + bar->size - 1),
+ (uintmax_t)bar->pbase,
+ (uintmax_t)(bar->pbase + bar->size - 1),
intel_ntb_vm_memattr_to_str(mapmode));
} else
device_printf(ntb->device,
- "Unable to mark BAR%d v:[%p-%p] p:[%p-%p] as "
+ "Unable to mark BAR%d v:[%p-%p] p:[0x%jx-0x%jx] as "
"%s: %d\n",
PCI_RID2BAR(bar->pci_resource_id), bar->vbase,
(char *)bar->vbase + bar->size - 1,
- (void *)bar->pbase, (void *)(bar->pbase + bar->size - 1),
+ (uintmax_t)bar->pbase,
+ (uintmax_t)(bar->pbase + bar->size - 1),
intel_ntb_vm_memattr_to_str(mapmode), rc);
/* Proceed anyway */
return (0);

File Metadata

Mime Type
text/plain
Expires
Sat, Jan 18, 11:39 PM (13 h, 21 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15905248
Default Alt Text
D36751.diff (2 KB)

Event Timeline