diff options
| author |   kettenis <kettenis@openbsd.org> | 2020-07-10 18:34:24 +0000 |
|---|---|---|
| committer | kettenis <kettenis@openbsd.org> | 2020-07-10 18:34:24 +0000 |
| commit | a6aa8e655ec6c055aef9717e22c00b6754376c9a (patch) | |
| tree | b6974bb3a45bac79181a0d02c77f4620733c59c6 | |
| parent | Implement process_read_regs() such that core dumps become usable. (diff) | |
| download | wireguard-openbsd-a6aa8e655ec6c055aef9717e22c00b6754376c9a.tar.xz wireguard-openbsd-a6aa8e655ec6c055aef9717e22c00b6754376c9a.zip | |
Oops, I didn't intend to commit these bits.
| -rw-r--r-- | sys/arch/powerpc64/powerpc64/cpu.c | 12 | ||||
| -rw-r--r-- | sys/arch/powerpc64/powerpc64/trap.c | 11 |
2 files changed, 5 insertions, 18 deletions
diff --git a/sys/arch/powerpc64/powerpc64/cpu.c b/sys/arch/powerpc64/powerpc64/cpu.c index 6dabec32aa8..5f7162f8ea6 100644 --- a/sys/arch/powerpc64/powerpc64/cpu.c +++ b/sys/arch/powerpc64/powerpc64/cpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.c,v 1.9 2020/07/10 18:30:28 kettenis Exp $ */ +/* $OpenBSD: cpu.c,v 1.10 2020/07/10 18:34:24 kettenis Exp $ */ /* * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org> @@ -87,7 +87,9 @@ cpu_attach(struct device *parent, struct device *dev, void *aux) { struct fdt_attach_args *faa = aux; const char *name = NULL; - uint32_t pvr, clock_freq, iline, dline; + uint32_t pvr; + uint32_t iline; + uint32_t dline; int node, level, i; printf(" pir %llx", faa->fa_reg[0].addr); @@ -111,12 +113,6 @@ cpu_attach(struct device *parent, struct device *dev, void *aux) } node = faa->fa_node; - clock_freq = OF_getpropint(node, "clock-frequency", 0); - if (clock_freq != 0) { - clock_freq /= 1000000; /* Hz to MHz */ - printf(", %u MHz", clock_freq); - } - iline = OF_getpropint(node, "i-cache-block-size", 128); dline = OF_getpropint(node, "d-cache-block-size", 128); level = 1; diff --git a/sys/arch/powerpc64/powerpc64/trap.c b/sys/arch/powerpc64/powerpc64/trap.c index 794d42cb86b..46eecf2d8aa 100644 --- a/sys/arch/powerpc64/powerpc64/trap.c +++ b/sys/arch/powerpc64/powerpc64/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.25 2020/07/10 18:30:28 kettenis Exp $ */ +/* $OpenBSD: trap.c,v 1.26 2020/07/10 18:34:24 kettenis Exp $ */ /* * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org> @@ -278,15 +278,6 @@ trap(struct trapframe *frame) frame->srr1 |= PSL_VEC; break; - case EXC_HEA|EXC_USER: - { - uint32_t heir; - - __asm volatile ("mfspr %0, 339" : "=r"(heir)); - printf("heir %x\n", heir); - } - /* FALLTHROUGH */ - default: fatal: panic("trap type %x srr1 %lx at %lx lr %lx", |