upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

LinuxKPI: cleanup internal calls to VM_PAGE_TO_PHYS

Browse source 
Replace FreeBSD native VM_PAGE_TO_PHYS() calls with page_to_phys()
allowing us to work on a struct page in the future using the one
single public Linux KPI interface to map to a native FreeBSD vm_page.

This should be a NOP.

Sponsored by:	The FreeBSD Foundation
MFC after:	2 weeks
Reviewed by:	markj
Differential Revision: https://reviews.freebsd.org/D41256
This commit is contained in:
Bjoern A. Zeeb 2023-07-31 03:15:29 +00:00
parent 9e9c682ff3
commit d1ea07642c
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sys/compat/linuxkpi/common/include/linux/dma-mapping.h
View file

@ -183,7 +183,7 @@ dma_map_page_attrs(struct device *dev, struct page *page, size_t offset,
size_t size, enum dma_data_direction dir, unsigned long attrs)
{
return (linux_dma_map_phys(dev, VM_PAGE_TO_PHYS(page) + offset, size));
return (linux_dma_map_phys(dev, page_to_phys(page) + offset, size));
}
/* linux_dma_(un)map_sg_attrs does not support attrs yet */
@ -198,7 +198,7 @@ dma_map_page(struct device *dev, struct page *page,
unsigned long offset, size_t size, enum dma_data_direction direction)
{
return (linux_dma_map_phys(dev, VM_PAGE_TO_PHYS(page) + offset, size));
return (linux_dma_map_phys(dev, page_to_phys(page) + offset, size));
}
static inline void

2
sys/compat/linuxkpi/common/include/linux/highmem.h
View file

@ -60,7 +60,7 @@ kmap(struct page *page)
struct sf_buf *sf;
if (PMAP_HAS_DMAP) {
return ((void *)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(page)));
return ((void *)PHYS_TO_DMAP(page_to_phys(page)));
} else {
sched_pin();
sf = sf_buf_alloc(page, SFB_NOWAIT | SFB_CPUPRIVATE);

4
sys/compat/linuxkpi/common/include/linux/scatterlist.h
View file

@ -158,7 +158,7 @@ sg_next(struct scatterlist *sg)
static inline vm_paddr_t
sg_phys(struct scatterlist *sg)
{
return (VM_PAGE_TO_PHYS(sg_page(sg)) + sg->offset);
return (page_to_phys(sg_page(sg)) + sg->offset);
}
static inline void *
@ -649,7 +649,7 @@ sg_pcopy_to_buffer(struct scatterlist *sgl, unsigned int nents,
break;
vaddr = (char *)sf_buf_kva(sf);
} else
vaddr = (char *)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(page));
vaddr = (char *)PHYS_TO_DMAP(page_to_phys(page));
memcpy(buf, vaddr + sg->offset + offset, len);
if (!PMAP_HAS_DMAP)
sf_buf_free(sf);

2
sys/compat/linuxkpi/common/src/linux_page.c
View file

@ -91,7 +91,7 @@ linux_page_address(struct page *page)
if (page->object != kernel_object) {
return (PMAP_HAS_DMAP ?
((void *)(uintptr_t)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(page))) :
((void *)(uintptr_t)PHYS_TO_DMAP(page_to_phys(page))) :
NULL);
}
return ((void *)(uintptr_t)(VM_MIN_KERNEL_ADDRESS +