Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
ed0da6fc
Commit
ed0da6fc
authored
Aug 18, 2006
by
Greg Kroah-Hartman
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'merge' of
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
parents
774bd861
9e8a9bc2
Changes
20
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
695 additions
and
134 deletions
+695
-134
Documentation/powerpc/booting-without-of.txt
Documentation/powerpc/booting-without-of.txt
+5
-5
arch/powerpc/Kconfig
arch/powerpc/Kconfig
+4
-3
arch/powerpc/boot/dts/mpc8641_hpcn.dts
arch/powerpc/boot/dts/mpc8641_hpcn.dts
+339
-0
arch/powerpc/configs/g5_defconfig
arch/powerpc/configs/g5_defconfig
+98
-24
arch/powerpc/configs/iseries_defconfig
arch/powerpc/configs/iseries_defconfig
+64
-14
arch/powerpc/configs/pseries_defconfig
arch/powerpc/configs/pseries_defconfig
+62
-16
arch/powerpc/kernel/Makefile
arch/powerpc/kernel/Makefile
+2
-2
arch/powerpc/kernel/cpu_setup_power4.S
arch/powerpc/kernel/cpu_setup_power4.S
+2
-0
arch/powerpc/kernel/crash.c
arch/powerpc/kernel/crash.c
+11
-0
arch/powerpc/kernel/irq.c
arch/powerpc/kernel/irq.c
+1
-1
arch/powerpc/kernel/kprobes.c
arch/powerpc/kernel/kprobes.c
+2
-0
arch/powerpc/kernel/machine_kexec.c
arch/powerpc/kernel/machine_kexec.c
+56
-0
arch/powerpc/kernel/machine_kexec_64.c
arch/powerpc/kernel/machine_kexec_64.c
+0
-57
arch/powerpc/kernel/rtas.c
arch/powerpc/kernel/rtas.c
+21
-0
arch/powerpc/kernel/traps.c
arch/powerpc/kernel/traps.c
+13
-3
arch/powerpc/platforms/pseries/setup.c
arch/powerpc/platforms/pseries/setup.c
+0
-2
arch/powerpc/platforms/pseries/xics.c
arch/powerpc/platforms/pseries/xics.c
+3
-3
arch/powerpc/sysdev/fsl_soc.c
arch/powerpc/sysdev/fsl_soc.c
+10
-2
include/asm-powerpc/kexec.h
include/asm-powerpc/kexec.h
+1
-2
include/asm-powerpc/rtas.h
include/asm-powerpc/rtas.h
+1
-0
No files found.
Documentation/powerpc/booting-without-of.txt
View file @
ed0da6fc
...
...
@@ -1196,7 +1196,7 @@ platforms are moved over to use the flattened-device-tree model.
- model : Model of the device. Can be "TSEC", "eTSEC", or "FEC"
- compatible : Should be "gianfar"
- reg : Offset and length of the register set for the device
- address : List of bytes representing the ethernet address of
-
mac-
address : List of bytes representing the ethernet address of
this controller
- interrupts : <a b> where a is the interrupt number and b is a
field that represents an encoding of the sense and level
...
...
@@ -1216,7 +1216,7 @@ platforms are moved over to use the flattened-device-tree model.
model = "TSEC";
compatible = "gianfar";
reg = <24000 1000>;
address = [ 00 E0 0C 00 73 00 ];
mac-
address = [ 00 E0 0C 00 73 00 ];
interrupts = <d 3 e 3 12 3>;
interrupt-parent = <40000>;
phy-handle = <2452000>
...
...
@@ -1498,7 +1498,7 @@ not necessary as they are usually the same as the root node.
model = "TSEC";
compatible = "gianfar";
reg = <24000 1000>;
address = [ 00 E0 0C 00 73 00 ];
mac-
address = [ 00 E0 0C 00 73 00 ];
interrupts = <d 3 e 3 12 3>;
interrupt-parent = <40000>;
phy-handle = <2452000>;
...
...
@@ -1511,7 +1511,7 @@ not necessary as they are usually the same as the root node.
model = "TSEC";
compatible = "gianfar";
reg = <25000 1000>;
address = [ 00 E0 0C 00 73 01 ];
mac-
address = [ 00 E0 0C 00 73 01 ];
interrupts = <13 3 14 3 18 3>;
interrupt-parent = <40000>;
phy-handle = <2452001>;
...
...
@@ -1524,7 +1524,7 @@ not necessary as they are usually the same as the root node.
model = "FEC";
compatible = "gianfar";
reg = <26000 1000>;
address = [ 00 E0 0C 00 73 02 ];
mac-
address = [ 00 E0 0C 00 73 02 ];
interrupts = <19 3>;
interrupt-parent = <40000>;
phy-handle = <2452002>;
...
...
arch/powerpc/Kconfig
View file @
ed0da6fc
...
...
@@ -836,9 +836,10 @@ config MCA
bool
config PCI
bool "PCI support" if 40x || CPM2 || PPC_83xx || PPC_85xx || PPC_MPC52xx || (EMBEDDED && PPC_ISERIES) \
|| MPC7448HPC2
default y if !40x && !CPM2 && !8xx && !APUS && !PPC_83xx && !PPC_85xx && !PPC_86xx
bool "PCI support" if 40x || CPM2 || PPC_83xx || PPC_85xx || PPC_86xx \
|| PPC_MPC52xx || (EMBEDDED && PPC_ISERIES) || MPC7448HPC2
default y if !40x && !CPM2 && !8xx && !APUS && !PPC_83xx \
&& !PPC_85xx && !PPC_86xx
default PCI_PERMEDIA if !4xx && !CPM2 && !8xx && APUS
default PCI_QSPAN if !4xx && !CPM2 && 8xx
help
...
...
arch/powerpc/boot/dts/mpc8641_hpcn.dts
0 → 100644
View file @
ed0da6fc
/*
*
MPC8641
HPCN
Device
Tree
Source
*
*
Copyright
2006
Freescale
Semiconductor
Inc
.
*
*
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
.
*/
/
{
model
=
"MPC8641HPCN"
;
compatible
=
"mpc86xx"
;
#
address
-
cells
=
<
1
>;
#
size
-
cells
=
<
1
>;
cpus
{
#
cpus
=
<
2
>;
#
address
-
cells
=
<
1
>;
#
size
-
cells
=
<
0
>;
PowerPC
,
8641
@
0
{
device_type
=
"cpu"
;
reg
=
<
0
>;
d
-
cache
-
line
-
size
=
<
20
>;
//
32
bytes
i
-
cache
-
line
-
size
=
<
20
>;
//
32
bytes
d
-
cache
-
size
=
<
8000
>;
//
L1
,
32
K
i
-
cache
-
size
=
<
8000
>;
//
L1
,
32
K
timebase
-
frequency
=
<
0
>;
//
33
MHz
,
from
uboot
bus
-
frequency
=
<
0
>;
//
From
uboot
clock
-
frequency
=
<
0
>;
//
From
uboot
32
-
bit
;
linux
,
boot
-
cpu
;
};
PowerPC
,
8641
@
1
{
device_type
=
"cpu"
;
reg
=
<
1
>;
d
-
cache
-
line
-
size
=
<
20
>;
//
32
bytes
i
-
cache
-
line
-
size
=
<
20
>;
//
32
bytes
d
-
cache
-
size
=
<
8000
>;
//
L1
,
32
K
i
-
cache
-
size
=
<
8000
>;
//
L1
,
32
K
timebase
-
frequency
=
<
0
>;
//
33
MHz
,
from
uboot
bus
-
frequency
=
<
0
>;
//
From
uboot
clock
-
frequency
=
<
0
>;
//
From
uboot
32
-
bit
;
};
};
memory
{
device_type
=
"memory"
;
reg
=
<
00000000
40000000
>;
//
1
G
at
0x0
};
soc8641
@
f8000000
{
#
address
-
cells
=
<
1
>;
#
size
-
cells
=
<
1
>;
#
interrupt
-
cells
=
<
2
>;
device_type
=
"soc"
;
ranges
=
<
0
f8000000
00100000
>;
reg
=
<
f8000000
00100000
>;
//
CCSRBAR
1
M
bus
-
frequency
=
<
0
>;
i2c
@
3000
{
device_type
=
"i2c"
;
compatible
=
"fsl-i2c"
;
reg
=
<
3000
100
>;
interrupts
=
<
2
b
2
>;
interrupt
-
parent
=
<
40000
>;
dfsrr
;
};
i2c
@
3100
{
device_type
=
"i2c"
;
compatible
=
"fsl-i2c"
;
reg
=
<
3100
100
>;
interrupts
=
<
2
b
2
>;
interrupt
-
parent
=
<
40000
>;
dfsrr
;
};
mdio
@
24520
{
#
address
-
cells
=
<
1
>;
#
size
-
cells
=
<
0
>;
device_type
=
"mdio"
;
compatible
=
"gianfar"
;
reg
=
<
24520
20
>;
linux
,
phandle
=
<
24520
>;
ethernet
-
phy
@
0
{
linux
,
phandle
=
<
2452000
>;
interrupt
-
parent
=
<
40000
>;
interrupts
=
<
4
a
1
>;
reg
=
<
0
>;
device_type
=
"ethernet-phy"
;
};
ethernet
-
phy
@
1
{
linux
,
phandle
=
<
2452001
>;
interrupt
-
parent
=
<
40000
>;
interrupts
=
<
4
a
1
>;
reg
=
<
1
>;
device_type
=
"ethernet-phy"
;
};
ethernet
-
phy
@
2
{
linux
,
phandle
=
<
2452002
>;
interrupt
-
parent
=
<
40000
>;
interrupts
=
<
4
a
1
>;
reg
=
<
2
>;
device_type
=
"ethernet-phy"
;
};
ethernet
-
phy
@
3
{
linux
,
phandle
=
<
2452003
>;
interrupt
-
parent
=
<
40000
>;
interrupts
=
<
4
a
1
>;
reg
=
<
3
>;
device_type
=
"ethernet-phy"
;
};
};
ethernet
@
24000
{
#
address
-
cells
=
<
1
>;
#
size
-
cells
=
<
0
>;
device_type
=
"network"
;
model
=
"TSEC"
;
compatible
=
"gianfar"
;
reg
=
<
24000
1000
>;
mac
-
address
=
[
00
E0
0
C
00
73
00
];
interrupts
=
<
1
d
2
1
e
2
22
2
>;
interrupt
-
parent
=
<
40000
>;
phy
-
handle
=
<
2452000
>;
};
ethernet
@
25000
{
#
address
-
cells
=
<
1
>;
#
size
-
cells
=
<
0
>;
device_type
=
"network"
;
model
=
"TSEC"
;
compatible
=
"gianfar"
;
reg
=
<
25000
1000
>;
mac
-
address
=
[
00
E0
0
C
00
73
01
];
interrupts
=
<
23
2
24
2
28
2
>;
interrupt
-
parent
=
<
40000
>;
phy
-
handle
=
<
2452001
>;
};
ethernet
@
26000
{
#
address
-
cells
=
<
1
>;
#
size
-
cells
=
<
0
>;
device_type
=
"network"
;
model
=
"TSEC"
;
compatible
=
"gianfar"
;
reg
=
<
26000
1000
>;
mac
-
address
=
[
00
E0
0
C
00
02
FD
];
interrupts
=
<
1F
2
20
2
21
2
>;
interrupt
-
parent
=
<
40000
>;
phy
-
handle
=
<
2452002
>;
};
ethernet
@
27000
{
#
address
-
cells
=
<
1
>;
#
size
-
cells
=
<
0
>;
device_type
=
"network"
;
model
=
"TSEC"
;
compatible
=
"gianfar"
;
reg
=
<
27000
1000
>;
mac
-
address
=
[
00
E0
0
C
00
03
FD
];
interrupts
=
<
25
2
26
2
27
2
>;
interrupt
-
parent
=
<
40000
>;
phy
-
handle
=
<
2452003
>;
};
serial
@
4500
{
device_type
=
"serial"
;
compatible
=
"ns16550"
;
reg
=
<
4500
100
>;
clock
-
frequency
=
<
0
>;
interrupts
=
<
2
a
2
>;
interrupt
-
parent
=
<
40000
>;
};
serial
@
4600
{
device_type
=
"serial"
;
compatible
=
"ns16550"
;
reg
=
<
4600
100
>;
clock
-
frequency
=
<
0
>;
interrupts
=
<
1
c
2
>;
interrupt
-
parent
=
<
40000
>;
};
pci
@
8000
{
compatible
=
"86xx"
;
device_type
=
"pci"
;
#
interrupt
-
cells
=
<
1
>;
#
size
-
cells
=
<
2
>;
#
address
-
cells
=
<
3
>;
reg
=
<
8000
1000
>;
bus
-
range
=
<
0
fe
>;
ranges
=
<
02000000
0
80000000
80000000
0
20000000
01000000
0
00000000
e2000000
0
00100000
>;
clock
-
frequency
=
<
1f
ca055
>;
interrupt
-
parent
=
<
40000
>;
interrupts
=
<
18
2
>;
interrupt
-
map
-
mask
=
<
f800
0
0
7
>;
interrupt
-
map
=
<
/*
IDSEL
0x11
*/
8800
0
0
1
4
d0
3
2
8800
0
0
2
4
d0
4
2
8800
0
0
3
4
d0
5
2
8800
0
0
4
4
d0
6
2
/*
IDSEL
0x12
*/
9000
0
0
1
4
d0
4
2
9000
0
0
2
4
d0
5
2
9000
0
0
3
4
d0
6
2
9000
0
0
4
4
d0
3
2
/*
IDSEL
0x13
*/
9800
0
0
1
4
d0
0
0
9800
0
0
2
4
d0
0
0
9800
0
0
3
4
d0
0
0
9800
0
0
4
4
d0
0
0
/*
IDSEL
0x14
*/
a000
0
0
1
4
d0
0
0
a000
0
0
2
4
d0
0
0
a000
0
0
3
4
d0
0
0
a000
0
0
4
4
d0
0
0
/*
IDSEL
0x15
*/
a800
0
0
1
4
d0
0
0
a800
0
0
2
4
d0
0
0
a800
0
0
3
4
d0
0
0
a800
0
0
4
4
d0
0
0
/*
IDSEL
0x16
*/
b000
0
0
1
4
d0
0
0
b000
0
0
2
4
d0
0
0
b000
0
0
3
4
d0
0
0
b000
0
0
4
4
d0
0
0
/*
IDSEL
0x17
*/
b800
0
0
1
4
d0
0
0
b800
0
0
2
4
d0
0
0
b800
0
0
3
4
d0
0
0
b800
0
0
4
4
d0
0
0
/*
IDSEL
0x18
*/
c000
0
0
1
4
d0
0
0
c000
0
0
2
4
d0
0
0
c000
0
0
3
4
d0
0
0
c000
0
0
4
4
d0
0
0
/*
IDSEL
0x19
*/
c800
0
0
1
4
d0
0
0
c800
0
0
2
4
d0
0
0
c800
0
0
3
4
d0
0
0
c800
0
0
4
4
d0
0
0
/*
IDSEL
0x1a
*/
d000
0
0
1
4
d0
6
2
d000
0
0
2
4
d0
3
2
d000
0
0
3
4
d0
4
2
d000
0
0
4
4
d0
5
2
/*
IDSEL
0x1b
*/
d800
0
0
1
4
d0
5
2
d800
0
0
2
4
d0
0
0
d800
0
0
3
4
d0
0
0
d800
0
0
4
4
d0
0
0
/*
IDSEL
0x1c
*/
e000
0
0
1
4
d0
9
2
e000
0
0
2
4
d0
a
2
e000
0
0
3
4
d0
c
2
e000
0
0
4
4
d0
7
2
/*
IDSEL
0x1d
*/
e800
0
0
1
4
d0
9
2
e800
0
0
2
4
d0
a
2
e800
0
0
3
4
d0
b
2
e800
0
0
4
4
d0
0
0
/*
IDSEL
0x1e
*/
f000
0
0
1
4
d0
c
2
f000
0
0
2
4
d0
0
0
f000
0
0
3
4
d0
0
0
f000
0
0
4
4
d0
0
0
/*
IDSEL
0x1f
*/
f800
0
0
1
4
d0
6
2
f800
0
0
2
4
d0
0
0
f800
0
0
3
4
d0
0
0
f800
0
0
4
4
d0
0
0
>;
i8259
@
4
d0
{
linux
,
phandle
=
<
4
d0
>;
clock
-
frequency
=
<
0
>;
interrupt
-
controller
;
device_type
=
"interrupt-controller"
;
#
address
-
cells
=
<
0
>;
#
interrupt
-
cells
=
<
2
>;
built
-
in
;
compatible
=
"chrp,iic"
;
big
-
endian
;
interrupts
=
<
49
2
>;
interrupt
-
parent
=
<
40000
>;
};
};
pic
@
40000
{
linux
,
phandle
=
<
40000
>;
clock
-
frequency
=
<
0
>;
interrupt
-
controller
;
#
address
-
cells
=
<
0
>;
#
interrupt
-
cells
=
<
2
>;
reg
=
<
40000
40000
>;
built
-
in
;
compatible
=
"chrp,open-pic"
;
device_type
=
"open-pic"
;
big
-
endian
;
interrupts
=
<
10
2
11
2
12
2
13
2
14
2
15
2
16
2
17
2
18
2
19
2
1
a
2
1
b
2
1
c
2
1
d
2
1
e
2
1f
2
20
2
21
2
22
2
23
2
24
2
25
2
26
2
27
2
28
2
29
2
2
a
2
2
b
2
2
c
2
2
d
2
2
e
2
2f
2
30
2
31
2
32
2
33
2
34
2
35
2
36
2
37
2
38
2
39
2
2
a
2
3
b
2
3
c
2
3
d
2
3
e
2
3f
2
48
1
49
2
4
a
1
>;
interrupt
-
parent
=
<
40000
>;
};
};
};
arch/powerpc/configs/g5_defconfig
View file @
ed0da6fc
This diff is collapsed.
Click to expand it.
arch/powerpc/configs/iseries_defconfig
View file @
ed0da6fc
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.1
7-rc1
#
Wed Apr 19 11:46:44
2006
# Linux kernel version: 2.6.1
8-rc3
#
Tue Aug 8 09:15:46
2006
#
CONFIG_PPC64=y
CONFIG_64BIT=y
CONFIG_PPC_MERGE=y
CONFIG_MMU=y
CONFIG_GENERIC_HARDIRQS=y
CONFIG_IRQ_PER_CPU=y
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
CONFIG_GENERIC_HWEIGHT=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
CONFIG_GENERIC_FIND_NEXT_BIT=y
CONFIG_PPC=y
CONFIG_EARLY_PRINTK=y
CONFIG_COMPAT=y
...
...
@@ -34,6 +36,7 @@ CONFIG_PPC_STD_MMU=y
CONFIG_VIRT_CPU_ACCOUNTING=y
CONFIG_SMP=y
CONFIG_NR_CPUS=32
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
#
# Code maturity level options
...
...
@@ -51,6 +54,7 @@ CONFIG_SWAP=y
CONFIG_SYSVIPC=y
CONFIG_POSIX_MQUEUE=y
# CONFIG_BSD_PROCESS_ACCT is not set
# CONFIG_TASKSTATS is not set
CONFIG_SYSCTL=y
CONFIG_AUDIT=y
CONFIG_AUDITSYSCALL=y
...
...
@@ -69,10 +73,12 @@ CONFIG_PRINTK=y
CONFIG_BUG=y
CONFIG_ELF_CORE=y
CONFIG_BASE_FULL=y
CONFIG_RT_MUTEXES=y
CONFIG_FUTEX=y
CONFIG_EPOLL=y
CONFIG_SHMEM=y
CONFIG_SLAB=y
CONFIG_VM_EVENT_COUNTERS=y
# CONFIG_TINY_SHMEM is not set
CONFIG_BASE_SMALL=0
# CONFIG_SLOB is not set
...
...
@@ -113,10 +119,14 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
CONFIG_PPC_ISERIES=y
# CONFIG_EMBEDDED6xx is not set
# CONFIG_APUS is not set
# CONFIG_PPC_CELL is not set
# CONFIG_PPC_CELL_NATIVE is not set
# CONFIG_UDBG_RTAS_CONSOLE is not set
# CONFIG_PPC_RTAS is not set
# CONFIG_MMIO_NVRAM is not set
CONFIG_IBMVIO=y
# CONFIG_PPC_MPC106 is not set
# CONFIG_PPC_970_NAP is not set
# CONFIG_CPU_FREQ is not set
# CONFIG_WANT_EARLY_SERIAL is not set
...
...
@@ -135,6 +145,7 @@ CONFIG_BINFMT_ELF=y
# CONFIG_BINFMT_MISC is not set
CONFIG_FORCE_MAX_ZONEORDER=13
CONFIG_IOMMU_VMERGE=y
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
CONFIG_IRQ_ALL_CPUS=y
CONFIG_LPARCFG=y
# CONFIG_NUMA is not set
...
...
@@ -149,6 +160,7 @@ CONFIG_FLATMEM=y
CONFIG_FLAT_NODE_MEM_MAP=y
# CONFIG_SPARSEMEM_STATIC is not set
CONFIG_SPLIT_PTLOCK_CPUS=4
CONFIG_RESOURCES_64BIT=y
# CONFIG_PPC_64K_PAGES is not set
# CONFIG_SCHED_SMT is not set
CONFIG_PROC_DEVICETREE=y
...
...
@@ -164,6 +176,7 @@ CONFIG_GENERIC_ISA_DMA=y
# CONFIG_PPC_INDIRECT_PCI is not set
CONFIG_PCI=y
CONFIG_PCI_DOMAINS=y
# CONFIG_PCIEPORTBUS is not set
# CONFIG_PCI_DEBUG is not set
#
...
...
@@ -207,6 +220,8 @@ CONFIG_INET_ESP=m
CONFIG_INET_IPCOMP=m
CONFIG_INET_XFRM_TUNNEL=m
CONFIG_INET_TUNNEL=y
CONFIG_INET_XFRM_MODE_TRANSPORT=y
CONFIG_INET_XFRM_MODE_TUNNEL=y
CONFIG_INET_DIAG=y
CONFIG_INET_TCP_DIAG=y
# CONFIG_TCP_CONG_ADVANCED is not set
...
...
@@ -219,6 +234,7 @@ CONFIG_TCP_CONG_BIC=y
# CONFIG_IPV6 is not set
# CONFIG_INET6_XFRM_TUNNEL is not set
# CONFIG_INET6_TUNNEL is not set
# CONFIG_NETWORK_SECMARK is not set
CONFIG_NETFILTER=y
# CONFIG_NETFILTER_DEBUG is not set
...
...
@@ -246,9 +262,11 @@ CONFIG_NETFILTER_XT_MATCH_MARK=m
# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
CONFIG_NETFILTER_XT_MATCH_REALM=m
CONFIG_NETFILTER_XT_MATCH_SCTP=m
CONFIG_NETFILTER_XT_MATCH_STATE=m
# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
CONFIG_NETFILTER_XT_MATCH_STRING=m
CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
...
...
@@ -267,6 +285,7 @@ CONFIG_IP_NF_TFTP=m
CONFIG_IP_NF_AMANDA=m
# CONFIG_IP_NF_PPTP is not set
# CONFIG_IP_NF_H323 is not set
# CONFIG_IP_NF_SIP is not set
CONFIG_IP_NF_QUEUE=m
CONFIG_IP_NF_IPTABLES=m
CONFIG_IP_NF_MATCH_IPRANGE=m
...
...
@@ -360,6 +379,7 @@ CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
CONFIG_FW_LOADER=m
# CONFIG_DEBUG_DRIVER is not set
# CONFIG_SYS_HYPERVISOR is not set
#
# Connector - unified userspace <-> kernelspace linker
...
...
@@ -396,6 +416,7 @@ CONFIG_BLK_DEV_NBD=m
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=65536
CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
CONFIG_BLK_DEV_INITRD=y
# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set
...
...
@@ -453,6 +474,7 @@ CONFIG_SCSI_FC_ATTRS=y
# CONFIG_MEGARAID_LEGACY is not set
# CONFIG_MEGARAID_SAS is not set
# CONFIG_SCSI_SATA is not set
# CONFIG_SCSI_HPTIOP is not set
# CONFIG_SCSI_BUSLOGIC is not set
# CONFIG_SCSI_DMX3191D is not set
# CONFIG_SCSI_EATA is not set
...
...
@@ -464,7 +486,6 @@ CONFIG_SCSI_IBMVSCSI=m
# CONFIG_SCSI_INIA100 is not set
# CONFIG_SCSI_SYM53C8XX_2 is not set
# CONFIG_SCSI_IPR is not set
# CONFIG_SCSI_QLOGIC_FC is not set
# CONFIG_SCSI_QLOGIC_1280 is not set
# CONFIG_SCSI_QLA_FC is not set
# CONFIG_SCSI_LPFC is not set
...
...
@@ -481,9 +502,7 @@ CONFIG_MD_LINEAR=y
CONFIG_MD_RAID0=y
CONFIG_MD_RAID1=y
CONFIG_MD_RAID10=m
CONFIG_MD_RAID5=y
# CONFIG_MD_RAID5_RESHAPE is not set
CONFIG_MD_RAID6=m
# CONFIG_MD_RAID456 is not set
CONFIG_MD_MULTIPATH=m
CONFIG_MD_FAULTY=m
CONFIG_BLK_DEV_DM=y
...
...
@@ -596,6 +615,7 @@ CONFIG_E1000=m
# CONFIG_CHELSIO_T1 is not set
# CONFIG_IXGB is not set
# CONFIG_S2IO is not set
# CONFIG_MYRI10GE is not set
#
# Token Ring devices
...
...
@@ -696,6 +716,7 @@ CONFIG_SERIAL_ICOM=m
CONFIG_UNIX98_PTYS=y
CONFIG_LEGACY_PTYS=y
CONFIG_LEGACY_PTY_COUNT=256
# CONFIG_BRIQ_PANEL is not set
#
# IPMI
...
...
@@ -706,6 +727,7 @@ CONFIG_LEGACY_PTY_COUNT=256
# Watchdog Cards
#
# CONFIG_WATCHDOG is not set
# CONFIG_HW_RANDOM is not set
CONFIG_GEN_RTC=y
# CONFIG_GEN_RTC_X is not set
# CONFIG_DTLK is not set
...
...
@@ -741,7 +763,6 @@ CONFIG_MAX_RAW_DEVS=256
#
# Dallas's 1-wire bus
#
# CONFIG_W1 is not set
#
# Hardware Monitoring support
...
...
@@ -757,6 +778,7 @@ CONFIG_MAX_RAW_DEVS=256
# Multimedia devices
#
# CONFIG_VIDEO_DEV is not set
CONFIG_VIDEO_V4L2=y
#
# Digital Video Broadcasting Devices
...
...
@@ -766,7 +788,9 @@ CONFIG_MAX_RAW_DEVS=256
#
# Graphics support
#
CONFIG_FIRMWARE_EDID=y
# CONFIG_FB is not set
# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
#
# Sound
...
...
@@ -800,6 +824,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
#
# CONFIG_NEW_LEDS is not set
#
# LED drivers
#
#
# LED Triggers
#
#
# InfiniBand support
#
...
...
@@ -814,6 +846,19 @@ CONFIG_USB_ARCH_HAS_EHCI=y
#
# CONFIG_RTC_CLASS is not set
#
# DMA Engine support
#
# CONFIG_DMA_ENGINE is not set
#
# DMA Clients
#
#
# DMA Devices
#
#
# File systems
#
...
...
@@ -843,7 +888,6 @@ CONFIG_JFS_SECURITY=y
# CONFIG_JFS_STATISTICS is not set
CONFIG_FS_POSIX_ACL=y
CONFIG_XFS_FS=m
CONFIG_XFS_EXPORT=y
# CONFIG_XFS_QUOTA is not set
CONFIG_XFS_SECURITY=y
CONFIG_XFS_POSIX_ACL=y
...
...
@@ -852,6 +896,7 @@ CONFIG_XFS_POSIX_ACL=y
# CONFIG_MINIX_FS is not set
# CONFIG_ROMFS_FS is not set
CONFIG_INOTIFY=y
CONFIG_INOTIFY_USER=y
# CONFIG_QUOTA is not set
CONFIG_DNOTIFY=y
CONFIG_AUTOFS_FS=m
...
...
@@ -933,8 +978,10 @@ CONFIG_RPCSEC_GSS_SPKM3=m
# CONFIG_SMB_FS is not set
CONFIG_CIFS=m
# CONFIG_CIFS_STATS is not set
# CONFIG_CIFS_WEAK_PW_HASH is not set
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y
# CONFIG_CIFS_DEBUG2 is not set
# CONFIG_CIFS_EXPERIMENTAL is not set
# CONFIG_NCP_FS is not set
# CONFIG_CODA_FS is not set
...
...
@@ -1013,10 +1060,12 @@ CONFIG_TEXTSEARCH=y
CONFIG_TEXTSEARCH_KMP=m
CONFIG_TEXTSEARCH_BM=m
CONFIG_TEXTSEARCH_FSM=m
CONFIG_PLIST=y
#
# Instrumentation Support
#
# CONFIG_PROFILING is not set
# CONFIG_KPROBES is not set
#
...
...
@@ -1024,14 +1073,19 @@ CONFIG_TEXTSEARCH_FSM=m
#
# CONFIG_PRINTK_TIME is not set
CONFIG_MAGIC_SYSRQ=y
# CONFIG_UNUSED_SYMBOLS is not set
CONFIG_DEBUG_KERNEL=y
CONFIG_LOG_BUF_SHIFT=17
CONFIG_DETECT_SOFTLOCKUP=y
# CONFIG_SCHEDSTATS is not set
# CONFIG_DEBUG_SLAB is not set
# CONFIG_DEBUG_MUTEXES is not set
# CONFIG_DEBUG_RT_MUTEXES is not set
# CONFIG_RT_MUTEX_TESTER is not set
# CONFIG_DEBUG_SPINLOCK is not set
# CONFIG_DEBUG_MUTEXES is not set
# CONFIG_DEBUG_RWSEMS is not set
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
# CONFIG_DEBUG_KOBJECT is not set
# CONFIG_DEBUG_INFO is not set
CONFIG_DEBUG_FS=y
...
...
@@ -1042,11 +1096,7 @@ CONFIG_DEBUG_STACKOVERFLOW=y
CONFIG_DEBUG_STACK_USAGE=y
# CONFIG_DEBUGGER is not set
CONFIG_IRQSTACKS=y
# CONFIG_PPC_EARLY_DEBUG_LPAR is not set
# CONFIG_PPC_EARLY_DEBUG_G5 is not set
# CONFIG_PPC_EARLY_DEBUG_RTAS is not set
# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
# CONFIG_PPC_EARLY_DEBUG is not set
#
# Security options
...
...
arch/powerpc/configs/pseries_defconfig
View file @
ed0da6fc
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.1
7-rc4
#
Sun May 28 07:26:56
2006
# Linux kernel version: 2.6.1
8-rc3
#
Tue Aug 8 09:14:48
2006
#
CONFIG_PPC64=y
CONFIG_64BIT=y
CONFIG_PPC_MERGE=y
CONFIG_MMU=y
CONFIG_GENERIC_HARDIRQS=y
CONFIG_IRQ_PER_CPU=y
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
CONFIG_GENERIC_HWEIGHT=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
...
...
@@ -35,6 +36,7 @@ CONFIG_PPC_STD_MMU=y
CONFIG_VIRT_CPU_ACCOUNTING=y
CONFIG_SMP=y
CONFIG_NR_CPUS=128
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
#
# Code maturity level options
...
...
@@ -52,6 +54,7 @@ CONFIG_SWAP=y
CONFIG_SYSVIPC=y
CONFIG_POSIX_MQUEUE=y
# CONFIG_BSD_PROCESS_ACCT is not set
# CONFIG_TASKSTATS is not set
CONFIG_SYSCTL=y
CONFIG_AUDIT=y
CONFIG_AUDITSYSCALL=y
...
...
@@ -70,10 +73,12 @@ CONFIG_PRINTK=y
CONFIG_BUG=y
CONFIG_ELF_CORE=y
CONFIG_BASE_FULL=y
CONFIG_RT_MUTEXES=y
CONFIG_FUTEX=y
CONFIG_EPOLL=y
CONFIG_SHMEM=y
CONFIG_SLAB=y
CONFIG_VM_EVENT_COUNTERS=y
# CONFIG_TINY_SHMEM is not set
CONFIG_BASE_SMALL=0
# CONFIG_SLOB is not set
...
...
@@ -118,6 +123,9 @@ CONFIG_PPC_PSERIES=y
# CONFIG_PPC_PMAC is not set
# CONFIG_PPC_MAPLE is not set
# CONFIG_PPC_CELL is not set
# CONFIG_PPC_CELL_NATIVE is not set
# CONFIG_PPC_IBM_CELL_BLADE is not set
# CONFIG_UDBG_RTAS_CONSOLE is not set
CONFIG_XICS=y
# CONFIG_U3_DART is not set
CONFIG_MPIC=y
...
...
@@ -149,6 +157,7 @@ CONFIG_BINFMT_MISC=m
CONFIG_FORCE_MAX_ZONEORDER=13
CONFIG_IOMMU_VMERGE=y
CONFIG_HOTPLUG_CPU=y
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
CONFIG_KEXEC=y
# CONFIG_CRASH_DUMP is not set
CONFIG_IRQ_ALL_CPUS=y
...
...
@@ -173,6 +182,7 @@ CONFIG_SPARSEMEM_EXTREME=y
# CONFIG_MEMORY_HOTPLUG is not set
CONFIG_SPLIT_PTLOCK_CPUS=4
CONFIG_MIGRATION=y
CONFIG_RESOURCES_64BIT=y
CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y
# CONFIG_PPC_64K_PAGES is not set
CONFIG_SCHED_SMT=y
...
...
@@ -190,6 +200,7 @@ CONFIG_PPC_I8259=y
# CONFIG_PPC_INDIRECT_PCI is not set
CONFIG_PCI=y
CONFIG_PCI_DOMAINS=y
# CONFIG_PCIEPORTBUS is not set
# CONFIG_PCI_DEBUG is not set
#
...
...
@@ -238,6 +249,8 @@ CONFIG_INET_ESP=m
CONFIG_INET_IPCOMP=m
CONFIG_INET_XFRM_TUNNEL=m
CONFIG_INET_TUNNEL=y
CONFIG_INET_XFRM_MODE_TRANSPORT=y
CONFIG_INET_XFRM_MODE_TUNNEL=y
CONFIG_INET_DIAG=y
CONFIG_INET_TCP_DIAG=y
# CONFIG_TCP_CONG_ADVANCED is not set
...
...
@@ -250,6 +263,7 @@ CONFIG_TCP_CONG_BIC=y
# CONFIG_IPV6 is not set
# CONFIG_INET6_XFRM_TUNNEL is not set
# CONFIG_INET6_TUNNEL is not set
# CONFIG_NETWORK_SECMARK is not set
CONFIG_NETFILTER=y
# CONFIG_NETFILTER_DEBUG is not set
...
...
@@ -277,6 +291,7 @@ CONFIG_IP_NF_TFTP=m
CONFIG_IP_NF_AMANDA=m
# CONFIG_IP_NF_PPTP is not set
# CONFIG_IP_NF_H323 is not set
# CONFIG_IP_NF_SIP is not set
CONFIG_IP_NF_QUEUE=m
#
...
...
@@ -316,6 +331,7 @@ CONFIG_LLC=y
# Network testing
#
# CONFIG_NET_PKTGEN is not set
# CONFIG_NET_TCPPROBE is not set
# CONFIG_HAMRADIO is not set
# CONFIG_IRDA is not set
# CONFIG_BT is not set
...
...
@@ -332,6 +348,7 @@ CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
CONFIG_FW_LOADER=y
# CONFIG_DEBUG_DRIVER is not set
# CONFIG_SYS_HYPERVISOR is not set
#
# Connector - unified userspace <-> kernelspace linker
...
...
@@ -352,6 +369,7 @@ CONFIG_PARPORT_PC=m
# CONFIG_PARPORT_PC_FIFO is not set
# CONFIG_PARPORT_PC_SUPERIO is not set
# CONFIG_PARPORT_GSC is not set
# CONFIG_PARPORT_AX88796 is not set
# CONFIG_PARPORT_1284 is not set
#
...
...
@@ -376,6 +394,7 @@ CONFIG_BLK_DEV_NBD=m
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=65536
CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
CONFIG_BLK_DEV_INITRD=y
# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set
...
...
@@ -487,6 +506,7 @@ CONFIG_SCSI_SAS_ATTRS=m
# CONFIG_MEGARAID_LEGACY is not set
# CONFIG_MEGARAID_SAS is not set
# CONFIG_SCSI_SATA is not set
# CONFIG_SCSI_HPTIOP is not set
# CONFIG_SCSI_BUSLOGIC is not set
# CONFIG_SCSI_DMX3191D is not set
# CONFIG_SCSI_EATA is not set
...
...
@@ -508,12 +528,6 @@ CONFIG_SCSI_IPR_TRACE=y
CONFIG_SCSI_IPR_DUMP=y
# CONFIG_SCSI_QLOGIC_1280 is not set
CONFIG_SCSI_QLA_FC=m
CONFIG_SCSI_QLA2XXX_EMBEDDED_FIRMWARE=y
CONFIG_SCSI_QLA21XX=m
CONFIG_SCSI_QLA22XX=m
CONFIG_SCSI_QLA2300=m
CONFIG_SCSI_QLA2322=m
CONFIG_SCSI_QLA24XX=m
CONFIG_SCSI_LPFC=m
# CONFIG_SCSI_DC395x is not set
# CONFIG_SCSI_DC390T is not set
...
...
@@ -528,9 +542,7 @@ CONFIG_MD_LINEAR=y
CONFIG_MD_RAID0=y
CONFIG_MD_RAID1=y
CONFIG_MD_RAID10=m
CONFIG_MD_RAID5=y
CONFIG_MD_RAID5_RESHAPE=y
CONFIG_MD_RAID6=m
# CONFIG_MD_RAID456 is not set
CONFIG_MD_MULTIPATH=m
CONFIG_MD_FAULTY=m
CONFIG_BLK_DEV_DM=y
...
...
@@ -651,6 +663,7 @@ CONFIG_IXGB=m
# CONFIG_IXGB_NAPI is not set
CONFIG_S2IO=m
# CONFIG_S2IO_NAPI is not set
# CONFIG_MYRI10GE is not set
#
# Token Ring devices
...
...
@@ -754,6 +767,7 @@ CONFIG_SERIO_LIBPS2=y
CONFIG_VT=y
CONFIG_VT_CONSOLE=y
CONFIG_HW_CONSOLE=y
# CONFIG_VT_HW_CONSOLE_BINDING is not set
# CONFIG_SERIAL_NONSTANDARD is not set
#
...
...
@@ -776,6 +790,7 @@ CONFIG_SERIAL_JSM=m
CONFIG_UNIX98_PTYS=y
CONFIG_LEGACY_PTYS=y
CONFIG_LEGACY_PTY_COUNT=256
# CONFIG_BRIQ_PANEL is not set
# CONFIG_PRINTER is not set
# CONFIG_PPDEV is not set
# CONFIG_TIPAR is not set
...
...
@@ -793,6 +808,7 @@ CONFIG_HVCS=m
# Watchdog Cards
#
# CONFIG_WATCHDOG is not set
# CONFIG_HW_RANDOM is not set
CONFIG_GEN_RTC=y
# CONFIG_GEN_RTC_X is not set
# CONFIG_DTLK is not set
...
...
@@ -839,6 +855,7 @@ CONFIG_I2C_ALGOBIT=y
# CONFIG_I2C_I810 is not set
# CONFIG_I2C_PIIX4 is not set
# CONFIG_I2C_NFORCE2 is not set
# CONFIG_I2C_OCORES is not set
# CONFIG_I2C_PARPORT is not set
# CONFIG_I2C_PARPORT_LIGHT is not set
# CONFIG_I2C_PROSAVAGE is not set
...
...
@@ -876,7 +893,6 @@ CONFIG_I2C_ALGOBIT=y
#
# Dallas's 1-wire bus
#
# CONFIG_W1 is not set
#
# Hardware Monitoring support
...
...
@@ -892,6 +908,7 @@ CONFIG_I2C_ALGOBIT=y
# Multimedia devices
#
# CONFIG_VIDEO_DEV is not set
CONFIG_VIDEO_V4L2=y
#
# Digital Video Broadcasting Devices
...
...
@@ -902,19 +919,19 @@ CONFIG_I2C_ALGOBIT=y
#
# Graphics support
#
CONFIG_FIRMWARE_EDID=y
CONFIG_FB=y
CONFIG_FB_CFB_FILLRECT=y
CONFIG_FB_CFB_COPYAREA=y
CONFIG_FB_CFB_IMAGEBLIT=y
CONFIG_FB_MACMODES=y
CONFIG_FB_FIRMWARE_EDID=y
# CONFIG_FB_BACKLIGHT is not set
CONFIG_FB_MODE_HELPERS=y
CONFIG_FB_TILEBLITTING=y
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_PM2 is not set
# CONFIG_FB_CYBER2000 is not set
CONFIG_FB_OF=y
# CONFIG_FB_CT65550 is not set
# CONFIG_FB_ASILIANT is not set
# CONFIG_FB_IMSTT is not set
# CONFIG_FB_VGA16 is not set
...
...
@@ -993,6 +1010,7 @@ CONFIG_USB_DEVICEFS=y
CONFIG_USB_EHCI_HCD=y
# CONFIG_USB_EHCI_SPLIT_ISO is not set
# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
# CONFIG_USB_EHCI_TT_NEWSCHED is not set
# CONFIG_USB_ISP116X_HCD is not set
CONFIG_USB_OHCI_HCD=y
# CONFIG_USB_OHCI_BIG_ENDIAN is not set
...
...
@@ -1083,10 +1101,12 @@ CONFIG_USB_MON=y
# CONFIG_USB_LEGOTOWER is not set
# CONFIG_USB_LCD is not set
# CONFIG_USB_LED is not set
# CONFIG_USB_CYPRESS_CY7C63 is not set
# CONFIG_USB_CYTHERM is not set
# CONFIG_USB_PHIDGETKIT is not set
# CONFIG_USB_PHIDGETSERVO is not set
# CONFIG_USB_IDMOUSE is not set
# CONFIG_USB_APPLEDISPLAY is not set
# CONFIG_USB_SISUSBVGA is not set
# CONFIG_USB_LD is not set
# CONFIG_USB_TEST is not set
...
...
@@ -1124,12 +1144,14 @@ CONFIG_USB_MON=y
CONFIG_INFINIBAND=m
CONFIG_INFINIBAND_USER_MAD=m
CONFIG_INFINIBAND_USER_ACCESS=m
CONFIG_INFINIBAND_ADDR_TRANS=y
CONFIG_INFINIBAND_MTHCA=m
CONFIG_INFINIBAND_MTHCA_DEBUG=y
CONFIG_INFINIBAND_IPOIB=m
CONFIG_INFINIBAND_IPOIB_DEBUG=y
# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
CONFIG_INFINIBAND_SRP=m
# CONFIG_INFINIBAND_ISER is not set
#
# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
...
...
@@ -1140,6 +1162,19 @@ CONFIG_INFINIBAND_SRP=m
#
# CONFIG_RTC_CLASS is not set
#
# DMA Engine support
#
# CONFIG_DMA_ENGINE is not set
#
# DMA Clients
#
#
# DMA Devices
#
#
# File systems
#
...
...
@@ -1169,15 +1204,16 @@ CONFIG_JFS_SECURITY=y
# CONFIG_JFS_STATISTICS is not set
CONFIG_FS_POSIX_ACL=y
CONFIG_XFS_FS=m
CONFIG_XFS_EXPORT=y
# CONFIG_XFS_QUOTA is not set
CONFIG_XFS_SECURITY=y
CONFIG_XFS_POSIX_ACL=y
# CONFIG_XFS_RT is not set
CONFIG_OCFS2_FS=m
CONFIG_OCFS2_DEBUG_MASKLOG=y
# CONFIG_MINIX_FS is not set
# CONFIG_ROMFS_FS is not set
CONFIG_INOTIFY=y
CONFIG_INOTIFY_USER=y
# CONFIG_QUOTA is not set
CONFIG_DNOTIFY=y
# CONFIG_AUTOFS_FS is not set
...
...
@@ -1259,8 +1295,10 @@ CONFIG_RPCSEC_GSS_SPKM3=m
# CONFIG_SMB_FS is not set
CONFIG_CIFS=m
# CONFIG_CIFS_STATS is not set
# CONFIG_CIFS_WEAK_PW_HASH is not set
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y
# CONFIG_CIFS_DEBUG2 is not set
# CONFIG_CIFS_EXPERIMENTAL is not set
# CONFIG_NCP_FS is not set
# CONFIG_CODA_FS is not set
...
...
@@ -1326,6 +1364,9 @@ CONFIG_CRC32=y
CONFIG_LIBCRC32C=m
CONFIG_ZLIB_INFLATE=y
CONFIG_ZLIB_DEFLATE=m
CONFIG_TEXTSEARCH=y
CONFIG_TEXTSEARCH_KMP=m
CONFIG_PLIST=y
#
# Instrumentation Support
...
...
@@ -1339,14 +1380,19 @@ CONFIG_KPROBES=y
#
# CONFIG_PRINTK_TIME is not set
CONFIG_MAGIC_SYSRQ=y
# CONFIG_UNUSED_SYMBOLS is not set
CONFIG_DEBUG_KERNEL=y
CONFIG_LOG_BUF_SHIFT=17
CONFIG_DETECT_SOFTLOCKUP=y
# CONFIG_SCHEDSTATS is not set
# CONFIG_DEBUG_SLAB is not set
# CONFIG_DEBUG_MUTEXES is not set
# CONFIG_DEBUG_RT_MUTEXES is not set
# CONFIG_RT_MUTEX_TESTER is not set
# CONFIG_DEBUG_SPINLOCK is not set
# CONFIG_DEBUG_MUTEXES is not set
# CONFIG_DEBUG_RWSEMS is not set
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
# CONFIG_DEBUG_KOBJECT is not set
# CONFIG_DEBUG_INFO is not set
CONFIG_DEBUG_FS=y
...
...
arch/powerpc/kernel/Makefile
View file @
ed0da6fc
...
...
@@ -67,9 +67,9 @@ pci64-$(CONFIG_PPC64) += pci_64.o pci_dn.o pci_iommu.o \
pci_direct_iommu.o iomap.o
pci32-$(CONFIG_PPC32)
:=
pci_32.o
obj-$(CONFIG_PCI)
+=
$
(
pci64-y
)
$
(
pci32-y
)
kexec-$(CONFIG_PPC64)
:=
machine_kexec_64.o
crash.o
kexec-$(CONFIG_PPC64)
:=
machine_kexec_64.o
kexec-$(CONFIG_PPC32)
:=
machine_kexec_32.o
obj-$(CONFIG_KEXEC)
+=
machine_kexec.o
$
(
kexec-y
)
obj-$(CONFIG_KEXEC)
+=
machine_kexec.o
crash.o
$
(
kexec-y
)
ifeq
($(CONFIG_PPC_ISERIES),y)
$(obj)/head_64.o
:
$(obj)/lparmap.s
...
...
arch/powerpc/kernel/cpu_setup_power4.S
View file @
ed0da6fc
...
...
@@ -76,6 +76,8 @@ _GLOBAL(__setup_cpu_ppc970)
mfspr
r0
,
SPRN_HID0
li
r11
,
5
/*
clear
DOZE
and
SLEEP
*/
rldimi
r0
,
r11
,
52
,
8
/*
set
NAP
and
DPM
*/
li
r11
,
0
rldimi
r0
,
r11
,
32
,
31
/*
clear
EN_ATTN
*/
mtspr
SPRN_HID0
,
r0
mfspr
r0
,
SPRN_HID0
mfspr
r0
,
SPRN_HID0
...
...
arch/powerpc/kernel/crash.c
View file @
ed0da6fc
...
...
@@ -44,6 +44,7 @@
/* This keeps a track of which one is crashing cpu. */
int
crashing_cpu
=
-
1
;
static
cpumask_t
cpus_in_crash
=
CPU_MASK_NONE
;
cpumask_t
cpus_in_sr
=
CPU_MASK_NONE
;
static
u32
*
append_elf_note
(
u32
*
buf
,
char
*
name
,
unsigned
type
,
void
*
data
,
size_t
data_len
)
...
...
@@ -139,7 +140,13 @@ void crash_ipi_callback(struct pt_regs *regs)
if
(
ppc_md
.
kexec_cpu_down
)
ppc_md
.
kexec_cpu_down
(
1
,
1
);
#ifdef CONFIG_PPC64
kexec_smp_wait
();
#else
for
(;;);
/* FIXME */
#endif
/* NOTREACHED */
}
...
...
@@ -255,7 +262,11 @@ static void crash_kexec_prepare_cpus(int cpu)
*
* do this if kexec in setup.c ?
*/
#ifdef CONFIG_PPC64
smp_release_cpus
();
#else
/* FIXME */
#endif
}
void
crash_kexec_secondary
(
struct
pt_regs
*
regs
)
...
...
arch/powerpc/kernel/irq.c
View file @
ed0da6fc
...
...
@@ -693,7 +693,7 @@ unsigned int irq_radix_revmap(struct irq_host *host,
/* If not there, try to insert it */
virq
=
irq_find_mapping
(
host
,
hwirq
);
if
(
virq
!=
NO_IRQ
)
radix_tree_insert
(
tree
,
v
irq
,
&
irq_map
[
virq
]);
radix_tree_insert
(
tree
,
hw
irq
,
&
irq_map
[
virq
]);
bail:
spin_unlock_irqrestore
(
&
irq_big_lock
,
flags
);
return
virq
;
...
...
arch/powerpc/kernel/kprobes.c
View file @
ed0da6fc
...
...
@@ -61,6 +61,8 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p)
if
(
!
ret
)
{
memcpy
(
p
->
ainsn
.
insn
,
p
->
addr
,
MAX_INSN_SIZE
*
sizeof
(
kprobe_opcode_t
));
p
->
opcode
=
*
p
->
addr
;
flush_icache_range
((
unsigned
long
)
p
->
ainsn
.
insn
,
(
unsigned
long
)
p
->
ainsn
.
insn
+
sizeof
(
kprobe_opcode_t
));
}
return
ret
;
...
...
arch/powerpc/kernel/machine_kexec.c
View file @
ed0da6fc
...
...
@@ -13,6 +13,7 @@
#include <linux/reboot.h>
#include <linux/threads.h>
#include <asm/machdep.h>
#include <asm/lmb.h>
void
machine_crash_shutdown
(
struct
pt_regs
*
regs
)
{
...
...
@@ -59,3 +60,58 @@ NORET_TYPE void machine_kexec(struct kimage *image)
}
for
(;;);
}
static
int
__init
early_parse_crashk
(
char
*
p
)
{
unsigned
long
size
;
if
(
!
p
)
return
1
;
size
=
memparse
(
p
,
&
p
);
if
(
*
p
==
'@'
)
crashk_res
.
start
=
memparse
(
p
+
1
,
&
p
);
else
crashk_res
.
start
=
KDUMP_KERNELBASE
;
crashk_res
.
end
=
crashk_res
.
start
+
size
-
1
;
return
0
;
}
early_param
(
"crashkernel"
,
early_parse_crashk
);
void
__init
reserve_crashkernel
(
void
)
{
unsigned
long
size
;
if
(
crashk_res
.
start
==
0
)
return
;
/* We might have got these values via the command line or the
* device tree, either way sanitise them now. */
size
=
crashk_res
.
end
-
crashk_res
.
start
+
1
;
if
(
crashk_res
.
start
!=
KDUMP_KERNELBASE
)
printk
(
"Crash kernel location must be 0x%x
\n
"
,
KDUMP_KERNELBASE
);
crashk_res
.
start
=
KDUMP_KERNELBASE
;
size
=
PAGE_ALIGN
(
size
);
crashk_res
.
end
=
crashk_res
.
start
+
size
-
1
;
/* Crash kernel trumps memory limit */
if
(
memory_limit
&&
memory_limit
<=
crashk_res
.
end
)
{
memory_limit
=
crashk_res
.
end
+
1
;
printk
(
"Adjusted memory limit for crashkernel, now 0x%lx
\n
"
,
memory_limit
);
}
lmb_reserve
(
crashk_res
.
start
,
size
);
}
int
overlaps_crashkernel
(
unsigned
long
start
,
unsigned
long
size
)
{
return
(
start
+
size
)
>
crashk_res
.
start
&&
start
<=
crashk_res
.
end
;
}
arch/powerpc/kernel/machine_kexec_64.c
View file @
ed0da6fc
...
...
@@ -10,7 +10,6 @@
*/
#include <linux/cpumask.h>
#include <linux/kexec.h>
#include <linux/smp.h>
#include <linux/thread_info.h>
...
...
@@ -21,7 +20,6 @@
#include <asm/machdep.h>
#include <asm/cacheflush.h>
#include <asm/paca.h>
#include <asm/lmb.h>
#include <asm/mmu.h>
#include <asm/sections.h>
/* _end */
#include <asm/prom.h>
...
...
@@ -385,58 +383,3 @@ static int __init kexec_setup(void)
return
0
;
}
__initcall
(
kexec_setup
);
static
int
__init
early_parse_crashk
(
char
*
p
)
{
unsigned
long
size
;
if
(
!
p
)
return
1
;
size
=
memparse
(
p
,
&
p
);
if
(
*
p
==
'@'
)
crashk_res
.
start
=
memparse
(
p
+
1
,
&
p
);
else
crashk_res
.
start
=
KDUMP_KERNELBASE
;
crashk_res
.
end
=
crashk_res
.
start
+
size
-
1
;
return
0
;
}
early_param
(
"crashkernel"
,
early_parse_crashk
);
void
__init
reserve_crashkernel
(
void
)
{
unsigned
long
size
;
if
(
crashk_res
.
start
==
0
)
return
;
/* We might have got these values via the command line or the
* device tree, either way sanitise them now. */
size
=
crashk_res
.
end
-
crashk_res
.
start
+
1
;
if
(
crashk_res
.
start
!=
KDUMP_KERNELBASE
)
printk
(
"Crash kernel location must be 0x%x
\n
"
,
KDUMP_KERNELBASE
);
crashk_res
.
start
=
KDUMP_KERNELBASE
;
size
=
PAGE_ALIGN
(
size
);
crashk_res
.
end
=
crashk_res
.
start
+
size
-
1
;
/* Crash kernel trumps memory limit */
if
(
memory_limit
&&
memory_limit
<=
crashk_res
.
end
)
{
memory_limit
=
crashk_res
.
end
+
1
;
printk
(
"Adjusted memory limit for crashkernel, now 0x%lx
\n
"
,
memory_limit
);
}
lmb_reserve
(
crashk_res
.
start
,
size
);
}
int
overlaps_crashkernel
(
unsigned
long
start
,
unsigned
long
size
)
{
return
(
start
+
size
)
>
crashk_res
.
start
&&
start
<=
crashk_res
.
end
;
}
arch/powerpc/kernel/rtas.c
View file @
ed0da6fc
...
...
@@ -569,6 +569,27 @@ int rtas_set_indicator(int indicator, int index, int new_value)
}
EXPORT_SYMBOL
(
rtas_set_indicator
);
/*
* Ignoring RTAS extended delay
*/
int
rtas_set_indicator_fast
(
int
indicator
,
int
index
,
int
new_value
)
{
int
rc
;
int
token
=
rtas_token
(
"set-indicator"
);
if
(
token
==
RTAS_UNKNOWN_SERVICE
)
return
-
ENOENT
;
rc
=
rtas_call
(
token
,
3
,
1
,
NULL
,
indicator
,
index
,
new_value
);
WARN_ON
(
rc
==
-
2
||
(
rc
>=
9900
&&
rc
<=
9905
));
if
(
rc
<
0
)
return
rtas_error_rc
(
rc
);
return
rc
;
}
void
rtas_restart
(
char
*
cmd
)
{
if
(
rtas_flash_term_hook
)
...
...
arch/powerpc/kernel/traps.c
View file @
ed0da6fc
...
...
@@ -55,9 +55,6 @@
#ifdef CONFIG_PPC64
/* XXX */
#define _IO_BASE pci_io_base
#ifdef CONFIG_KEXEC
cpumask_t
cpus_in_sr
=
CPU_MASK_NONE
;
#endif
#endif
#ifdef CONFIG_DEBUGGER
...
...
@@ -211,6 +208,19 @@ void system_reset_exception(struct pt_regs *regs)
die
(
"System Reset"
,
regs
,
SIGABRT
);
/*
* Some CPUs when released from the debugger will execute this path.
* These CPUs entered the debugger via a soft-reset. If the CPU was
* hung before entering the debugger it will return to the hung
* state when exiting this function. This causes a problem in
* kdump since the hung CPU(s) will not respond to the IPI sent
* from kdump. To prevent the problem we call crash_kexec_secondary()
* here. If a kdump had not been initiated or we exit the debugger
* with the "exit and recover" command (x) crash_kexec_secondary()
* will return after 5ms and the CPU returns to its previous state.
*/
crash_kexec_secondary
(
regs
);
/* Must die if the interrupt is not recoverable */
if
(
!
(
regs
->
msr
&
MSR_RI
))
panic
(
"Unrecoverable System Reset"
);
...
...
arch/powerpc/platforms/pseries/setup.c
View file @
ed0da6fc
...
...
@@ -213,8 +213,6 @@ static void pseries_lpar_enable_pmcs(void)
{
unsigned
long
set
,
reset
;
power4_enable_pmcs
();
set
=
1UL
<<
63
;
reset
=
0
;
plpar_hcall_norets
(
H_PERFMON
,
set
,
reset
);
...
...
arch/powerpc/platforms/pseries/xics.c
View file @
ed0da6fc
...
...
@@ -467,7 +467,7 @@ void xics_setup_cpu(void)
*
* XXX: undo of teardown on kexec needs this too, as may hotplug
*/
rtas_set_indicator
(
GLOBAL_INTERRUPT_QUEUE
,
rtas_set_indicator
_fast
(
GLOBAL_INTERRUPT_QUEUE
,
(
1UL
<<
interrupt_server_size
)
-
1
-
default_distrib_server
,
1
);
}
...
...
@@ -796,7 +796,7 @@ void xics_teardown_cpu(int secondary)
* so leave the master cpu in the group.
*/
if
(
secondary
)
rtas_set_indicator
(
GLOBAL_INTERRUPT_QUEUE
,
rtas_set_indicator
_fast
(
GLOBAL_INTERRUPT_QUEUE
,
(
1UL
<<
interrupt_server_size
)
-
1
-
default_distrib_server
,
0
);
}
...
...
@@ -813,7 +813,7 @@ void xics_migrate_irqs_away(void)
xics_set_cpu_priority
(
cpu
,
0
);
/* remove ourselves from the global interrupt queue */
status
=
rtas_set_indicator
(
GLOBAL_INTERRUPT_QUEUE
,
status
=
rtas_set_indicator
_fast
(
GLOBAL_INTERRUPT_QUEUE
,
(
1UL
<<
interrupt_server_size
)
-
1
-
default_distrib_server
,
0
);
WARN_ON
(
status
<
0
);
...
...
arch/powerpc/sysdev/fsl_soc.c
View file @
ed0da6fc
...
...
@@ -169,8 +169,16 @@ static int __init gfar_of_init(void)
goto
err
;
}
mac_addr
=
get_property
(
np
,
"address"
,
NULL
);
memcpy
(
gfar_data
.
mac_addr
,
mac_addr
,
6
);
mac_addr
=
get_property
(
np
,
"local-mac-address"
,
NULL
);
if
(
mac_addr
==
NULL
)
mac_addr
=
get_property
(
np
,
"mac-address"
,
NULL
);
if
(
mac_addr
==
NULL
)
{
/* Obsolete */
mac_addr
=
get_property
(
np
,
"address"
,
NULL
);
}
if
(
mac_addr
)
memcpy
(
gfar_data
.
mac_addr
,
mac_addr
,
6
);
if
(
model
&&
!
strcasecmp
(
model
,
"TSEC"
))
gfar_data
.
device_flags
=
...
...
include/asm-powerpc/kexec.h
View file @
ed0da6fc
...
...
@@ -32,6 +32,7 @@
#endif
#ifndef __ASSEMBLY__
#include <linux/cpumask.h>
#ifdef CONFIG_KEXEC
...
...
@@ -109,7 +110,6 @@ static inline void crash_setup_regs(struct pt_regs *newregs,
#define MAX_NOTE_BYTES 1024
#ifdef __powerpc64__
extern
void
kexec_smp_wait
(
void
);
/* get and clear naca physid, wait for
master to copy new code to 0 */
extern
int
crashing_cpu
;
...
...
@@ -119,7 +119,6 @@ static inline int kexec_sr_activated(int cpu)
{
return
cpu_isset
(
cpu
,
cpus_in_sr
);
}
#endif
/* __powerpc64 __ */
struct
kimage
;
struct
pt_regs
;
...
...
include/asm-powerpc/rtas.h
View file @
ed0da6fc
...
...
@@ -170,6 +170,7 @@ extern int rtas_get_sensor(int sensor, int index, int *state);
extern
int
rtas_get_power_level
(
int
powerdomain
,
int
*
level
);
extern
int
rtas_set_power_level
(
int
powerdomain
,
int
level
,
int
*
setlevel
);
extern
int
rtas_set_indicator
(
int
indicator
,
int
index
,
int
new_value
);
extern
int
rtas_set_indicator_fast
(
int
indicator
,
int
index
,
int
new_value
);
extern
void
rtas_progress
(
char
*
s
,
unsigned
short
hex
);
extern
void
rtas_initialize
(
void
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment