summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/include/asm')
-rw-r--r--arch/x86/include/asm/io.h11
-rw-r--r--arch/x86/include/asm/page_64.h.rej114
-rw-r--r--arch/x86/include/asm/xen/hypervisor.h28
3 files changed, 26 insertions, 127 deletions
diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
index 4f8e820cf38..683d0b4c00f 100644
--- a/arch/x86/include/asm/io.h
+++ b/arch/x86/include/asm/io.h
@@ -124,10 +124,15 @@ static inline void *phys_to_virt(phys_addr_t address)
/*
* ISA I/O bus memory addresses are 1:1 with the physical address.
+ * However, we truncate the address to unsigned int to avoid undesirable
+ * promitions in legacy drivers.
*/
-#define isa_virt_to_bus (unsigned long)virt_to_phys
-#define isa_page_to_bus page_to_phys
-#define isa_bus_to_virt phys_to_virt
+static inline unsigned int isa_virt_to_bus(volatile void *address)
+{
+ return (unsigned int)virt_to_phys(address);
+}
+#define isa_page_to_bus(page) ((unsigned int)page_to_phys(page))
+#define isa_bus_to_virt phys_to_virt
/*
* However PCI ones are not necessarily 1:1 and therefore these interfaces
diff --git a/arch/x86/include/asm/page_64.h.rej b/arch/x86/include/asm/page_64.h.rej
deleted file mode 100644
index 9b1807f1859..00000000000
--- a/arch/x86/include/asm/page_64.h.rej
+++ /dev/null
@@ -1,114 +0,0 @@
-***************
-*** 1,105 ****
- #ifndef _ASM_X86_PAGE_64_H
- #define _ASM_X86_PAGE_64_H
-
-- #define PAGETABLE_LEVELS 4
--
-- #define THREAD_ORDER 1
-- #define THREAD_SIZE (PAGE_SIZE << THREAD_ORDER)
-- #define CURRENT_MASK (~(THREAD_SIZE - 1))
--
-- #define EXCEPTION_STACK_ORDER 0
-- #define EXCEPTION_STKSZ (PAGE_SIZE << EXCEPTION_STACK_ORDER)
--
-- #define DEBUG_STACK_ORDER (EXCEPTION_STACK_ORDER + 1)
-- #define DEBUG_STKSZ (PAGE_SIZE << DEBUG_STACK_ORDER)
--
-- #define IRQSTACK_ORDER 2
-- #define IRQSTACKSIZE (PAGE_SIZE << IRQSTACK_ORDER)
--
-- #define STACKFAULT_STACK 1
-- #define DOUBLEFAULT_STACK 2
-- #define NMI_STACK 3
-- #define DEBUG_STACK 4
-- #define MCE_STACK 5
-- #define N_EXCEPTION_STACKS 5 /* hw limit: 7 */
--
-- #define PUD_PAGE_SIZE (_AC(1, UL) << PUD_SHIFT)
-- #define PUD_PAGE_MASK (~(PUD_PAGE_SIZE-1))
--
-- /*
-- * Set __PAGE_OFFSET to the most negative possible address +
-- * PGDIR_SIZE*16 (pgd slot 272). The gap is to allow a space for a
-- * hypervisor to fit. Choosing 16 slots here is arbitrary, but it's
-- * what Xen requires.
-- */
-- #define __PAGE_OFFSET _AC(0xffff880000000000, UL)
--
-- #define __PHYSICAL_START CONFIG_PHYSICAL_START
-- #define __KERNEL_ALIGN 0x200000
--
-- /*
-- * Make sure kernel is aligned to 2MB address. Catching it at compile
-- * time is better. Change your config file and compile the kernel
-- * for a 2MB aligned address (CONFIG_PHYSICAL_START)
-- */
-- #if (CONFIG_PHYSICAL_START % __KERNEL_ALIGN) != 0
-- #error "CONFIG_PHYSICAL_START must be a multiple of 2MB"
-- #endif
--
-- #define __START_KERNEL (__START_KERNEL_map + __PHYSICAL_START)
-- #define __START_KERNEL_map _AC(0xffffffff80000000, UL)
--
-- /* See Documentation/x86_64/mm.txt for a description of the memory map. */
-- #define __PHYSICAL_MASK_SHIFT 46
-- #define __VIRTUAL_MASK_SHIFT 48
--
-- /*
-- * Kernel image size is limited to 512 MB (see level2_kernel_pgt in
-- * arch/x86/kernel/head_64.S), and it is mapped here:
-- */
-- #define KERNEL_IMAGE_SIZE (512 * 1024 * 1024)
-- #define KERNEL_IMAGE_START _AC(0xffffffff80000000, UL)
--
-- #ifndef __ASSEMBLY__
-- void clear_page(void *page);
-- void copy_page(void *to, void *from);
--
-- /* duplicated to the one in bootmem.h */
-- extern unsigned long max_pfn;
-- extern unsigned long phys_base;
--
-- extern unsigned long __phys_addr(unsigned long);
-- #define __phys_reloc_hide(x) (x)
--
-- /*
-- * These are used to make use of C type-checking..
-- */
-- typedef unsigned long pteval_t;
-- typedef unsigned long pmdval_t;
-- typedef unsigned long pudval_t;
-- typedef unsigned long pgdval_t;
-- typedef unsigned long pgprotval_t;
--
-- typedef struct page *pgtable_t;
--
-- typedef struct { pteval_t pte; } pte_t;
--
-- #define vmemmap ((struct page *)VMEMMAP_START)
--
-- extern unsigned long init_memory_mapping(unsigned long start,
-- unsigned long end);
--
-- extern void initmem_init(unsigned long start_pfn, unsigned long end_pfn);
-- extern void free_initmem(void);
--
-- extern void init_extra_mapping_uc(unsigned long phys, unsigned long size);
-- extern void init_extra_mapping_wb(unsigned long phys, unsigned long size);
--
-- #endif /* !__ASSEMBLY__ */
--
-- #ifdef CONFIG_FLATMEM
-- #define pfn_valid(pfn) ((pfn) < max_pfn)
-- #endif
--
-
- #endif /* _ASM_X86_PAGE_64_H */
---- 1,6 ----
- #ifndef _ASM_X86_PAGE_64_H
- #define _ASM_X86_PAGE_64_H
-
-+ #include <asm/page_64_types.h>
-
- #endif /* _ASM_X86_PAGE_64_H */
diff --git a/arch/x86/include/asm/xen/hypervisor.h b/arch/x86/include/asm/xen/hypervisor.h
index 81fbd735aec..d5b7e90c0ed 100644
--- a/arch/x86/include/asm/xen/hypervisor.h
+++ b/arch/x86/include/asm/xen/hypervisor.h
@@ -38,22 +38,30 @@ extern struct shared_info *HYPERVISOR_shared_info;
extern struct start_info *xen_start_info;
enum xen_domain_type {
- XEN_NATIVE,
- XEN_PV_DOMAIN,
- XEN_HVM_DOMAIN,
+ XEN_NATIVE, /* running on bare hardware */
+ XEN_PV_DOMAIN, /* running in a PV domain */
+ XEN_HVM_DOMAIN, /* running in a Xen hvm domain */
};
-extern enum xen_domain_type xen_domain_type;
-
#ifdef CONFIG_XEN
-#define xen_domain() (xen_domain_type != XEN_NATIVE)
+extern enum xen_domain_type xen_domain_type;
#else
-#define xen_domain() (0)
+#define xen_domain_type XEN_NATIVE
#endif
-#define xen_pv_domain() (xen_domain() && xen_domain_type == XEN_PV_DOMAIN)
-#define xen_hvm_domain() (xen_domain() && xen_domain_type == XEN_HVM_DOMAIN)
+#define xen_domain() (xen_domain_type != XEN_NATIVE)
+#define xen_pv_domain() (xen_domain() && \
+ xen_domain_type == XEN_PV_DOMAIN)
+#define xen_hvm_domain() (xen_domain() && \
+ xen_domain_type == XEN_HVM_DOMAIN)
+
+#ifdef CONFIG_XEN_DOM0
+#include <xen/interface/xen.h>
-#define xen_initial_domain() (xen_pv_domain() && xen_start_info->flags & SIF_INITDOMAIN)
+#define xen_initial_domain() (xen_pv_domain() && \
+ xen_start_info->flags & SIF_INITDOMAIN)
+#else /* !CONFIG_XEN_DOM0 */
+#define xen_initial_domain() (0)
+#endif /* CONFIG_XEN_DOM0 */
#endif /* _ASM_X86_XEN_HYPERVISOR_H */
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-02-11 20:57:10 +0000