Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b80fc72 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar
Browse files

x86: merge acpi_32/64.h 



Merge the files.

[ mingo@elte.hu: build fix ]

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 8a999410

include/asm-x86/acpi.h

+143 −5
Original line number Diff line number Diff line 
#ifndef _ASM_X86_ACPI_H

#define _ASM_X86_ACPI_H



#ifdef CONFIG_X86_32

# include "acpi_32.h"

#else

# include "acpi_64.h"

#endif

/*

 *  Copyright (C) 2001 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>

 *  Copyright (C) 2001 Patrick Mochel <mochel@osdl.org>

 *

 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 *

 *  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.

 *

 *  You should have received a copy of the GNU General Public License

 *  along with this program; if not, write to the Free Software

 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 *

 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 */

#include <acpi/pdc_intel.h>



#include <asm/numa.h>

#include <asm/processor.h>



#define COMPILER_DEPENDENT_INT64   long long

#define COMPILER_DEPENDENT_UINT64  unsigned long long



/*

 * Calling conventions:

 *

 * ACPI_SYSTEM_XFACE        - Interfaces to host OS (handlers, threads)

 * ACPI_EXTERNAL_XFACE      - External ACPI interfaces

 * ACPI_INTERNAL_XFACE      - Internal ACPI interfaces

 * ACPI_INTERNAL_VAR_XFACE  - Internal variable-parameter list interfaces

 */

#define ACPI_SYSTEM_XFACE

#define ACPI_EXTERNAL_XFACE

#define ACPI_INTERNAL_XFACE

#define ACPI_INTERNAL_VAR_XFACE



/* Asm macros */



#define ACPI_ASM_MACROS

#define BREAKPOINT3

#define ACPI_DISABLE_IRQS() local_irq_disable()

#define ACPI_ENABLE_IRQS()  local_irq_enable()

#define ACPI_FLUSH_CPU_CACHE()	wbinvd()



int __acpi_acquire_global_lock(unsigned int *lock);

int __acpi_release_global_lock(unsigned int *lock);



#define ACPI_ACQUIRE_GLOBAL_LOCK(facs, Acq) \

	((Acq) = __acpi_acquire_global_lock(&facs->global_lock))



#define ACPI_RELEASE_GLOBAL_LOCK(facs, Acq) \

	((Acq) = __acpi_release_global_lock(&facs->global_lock))



/*

 * Math helper asm macros

 */

#define ACPI_DIV_64_BY_32(n_hi, n_lo, d32, q32, r32) \

	asm("divl %2;"				     \

	    :"=a"(q32), "=d"(r32)		     \

	    :"r"(d32),				     \

	     "0"(n_lo), "1"(n_hi))





#define ACPI_SHIFT_RIGHT_64(n_hi, n_lo) \

	asm("shrl   $1,%2	;"	\

	    "rcrl   $1,%3;"		\

	    :"=r"(n_hi), "=r"(n_lo)	\

	    :"0"(n_hi), "1"(n_lo))



#ifdef CONFIG_ACPI

extern int acpi_lapic;

extern int acpi_ioapic;

extern int acpi_noirq;

extern int acpi_strict;

extern int acpi_disabled;

extern int acpi_ht;

extern int acpi_pci_disabled;

extern int acpi_skip_timer_override;

extern int acpi_use_timer_override;



static inline void disable_acpi(void)

{

	acpi_disabled = 1;

	acpi_ht = 0;

	acpi_pci_disabled = 1;

	acpi_noirq = 1;

}



/* Fixmap pages to reserve for ACPI boot-time tables (see fixmap.h) */

#define FIX_ACPI_PAGES 4



extern int acpi_gsi_to_irq(u32 gsi, unsigned int *irq);



static inline void acpi_noirq_set(void) { acpi_noirq = 1; }

static inline void acpi_disable_pci(void)

{

	acpi_pci_disabled = 1;

	acpi_noirq_set();

}

extern int acpi_irq_balance_set(char *str);



/* routines for saving/restoring kernel state */

extern int acpi_save_state_mem(void);

extern void acpi_restore_state_mem(void);



extern unsigned long acpi_wakeup_address;



/* early initialization routine */

extern void acpi_reserve_bootmem(void);



/*

 * Check if the CPU can handle C2 and deeper

 */
@@ -29,4 +138,33 @@ static inline unsigned int acpi_processor_cstate_check(unsigned int max_cstate) 
		return max_cstate;

}



#else /* !CONFIG_ACPI */



#define acpi_lapic 0

#define acpi_ioapic 0

static inline void acpi_noirq_set(void) { }

static inline void acpi_disable_pci(void) { }

static inline void disable_acpi(void) { }



#endif /* !CONFIG_ACPI */



#define ARCH_HAS_POWER_INIT	1



struct bootnode;



