system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-22 02:37:15 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

arm64: Fixed IOMMU compilation errors

Browse source 
These are missing changes after 1228b93b41 when ref_count was
removed from bus_dma_tag_common and 1e3f42b6ba, when the address
arguments were switched to pointers.

Reviewed by:		jhb
MFC after:		3 days
Differential Revision:	https://reviews.freebsd.org/D45289
This commit is contained in:
Dmitry Salychev 2024-05-21 22:25:59 +02:00
parent c2628accc0
commit ac4ddc467b
No known key found for this signature in database
GPG key ID: CEDA4464564B041D
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sys/arm64/conf/NOTES
View file

@ -240,6 +240,8 @@ nooptions COMPAT_FREEBSD10
# arm64 supports 32-bit FreeBSD/arm binaries (armv[67] ABIs)
options COMPAT_FREEBSD32 # Compatible with FreeBSD/arm
options IOMMU # ARM64 SMMU/IOMMU
#####################################################################
# ZFS support
@ -250,4 +252,4 @@ options ZFS
#
device iichid # HID-over-I2C support
options IICHID_DEBUG # Enable HID-over-I2C debug messages
options IICHID_SAMPLING # Workaround missing GPIO INTR support
options IICHID_SAMPLING # Workaround missing GPIO INTR support

1
sys/arm64/iommu/iommu.c
View file

@ -172,7 +172,6 @@ iommu_tag_init(struct iommu_domain *iodom, struct bus_dma_tag_iommu *t)
maxaddr = MIN(iodom->end, BUS_SPACE_MAXADDR);
t->common.ref_count = 0;
t->common.impl = &bus_dma_iommu_impl;
t->common.alignment = 1;
t->common.boundary = 0;

8
sys/arm64/iommu/iommu_pmap.c
View file

@ -632,8 +632,8 @@ pmap_gpu_enter(struct smmu_pmap *pmap, vm_offset_t va, vm_paddr_t pa,
l1p = smmu_pmap_l1(pmap, va);
l2p = smmu_pmap_l2(pmap, va);
cpu_dcache_wb_range((vm_offset_t)l1p, sizeof(pd_entry_t));
cpu_dcache_wb_range((vm_offset_t)l2p, sizeof(pd_entry_t));
cpu_dcache_wb_range(l1p, sizeof(pd_entry_t));
cpu_dcache_wb_range(l2p, sizeof(pd_entry_t));
goto retry;
}
@ -644,7 +644,7 @@ pmap_gpu_enter(struct smmu_pmap *pmap, vm_offset_t va, vm_paddr_t pa,
/* New mapping */
smmu_pmap_store(l3, new_l3);
cpu_dcache_wb_range((vm_offset_t)l3, sizeof(pt_entry_t));
cpu_dcache_wb_range(l3, sizeof(pt_entry_t));
smmu_pmap_resident_count_inc(pmap, 1);
dsb(ishst);
@ -681,7 +681,7 @@ pmap_gpu_remove(struct smmu_pmap *pmap, vm_offset_t va)
smmu_pmap_resident_count_dec(pmap, 1);
smmu_pmap_clear(pte);
cpu_dcache_wb_range((vm_offset_t)pte, sizeof(pt_entry_t));
cpu_dcache_wb_range(pte, sizeof(pt_entry_t));
rc = KERN_SUCCESS;
out: