[patch 08/18] PS3: Kexec support
Michael Ellerman
michael at ellerman.id.au
Wed Jun 6 14:01:50 EST 2007
On Tue, 2007-06-05 at 20:00 -0700, Geoff Levand wrote:
> Fixup the core platform parts needed for kexec to work on the PS3.
> - Setup ps3_hpte_clear correctly.
> - Mask interrupts on irq removal.
> - Release all hypervisor resources.
The irq changes might be kexec related, but it's a mess to review. You
seem to moving a bunch of code around in the patch as well.
> Signed-off-by: Geoff Levand <geoffrey.levand at am.sony.com>
> ---
> arch/powerpc/platforms/ps3/htab.c | 14 +-
> arch/powerpc/platforms/ps3/interrupt.c | 199 ++++++++++++++++++++-------------
> arch/powerpc/platforms/ps3/setup.c | 29 ++--
> 3 files changed, 147 insertions(+), 95 deletions(-)
>
> --- a/arch/powerpc/platforms/ps3/htab.c
> +++ b/arch/powerpc/platforms/ps3/htab.c
> @@ -234,10 +234,18 @@ static void ps3_hpte_invalidate(unsigned
>
> static void ps3_hpte_clear(void)
> {
> - /* Make sure to clean up the frame buffer device first */
> - ps3fb_cleanup();
> + int result;
>
> - lv1_unmap_htab(htab_addr);
> + DBG(" -> %s:%d\n", __func__, __LINE__);
> +
> + result = lv1_unmap_htab(htab_addr);
> + BUG_ON(result);
> +
> + ps3_mm_shutdown();
> +
> + ps3_mm_vas_destroy();
> +
> + DBG(" <- %s:%d\n", __func__, __LINE__);
> }
Do you really want to be calling DBG() here? Hmm, it looks like it
doesn't actually do anything?
>
> void __init ps3_hpte_init(unsigned long htab_size)
> --- a/arch/powerpc/platforms/ps3/interrupt.c
> +++ b/arch/powerpc/platforms/ps3/interrupt.c
> @@ -91,6 +91,92 @@ struct ps3_private {
> static DEFINE_PER_CPU(struct ps3_private, ps3_private);
>
> /**
> + * ps3_chip_mask - Set an interrupt mask bit in ps3_bmp.
> + * @virq: The assigned Linux virq.
> + *
> + * Sets ps3_bmp.mask and calls lv1_did_update_interrupt_mask().
> + */
> +
> +static void ps3_chip_mask(unsigned int virq)
> +{
> + struct ps3_private *pd = get_irq_chip_data(virq);
> + u64 bit = 0x8000000000000000UL >> virq;
> + u64 *p = &pd->bmp.mask;
> + u64 old;
> + unsigned long flags;
> +
> + pr_debug("%s:%d: cpu %u, virq %d\n", __func__, __LINE__, pd->cpu, virq);
> +
> + local_irq_save(flags);
> + asm volatile(
> + "1: ldarx %0,0,%3\n"
> + "andc %0,%0,%2\n"
> + "stdcx. %0,0,%3\n"
> + "bne- 1b"
> + : "=&r" (old), "+m" (*p)
> + : "r" (bit), "r" (p)
> + : "cc" );
> +
> + lv1_did_update_interrupt_mask(pd->node, pd->cpu);
> + local_irq_restore(flags);
How is this different from set_bit() ? (asm-powerpc/bitops.h)
ps. now that I see you're just moving this code around someone's
probably already asked that question.
> +/**
> + * ps3_chip_unmask - Clear an interrupt mask bit in ps3_bmp.
> + * @virq: The assigned Linux virq.
> + *
> + * Clears ps3_bmp.mask and calls lv1_did_update_interrupt_mask().
> + */
> +
> +static void ps3_chip_unmask(unsigned int virq)
> +{
> + struct ps3_private *pd = get_irq_chip_data(virq);
> + u64 bit = 0x8000000000000000UL >> virq;
> + u64 *p = &pd->bmp.mask;
> + u64 old;
> + unsigned long flags;
> +
> + pr_debug("%s:%d: cpu %u, virq %d\n", __func__, __LINE__, pd->cpu, virq);
> +
> + local_irq_save(flags);
> + asm volatile(
> + "1: ldarx %0,0,%3\n"
> + "or %0,%0,%2\n"
> + "stdcx. %0,0,%3\n"
> + "bne- 1b"
> + : "=&r" (old), "+m" (*p)
> + : "r" (bit), "r" (p)
> + : "cc" );
> +
> + lv1_did_update_interrupt_mask(pd->node, pd->cpu);
> + local_irq_restore(flags);
> +}
> +
> +/**
> + * ps3_chip_eoi - HV end-of-interrupt.
> + * @virq: The assigned Linux virq.
> + *
> + * Calls lv1_end_of_interrupt_ext().
> + */
> +
> +static void ps3_chip_eoi(unsigned int virq)
> +{
> + const struct ps3_private *pd = get_irq_chip_data(virq);
> + lv1_end_of_interrupt_ext(pd->node, pd->cpu, virq);
> +}
> +
> +/**
> + * ps3_irq_chip - Represents the ps3_bmp as a Linux struct irq_chip.
> + */
> +
> +static struct irq_chip ps3_irq_chip = {
> + .typename = "ps3",
> + .mask = ps3_chip_mask,
> + .unmask = ps3_chip_unmask,
> + .eoi = ps3_chip_eoi,
> +};
> +
> +/**
> * ps3_virq_setup - virq related setup.
> * @cpu: enum ps3_cpu_binding indicating the cpu the interrupt should be
> * serviced on.
> @@ -134,6 +220,8 @@ int ps3_virq_setup(enum ps3_cpu_binding
> goto fail_set;
> }
>
> + ps3_chip_mask(*virq);
> +
> return result;
>
> fail_set:
> @@ -225,6 +313,8 @@ int ps3_irq_plug_destroy(unsigned int vi
> pr_debug("%s:%d: node %lu, cpu %d, virq %u\n", __func__, __LINE__,
> pd->node, pd->cpu, virq);
>
> + ps3_chip_mask(virq);
> +
> result = lv1_disconnect_irq_plug_ext(pd->node, pd->cpu, virq);
>
> if (result)
> @@ -282,7 +372,9 @@ int ps3_event_receive_port_destroy(unsig
> {
> int result;
>
> - pr_debug(" -> %s:%d virq: %u\n", __func__, __LINE__, virq);
> + pr_debug(" -> %s:%d virq %u\n", __func__, __LINE__, virq);
> +
> + ps3_chip_mask(virq);
>
> result = lv1_destruct_event_receive_port(virq_to_hw(virq));
>
> @@ -290,17 +382,13 @@ int ps3_event_receive_port_destroy(unsig
> pr_debug("%s:%d: lv1_destruct_event_receive_port failed: %s\n",
> __func__, __LINE__, ps3_result(result));
>
> - /* lv1_destruct_event_receive_port() destroys the IRQ plug,
> - * so don't call ps3_irq_plug_destroy() here.
> + /* Can't call ps3_virq_destroy() here since ps3_smp_cleanup_cpu()
> + * calls from interrupt context (smp_call_function).
> */
>
> - result = ps3_virq_destroy(virq);
> - BUG_ON(result);
> -
> pr_debug(" <- %s:%d\n", __func__, __LINE__);
> return result;
> }
> -EXPORT_SYMBOL_GPL(ps3_event_receive_port_destroy);
>
> int ps3_send_event_locally(unsigned int virq)
> {
> @@ -372,6 +460,13 @@ int ps3_sb_event_receive_port_destroy(co
> result = ps3_event_receive_port_destroy(virq);
> BUG_ON(result);
>
> + /* ps3_event_receive_port_destroy() destroys the IRQ plug,
> + * so don't call ps3_irq_plug_destroy() here.
> + */
> +
> + result = ps3_virq_destroy(virq);
> + BUG_ON(result);
> +
> pr_debug(" <- %s:%d\n", __func__, __LINE__);
> return result;
> }
> @@ -412,16 +507,23 @@ EXPORT_SYMBOL_GPL(ps3_io_irq_setup);
> int ps3_io_irq_destroy(unsigned int virq)
> {
> int result;
> + unsigned long outlet = virq_to_hw(virq);
>
> - result = lv1_destruct_io_irq_outlet(virq_to_hw(virq));
> + ps3_chip_mask(virq);
>
> - if (result)
> - pr_debug("%s:%d: lv1_destruct_io_irq_outlet failed: %s\n",
> - __func__, __LINE__, ps3_result(result));
> + /* lv1_destruct_io_irq_outlet() will destroy the IRQ plug,
> + * so call ps3_irq_plug_destroy() first.
> + */
>
> result = ps3_irq_plug_destroy(virq);
> BUG_ON(result);
>
> + result = lv1_destruct_io_irq_outlet(outlet);
> +
> + if (result)
> + pr_debug("%s:%d: lv1_destruct_io_irq_outlet failed: %s\n",
> + __func__, __LINE__, ps3_result(result));
> +
> return result;
> }
> EXPORT_SYMBOL_GPL(ps3_io_irq_destroy);
> @@ -466,6 +568,7 @@ int ps3_vuart_irq_destroy(unsigned int v
> {
> int result;
>
> + ps3_chip_mask(virq);
> result = lv1_deconfigure_virtual_uart_irq();
>
> if (result) {
> @@ -514,9 +617,14 @@ int ps3_spe_irq_setup(enum ps3_cpu_bindi
>
> int ps3_spe_irq_destroy(unsigned int virq)
> {
> - int result = ps3_irq_plug_destroy(virq);
> + int result;
> +
> + ps3_chip_mask(virq);
> +
> + result = ps3_irq_plug_destroy(virq);
> BUG_ON(result);
> - return 0;
> +
> + return result;
> }
>
>
> @@ -565,67 +673,6 @@ static void __maybe_unused _dump_mask(st
> static void dump_bmp(struct ps3_private* pd) {};
> #endif /* defined(DEBUG) */
>
> -static void ps3_chip_mask(unsigned int virq)
> -{
> - struct ps3_private *pd = get_irq_chip_data(virq);
> - u64 bit = 0x8000000000000000UL >> virq;
> - u64 *p = &pd->bmp.mask;
> - u64 old;
> - unsigned long flags;
> -
> - pr_debug("%s:%d: cpu %u, virq %d\n", __func__, __LINE__, pd->cpu, virq);
> -
> - local_irq_save(flags);
> - asm volatile(
> - "1: ldarx %0,0,%3\n"
> - "andc %0,%0,%2\n"
> - "stdcx. %0,0,%3\n"
> - "bne- 1b"
> - : "=&r" (old), "+m" (*p)
> - : "r" (bit), "r" (p)
> - : "cc" );
> -
> - lv1_did_update_interrupt_mask(pd->node, pd->cpu);
> - local_irq_restore(flags);
> -}
> -
> -static void ps3_chip_unmask(unsigned int virq)
> -{
> - struct ps3_private *pd = get_irq_chip_data(virq);
> - u64 bit = 0x8000000000000000UL >> virq;
> - u64 *p = &pd->bmp.mask;
> - u64 old;
> - unsigned long flags;
> -
> - pr_debug("%s:%d: cpu %u, virq %d\n", __func__, __LINE__, pd->cpu, virq);
> -
> - local_irq_save(flags);
> - asm volatile(
> - "1: ldarx %0,0,%3\n"
> - "or %0,%0,%2\n"
> - "stdcx. %0,0,%3\n"
> - "bne- 1b"
> - : "=&r" (old), "+m" (*p)
> - : "r" (bit), "r" (p)
> - : "cc" );
> -
> - lv1_did_update_interrupt_mask(pd->node, pd->cpu);
> - local_irq_restore(flags);
> -}
> -
> -static void ps3_chip_eoi(unsigned int virq)
> -{
> - const struct ps3_private *pd = get_irq_chip_data(virq);
> - lv1_end_of_interrupt_ext(pd->node, pd->cpu, virq);
> -}
> -
> -static struct irq_chip irq_chip = {
> - .typename = "ps3",
> - .mask = ps3_chip_mask,
> - .unmask = ps3_chip_unmask,
> - .eoi = ps3_chip_eoi,
> -};
> -
> static void ps3_host_unmap(struct irq_host *h, unsigned int virq)
> {
> set_irq_chip_data(virq, NULL);
> @@ -637,7 +684,7 @@ static int ps3_host_map(struct irq_host
> pr_debug("%s:%d: hwirq %lu, virq %u\n", __func__, __LINE__, hwirq,
> virq);
>
> - set_irq_chip_and_handler(virq, &irq_chip, handle_fasteoi_irq);
> + set_irq_chip_and_handler(virq, &ps3_irq_chip, handle_fasteoi_irq);
>
> return 0;
> }
> @@ -657,7 +704,7 @@ void __init ps3_register_ipi_debug_brk(u
> cpu, virq, pd->bmp.ipi_debug_brk_mask);
> }
>
> -unsigned int ps3_get_irq(void)
> +static unsigned int ps3_get_irq(void)
> {
> struct ps3_private *pd = &__get_cpu_var(ps3_private);
> u64 x = (pd->bmp.status & pd->bmp.mask);
> --- a/arch/powerpc/platforms/ps3/setup.c
> +++ b/arch/powerpc/platforms/ps3/setup.c
> @@ -209,31 +209,28 @@ static int __init ps3_probe(void)
> #if defined(CONFIG_KEXEC)
> static void ps3_kexec_cpu_down(int crash_shutdown, int secondary)
> {
> - DBG(" -> %s:%d\n", __func__, __LINE__);
> + int result;
> + u64 ppe_id;
> + u64 thread_id = secondary ? 1 : 0;
> +
> + DBG(" -> %s:%d: (%d)\n", __func__, __LINE__, secondary);
> + ps3_smp_cleanup_cpu(thread_id);
> +
> + lv1_get_logical_ppe_id(&ppe_id);
> + result = lv1_configure_irq_state_bitmap(ppe_id, secondary ? 0 : 1, 0);
>
> - if (secondary) {
> - int cpu;
> - for_each_online_cpu(cpu)
> - if (cpu)
> - ps3_smp_cleanup_cpu(cpu);
> - } else
> - ps3_smp_cleanup_cpu(0);
> + /* seems to fail on second call */
> + DBG("%s:%d: lv1_configure_irq_state_bitmap (%d) %s\n", __func__,
> + __LINE__, secondary, ps3_result(result));
>
> DBG(" <- %s:%d\n", __func__, __LINE__);
> }
>
> static void ps3_machine_kexec(struct kimage *image)
> {
> - unsigned long ppe_id;
> -
> DBG(" -> %s:%d\n", __func__, __LINE__);
>
> - lv1_get_logical_ppe_id(&ppe_id);
> - lv1_configure_irq_state_bitmap(ppe_id, 0, 0);
> - ps3_mm_shutdown();
> - ps3_mm_vas_destroy();
> -
> - default_machine_kexec(image);
> + default_machine_kexec(image); // needs ipi, never returns.
Just get rid of ps3_machine_kexec() and hook default_machine_kexec()
directly into your ppc_md.
cheers
--
Michael Ellerman
OzLabs, IBM Australia Development Lab
wwweb: http://michael.ellerman.id.au
phone: +61 2 6212 1183 (tie line 70 21183)
We do not inherit the earth from our ancestors,
we borrow it from our children. - S.M.A.R.T Person
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://lists.ozlabs.org/pipermail/linuxppc-dev/attachments/20070606/d8a783a8/attachment.pgp>
More information about the Linuxppc-dev
mailing list