#ifdef CONFIG_ACPI_NUMA

extern int acpi_numa;

extern int acpi_scan_nodes(unsigned long start, unsigned long end);

#ifdef CONFIG_X86_64

# define NR_NODE_MEMBLKS (MAX_NUMNODES*2)

#endif

extern void __init acpi_fake_nodes(const struct bootnode *fake_nodes,

				   int num_nodes);

#else

static inline void acpi_fake_nodes(const struct bootnode *fake_nodes,

				   int num_nodes)

{

}

#endif



#endif /*__X86_ASM_ACPI_H*/

include/asm-x86/acpi_32.h

deleted100644 → 0
+0 −132
Original line number Diff line number Diff line 
/*

 *  Copyright (C) 2001 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>

 *  Copyright (C) 2001 Patrick Mochel <mochel@osdl.org>

 *

 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 *

 *  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.

 *

 *  You should have received a copy of the GNU General Public License

 *  along with this program; if not, write to the Free Software

 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 *

 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 */



#ifndef _ASM_ACPI_H

#define _ASM_ACPI_H



#include <acpi/pdc_intel.h>

#include <asm/numa.h>



#define COMPILER_DEPENDENT_INT64   long long

#define COMPILER_DEPENDENT_UINT64  unsigned long long



/*

 * Calling conventions:

 *

 * ACPI_SYSTEM_XFACE        - Interfaces to host OS (handlers, threads)

 * ACPI_EXTERNAL_XFACE      - External ACPI interfaces

 * ACPI_INTERNAL_XFACE      - Internal ACPI interfaces

 * ACPI_INTERNAL_VAR_XFACE  - Internal variable-parameter list interfaces

 */

#define ACPI_SYSTEM_XFACE

#define ACPI_EXTERNAL_XFACE

#define ACPI_INTERNAL_XFACE

#define ACPI_INTERNAL_VAR_XFACE



/* Asm macros */



#define ACPI_ASM_MACROS

#define BREAKPOINT3

#define ACPI_DISABLE_IRQS() local_irq_disable()

#define ACPI_ENABLE_IRQS()  local_irq_enable()

#define ACPI_FLUSH_CPU_CACHE()	wbinvd()



int __acpi_acquire_global_lock(unsigned int *lock);

int __acpi_release_global_lock(unsigned int *lock);



#define ACPI_ACQUIRE_GLOBAL_LOCK(facs, Acq) \

	((Acq) = __acpi_acquire_global_lock(&facs->global_lock))



#define ACPI_RELEASE_GLOBAL_LOCK(facs, Acq) \

	((Acq) = __acpi_release_global_lock(&facs->global_lock))



/*

 * Math helper asm macros

 */

#define ACPI_DIV_64_BY_32(n_hi, n_lo, d32, q32, r32) \

	asm("divl %2;"				     \

	    :"=a"(q32), "=d"(r32)		     \

	    :"r"(d32),				     \

	     "0"(n_lo), "1"(n_hi))





#define ACPI_SHIFT_RIGHT_64(n_hi, n_lo) \

	asm("shrl   $1,%2	;"	\

	    "rcrl   $1,%3;"		\

	    :"=r"(n_hi), "=r"(n_lo)	\

	    :"0"(n_hi), "1"(n_lo))



#ifdef CONFIG_ACPI

extern int acpi_lapic;

extern int acpi_ioapic;

extern int acpi_noirq;

extern int acpi_strict;

extern int acpi_disabled;

extern int acpi_ht;

extern int acpi_pci_disabled;

extern int acpi_skip_timer_override;

extern int acpi_use_timer_override;



static inline void disable_acpi(void)

{

	acpi_disabled = 1;

	acpi_ht = 0;

	acpi_pci_disabled = 1;

	acpi_noirq = 1;

}



/* Fixmap pages to reserve for ACPI boot-time tables (see fixmap.h) */

#define FIX_ACPI_PAGES 4



extern int acpi_gsi_to_irq(u32 gsi, unsigned int *irq);



static inline void acpi_noirq_set(void) { acpi_noirq = 1; }

static inline void acpi_disable_pci(void)

{

	acpi_pci_disabled = 1;

	acpi_noirq_set();

}

extern int acpi_irq_balance_set(char *str);



/* routines for saving/restoring kernel state */

extern int acpi_save_state_mem(void);

extern void acpi_restore_state_mem(void);



extern unsigned long acpi_wakeup_address;



/* early initialization routine */

extern void acpi_reserve_bootmem(void);



#else /* !CONFIG_ACPI */



#define acpi_lapic 0

#define acpi_ioapic 0

static inline void acpi_noirq_set(void) { }

static inline void acpi_disable_pci(void) { }

static inline void disable_acpi(void) { }



#endif /* !CONFIG_ACPI */



#define ARCH_HAS_POWER_INIT	1



