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

Intel DMAR: remove the 'dev' member

Browse source 
It duplicates iommu.dev, and was forgotten when struct iommu was split
out from dmar.

Sponsored by:	The FreeBSD Foundation
Sponsored by:	AMD dvanced Micro Devices (AMD)
MFC after:	1 week
This commit is contained in:
Konstantin Belousov 2024-05-30 17:05:22 +03:00
parent 1eb7099eac
commit 164fdee111
5 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sys/x86/iommu/intel_dmar.h
View file

@ -123,7 +123,6 @@ struct dmar_msi_data {
struct dmar_unit { struct dmar_unit {
struct iommu_unit iommu; struct iommu_unit iommu;
device_t dev;
uint16_t segment; uint16_t segment;
uint64_t base; uint64_t base;

1
sys/x86/iommu/intel_drv.c
View file

@ -410,7 +410,6 @@ dmar_attach(device_t dev)
int i, error; int i, error;
unit = device_get_softc(dev); unit = device_get_softc(dev);
unit->dev = dev;
unit->iommu.unit = device_get_unit(dev); unit->iommu.unit = device_get_unit(dev);
unit->iommu.dev = dev; unit->iommu.dev = dev;
dmaru = dmar_find_by_index(unit->iommu.unit); dmaru = dmar_find_by_index(unit->iommu.unit);

4
sys/x86/iommu/intel_intrmap.c
View file

@ -271,7 +271,7 @@ dmar_ir_program_irte(struct dmar_unit *unit, u_int idx, uint64_t low,
high = DMAR_IRTE2_SVT_RID | DMAR_IRTE2_SQ_RID | high = DMAR_IRTE2_SVT_RID | DMAR_IRTE2_SQ_RID |
DMAR_IRTE2_SID_RID(rid); DMAR_IRTE2_SID_RID(rid);
if (bootverbose) { if (bootverbose) {
device_printf(unit->dev, device_printf(unit->iommu.dev,
"programming irte[%d] rid %#x high %#jx low %#jx\n", "programming irte[%d] rid %#x high %#jx low %#jx\n",
idx, rid, (uintmax_t)high, (uintmax_t)low); idx, rid, (uintmax_t)high, (uintmax_t)low);
} }
@ -335,7 +335,7 @@ dmar_init_irt(struct dmar_unit *unit)
if (!unit->qi_enabled) { if (!unit->qi_enabled) {
unit->ir_enabled = 0; unit->ir_enabled = 0;
if (bootverbose) if (bootverbose)
device_printf(unit->dev, device_printf(unit->iommu.dev,
"QI disabled, disabling interrupt remapping\n"); "QI disabled, disabling interrupt remapping\n");
return (0); return (0);
} }

7
sys/x86/iommu/intel_quirks.c
View file

@ -108,7 +108,7 @@ dmar_match_quirks(struct dmar_unit *dmar,
(nb_quirk->rev_no == rev_no || (nb_quirk->rev_no == rev_no ||
nb_quirk->rev_no == QUIRK_NB_ALL_REV)) { nb_quirk->rev_no == QUIRK_NB_ALL_REV)) {
if (bootverbose) { if (bootverbose) {
device_printf(dmar->dev, device_printf(dmar->iommu.dev,
"NB IOMMU quirk %s\n", "NB IOMMU quirk %s\n",
nb_quirk->descr); nb_quirk->descr);
} }
@ -116,7 +116,8 @@ dmar_match_quirks(struct dmar_unit *dmar,
} }
} }
} else { } else {
device_printf(dmar->dev, "cannot find northbridge\n"); device_printf(dmar->iommu.dev,
"cannot find northbridge\n");
} }
} }
if (cpu_quirks != NULL) { if (cpu_quirks != NULL) {
@ -135,7 +136,7 @@ dmar_match_quirks(struct dmar_unit *dmar,
(cpu_quirk->stepping == -1 || (cpu_quirk->stepping == -1 ||
cpu_quirk->stepping == stepping)) { cpu_quirk->stepping == stepping)) {
if (bootverbose) { if (bootverbose) {
device_printf(dmar->dev, device_printf(dmar->iommu.dev,
"CPU IOMMU quirk %s\n", "CPU IOMMU quirk %s\n",
cpu_quirk->descr); cpu_quirk->descr);
} }

2
sys/x86/iommu/intel_utils.c
View file

@ -136,7 +136,7 @@ domain_set_agaw(struct dmar_domain *domain, int mgaw)
return (0); return (0);
} }
} }
device_printf(domain->dmar->dev, device_printf(domain->dmar->iommu.dev,
"context request mgaw %d: no agaw found, sagaw %x\n", "context request mgaw %d: no agaw found, sagaw %x\n",
mgaw, sagaw); mgaw, sagaw);
return (EINVAL); return (EINVAL);