d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minimal changes for MPR to build on architectures with physical addresses larger than virtual

Browse Source 
Summary:
Some architectures use large (36-bit) physical addresses, with smaller
virtual addresses.  Casting between vm_paddr_t (or bus_addr_t) and void * is
considered illegal, so cast through uintptr_t.  No functional change on existing
platforms.

Reviewed By:	scottl
Differential Revision:	https://reviews.freebsd.org/D14042
This commit is contained in:
jhibbits 2018-02-04 15:37:58 +00:00
parent 330d9b337f
commit 1ec4ec85dd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/mpr/mpr.c
View File

@ -2763,7 +2763,7 @@ mpr_build_nvme_prp(struct mpr_softc *sc, struct mpr_command *cm,
prp_entry_phys = prp_page_phys; prp_entry_phys = prp_page_phys;
/* Get physical address and length of the data buffer. */ /* Get physical address and length of the data buffer. */
paddr = (bus_addr_t)data; paddr = (bus_addr_t)(uintptr_t)data;
if (data_in_sz) if (data_in_sz)
length = data_in_sz; length = data_in_sz;
else else
@ -2947,7 +2947,7 @@ mpr_check_pcie_native_sgl(struct mpr_softc *sc, struct mpr_command *cm,
else if ((buff_len > (PAGE_SIZE * 4)) && else if ((buff_len > (PAGE_SIZE * 4)) &&
(buff_len <= (PAGE_SIZE * 5)) ) (buff_len <= (PAGE_SIZE * 5)) )
{ {
msg_phys = (uint64_t *)segs[0].ds_addr; msg_phys = (uint64_t *)(uintptr_t)segs[0].ds_addr;
first_page_offset = first_page_offset =
((uint32_t)(uint64_t)(uintptr_t)msg_phys & ((uint32_t)(uint64_t)(uintptr_t)msg_phys &
page_mask); page_mask);