* [PATCH WIP v1 01/10] xen: arm: Add debug keyhandler to dump the physical GIC state.
2015-03-10 9:01 [PATCH WIP 0/10] *hacky* basic support for Nvidia Tegra K1/Jetson board (probably ignore) Ian Campbell
@ 2015-03-10 9:02 ` Ian Campbell
2015-03-10 9:02 ` [PATCH WIP v1 02/10] xen: arm: earlyprintk support for Nvidia Jetson Ian Campbell
` (9 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Ian Campbell @ 2015-03-10 9:02 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Campbell
Rename the existing gic_dump_info to gic_dump_info_guest reduce confusion.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
v2: s/gic_dump_info/gic_dump_info_guest/
---
xen/arch/arm/domain.c | 2 +-
xen/arch/arm/gic-v2.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++-
xen/arch/arm/gic-v3.c | 5 ++--
xen/arch/arm/gic.c | 25 ++++++++++++++++--
xen/include/asm-arm/gic.h | 6 +++--
5 files changed, 96 insertions(+), 8 deletions(-)
diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c
index fdba081..bec1082 100644
--- a/xen/arch/arm/domain.c
+++ b/xen/arch/arm/domain.c
@@ -803,7 +803,7 @@ long arch_do_vcpu_op(int cmd, struct vcpu *v, XEN_GUEST_HANDLE_PARAM(void) arg)
void arch_dump_vcpu_info(struct vcpu *v)
{
- gic_dump_info(v);
+ gic_dump_info_guest(v);
}
void vcpu_mark_events_pending(struct vcpu *v)
diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c
index 20cdbc9..2f5d33b 100644
--- a/xen/arch/arm/gic-v2.c
+++ b/xen/arch/arm/gic-v2.c
@@ -94,6 +94,11 @@ static inline void writel_gicd(uint32_t val, unsigned int offset)
writel_relaxed(val, gicv2.map_dbase + offset);
}
+static inline uint8_t readb_gicd(unsigned int offset)
+{
+ return readb_relaxed(gicv2.map_dbase + offset);
+}
+
static inline uint32_t readl_gicd(unsigned int offset)
{
return readl_relaxed(gicv2.map_dbase + offset);
@@ -168,7 +173,7 @@ static void gicv2_restore_state(const struct vcpu *v)
writel_gich(GICH_HCR_EN, GICH_HCR);
}
-static void gicv2_dump_state(const struct vcpu *v)
+static void gicv2_dump_state_guest(const struct vcpu *v)
{
int i;
@@ -651,6 +656,64 @@ static int gicv2_make_dt_node(const struct domain *d,
return res;
}
+static void gicv2_dump_state(void)
+{
+ int irq;
+
+ for ( irq = 0; irq < gicv2_info.nr_lines; irq++ )
+ {
+ const char *type;
+ int type_nr, enable, pend, active, priority, target;
+ struct irq_desc *desc = irq_to_desc(irq);
+ uint32_t wordreg;
+
+ target = readb_gicd(GICD_ITARGETSR + irq);
+ priority = readb_gicd(GICD_IPRIORITYR + irq);
+
+ switch ( irq )
+ {
+ case 0 ... 15:
+ type = "SGI";
+ type_nr = irq;
+ target = 0x00; /* these are per-CPU */
+ break;
+ case 16 ... 31:
+ type = "PPI";
+ type_nr = irq - 16;
+ break;
+ default:
+ type = "SPI";
+ type_nr = irq - 32;
+ break;
+ }
+
+ wordreg = readl_gicd(GICD_ISENABLER + (irq / 32) * 4);
+ enable = !!(wordreg & (1u << (irq % 32)));
+ wordreg = readl_gicd(GICD_ISPENDR + (irq / 32) * 4);
+ pend = !!(wordreg & (1u << (irq % 32)));
+ wordreg = readl_gicd(GICD_ISACTIVER + (irq / 32) * 4);
+ active = !!(wordreg & (1u << (irq % 32)));
+
+ printk("IRQ%03d %s%03d: %c%c%c pri:%02x tgt:%02x ",
+ irq, type, type_nr,
+ enable ? 'e' : '-',
+ pend ? 'p' : '-',
+ active ? 'a' : '-',
+ priority, target);
+
+ if ( desc->status & IRQ_GUEST )
+ {
+ struct domain *d = desc->action->dev_id;
+ printk("dom%d %s", d->domain_id, desc->action->name);
+ }
+ else
+ {
+ printk("Xen");
+ }
+ printk("\n");
+ }
+}
+
/* XXX different for level vs edge */
static hw_irq_controller gicv2_host_irq_type = {
.typename = "gic-v2",
@@ -680,6 +743,7 @@ const static struct gic_hw_operations gicv2_ops = {
.save_state = gicv2_save_state,
.restore_state = gicv2_restore_state,
.dump_state = gicv2_dump_state,
+ .dump_state_guest = gicv2_dump_state_guest,
.gicv_setup = gicv2v_setup,
.gic_host_irq_type = &gicv2_host_irq_type,
.gic_guest_irq_type = &gicv2_guest_irq_type,
diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c
index ab80670..4516304 100644
--- a/xen/arch/arm/gic-v3.c
+++ b/xen/arch/arm/gic-v3.c
@@ -394,7 +394,7 @@ static void gicv3_restore_state(const struct vcpu *v)
dsb(sy);
}
-static void gicv3_dump_state(const struct vcpu *v)
+static void gicv3_dump_state_guest(const struct vcpu *v)
{
int i;
@@ -1177,7 +1177,8 @@ static const struct gic_hw_operations gicv3_ops = {
.info = &gicv3_info,
.save_state = gicv3_save_state,
.restore_state = gicv3_restore_state,
- .dump_state = gicv3_dump_state,
+ .dump_state = NULL,
+ .dump_state_guest = gicv3_dump_state_guest,
.gicv_setup = gicv_v3_init,
.gic_host_irq_type = &gicv3_host_irq_type,
.gic_guest_irq_type = &gicv3_guest_irq_type,
diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c
index 390c8b0..6c5581b 100644
--- a/xen/arch/arm/gic.c
+++ b/xen/arch/arm/gic.c
@@ -27,6 +27,7 @@
#include <xen/softirq.h>
#include <xen/list.h>
#include <xen/device_tree.h>
+#include <xen/keyhandler.h>
#include <asm/p2m.h>
#include <asm/domain.h>
#include <asm/platform.h>
@@ -163,6 +164,24 @@ int gic_irq_xlate(const u32 *intspec, unsigned int intsize,
return 0;
}
+
+static void do_dump_gic(unsigned char key)
+{
+ if ( gic_hw_ops->dump_state )
+ {
+ printk("'%c' pressed -> dumping GIC state\n", key);
+ gic_hw_ops->dump_state();
+ }
+ else
+ printk("'%c' pressed -> no GIC dump state handler\n", key);
+}
+
+static struct keyhandler dump_gic_keyhandler = {
+ .irq_callback = 0,
+ .u.fn = do_dump_gic,
+ .desc = "dump GIC state"
+};
+
/* Set up the GIC */
void __init gic_init(void)
{
@@ -191,6 +210,8 @@ void __init gic_init(void)
/* Clear LR mask for cpu0 */
clear_cpu_lr_mask();
+
+ register_keyhandler('G', &dump_gic_keyhandler);
}
void send_SGI_mask(const cpumask_t *cpumask, enum gic_sgi sgi)
@@ -609,12 +630,12 @@ static void maintenance_interrupt(int irq, void *dev_id, struct cpu_user_regs *r
perfc_incr(maintenance_irqs);
}
-void gic_dump_info(struct vcpu *v)
+void gic_dump_info_guest(struct vcpu *v)
{
struct pending_irq *p;
printk("GICH_LRs (vcpu %d) mask=%"PRIx64"\n", v->vcpu_id, v->arch.lr_mask);
- gic_hw_ops->dump_state(v);
+ gic_hw_ops->dump_state_guest(v);
list_for_each_entry ( p, &v->arch.vgic.inflight_irqs, inflight )
{
diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h
index 6f5767f..65a379c 100644
--- a/xen/include/asm-arm/gic.h
+++ b/xen/include/asm-arm/gic.h
@@ -263,7 +263,7 @@ extern void send_SGI_self(enum gic_sgi sgi);
extern void send_SGI_allbutself(enum gic_sgi sgi);
/* print useful debug info */
-extern void gic_dump_info(struct vcpu *v);
+extern void gic_dump_info_guest(struct vcpu *v);
/* Number of interrupt lines */
extern unsigned int gic_number_lines(void);
@@ -291,8 +291,10 @@ struct gic_hw_operations {
void (*save_state)(struct vcpu *);
/* Restore GIC registers */
void (*restore_state)(const struct vcpu *);
+ /* Dump GIC host register information */
+ void (*dump_state)(void);
/* Dump GIC LR register information */
- void (*dump_state)(const struct vcpu *);
+ void (*dump_state_guest)(const struct vcpu *);
/* Map MMIO region of GIC */
int (*gicv_setup)(struct domain *);
--
2.1.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH WIP v1 02/10] xen: arm: earlyprintk support for Nvidia Jetson
2015-03-10 9:01 [PATCH WIP 0/10] *hacky* basic support for Nvidia Tegra K1/Jetson board (probably ignore) Ian Campbell
2015-03-10 9:02 ` [PATCH WIP v1 01/10] xen: arm: Add debug keyhandler to dump the physical GIC state Ian Campbell
@ 2015-03-10 9:02 ` Ian Campbell
2015-03-10 9:02 ` [PATCH WIP v1 03/10] xen: arm: add platform hook for routing IRQ to guests Ian Campbell
` (8 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Ian Campbell @ 2015-03-10 9:02 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Campbell
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
docs/misc/arm/early-printk.txt | 1 +
xen/arch/arm/Rules.mk | 5 +++++
2 files changed, 6 insertions(+)
diff --git a/docs/misc/arm/early-printk.txt b/docs/misc/arm/early-printk.txt
index 1ca2a55..4354e2d 100644
--- a/docs/misc/arm/early-printk.txt
+++ b/docs/misc/arm/early-printk.txt
@@ -13,6 +13,7 @@ where mach is the name of the machine:
- exynos5250: printk with the second UART
- midway: printk with the pl011 on Calxeda Midway processors
- fastmodel: printk on ARM Fastmodel software emulators
+ - jetson: printk on Nvidia Jetson TK1
- omap5432: printk with UART3 on TI OMAP5432 processors
- sun6i: printk with 8250 on Allwinner A31 processors
- sun7i: printk with 8250 on Allwinner A20 processors
diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk
index c7bd227..3fc8065 100644
--- a/xen/arch/arm/Rules.mk
+++ b/xen/arch/arm/Rules.mk
@@ -105,6 +105,11 @@ EARLY_PRINTK_INC := 8250
EARLY_UART_BASE_ADDRESS := 0xE4007000
EARLY_UART_REG_SHIFT := 2
endif
+ifeq ($(CONFIG_EARLY_PRINTK), jetson)
+EARLY_PRINTK_INC := 8250
+EARLY_UART_BASE_ADDRESS := 0x70006300
+EARLY_UART_REG_SHIFT := 2
+endif
ifeq ($(CONFIG_EARLY_PRINTK), seattle)
EARLY_PRINTK_INC := pl011
EARLY_UART_BASE_ADDRESS := 0xe1010000
--
2.1.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH WIP v1 03/10] xen: arm: add platform hook for routing IRQ to guests
2015-03-10 9:01 [PATCH WIP 0/10] *hacky* basic support for Nvidia Tegra K1/Jetson board (probably ignore) Ian Campbell
2015-03-10 9:02 ` [PATCH WIP v1 01/10] xen: arm: Add debug keyhandler to dump the physical GIC state Ian Campbell
2015-03-10 9:02 ` [PATCH WIP v1 02/10] xen: arm: earlyprintk support for Nvidia Jetson Ian Campbell
@ 2015-03-10 9:02 ` Ian Campbell
2015-03-10 9:02 ` [PATCH WIP v1 04/10] WIP: xen: ns16550: Add nvidia, tegra20-uart to DT compatible list Ian Campbell
` (7 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Ian Campbell @ 2015-03-10 9:02 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Campbell
Tegra contains a secondary set of IRQ registers which dom0 wants to poke at, we
will use this for that.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
xen/arch/arm/irq.c | 4 ++++
xen/arch/arm/platform.c | 6 ++++++
xen/include/asm-arm/platform.h | 5 +++++
3 files changed, 15 insertions(+)
diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c
index cb9c99b..c574b92 100644
--- a/xen/arch/arm/irq.c
+++ b/xen/arch/arm/irq.c
@@ -27,6 +27,7 @@
#include <asm/gic.h>
#include <asm/vgic.h>
+#include <asm/platform.h>
static unsigned int local_irqs_type[NR_LOCAL_IRQS];
static DEFINE_SPINLOCK(local_irqs_type_lock);
@@ -423,6 +424,9 @@ int route_irq_to_guest(struct domain *d, unsigned int irq,
gic_route_irq_to_guest(d, desc, cpumask_of(smp_processor_id()),
GIC_PRI_IRQ);
+
+ platform_route_irq_to_guest(d, desc);
+
spin_unlock_irqrestore(&desc->lock, flags);
return 0;
diff --git a/xen/arch/arm/platform.c b/xen/arch/arm/platform.c
index 86daf2b..c58e251 100644
--- a/xen/arch/arm/platform.c
+++ b/xen/arch/arm/platform.c
@@ -160,6 +160,12 @@ bool_t platform_device_is_blacklisted(const struct dt_device_node *node)
return (dt_match_node(blacklist, node) != NULL);
}
+void platform_route_irq_to_guest(struct domain *d, struct irq_desc *desc)
+{
+ if ( platform && platform->route_irq_to_guest )
+ platform->route_irq_to_guest(d, desc);
+}
+
void platform_dom0_gnttab(paddr_t *start, paddr_t *size)
{
if ( platform && platform->dom0_gnttab_size )
diff --git a/xen/include/asm-arm/platform.h b/xen/include/asm-arm/platform.h
index 4eba37b..22d1f8b 100644
--- a/xen/include/asm-arm/platform.h
+++ b/xen/include/asm-arm/platform.h
@@ -26,6 +26,9 @@ struct platform_desc {
void (*reset)(void);
/* Platform power-off */
void (*poweroff)(void);
+
+ void (*route_irq_to_guest)(struct domain *d, struct irq_desc *);
+
/*
* Platform quirks
* Defined has a function because a platform can support multiple
@@ -70,6 +73,8 @@ bool_t platform_device_is_blacklisted(const struct dt_device_node *node);
unsigned int platform_dom0_evtchn_ppi(void);
void platform_dom0_gnttab(paddr_t *start, paddr_t *size);
+void platform_route_irq_to_guest(struct domain *, struct irq_desc *);
+
#define PLATFORM_START(_name, _namestr) \
static const struct platform_desc __plat_desc_##_name __used \
__attribute__((__section__(".arch.info"))) = { \
--
2.1.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH WIP v1 04/10] WIP: xen: ns16550: Add nvidia, tegra20-uart to DT compatible list
2015-03-10 9:01 [PATCH WIP 0/10] *hacky* basic support for Nvidia Tegra K1/Jetson board (probably ignore) Ian Campbell
` (2 preceding siblings ...)
2015-03-10 9:02 ` [PATCH WIP v1 03/10] xen: arm: add platform hook for routing IRQ to guests Ian Campbell
@ 2015-03-10 9:02 ` Ian Campbell
2015-03-10 9:02 ` [PATCH WIP v1 05/10] WIP: xen: arm: intial platform support for Nvidia TK1 Ian Campbell
` (6 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Ian Campbell @ 2015-03-10 9:02 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Campbell
DO NOT APPLY. Doesn't work without sync_console *and* the changes from "HACK:
xen: arm: trying to figure out ns16550 vs. Tegra issue".
I suspect and IRQ or FIFO depth issue. Linux has a separate serial-tegra driver
so perhaps the device is just not as compatible as I think.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
xen/drivers/char/ns16550.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c
index d443880..44045d7 100644
--- a/xen/drivers/char/ns16550.c
+++ b/xen/drivers/char/ns16550.c
@@ -1189,6 +1189,7 @@ static const struct dt_device_match ns16550_dt_match[] __initconst =
{
DT_MATCH_COMPATIBLE("ns16550"),
DT_MATCH_COMPATIBLE("ns16550a"),
+ DT_MATCH_COMPATIBLE("nvidia,tegra20-uart"),
DT_MATCH_COMPATIBLE("snps,dw-apb-uart"),
{ /* sentinel */ },
};
--
2.1.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH WIP v1 05/10] WIP: xen: arm: intial platform support for Nvidia TK1
2015-03-10 9:01 [PATCH WIP 0/10] *hacky* basic support for Nvidia Tegra K1/Jetson board (probably ignore) Ian Campbell
` (3 preceding siblings ...)
2015-03-10 9:02 ` [PATCH WIP v1 04/10] WIP: xen: ns16550: Add nvidia, tegra20-uart to DT compatible list Ian Campbell
@ 2015-03-10 9:02 ` Ian Campbell
2015-03-10 9:02 ` [PATCH WIP v1 06/10] HACK: xen: arm: Map other regions to dom0 after one fails Ian Campbell
` (5 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Ian Campbell @ 2015-03-10 9:02 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Campbell
As used on the Jetson board.
This platform has a bunch of specific mappings and, more importantly, an
additional interrupt controller (which is used alongside the main GIC and
covers the same interrupts etc, so it is not a secondary or chained interrupt
controller) which dom0 really wants to poke at, I think for power gating
reasons. This is implemented as a whitelist derived from the set of interrupts
routed to dom0 (discovered by the new route_irq_to_guest platform hook).
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
xen/arch/arm/platforms/Makefile | 1 +
xen/arch/arm/platforms/tegra.c | 395 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 396 insertions(+)
create mode 100644 xen/arch/arm/platforms/tegra.c
diff --git a/xen/arch/arm/platforms/Makefile b/xen/arch/arm/platforms/Makefile
index e173fec..eb512ed 100644
--- a/xen/arch/arm/platforms/Makefile
+++ b/xen/arch/arm/platforms/Makefile
@@ -3,6 +3,7 @@ obj-$(CONFIG_ARM_32) += brcm.o
obj-$(CONFIG_ARM_32) += exynos5.o
obj-$(CONFIG_ARM_32) += midway.o
obj-$(CONFIG_ARM_32) += omap5.o
+obj-$(CONFIG_ARM_32) += tegra.o
obj-$(CONFIG_ARM_32) += sunxi.o
obj-$(CONFIG_ARM_32) += rcar2.o
obj-$(CONFIG_ARM_64) += seattle.o
diff --git a/xen/arch/arm/platforms/tegra.c b/xen/arch/arm/platforms/tegra.c
new file mode 100644
index 0000000..189ef44
--- /dev/null
+++ b/xen/arch/arm/platforms/tegra.c
@@ -0,0 +1,395 @@
+/*
+ * xen/arch/arm/platforms/tegra.c
+ *
+ * Nvidia Tegra specific settings
+ *
+ * Ian Campbell
+ * Copyright (c) 2014 Citrix Systems
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <xen/config.h>
+#include <asm/platform.h>
+#include <xen/stdbool.h>
+#include <xen/vmap.h>
+#include <asm/io.h>
+#include <asm/gic.h>
+
+#define ICTLR_BASE 0x60004000
+#define ICTLR_SIZE 0x00001000
+
+#define ICTLR_CPU_IEP_VFIQ 0x08
+#define ICTLR_CPU_IEP_FIR 0x14
+#define ICTLR_CPU_IEP_FIR_SET 0x18
+#define ICTLR_CPU_IEP_FIR_CLR 0x1c
+
+#define ICTLR_CPU_IER 0x20
+#define ICTLR_CPU_IER_SET 0x24
+#define ICTLR_CPU_IER_CLR 0x28
+#define ICTLR_CPU_IEP_CLASS 0x2C
+
+#define ICTLR_COP_IER 0x30
+#define ICTLR_COP_IER_SET 0x34
+#define ICTLR_COP_IER_CLR 0x38
+#define ICTLR_COP_IEP_CLASS 0x3c
+
+static void __iomem *ictlr;
+
+struct {
+ uint32_t allow_dom0;
+} ictlr_info[5] = {
+ [0] = { 0x0 },
+ [1] = { 0x0 },
+ [2] = { 0x0 },
+ [3] = { 0x0 },
+ [4] = { 0x0 },
+};
+
+static int ictlr_read(struct vcpu *v, mmio_info_t *info)
+{
+ struct hsr_dabt dabt = info->dabt;
+ struct cpu_user_regs *regs = guest_cpu_user_regs();
+ register_t *r = select_user_reg(regs, dabt.reg);
+ uint32_t offs = info->gpa - ICTLR_BASE;
+ int ctlrnr = offs >> 8;
+ int reg = offs & 0xff;
+
+ uint32_t val;
+
+ if ( offs > 0x4ff )
+ {
+ printk("UNHANDLED READ FROM %"PRIpaddr"\n", info->gpa);
+ domain_crash_synchronous();
+ }
+ if ( offs & 0x3 )
+ {
+ printk("MISALIGNED READ FROM %"PRIpaddr"\n", info->gpa);
+ domain_crash_synchronous();
+ }
+ if ( dabt.size != DABT_WORD )
+ {
+ printk("NON-WORD READ FROM %"PRIpaddr"\n", info->gpa);
+ domain_crash_synchronous();
+ }
+
+ switch ( reg ) {
+ /* Read only */
+ case 0x00 ... 0x14:
+ case 0x20:
+ case 0x30:
+ case 0x60 ... 0x68:
+ case 0x78 ... 0x80:
+ case 0x90 ... 0x98:
+ /* Read/write */
+ case 0x2C:
+ case 0x3C:
+ case 0x74:
+ case 0x8C:
+ case 0xA4:
+ val = readl(ictlr + offs);
+ *r = val & ictlr_info[ctlrnr].allow_dom0;
+ if ( val != *r )
+ printk("TEGRA: ICTLR%d READ %x INTO r%d=%08"PRIregister" (%08"PRIregister")\n",
+ ctlrnr+1, reg, dabt.reg, *r, val);
+ return 1;
+ /* Write only */
+ case 0x18 ... 0x1c:
+ case 0x24 ... 0x28:
+ case 0x34 ... 0x38:
+ case 0x6C ... 0x70:
+ case 0x84 ... 0x88:
+ case 0x9C ... 0xA0:
+ printk("READ FROM WO %"PRIpaddr"\n", info->gpa);
+ domain_crash_synchronous();
+ break;
+ case 0xa8 ... 0xff:
+ printk("READ FROM NON-EXISTENT %"PRIpaddr"\n", info->gpa);
+ domain_crash_synchronous();
+ break;
+ default:
+ BUG();
+ }
+}
+
+static int ictlr_write(struct vcpu *v, mmio_info_t *info)
+{
+ struct hsr_dabt dabt = info->dabt;
+ struct cpu_user_regs *regs = guest_cpu_user_regs();
+ register_t *r = select_user_reg(regs, dabt.reg);
+ uint32_t offs = info->gpa - ICTLR_BASE;
+ int ctlrnr = offs >> 8;
+ int reg = offs & 0xff;
+
+ uint32_t val = *r;
+
+ if ( offs > 0x4ff )
+ {
+ printk("UNHANDLED WRITE TO %"PRIpaddr"\n", info->gpa);
+ domain_crash_synchronous();
+ }
+ if ( offs & 0x3 )
+ {
+ printk("MISALIGNED WRITE TO %"PRIpaddr"\n", info->gpa);
+ domain_crash_synchronous();
+ }
+ if ( dabt.size != DABT_WORD )
+ {
+ printk("NON-WORD WRITE TO %"PRIpaddr"\n", info->gpa);
+ domain_crash_synchronous();
+ }
+
+ val &= ictlr_info[ctlrnr].allow_dom0;
+
+ switch ( reg ) {
+ /* Read only */
+ case 0x00 ... 0x14:
+ case 0x20:
+ case 0x30:
+ case 0x60 ... 0x68:
+ case 0x78 ... 0x80:
+ case 0x90 ... 0x98:
+ printk("WRITE TO RO %"PRIpaddr"\n", info->gpa);
+ domain_crash_synchronous();
+ /* Read/write */
+ case 0x2C:
+ case 0x3C:
+ case 0x74:
+ case 0x8C:
+ case 0xA4:
+ /* Write only */
+ case 0x18 ... 0x1c:
+ case 0x24 ... 0x28:
+ case 0x34 ... 0x38:
+ case 0x6C ... 0x70:
+ case 0x84 ... 0x88:
+ case 0x9C ... 0xA0:
+ if ( val != *r )
+ printk("TEGRA: ICTLR%d WRITE r%d=%08"PRIregister" (%08"PRIregister") INTO %x\n",
+ ctlrnr+1, dabt.reg, val, *r, reg);
+ writel(val, ictlr + offs);
+ return 1;
+ case 0xa8 ... 0xff:
+ printk("READ FROM NON-EXISTENT %"PRIpaddr"\n", info->gpa);
+ domain_crash_synchronous();
+ break;
+ default:
+ BUG();
+ }
+}
+
+static struct mmio_handler_ops tegra_mmio_ictlr = {
+ .read_handler = ictlr_read,
+ .write_handler = ictlr_write,
+};
+
+static void tegra_route_irq_to_guest(struct domain *d, struct irq_desc *desc)
+{
+ int irq = desc->irq;
+ int ctlrnr;
+ uint32_t mask;
+
+ if ( irq < NR_LOCAL_IRQS )
+ return;
+
+ if ( d->domain_id )
+ return;
+
+ ctlrnr = ( irq - NR_LOCAL_IRQS ) / 32;
+ mask = BIT((irq - NR_LOCAL_IRQS) % 32);
+ printk("TEGRA: Routing IRQ%d to dom0, ICTLR%d, mask %#08x\n",
+ irq, ctlrnr, mask);
+ ictlr_info[ctlrnr].allow_dom0 |= mask;
+}
+
+static int map_one_mmio(struct domain *d, const char *what,
+ unsigned long start, unsigned long end)
+{
+ int ret;
+
+ printk("Additional MMIO %lx-%lx (%s)\n",
+ start, end, what);
+ ret = map_mmio_regions(d, start, end - start + 1, start);
+ if ( ret )
+ printk("Failed to map %s @ %lx to dom%d\n",
+ what, start, d->domain_id);
+ return ret;
+}
+
+static int map_one_spi(struct domain *d, const char *what,
+ unsigned int spi, unsigned int type)
+{
+ unsigned int irq;
+ int ret;
+
+ irq = spi + 32; /* SPIs start at IRQ 32 */
+
+ ret = irq_set_spi_type(irq, type);
+ if ( ret )
+ {
+ printk("Failed to set the type for IRQ%u\n", irq);
+ return ret;
+ }
+
+ printk("Additional IRQ %u (%s)\n", irq, what);
+
+ ret = route_irq_to_guest(d, irq, what);
+ if ( ret )
+ printk("Failed to route %s to dom%d\n", what, d->domain_id);
+
+ return ret;
+}
+
+/*
+ * Xen does not currently support mapping MMIO regions and interrupt
+ * for bus child devices (referenced via the "ranges" and
+ * "interrupt-map" properties to domain 0). Instead for now map the
+ * necessary resources manually.
+ */
+static int tegra_specific_mapping(struct domain *d)
+{
+ int ret;
+
+ ret = map_one_mmio(d, "IRAM", paddr_to_pfn(0x40000000),
+ paddr_to_pfn(0x40040000));
+ if ( ret )
+ goto err;
+
+ ret = map_one_mmio(d, "Display A", paddr_to_pfn(0x54200000),
+ paddr_to_pfn(0x54240000));
+ if ( ret )
+ goto err;
+
+ ret = map_one_mmio(d, "Display B", paddr_to_pfn(0x54240000),
+ paddr_to_pfn(0x54280000));
+ if ( ret )
+ goto err;
+
+ ret = map_one_mmio(d, "EXCEPTION VECTORS", paddr_to_pfn(0x6000f000),
+ paddr_to_pfn(0x60010000));
+ if ( ret )
+ goto err;
+
+ ret = map_one_mmio(d, "SYSREG", paddr_to_pfn(0x6000c000),
+ paddr_to_pfn(0x6000d000));
+ if ( ret )
+ goto err;
+
+ ret = map_one_mmio(d, "PCI CFG0", paddr_to_pfn(0x01000000),
+ paddr_to_pfn(0x01001000));
+ if ( ret )
+ goto err;
+ ret = map_one_mmio(d, "PCI CFG1", paddr_to_pfn(0x01001000),
+ paddr_to_pfn(0x01002000));
+ if ( ret )
+ goto err;
+ ret = map_one_mmio(d, "PCI IO", paddr_to_pfn(0x12000000),
+ paddr_to_pfn(0x12010000));
+ if ( ret )
+ goto err;
+ ret = map_one_mmio(d, "PCI MEM", paddr_to_pfn(0x13000000),
+ paddr_to_pfn(0x20000000));
+ if ( ret )
+ goto err;
+ ret = map_one_mmio(d, "PCI MEM (PREFETCH)", paddr_to_pfn(0x20000000),
+ paddr_to_pfn(0x40000000));
+ if ( ret )
+ goto err;
+
+ ret = map_one_spi(d, "DISPLAY", 73, DT_IRQ_TYPE_LEVEL_HIGH);
+ if ( ret )
+ goto err;
+
+ ret = map_one_spi(d, "DISPLAY B", 74, DT_IRQ_TYPE_LEVEL_HIGH);
+ if ( ret )
+ goto err;
+
+ register_mmio_handler(d, &tegra_mmio_ictlr, ICTLR_BASE, ICTLR_SIZE);
+
+ ret = 0;
+err:
+ return ret;
+}
+
+static void tegra_reset(void)
+{
+ void __iomem *addr;
+ u32 val;
+ addr = ioremap_nocache(0x7000e400, 4);
+
+ if ( !addr )
+ {
+ printk("Tegra: Unable to map tegra reset address, can not reset...\n");
+ return;
+ }
+
+ val = readl(addr);
+ val |= 0x10;
+ writel(val, addr);
+
+ iounmap(addr);
+}
+
+
+static int tegra_init(void)
+{
+ int i;
+
+ ictlr = ioremap_nocache(ICTLR_BASE, ICTLR_SIZE);
+ if ( !ictlr )
+ panic("Failed to map intc\n");
+
+ for (i = 0; i < ARRAY_SIZE(ictlr_info); i++) {
+ void __iomem *ictlr_n = ictlr + 0x100*i;
+ writel(~0, ictlr_n + ICTLR_CPU_IER_CLR);
+ writel(0, ictlr_n + ICTLR_CPU_IEP_CLASS);
+ }
+
+ return 0;
+}
+
+static const char * const tegra_dt_compat[] __initconst =
+{
+ "nvidia,tegra124",
+ NULL
+};
+
+static const struct dt_device_match tegra_blacklist_dev[] __initconst =
+{
+ /*
+ * The UARTs share a page which runs the risk of mapping the Xen console
+ * UART to dom0, so don't map any of them.
+ */
+ DT_MATCH_COMPATIBLE("nvidia,tegra20-uart"),
+ { /* sentinel */ },
+};
+
+PLATFORM_START(tegra, "TEGRA124")
+ .compatible = tegra_dt_compat,
+ .blacklist_dev = tegra_blacklist_dev,
+ .init = tegra_init,
+ .reset = tegra_reset,
+ .specific_mapping = tegra_specific_mapping,
+
+ .route_irq_to_guest = tegra_route_irq_to_guest,
+
+ .dom0_gnttab_start = 0x68000000,
+ .dom0_gnttab_size = 0x20000,
+PLATFORM_END
+
+/*
+ * Local variables:
+ * mode: C
+ * c-file-style: "BSD"
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
--
2.1.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH WIP v1 06/10] HACK: xen: arm: Map other regions to dom0 after one fails
2015-03-10 9:01 [PATCH WIP 0/10] *hacky* basic support for Nvidia Tegra K1/Jetson board (probably ignore) Ian Campbell
` (4 preceding siblings ...)
2015-03-10 9:02 ` [PATCH WIP v1 05/10] WIP: xen: arm: intial platform support for Nvidia TK1 Ian Campbell
@ 2015-03-10 9:02 ` Ian Campbell
2015-03-10 9:02 ` [PATCH WIP v1 07/10] HACK: xen: arm: trying to figure out ns16550 vs. Tegra issue Ian Campbell
` (4 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Ian Campbell @ 2015-03-10 9:02 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Campbell
We can't seem to hanle /pcie-controller@0,01003000/pci@1,0 and
/pcie-controller@0,01003000/pci@2,0. Perhaps better solved by DT/PCI series.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
xen/arch/arm/domain_build.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index 9f1f59f..e754d37 100644
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -985,8 +985,9 @@ static int map_device(struct domain *d, struct dt_device_node *dev)
res = dt_device_get_address(dev, i, &addr, &size);
if ( res )
{
- printk(XENLOG_ERR "Unable to retrieve address %u for %s\n",
- i, dt_node_full_name(dev));
+ printk(XENLOG_ERR "Unable to retrieve address %u for %s: %d\n",
+ i, dt_node_full_name(dev), res);
+ continue;
return res;
}
--
2.1.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH WIP v1 07/10] HACK: xen: arm: trying to figure out ns16550 vs. Tegra issue
2015-03-10 9:01 [PATCH WIP 0/10] *hacky* basic support for Nvidia Tegra K1/Jetson board (probably ignore) Ian Campbell
` (5 preceding siblings ...)
2015-03-10 9:02 ` [PATCH WIP v1 06/10] HACK: xen: arm: Map other regions to dom0 after one fails Ian Campbell
@ 2015-03-10 9:02 ` Ian Campbell
2015-03-10 9:02 ` [PATCH WIP v1 08/10] HACK: xen: arm: Add mask, unmask and eoi platform hooks Ian Campbell
` (3 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Ian Campbell @ 2015-03-10 9:02 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Campbell
Messing with the FIFO depths and trigger levels seems to help, as does messing
with the interrupt enable state at various points. The latter might be better
handled via the start/stop_tx hooks which were added a while ago.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
xen/drivers/char/ns16550.c | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c
index 44045d7..3b32f40 100644
--- a/xen/drivers/char/ns16550.c
+++ b/xen/drivers/char/ns16550.c
@@ -401,7 +401,14 @@ static void ns16550_interrupt(
{
char lsr = ns_read_reg(uart, UART_LSR);
if ( (lsr & uart->lsr_mask) == uart->lsr_mask )
+ {
serial_tx_interrupt(port, regs);
+ if ( port->txbufc == port->txbufp ) {
+ u8 reg;
+ reg = ns_read_reg(uart, UART_IER);
+ ns_write_reg(uart, UART_IER, reg & (~UART_IER_ETHREI));
+ }
+ }
if ( lsr & UART_LSR_DR )
serial_rx_interrupt(port, regs);
}
@@ -450,6 +457,13 @@ static int ns16550_tx_ready(struct serial_port *port)
if ( ns16550_ioport_invalid(uart) )
return -EIO;
+ if ( 1 )
+ {
+ u8 reg;
+ reg = ns_read_reg(uart, UART_IER);
+ ns_write_reg(uart, UART_IER, reg | UART_IER_ETHREI);
+ }
+
return ( (ns_read_reg(uart, UART_LSR) &
uart->lsr_mask ) == uart->lsr_mask ) ? uart->fifo_size : 0;
}
@@ -539,7 +553,7 @@ static void ns16550_setup_preirq(struct ns16550 *uart)
/* Enable and clear the FIFOs. Set a large trigger threshold. */
ns_write_reg(uart, UART_FCR,
- UART_FCR_ENABLE | UART_FCR_CLRX | UART_FCR_CLTX | UART_FCR_TRG14);
+ UART_FCR_ENABLE | UART_FCR_CLRX | UART_FCR_CLTX | UART_FCR_TRG1/*UART_FCR_TRG14*/);
}
static void __init ns16550_init_preirq(struct serial_port *port)
--
2.1.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH WIP v1 08/10] HACK: xen: arm: Add mask, unmask and eoi platform hooks.
2015-03-10 9:01 [PATCH WIP 0/10] *hacky* basic support for Nvidia Tegra K1/Jetson board (probably ignore) Ian Campbell
` (6 preceding siblings ...)
2015-03-10 9:02 ` [PATCH WIP v1 07/10] HACK: xen: arm: trying to figure out ns16550 vs. Tegra issue Ian Campbell
@ 2015-03-10 9:02 ` Ian Campbell
2015-03-10 9:02 ` [PATCH WIP v1 09/10] HACK: xen: arm: stop recursing with dom0 mappings once we've hit a ranges Ian Campbell
` (2 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Ian Campbell @ 2015-03-10 9:02 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Campbell
Not to be applied until better understood.
Linux has these hooks and uses them on Tegra.
However I don't think they are strictly needed (only for power gating stuff
perhaps?). I implemented them while investigating some other issues, used by
later "Tegra hacking" patch which isn't actually needed for a working board,
AFAICT.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
xen/arch/arm/gic-v2.c | 3 +++
xen/arch/arm/platform.c | 16 ++++++++++++++++
xen/include/asm-arm/platform.h | 8 ++++++++
3 files changed, 27 insertions(+)
diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c
index 2f5d33b..033a94a 100644
--- a/xen/arch/arm/gic-v2.c
+++ b/xen/arch/arm/gic-v2.c
@@ -537,6 +537,7 @@ static void gicv2_irq_enable(struct irq_desc *desc)
clear_bit(_IRQ_DISABLED, &desc->status);
dsb(sy);
/* Enable routing */
+ platform_irq_unmask(desc);
writel_gicd((1u << (irq % 32)), GICD_ISENABLER + (irq / 32) * 4);
spin_unlock_irqrestore(&gicv2.lock, flags);
}
@@ -552,6 +553,7 @@ static void gicv2_irq_disable(struct irq_desc *desc)
/* Disable routing */
writel_gicd(1u << (irq % 32), GICD_ICENABLER + (irq / 32) * 4);
set_bit(_IRQ_DISABLED, &desc->status);
+ platform_irq_mask(desc);
spin_unlock_irqrestore(&gicv2.lock, flags);
}
@@ -574,6 +576,7 @@ static void gicv2_irq_ack(struct irq_desc *desc)
static void gicv2_host_irq_end(struct irq_desc *desc)
{
+ platform_irq_eoi(desc);
/* Lower the priority */
gicv2_eoi_irq(desc);
/* Deactivate */
diff --git a/xen/arch/arm/platform.c b/xen/arch/arm/platform.c
index c58e251..3255c6a 100644
--- a/xen/arch/arm/platform.c
+++ b/xen/arch/arm/platform.c
@@ -160,6 +160,22 @@ bool_t platform_device_is_blacklisted(const struct dt_device_node *node)
return (dt_match_node(blacklist, node) != NULL);
}
+void platform_irq_eoi(struct irq_desc *desc)
+{
+ if ( platform && platform->irq_eoi )
+ platform->irq_eoi(desc);
+}
+void platform_irq_mask(struct irq_desc *desc)
+{
+ if ( platform && platform->irq_mask )
+ platform->irq_mask(desc);
+}
+void platform_irq_unmask(struct irq_desc *desc)
+{
+ if ( platform && platform->irq_unmask )
+ platform->irq_unmask(desc);
+}
+
void platform_route_irq_to_guest(struct domain *d, struct irq_desc *desc)
{
if ( platform && platform->route_irq_to_guest )
diff --git a/xen/include/asm-arm/platform.h b/xen/include/asm-arm/platform.h
index 22d1f8b..8b4c807 100644
--- a/xen/include/asm-arm/platform.h
+++ b/xen/include/asm-arm/platform.h
@@ -27,6 +27,11 @@ struct platform_desc {
/* Platform power-off */
void (*poweroff)(void);
+ /* GIC hooks */
+ void (*irq_eoi)(struct irq_desc *);
+ void (*irq_mask)(struct irq_desc *);
+ void (*irq_unmask)(struct irq_desc *);
+
void (*route_irq_to_guest)(struct domain *d, struct irq_desc *);
/*
@@ -72,6 +77,9 @@ bool_t platform_has_quirk(uint32_t quirk);
bool_t platform_device_is_blacklisted(const struct dt_device_node *node);
unsigned int platform_dom0_evtchn_ppi(void);
void platform_dom0_gnttab(paddr_t *start, paddr_t *size);
+void platform_irq_eoi(struct irq_desc *);
+void platform_irq_mask(struct irq_desc *);
+void platform_irq_unmask(struct irq_desc *);
void platform_route_irq_to_guest(struct domain *, struct irq_desc *);
--
2.1.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH WIP v1 09/10] HACK: xen: arm: stop recursing with dom0 mappings once we've hit a ranges.
2015-03-10 9:01 [PATCH WIP 0/10] *hacky* basic support for Nvidia Tegra K1/Jetson board (probably ignore) Ian Campbell
` (7 preceding siblings ...)
2015-03-10 9:02 ` [PATCH WIP v1 08/10] HACK: xen: arm: Add mask, unmask and eoi platform hooks Ian Campbell
@ 2015-03-10 9:02 ` Ian Campbell
2015-03-10 9:02 ` [PATCH WIP v1 10/10] Tegra hacking Ian Campbell
2015-03-10 9:49 ` [PATCH WIP 0/10] *hacky* basic support for Nvidia Tegra K1/Jetson board (probably ignore) Ian Campbell
10 siblings, 0 replies; 12+ messages in thread
From: Ian Campbell @ 2015-03-10 9:02 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Campbell
Probably better done with improvements to DT/PCI parsing code and doesn't seem
to dpo any harm not to have this patch anyway.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
xen/arch/arm/domain_build.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index e754d37..ee27930 100644
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -1022,7 +1022,8 @@ static int map_device(struct domain *d, struct dt_device_node *dev)
}
static int handle_node(struct domain *d, struct kernel_info *kinfo,
- struct dt_device_node *node)
+ struct dt_device_node *node,
+ bool_t map)
{
static const struct dt_device_match skip_matches[] __initconst =
{
@@ -1051,6 +1052,8 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo,
int res;
const char *name;
const char *path;
+ bool_t map_children = true;
+ u32 ranges_len;
path = dt_node_full_name(node);
@@ -1099,7 +1102,8 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo,
* property. Therefore these device doesn't need to be mapped. This
* solution can be use later for pass through.
*/
- if ( !dt_device_type_is_equal(node, "memory") &&
+ if ( map &&
+ !dt_device_type_is_equal(node, "memory") &&
dt_device_is_available(node) )
{
res = map_device(d, node);
@@ -1124,9 +1128,15 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo,
if ( res )
return res;
+ /* Don't need to map anything below a node with a non-empty ranges property
+ * -- it's already covered and we may not know how to translate
+ * anyway. */
+ if ( dt_get_property(node, "ranges", &ranges_len) != NULL && ranges_len )
+ map_children = false;
+
for ( child = node->child; child != NULL; child = child->sibling )
{
- res = handle_node(d, kinfo, child);
+ res = handle_node(d, kinfo, child, map_children);
if ( res )
return res;
}
@@ -1177,7 +1187,7 @@ static int prepare_dtb(struct domain *d, struct kernel_info *kinfo)
fdt_finish_reservemap(kinfo->fdt);
- ret = handle_node(d, kinfo, dt_host);
+ ret = handle_node(d, kinfo, dt_host, true);
if ( ret )
goto err;
--
2.1.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH WIP v1 10/10] Tegra hacking.
2015-03-10 9:01 [PATCH WIP 0/10] *hacky* basic support for Nvidia Tegra K1/Jetson board (probably ignore) Ian Campbell
` (8 preceding siblings ...)
2015-03-10 9:02 ` [PATCH WIP v1 09/10] HACK: xen: arm: stop recursing with dom0 mappings once we've hit a ranges Ian Campbell
@ 2015-03-10 9:02 ` Ian Campbell
2015-03-10 9:49 ` [PATCH WIP 0/10] *hacky* basic support for Nvidia Tegra K1/Jetson board (probably ignore) Ian Campbell
10 siblings, 0 replies; 12+ messages in thread
From: Ian Campbell @ 2015-03-10 9:02 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Campbell
Works without all this stuff.
---
xen/arch/arm/platforms/tegra.c | 68 +++++++++++++++++++++++++++++++++++++++++-
1 file changed, 67 insertions(+), 1 deletion(-)
diff --git a/xen/arch/arm/platforms/tegra.c b/xen/arch/arm/platforms/tegra.c
index 189ef44..5ec9dda 100644
--- a/xen/arch/arm/platforms/tegra.c
+++ b/xen/arch/arm/platforms/tegra.c
@@ -191,6 +191,45 @@ static struct mmio_handler_ops tegra_mmio_ictlr = {
.write_handler = ictlr_write,
};
+static inline void tegra_irq_write_mask(unsigned int irq, unsigned long reg)
+{
+ void __iomem *base;
+ u32 mask;
+
+ BUG_ON(irq < NR_LOCAL_IRQS ||
+ irq >= NR_LOCAL_IRQS + ARRAY_SIZE(ictlr_info) * 32);
+
+ irq -= NR_LOCAL_IRQS;
+ base = ictlr + 0x100 * (irq / 32);
+ mask = BIT(irq % 32);
+
+ writel(mask, base + reg);
+}
+
+static void tegra_irq_eoi(struct irq_desc *desc)
+{
+ int irq = desc->irq;
+ if ( irq < NR_LOCAL_IRQS )
+ return;
+ //tegra_irq_write_mask(irq, ICTLR_CPU_IEP_FIR_CLR);
+}
+
+static void tegra_irq_mask(struct irq_desc *desc)
+{
+ int irq = desc->irq;
+ if ( irq < NR_LOCAL_IRQS )
+ return;
+ tegra_irq_write_mask(irq, ICTLR_CPU_IER_CLR);
+}
+
+static void tegra_irq_unmask(struct irq_desc *desc)
+{
+ int irq = desc->irq;
+ if ( irq < NR_LOCAL_IRQS )
+ return;
+ tegra_irq_write_mask(irq, ICTLR_CPU_IER_SET);
+}
+
static void tegra_route_irq_to_guest(struct domain *d, struct irq_desc *desc)
{
int irq = desc->irq;
@@ -256,7 +295,7 @@ static int map_one_spi(struct domain *d, const char *what,
*/
static int tegra_specific_mapping(struct domain *d)
{
- int ret;
+ int ret/*, i*/;
ret = map_one_mmio(d, "IRAM", paddr_to_pfn(0x40000000),
paddr_to_pfn(0x40040000));
@@ -312,6 +351,29 @@ static int tegra_specific_mapping(struct domain *d)
if ( ret )
goto err;
+#if 0
+ ret = map_one_spi(d, "PCI INTx", 98, DT_IRQ_TYPE_LEVEL_HIGH);
+ if ( ret )
+ goto err;
+
+ ret = map_one_spi(d, "PCI MSI", 99, DT_IRQ_TYPE_LEVEL_HIGH);
+ if ( ret )
+ goto err;
+
+ for ( i = 104 ; i < 119 ; i++ )
+ {
+ ret = map_one_spi(d, "AHB DMA", i, DT_IRQ_TYPE_LEVEL_HIGH);
+ if ( ret )
+ goto err;
+ }
+ for ( i = 128 ; i < 143 ; i++ )
+ {
+ ret = map_one_spi(d, "AHB DMA", i, DT_IRQ_TYPE_LEVEL_HIGH);
+ if ( ret )
+ goto err;
+ }
+#endif
+
register_mmio_handler(d, &tegra_mmio_ictlr, ICTLR_BASE, ICTLR_SIZE);
ret = 0;
@@ -379,6 +441,10 @@ PLATFORM_START(tegra, "TEGRA124")
.reset = tegra_reset,
.specific_mapping = tegra_specific_mapping,
+ .irq_eoi = tegra_irq_eoi,
+ .irq_mask = tegra_irq_mask,
+ .irq_unmask = tegra_irq_unmask,
+
.route_irq_to_guest = tegra_route_irq_to_guest,
.dom0_gnttab_start = 0x68000000,
--
2.1.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH WIP 0/10] *hacky* basic support for Nvidia Tegra K1/Jetson board (probably ignore)
2015-03-10 9:01 [PATCH WIP 0/10] *hacky* basic support for Nvidia Tegra K1/Jetson board (probably ignore) Ian Campbell
` (9 preceding siblings ...)
2015-03-10 9:02 ` [PATCH WIP v1 10/10] Tegra hacking Ian Campbell
@ 2015-03-10 9:49 ` Ian Campbell
10 siblings, 0 replies; 12+ messages in thread
From: Ian Campbell @ 2015-03-10 9:49 UTC (permalink / raw)
To: xen-devel; +Cc: julien.grall, tim, stefano.stabellini
On Tue, 2015-03-10 at 09:01 +0000, Ian Campbell wrote:
Forgot to say -- this needs some u-boot patches to enable booting in
hypmode. Jan Kiska has picked up the dev work of those, I tested using
v4 from http://lists.denx.de/pipermail/u-boot/2015-February/206557.html
applied on top of u-boot-tegra.git#master
v5 was posted recently
http://lists.denx.de/pipermail/u-boot/2015-March/207532.html
Ian.
^ permalink raw reply [flat|nested] 12+ messages in thread