svn commit: r305136 - in stable/11/sys: arm64/arm64 arm64/cavium arm64/include dev/pci
Andrew Turner
andrew at FreeBSD.org
Wed Aug 31 17:36:45 UTC 2016
Author: andrew
Date: Wed Aug 31 17:36:43 2016
New Revision: 305136
URL: https://svnweb.freebsd.org/changeset/base/305136
Log:
MFC 302847, 302848, 302852, 302853:
Remove the remaining non-INTRNG support from the arm64 code.
Modified:
stable/11/sys/arm64/arm64/autoconf.c
stable/11/sys/arm64/arm64/gic_v3.c
stable/11/sys/arm64/arm64/gic_v3_fdt.c
stable/11/sys/arm64/arm64/gic_v3_var.h
stable/11/sys/arm64/arm64/mp_machdep.c
stable/11/sys/arm64/arm64/nexus.c
stable/11/sys/arm64/cavium/thunder_pcie_pem_fdt.c
stable/11/sys/arm64/include/intr.h
stable/11/sys/dev/pci/pci_host_generic.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/arm64/arm64/autoconf.c
==============================================================================
--- stable/11/sys/arm64/arm64/autoconf.c Wed Aug 31 17:30:21 2016 (r305135)
+++ stable/11/sys/arm64/arm64/autoconf.c Wed Aug 31 17:36:43 2016 (r305136)
@@ -81,12 +81,8 @@ static void
configure_final(void *dummy)
{
-#ifdef INTRNG
/* Enable interrupt reception on this CPU */
intr_enable();
-#else
- arm_enable_intr();
-#endif
cninit_finish();
if (bootverbose)
Modified: stable/11/sys/arm64/arm64/gic_v3.c
==============================================================================
--- stable/11/sys/arm64/arm64/gic_v3.c Wed Aug 31 17:30:21 2016 (r305135)
+++ stable/11/sys/arm64/arm64/gic_v3.c Wed Aug 31 17:36:43 2016 (r305136)
@@ -69,7 +69,6 @@ __FBSDID("$FreeBSD$");
static bus_read_ivar_t gic_v3_read_ivar;
-#ifdef INTRNG
static pic_disable_intr_t gic_v3_disable_intr;
static pic_enable_intr_t gic_v3_enable_intr;
static pic_map_intr_t gic_v3_map_intr;
@@ -90,18 +89,6 @@ static u_int gic_irq_cpu;
static u_int sgi_to_ipi[GIC_LAST_SGI - GIC_FIRST_SGI + 1];
static u_int sgi_first_unused = GIC_FIRST_SGI;
#endif
-#else
-/* Device and PIC methods */
-static int gic_v3_bind(device_t, u_int, u_int);
-static void gic_v3_dispatch(device_t, struct trapframe *);
-static void gic_v3_eoi(device_t, u_int);
-static void gic_v3_mask_irq(device_t, u_int);
-static void gic_v3_unmask_irq(device_t, u_int);
-#ifdef SMP
-static void gic_v3_init_secondary(device_t);
-static void gic_v3_ipi_send(device_t, cpuset_t, u_int);
-#endif
-#endif
static device_method_t gic_v3_methods[] = {
/* Device interface */
@@ -110,7 +97,6 @@ static device_method_t gic_v3_methods[]
/* Bus interface */
DEVMETHOD(bus_read_ivar, gic_v3_read_ivar),
-#ifdef INTRNG
/* Interrupt controller interface */
DEVMETHOD(pic_disable_intr, gic_v3_disable_intr),
DEVMETHOD(pic_enable_intr, gic_v3_enable_intr),
@@ -126,18 +112,6 @@ static device_method_t gic_v3_methods[]
DEVMETHOD(pic_ipi_send, gic_v3_ipi_send),
DEVMETHOD(pic_ipi_setup, gic_v3_ipi_setup),
#endif
-#else
- /* PIC interface */
- DEVMETHOD(pic_bind, gic_v3_bind),
- DEVMETHOD(pic_dispatch, gic_v3_dispatch),
- DEVMETHOD(pic_eoi, gic_v3_eoi),
- DEVMETHOD(pic_mask, gic_v3_mask_irq),
- DEVMETHOD(pic_unmask, gic_v3_unmask_irq),
-#ifdef SMP
- DEVMETHOD(pic_init_secondary, gic_v3_init_secondary),
- DEVMETHOD(pic_ipi_send, gic_v3_ipi_send),
-#endif
-#endif
/* End */
DEVMETHOD_END
@@ -188,7 +162,6 @@ static gic_v3_initseq_t gic_v3_secondary
};
#endif
-#ifdef INTRNG
uint32_t
gic_r_read_4(device_t dev, bus_size_t offset)
{
@@ -224,7 +197,6 @@ gic_r_write_8(device_t dev, bus_size_t o
sc = device_get_softc(dev);
bus_write_8(sc->gic_redists.pcpu[PCPU_GET(cpuid)], offset, val);
}
-#endif
/*
* Device interface.
@@ -238,10 +210,8 @@ gic_v3_attach(device_t dev)
int rid;
int err;
size_t i;
-#ifdef INTRNG
u_int irq;
const char *name;
-#endif
sc = device_get_softc(dev);
sc->gic_registered = FALSE;
@@ -290,7 +260,6 @@ gic_v3_attach(device_t dev)
if (sc->gic_nirqs > GIC_I_NUM_MAX)
sc->gic_nirqs = GIC_I_NUM_MAX;
-#ifdef INTRNG
sc->gic_irqs = malloc(sizeof(*sc->gic_irqs) * sc->gic_nirqs,
M_GIC_V3, M_WAITOK | M_ZERO);
name = device_get_nameunit(dev);
@@ -318,7 +287,6 @@ gic_v3_attach(device_t dev)
return (err);
}
}
-#endif
/* Get the number of supported interrupt identifier bits */
sc->gic_idbits = GICD_TYPER_IDBITS(typer);
@@ -334,14 +302,6 @@ gic_v3_attach(device_t dev)
if (err != 0)
return (err);
}
- /*
- * Full success.
- * Now register PIC to the interrupts handling layer.
- */
-#ifndef INTRNG
- arm_register_root_pic(dev, sc->gic_nirqs);
- sc->gic_registered = TRUE;
-#endif
return (0);
}
@@ -394,7 +354,6 @@ gic_v3_read_ivar(device_t dev, device_t
return (ENOENT);
}
-#ifdef INTRNG
int
arm_gic_v3_intr(void *arg)
{
@@ -914,215 +873,6 @@ gic_v3_ipi_setup(device_t dev, u_int ipi
return (0);
}
#endif /* SMP */
-#else /* INTRNG */
-/*
- * PIC interface.
- */
-
-static int
-gic_v3_bind(device_t dev, u_int irq, u_int cpuid)
-{
- uint64_t aff;
- struct gic_v3_softc *sc;
-
- sc = device_get_softc(dev);
-
- if (irq <= GIC_LAST_PPI) {
- /* Can't bind PPI to another CPU but it's not an error */
- return (0);
- } else if (irq >= GIC_FIRST_SPI && irq <= GIC_LAST_SPI) {
- aff = CPU_AFFINITY(cpuid);
- gic_d_write(sc, 4, GICD_IROUTER(irq), aff);
- return (0);
- } else if (irq >= GIC_FIRST_LPI)
- return (lpi_migrate(dev, irq, cpuid));
-
- return (EINVAL);
-}
-
-static void
-gic_v3_dispatch(device_t dev, struct trapframe *frame)
-{
- uint64_t active_irq;
-
- while (1) {
- if (CPU_MATCH_ERRATA_CAVIUM_THUNDER_1_1) {
- /*
- * Hardware: Cavium ThunderX
- * Chip revision: Pass 1.0 (early version)
- * Pass 1.1 (production)
- * ERRATUM: 22978, 23154
- */
- __asm __volatile(
- "nop;nop;nop;nop;nop;nop;nop;nop; \n"
- "mrs %0, ICC_IAR1_EL1 \n"
- "nop;nop;nop;nop; \n"
- "dsb sy \n"
- : "=&r" (active_irq));
- } else {
- active_irq = gic_icc_read(IAR1);
- }
-
- if (__predict_false(active_irq == ICC_IAR1_EL1_SPUR))
- break;
-
- if (__predict_true((active_irq >= GIC_FIRST_PPI &&
- active_irq <= GIC_LAST_SPI) || active_irq >= GIC_FIRST_LPI)) {
- arm_dispatch_intr(active_irq, frame);
- continue;
- }
-
- if (active_irq <= GIC_LAST_SGI) {
- gic_icc_write(EOIR1, (uint64_t)active_irq);
- arm_dispatch_intr(active_irq, frame);
- continue;
- }
- }
-}
-
-static void
-gic_v3_eoi(device_t dev, u_int irq)
-{
-
- gic_icc_write(EOIR1, (uint64_t)irq);
-}
-
-static void
-gic_v3_mask_irq(device_t dev, u_int irq)
-{
- struct gic_v3_softc *sc;
-
- sc = device_get_softc(dev);
-
- if (irq <= GIC_LAST_PPI) { /* SGIs and PPIs in corresponding Re-Distributor */
- gic_r_write(sc, 4,
- GICR_SGI_BASE_SIZE + GICD_ICENABLER(irq), GICD_I_MASK(irq));
- gic_v3_wait_for_rwp(sc, REDIST);
- } else if (irq >= GIC_FIRST_SPI && irq <= GIC_LAST_SPI) { /* SPIs in distributor */
- gic_r_write(sc, 4, GICD_ICENABLER(irq), GICD_I_MASK(irq));
- gic_v3_wait_for_rwp(sc, DIST);
- } else if (irq >= GIC_FIRST_LPI) { /* LPIs */
- lpi_mask_irq(dev, irq);
- } else
- panic("%s: Unsupported IRQ number %u", __func__, irq);
-}
-
-static void
-gic_v3_unmask_irq(device_t dev, u_int irq)
-{
- struct gic_v3_softc *sc;
-
- sc = device_get_softc(dev);
-
- if (irq <= GIC_LAST_PPI) { /* SGIs and PPIs in corresponding Re-Distributor */
- gic_r_write(sc, 4,
- GICR_SGI_BASE_SIZE + GICD_ISENABLER(irq), GICD_I_MASK(irq));
- gic_v3_wait_for_rwp(sc, REDIST);
- } else if (irq >= GIC_FIRST_SPI && irq <= GIC_LAST_SPI) { /* SPIs in distributor */
- gic_d_write(sc, 4, GICD_ISENABLER(irq), GICD_I_MASK(irq));
- gic_v3_wait_for_rwp(sc, DIST);
- } else if (irq >= GIC_FIRST_LPI) { /* LPIs */
- lpi_unmask_irq(dev, irq);
- } else
- panic("%s: Unsupported IRQ number %u", __func__, irq);
-}
-
-#ifdef SMP
-static void
-gic_v3_init_secondary(device_t dev)
-{
- struct gic_v3_softc *sc;
- gic_v3_initseq_t *init_func;
- int err;
-
- sc = device_get_softc(dev);
-
- /* Train init sequence for boot CPU */
- for (init_func = gic_v3_secondary_init; *init_func != NULL; init_func++) {
- err = (*init_func)(sc);
- if (err != 0) {
- device_printf(dev,
- "Could not initialize GIC for CPU%u\n",
- PCPU_GET(cpuid));
- return;
- }
- }
-
- /*
- * Try to initialize ITS.
- * If there is no driver attached this routine will fail but that
- * does not mean failure here as only LPIs will not be functional
- * on the current CPU.
- */
- if (its_init_cpu(NULL) != 0) {
- device_printf(dev,
- "Could not initialize ITS for CPU%u. "
- "No LPIs will arrive on this CPU\n",
- PCPU_GET(cpuid));
- }
-
- /*
- * ARM64TODO: Unmask timer PPIs. To be removed when appropriate
- * mechanism is implemented.
- * Activate the timer interrupts: virtual (27), secure (29),
- * and non-secure (30). Use hardcoded values here as there
- * should be no defines for them.
- */
- gic_v3_unmask_irq(dev, 27);
- gic_v3_unmask_irq(dev, 29);
- gic_v3_unmask_irq(dev, 30);
-}
-
-static void
-gic_v3_ipi_send(device_t dev, cpuset_t cpuset, u_int ipi)
-{
- u_int cpu;
- uint64_t aff, tlist;
- uint64_t val;
- uint64_t aff_mask;
-
- /* Set affinity mask to match level 3, 2 and 1 */
- aff_mask = CPU_AFF1_MASK | CPU_AFF2_MASK | CPU_AFF3_MASK;
-
- /* Iterate through all CPUs in set */
- while (!CPU_EMPTY(&cpuset)) {
- aff = tlist = 0;
- for (cpu = 0; cpu < mp_ncpus; cpu++) {
- /* Compose target list for single AFF3:AFF2:AFF1 set */
- if (CPU_ISSET(cpu, &cpuset)) {
- if (!tlist) {
- /*
- * Save affinity of the first CPU to
- * send IPI to for later comparison.
- */
- aff = CPU_AFFINITY(cpu);
- tlist |= (1UL << CPU_AFF0(aff));
- CPU_CLR(cpu, &cpuset);
- }
- /* Check for same Affinity level 3, 2 and 1 */
- if ((aff & aff_mask) == (CPU_AFFINITY(cpu) & aff_mask)) {
- tlist |= (1UL << CPU_AFF0(CPU_AFFINITY(cpu)));
- /* Clear CPU in cpuset from target list */
- CPU_CLR(cpu, &cpuset);
- }
- }
- }
- if (tlist) {
- KASSERT((tlist & ~ICC_SGI1R_EL1_TL_MASK) == 0,
- ("Target list too long for GICv3 IPI"));
- /* Send SGI to CPUs in target list */
- val = tlist;
- val |= (uint64_t)CPU_AFF3(aff) << ICC_SGI1R_EL1_AFF3_SHIFT;
- val |= (uint64_t)CPU_AFF2(aff) << ICC_SGI1R_EL1_AFF2_SHIFT;
- val |= (uint64_t)CPU_AFF1(aff) << ICC_SGI1R_EL1_AFF1_SHIFT;
- val |= (uint64_t)(ipi & ICC_SGI1R_EL1_SGIID_MASK) <<
- ICC_SGI1R_EL1_SGIID_SHIFT;
- gic_icc_write(SGI1R, val);
- }
- }
-}
-#endif
-#endif /* !INTRNG */
/*
* Helper routines
Modified: stable/11/sys/arm64/arm64/gic_v3_fdt.c
==============================================================================
--- stable/11/sys/arm64/arm64/gic_v3_fdt.c Wed Aug 31 17:30:21 2016 (r305135)
+++ stable/11/sys/arm64/arm64/gic_v3_fdt.c Wed Aug 31 17:36:43 2016 (r305136)
@@ -116,9 +116,7 @@ gic_v3_fdt_attach(device_t dev)
{
struct gic_v3_softc *sc;
pcell_t redist_regions;
-#ifdef INTRNG
intptr_t xref;
-#endif
int err;
sc = device_get_softc(dev);
@@ -137,7 +135,6 @@ gic_v3_fdt_attach(device_t dev)
if (err != 0)
goto error;
-#ifdef INTRNG
xref = OF_xref_from_node(ofw_bus_get_node(dev));
sc->gic_pic = intr_pic_register(dev, xref);
if (sc->gic_pic == NULL) {
@@ -151,7 +148,6 @@ gic_v3_fdt_attach(device_t dev)
err = ENXIO;
goto error;
}
-#endif
/*
* Try to register ITS to this GIC.
@@ -165,10 +161,8 @@ gic_v3_fdt_attach(device_t dev)
}
}
-#ifdef INTRNG
if (device_get_children(dev, &sc->gic_children, &sc->gic_nchildren) != 0)
sc->gic_nchildren = 0;
-#endif
return (err);
@@ -302,37 +296,3 @@ gic_v3_ofw_bus_attach(device_t dev)
return (bus_generic_attach(dev));
}
-
-#ifndef INTRNG
-static int gic_v3_its_fdt_probe(device_t dev);
-
-static device_method_t gic_v3_its_fdt_methods[] = {
- /* Device interface */
- DEVMETHOD(device_probe, gic_v3_its_fdt_probe),
-
- /* End */
- DEVMETHOD_END
-};
-
-DEFINE_CLASS_1(its, gic_v3_its_fdt_driver, gic_v3_its_fdt_methods,
- sizeof(struct gic_v3_its_softc), gic_v3_its_driver);
-
-static devclass_t gic_v3_its_fdt_devclass;
-
-EARLY_DRIVER_MODULE(its, gic, gic_v3_its_fdt_driver,
- gic_v3_its_fdt_devclass, 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
-
-static int
-gic_v3_its_fdt_probe(device_t dev)
-{
-
- if (!ofw_bus_status_okay(dev))
- return (ENXIO);
-
- if (!ofw_bus_is_compatible(dev, GIC_V3_ITS_COMPSTR))
- return (ENXIO);
-
- device_set_desc(dev, GIC_V3_ITS_DEVSTR);
- return (BUS_PROBE_DEFAULT);
-}
-#endif
Modified: stable/11/sys/arm64/arm64/gic_v3_var.h
==============================================================================
--- stable/11/sys/arm64/arm64/gic_v3_var.h Wed Aug 31 17:30:21 2016 (r305135)
+++ stable/11/sys/arm64/arm64/gic_v3_var.h Wed Aug 31 17:36:43 2016 (r305136)
@@ -36,21 +36,12 @@
DECLARE_CLASS(gic_v3_driver);
-#ifndef INTRNG
-#define LPI_FLAGS_CONF_FLUSH (1UL << 0)
-#define LPI_CONFTAB_SIZE PAGE_SIZE_64K
-/* 1 bit per LPI + 1 KB more for the obligatory PPI, SGI, SPI stuff */
-#define LPI_PENDTAB_SIZE ((LPI_CONFTAB_SIZE / 8) + 0x400)
-#endif
-
-#ifdef INTRNG
struct gic_v3_irqsrc {
struct intr_irqsrc gi_isrc;
uint32_t gi_irq;
enum intr_polarity gi_pol;
enum intr_trigger gi_trig;
};
-#endif
struct redist_lpis {
vm_offset_t conf_base;
@@ -87,17 +78,13 @@ struct gic_v3_softc {
boolean_t gic_registered;
-#ifdef INTRNG
int gic_nchildren;
device_t *gic_children;
struct intr_pic *gic_pic;
struct gic_v3_irqsrc *gic_irqs;
-#endif
};
-#ifdef INTRNG
#define GIC_INTR_ISRC(sc, irq) (&sc->gic_irqs[irq].gi_isrc)
-#endif
MALLOC_DECLARE(M_GIC_V3);
@@ -115,12 +102,10 @@ int gic_v3_attach(device_t dev);
int gic_v3_detach(device_t dev);
int arm_gic_v3_intr(void *);
-#ifdef INTRNG
uint32_t gic_r_read_4(device_t, bus_size_t);
uint64_t gic_r_read_8(device_t, bus_size_t);
void gic_r_write_4(device_t, bus_size_t, uint32_t var);
void gic_r_write_8(device_t, bus_size_t, uint64_t var);
-#endif
/*
* ITS
@@ -130,9 +115,6 @@ void gic_r_write_8(device_t, bus_size_t,
struct lpi_chunk {
u_int lpi_base;
u_int lpi_free; /* First free LPI in set */
-#ifndef INTRNG
- u_int *lpi_col_ids;
-#endif
u_int lpi_num; /* Total number of LPIs in chunk */
u_int lpi_busy; /* Number of busy LPIs in chink */
};
@@ -150,64 +132,6 @@ struct its_dev {
vm_offset_t itt;
size_t itt_size;
};
-#ifndef INTRNG
-TAILQ_HEAD(its_dev_list, its_dev);
-
-/* ITS private table description */
-struct its_ptab {
- vm_offset_t ptab_vaddr; /* Virtual Address of table */
- size_t ptab_pgsz; /* Page size */
- size_t ptab_npages; /* Number of pages */
-};
-
-/* ITS collection description. */
-struct its_col {
- uint64_t col_target; /* Target Re-Distributor */
- uint64_t col_id; /* Collection ID */
-};
-
-/* ITS command. Each command is 32 bytes long */
-struct its_cmd {
- uint64_t cmd_dword[4]; /* ITS command double word */
-};
-
-#define GIC_V3_ITS_DEVSTR "ARM GIC Interrupt Translation Service"
-#define GIC_V3_ITS_COMPSTR "arm,gic-v3-its"
-
-DECLARE_CLASS(gic_v3_its_driver);
-
-/* ITS commands encoding */
-#define ITS_CMD_MOVI (0x01)
-#define ITS_CMD_SYNC (0x05)
-#define ITS_CMD_MAPD (0x08)
-#define ITS_CMD_MAPC (0x09)
-#define ITS_CMD_MAPVI (0x0a)
-#define ITS_CMD_MAPI (0x0b)
-#define ITS_CMD_INV (0x0c)
-#define ITS_CMD_INVALL (0x0d)
-/* Command */
-#define CMD_COMMAND_MASK (0xFFUL)
-/* PCI device ID */
-#define CMD_DEVID_SHIFT (32)
-#define CMD_DEVID_MASK (0xFFFFFFFFUL << CMD_DEVID_SHIFT)
-/* Size of IRQ ID bitfield */
-#define CMD_SIZE_MASK (0xFFUL)
-/* Virtual LPI ID */
-#define CMD_ID_MASK (0xFFFFFFFFUL)
-/* Physical LPI ID */
-#define CMD_PID_SHIFT (32)
-#define CMD_PID_MASK (0xFFFFFFFFUL << CMD_PID_SHIFT)
-/* Collection */
-#define CMD_COL_MASK (0xFFFFUL)
-/* Target (CPU or Re-Distributor) */
-#define CMD_TARGET_SHIFT (16)
-#define CMD_TARGET_MASK (0xFFFFFFFFUL << CMD_TARGET_SHIFT)
-/* Interrupt Translation Table address */
-#define CMD_ITT_MASK (0xFFFFFFFFFF00UL)
-/* Valid command bit */
-#define CMD_VALID_SHIFT (63)
-#define CMD_VALID_MASK (1UL << CMD_VALID_SHIFT)
-#endif /* INTRNG */
/*
* ITS command descriptor.
@@ -264,61 +188,6 @@ struct its_cmd_desc {
#define ITS_TARGET_NONE 0xFBADBEEF
-#ifndef INTRNG
-#define ITS_CMDQ_SIZE PAGE_SIZE_64K
-#define ITS_CMDQ_NENTRIES (ITS_CMDQ_SIZE / sizeof(struct its_cmd))
-
-#define ITS_FLAGS_CMDQ_FLUSH (1UL << 0)
-
-struct gic_v3_its_softc {
- device_t dev;
- struct resource * its_res;
-
- struct its_cmd * its_cmdq_base; /* ITS command queue base */
- struct its_cmd * its_cmdq_write; /* ITS command queue write ptr */
- struct its_ptab its_ptabs[GITS_BASER_NUM];/* ITS private tables */
- struct its_col * its_cols[MAXCPU];/* Per-CPU collections */
-
- uint64_t its_flags;
-
-#ifndef INTRNG
- struct its_dev_list its_dev_list;
-#endif
-
- bitstr_t * its_lpi_bitmap;
- uint32_t its_lpi_maxid;
-
- struct mtx its_dev_lock;
- struct mtx its_cmd_lock;
-
- uint32_t its_socket; /* Socket number ITS is attached to */
-};
-
-/* Stuff that is specific to the vendor's implementation */
-typedef uint32_t (*its_devbits_func_t)(device_t);
-
-struct its_quirks {
- uint64_t cpuid;
- uint64_t cpuid_mask;
- its_devbits_func_t devbits_func;
-};
-
-extern devclass_t gic_v3_its_devclass;
-
-int gic_v3_its_detach(device_t);
-
-int gic_v3_its_alloc_msix(device_t, device_t, int *);
-int gic_v3_its_release_msix(device_t, device_t, int);
-int gic_v3_its_alloc_msi(device_t, device_t, int, int *);
-int gic_v3_its_release_msi(device_t, device_t, int, int *);
-int gic_v3_its_map_msi(device_t, device_t, int, uint64_t *, uint32_t *);
-
-int its_init_cpu(struct gic_v3_its_softc *);
-
-int lpi_migrate(device_t, uint32_t, u_int);
-void lpi_unmask_irq(device_t, uint32_t);
-void lpi_mask_irq(device_t, uint32_t);
-#endif
/*
* GIC Distributor accessors.
* Notice that only GIC sofc can be passed.
Modified: stable/11/sys/arm64/arm64/mp_machdep.c
==============================================================================
--- stable/11/sys/arm64/arm64/mp_machdep.c Wed Aug 31 17:30:21 2016 (r305135)
+++ stable/11/sys/arm64/arm64/mp_machdep.c Wed Aug 31 17:36:43 2016 (r305136)
@@ -65,7 +65,6 @@ __FBSDID("$FreeBSD$");
#include <dev/psci/psci.h>
-#ifdef INTRNG
#include "pic_if.h"
typedef void intr_ipi_send_t(void *, cpuset_t, u_int);
@@ -86,7 +85,6 @@ static struct intr_ipi ipi_sources[INTR_
static struct intr_ipi *intr_ipi_lookup(u_int);
static void intr_pic_ipi_setup(u_int, const char *, intr_ipi_handler_t *,
void *);
-#endif /* INTRNG */
boolean_t ofw_cpu_reg(phandle_t node, u_int, cell_t *);
@@ -214,18 +212,12 @@ release_aps(void *dummy __unused)
{
int cpu, i;
-#ifdef INTRNG
intr_pic_ipi_setup(IPI_AST, "ast", ipi_ast, NULL);
intr_pic_ipi_setup(IPI_PREEMPT, "preempt", ipi_preempt, NULL);
intr_pic_ipi_setup(IPI_RENDEZVOUS, "rendezvous", ipi_rendezvous, NULL);
intr_pic_ipi_setup(IPI_STOP, "stop", ipi_stop, NULL);
intr_pic_ipi_setup(IPI_STOP_HARD, "stop hard", ipi_stop, NULL);
intr_pic_ipi_setup(IPI_HARDCLOCK, "hardclock", ipi_hardclock, NULL);
-#else
- /* Setup the IPI handler */
- for (i = 0; i < INTR_IPI_COUNT; i++)
- arm_setup_ipihandler(ipi_handler, i);
-#endif
atomic_store_rel_int(&aps_ready, 1);
/* Wake up the other CPUs */
@@ -253,9 +245,6 @@ void
init_secondary(uint64_t cpu)
{
struct pcpu *pcpup;
-#ifndef INTRNG
- int i;
-#endif
pcpup = &__pcpu[cpu];
/*
@@ -282,15 +271,7 @@ init_secondary(uint64_t cpu)
*/
identify_cpu();
-#ifdef INTRNG
intr_pic_init_secondary();
-#else
- /* Configure the interrupt controller */
- arm_init_secondary();
-
- for (i = 0; i < INTR_IPI_COUNT; i++)
- arm_unmask_ipi(i);
-#endif
/* Start per-CPU event timers. */
cpu_initclocks_ap();
@@ -322,7 +303,6 @@ init_secondary(uint64_t cpu)
/* NOTREACHED */
}
-#ifdef INTRNG
/*
* Send IPI thru interrupt controller.
*/
@@ -378,7 +358,6 @@ intr_ipi_send(cpuset_t cpus, u_int ipi)
ii->ii_send(ii->ii_send_arg, cpus, ipi);
}
-#endif
static void
ipi_ast(void *dummy __unused)
@@ -432,44 +411,6 @@ ipi_stop(void *dummy __unused)
CTR0(KTR_SMP, "IPI_STOP (restart)");
}
-#ifndef INTRNG
-static int
-ipi_handler(void *arg)
-{
- u_int cpu, ipi;
-
- arg = (void *)((uintptr_t)arg & ~(1 << 16));
- KASSERT((uintptr_t)arg < INTR_IPI_COUNT,
- ("Invalid IPI %ju", (uintptr_t)arg));
-
- cpu = PCPU_GET(cpuid);
- ipi = (uintptr_t)arg;
-
- switch(ipi) {
- case IPI_AST:
- ipi_ast(NULL);
- break;
- case IPI_PREEMPT:
- ipi_preempt(NULL);
- break;
- case IPI_RENDEZVOUS:
- ipi_rendezvous(NULL);
- break;
- case IPI_STOP:
- case IPI_STOP_HARD:
- ipi_stop(NULL);
- break;
- case IPI_HARDCLOCK:
- ipi_hardclock(NULL);
- break;
- default:
- panic("Unknown IPI %#0x on cpu %d", ipi, curcpu);
- }
-
- return (FILTER_HANDLED);
-}
-#endif
-
struct cpu_group *
cpu_topo(void)
{
@@ -624,7 +565,6 @@ cpu_mp_setmaxid(void)
mp_maxid = 0;
}
-#ifdef INTRNG
/*
* Lookup IPI source.
*/
@@ -768,4 +708,3 @@ ipi_selected(cpuset_t cpus, u_int ipi)
CTR2(KTR_SMP, "%s: ipi: %x", __func__, ipi);
intr_ipi_send(cpus, ipi);
}
-#endif /* INTRNG */
Modified: stable/11/sys/arm64/arm64/nexus.c
==============================================================================
--- stable/11/sys/arm64/arm64/nexus.c Wed Aug 31 17:30:21 2016 (r305135)
+++ stable/11/sys/arm64/arm64/nexus.c Wed Aug 31 17:36:43 2016 (r305136)
@@ -271,13 +271,9 @@ nexus_config_intr(device_t dev, int irq,
enum intr_polarity pol)
{
-#ifdef INTRNG
/* TODO: This is wrong, it's needed for ACPI */
device_printf(dev, "bus_config_intr is obsolete and not supported!\n");
return (EOPNOTSUPP);
-#else
- return (intr_irq_config(irq, trig, pol));
-#endif
}
static int
@@ -294,12 +290,7 @@ nexus_setup_intr(device_t dev, device_t
if (error)
return (error);
-#ifdef INTRNG
error = intr_setup_irq(child, res, filt, intr, arg, flags, cookiep);
-#else
- error = arm_setup_intr(device_get_nameunit(child), filt, intr,
- arg, rman_get_start(res), flags, cookiep);
-#endif
return (error);
}
@@ -308,11 +299,7 @@ static int
nexus_teardown_intr(device_t dev, device_t child, struct resource *r, void *ih)
{
-#ifdef INTRNG
return (intr_teardown_irq(child, r, ih));
-#else
- return (intr_irq_remove_handler(child, rman_get_start(r), ih));
-#endif
}
#ifdef SMP
@@ -320,11 +307,7 @@ static int
nexus_bind_intr(device_t dev, device_t child, struct resource *irq, int cpu)
{
-#ifdef INTRNG
return (intr_bind_irq(child, irq, cpu));
-#else
- return (intr_irq_bind(rman_get_start(irq), cpu));
-#endif
}
#endif
@@ -447,22 +430,8 @@ static int
nexus_ofw_map_intr(device_t dev, device_t child, phandle_t iparent, int icells,
pcell_t *intr)
{
-#ifdef INTRNG
- return (INTR_IRQ_INVALID);
-#else
- int irq;
-
- if (icells == 3) {
- irq = intr[1];
- if (intr[0] == 0)
- irq += 32; /* SPI */
- else
- irq += 16; /* PPI */
- } else
- irq = intr[0];
- return (irq);
-#endif
+ return (INTR_IRQ_INVALID);
}
#endif
Modified: stable/11/sys/arm64/cavium/thunder_pcie_pem_fdt.c
==============================================================================
--- stable/11/sys/arm64/cavium/thunder_pcie_pem_fdt.c Wed Aug 31 17:30:21 2016 (r305135)
+++ stable/11/sys/arm64/cavium/thunder_pcie_pem_fdt.c Wed Aug 31 17:36:43 2016 (r305136)
@@ -109,7 +109,6 @@ thunder_pem_fdt_probe(device_t dev)
return (ENXIO);
}
-#ifdef INTRNG
static int
thunder_pem_fdt_alloc_msi(device_t pci, device_t child, int count, int maxcount,
int *irqs)
@@ -162,44 +161,6 @@ thunder_pem_fdt_map_msi(device_t pci, de
NULL);
return (intr_map_msi(pci, child, msi_parent, irq, addr, data));
}
-#else
-static int
-thunder_pem_fdt_alloc_msi(device_t pci, device_t child, int count, int maxcount,
- int *irqs)
-{
-
- return (arm_alloc_msi(pci, child, count, maxcount, irqs));
-}
-
-static int
-thunder_pem_fdt_release_msi(device_t pci, device_t child, int count, int *irqs)
-{
-
- return (arm_release_msi(pci, child, count, irqs));
-}
-
-static int
-thunder_pem_fdt_alloc_msix(device_t pci, device_t child, int *irq)
-{
-
- return (arm_alloc_msix(pci, child, irq));
-}
-
-static int
-thunder_pem_fdt_release_msix(device_t pci, device_t child, int irq)
-{
-
- return (arm_release_msix(pci, child, irq));
-}
-
-static int
-thunder_pem_fdt_map_msi(device_t pci, device_t child, int irq, uint64_t *addr,
- uint32_t *data)
-{
-
- return (arm_map_msi(pci, child, irq, addr, data));
-}
-#endif
static int
thunder_pem_fdt_get_id(device_t dev, device_t child, enum pci_id_type type,
Modified: stable/11/sys/arm64/include/intr.h
==============================================================================
--- stable/11/sys/arm64/include/intr.h Wed Aug 31 17:30:21 2016 (r305135)
+++ stable/11/sys/arm64/include/intr.h Wed Aug 31 17:36:43 2016 (r305136)
@@ -29,8 +29,6 @@
#ifndef _MACHINE_INTR_H_
#define _MACHINE_INTR_H_
-#ifdef INTRNG
-
#ifdef FDT
#include <dev/ofw/openfirm.h>
#endif
@@ -50,33 +48,4 @@ arm_irq_memory_barrier(uintptr_t irq)
void intr_ipi_dispatch(u_int, struct trapframe *);
#endif
-#else
-int intr_irq_config(u_int, enum intr_trigger, enum intr_polarity);
-void intr_irq_handler(struct trapframe *);
-int intr_irq_remove_handler(device_t, u_int, void *);
-
-void arm_dispatch_intr(u_int, struct trapframe *);
-int arm_enable_intr(void);
-void arm_mask_irq(u_int);
-void arm_register_root_pic(device_t, u_int);
-void arm_register_msi_pic(device_t);
-int arm_alloc_msi(device_t, device_t, int, int, int *);
-int arm_release_msi(device_t, device_t, int, int *);
-int arm_alloc_msix(device_t, device_t, int *);
-int arm_release_msix(device_t, device_t, int);
-int arm_map_msi(device_t, device_t, int, uint64_t *, uint32_t *);
-int arm_map_msix(device_t, device_t, int, uint64_t *, uint32_t *);
-int arm_setup_intr(const char *, driver_filter_t *, driver_intr_t,
- void *, u_int, enum intr_type, void **);
-void arm_unmask_irq(u_int);
-
-#ifdef SMP
-int intr_irq_bind(u_int, int);
-
-void arm_init_secondary(void);
-void arm_setup_ipihandler(driver_filter_t *, u_int);
-void arm_unmask_ipi(u_int);
-#endif
-#endif
-
#endif /* _MACHINE_INTR_H */
Modified: stable/11/sys/dev/pci/pci_host_generic.c
==============================================================================
--- stable/11/sys/dev/pci/pci_host_generic.c Wed Aug 31 17:30:21 2016 (r305135)
+++ stable/11/sys/dev/pci/pci_host_generic.c Wed Aug 31 17:36:43 2016 (r305136)
@@ -724,8 +724,6 @@ generic_pcie_alloc_msi(device_t pci, dev
NULL);
return (intr_alloc_msi(pci, child, msi_parent, count, maxcount,
irqs));
-#elif defined(__aarch64__)
- return (arm_alloc_msi(pci, child, count, maxcount, irqs));
#else
return (ENXIO);
#endif
@@ -740,8 +738,6 @@ generic_pcie_release_msi(device_t pci, d
ofw_bus_msimap(ofw_bus_get_node(pci), pci_get_rid(child), &msi_parent,
NULL);
return (intr_release_msi(pci, child, msi_parent, count, irqs));
-#elif defined(__aarch64__)
- return (arm_release_msi(pci, child, count, irqs));
#else
return (ENXIO);
#endif
@@ -757,8 +753,6 @@ generic_pcie_map_msi(device_t pci, devic
ofw_bus_msimap(ofw_bus_get_node(pci), pci_get_rid(child), &msi_parent,
NULL);
return (intr_map_msi(pci, child, msi_parent, irq, addr, data));
-#elif defined(__aarch64__)
- return (arm_map_msi(pci, child, irq, addr, data));
#else
return (ENXIO);
#endif
@@ -773,8 +767,6 @@ generic_pcie_alloc_msix(device_t pci, de
ofw_bus_msimap(ofw_bus_get_node(pci), pci_get_rid(child), &msi_parent,
NULL);
return (intr_alloc_msix(pci, child, msi_parent, irq));
-#elif defined(__aarch64__)
- return (arm_alloc_msix(pci, child, irq));
#else
return (ENXIO);
#endif
@@ -789,8 +781,6 @@ generic_pcie_release_msix(device_t pci,
ofw_bus_msimap(ofw_bus_get_node(pci), pci_get_rid(child), &msi_parent,
NULL);
return (intr_release_msix(pci, child, msi_parent, irq));
-#elif defined(__aarch64__)
- return (arm_release_msix(pci, child, irq));
#else
return (ENXIO);
#endif
More information about the svn-src-all
mailing list