diff options
| author | Conrad Meyer <cem@FreeBSD.org> | 2015-10-29 04:16:28 +0000 |
|---|---|---|
| committer | Conrad Meyer <cem@FreeBSD.org> | 2015-10-29 04:16:28 +0000 |
| commit | 79c1a0199fef91b73be95c7fea26dc2a17d8b38a (patch) | |
| tree | dc4661d19af2fe506db6944d6067c2e2fb276419 /sys | |
| parent | e9497f9bbd2ac5e16b9d913c89ff2d2a08f52cd7 (diff) | |
| download | src-79c1a0199fef91b73be95c7fea26dc2a17d8b38a.tar.gz src-79c1a0199fef91b73be95c7fea26dc2a17d8b38a.zip | |
ntb: Do not attempt to set write-combining on MWs
AMD64 pmap assumes ranges will be in the DMAP, which isn't necessarily
true for NTB memory windows (especially 64-bit BARs).
Suggested by: pmap_change_attr_locked -> kassert_panic
Sponsored by: EMC / Isilon Storage Division
Notes
Notes:
svn path=/head/; revision=290130
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/ntb/ntb_hw/ntb_hw.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sys/dev/ntb/ntb_hw/ntb_hw.c b/sys/dev/ntb/ntb_hw/ntb_hw.c index e918d263ea59..f5dbc3290d27 100644 --- a/sys/dev/ntb/ntb_hw/ntb_hw.c +++ b/sys/dev/ntb/ntb_hw/ntb_hw.c @@ -755,9 +755,13 @@ map_memory_window_bar(struct ntb_softc *ntb, struct ntb_pci_bar_info *bar) save_bar_parameters(bar); } +#if 0 /* XXX: amd64 pmap_change_attr() assumes region lies in DMAP. */ /* Mark bar region as write combining to improve performance. */ rc = pmap_change_attr((vm_offset_t)bar->vbase, bar->size, VM_MEMATTR_WRITE_COMBINING); +#else + rc = EINVAL; +#endif print_map_success(ntb, bar, "mw"); if (rc == 0) device_printf(ntb->device, |