Re: [PATCH] [19/48] Suspend2 2.1.9.8 for 2.6.12: 510-version-specific-mac.patch

Zwane Mwaikambo
2005-07-06T05:33:06Z

On Wed, 6 Jul 2005, Nigel Cunningham wrote:

> + /*
> + * eflags
> + */
> + asm volatile ("pushfl ; popl (%0)" : "=m" (suspend2_saved_context.eflags));

To be future proof you probably want to do pushfq/popq

> +
> + /*
> + * control registers
> + */
> + asm volatile ("movl %%cr0, %0" : "=r" (suspend2_saved_context.cr0));
> + asm volatile ("movl %%cr2, %0" : "=r" (suspend2_saved_context.cr2));
> + asm volatile ("movl %%cr3, %0" : "=r" (suspend2_saved_context.cr3));
> + asm volatile ("movl %%cr4, %0" : "=r" (suspend2_saved_context.cr4));

I guess we don't have to worry about %cr8 for now?

> + * a little clearer, but it needs to be inlined because we won't have a
> + * stack when we get here (so we can't push a return address).
> + */
> +static inline void restore_processor_context(void)
> +{
> + /*
> + * first restore %ds, so we can access our data properly
> + */
> + //asm volatile ("movw %0, %%ds" :: "r" ((u16)__KERNEL_DS));
> +
> + __flush_tlb_global(); /* INLINE? */
> +
> + asm volatile ("movl $24, %eax");
> + asm volatile ("movl %eax, %ds");

Shouldn't that be KERNEL_DS?

> + asm volatile ("pushl %0 ; popfl" :: "m" (suspend2_saved_context.eflags));

pushq/popfq?

> + save_and_set_irq_affinity();
> +
> + c_loops_per_jiffy_ref[_smp_processor_id()] = current_cpu_data.loops_per_jiffy;
> +#ifndef CONFIG_SMP
> + cpu_khz_ref = cpu_khz;
> + c_loops_per_jiffy_ref[_smp_processor_id()] = loops_per_jiffy;
> +#endif
> +
> + /* We want to run from swsusp_pg_dir, since swsusp_pg_dir is stored in constant
> + * place in memory
> + */
> +
> + __asm__( "movl %%ecx,%%cr3\n" ::"c"(__pa(swsusp_pg_dir)));

This looks like it depends on the swsusp_pg_dir being in lower 32bit
address space, shouldn't it be a movq %%rcx?