Re: [PATCH 2/4] x86: Add UV bios call infrastructure v2

[Russ Anderson <rja@sgi.com>]

On Sat, Sep 27, 2008 at 09:21:35AM +0800, Huang Ying wrote:
> On Fri, 2008-09-26 at 15:02 -0500, Russ Anderson wrote:
> > Index: linux/include/asm-x86/efi.h
> > ===================================================================
> > --- linux.orig/include/asm-x86/efi.h	2008-09-26 14:13:24.000000000 -0500
> > +++ linux/include/asm-x86/efi.h	2008-09-26 14:13:36.000000000 -0500
> > @@ -49,6 +49,20 @@ extern u64 efi_call5(void *fp, u64 arg1,
> >  extern u64 efi_call6(void *fp, u64 arg1, u64 arg2, u64 arg3,
> >  		     u64 arg4, u64 arg5, u64 arg6);
> >  
> > +
> > +#ifndef CONFIG_EFI
> > +/*
> > + * IF EFI is not configured, have the EFI calls return -ENOSYS.
> > + */
> > +#define efi_call0(_f)					(-ENOSYS)
> > +#define efi_call1(_f, _a1)				(-ENOSYS)
> > +#define efi_call2(_f, _a1, _a2)				(-ENOSYS)
> > +#define efi_call3(_f, _a1, _a2, _a3)			(-ENOSYS)
> > +#define efi_call4(_f, _a1, _a2, _a3, _a4)		(-ENOSYS)
> > +#define efi_call5(_f, _a1, _a2, _a3, _a4, _a5)		(-ENOSYS)
> > +#define efi_call6(_f, _a1, _a2, _a3, _a4, _a5, _a6)	(-ENOSYS)
> > +#endif /* CONFIG_EFI */
> > +
> >  #define efi_call_phys0(f)			\
> >  	efi_call0((void *)(f))
> >  #define efi_call_phys1(f, a1)			\
> 
> efi_call_virt<n> and efi_call_phys<n> is the API instead of efi_call<n>.

#define efi_call_virt6(f, a1, a2, a3, a4, a5, a6)                       \
        efi_call6((void *)(efi.systab->runtime->f), (u64)(a1), (u64)(a2), \
                  (u64)(a3), (u64)(a4), (u64)(a5), (u64)(a6))

efi_call_virt6() uses efi.systab->runtime->f.
My call needs to use uv_systab, not efi.systab.

How about something like this?

#define efi_call_uv_virt6(a1, a2, a3, a4, a5, a6)                       \
        efi_call6((void *)(__va(uv_systab.function)), (u64)(a1), (u64)(a2), \
                  (u64)(a3), (u64)(a4), (u64)(a5), (u64)(a6))


> And please put the implementation without CONFIG_EFI defined out of
> 
> #ifdef CONFIG_X86_32
> <...>
> #else
> <...>
> #endif
> 
> Best Regards,
> Huang Ying


-- 
Russ Anderson, OS RAS/Partitioning Project Lead  
SGI - Silicon Graphics Inc          rja@sgi.com