aboutsummaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorJohn Baldwin <jhb@FreeBSD.org>2022-09-22 22:08:52 +0000
committerJohn Baldwin <jhb@FreeBSD.org>2022-09-22 22:08:52 +0000
commit7ae99f80b6661760c5de3edd330b279f04b092a2 (patch)
tree533dff9d5801d8e7cb6c552f39761067180853b7 /sys/dev
parent02fac928ab687607786801cdf33f100c70cc6a2e (diff)
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/acpica/Osd/OsdMemory.c6
-rw-r--r--sys/dev/acpica/acpi_apei.c3
-rw-r--r--sys/dev/acpica/acpi_pxm.c2
-rw-r--r--sys/dev/cesa/cesa.c4
-rw-r--r--sys/dev/cesa/cesa.h2
-rw-r--r--sys/dev/drm2/drm_memory.c2
-rw-r--r--sys/dev/drm2/ttm/ttm_bo_util.c8
-rw-r--r--sys/dev/fb/vesa.c5
-rw-r--r--sys/dev/ioat/ioat_test.c3
-rw-r--r--sys/dev/ipmi/ipmi_smbios.c8
-rw-r--r--sys/dev/mxge/if_mxge.c6
-rw-r--r--sys/dev/ofw/ofw_pcib.c2
-rw-r--r--sys/dev/pci/vga_pci.c2
-rw-r--r--sys/dev/powermac_nvram/powermac_nvram.c22
-rw-r--r--sys/dev/powermac_nvram/powermac_nvramvar.h6
-rw-r--r--sys/dev/smbios/smbios.c2
-rw-r--r--sys/dev/vt/hw/efifb/efifb.c2
-rw-r--r--sys/dev/vt/hw/vbefb/vbefb.c2
-rw-r--r--sys/dev/xen/bus/xenpv.c4
19 files changed, 45 insertions, 46 deletions
diff --git a/sys/dev/acpica/Osd/OsdMemory.c b/sys/dev/acpica/Osd/OsdMemory.c
index b806642a61fc..599065e5c653 100644
--- a/sys/dev/acpica/Osd/OsdMemory.c
+++ b/sys/dev/acpica/Osd/OsdMemory.c
@@ -63,7 +63,7 @@ AcpiOsMapMemory(ACPI_PHYSICAL_ADDRESS PhysicalAddress, ACPI_SIZE Length)
void
AcpiOsUnmapMemory(void *LogicalAddress, ACPI_SIZE Length)
{
- pmap_unmapbios((vm_offset_t)LogicalAddress, Length);
+ pmap_unmapbios(LogicalAddress, Length);
}
ACPI_STATUS
@@ -110,7 +110,7 @@ AcpiOsReadMemory(ACPI_PHYSICAL_ADDRESS Address, UINT64 *Value, UINT32 Width)
break;
}
- pmap_unmapdev((vm_offset_t)LogicalAddress, Width / 8);
+ pmap_unmapdev(LogicalAddress, Width / 8);
return (AE_OK);
}
@@ -139,7 +139,7 @@ AcpiOsWriteMemory(ACPI_PHYSICAL_ADDRESS Address, UINT64 Value, UINT32 Width)
break;
}
- pmap_unmapdev((vm_offset_t)LogicalAddress, Width / 8);
+ pmap_unmapdev(LogicalAddress, Width / 8);
return (AE_OK);
}
diff --git a/sys/dev/acpica/acpi_apei.c b/sys/dev/acpica/acpi_apei.c
index 5c442d59972d..9923b2ff9247 100644
--- a/sys/dev/acpica/acpi_apei.c
+++ b/sys/dev/acpica/acpi_apei.c
@@ -787,8 +787,7 @@ apei_detach(device_t dev)
free(ge->copybuf, M_DEVBUF);
}
if (ge->buf) {
- pmap_unmapdev((vm_offset_t)ge->buf,
- ge->v1.ErrorBlockLength);
+ pmap_unmapdev(ge->buf, ge->v1.ErrorBlockLength);
}
free(ge, M_DEVBUF);
}
diff --git a/sys/dev/acpica/acpi_pxm.c b/sys/dev/acpica/acpi_pxm.c
index 808886d744f0..03624f00e2f6 100644
--- a/sys/dev/acpica/acpi_pxm.c
+++ b/sys/dev/acpica/acpi_pxm.c
@@ -666,7 +666,7 @@ acpi_pxm_set_cpu_locality(void)
pc->pc_domain);
}
/* XXXMJ the page is leaked. */
- pmap_unmapbios((vm_offset_t)cpus, sizeof(*cpus) * max_cpus);
+ pmap_unmapbios(cpus, sizeof(*cpus) * max_cpus);
srat_physaddr = 0;
cpus = NULL;
}
diff --git a/sys/dev/cesa/cesa.c b/sys/dev/cesa/cesa.c
index 64d022a994a3..4ceb6fddf478 100644
--- a/sys/dev/cesa/cesa.c
+++ b/sys/dev/cesa/cesa.c
@@ -962,7 +962,7 @@ cesa_setup_sram(struct cesa_softc *sc)
sram_va = pmap_mapdev(sc->sc_sram_base_pa, sc->sc_sram_size);
if (sram_va == NULL)
return (ENOMEM);
- sc->sc_sram_base_va = (vm_offset_t)sram_va;
+ sc->sc_sram_base_va = sram_va;
return (0);
}
@@ -1072,7 +1072,7 @@ cesa_setup_sram_armada(struct cesa_softc *sc)
sram_va = pmap_mapdev(sc->sc_sram_base_pa, sc->sc_sram_size);
if (sram_va == NULL)
return (ENOMEM);
- sc->sc_sram_base_va = (vm_offset_t)sram_va;
+ sc->sc_sram_base_va = sram_va;
return (0);
}
diff --git a/sys/dev/cesa/cesa.h b/sys/dev/cesa/cesa.h
index 9387c87e9615..c7529ec6d0ef 100644
--- a/sys/dev/cesa/cesa.h
+++ b/sys/dev/cesa/cesa.h
@@ -259,7 +259,7 @@ struct cesa_softc {
/* CESA SRAM Address */
bus_addr_t sc_sram_base_pa;
- vm_offset_t sc_sram_base_va;
+ void *sc_sram_base_va;
bus_size_t sc_sram_size;
};
diff --git a/sys/dev/drm2/drm_memory.c b/sys/dev/drm2/drm_memory.c
index 226c2c15734b..e32925445f9c 100644
--- a/sys/dev/drm2/drm_memory.c
+++ b/sys/dev/drm2/drm_memory.c
@@ -129,6 +129,6 @@ void drm_core_ioremapfree(struct drm_local_map *map, struct drm_device *dev)
dev->agp && dev->agp->cant_use_aperture && map->type == _DRM_AGP)
vunmap(map->handle);
else
- pmap_unmapdev((vm_offset_t)map->handle, map->size);
+ pmap_unmapdev(map->handle, map->size);
}
EXPORT_SYMBOL(drm_core_ioremapfree);
diff --git a/sys/dev/drm2/ttm/ttm_bo_util.c b/sys/dev/drm2/ttm/ttm_bo_util.c
index c53bb21450d8..9caab983787c 100644
--- a/sys/dev/drm2/ttm/ttm_bo_util.c
+++ b/sys/dev/drm2/ttm/ttm_bo_util.c
@@ -224,7 +224,7 @@ void ttm_mem_reg_iounmap(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem,
man = &bdev->man[mem->mem_type];
if (virtual && mem->bus.addr == NULL)
- pmap_unmapdev((vm_offset_t)virtual, mem->bus.size);
+ pmap_unmapdev(virtual, mem->bus.size);
(void) ttm_mem_io_lock(man, false);
ttm_mem_io_free(bdev, mem);
ttm_mem_io_unlock(man);
@@ -263,7 +263,7 @@ static int ttm_copy_io_ttm_page(struct ttm_tt *ttm, void *src,
memcpy(dst, src, PAGE_SIZE);
- pmap_unmapdev((vm_offset_t)dst, PAGE_SIZE);
+ pmap_unmapdev(dst, PAGE_SIZE);
return 0;
}
@@ -285,7 +285,7 @@ static int ttm_copy_ttm_io_page(struct ttm_tt *ttm, void *dst,
memcpy(dst, src, PAGE_SIZE);
- pmap_unmapdev((vm_offset_t)src, PAGE_SIZE);
+ pmap_unmapdev(src, PAGE_SIZE);
return 0;
}
@@ -570,7 +570,7 @@ void ttm_bo_kunmap(struct ttm_bo_kmap_obj *map)
return;
switch (map->bo_kmap_type) {
case ttm_bo_map_iomap:
- pmap_unmapdev((vm_offset_t)map->virtual, map->size);
+ pmap_unmapdev(map->virtual, map->size);
break;
case ttm_bo_map_vmap:
pmap_qremove((vm_offset_t)(map->virtual), map->num_pages);
diff --git a/sys/dev/fb/vesa.c b/sys/dev/fb/vesa.c
index f1d75873f983..0e19884e86b5 100644
--- a/sys/dev/fb/vesa.c
+++ b/sys/dev/fb/vesa.c
@@ -1305,7 +1305,8 @@ vesa_set_mode(video_adapter_t *adp, int mode)
}
int10_set_mode(adp->va_initial_bios_mode);
if (adp->va_info.vi_flags & V_INFO_LINEAR)
- pmap_unmapdev(adp->va_buffer, vesa_vmem_max);
+ pmap_unmapdev((void *)adp->va_buffer,
+ vesa_vmem_max);
/*
* Once (*prevvidsw->get_info)() succeeded,
* (*prevvidsw->set_mode)() below won't fail...
@@ -1350,7 +1351,7 @@ vesa_set_mode(video_adapter_t *adp, int mode)
adp->va_flags |= V_ADP_DAC8;
if (adp->va_info.vi_flags & V_INFO_LINEAR)
- pmap_unmapdev(adp->va_buffer, vesa_vmem_max);
+ pmap_unmapdev((void *)adp->va_buffer, vesa_vmem_max);
#if VESA_DEBUG > 0
printf("VESA: mode set!\n");
diff --git a/sys/dev/ioat/ioat_test.c b/sys/dev/ioat/ioat_test.c
index 3a42ba5fb54c..46aa6e9ca55e 100644
--- a/sys/dev/ioat/ioat_test.c
+++ b/sys/dev/ioat/ioat_test.c
@@ -504,8 +504,7 @@ ioat_dma_test(void *arg)
ioat_test_release_memory(test);
out:
if (test->testkind == IOAT_TEST_RAW_DMA && !test->raw_is_virtual)
- pmap_unmapdev((vm_offset_t)test->raw_vtarget,
- test->buffer_size);
+ pmap_unmapdev(test->raw_vtarget, test->buffer_size);
ioat_put_dmaengine(dmaengine);
}
diff --git a/sys/dev/ipmi/ipmi_smbios.c b/sys/dev/ipmi/ipmi_smbios.c
index e26b6f2956ad..c7e07642ce8d 100644
--- a/sys/dev/ipmi/ipmi_smbios.c
+++ b/sys/dev/ipmi/ipmi_smbios.c
@@ -182,10 +182,10 @@ ipmi_smbios_probe(struct ipmi_get_info *info)
*/
header = pmap_mapbios(addr, sizeof(struct smbios_eps));
table = pmap_mapbios(addr, header->length);
- pmap_unmapbios((vm_offset_t)header, sizeof(struct smbios_eps));
+ pmap_unmapbios(header, sizeof(struct smbios_eps));
header = table;
if (smbios_cksum(header) != 0) {
- pmap_unmapbios((vm_offset_t)header, header->length);
+ pmap_unmapbios(header, header->length);
return;
}
@@ -196,8 +196,8 @@ ipmi_smbios_probe(struct ipmi_get_info *info)
info);
/* Unmap everything. */
- pmap_unmapbios((vm_offset_t)table, header->structure_table_length);
- pmap_unmapbios((vm_offset_t)header, header->length);
+ pmap_unmapbios(table, header->structure_table_length);
+ pmap_unmapbios(header, header->length);
}
/*
diff --git a/sys/dev/mxge/if_mxge.c b/sys/dev/mxge/if_mxge.c
index bfeedadf4521..8b2118eeb9de 100644
--- a/sys/dev/mxge/if_mxge.c
+++ b/sys/dev/mxge/if_mxge.c
@@ -435,7 +435,7 @@ mxge_enable_nvidia_ecrc(mxge_softc_t *sc)
if (! (vendor_id == ivend && device_id == idev)) {
device_printf(sc->dev, "mapping failed: 0x%x:0x%x\n",
vendor_id, device_id);
- pmap_unmapdev((vm_offset_t)va, PAGE_SIZE);
+ pmap_unmapdev(va, PAGE_SIZE);
return;
}
@@ -444,11 +444,11 @@ mxge_enable_nvidia_ecrc(mxge_softc_t *sc)
if (val == 0xffffffff) {
device_printf(sc->dev, "extended mapping failed\n");
- pmap_unmapdev((vm_offset_t)va, PAGE_SIZE);
+ pmap_unmapdev(va, PAGE_SIZE);
return;
}
*ptr32 = val | 0x40;
- pmap_unmapdev((vm_offset_t)va, PAGE_SIZE);
+ pmap_unmapdev(va, PAGE_SIZE);
if (mxge_verbose)
device_printf(sc->dev,
"Enabled ECRC on upstream Nvidia bridge "
diff --git a/sys/dev/ofw/ofw_pcib.c b/sys/dev/ofw/ofw_pcib.c
index e2aa0c9203b7..f40e860a8309 100644
--- a/sys/dev/ofw/ofw_pcib.c
+++ b/sys/dev/ofw/ofw_pcib.c
@@ -622,7 +622,7 @@ ofw_pcib_deactivate_resource(device_t bus, device_t child, int type, int rid,
}
psize = rman_get_size(res);
- pmap_unmapdev((vm_offset_t)rman_get_virtual(res), psize);
+ pmap_unmapdev(rman_get_virtual(res), psize);
return (rman_deactivate_resource(res));
}
diff --git a/sys/dev/pci/vga_pci.c b/sys/dev/pci/vga_pci.c
index a38f52d1bd12..ac8615d88e57 100644
--- a/sys/dev/pci/vga_pci.c
+++ b/sys/dev/pci/vga_pci.c
@@ -285,7 +285,7 @@ vga_pci_unmap_bios(device_t dev, void *bios)
#if defined(__amd64__) || defined(__i386__)
if (vga_pci_is_boot_display(dev)) {
/* We mapped the BIOS shadow copy located at 0xC0000. */
- pmap_unmapdev((vm_offset_t)bios, VGA_PCI_BIOS_SHADOW_SIZE);
+ pmap_unmapdev(bios, VGA_PCI_BIOS_SHADOW_SIZE);
return;
}
diff --git a/sys/dev/powermac_nvram/powermac_nvram.c b/sys/dev/powermac_nvram/powermac_nvram.c
index 7913437bd1fc..247d35264441 100644
--- a/sys/dev/powermac_nvram/powermac_nvram.c
+++ b/sys/dev/powermac_nvram/powermac_nvram.c
@@ -156,14 +156,14 @@ powermac_nvram_attach(device_t dev)
*/
i = (i/4) - 2;
- sc->sc_bank0 = (vm_offset_t)pmap_mapdev(reg[i], NVRAM_SIZE * 2);
- sc->sc_bank1 = sc->sc_bank0 + NVRAM_SIZE;
+ sc->sc_bank0 = pmap_mapdev(reg[i], NVRAM_SIZE * 2);
+ sc->sc_bank1 = (char *)sc->sc_bank0 + NVRAM_SIZE;
- gen0 = powermac_nvram_check((void *)sc->sc_bank0);
- gen1 = powermac_nvram_check((void *)sc->sc_bank1);
+ gen0 = powermac_nvram_check(sc->sc_bank0);
+ gen1 = powermac_nvram_check(sc->sc_bank1);
if (gen0 == -1 && gen1 == -1) {
- if ((void *)sc->sc_bank0 != NULL)
+ if (sc->sc_bank0 != NULL)
pmap_unmapdev(sc->sc_bank0, NVRAM_SIZE * 2);
device_printf(dev, "both banks appear to be corrupt\n");
return ENXIO;
@@ -172,7 +172,7 @@ powermac_nvram_attach(device_t dev)
gen0, gen1);
sc->sc_bank = (gen0 > gen1) ? sc->sc_bank0 : sc->sc_bank1;
- bcopy((void *)sc->sc_bank, (void *)sc->sc_data, NVRAM_SIZE);
+ bcopy(sc->sc_bank, sc->sc_data, NVRAM_SIZE);
sc->sc_cdev = make_dev(&powermac_nvram_cdevsw, 0, 0, 0, 0600,
"powermac_nvram");
@@ -190,7 +190,7 @@ powermac_nvram_detach(device_t dev)
sc = device_get_softc(dev);
- if ((void *)sc->sc_bank0 != NULL)
+ if (sc->sc_bank0 != NULL)
pmap_unmapdev(sc->sc_bank0, NVRAM_SIZE * 2);
if (sc->sc_cdev != NULL)
@@ -224,12 +224,12 @@ powermac_nvram_close(struct cdev *dev, int fflag, int devtype, struct thread *td
{
struct powermac_nvram_softc *sc = dev->si_drv1;
struct core99_header *header;
- vm_offset_t bank;
+ void *bank;
sx_xlock(&sc->sc_lock);
if (sc->sc_wpos != sizeof(sc->sc_data)) {
/* Short write, restore in-memory copy */
- bcopy((void *)sc->sc_bank, (void *)sc->sc_data, NVRAM_SIZE);
+ bcopy(sc->sc_bank, sc->sc_data, NVRAM_SIZE);
sc->sc_isopen = 0;
sx_xunlock(&sc->sc_lock);
return 0;
@@ -249,8 +249,8 @@ powermac_nvram_close(struct cdev *dev, int fflag, int devtype, struct thread *td
(uint8_t *)&(header->adler_checksum));
bank = (sc->sc_bank == sc->sc_bank0) ? sc->sc_bank1 : sc->sc_bank0;
- if (erase_bank(sc->sc_dev, (uint8_t *)bank) != 0 ||
- write_bank(sc->sc_dev, (uint8_t *)bank, sc->sc_data) != 0) {
+ if (erase_bank(sc->sc_dev, bank) != 0 ||
+ write_bank(sc->sc_dev, bank, sc->sc_data) != 0) {
sc->sc_isopen = 0;
sx_xunlock(&sc->sc_lock);
return ENOSPC;
diff --git a/sys/dev/powermac_nvram/powermac_nvramvar.h b/sys/dev/powermac_nvram/powermac_nvramvar.h
index abc514357531..ba637b62b83a 100644
--- a/sys/dev/powermac_nvram/powermac_nvramvar.h
+++ b/sys/dev/powermac_nvram/powermac_nvramvar.h
@@ -51,9 +51,9 @@ struct powermac_nvram_softc {
device_t sc_dev;
struct sx sc_lock;
phandle_t sc_node;
- vm_offset_t sc_bank;
- vm_offset_t sc_bank0;
- vm_offset_t sc_bank1;
+ void * sc_bank;
+ void * sc_bank0;
+ void * sc_bank1;
uint8_t sc_data[NVRAM_SIZE];
struct cdev * sc_cdev;
diff --git a/sys/dev/smbios/smbios.c b/sys/dev/smbios/smbios.c
index 57f20d7b75c1..b76d0f343671 100644
--- a/sys/dev/smbios/smbios.c
+++ b/sys/dev/smbios/smbios.c
@@ -124,7 +124,7 @@ smbios_identify (driver_t *driver, device_t parent)
device_set_driver(child, driver);
bus_set_resource(child, SYS_RES_MEMORY, rid, addr, length);
device_set_desc(child, "System Management BIOS");
- pmap_unmapbios((vm_offset_t)eps, 0x1f);
+ pmap_unmapbios(eps, 0x1f);
}
return;
diff --git a/sys/dev/vt/hw/efifb/efifb.c b/sys/dev/vt/hw/efifb/efifb.c
index fd78e53bbaf7..b30b1d29e205 100644
--- a/sys/dev/vt/hw/efifb/efifb.c
+++ b/sys/dev/vt/hw/efifb/efifb.c
@@ -154,5 +154,5 @@ vt_efifb_fini(struct vt_device *vd, void *softc)
struct fb_info *info = softc;
vt_fb_fini(vd, softc);
- pmap_unmapdev(info->fb_vbase, info->fb_size);
+ pmap_unmapdev((void *)info->fb_vbase, info->fb_size);
}
diff --git a/sys/dev/vt/hw/vbefb/vbefb.c b/sys/dev/vt/hw/vbefb/vbefb.c
index 569a40eb7d95..5223fb58d850 100644
--- a/sys/dev/vt/hw/vbefb/vbefb.c
+++ b/sys/dev/vt/hw/vbefb/vbefb.c
@@ -159,5 +159,5 @@ vt_vbefb_fini(struct vt_device *vd, void *softc)
struct fb_info *info = softc;
vt_fb_fini(vd, softc);
- pmap_unmapdev(info->fb_vbase, info->fb_size);
+ pmap_unmapdev((void *)info->fb_vbase, info->fb_size);
}
diff --git a/sys/dev/xen/bus/xenpv.c b/sys/dev/xen/bus/xenpv.c
index 3d1d1025b736..584b114119e9 100644
--- a/sys/dev/xen/bus/xenpv.c
+++ b/sys/dev/xen/bus/xenpv.c
@@ -144,12 +144,12 @@ static int
xenpv_free_physmem(device_t dev, device_t child, int res_id, struct resource *res)
{
vm_paddr_t phys_addr;
- vm_offset_t virt_addr;
+ void *virt_addr;
size_t size;
phys_addr = rman_get_start(res);
size = rman_get_size(res);
- virt_addr = (vm_offset_t)rman_get_virtual(res);
+ virt_addr = rman_get_virtual(res);
pmap_unmapdev(virt_addr, size);
vm_phys_fictitious_unreg_range(phys_addr, phys_addr + size);
generated by cgit v1.3 (git 2.53.0) at 2026-05-13 04:04:35 +0000