#endif /*_ASM_ACPI_H*/

include/asm-x86/acpi_64.h

deleted100644 → 0
+0 −144
Original line number Diff line number Diff line 
/*

 *  Copyright (C) 2001 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>

 *  Copyright (C) 2001 Patrick Mochel <mochel@osdl.org>

 *

 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 *

 *  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.

 *

 *  You should have received a copy of the GNU General Public License

 *  along with this program; if not, write to the Free Software

 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 *

 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 */



#ifndef _ASM_ACPI_H

#define _ASM_ACPI_H



#include <acpi/pdc_intel.h>

#include <asm/numa.h>



#define COMPILER_DEPENDENT_INT64   long long

#define COMPILER_DEPENDENT_UINT64  unsigned long long



/*

 * Calling conventions:

 *

 * ACPI_SYSTEM_XFACE        - Interfaces to host OS (handlers, threads)

 * ACPI_EXTERNAL_XFACE      - External ACPI interfaces

 * ACPI_INTERNAL_XFACE      - Internal ACPI interfaces

 * ACPI_INTERNAL_VAR_XFACE  - Internal variable-parameter list interfaces

 */

#define ACPI_SYSTEM_XFACE

#define ACPI_EXTERNAL_XFACE

#define ACPI_INTERNAL_XFACE

#define ACPI_INTERNAL_VAR_XFACE



/* Asm macros */



#define ACPI_ASM_MACROS

#define BREAKPOINT3

#define ACPI_DISABLE_IRQS() local_irq_disable()

#define ACPI_ENABLE_IRQS()  local_irq_enable()

#define ACPI_FLUSH_CPU_CACHE()	wbinvd()



int __acpi_acquire_global_lock(unsigned int *lock);

int __acpi_release_global_lock(unsigned int *lock);



#define ACPI_ACQUIRE_GLOBAL_LOCK(facs, Acq) \

	((Acq) = __acpi_acquire_global_lock(&facs->global_lock))



#define ACPI_RELEASE_GLOBAL_LOCK(facs, Acq) \

	((Acq) = __acpi_release_global_lock(&facs->global_lock))



/*

 * Math helper asm macros

 */

#define ACPI_DIV_64_BY_32(n_hi, n_lo, d32, q32, r32) \

	asm("divl %2;"				     \

	    :"=a"(q32), "=d"(r32)		     \

	    :"r"(d32),				     \

	     "0"(n_lo), "1"(n_hi))





#define ACPI_SHIFT_RIGHT_64(n_hi, n_lo) \

	asm("shrl   $1,%2	;"	\

	    "rcrl   $1,%3;"		\

	    :"=r"(n_hi), "=r"(n_lo)	\

	    :"0"(n_hi), "1"(n_lo))



#ifdef CONFIG_ACPI

extern int acpi_lapic;

extern int acpi_ioapic;

extern int acpi_noirq;

extern int acpi_strict;

extern int acpi_disabled;

extern int acpi_ht;

extern int acpi_pci_disabled;

extern int acpi_skip_timer_override;

extern int acpi_use_timer_override;



static inline void disable_acpi(void)

{

	acpi_disabled = 1;

	acpi_ht = 0;

	acpi_pci_disabled = 1;

	acpi_noirq = 1;

}



/* Fixmap pages to reserve for ACPI boot-time tables (see fixmap.h) */

#define FIX_ACPI_PAGES 4



extern int acpi_gsi_to_irq(u32 gsi, unsigned int *irq);



static inline void acpi_noirq_set(void) { acpi_noirq = 1; }

static inline void acpi_disable_pci(void)

{

	acpi_pci_disabled = 1;

	acpi_noirq_set();

}

extern int acpi_irq_balance_set(char *str);



/* routines for saving/restoring kernel state */

extern int acpi_save_state_mem(void);

extern void acpi_restore_state_mem(void);



extern unsigned long acpi_wakeup_address;



/* early initialization routine */

extern void acpi_reserve_bootmem(void);



#else /* !CONFIG_ACPI */



#define acpi_lapic 0

#define acpi_ioapic 0

static inline void acpi_noirq_set(void) { }

static inline void acpi_disable_pci(void) { }



#endif /* !CONFIG_ACPI */



#define ARCH_HAS_POWER_INIT	1



#ifdef CONFIG_ACPI_NUMA

extern int acpi_numa;

extern int acpi_scan_nodes(unsigned long start, unsigned long end);

#define NR_NODE_MEMBLKS (MAX_NUMNODES*2)

extern void __init acpi_fake_nodes(const struct bootnode *fake_nodes,

				   int num_nodes);

#else

static inline void acpi_fake_nodes(const struct bootnode *fake_nodes,

				   int num_nodes)

{

}

#endif



#endif /*_ASM_ACPI_H*/