Skip to content

Commit fd3bc66

Browse files
ozbenhozbenh
committed
Merge tag 'disintegrate-powerpc-20121009' into merge
UAPI Disintegration 2012-10-09
2 parents 547b1e8 + c3617f7 commit fd3bc66

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+1705
-1528
lines changed

‎arch/powerpc/include/asm/Kbuild

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,4 @@
1-
include include/asm-generic/Kbuild.asm
21

3-
header-y += auxvec.h
4-
header-y += bootx.h
5-
header-y += byteorder.h
6-
header-y += cputable.h
7-
header-y += elf.h
8-
header-y += errno.h
9-
header-y += fcntl.h
10-
header-y += ioctl.h
11-
header-y += ioctls.h
12-
header-y += ipcbuf.h
13-
header-y += linkage.h
14-
header-y += msgbuf.h
15-
header-y += nvram.h
16-
header-y += param.h
17-
header-y += poll.h
18-
header-y += posix_types.h
19-
header-y += ps3fb.h
20-
header-y += resource.h
21-
header-y += seccomp.h
22-
header-y += sembuf.h
23-
header-y += shmbuf.h
24-
header-y += sigcontext.h
25-
header-y += siginfo.h
26-
header-y += signal.h
27-
header-y += socket.h
28-
header-y += sockios.h
29-
header-y += spu_info.h
30-
header-y += stat.h
31-
header-y += statfs.h
32-
header-y += termbits.h
33-
header-y += termios.h
34-
header-y += types.h
35-
header-y += ucontext.h
36-
header-y += unistd.h
372

383
generic-y += clkdev.h
394
generic-y += rwsem.h

‎arch/powerpc/include/asm/bootx.h

Lines changed: 1 addition & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -5,126 +5,11 @@
55
* Written by Benjamin Herrenschmidt.
66
*/
77

8-
98
#ifndef __ASM_BOOTX_H__
109
#define __ASM_BOOTX_H__
1110

12-
#include <linux/types.h>
13-
14-
#ifdef macintosh
15-
#include <Types.h>
16-
#include "linux_type_defs.h"
17-
#endif
18-
19-
#ifdef macintosh
20-
/* All this requires PowerPC alignment */
21-
#pragma options align=power
22-
#endif
23-
24-
/* On kernel entry:
25-
*
26-
* r3 = 0x426f6f58 ('BooX')
27-
* r4 = pointer to boot_infos
28-
* r5 = NULL
29-
*
30-
* Data and instruction translation disabled, interrupts
31-
* disabled, kernel loaded at physical 0x00000000 on PCI
32-
* machines (will be different on NuBus).
33-
*/
34-
35-
#define BOOT_INFO_VERSION 5
36-
#define BOOT_INFO_COMPATIBLE_VERSION 1
37-
38-
/* Bit in the architecture flag mask. More to be defined in
39-
future versions. Note that either BOOT_ARCH_PCI or
40-
BOOT_ARCH_NUBUS is set. The other BOOT_ARCH_NUBUS_xxx are
41-
set additionally when BOOT_ARCH_NUBUS is set.
42-
*/
43-
#define BOOT_ARCH_PCI 0x00000001UL
44-
#define BOOT_ARCH_NUBUS 0x00000002UL
45-
#define BOOT_ARCH_NUBUS_PDM 0x00000010UL
46-
#define BOOT_ARCH_NUBUS_PERFORMA 0x00000020UL
47-
#define BOOT_ARCH_NUBUS_POWERBOOK 0x00000040UL
48-
49-
/* Maximum number of ranges in phys memory map */
50-
#define MAX_MEM_MAP_SIZE 26
51-
52-
/* This is the format of an element in the physical memory map. Note that
53-
the map is optional and current BootX will only build it for pre-PCI
54-
machines */
55-
typedef struct boot_info_map_entry
56-
{
57-
__u32 physAddr; /* Physical starting address */
58-
__u32 size; /* Size in bytes */
59-
} boot_info_map_entry_t;
60-
61-
62-
/* Here are the boot informations that are passed to the bootstrap
63-
* Note that the kernel arguments and the device tree are appended
64-
* at the end of this structure. */
65-
typedef struct boot_infos
66-
{
67-
/* Version of this structure */
68-
__u32 version;
69-
/* backward compatible down to version: */
70-
__u32 compatible_version;
71-
72-
/* NEW (vers. 2) this holds the current _logical_ base addr of
73-
the frame buffer (for use by early boot message) */
74-
__u8* logicalDisplayBase;
11+
#include <uapi/asm/bootx.h>
7512

76-
/* NEW (vers. 4) Apple's machine identification */
77-
__u32 machineID;
78-
79-
/* NEW (vers. 4) Detected hw architecture */
80-
__u32 architecture;
81-
82-
/* The device tree (internal addresses relative to the beginning of the tree,
83-
* device tree offset relative to the beginning of this structure).
84-
* On pre-PCI macintosh (BOOT_ARCH_PCI bit set to 0 in architecture), this
85-
* field is 0.
86-
*/
87-
__u32 deviceTreeOffset; /* Device tree offset */
88-
__u32 deviceTreeSize; /* Size of the device tree */
89-
90-
/* Some infos about the current MacOS display */
91-
__u32 dispDeviceRect[4]; /* left,top,right,bottom */
92-
__u32 dispDeviceDepth; /* (8, 16 or 32) */
93-
__u8* dispDeviceBase; /* base address (physical) */
94-
__u32 dispDeviceRowBytes; /* rowbytes (in bytes) */
95-
__u32 dispDeviceColorsOffset; /* Colormap (8 bits only) or 0 (*) */
96-
/* Optional offset in the registry to the current
97-
* MacOS display. (Can be 0 when not detected) */
98-
__u32 dispDeviceRegEntryOffset;
99-
100-
/* Optional pointer to boot ramdisk (offset from this structure) */
101-
__u32 ramDisk;
102-
__u32 ramDiskSize; /* size of ramdisk image */
103-
104-
/* Kernel command line arguments (offset from this structure) */
105-
__u32 kernelParamsOffset;
106-
107-
/* ALL BELOW NEW (vers. 4) */
108-
109-
/* This defines the physical memory. Valid with BOOT_ARCH_NUBUS flag
110-
(non-PCI) only. On PCI, memory is contiguous and it's size is in the
111-
device-tree. */
112-
boot_info_map_entry_t
113-
physMemoryMap[MAX_MEM_MAP_SIZE]; /* Where the phys memory is */
114-
__u32 physMemoryMapSize; /* How many entries in map */
115-
116-
117-
/* The framebuffer size (optional, currently 0) */
118-
__u32 frameBufferSize; /* Represents a max size, can be 0. */
119-
120-
/* NEW (vers. 5) */
121-
122-
/* Total params size (args + colormap + device tree + ramdisk) */
123-
__u32 totalParamsSize;
124-
125-
} boot_infos_t;
126-
127-
#ifdef __KERNEL__
12813
/* (*) The format of the colormap is 256 * 3 * 2 bytes. Each color index
12914
* is represented by 3 short words containing a 16 bits (unsigned) color
13015
* component. Later versions may contain the gamma table for direct-color
@@ -162,10 +47,4 @@ struct bootx_dt_node {
16247

16348
extern void bootx_init(unsigned long r4, unsigned long phys);
16449

165-
#endif /* __KERNEL__ */
166-
167-
#ifdef macintosh
168-
#pragma options align=reset
169-
#endif
170-
17150
#endif

