Page MenuHomeFreeBSD
Files F160123849

D17841.id50589.diff
No OneTemporary
Actions

D17841.id50589.diff
View Options

Index: head/sys/arm64/arm64/gicv3_its.c
===================================================================
--- head/sys/arm64/arm64/gicv3_its.c
+++ head/sys/arm64/arm64/gicv3_its.c
@@ -580,18 +580,11 @@
uint64_t xbaser, tmp;
uint32_t ctlr;
u_int cpuid;
- int domain;
- if (!CPU_ISSET(PCPU_GET(cpuid), &sc->sc_cpus))
- return (0);
-
- if (bus_get_domain(dev, &domain) == 0) {
- if (PCPU_GET(domain) != domain)
- return (0);
- }
-
gicv3 = device_get_parent(dev);
cpuid = PCPU_GET(cpuid);
+ if (!CPU_ISSET(cpuid, &sc->sc_cpus))
+ return (0);
/* Check if the ITS is enabled on this CPU */
if ((gic_r_read_4(gicv3, GICR_TYPER) & GICR_TYPER_PLPIS) == 0) {
@@ -729,12 +722,14 @@
/* Protects access to the ITS command circular buffer. */
mtx_init(&sc->sc_its_cmd_lock, "ITS cmd lock", NULL, MTX_SPIN);
+ CPU_ZERO(&sc->sc_cpus);
if (bus_get_domain(dev, &domain) == 0) {
- CPU_ZERO(&sc->sc_cpus);
if (domain < MAXMEMDOM)
CPU_COPY(&cpuset_domain[domain], &sc->sc_cpus);
} else {
- CPU_COPY(&all_cpus, &sc->sc_cpus);
+ /* XXX : cannot handle more than one ITS per cpu */
+ if (device_get_unit(dev) == 0)
+ CPU_COPY(&all_cpus, &sc->sc_cpus);
}
/* Allocate the command circular buffer */
@@ -1737,7 +1732,7 @@
sc->sc_pic = intr_pic_register(dev,
device_get_unit(dev) + ACPI_MSI_XREF);
intr_pic_add_handler(device_get_parent(dev), sc->sc_pic,
- gicv3_its_intr, sc, GIC_FIRST_LPI, LPI_NIRQS);
+ gicv3_its_intr, sc, sc->sc_irq_base, sc->sc_irq_length);
/* Register this device to handle MSI interrupts */
intr_msi_register(dev, device_get_unit(dev) + ACPI_MSI_XREF);

File Metadata

Mime Type
text/plain
Expires
Mon, Jun 22, 2:35 PM (16 h, 10 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
34193451
Default Alt Text
D17841.id50589.diff (1 KB)

Event Timeline