‎arch/powerpc/include/asm/cputable.h

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,10 @@
11
#ifndef __ASM_POWERPC_CPUTABLE_H
22
#define __ASM_POWERPC_CPUTABLE_H
33

4-
#define PPC_FEATURE_32 0x80000000
5-
#define PPC_FEATURE_64 0x40000000
6-
#define PPC_FEATURE_601_INSTR 0x20000000
7-
#define PPC_FEATURE_HAS_ALTIVEC 0x10000000
8-
#define PPC_FEATURE_HAS_FPU 0x08000000
9-
#define PPC_FEATURE_HAS_MMU 0x04000000
10-
#define PPC_FEATURE_HAS_4xxMAC 0x02000000
11-
#define PPC_FEATURE_UNIFIED_CACHE 0x01000000
12-
#define PPC_FEATURE_HAS_SPE 0x00800000
13-
#define PPC_FEATURE_HAS_EFP_SINGLE 0x00400000
14-
#define PPC_FEATURE_HAS_EFP_DOUBLE 0x00200000
15-
#define PPC_FEATURE_NO_TB 0x00100000
16-
#define PPC_FEATURE_POWER4 0x00080000
17-
#define PPC_FEATURE_POWER5 0x00040000
18-
#define PPC_FEATURE_POWER5_PLUS 0x00020000
19-
#define PPC_FEATURE_CELL 0x00010000
20-
#define PPC_FEATURE_BOOKE 0x00008000
21-
#define PPC_FEATURE_SMT 0x00004000
22-
#define PPC_FEATURE_ICACHE_SNOOP 0x00002000
23-
#define PPC_FEATURE_ARCH_2_05 0x00001000
24-
#define PPC_FEATURE_PA6T 0x00000800
25-
#define PPC_FEATURE_HAS_DFP 0x00000400
26-
#define PPC_FEATURE_POWER6_EXT 0x00000200
27-
#define PPC_FEATURE_ARCH_2_06 0x00000100
28-
#define PPC_FEATURE_HAS_VSX 0x00000080
29-
30-
#define PPC_FEATURE_PSERIES_PERFMON_COMPAT \
31-
0x00000040
32-
33-
#define PPC_FEATURE_TRUE_LE 0x00000002
34-
#define PPC_FEATURE_PPC_LE 0x00000001
35-
36-
#ifdef __KERNEL__
374

385
#include <asm/asm-compat.h>
396
#include <asm/feature-fixups.h>
7+
#include <uapi/asm/cputable.h>
408

419
#ifndef __ASSEMBLY__
4210

@@ -557,5 +525,4 @@ static inline int cpu_has_feature(unsigned long feature)
557525

558526
#endif /* !__ASSEMBLY__ */
559527

560-
#endif /* __KERNEL__ */
561528
#endif /* __ASM_POWERPC_CPUTABLE_H */

0 commit comments

Comments
 (0)