mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
Merge branch 'upstream-fixes' into upstream
This commit is contained in:
commit
23946a8a98
336 changed files with 3748 additions and 1986 deletions
5
.gitignore
vendored
5
.gitignore
vendored
|
@ -30,6 +30,11 @@ include/config
|
||||||
include/linux/autoconf.h
|
include/linux/autoconf.h
|
||||||
include/linux/compile.h
|
include/linux/compile.h
|
||||||
include/linux/version.h
|
include/linux/version.h
|
||||||
|
include/linux/utsrelease.h
|
||||||
|
|
||||||
# stgit generated dirs
|
# stgit generated dirs
|
||||||
patches-*
|
patches-*
|
||||||
|
|
||||||
|
# quilt's files
|
||||||
|
patches
|
||||||
|
series
|
||||||
|
|
|
@ -58,6 +58,9 @@
|
||||||
!Iinclude/linux/ktime.h
|
!Iinclude/linux/ktime.h
|
||||||
!Iinclude/linux/hrtimer.h
|
!Iinclude/linux/hrtimer.h
|
||||||
!Ekernel/hrtimer.c
|
!Ekernel/hrtimer.c
|
||||||
|
</sect1>
|
||||||
|
<sect1><title>Workqueues and Kevents</title>
|
||||||
|
!Ekernel/workqueue.c
|
||||||
</sect1>
|
</sect1>
|
||||||
<sect1><title>Internal Functions</title>
|
<sect1><title>Internal Functions</title>
|
||||||
!Ikernel/exit.c
|
!Ikernel/exit.c
|
||||||
|
@ -300,7 +303,7 @@ X!Ekernel/module.c
|
||||||
</sect1>
|
</sect1>
|
||||||
|
|
||||||
<sect1><title>Resources Management</title>
|
<sect1><title>Resources Management</title>
|
||||||
!Ekernel/resource.c
|
!Ikernel/resource.c
|
||||||
</sect1>
|
</sect1>
|
||||||
|
|
||||||
<sect1><title>MTRR Handling</title>
|
<sect1><title>MTRR Handling</title>
|
||||||
|
@ -312,9 +315,7 @@ X!Ekernel/module.c
|
||||||
!Edrivers/pci/pci-driver.c
|
!Edrivers/pci/pci-driver.c
|
||||||
!Edrivers/pci/remove.c
|
!Edrivers/pci/remove.c
|
||||||
!Edrivers/pci/pci-acpi.c
|
!Edrivers/pci/pci-acpi.c
|
||||||
<!-- kerneldoc does not understand __devinit
|
!Edrivers/pci/search.c
|
||||||
X!Edrivers/pci/search.c
|
|
||||||
-->
|
|
||||||
!Edrivers/pci/msi.c
|
!Edrivers/pci/msi.c
|
||||||
!Edrivers/pci/bus.c
|
!Edrivers/pci/bus.c
|
||||||
<!-- FIXME: Removed for now since no structured comments in source
|
<!-- FIXME: Removed for now since no structured comments in source
|
||||||
|
|
|
@ -10,7 +10,9 @@ kernel, the process can sometimes be daunting if you're not familiar
|
||||||
with "the system." This text is a collection of suggestions which
|
with "the system." This text is a collection of suggestions which
|
||||||
can greatly increase the chances of your change being accepted.
|
can greatly increase the chances of your change being accepted.
|
||||||
|
|
||||||
If you are submitting a driver, also read Documentation/SubmittingDrivers.
|
Read Documentation/SubmitChecklist for a list of items to check
|
||||||
|
before submitting code. If you are submitting a driver, also read
|
||||||
|
Documentation/SubmittingDrivers.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -74,9 +76,6 @@ There are a number of scripts which can aid in this:
|
||||||
Quilt:
|
Quilt:
|
||||||
http://savannah.nongnu.org/projects/quilt
|
http://savannah.nongnu.org/projects/quilt
|
||||||
|
|
||||||
Randy Dunlap's patch scripts:
|
|
||||||
http://www.xenotime.net/linux/scripts/patching-scripts-002.tar.gz
|
|
||||||
|
|
||||||
Andrew Morton's patch scripts:
|
Andrew Morton's patch scripts:
|
||||||
http://www.zip.com.au/~akpm/linux/patches/
|
http://www.zip.com.au/~akpm/linux/patches/
|
||||||
Instead of these scripts, quilt is the recommended patch management
|
Instead of these scripts, quilt is the recommended patch management
|
||||||
|
@ -484,7 +483,7 @@ Greg Kroah-Hartman "How to piss off a kernel subsystem maintainer".
|
||||||
<http://www.kroah.com/log/2005/10/19/>
|
<http://www.kroah.com/log/2005/10/19/>
|
||||||
<http://www.kroah.com/log/2006/01/11/>
|
<http://www.kroah.com/log/2006/01/11/>
|
||||||
|
|
||||||
NO!!!! No more huge patch bombs to linux-kernel@vger.kernel.org people!.
|
NO!!!! No more huge patch bombs to linux-kernel@vger.kernel.org people!
|
||||||
<http://marc.theaimsgroup.com/?l=linux-kernel&m=112112749912944&w=2>
|
<http://marc.theaimsgroup.com/?l=linux-kernel&m=112112749912944&w=2>
|
||||||
|
|
||||||
Kernel Documentation/CodingStyle
|
Kernel Documentation/CodingStyle
|
||||||
|
@ -493,4 +492,3 @@ Kernel Documentation/CodingStyle
|
||||||
Linus Torvald's mail on the canonical patch format:
|
Linus Torvald's mail on the canonical patch format:
|
||||||
<http://lkml.org/lkml/2005/4/7/183>
|
<http://lkml.org/lkml/2005/4/7/183>
|
||||||
--
|
--
|
||||||
Last updated on 17 Nov 2005.
|
|
||||||
|
|
|
@ -64,11 +64,13 @@ Compile the kernel with
|
||||||
CONFIG_TASK_DELAY_ACCT=y
|
CONFIG_TASK_DELAY_ACCT=y
|
||||||
CONFIG_TASKSTATS=y
|
CONFIG_TASKSTATS=y
|
||||||
|
|
||||||
Enable the accounting at boot time by adding
|
Delay accounting is enabled by default at boot up.
|
||||||
the following to the kernel boot options
|
To disable, add
|
||||||
delayacct
|
nodelayacct
|
||||||
|
to the kernel boot options. The rest of the instructions
|
||||||
|
below assume this has not been done.
|
||||||
|
|
||||||
and after the system has booted up, use a utility
|
After the system has booted up, use a utility
|
||||||
similar to getdelays.c to access the delays
|
similar to getdelays.c to access the delays
|
||||||
seen by a given task or a task group (tgid).
|
seen by a given task or a task group (tgid).
|
||||||
The utility also allows a given command to be
|
The utility also allows a given command to be
|
||||||
|
|
|
@ -251,16 +251,24 @@ A: This is what you would need in your kernel code to receive notifications.
|
||||||
return NOTIFY_OK;
|
return NOTIFY_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct notifier_block foobar_cpu_notifer =
|
static struct notifier_block __cpuinitdata foobar_cpu_notifer =
|
||||||
{
|
{
|
||||||
.notifier_call = foobar_cpu_callback,
|
.notifier_call = foobar_cpu_callback,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
You need to call register_cpu_notifier() from your init function.
|
||||||
|
Init functions could be of two types:
|
||||||
|
1. early init (init function called when only the boot processor is online).
|
||||||
|
2. late init (init function called _after_ all the CPUs are online).
|
||||||
|
|
||||||
In your init function,
|
For the first case, you should add the following to your init function
|
||||||
|
|
||||||
register_cpu_notifier(&foobar_cpu_notifier);
|
register_cpu_notifier(&foobar_cpu_notifier);
|
||||||
|
|
||||||
|
For the second case, you should add the following to your init function
|
||||||
|
|
||||||
|
register_hotcpu_notifier(&foobar_cpu_notifier);
|
||||||
|
|
||||||
You can fail PREPARE notifiers if something doesn't work to prepare resources.
|
You can fail PREPARE notifiers if something doesn't work to prepare resources.
|
||||||
This will stop the activity and send a following CANCELED event back.
|
This will stop the activity and send a following CANCELED event back.
|
||||||
|
|
||||||
|
|
|
@ -2565,10 +2565,10 @@ Your cooperation is appreciated.
|
||||||
243 = /dev/usb/dabusb3 Fourth dabusb device
|
243 = /dev/usb/dabusb3 Fourth dabusb device
|
||||||
|
|
||||||
180 block USB block devices
|
180 block USB block devices
|
||||||
0 = /dev/uba First USB block device
|
0 = /dev/uba First USB block device
|
||||||
8 = /dev/ubb Second USB block device
|
8 = /dev/ubb Second USB block device
|
||||||
16 = /dev/ubc Thrid USB block device
|
16 = /dev/ubc Third USB block device
|
||||||
...
|
...
|
||||||
|
|
||||||
181 char Conrad Electronic parallel port radio clocks
|
181 char Conrad Electronic parallel port radio clocks
|
||||||
0 = /dev/pcfclock0 First Conrad radio clock
|
0 = /dev/pcfclock0 First Conrad radio clock
|
||||||
|
|
|
@ -51,8 +51,6 @@ Debugging Information
|
||||||
|
|
||||||
References
|
References
|
||||||
|
|
||||||
IETF IP over InfiniBand (ipoib) Working Group
|
|
||||||
http://ietf.org/html.charters/ipoib-charter.html
|
|
||||||
Transmission of IP over InfiniBand (IPoIB) (RFC 4391)
|
Transmission of IP over InfiniBand (IPoIB) (RFC 4391)
|
||||||
http://ietf.org/rfc/rfc4391.txt
|
http://ietf.org/rfc/rfc4391.txt
|
||||||
IP over InfiniBand (IPoIB) Architecture (RFC 4392)
|
IP over InfiniBand (IPoIB) Architecture (RFC 4392)
|
||||||
|
|
|
@ -72,6 +72,22 @@ initrd adds the following new options:
|
||||||
initrd is mounted as root, and the normal boot procedure is followed,
|
initrd is mounted as root, and the normal boot procedure is followed,
|
||||||
with the RAM disk still mounted as root.
|
with the RAM disk still mounted as root.
|
||||||
|
|
||||||
|
Compressed cpio images
|
||||||
|
----------------------
|
||||||
|
|
||||||
|
Recent kernels have support for populating a ramdisk from a compressed cpio
|
||||||
|
archive, on such systems, the creation of a ramdisk image doesn't need to
|
||||||
|
involve special block devices or loopbacks, you merely create a directory on
|
||||||
|
disk with the desired initrd content, cd to that directory, and run (as an
|
||||||
|
example):
|
||||||
|
|
||||||
|
find . | cpio --quiet -c -o | gzip -9 -n > /boot/imagefile.img
|
||||||
|
|
||||||
|
Examining the contents of an existing image file is just as simple:
|
||||||
|
|
||||||
|
mkdir /tmp/imagefile
|
||||||
|
cd /tmp/imagefile
|
||||||
|
gzip -cd /boot/imagefile.img | cpio -imd --quiet
|
||||||
|
|
||||||
Installation
|
Installation
|
||||||
------------
|
------------
|
||||||
|
|
|
@ -407,6 +407,20 @@ more details, with real examples.
|
||||||
The second argument is optional, and if supplied will be used
|
The second argument is optional, and if supplied will be used
|
||||||
if first argument is not supported.
|
if first argument is not supported.
|
||||||
|
|
||||||
|
ld-option
|
||||||
|
ld-option is used to check if $(CC) when used to link object files
|
||||||
|
supports the given option. An optional second option may be
|
||||||
|
specified if first option are not supported.
|
||||||
|
|
||||||
|
Example:
|
||||||
|
#arch/i386/kernel/Makefile
|
||||||
|
vsyscall-flags += $(call ld-option, -Wl$(comma)--hash-style=sysv)
|
||||||
|
|
||||||
|
In the above example vsyscall-flags will be assigned the option
|
||||||
|
-Wl$(comma)--hash-style=sysv if it is supported by $(CC).
|
||||||
|
The second argument is optional, and if supplied will be used
|
||||||
|
if first argument is not supported.
|
||||||
|
|
||||||
cc-option
|
cc-option
|
||||||
cc-option is used to check if $(CC) support a given option, and not
|
cc-option is used to check if $(CC) support a given option, and not
|
||||||
supported to use an optional second option.
|
supported to use an optional second option.
|
||||||
|
|
|
@ -448,8 +448,6 @@ running once the system is up.
|
||||||
Format: <area>[,<node>]
|
Format: <area>[,<node>]
|
||||||
See also Documentation/networking/decnet.txt.
|
See also Documentation/networking/decnet.txt.
|
||||||
|
|
||||||
delayacct [KNL] Enable per-task delay accounting
|
|
||||||
|
|
||||||
dhash_entries= [KNL]
|
dhash_entries= [KNL]
|
||||||
Set number of hash buckets for dentry cache.
|
Set number of hash buckets for dentry cache.
|
||||||
|
|
||||||
|
@ -1031,6 +1029,8 @@ running once the system is up.
|
||||||
|
|
||||||
nocache [ARM]
|
nocache [ARM]
|
||||||
|
|
||||||
|
nodelayacct [KNL] Disable per-task delay accounting
|
||||||
|
|
||||||
nodisconnect [HW,SCSI,M68K] Disables SCSI disconnects.
|
nodisconnect [HW,SCSI,M68K] Disables SCSI disconnects.
|
||||||
|
|
||||||
noexec [IA-64]
|
noexec [IA-64]
|
||||||
|
|
|
@ -59,7 +59,7 @@ bind to an interface (or perhaps several) using an ioctl call. You
|
||||||
would issue more ioctls to the device to communicate to it using
|
would issue more ioctls to the device to communicate to it using
|
||||||
control, bulk, or other kinds of USB transfers. The IOCTLs are
|
control, bulk, or other kinds of USB transfers. The IOCTLs are
|
||||||
listed in the <linux/usbdevice_fs.h> file, and at this writing the
|
listed in the <linux/usbdevice_fs.h> file, and at this writing the
|
||||||
source code (linux/drivers/usb/devio.c) is the primary reference
|
source code (linux/drivers/usb/core/devio.c) is the primary reference
|
||||||
for how to access devices through those files.
|
for how to access devices through those files.
|
||||||
|
|
||||||
Note that since by default these BBB/DDD files are writable only by
|
Note that since by default these BBB/DDD files are writable only by
|
||||||
|
|
|
@ -5,8 +5,7 @@ For USB help other than the readme files that are located in
|
||||||
Documentation/usb/*, see the following:
|
Documentation/usb/*, see the following:
|
||||||
|
|
||||||
Linux-USB project: http://www.linux-usb.org
|
Linux-USB project: http://www.linux-usb.org
|
||||||
mirrors at http://www.suse.cz/development/linux-usb/
|
mirrors at http://usb.in.tum.de/linux-usb/
|
||||||
and http://usb.in.tum.de/linux-usb/
|
|
||||||
and http://it.linux-usb.org
|
and http://it.linux-usb.org
|
||||||
Linux USB Guide: http://linux-usb.sourceforge.net
|
Linux USB Guide: http://linux-usb.sourceforge.net
|
||||||
Linux-USB device overview (working devices and drivers):
|
Linux-USB device overview (working devices and drivers):
|
||||||
|
|
15
MAINTAINERS
15
MAINTAINERS
|
@ -968,6 +968,10 @@ P: Andrey V. Savochkin
|
||||||
M: saw@saw.sw.com.sg
|
M: saw@saw.sw.com.sg
|
||||||
S: Maintained
|
S: Maintained
|
||||||
|
|
||||||
|
EFS FILESYSTEM
|
||||||
|
W: http://aeschi.ch.eu.org/efs/
|
||||||
|
S: Orphan
|
||||||
|
|
||||||
EMU10K1 SOUND DRIVER
|
EMU10K1 SOUND DRIVER
|
||||||
P: James Courtier-Dutton
|
P: James Courtier-Dutton
|
||||||
M: James@superbug.demon.co.uk
|
M: James@superbug.demon.co.uk
|
||||||
|
@ -1598,7 +1602,7 @@ W: http://jfs.sourceforge.net/
|
||||||
T: git kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git
|
T: git kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git
|
||||||
S: Supported
|
S: Supported
|
||||||
|
|
||||||
JOURNALLING LAYER FOR BLOCK DEVICS (JBD)
|
JOURNALLING LAYER FOR BLOCK DEVICES (JBD)
|
||||||
P: Stephen Tweedie, Andrew Morton
|
P: Stephen Tweedie, Andrew Morton
|
||||||
M: sct@redhat.com, akpm@osdl.org
|
M: sct@redhat.com, akpm@osdl.org
|
||||||
L: ext2-devel@lists.sourceforge.net
|
L: ext2-devel@lists.sourceforge.net
|
||||||
|
@ -1642,9 +1646,8 @@ S: Maintained
|
||||||
|
|
||||||
KERNEL JANITORS
|
KERNEL JANITORS
|
||||||
P: Several
|
P: Several
|
||||||
L: kernel-janitors@osdl.org
|
L: kernel-janitors@lists.osdl.org
|
||||||
W: http://www.kerneljanitors.org/
|
W: http://www.kerneljanitors.org/
|
||||||
W: http://sf.net/projects/kernel-janitor/
|
|
||||||
S: Maintained
|
S: Maintained
|
||||||
|
|
||||||
KERNEL NFSD
|
KERNEL NFSD
|
||||||
|
@ -1882,6 +1885,12 @@ S: linux-scsi@vger.kernel.org
|
||||||
W: http://megaraid.lsilogic.com
|
W: http://megaraid.lsilogic.com
|
||||||
S: Maintained
|
S: Maintained
|
||||||
|
|
||||||
|
MEMORY MANAGEMENT
|
||||||
|
L: linux-mm@kvack.org
|
||||||
|
L: linux-kernel@vger.kernel.org
|
||||||
|
W: http://www.linux-mm.org
|
||||||
|
S: Maintained
|
||||||
|
|
||||||
MEMORY TECHNOLOGY DEVICES (MTD)
|
MEMORY TECHNOLOGY DEVICES (MTD)
|
||||||
P: David Woodhouse
|
P: David Woodhouse
|
||||||
M: dwmw2@infradead.org
|
M: dwmw2@infradead.org
|
||||||
|
|
7
Makefile
7
Makefile
|
@ -1,7 +1,7 @@
|
||||||
VERSION = 2
|
VERSION = 2
|
||||||
PATCHLEVEL = 6
|
PATCHLEVEL = 6
|
||||||
SUBLEVEL = 18
|
SUBLEVEL = 18
|
||||||
EXTRAVERSION = -rc2
|
EXTRAVERSION = -rc3
|
||||||
NAME=Crazed Snow-Weasel
|
NAME=Crazed Snow-Weasel
|
||||||
|
|
||||||
# *DOCUMENTATION*
|
# *DOCUMENTATION*
|
||||||
|
@ -310,8 +310,8 @@ CPPFLAGS := -D__KERNEL__ $(LINUXINCLUDE)
|
||||||
CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
|
CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
|
||||||
-fno-strict-aliasing -fno-common
|
-fno-strict-aliasing -fno-common
|
||||||
# Force gcc to behave correct even for buggy distributions
|
# Force gcc to behave correct even for buggy distributions
|
||||||
CFLAGS += $(call cc-option, -fno-stack-protector-all \
|
CFLAGS += $(call cc-option, -fno-stack-protector)
|
||||||
-fno-stack-protector)
|
|
||||||
AFLAGS := -D__ASSEMBLY__
|
AFLAGS := -D__ASSEMBLY__
|
||||||
|
|
||||||
# Read KERNELRELEASE from include/config/kernel.release (if it exists)
|
# Read KERNELRELEASE from include/config/kernel.release (if it exists)
|
||||||
|
@ -368,6 +368,7 @@ endif
|
||||||
|
|
||||||
no-dot-config-targets := clean mrproper distclean \
|
no-dot-config-targets := clean mrproper distclean \
|
||||||
cscope TAGS tags help %docs check% \
|
cscope TAGS tags help %docs check% \
|
||||||
|
include/linux/version.h headers_% \
|
||||||
kernelrelease kernelversion
|
kernelrelease kernelversion
|
||||||
|
|
||||||
config-targets := 0
|
config-targets := 0
|
||||||
|
|
|
@ -279,11 +279,9 @@ ev7_register_error_handlers(void)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
for(i = 0;
|
for (i = 0; i < ARRAY_SIZE(el_ev7_pal_annotations); i++)
|
||||||
i<sizeof(el_ev7_pal_annotations)/sizeof(el_ev7_pal_annotations[1]);
|
|
||||||
i++) {
|
|
||||||
cdl_register_subpacket_annotation(&el_ev7_pal_annotations[i]);
|
cdl_register_subpacket_annotation(&el_ev7_pal_annotations[i]);
|
||||||
}
|
|
||||||
cdl_register_subpacket_handler(&ev7_pal_subpacket_handler);
|
cdl_register_subpacket_handler(&ev7_pal_subpacket_handler);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -623,7 +623,7 @@ osf_sysinfo(int command, char __user *buf, long count)
|
||||||
long len, err = -EINVAL;
|
long len, err = -EINVAL;
|
||||||
|
|
||||||
offset = command-1;
|
offset = command-1;
|
||||||
if (offset >= sizeof(sysinfo_table)/sizeof(char *)) {
|
if (offset >= ARRAY_SIZE(sysinfo_table)) {
|
||||||
/* Digital UNIX has a few unpublished interfaces here */
|
/* Digital UNIX has a few unpublished interfaces here */
|
||||||
printk("sysinfo(%d)", command);
|
printk("sysinfo(%d)", command);
|
||||||
goto out;
|
goto out;
|
||||||
|
|
|
@ -114,8 +114,6 @@ struct alpha_machine_vector alpha_mv;
|
||||||
int alpha_using_srm;
|
int alpha_using_srm;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define N(a) (sizeof(a)/sizeof(a[0]))
|
|
||||||
|
|
||||||
static struct alpha_machine_vector *get_sysvec(unsigned long, unsigned long,
|
static struct alpha_machine_vector *get_sysvec(unsigned long, unsigned long,
|
||||||
unsigned long);
|
unsigned long);
|
||||||
static struct alpha_machine_vector *get_sysvec_byname(const char *);
|
static struct alpha_machine_vector *get_sysvec_byname(const char *);
|
||||||
|
@ -240,7 +238,7 @@ reserve_std_resources(void)
|
||||||
standard_io_resources[0].start = RTC_PORT(0);
|
standard_io_resources[0].start = RTC_PORT(0);
|
||||||
standard_io_resources[0].end = RTC_PORT(0) + 0x10;
|
standard_io_resources[0].end = RTC_PORT(0) + 0x10;
|
||||||
|
|
||||||
for (i = 0; i < N(standard_io_resources); ++i)
|
for (i = 0; i < ARRAY_SIZE(standard_io_resources); ++i)
|
||||||
request_resource(io, standard_io_resources+i);
|
request_resource(io, standard_io_resources+i);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -918,13 +916,13 @@ get_sysvec(unsigned long type, unsigned long variation, unsigned long cpu)
|
||||||
|
|
||||||
/* Search the system tables first... */
|
/* Search the system tables first... */
|
||||||
vec = NULL;
|
vec = NULL;
|
||||||
if (type < N(systype_vecs)) {
|
if (type < ARRAY_SIZE(systype_vecs)) {
|
||||||
vec = systype_vecs[type];
|
vec = systype_vecs[type];
|
||||||
} else if ((type > ST_API_BIAS) &&
|
} else if ((type > ST_API_BIAS) &&
|
||||||
(type - ST_API_BIAS) < N(api_vecs)) {
|
(type - ST_API_BIAS) < ARRAY_SIZE(api_vecs)) {
|
||||||
vec = api_vecs[type - ST_API_BIAS];
|
vec = api_vecs[type - ST_API_BIAS];
|
||||||
} else if ((type > ST_UNOFFICIAL_BIAS) &&
|
} else if ((type > ST_UNOFFICIAL_BIAS) &&
|
||||||
(type - ST_UNOFFICIAL_BIAS) < N(unofficial_vecs)) {
|
(type - ST_UNOFFICIAL_BIAS) < ARRAY_SIZE(unofficial_vecs)) {
|
||||||
vec = unofficial_vecs[type - ST_UNOFFICIAL_BIAS];
|
vec = unofficial_vecs[type - ST_UNOFFICIAL_BIAS];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -938,11 +936,11 @@ get_sysvec(unsigned long type, unsigned long variation, unsigned long cpu)
|
||||||
|
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case ST_DEC_ALCOR:
|
case ST_DEC_ALCOR:
|
||||||
if (member < N(alcor_indices))
|
if (member < ARRAY_SIZE(alcor_indices))
|
||||||
vec = alcor_vecs[alcor_indices[member]];
|
vec = alcor_vecs[alcor_indices[member]];
|
||||||
break;
|
break;
|
||||||
case ST_DEC_EB164:
|
case ST_DEC_EB164:
|
||||||
if (member < N(eb164_indices))
|
if (member < ARRAY_SIZE(eb164_indices))
|
||||||
vec = eb164_vecs[eb164_indices[member]];
|
vec = eb164_vecs[eb164_indices[member]];
|
||||||
/* PC164 may show as EB164 variation with EV56 CPU,
|
/* PC164 may show as EB164 variation with EV56 CPU,
|
||||||
but, since no true EB164 had anything but EV5... */
|
but, since no true EB164 had anything but EV5... */
|
||||||
|
@ -950,24 +948,24 @@ get_sysvec(unsigned long type, unsigned long variation, unsigned long cpu)
|
||||||
vec = &pc164_mv;
|
vec = &pc164_mv;
|
||||||
break;
|
break;
|
||||||
case ST_DEC_EB64P:
|
case ST_DEC_EB64P:
|
||||||
if (member < N(eb64p_indices))
|
if (member < ARRAY_SIZE(eb64p_indices))
|
||||||
vec = eb64p_vecs[eb64p_indices[member]];
|
vec = eb64p_vecs[eb64p_indices[member]];
|
||||||
break;
|
break;
|
||||||
case ST_DEC_EB66:
|
case ST_DEC_EB66:
|
||||||
if (member < N(eb66_indices))
|
if (member < ARRAY_SIZE(eb66_indices))
|
||||||
vec = eb66_vecs[eb66_indices[member]];
|
vec = eb66_vecs[eb66_indices[member]];
|
||||||
break;
|
break;
|
||||||
case ST_DEC_MARVEL:
|
case ST_DEC_MARVEL:
|
||||||
if (member < N(marvel_indices))
|
if (member < ARRAY_SIZE(marvel_indices))
|
||||||
vec = marvel_vecs[marvel_indices[member]];
|
vec = marvel_vecs[marvel_indices[member]];
|
||||||
break;
|
break;
|
||||||
case ST_DEC_TITAN:
|
case ST_DEC_TITAN:
|
||||||
vec = titan_vecs[0]; /* default */
|
vec = titan_vecs[0]; /* default */
|
||||||
if (member < N(titan_indices))
|
if (member < ARRAY_SIZE(titan_indices))
|
||||||
vec = titan_vecs[titan_indices[member]];
|
vec = titan_vecs[titan_indices[member]];
|
||||||
break;
|
break;
|
||||||
case ST_DEC_TSUNAMI:
|
case ST_DEC_TSUNAMI:
|
||||||
if (member < N(tsunami_indices))
|
if (member < ARRAY_SIZE(tsunami_indices))
|
||||||
vec = tsunami_vecs[tsunami_indices[member]];
|
vec = tsunami_vecs[tsunami_indices[member]];
|
||||||
break;
|
break;
|
||||||
case ST_DEC_1000:
|
case ST_DEC_1000:
|
||||||
|
@ -1039,7 +1037,7 @@ get_sysvec_byname(const char *name)
|
||||||
|
|
||||||
size_t i;
|
size_t i;
|
||||||
|
|
||||||
for (i = 0; i < N(all_vecs); ++i) {
|
for (i = 0; i < ARRAY_SIZE(all_vecs); ++i) {
|
||||||
struct alpha_machine_vector *mv = all_vecs[i];
|
struct alpha_machine_vector *mv = all_vecs[i];
|
||||||
if (strcasecmp(mv->vector_name, name) == 0)
|
if (strcasecmp(mv->vector_name, name) == 0)
|
||||||
return mv;
|
return mv;
|
||||||
|
@ -1055,13 +1053,13 @@ get_sysnames(unsigned long type, unsigned long variation, unsigned long cpu,
|
||||||
|
|
||||||
/* If not in the tables, make it UNKNOWN,
|
/* If not in the tables, make it UNKNOWN,
|
||||||
else set type name to family */
|
else set type name to family */
|
||||||
if (type < N(systype_names)) {
|
if (type < ARRAY_SIZE(systype_names)) {
|
||||||
*type_name = systype_names[type];
|
*type_name = systype_names[type];
|
||||||
} else if ((type > ST_API_BIAS) &&
|
} else if ((type > ST_API_BIAS) &&
|
||||||
(type - ST_API_BIAS) < N(api_names)) {
|
(type - ST_API_BIAS) < ARRAY_SIZE(api_names)) {
|
||||||
*type_name = api_names[type - ST_API_BIAS];
|
*type_name = api_names[type - ST_API_BIAS];
|
||||||
} else if ((type > ST_UNOFFICIAL_BIAS) &&
|
} else if ((type > ST_UNOFFICIAL_BIAS) &&
|
||||||
(type - ST_UNOFFICIAL_BIAS) < N(unofficial_names)) {
|
(type - ST_UNOFFICIAL_BIAS) < ARRAY_SIZE(unofficial_names)) {
|
||||||
*type_name = unofficial_names[type - ST_UNOFFICIAL_BIAS];
|
*type_name = unofficial_names[type - ST_UNOFFICIAL_BIAS];
|
||||||
} else {
|
} else {
|
||||||
*type_name = sys_unknown;
|
*type_name = sys_unknown;
|
||||||
|
@ -1083,7 +1081,7 @@ get_sysnames(unsigned long type, unsigned long variation, unsigned long cpu,
|
||||||
default: /* default to variation "0" for now */
|
default: /* default to variation "0" for now */
|
||||||
break;
|
break;
|
||||||
case ST_DEC_EB164:
|
case ST_DEC_EB164:
|
||||||
if (member < N(eb164_indices))
|
if (member < ARRAY_SIZE(eb164_indices))
|
||||||
*variation_name = eb164_names[eb164_indices[member]];
|
*variation_name = eb164_names[eb164_indices[member]];
|
||||||
/* PC164 may show as EB164 variation, but with EV56 CPU,
|
/* PC164 may show as EB164 variation, but with EV56 CPU,
|
||||||
so, since no true EB164 had anything but EV5... */
|
so, since no true EB164 had anything but EV5... */
|
||||||
|
@ -1091,32 +1089,32 @@ get_sysnames(unsigned long type, unsigned long variation, unsigned long cpu,
|
||||||
*variation_name = eb164_names[1]; /* make it PC164 */
|
*variation_name = eb164_names[1]; /* make it PC164 */
|
||||||
break;
|
break;
|
||||||
case ST_DEC_ALCOR:
|
case ST_DEC_ALCOR:
|
||||||
if (member < N(alcor_indices))
|
if (member < ARRAY_SIZE(alcor_indices))
|
||||||
*variation_name = alcor_names[alcor_indices[member]];
|
*variation_name = alcor_names[alcor_indices[member]];
|
||||||
break;
|
break;
|
||||||
case ST_DEC_EB64P:
|
case ST_DEC_EB64P:
|
||||||
if (member < N(eb64p_indices))
|
if (member < ARRAY_SIZE(eb64p_indices))
|
||||||
*variation_name = eb64p_names[eb64p_indices[member]];
|
*variation_name = eb64p_names[eb64p_indices[member]];
|
||||||
break;
|
break;
|
||||||
case ST_DEC_EB66:
|
case ST_DEC_EB66:
|
||||||
if (member < N(eb66_indices))
|
if (member < ARRAY_SIZE(eb66_indices))
|
||||||
*variation_name = eb66_names[eb66_indices[member]];
|
*variation_name = eb66_names[eb66_indices[member]];
|
||||||
break;
|
break;
|
||||||
case ST_DEC_MARVEL:
|
case ST_DEC_MARVEL:
|
||||||
if (member < N(marvel_indices))
|
if (member < ARRAY_SIZE(marvel_indices))
|
||||||
*variation_name = marvel_names[marvel_indices[member]];
|
*variation_name = marvel_names[marvel_indices[member]];
|
||||||
break;
|
break;
|
||||||
case ST_DEC_RAWHIDE:
|
case ST_DEC_RAWHIDE:
|
||||||
if (member < N(rawhide_indices))
|
if (member < ARRAY_SIZE(rawhide_indices))
|
||||||
*variation_name = rawhide_names[rawhide_indices[member]];
|
*variation_name = rawhide_names[rawhide_indices[member]];
|
||||||
break;
|
break;
|
||||||
case ST_DEC_TITAN:
|
case ST_DEC_TITAN:
|
||||||
*variation_name = titan_names[0]; /* default */
|
*variation_name = titan_names[0]; /* default */
|
||||||
if (member < N(titan_indices))
|
if (member < ARRAY_SIZE(titan_indices))
|
||||||
*variation_name = titan_names[titan_indices[member]];
|
*variation_name = titan_names[titan_indices[member]];
|
||||||
break;
|
break;
|
||||||
case ST_DEC_TSUNAMI:
|
case ST_DEC_TSUNAMI:
|
||||||
if (member < N(tsunami_indices))
|
if (member < ARRAY_SIZE(tsunami_indices))
|
||||||
*variation_name = tsunami_names[tsunami_indices[member]];
|
*variation_name = tsunami_names[tsunami_indices[member]];
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -1211,7 +1209,7 @@ show_cpuinfo(struct seq_file *f, void *slot)
|
||||||
|
|
||||||
cpu_index = (unsigned) (cpu->type - 1);
|
cpu_index = (unsigned) (cpu->type - 1);
|
||||||
cpu_name = "Unknown";
|
cpu_name = "Unknown";
|
||||||
if (cpu_index < N(cpu_names))
|
if (cpu_index < ARRAY_SIZE(cpu_names))
|
||||||
cpu_name = cpu_names[cpu_index];
|
cpu_name = cpu_names[cpu_index];
|
||||||
|
|
||||||
get_sysnames(hwrpb->sys_type, hwrpb->sys_variation,
|
get_sysnames(hwrpb->sys_type, hwrpb->sys_variation,
|
||||||
|
|
|
@ -203,7 +203,7 @@ ruffian_get_bank_size(unsigned long offset)
|
||||||
};
|
};
|
||||||
|
|
||||||
bank = (bank & 0x1e) >> 1;
|
bank = (bank & 0x1e) >> 1;
|
||||||
if (bank < sizeof(size)/sizeof(*size))
|
if (bank < ARRAY_SIZE(size))
|
||||||
ret = size[bank];
|
ret = size[bank];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -233,7 +233,7 @@ validate_cc_value(unsigned long cc)
|
||||||
index = cpu->type & 0xffffffff;
|
index = cpu->type & 0xffffffff;
|
||||||
|
|
||||||
/* If index out of bounds, no way to validate. */
|
/* If index out of bounds, no way to validate. */
|
||||||
if (index >= sizeof(cpu_hz)/sizeof(cpu_hz[0]))
|
if (index >= ARRAY_SIZE(cpu_hz))
|
||||||
return cc;
|
return cc;
|
||||||
|
|
||||||
/* If index contains no data, no way to validate. */
|
/* If index contains no data, no way to validate. */
|
||||||
|
|
|
@ -95,7 +95,8 @@ static void gic_set_cpu(unsigned int irq, cpumask_t mask_val)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static struct irqchip gic_chip = {
|
static struct irq_chip gic_chip = {
|
||||||
|
.name = "GIC",
|
||||||
.ack = gic_ack_irq,
|
.ack = gic_ack_irq,
|
||||||
.mask = gic_mask_irq,
|
.mask = gic_mask_irq,
|
||||||
.unmask = gic_unmask_irq,
|
.unmask = gic_unmask_irq,
|
||||||
|
|
|
@ -204,7 +204,8 @@ static void locomo_unmask_irq(unsigned int irq)
|
||||||
locomo_writel(r, mapbase + LOCOMO_ICR);
|
locomo_writel(r, mapbase + LOCOMO_ICR);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct irqchip locomo_chip = {
|
static struct irq_chip locomo_chip = {
|
||||||
|
.name = "LOCOMO",
|
||||||
.ack = locomo_ack_irq,
|
.ack = locomo_ack_irq,
|
||||||
.mask = locomo_mask_irq,
|
.mask = locomo_mask_irq,
|
||||||
.unmask = locomo_unmask_irq,
|
.unmask = locomo_unmask_irq,
|
||||||
|
@ -249,7 +250,8 @@ static void locomo_key_unmask_irq(unsigned int irq)
|
||||||
locomo_writel(r, mapbase + LOCOMO_KEYBOARD + LOCOMO_KIC);
|
locomo_writel(r, mapbase + LOCOMO_KEYBOARD + LOCOMO_KIC);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct irqchip locomo_key_chip = {
|
static struct irq_chip locomo_key_chip = {
|
||||||
|
.name = "LOCOMO-key",
|
||||||
.ack = locomo_key_ack_irq,
|
.ack = locomo_key_ack_irq,
|
||||||
.mask = locomo_key_mask_irq,
|
.mask = locomo_key_mask_irq,
|
||||||
.unmask = locomo_key_unmask_irq,
|
.unmask = locomo_key_unmask_irq,
|
||||||
|
@ -312,7 +314,8 @@ static void locomo_gpio_unmask_irq(unsigned int irq)
|
||||||
locomo_writel(r, mapbase + LOCOMO_GIE);
|
locomo_writel(r, mapbase + LOCOMO_GIE);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct irqchip locomo_gpio_chip = {
|
static struct irq_chip locomo_gpio_chip = {
|
||||||
|
.name = "LOCOMO-gpio",
|
||||||
.ack = locomo_gpio_ack_irq,
|
.ack = locomo_gpio_ack_irq,
|
||||||
.mask = locomo_gpio_mask_irq,
|
.mask = locomo_gpio_mask_irq,
|
||||||
.unmask = locomo_gpio_unmask_irq,
|
.unmask = locomo_gpio_unmask_irq,
|
||||||
|
@ -357,7 +360,8 @@ static void locomo_lt_unmask_irq(unsigned int irq)
|
||||||
locomo_writel(r, mapbase + LOCOMO_LTINT);
|
locomo_writel(r, mapbase + LOCOMO_LTINT);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct irqchip locomo_lt_chip = {
|
static struct irq_chip locomo_lt_chip = {
|
||||||
|
.name = "LOCOMO-lt",
|
||||||
.ack = locomo_lt_ack_irq,
|
.ack = locomo_lt_ack_irq,
|
||||||
.mask = locomo_lt_mask_irq,
|
.mask = locomo_lt_mask_irq,
|
||||||
.unmask = locomo_lt_unmask_irq,
|
.unmask = locomo_lt_unmask_irq,
|
||||||
|
@ -418,7 +422,8 @@ static void locomo_spi_unmask_irq(unsigned int irq)
|
||||||
locomo_writel(r, mapbase + LOCOMO_SPIIE);
|
locomo_writel(r, mapbase + LOCOMO_SPIIE);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct irqchip locomo_spi_chip = {
|
static struct irq_chip locomo_spi_chip = {
|
||||||
|
.name = "LOCOMO-spi",
|
||||||
.ack = locomo_spi_ack_irq,
|
.ack = locomo_spi_ack_irq,
|
||||||
.mask = locomo_spi_mask_irq,
|
.mask = locomo_spi_mask_irq,
|
||||||
.unmask = locomo_spi_unmask_irq,
|
.unmask = locomo_spi_unmask_irq,
|
||||||
|
|
|
@ -272,7 +272,8 @@ static int sa1111_wake_lowirq(unsigned int irq, unsigned int on)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct irqchip sa1111_low_chip = {
|
static struct irq_chip sa1111_low_chip = {
|
||||||
|
.name = "SA1111-l",
|
||||||
.ack = sa1111_ack_irq,
|
.ack = sa1111_ack_irq,
|
||||||
.mask = sa1111_mask_lowirq,
|
.mask = sa1111_mask_lowirq,
|
||||||
.unmask = sa1111_unmask_lowirq,
|
.unmask = sa1111_unmask_lowirq,
|
||||||
|
@ -368,7 +369,8 @@ static int sa1111_wake_highirq(unsigned int irq, unsigned int on)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct irqchip sa1111_high_chip = {
|
static struct irq_chip sa1111_high_chip = {
|
||||||
|
.name = "SA1111-h",
|
||||||
.ack = sa1111_ack_irq,
|
.ack = sa1111_ack_irq,
|
||||||
.mask = sa1111_mask_highirq,
|
.mask = sa1111_mask_highirq,
|
||||||
.unmask = sa1111_unmask_highirq,
|
.unmask = sa1111_unmask_highirq,
|
||||||
|
|
|
@ -39,7 +39,8 @@ static void vic_unmask_irq(unsigned int irq)
|
||||||
writel(1 << irq, base + VIC_INT_ENABLE);
|
writel(1 << irq, base + VIC_INT_ENABLE);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct irqchip vic_chip = {
|
static struct irq_chip vic_chip = {
|
||||||
|
.name = "VIC",
|
||||||
.ack = vic_mask_irq,
|
.ack = vic_mask_irq,
|
||||||
.mask = vic_mask_irq,
|
.mask = vic_mask_irq,
|
||||||
.unmask = vic_unmask_irq,
|
.unmask = vic_unmask_irq,
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#
|
#
|
||||||
# Automatically generated make config: don't edit
|
# Automatically generated make config: don't edit
|
||||||
# Linux kernel version: 2.6.18-rc1
|
# Linux kernel version: 2.6.18-rc1-git9
|
||||||
# Sun Jul 9 15:21:30 2006
|
# Sat Jul 15 15:08:10 2006
|
||||||
#
|
#
|
||||||
CONFIG_ARM=y
|
CONFIG_ARM=y
|
||||||
CONFIG_MMU=y
|
CONFIG_MMU=y
|
||||||
|
@ -30,6 +30,7 @@ CONFIG_SWAP=y
|
||||||
CONFIG_SYSVIPC=y
|
CONFIG_SYSVIPC=y
|
||||||
# CONFIG_POSIX_MQUEUE is not set
|
# CONFIG_POSIX_MQUEUE is not set
|
||||||
# CONFIG_BSD_PROCESS_ACCT is not set
|
# CONFIG_BSD_PROCESS_ACCT is not set
|
||||||
|
# CONFIG_TASKSTATS is not set
|
||||||
CONFIG_SYSCTL=y
|
CONFIG_SYSCTL=y
|
||||||
# CONFIG_AUDIT is not set
|
# CONFIG_AUDIT is not set
|
||||||
CONFIG_IKCONFIG=y
|
CONFIG_IKCONFIG=y
|
||||||
|
@ -749,7 +750,7 @@ CONFIG_VIDEO_V4L2=y
|
||||||
# USB support
|
# USB support
|
||||||
#
|
#
|
||||||
CONFIG_USB_ARCH_HAS_HCD=y
|
CONFIG_USB_ARCH_HAS_HCD=y
|
||||||
# CONFIG_USB_ARCH_HAS_OHCI is not set
|
CONFIG_USB_ARCH_HAS_OHCI=y
|
||||||
# CONFIG_USB_ARCH_HAS_EHCI is not set
|
# CONFIG_USB_ARCH_HAS_EHCI is not set
|
||||||
CONFIG_USB=y
|
CONFIG_USB=y
|
||||||
CONFIG_USB_DEBUG=y
|
CONFIG_USB_DEBUG=y
|
||||||
|
@ -766,6 +767,9 @@ CONFIG_USB_DYNAMIC_MINORS=y
|
||||||
# USB Host Controller Drivers
|
# USB Host Controller Drivers
|
||||||
#
|
#
|
||||||
# CONFIG_USB_ISP116X_HCD is not set
|
# CONFIG_USB_ISP116X_HCD is not set
|
||||||
|
CONFIG_USB_OHCI_HCD=y
|
||||||
|
# CONFIG_USB_OHCI_BIG_ENDIAN is not set
|
||||||
|
CONFIG_USB_OHCI_LITTLE_ENDIAN=y
|
||||||
# CONFIG_USB_SL811_HCD is not set
|
# CONFIG_USB_SL811_HCD is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
|
@ -855,6 +859,7 @@ CONFIG_USB_SERIAL_CONSOLE=y
|
||||||
CONFIG_USB_SERIAL_PL2303=y
|
CONFIG_USB_SERIAL_PL2303=y
|
||||||
# CONFIG_USB_SERIAL_HP4X is not set
|
# CONFIG_USB_SERIAL_HP4X is not set
|
||||||
# CONFIG_USB_SERIAL_SAFE is not set
|
# CONFIG_USB_SERIAL_SAFE is not set
|
||||||
|
# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
|
||||||
# CONFIG_USB_SERIAL_TI is not set
|
# CONFIG_USB_SERIAL_TI is not set
|
||||||
# CONFIG_USB_SERIAL_CYBERJACK is not set
|
# CONFIG_USB_SERIAL_CYBERJACK is not set
|
||||||
# CONFIG_USB_SERIAL_XIRCOM is not set
|
# CONFIG_USB_SERIAL_XIRCOM is not set
|
||||||
|
@ -871,7 +876,7 @@ CONFIG_USB_SERIAL_PL2303=y
|
||||||
# CONFIG_USB_LEGOTOWER is not set
|
# CONFIG_USB_LEGOTOWER is not set
|
||||||
# CONFIG_USB_LCD is not set
|
# CONFIG_USB_LCD is not set
|
||||||
# CONFIG_USB_LED is not set
|
# CONFIG_USB_LED is not set
|
||||||
# CONFIG_USB_CY7C63 is not set
|
# CONFIG_USB_CYPRESS_CY7C63 is not set
|
||||||
# CONFIG_USB_CYTHERM is not set
|
# CONFIG_USB_CYTHERM is not set
|
||||||
# CONFIG_USB_PHIDGETKIT is not set
|
# CONFIG_USB_PHIDGETKIT is not set
|
||||||
# CONFIG_USB_PHIDGETSERVO is not set
|
# CONFIG_USB_PHIDGETSERVO is not set
|
||||||
|
@ -916,6 +921,7 @@ CONFIG_RTC_INTF_DEV=y
|
||||||
# CONFIG_RTC_DRV_X1205 is not set
|
# CONFIG_RTC_DRV_X1205 is not set
|
||||||
# CONFIG_RTC_DRV_DS1307 is not set
|
# CONFIG_RTC_DRV_DS1307 is not set
|
||||||
# CONFIG_RTC_DRV_DS1553 is not set
|
# CONFIG_RTC_DRV_DS1553 is not set
|
||||||
|
# CONFIG_RTC_DRV_ISL1208 is not set
|
||||||
# CONFIG_RTC_DRV_DS1672 is not set
|
# CONFIG_RTC_DRV_DS1672 is not set
|
||||||
# CONFIG_RTC_DRV_DS1742 is not set
|
# CONFIG_RTC_DRV_DS1742 is not set
|
||||||
# CONFIG_RTC_DRV_PCF8563 is not set
|
# CONFIG_RTC_DRV_PCF8563 is not set
|
||||||
|
@ -1023,7 +1029,6 @@ CONFIG_SUNRPC=y
|
||||||
# CONFIG_RPCSEC_GSS_SPKM3 is not set
|
# CONFIG_RPCSEC_GSS_SPKM3 is not set
|
||||||
# CONFIG_SMB_FS is not set
|
# CONFIG_SMB_FS is not set
|
||||||
# CONFIG_CIFS is not set
|
# CONFIG_CIFS is not set
|
||||||
# CONFIG_CIFS_DEBUG2 is not set
|
|
||||||
# CONFIG_NCP_FS is not set
|
# CONFIG_NCP_FS is not set
|
||||||
# CONFIG_CODA_FS is not set
|
# CONFIG_CODA_FS is not set
|
||||||
# CONFIG_AFS_FS is not set
|
# CONFIG_AFS_FS is not set
|
||||||
|
|
|
@ -470,7 +470,8 @@ static void ecard_irq_mask(unsigned int irqnr)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct irqchip ecard_chip = {
|
static struct irq_chip ecard_chip = {
|
||||||
|
.name = "ECARD",
|
||||||
.ack = ecard_irq_mask,
|
.ack = ecard_irq_mask,
|
||||||
.mask = ecard_irq_mask,
|
.mask = ecard_irq_mask,
|
||||||
.unmask = ecard_irq_unmask,
|
.unmask = ecard_irq_unmask,
|
||||||
|
|
|
@ -114,9 +114,9 @@ ENTRY(secondary_startup)
|
||||||
* Use the page tables supplied from __cpu_up.
|
* Use the page tables supplied from __cpu_up.
|
||||||
*/
|
*/
|
||||||
adr r4, __secondary_data
|
adr r4, __secondary_data
|
||||||
ldmia r4, {r5, r6, r13} @ address to jump to after
|
ldmia r4, {r5, r7, r13} @ address to jump to after
|
||||||
sub r4, r4, r5 @ mmu has been enabled
|
sub r4, r4, r5 @ mmu has been enabled
|
||||||
ldr r4, [r6, r4] @ get secondary_data.pgdir
|
ldr r4, [r7, r4] @ get secondary_data.pgdir
|
||||||
adr lr, __enable_mmu @ return address
|
adr lr, __enable_mmu @ return address
|
||||||
add pc, r10, #12 @ initialise processor
|
add pc, r10, #12 @ initialise processor
|
||||||
@ (return control reg)
|
@ (return control reg)
|
||||||
|
@ -125,7 +125,7 @@ ENTRY(secondary_startup)
|
||||||
* r6 = &secondary_data
|
* r6 = &secondary_data
|
||||||
*/
|
*/
|
||||||
ENTRY(__secondary_switched)
|
ENTRY(__secondary_switched)
|
||||||
ldr sp, [r6, #4] @ get secondary_data.stack
|
ldr sp, [r7, #4] @ get secondary_data.stack
|
||||||
mov fp, #0
|
mov fp, #0
|
||||||
b secondary_start_kernel
|
b secondary_start_kernel
|
||||||
|
|
||||||
|
|
|
@ -77,6 +77,7 @@ int show_interrupts(struct seq_file *p, void *v)
|
||||||
seq_printf(p, "%3d: ", i);
|
seq_printf(p, "%3d: ", i);
|
||||||
for_each_present_cpu(cpu)
|
for_each_present_cpu(cpu)
|
||||||
seq_printf(p, "%10u ", kstat_cpu(cpu).irqs[i]);
|
seq_printf(p, "%10u ", kstat_cpu(cpu).irqs[i]);
|
||||||
|
seq_printf(p, " %10s", irq_desc[i].chip->name ? : "-");
|
||||||
seq_printf(p, " %s", action->name);
|
seq_printf(p, " %s", action->name);
|
||||||
for (action = action->next; action; action = action->next)
|
for (action = action->next; action; action = action->next)
|
||||||
seq_printf(p, ", %s", action->name);
|
seq_printf(p, ", %s", action->name);
|
||||||
|
|
|
@ -232,11 +232,8 @@ NORET_TYPE void die(const char *str, struct pt_regs *regs, int err)
|
||||||
bust_spinlocks(0);
|
bust_spinlocks(0);
|
||||||
spin_unlock_irq(&die_lock);
|
spin_unlock_irq(&die_lock);
|
||||||
|
|
||||||
if (panic_on_oops) {
|
if (panic_on_oops)
|
||||||
printk(KERN_EMERG "Fatal exception: panic in 5 seconds\n");
|
panic("Fatal exception: panic_on_oops");
|
||||||
ssleep(5);
|
|
||||||
panic("Fatal exception");
|
|
||||||
}
|
|
||||||
|
|
||||||
do_exit(SIGSEGV);
|
do_exit(SIGSEGV);
|
||||||
}
|
}
|
||||||
|
|
|
@ -327,7 +327,8 @@ static int gpio_irq_type(unsigned pin, unsigned type)
|
||||||
return (type == IRQT_BOTHEDGE) ? 0 : -EINVAL;
|
return (type == IRQT_BOTHEDGE) ? 0 : -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct irqchip gpio_irqchip = {
|
static struct irq_chip gpio_irqchip = {
|
||||||
|
.name = "GPIO",
|
||||||
.mask = gpio_irq_mask,
|
.mask = gpio_irq_mask,
|
||||||
.unmask = gpio_irq_unmask,
|
.unmask = gpio_irq_unmask,
|
||||||
.set_type = gpio_irq_type,
|
.set_type = gpio_irq_type,
|
||||||
|
|
|
@ -114,7 +114,8 @@ void at91_irq_resume(void)
|
||||||
#define at91_aic_set_wake NULL
|
#define at91_aic_set_wake NULL
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static struct irqchip at91_aic_chip = {
|
static struct irq_chip at91_aic_chip = {
|
||||||
|
.name = "AIC",
|
||||||
.ack = at91_aic_mask_irq,
|
.ack = at91_aic_mask_irq,
|
||||||
.mask = at91_aic_mask_irq,
|
.mask = at91_aic_mask_irq,
|
||||||
.unmask = at91_aic_unmask_irq,
|
.unmask = at91_aic_unmask_irq,
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
#include <linux/ioport.h>
|
#include <linux/ioport.h>
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
#include <linux/init.h>
|
#include <linux/init.h>
|
||||||
#include <linux/tty.h>
|
#include <linux/screen_info.h>
|
||||||
|
|
||||||
#include <asm/hardware/dec21285.h>
|
#include <asm/hardware/dec21285.h>
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
|
|
|
@ -204,13 +204,15 @@ imx_gpiod_demux_handler(unsigned int irq_unused, struct irqdesc *desc,
|
||||||
imx_gpio_handler(mask, irq, desc, regs);
|
imx_gpio_handler(mask, irq, desc, regs);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct irqchip imx_internal_chip = {
|
static struct irq_chip imx_internal_chip = {
|
||||||
|
.name = "MPU",
|
||||||
.ack = imx_mask_irq,
|
.ack = imx_mask_irq,
|
||||||
.mask = imx_mask_irq,
|
.mask = imx_mask_irq,
|
||||||
.unmask = imx_unmask_irq,
|
.unmask = imx_unmask_irq,
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct irqchip imx_gpio_chip = {
|
static struct irq_chip imx_gpio_chip = {
|
||||||
|
.name = "GPIO",
|
||||||
.ack = imx_gpio_ack_irq,
|
.ack = imx_gpio_ack_irq,
|
||||||
.mask = imx_gpio_mask_irq,
|
.mask = imx_gpio_mask_irq,
|
||||||
.unmask = imx_gpio_unmask_irq,
|
.unmask = imx_gpio_unmask_irq,
|
||||||
|
|
|
@ -161,7 +161,8 @@ static void sc_unmask_irq(unsigned int irq)
|
||||||
writel(1 << irq, VA_IC_BASE + IRQ_ENABLE_SET);
|
writel(1 << irq, VA_IC_BASE + IRQ_ENABLE_SET);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct irqchip sc_chip = {
|
static struct irq_chip sc_chip = {
|
||||||
|
.name = "SC",
|
||||||
.ack = sc_mask_irq,
|
.ack = sc_mask_irq,
|
||||||
.mask = sc_mask_irq,
|
.mask = sc_mask_irq,
|
||||||
.unmask = sc_unmask_irq,
|
.unmask = sc_unmask_irq,
|
||||||
|
|
|
@ -156,7 +156,8 @@ static void cic_unmask_irq(unsigned int irq)
|
||||||
cic_writel(1 << irq, INTCP_VA_CIC_BASE + IRQ_ENABLE_SET);
|
cic_writel(1 << irq, INTCP_VA_CIC_BASE + IRQ_ENABLE_SET);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct irqchip cic_chip = {
|
static struct irq_chip cic_chip = {
|
||||||
|
.name = "CIC",
|
||||||
.ack = cic_mask_irq,
|
.ack = cic_mask_irq,
|
||||||
.mask = cic_mask_irq,
|
.mask = cic_mask_irq,
|
||||||
.unmask = cic_unmask_irq,
|
.unmask = cic_unmask_irq,
|
||||||
|
@ -174,7 +175,8 @@ static void pic_unmask_irq(unsigned int irq)
|
||||||
pic_writel(1 << irq, INTCP_VA_PIC_BASE + IRQ_ENABLE_SET);
|
pic_writel(1 << irq, INTCP_VA_PIC_BASE + IRQ_ENABLE_SET);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct irqchip pic_chip = {
|
static struct irq_chip pic_chip = {
|
||||||
|
.name = "PIC",
|
||||||
.ack = pic_mask_irq,
|
.ack = pic_mask_irq,
|
||||||
.mask = pic_mask_irq,
|
.mask = pic_mask_irq,
|
||||||
.unmask = pic_unmask_irq,
|
.unmask = pic_unmask_irq,
|
||||||
|
@ -192,7 +194,8 @@ static void sic_unmask_irq(unsigned int irq)
|
||||||
sic_writel(1 << irq, INTCP_VA_SIC_BASE + IRQ_ENABLE_SET);
|
sic_writel(1 << irq, INTCP_VA_SIC_BASE + IRQ_ENABLE_SET);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct irqchip sic_chip = {
|
static struct irq_chip sic_chip = {
|
||||||
|
.name = "SIC",
|
||||||
.ack = sic_mask_irq,
|
.ack = sic_mask_irq,
|
||||||
.mask = sic_mask_irq,
|
.mask = sic_mask_irq,
|
||||||
.unmask = sic_unmask_irq,
|
.unmask = sic_unmask_irq,
|
||||||
|
|
|
@ -52,7 +52,8 @@ iop321_irq_unmask (unsigned int irq)
|
||||||
intctl_write(iop321_mask);
|
intctl_write(iop321_mask);
|
||||||
}
|
}
|
||||||
|
|
||||||
struct irqchip ext_chip = {
|
struct irq_chip ext_chip = {
|
||||||
|
.name = "IOP",
|
||||||
.ack = iop321_irq_mask,
|
.ack = iop321_irq_mask,
|
||||||
.mask = iop321_irq_mask,
|
.mask = iop321_irq_mask,
|
||||||
.unmask = iop321_irq_unmask,
|
.unmask = iop321_irq_unmask,
|
||||||
|
|
|
@ -77,13 +77,15 @@ iop331_irq_unmask2(unsigned int irq)
|
||||||
intctl_write1(iop331_mask1);
|
intctl_write1(iop331_mask1);
|
||||||
}
|
}
|
||||||
|
|
||||||
struct irqchip iop331_irqchip1 = {
|
struct irq_chip iop331_irqchip1 = {
|
||||||
|
.name = "IOP-1",
|
||||||
.ack = iop331_irq_mask1,
|
.ack = iop331_irq_mask1,
|
||||||
.mask = iop331_irq_mask1,
|
.mask = iop331_irq_mask1,
|
||||||
.unmask = iop331_irq_unmask1,
|
.unmask = iop331_irq_unmask1,
|
||||||
};
|
};
|
||||||
|
|
||||||
struct irqchip iop331_irqchip2 = {
|
struct irq_chip iop331_irqchip2 = {
|
||||||
|
.name = "IOP-2",
|
||||||
.ack = iop331_irq_mask2,
|
.ack = iop331_irq_mask2,
|
||||||
.mask = iop331_irq_mask2,
|
.mask = iop331_irq_mask2,
|
||||||
.unmask = iop331_irq_unmask2,
|
.unmask = iop331_irq_unmask2,
|
||||||
|
|
|
@ -63,7 +63,8 @@ static void kev7a400_unmask_cpld_irq (u32 irq)
|
||||||
CPLD_WR_PB_INT_MASK = CPLD_IRQ_mask;
|
CPLD_WR_PB_INT_MASK = CPLD_IRQ_mask;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct irqchip kev7a400_cpld_chip = {
|
static struct irq_chip kev7a400_cpld_chip = {
|
||||||
|
.name = "CPLD",
|
||||||
.ack = kev7a400_ack_cpld_irq,
|
.ack = kev7a400_ack_cpld_irq,
|
||||||
.mask = kev7a400_mask_cpld_irq,
|
.mask = kev7a400_mask_cpld_irq,
|
||||||
.unmask = kev7a400_unmask_cpld_irq,
|
.unmask = kev7a400_unmask_cpld_irq,
|
||||||
|
|
|
@ -200,7 +200,8 @@ static void lh7a40x_unmask_cpld_irq (u32 irq)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct irqchip lpd7a40x_cpld_chip = {
|
static struct irq_chip lpd7a40x_cpld_chip = {
|
||||||
|
.name = "CPLD",
|
||||||
.ack = lh7a40x_ack_cpld_irq,
|
.ack = lh7a40x_ack_cpld_irq,
|
||||||
.mask = lh7a40x_mask_cpld_irq,
|
.mask = lh7a40x_mask_cpld_irq,
|
||||||
.unmask = lh7a40x_unmask_cpld_irq,
|
.unmask = lh7a40x_unmask_cpld_irq,
|
||||||
|
|
|
@ -43,7 +43,8 @@ lh7a400_unmask_cpld_irq (u32 irq)
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct
|
static struct
|
||||||
irqchip lh7a400_cpld_chip = {
|
irq_chip lh7a400_cpld_chip = {
|
||||||
|
.name = "CPLD",
|
||||||
.ack = lh7a400_ack_cpld_irq,
|
.ack = lh7a400_ack_cpld_irq,
|
||||||
.mask = lh7a400_mask_cpld_irq,
|
.mask = lh7a400_mask_cpld_irq,
|
||||||
.unmask = lh7a400_unmask_cpld_irq,
|
.unmask = lh7a400_unmask_cpld_irq,
|
||||||
|
|
|
@ -38,13 +38,15 @@ static void lh7a400_ack_gpio_irq (u32 irq)
|
||||||
INTC_INTENC = (1 << irq);
|
INTC_INTENC = (1 << irq);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct irqchip lh7a400_internal_chip = {
|
static struct irq_chip lh7a400_internal_chip = {
|
||||||
|
.name = "MPU",
|
||||||
.ack = lh7a400_mask_irq, /* Level triggering -> mask is ack */
|
.ack = lh7a400_mask_irq, /* Level triggering -> mask is ack */
|
||||||
.mask = lh7a400_mask_irq,
|
.mask = lh7a400_mask_irq,
|
||||||
.unmask = lh7a400_unmask_irq,
|
.unmask = lh7a400_unmask_irq,
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct irqchip lh7a400_gpio_chip = {
|
static struct irq_chip lh7a400_gpio_chip = {
|
||||||
|
.name = "GPIO",
|
||||||
.ack = lh7a400_ack_gpio_irq,
|
.ack = lh7a400_ack_gpio_irq,
|
||||||
.mask = lh7a400_mask_irq,
|
.mask = lh7a400_mask_irq,
|
||||||
.unmask = lh7a400_unmask_irq,
|
.unmask = lh7a400_unmask_irq,
|
||||||
|
|
|
@ -76,25 +76,29 @@ static void lh7a404_vic2_ack_gpio_irq (u32 irq)
|
||||||
VIC2_INTENCLR = (1 << irq);
|
VIC2_INTENCLR = (1 << irq);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct irqchip lh7a404_vic1_chip = {
|
static struct irq_chip lh7a404_vic1_chip = {
|
||||||
|
.name = "VIC1",
|
||||||
.ack = lh7a404_vic1_mask_irq, /* Because level-triggered */
|
.ack = lh7a404_vic1_mask_irq, /* Because level-triggered */
|
||||||
.mask = lh7a404_vic1_mask_irq,
|
.mask = lh7a404_vic1_mask_irq,
|
||||||
.unmask = lh7a404_vic1_unmask_irq,
|
.unmask = lh7a404_vic1_unmask_irq,
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct irqchip lh7a404_vic2_chip = {
|
static struct irq_chip lh7a404_vic2_chip = {
|
||||||
|
.name = "VIC2",
|
||||||
.ack = lh7a404_vic2_mask_irq, /* Because level-triggered */
|
.ack = lh7a404_vic2_mask_irq, /* Because level-triggered */
|
||||||
.mask = lh7a404_vic2_mask_irq,
|
.mask = lh7a404_vic2_mask_irq,
|
||||||
.unmask = lh7a404_vic2_unmask_irq,
|
.unmask = lh7a404_vic2_unmask_irq,
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct irqchip lh7a404_gpio_vic1_chip = {
|
static struct irq_chip lh7a404_gpio_vic1_chip = {
|
||||||
|
.name = "GPIO-VIC1",
|
||||||
.ack = lh7a404_vic1_ack_gpio_irq,
|
.ack = lh7a404_vic1_ack_gpio_irq,
|
||||||
.mask = lh7a404_vic1_mask_irq,
|
.mask = lh7a404_vic1_mask_irq,
|
||||||
.unmask = lh7a404_vic1_unmask_irq,
|
.unmask = lh7a404_vic1_unmask_irq,
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct irqchip lh7a404_gpio_vic2_chip = {
|
static struct irq_chip lh7a404_gpio_vic2_chip = {
|
||||||
|
.name = "GPIO-VIC2",
|
||||||
.ack = lh7a404_vic2_ack_gpio_irq,
|
.ack = lh7a404_vic2_ack_gpio_irq,
|
||||||
.mask = lh7a404_vic2_mask_irq,
|
.mask = lh7a404_vic2_mask_irq,
|
||||||
.unmask = lh7a404_vic2_unmask_irq,
|
.unmask = lh7a404_vic2_unmask_irq,
|
||||||
|
|
|
@ -50,7 +50,8 @@ static void lh7a40x_unmask_cpld_irq (u32 irq)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct irqchip lh7a40x_cpld_chip = {
|
static struct irq_chip lh7a40x_cpld_chip = {
|
||||||
|
.name = "CPLD",
|
||||||
.ack = lh7a40x_ack_cpld_irq,
|
.ack = lh7a40x_ack_cpld_irq,
|
||||||
.mask = lh7a40x_mask_cpld_irq,
|
.mask = lh7a40x_mask_cpld_irq,
|
||||||
.unmask = lh7a40x_unmask_cpld_irq,
|
.unmask = lh7a40x_unmask_cpld_irq,
|
||||||
|
|
|
@ -106,14 +106,16 @@ void innovator_fpga_IRQ_demux(unsigned int irq, struct irqdesc *desc,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct irqchip omap_fpga_irq_ack = {
|
static struct irq_chip omap_fpga_irq_ack = {
|
||||||
|
.name = "FPGA-ack",
|
||||||
.ack = fpga_mask_ack_irq,
|
.ack = fpga_mask_ack_irq,
|
||||||
.mask = fpga_mask_irq,
|
.mask = fpga_mask_irq,
|
||||||
.unmask = fpga_unmask_irq,
|
.unmask = fpga_unmask_irq,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
static struct irqchip omap_fpga_irq = {
|
static struct irq_chip omap_fpga_irq = {
|
||||||
|
.name = "FPGA",
|
||||||
.ack = fpga_ack_irq,
|
.ack = fpga_ack_irq,
|
||||||
.mask = fpga_mask_irq,
|
.mask = fpga_mask_irq,
|
||||||
.unmask = fpga_unmask_irq,
|
.unmask = fpga_unmask_irq,
|
||||||
|
|
|
@ -168,7 +168,8 @@ static struct omap_irq_bank omap1610_irq_banks[] = {
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static struct irqchip omap_irq_chip = {
|
static struct irq_chip omap_irq_chip = {
|
||||||
|
.name = "MPU",
|
||||||
.ack = omap_mask_ack_irq,
|
.ack = omap_mask_ack_irq,
|
||||||
.mask = omap_mask_irq,
|
.mask = omap_mask_irq,
|
||||||
.unmask = omap_unmask_irq,
|
.unmask = omap_unmask_irq,
|
||||||
|
|
|
@ -94,7 +94,8 @@ static void omap_mask_ack_irq(unsigned int irq)
|
||||||
omap_ack_irq(irq);
|
omap_ack_irq(irq);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct irqchip omap_irq_chip = {
|
static struct irq_chip omap_irq_chip = {
|
||||||
|
.name = "INTC",
|
||||||
.ack = omap_mask_ack_irq,
|
.ack = omap_mask_ack_irq,
|
||||||
.mask = omap_mask_irq,
|
.mask = omap_mask_irq,
|
||||||
.unmask = omap_unmask_irq,
|
.unmask = omap_unmask_irq,
|
||||||
|
|
|
@ -39,7 +39,8 @@ static void pxa_unmask_low_irq(unsigned int irq)
|
||||||
ICMR |= (1 << (irq + PXA_IRQ_SKIP));
|
ICMR |= (1 << (irq + PXA_IRQ_SKIP));
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct irqchip pxa_internal_chip_low = {
|
static struct irq_chip pxa_internal_chip_low = {
|
||||||
|
.name = "SC",
|
||||||
.ack = pxa_mask_low_irq,
|
.ack = pxa_mask_low_irq,
|
||||||
.mask = pxa_mask_low_irq,
|
.mask = pxa_mask_low_irq,
|
||||||
.unmask = pxa_unmask_low_irq,
|
.unmask = pxa_unmask_low_irq,
|
||||||
|
@ -61,7 +62,8 @@ static void pxa_unmask_high_irq(unsigned int irq)
|
||||||
ICMR2 |= (1 << (irq - 32 + PXA_IRQ_SKIP));
|
ICMR2 |= (1 << (irq - 32 + PXA_IRQ_SKIP));
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct irqchip pxa_internal_chip_high = {
|
static struct irq_chip pxa_internal_chip_high = {
|
||||||
|
.name = "SC-hi",
|
||||||
.ack = pxa_mask_high_irq,
|
.ack = pxa_mask_high_irq,
|
||||||
.mask = pxa_mask_high_irq,
|
.mask = pxa_mask_high_irq,
|
||||||
.unmask = pxa_unmask_high_irq,
|
.unmask = pxa_unmask_high_irq,
|
||||||
|
@ -129,7 +131,8 @@ static void pxa_ack_low_gpio(unsigned int irq)
|
||||||
GEDR0 = (1 << (irq - IRQ_GPIO0));
|
GEDR0 = (1 << (irq - IRQ_GPIO0));
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct irqchip pxa_low_gpio_chip = {
|
static struct irq_chip pxa_low_gpio_chip = {
|
||||||
|
.name = "GPIO-l",
|
||||||
.ack = pxa_ack_low_gpio,
|
.ack = pxa_ack_low_gpio,
|
||||||
.mask = pxa_mask_low_irq,
|
.mask = pxa_mask_low_irq,
|
||||||
.unmask = pxa_unmask_low_irq,
|
.unmask = pxa_unmask_low_irq,
|
||||||
|
@ -237,7 +240,8 @@ static void pxa_unmask_muxed_gpio(unsigned int irq)
|
||||||
GFER(gpio) = GPIO_IRQ_falling_edge[idx] & GPIO_IRQ_mask[idx];
|
GFER(gpio) = GPIO_IRQ_falling_edge[idx] & GPIO_IRQ_mask[idx];
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct irqchip pxa_muxed_gpio_chip = {
|
static struct irq_chip pxa_muxed_gpio_chip = {
|
||||||
|
.name = "GPIO",
|
||||||
.ack = pxa_ack_muxed_gpio,
|
.ack = pxa_ack_muxed_gpio,
|
||||||
.mask = pxa_mask_muxed_gpio,
|
.mask = pxa_mask_muxed_gpio,
|
||||||
.unmask = pxa_unmask_muxed_gpio,
|
.unmask = pxa_unmask_muxed_gpio,
|
||||||
|
|
|
@ -68,7 +68,8 @@ static void lpd270_unmask_irq(unsigned int irq)
|
||||||
__raw_writew(lpd270_irq_enabled, LPD270_INT_MASK);
|
__raw_writew(lpd270_irq_enabled, LPD270_INT_MASK);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct irqchip lpd270_irq_chip = {
|
static struct irq_chip lpd270_irq_chip = {
|
||||||
|
.name = "CPLD",
|
||||||
.ack = lpd270_mask_irq,
|
.ack = lpd270_mask_irq,
|
||||||
.mask = lpd270_mask_irq,
|
.mask = lpd270_mask_irq,
|
||||||
.unmask = lpd270_unmask_irq,
|
.unmask = lpd270_unmask_irq,
|
||||||
|
|
|
@ -78,7 +78,8 @@ static void lubbock_unmask_irq(unsigned int irq)
|
||||||
LUB_IRQ_MASK_EN = (lubbock_irq_enabled |= (1 << lubbock_irq));
|
LUB_IRQ_MASK_EN = (lubbock_irq_enabled |= (1 << lubbock_irq));
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct irqchip lubbock_irq_chip = {
|
static struct irq_chip lubbock_irq_chip = {
|
||||||
|
.name = "FPGA",
|
||||||
.ack = lubbock_mask_irq,
|
.ack = lubbock_mask_irq,
|
||||||
.mask = lubbock_mask_irq,
|
.mask = lubbock_mask_irq,
|
||||||
.unmask = lubbock_unmask_irq,
|
.unmask = lubbock_unmask_irq,
|
||||||
|
|
|
@ -64,7 +64,8 @@ static void mainstone_unmask_irq(unsigned int irq)
|
||||||
MST_INTMSKENA = (mainstone_irq_enabled |= (1 << mainstone_irq));
|
MST_INTMSKENA = (mainstone_irq_enabled |= (1 << mainstone_irq));
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct irqchip mainstone_irq_chip = {
|
static struct irq_chip mainstone_irq_chip = {
|
||||||
|
.name = "FPGA",
|
||||||
.ack = mainstone_mask_irq,
|
.ack = mainstone_mask_irq,
|
||||||
.mask = mainstone_mask_irq,
|
.mask = mainstone_mask_irq,
|
||||||
.unmask = mainstone_unmask_irq,
|
.unmask = mainstone_unmask_irq,
|
||||||
|
|
|
@ -60,11 +60,12 @@ static struct map_desc anubis_iodesc[] __initdata = {
|
||||||
.virtual = (u32)S3C24XX_VA_ISA_BYTE,
|
.virtual = (u32)S3C24XX_VA_ISA_BYTE,
|
||||||
.pfn = __phys_to_pfn(0x0),
|
.pfn = __phys_to_pfn(0x0),
|
||||||
.length = SZ_4M,
|
.length = SZ_4M,
|
||||||
.type = MT_DEVICE
|
.type = MT_DEVICE,
|
||||||
}, {
|
}, {
|
||||||
.virtual = (u32)S3C24XX_VA_ISA_WORD,
|
.virtual = (u32)S3C24XX_VA_ISA_WORD,
|
||||||
.pfn = __phys_to_pfn(0x0),
|
.pfn = __phys_to_pfn(0x0),
|
||||||
.length = SZ_4M, MT_DEVICE
|
.length = SZ_4M,
|
||||||
|
.type = MT_DEVICE,
|
||||||
},
|
},
|
||||||
|
|
||||||
/* we could possibly compress the next set down into a set of smaller tables
|
/* we could possibly compress the next set down into a set of smaller tables
|
||||||
|
@ -78,36 +79,12 @@ static struct map_desc anubis_iodesc[] __initdata = {
|
||||||
.virtual = (u32)ANUBIS_VA_CTRL1,
|
.virtual = (u32)ANUBIS_VA_CTRL1,
|
||||||
.pfn = __phys_to_pfn(ANUBIS_PA_CTRL1),
|
.pfn = __phys_to_pfn(ANUBIS_PA_CTRL1),
|
||||||
.length = SZ_4K,
|
.length = SZ_4K,
|
||||||
.type = MT_DEVICE
|
.type = MT_DEVICE,
|
||||||
}, {
|
}, {
|
||||||
.virtual = (u32)ANUBIS_VA_CTRL2,
|
.virtual = (u32)ANUBIS_VA_CTRL2,
|
||||||
.pfn = __phys_to_pfn(ANUBIS_PA_CTRL2),
|
.pfn = __phys_to_pfn(ANUBIS_PA_CTRL2),
|
||||||
.length = SZ_4K,
|
.length = SZ_4K,
|
||||||
.type =MT_DEVICE
|
.type = MT_DEVICE,
|
||||||
},
|
|
||||||
|
|
||||||
/* IDE drives */
|
|
||||||
|
|
||||||
{
|
|
||||||
.virtual = (u32)ANUBIS_IDEPRI,
|
|
||||||
.pfn = __phys_to_pfn(S3C2410_CS3),
|
|
||||||
.length = SZ_1M,
|
|
||||||
.type = MT_DEVICE
|
|
||||||
}, {
|
|
||||||
.virtual = (u32)ANUBIS_IDEPRIAUX,
|
|
||||||
.pfn = __phys_to_pfn(S3C2410_CS3+(1<<26)),
|
|
||||||
.length = SZ_1M,
|
|
||||||
.type = MT_DEVICE
|
|
||||||
}, {
|
|
||||||
.virtual = (u32)ANUBIS_IDESEC,
|
|
||||||
.pfn = __phys_to_pfn(S3C2410_CS4),
|
|
||||||
.length = SZ_1M,
|
|
||||||
.type = MT_DEVICE
|
|
||||||
}, {
|
|
||||||
.virtual = (u32)ANUBIS_IDESECAUX,
|
|
||||||
.pfn = __phys_to_pfn(S3C2410_CS4+(1<<26)),
|
|
||||||
.length = SZ_1M,
|
|
||||||
.type = MT_DEVICE
|
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -126,7 +103,7 @@ static struct s3c24xx_uart_clksrc anubis_serial_clocks[] = {
|
||||||
.name = "pclk",
|
.name = "pclk",
|
||||||
.divisor = 1,
|
.divisor = 1,
|
||||||
.min_baud = 0,
|
.min_baud = 0,
|
||||||
.max_baud = 0.
|
.max_baud = 0,
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -139,7 +116,7 @@ static struct s3c2410_uartcfg anubis_uartcfgs[] __initdata = {
|
||||||
.ulcon = ULCON,
|
.ulcon = ULCON,
|
||||||
.ufcon = UFCON,
|
.ufcon = UFCON,
|
||||||
.clocks = anubis_serial_clocks,
|
.clocks = anubis_serial_clocks,
|
||||||
.clocks_size = ARRAY_SIZE(anubis_serial_clocks)
|
.clocks_size = ARRAY_SIZE(anubis_serial_clocks),
|
||||||
},
|
},
|
||||||
[1] = {
|
[1] = {
|
||||||
.hwport = 2,
|
.hwport = 2,
|
||||||
|
@ -148,7 +125,7 @@ static struct s3c2410_uartcfg anubis_uartcfgs[] __initdata = {
|
||||||
.ulcon = ULCON,
|
.ulcon = ULCON,
|
||||||
.ufcon = UFCON,
|
.ufcon = UFCON,
|
||||||
.clocks = anubis_serial_clocks,
|
.clocks = anubis_serial_clocks,
|
||||||
.clocks_size = ARRAY_SIZE(anubis_serial_clocks)
|
.clocks_size = ARRAY_SIZE(anubis_serial_clocks),
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -162,7 +139,7 @@ static struct mtd_partition anubis_default_nand_part[] = {
|
||||||
[0] = {
|
[0] = {
|
||||||
.name = "Boot Agent",
|
.name = "Boot Agent",
|
||||||
.size = SZ_16K,
|
.size = SZ_16K,
|
||||||
.offset = 0
|
.offset = 0,
|
||||||
},
|
},
|
||||||
[1] = {
|
[1] = {
|
||||||
.name = "/boot",
|
.name = "/boot",
|
||||||
|
@ -194,21 +171,21 @@ static struct s3c2410_nand_set anubis_nand_sets[] = {
|
||||||
.nr_chips = 1,
|
.nr_chips = 1,
|
||||||
.nr_map = external_map,
|
.nr_map = external_map,
|
||||||
.nr_partitions = ARRAY_SIZE(anubis_default_nand_part),
|
.nr_partitions = ARRAY_SIZE(anubis_default_nand_part),
|
||||||
.partitions = anubis_default_nand_part
|
.partitions = anubis_default_nand_part,
|
||||||
},
|
},
|
||||||
[0] = {
|
[0] = {
|
||||||
.name = "chip0",
|
.name = "chip0",
|
||||||
.nr_chips = 1,
|
.nr_chips = 1,
|
||||||
.nr_map = chip0_map,
|
.nr_map = chip0_map,
|
||||||
.nr_partitions = ARRAY_SIZE(anubis_default_nand_part),
|
.nr_partitions = ARRAY_SIZE(anubis_default_nand_part),
|
||||||
.partitions = anubis_default_nand_part
|
.partitions = anubis_default_nand_part,
|
||||||
},
|
},
|
||||||
[2] = {
|
[2] = {
|
||||||
.name = "chip1",
|
.name = "chip1",
|
||||||
.nr_chips = 1,
|
.nr_chips = 1,
|
||||||
.nr_map = chip1_map,
|
.nr_map = chip1_map,
|
||||||
.nr_partitions = ARRAY_SIZE(anubis_default_nand_part),
|
.nr_partitions = ARRAY_SIZE(anubis_default_nand_part),
|
||||||
.partitions = anubis_default_nand_part
|
.partitions = anubis_default_nand_part,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -313,7 +290,7 @@ static struct s3c24xx_board anubis_board __initdata = {
|
||||||
.devices = anubis_devices,
|
.devices = anubis_devices,
|
||||||
.devices_count = ARRAY_SIZE(anubis_devices),
|
.devices_count = ARRAY_SIZE(anubis_devices),
|
||||||
.clocks = anubis_clocks,
|
.clocks = anubis_clocks,
|
||||||
.clocks_count = ARRAY_SIZE(anubis_clocks)
|
.clocks_count = ARRAY_SIZE(anubis_clocks),
|
||||||
};
|
};
|
||||||
|
|
||||||
static void __init anubis_map_io(void)
|
static void __init anubis_map_io(void)
|
||||||
|
|
|
@ -67,12 +67,12 @@ static struct map_desc osiris_iodesc[] __initdata = {
|
||||||
.virtual = (u32)OSIRIS_VA_CTRL1,
|
.virtual = (u32)OSIRIS_VA_CTRL1,
|
||||||
.pfn = __phys_to_pfn(OSIRIS_PA_CTRL1),
|
.pfn = __phys_to_pfn(OSIRIS_PA_CTRL1),
|
||||||
.length = SZ_16K,
|
.length = SZ_16K,
|
||||||
.type = MT_DEVICE
|
.type = MT_DEVICE,
|
||||||
}, {
|
}, {
|
||||||
.virtual = (u32)OSIRIS_VA_CTRL2,
|
.virtual = (u32)OSIRIS_VA_CTRL2,
|
||||||
.pfn = __phys_to_pfn(OSIRIS_PA_CTRL2),
|
.pfn = __phys_to_pfn(OSIRIS_PA_CTRL2),
|
||||||
.length = SZ_16K,
|
.length = SZ_16K,
|
||||||
.type = MT_DEVICE
|
.type = MT_DEVICE,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -91,7 +91,7 @@ static struct s3c24xx_uart_clksrc osiris_serial_clocks[] = {
|
||||||
.name = "pclk",
|
.name = "pclk",
|
||||||
.divisor = 1,
|
.divisor = 1,
|
||||||
.min_baud = 0,
|
.min_baud = 0,
|
||||||
.max_baud = 0.
|
.max_baud = 0,
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -103,7 +103,7 @@ static struct s3c2410_uartcfg osiris_uartcfgs[] __initdata = {
|
||||||
.ulcon = ULCON,
|
.ulcon = ULCON,
|
||||||
.ufcon = UFCON,
|
.ufcon = UFCON,
|
||||||
.clocks = osiris_serial_clocks,
|
.clocks = osiris_serial_clocks,
|
||||||
.clocks_size = ARRAY_SIZE(osiris_serial_clocks)
|
.clocks_size = ARRAY_SIZE(osiris_serial_clocks),
|
||||||
},
|
},
|
||||||
[1] = {
|
[1] = {
|
||||||
.hwport = 1,
|
.hwport = 1,
|
||||||
|
@ -112,7 +112,7 @@ static struct s3c2410_uartcfg osiris_uartcfgs[] __initdata = {
|
||||||
.ulcon = ULCON,
|
.ulcon = ULCON,
|
||||||
.ufcon = UFCON,
|
.ufcon = UFCON,
|
||||||
.clocks = osiris_serial_clocks,
|
.clocks = osiris_serial_clocks,
|
||||||
.clocks_size = ARRAY_SIZE(osiris_serial_clocks)
|
.clocks_size = ARRAY_SIZE(osiris_serial_clocks),
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -126,7 +126,7 @@ static struct mtd_partition osiris_default_nand_part[] = {
|
||||||
[0] = {
|
[0] = {
|
||||||
.name = "Boot Agent",
|
.name = "Boot Agent",
|
||||||
.size = SZ_16K,
|
.size = SZ_16K,
|
||||||
.offset = 0
|
.offset = 0,
|
||||||
},
|
},
|
||||||
[1] = {
|
[1] = {
|
||||||
.name = "/boot",
|
.name = "/boot",
|
||||||
|
@ -158,21 +158,21 @@ static struct s3c2410_nand_set osiris_nand_sets[] = {
|
||||||
.nr_chips = 1,
|
.nr_chips = 1,
|
||||||
.nr_map = external_map,
|
.nr_map = external_map,
|
||||||
.nr_partitions = ARRAY_SIZE(osiris_default_nand_part),
|
.nr_partitions = ARRAY_SIZE(osiris_default_nand_part),
|
||||||
.partitions = osiris_default_nand_part
|
.partitions = osiris_default_nand_part,
|
||||||
},
|
},
|
||||||
[0] = {
|
[0] = {
|
||||||
.name = "chip0",
|
.name = "chip0",
|
||||||
.nr_chips = 1,
|
.nr_chips = 1,
|
||||||
.nr_map = chip0_map,
|
.nr_map = chip0_map,
|
||||||
.nr_partitions = ARRAY_SIZE(osiris_default_nand_part),
|
.nr_partitions = ARRAY_SIZE(osiris_default_nand_part),
|
||||||
.partitions = osiris_default_nand_part
|
.partitions = osiris_default_nand_part,
|
||||||
},
|
},
|
||||||
[2] = {
|
[2] = {
|
||||||
.name = "chip1",
|
.name = "chip1",
|
||||||
.nr_chips = 1,
|
.nr_chips = 1,
|
||||||
.nr_map = chip1_map,
|
.nr_map = chip1_map,
|
||||||
.nr_partitions = ARRAY_SIZE(osiris_default_nand_part),
|
.nr_partitions = ARRAY_SIZE(osiris_default_nand_part),
|
||||||
.partitions = osiris_default_nand_part
|
.partitions = osiris_default_nand_part,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -245,7 +245,7 @@ static struct s3c24xx_board osiris_board __initdata = {
|
||||||
.devices = osiris_devices,
|
.devices = osiris_devices,
|
||||||
.devices_count = ARRAY_SIZE(osiris_devices),
|
.devices_count = ARRAY_SIZE(osiris_devices),
|
||||||
.clocks = osiris_clocks,
|
.clocks = osiris_clocks,
|
||||||
.clocks_count = ARRAY_SIZE(osiris_clocks)
|
.clocks_count = ARRAY_SIZE(osiris_clocks),
|
||||||
};
|
};
|
||||||
|
|
||||||
static void __init osiris_map_io(void)
|
static void __init osiris_map_io(void)
|
||||||
|
|
|
@ -95,7 +95,8 @@ static int sa1100_low_gpio_wake(unsigned int irq, unsigned int on)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct irqchip sa1100_low_gpio_chip = {
|
static struct irq_chip sa1100_low_gpio_chip = {
|
||||||
|
.name = "GPIO-l",
|
||||||
.ack = sa1100_low_gpio_ack,
|
.ack = sa1100_low_gpio_ack,
|
||||||
.mask = sa1100_low_gpio_mask,
|
.mask = sa1100_low_gpio_mask,
|
||||||
.unmask = sa1100_low_gpio_unmask,
|
.unmask = sa1100_low_gpio_unmask,
|
||||||
|
@ -178,7 +179,8 @@ static int sa1100_high_gpio_wake(unsigned int irq, unsigned int on)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct irqchip sa1100_high_gpio_chip = {
|
static struct irq_chip sa1100_high_gpio_chip = {
|
||||||
|
.name = "GPIO-h",
|
||||||
.ack = sa1100_high_gpio_ack,
|
.ack = sa1100_high_gpio_ack,
|
||||||
.mask = sa1100_high_gpio_mask,
|
.mask = sa1100_high_gpio_mask,
|
||||||
.unmask = sa1100_high_gpio_unmask,
|
.unmask = sa1100_high_gpio_unmask,
|
||||||
|
@ -215,7 +217,8 @@ static int sa1100_set_wake(unsigned int irq, unsigned int on)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct irqchip sa1100_normal_chip = {
|
static struct irq_chip sa1100_normal_chip = {
|
||||||
|
.name = "SC",
|
||||||
.ack = sa1100_mask_irq,
|
.ack = sa1100_mask_irq,
|
||||||
.mask = sa1100_mask_irq,
|
.mask = sa1100_mask_irq,
|
||||||
.unmask = sa1100_unmask_irq,
|
.unmask = sa1100_unmask_irq,
|
||||||
|
|
|
@ -69,7 +69,8 @@ static irqreturn_t bogus_int(int irq, void *dev_id, struct pt_regs *regs)
|
||||||
|
|
||||||
static struct irqaction cascade;
|
static struct irqaction cascade;
|
||||||
|
|
||||||
static struct irqchip fb_chip = {
|
static struct irq_chip fb_chip = {
|
||||||
|
.name = "XT-PIC",
|
||||||
.ack = shark_ack_8259A_irq,
|
.ack = shark_ack_8259A_irq,
|
||||||
.mask = shark_disable_8259A_irq,
|
.mask = shark_disable_8259A_irq,
|
||||||
.unmask = shark_enable_8259A_irq,
|
.unmask = shark_enable_8259A_irq,
|
||||||
|
|
|
@ -69,7 +69,8 @@ static void sic_unmask_irq(unsigned int irq)
|
||||||
writel(1 << irq, VA_SIC_BASE + SIC_IRQ_ENABLE_SET);
|
writel(1 << irq, VA_SIC_BASE + SIC_IRQ_ENABLE_SET);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct irqchip sic_chip = {
|
static struct irq_chip sic_chip = {
|
||||||
|
.name = "SIC",
|
||||||
.ack = sic_mask_irq,
|
.ack = sic_mask_irq,
|
||||||
.mask = sic_mask_irq,
|
.mask = sic_mask_irq,
|
||||||
.unmask = sic_unmask_irq,
|
.unmask = sic_unmask_irq,
|
||||||
|
|
|
@ -363,7 +363,9 @@ EXPORT_SYMBOL(__ioremap);
|
||||||
|
|
||||||
void __iounmap(void __iomem *addr)
|
void __iounmap(void __iomem *addr)
|
||||||
{
|
{
|
||||||
|
#ifndef CONFIG_SMP
|
||||||
struct vm_struct **p, *tmp;
|
struct vm_struct **p, *tmp;
|
||||||
|
#endif
|
||||||
unsigned int section_mapping = 0;
|
unsigned int section_mapping = 0;
|
||||||
|
|
||||||
addr = (void __iomem *)(PAGE_MASK & (unsigned long)addr);
|
addr = (void __iomem *)(PAGE_MASK & (unsigned long)addr);
|
||||||
|
|
|
@ -13,6 +13,7 @@
|
||||||
#include <asm/cacheflush.h>
|
#include <asm/cacheflush.h>
|
||||||
#include <asm/proc-fns.h>
|
#include <asm/proc-fns.h>
|
||||||
#include <asm/tlbflush.h>
|
#include <asm/tlbflush.h>
|
||||||
|
#include <asm/page.h>
|
||||||
|
|
||||||
#ifndef MULTI_CPU
|
#ifndef MULTI_CPU
|
||||||
EXPORT_SYMBOL(cpu_dcache_clean_area);
|
EXPORT_SYMBOL(cpu_dcache_clean_area);
|
||||||
|
@ -30,6 +31,13 @@ EXPORT_SYMBOL(__cpuc_coherent_kern_range);
|
||||||
EXPORT_SYMBOL(cpu_cache);
|
EXPORT_SYMBOL(cpu_cache);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef MULTI_USER
|
||||||
|
EXPORT_SYMBOL(__cpu_clear_user_page);
|
||||||
|
EXPORT_SYMBOL(__cpu_copy_user_page);
|
||||||
|
#else
|
||||||
|
EXPORT_SYMBOL(cpu_user);
|
||||||
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* No module should need to touch the TLB (and currently
|
* No module should need to touch the TLB (and currently
|
||||||
* no modules do. We export this for "loadkernel" support
|
* no modules do. We export this for "loadkernel" support
|
||||||
|
|
|
@ -536,6 +536,11 @@ cpu_80200_name:
|
||||||
.asciz "XScale-80200"
|
.asciz "XScale-80200"
|
||||||
.size cpu_80200_name, . - cpu_80200_name
|
.size cpu_80200_name, . - cpu_80200_name
|
||||||
|
|
||||||
|
.type cpu_80219_name, #object
|
||||||
|
cpu_80219_name:
|
||||||
|
.asciz "XScale-80219"
|
||||||
|
.size cpu_80219_name, . - cpu_80219_name
|
||||||
|
|
||||||
.type cpu_8032x_name, #object
|
.type cpu_8032x_name, #object
|
||||||
cpu_8032x_name:
|
cpu_8032x_name:
|
||||||
.asciz "XScale-IOP8032x Family"
|
.asciz "XScale-IOP8032x Family"
|
||||||
|
@ -613,10 +618,33 @@ __80200_proc_info:
|
||||||
.long xscale_cache_fns
|
.long xscale_cache_fns
|
||||||
.size __80200_proc_info, . - __80200_proc_info
|
.size __80200_proc_info, . - __80200_proc_info
|
||||||
|
|
||||||
|
.type __80219_proc_info,#object
|
||||||
|
__80219_proc_info:
|
||||||
|
.long 0x69052e20
|
||||||
|
.long 0xffffffe0
|
||||||
|
.long PMD_TYPE_SECT | \
|
||||||
|
PMD_SECT_BUFFERABLE | \
|
||||||
|
PMD_SECT_CACHEABLE | \
|
||||||
|
PMD_SECT_AP_WRITE | \
|
||||||
|
PMD_SECT_AP_READ
|
||||||
|
.long PMD_TYPE_SECT | \
|
||||||
|
PMD_SECT_AP_WRITE | \
|
||||||
|
PMD_SECT_AP_READ
|
||||||
|
b __xscale_setup
|
||||||
|
.long cpu_arch_name
|
||||||
|
.long cpu_elf_name
|
||||||
|
.long HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP
|
||||||
|
.long cpu_80219_name
|
||||||
|
.long xscale_processor_functions
|
||||||
|
.long v4wbi_tlb_fns
|
||||||
|
.long xscale_mc_user_fns
|
||||||
|
.long xscale_cache_fns
|
||||||
|
.size __80219_proc_info, . - __80219_proc_info
|
||||||
|
|
||||||
.type __8032x_proc_info,#object
|
.type __8032x_proc_info,#object
|
||||||
__8032x_proc_info:
|
__8032x_proc_info:
|
||||||
.long 0x69052420
|
.long 0x69052420
|
||||||
.long 0xfffff5e0 @ mask should accomodate IOP80219 also
|
.long 0xffffffe0
|
||||||
.long PMD_TYPE_SECT | \
|
.long PMD_TYPE_SECT | \
|
||||||
PMD_SECT_BUFFERABLE | \
|
PMD_SECT_BUFFERABLE | \
|
||||||
PMD_SECT_CACHEABLE | \
|
PMD_SECT_CACHEABLE | \
|
||||||
|
|
|
@ -944,7 +944,8 @@ static void mpuio_unmask_irq(unsigned int irq)
|
||||||
_set_gpio_irqenable(bank, gpio, 1);
|
_set_gpio_irqenable(bank, gpio, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct irqchip gpio_irq_chip = {
|
static struct irq_chip gpio_irq_chip = {
|
||||||
|
.name = "GPIO",
|
||||||
.ack = gpio_ack_irq,
|
.ack = gpio_ack_irq,
|
||||||
.mask = gpio_mask_irq,
|
.mask = gpio_mask_irq,
|
||||||
.unmask = gpio_unmask_irq,
|
.unmask = gpio_unmask_irq,
|
||||||
|
@ -952,10 +953,11 @@ static struct irqchip gpio_irq_chip = {
|
||||||
.set_wake = gpio_wake_enable,
|
.set_wake = gpio_wake_enable,
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct irqchip mpuio_irq_chip = {
|
static struct irq_chip mpuio_irq_chip = {
|
||||||
|
.name = "MPUIO",
|
||||||
.ack = mpuio_ack_irq,
|
.ack = mpuio_ack_irq,
|
||||||
.mask = mpuio_mask_irq,
|
.mask = mpuio_mask_irq,
|
||||||
.unmask = mpuio_unmask_irq
|
.unmask = mpuio_unmask_irq
|
||||||
};
|
};
|
||||||
|
|
||||||
static int initialized;
|
static int initialized;
|
||||||
|
|
|
@ -672,7 +672,7 @@ config MTRR
|
||||||
See <file:Documentation/mtrr.txt> for more information.
|
See <file:Documentation/mtrr.txt> for more information.
|
||||||
|
|
||||||
config EFI
|
config EFI
|
||||||
bool "Boot from EFI support (EXPERIMENTAL)"
|
bool "Boot from EFI support"
|
||||||
depends on ACPI
|
depends on ACPI
|
||||||
default n
|
default n
|
||||||
---help---
|
---help---
|
||||||
|
|
|
@ -59,7 +59,8 @@ quiet_cmd_syscall = SYSCALL $@
|
||||||
|
|
||||||
export CPPFLAGS_vsyscall.lds += -P -C -U$(ARCH)
|
export CPPFLAGS_vsyscall.lds += -P -C -U$(ARCH)
|
||||||
|
|
||||||
vsyscall-flags = -shared -s -Wl,-soname=linux-gate.so.1
|
vsyscall-flags = -shared -s -Wl,-soname=linux-gate.so.1 \
|
||||||
|
$(call ld-option, -Wl$(comma)--hash-style=sysv)
|
||||||
SYSCFLAGS_vsyscall-sysenter.so = $(vsyscall-flags)
|
SYSCFLAGS_vsyscall-sysenter.so = $(vsyscall-flags)
|
||||||
SYSCFLAGS_vsyscall-int80.so = $(vsyscall-flags)
|
SYSCFLAGS_vsyscall-int80.so = $(vsyscall-flags)
|
||||||
|
|
||||||
|
|
|
@ -759,7 +759,7 @@ static int __cpuinit cache_sysfs_init(void)
|
||||||
if (num_cache_leaves == 0)
|
if (num_cache_leaves == 0)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
register_cpu_notifier(&cacheinfo_cpu_notifier);
|
register_hotcpu_notifier(&cacheinfo_cpu_notifier);
|
||||||
|
|
||||||
for_each_online_cpu(i) {
|
for_each_online_cpu(i) {
|
||||||
cacheinfo_cpu_callback(&cacheinfo_cpu_notifier, CPU_ONLINE,
|
cacheinfo_cpu_callback(&cacheinfo_cpu_notifier, CPU_ONLINE,
|
||||||
|
|
|
@ -9,6 +9,6 @@ void winchip_mcheck_init(struct cpuinfo_x86 *c);
|
||||||
/* Call the installed machine check handler for this CPU setup. */
|
/* Call the installed machine check handler for this CPU setup. */
|
||||||
extern fastcall void (*machine_check_vector)(struct pt_regs *, long error_code);
|
extern fastcall void (*machine_check_vector)(struct pt_regs *, long error_code);
|
||||||
|
|
||||||
extern int mce_disabled __initdata;
|
extern int mce_disabled;
|
||||||
extern int nr_mce_banks;
|
extern int nr_mce_banks;
|
||||||
|
|
||||||
|
|
|
@ -204,7 +204,7 @@ VM_MASK = 0x00020000
|
||||||
ENTRY(ret_from_fork)
|
ENTRY(ret_from_fork)
|
||||||
CFI_STARTPROC
|
CFI_STARTPROC
|
||||||
pushl %eax
|
pushl %eax
|
||||||
CFI_ADJUST_CFA_OFFSET -4
|
CFI_ADJUST_CFA_OFFSET 4
|
||||||
call schedule_tail
|
call schedule_tail
|
||||||
GET_THREAD_INFO(%ebp)
|
GET_THREAD_INFO(%ebp)
|
||||||
popl %eax
|
popl %eax
|
||||||
|
|
|
@ -256,11 +256,6 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
kprobe_opcode_t *addr;
|
kprobe_opcode_t *addr;
|
||||||
struct kprobe_ctlblk *kcb;
|
struct kprobe_ctlblk *kcb;
|
||||||
#ifdef CONFIG_PREEMPT
|
|
||||||
unsigned pre_preempt_count = preempt_count();
|
|
||||||
#else
|
|
||||||
unsigned pre_preempt_count = 1;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
addr = (kprobe_opcode_t *)(regs->eip - sizeof(kprobe_opcode_t));
|
addr = (kprobe_opcode_t *)(regs->eip - sizeof(kprobe_opcode_t));
|
||||||
|
|
||||||
|
@ -338,13 +333,15 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
ss_probe:
|
ss_probe:
|
||||||
if (pre_preempt_count && p->ainsn.boostable == 1 && !p->post_handler){
|
#ifndef CONFIG_PREEMPT
|
||||||
|
if (p->ainsn.boostable == 1 && !p->post_handler){
|
||||||
/* Boost up -- we can execute copied instructions directly */
|
/* Boost up -- we can execute copied instructions directly */
|
||||||
reset_current_kprobe();
|
reset_current_kprobe();
|
||||||
regs->eip = (unsigned long)p->ainsn.insn;
|
regs->eip = (unsigned long)p->ainsn.insn;
|
||||||
preempt_enable_no_resched();
|
preempt_enable_no_resched();
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
prepare_singlestep(p, regs);
|
prepare_singlestep(p, regs);
|
||||||
kcb->kprobe_status = KPROBE_HIT_SS;
|
kcb->kprobe_status = KPROBE_HIT_SS;
|
||||||
return 1;
|
return 1;
|
||||||
|
|
|
@ -189,14 +189,11 @@ NORET_TYPE void machine_kexec(struct kimage *image)
|
||||||
memcpy((void *)reboot_code_buffer, relocate_new_kernel,
|
memcpy((void *)reboot_code_buffer, relocate_new_kernel,
|
||||||
relocate_new_kernel_size);
|
relocate_new_kernel_size);
|
||||||
|
|
||||||
/* The segment registers are funny things, they are
|
/* The segment registers are funny things, they have both a
|
||||||
* automatically loaded from a table, in memory wherever you
|
* visible and an invisible part. Whenever the visible part is
|
||||||
* set them to a specific selector, but this table is never
|
* set to a specific selector, the invisible part is loaded
|
||||||
* accessed again you set the segment to a different selector.
|
* with from a table in memory. At no other time is the
|
||||||
*
|
* descriptor table in memory accessed.
|
||||||
* The more common model is are caches where the behide
|
|
||||||
* the scenes work is done, but is also dropped at arbitrary
|
|
||||||
* times.
|
|
||||||
*
|
*
|
||||||
* I take advantage of this here by force loading the
|
* I take advantage of this here by force loading the
|
||||||
* segments, before I zap the gdt with an invalid value.
|
* segments, before I zap the gdt with an invalid value.
|
||||||
|
|
|
@ -575,6 +575,7 @@ void touch_nmi_watchdog (void)
|
||||||
*/
|
*/
|
||||||
touch_softlockup_watchdog();
|
touch_softlockup_watchdog();
|
||||||
}
|
}
|
||||||
|
EXPORT_SYMBOL(touch_nmi_watchdog);
|
||||||
|
|
||||||
extern void die_nmi(struct pt_regs *, const char *msg);
|
extern void die_nmi(struct pt_regs *, const char *msg);
|
||||||
|
|
||||||
|
|
|
@ -212,14 +212,20 @@ static void __devinit smp_store_cpu_info(int id)
|
||||||
* then we print a warning if not, and always resync.
|
* then we print a warning if not, and always resync.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static atomic_t tsc_start_flag = ATOMIC_INIT(0);
|
static struct {
|
||||||
static atomic_t tsc_count_start = ATOMIC_INIT(0);
|
atomic_t start_flag;
|
||||||
static atomic_t tsc_count_stop = ATOMIC_INIT(0);
|
atomic_t count_start;
|
||||||
static unsigned long long tsc_values[NR_CPUS];
|
atomic_t count_stop;
|
||||||
|
unsigned long long values[NR_CPUS];
|
||||||
|
} tsc __initdata = {
|
||||||
|
.start_flag = ATOMIC_INIT(0),
|
||||||
|
.count_start = ATOMIC_INIT(0),
|
||||||
|
.count_stop = ATOMIC_INIT(0),
|
||||||
|
};
|
||||||
|
|
||||||
#define NR_LOOPS 5
|
#define NR_LOOPS 5
|
||||||
|
|
||||||
static void __init synchronize_tsc_bp (void)
|
static void __init synchronize_tsc_bp(void)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
unsigned long long t0;
|
unsigned long long t0;
|
||||||
|
@ -233,7 +239,7 @@ static void __init synchronize_tsc_bp (void)
|
||||||
/* convert from kcyc/sec to cyc/usec */
|
/* convert from kcyc/sec to cyc/usec */
|
||||||
one_usec = cpu_khz / 1000;
|
one_usec = cpu_khz / 1000;
|
||||||
|
|
||||||
atomic_set(&tsc_start_flag, 1);
|
atomic_set(&tsc.start_flag, 1);
|
||||||
wmb();
|
wmb();
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -250,16 +256,16 @@ static void __init synchronize_tsc_bp (void)
|
||||||
/*
|
/*
|
||||||
* all APs synchronize but they loop on '== num_cpus'
|
* all APs synchronize but they loop on '== num_cpus'
|
||||||
*/
|
*/
|
||||||
while (atomic_read(&tsc_count_start) != num_booting_cpus()-1)
|
while (atomic_read(&tsc.count_start) != num_booting_cpus()-1)
|
||||||
cpu_relax();
|
cpu_relax();
|
||||||
atomic_set(&tsc_count_stop, 0);
|
atomic_set(&tsc.count_stop, 0);
|
||||||
wmb();
|
wmb();
|
||||||
/*
|
/*
|
||||||
* this lets the APs save their current TSC:
|
* this lets the APs save their current TSC:
|
||||||
*/
|
*/
|
||||||
atomic_inc(&tsc_count_start);
|
atomic_inc(&tsc.count_start);
|
||||||
|
|
||||||
rdtscll(tsc_values[smp_processor_id()]);
|
rdtscll(tsc.values[smp_processor_id()]);
|
||||||
/*
|
/*
|
||||||
* We clear the TSC in the last loop:
|
* We clear the TSC in the last loop:
|
||||||
*/
|
*/
|
||||||
|
@ -269,56 +275,54 @@ static void __init synchronize_tsc_bp (void)
|
||||||
/*
|
/*
|
||||||
* Wait for all APs to leave the synchronization point:
|
* Wait for all APs to leave the synchronization point:
|
||||||
*/
|
*/
|
||||||
while (atomic_read(&tsc_count_stop) != num_booting_cpus()-1)
|
while (atomic_read(&tsc.count_stop) != num_booting_cpus()-1)
|
||||||
cpu_relax();
|
cpu_relax();
|
||||||
atomic_set(&tsc_count_start, 0);
|
atomic_set(&tsc.count_start, 0);
|
||||||
wmb();
|
wmb();
|
||||||
atomic_inc(&tsc_count_stop);
|
atomic_inc(&tsc.count_stop);
|
||||||
}
|
}
|
||||||
|
|
||||||
sum = 0;
|
sum = 0;
|
||||||
for (i = 0; i < NR_CPUS; i++) {
|
for (i = 0; i < NR_CPUS; i++) {
|
||||||
if (cpu_isset(i, cpu_callout_map)) {
|
if (cpu_isset(i, cpu_callout_map)) {
|
||||||
t0 = tsc_values[i];
|
t0 = tsc.values[i];
|
||||||
sum += t0;
|
sum += t0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
avg = sum;
|
avg = sum;
|
||||||
do_div(avg, num_booting_cpus());
|
do_div(avg, num_booting_cpus());
|
||||||
|
|
||||||
sum = 0;
|
|
||||||
for (i = 0; i < NR_CPUS; i++) {
|
for (i = 0; i < NR_CPUS; i++) {
|
||||||
if (!cpu_isset(i, cpu_callout_map))
|
if (!cpu_isset(i, cpu_callout_map))
|
||||||
continue;
|
continue;
|
||||||
delta = tsc_values[i] - avg;
|
delta = tsc.values[i] - avg;
|
||||||
if (delta < 0)
|
if (delta < 0)
|
||||||
delta = -delta;
|
delta = -delta;
|
||||||
/*
|
/*
|
||||||
* We report bigger than 2 microseconds clock differences.
|
* We report bigger than 2 microseconds clock differences.
|
||||||
*/
|
*/
|
||||||
if (delta > 2*one_usec) {
|
if (delta > 2*one_usec) {
|
||||||
long realdelta;
|
long long realdelta;
|
||||||
|
|
||||||
if (!buggy) {
|
if (!buggy) {
|
||||||
buggy = 1;
|
buggy = 1;
|
||||||
printk("\n");
|
printk("\n");
|
||||||
}
|
}
|
||||||
realdelta = delta;
|
realdelta = delta;
|
||||||
do_div(realdelta, one_usec);
|
do_div(realdelta, one_usec);
|
||||||
if (tsc_values[i] < avg)
|
if (tsc.values[i] < avg)
|
||||||
realdelta = -realdelta;
|
realdelta = -realdelta;
|
||||||
|
|
||||||
if (realdelta > 0)
|
if (realdelta)
|
||||||
printk(KERN_INFO "CPU#%d had %ld usecs TSC "
|
printk(KERN_INFO "CPU#%d had %Ld usecs TSC "
|
||||||
"skew, fixed it up.\n", i, realdelta);
|
"skew, fixed it up.\n", i, realdelta);
|
||||||
}
|
}
|
||||||
|
|
||||||
sum += delta;
|
|
||||||
}
|
}
|
||||||
if (!buggy)
|
if (!buggy)
|
||||||
printk("passed.\n");
|
printk("passed.\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
static void __init synchronize_tsc_ap (void)
|
static void __init synchronize_tsc_ap(void)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
@ -327,20 +331,20 @@ static void __init synchronize_tsc_ap (void)
|
||||||
* this gets called, so we first wait for the BP to
|
* this gets called, so we first wait for the BP to
|
||||||
* finish SMP initialization:
|
* finish SMP initialization:
|
||||||
*/
|
*/
|
||||||
while (!atomic_read(&tsc_start_flag))
|
while (!atomic_read(&tsc.start_flag))
|
||||||
cpu_relax();
|
cpu_relax();
|
||||||
|
|
||||||
for (i = 0; i < NR_LOOPS; i++) {
|
for (i = 0; i < NR_LOOPS; i++) {
|
||||||
atomic_inc(&tsc_count_start);
|
atomic_inc(&tsc.count_start);
|
||||||
while (atomic_read(&tsc_count_start) != num_booting_cpus())
|
while (atomic_read(&tsc.count_start) != num_booting_cpus())
|
||||||
cpu_relax();
|
cpu_relax();
|
||||||
|
|
||||||
rdtscll(tsc_values[smp_processor_id()]);
|
rdtscll(tsc.values[smp_processor_id()]);
|
||||||
if (i == NR_LOOPS-1)
|
if (i == NR_LOOPS-1)
|
||||||
write_tsc(0, 0);
|
write_tsc(0, 0);
|
||||||
|
|
||||||
atomic_inc(&tsc_count_stop);
|
atomic_inc(&tsc.count_stop);
|
||||||
while (atomic_read(&tsc_count_stop) != num_booting_cpus())
|
while (atomic_read(&tsc.count_stop) != num_booting_cpus())
|
||||||
cpu_relax();
|
cpu_relax();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -190,11 +190,11 @@ static void show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs,
|
||||||
if (unw_ret > 0 && !arch_unw_user_mode(&info)) {
|
if (unw_ret > 0 && !arch_unw_user_mode(&info)) {
|
||||||
#ifdef CONFIG_STACK_UNWIND
|
#ifdef CONFIG_STACK_UNWIND
|
||||||
print_symbol("DWARF2 unwinder stuck at %s\n",
|
print_symbol("DWARF2 unwinder stuck at %s\n",
|
||||||
UNW_PC(info.regs));
|
UNW_PC(&info));
|
||||||
if (call_trace == 1) {
|
if (call_trace == 1) {
|
||||||
printk("Leftover inexact backtrace:\n");
|
printk("Leftover inexact backtrace:\n");
|
||||||
if (UNW_SP(info.regs))
|
if (UNW_SP(&info))
|
||||||
stack = (void *)UNW_SP(info.regs);
|
stack = (void *)UNW_SP(&info);
|
||||||
} else if (call_trace > 1)
|
} else if (call_trace > 1)
|
||||||
return;
|
return;
|
||||||
else
|
else
|
||||||
|
@ -453,11 +453,9 @@ void die(const char * str, struct pt_regs * regs, long err)
|
||||||
if (in_interrupt())
|
if (in_interrupt())
|
||||||
panic("Fatal exception in interrupt");
|
panic("Fatal exception in interrupt");
|
||||||
|
|
||||||
if (panic_on_oops) {
|
if (panic_on_oops)
|
||||||
printk(KERN_EMERG "Fatal exception: panic in 5 seconds\n");
|
panic("Fatal exception: panic_on_oops");
|
||||||
ssleep(5);
|
|
||||||
panic("Fatal exception");
|
|
||||||
}
|
|
||||||
oops_exit();
|
oops_exit();
|
||||||
do_exit(SIGSEGV);
|
do_exit(SIGSEGV);
|
||||||
}
|
}
|
||||||
|
@ -1249,8 +1247,10 @@ static int __init call_trace_setup(char *s)
|
||||||
call_trace = -1;
|
call_trace = -1;
|
||||||
else if (strcmp(s, "both") == 0)
|
else if (strcmp(s, "both") == 0)
|
||||||
call_trace = 0;
|
call_trace = 0;
|
||||||
else if (strcmp(s, "new") == 0)
|
else if (strcmp(s, "newfallback") == 0)
|
||||||
call_trace = 1;
|
call_trace = 1;
|
||||||
|
else if (strcmp(s, "new") == 2)
|
||||||
|
call_trace = 2;
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
__setup("call_trace=", call_trace_setup);
|
__setup("call_trace=", call_trace_setup);
|
||||||
|
|
|
@ -10,6 +10,7 @@ SECTIONS
|
||||||
. = VDSO_PRELINK + SIZEOF_HEADERS;
|
. = VDSO_PRELINK + SIZEOF_HEADERS;
|
||||||
|
|
||||||
.hash : { *(.hash) } :text
|
.hash : { *(.hash) } :text
|
||||||
|
.gnu.hash : { *(.gnu.hash) }
|
||||||
.dynsym : { *(.dynsym) }
|
.dynsym : { *(.dynsym) }
|
||||||
.dynstr : { *(.dynstr) }
|
.dynstr : { *(.dynstr) }
|
||||||
.gnu.version : { *(.gnu.version) }
|
.gnu.version : { *(.gnu.version) }
|
||||||
|
|
|
@ -363,7 +363,7 @@ CONFIG_BLK_DEV_IDECD=y
|
||||||
#
|
#
|
||||||
CONFIG_IDE_GENERIC=y
|
CONFIG_IDE_GENERIC=y
|
||||||
CONFIG_BLK_DEV_IDEPCI=y
|
CONFIG_BLK_DEV_IDEPCI=y
|
||||||
# CONFIG_IDEPCI_SHARE_IRQ is not set
|
CONFIG_IDEPCI_SHARE_IRQ=y
|
||||||
# CONFIG_BLK_DEV_OFFBOARD is not set
|
# CONFIG_BLK_DEV_OFFBOARD is not set
|
||||||
# CONFIG_BLK_DEV_GENERIC is not set
|
# CONFIG_BLK_DEV_GENERIC is not set
|
||||||
# CONFIG_BLK_DEV_OPTI621 is not set
|
# CONFIG_BLK_DEV_OPTI621 is not set
|
||||||
|
|
|
@ -366,7 +366,7 @@ CONFIG_BLK_DEV_IDESCSI=m
|
||||||
# CONFIG_IDE_GENERIC is not set
|
# CONFIG_IDE_GENERIC is not set
|
||||||
# CONFIG_BLK_DEV_IDEPNP is not set
|
# CONFIG_BLK_DEV_IDEPNP is not set
|
||||||
CONFIG_BLK_DEV_IDEPCI=y
|
CONFIG_BLK_DEV_IDEPCI=y
|
||||||
# CONFIG_IDEPCI_SHARE_IRQ is not set
|
CONFIG_IDEPCI_SHARE_IRQ=y
|
||||||
# CONFIG_BLK_DEV_OFFBOARD is not set
|
# CONFIG_BLK_DEV_OFFBOARD is not set
|
||||||
CONFIG_BLK_DEV_GENERIC=y
|
CONFIG_BLK_DEV_GENERIC=y
|
||||||
# CONFIG_BLK_DEV_OPTI621 is not set
|
# CONFIG_BLK_DEV_OPTI621 is not set
|
||||||
|
|
|
@ -45,7 +45,8 @@ CPPFLAGS_gate.lds := -P -C -U$(ARCH)
|
||||||
quiet_cmd_gate = GATE $@
|
quiet_cmd_gate = GATE $@
|
||||||
cmd_gate = $(CC) -nostdlib $(GATECFLAGS_$(@F)) -Wl,-T,$(filter-out FORCE,$^) -o $@
|
cmd_gate = $(CC) -nostdlib $(GATECFLAGS_$(@F)) -Wl,-T,$(filter-out FORCE,$^) -o $@
|
||||||
|
|
||||||
GATECFLAGS_gate.so = -shared -s -Wl,-soname=linux-gate.so.1
|
GATECFLAGS_gate.so = -shared -s -Wl,-soname=linux-gate.so.1 \
|
||||||
|
$(call ld-option, -Wl$(comma)--hash-style=sysv)
|
||||||
$(obj)/gate.so: $(obj)/gate.lds $(obj)/gate.o FORCE
|
$(obj)/gate.so: $(obj)/gate.lds $(obj)/gate.o FORCE
|
||||||
$(call if_changed,gate)
|
$(call if_changed,gate)
|
||||||
|
|
||||||
|
|
|
@ -12,6 +12,7 @@ SECTIONS
|
||||||
. = GATE_ADDR + SIZEOF_HEADERS;
|
. = GATE_ADDR + SIZEOF_HEADERS;
|
||||||
|
|
||||||
.hash : { *(.hash) } :readable
|
.hash : { *(.hash) } :readable
|
||||||
|
.gnu.hash : { *(.gnu.hash) }
|
||||||
.dynsym : { *(.dynsym) }
|
.dynsym : { *(.dynsym) }
|
||||||
.dynstr : { *(.dynstr) }
|
.dynstr : { *(.dynstr) }
|
||||||
.gnu.version : { *(.gnu.version) }
|
.gnu.version : { *(.gnu.version) }
|
||||||
|
|
|
@ -448,11 +448,20 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void __kprobes flush_insn_slot(struct kprobe *p)
|
||||||
|
{
|
||||||
|
unsigned long arm_addr;
|
||||||
|
|
||||||
|
arm_addr = ((unsigned long)&p->opcode.bundle) & ~0xFULL;
|
||||||
|
flush_icache_range(arm_addr, arm_addr + sizeof(bundle_t));
|
||||||
|
}
|
||||||
|
|
||||||
void __kprobes arch_arm_kprobe(struct kprobe *p)
|
void __kprobes arch_arm_kprobe(struct kprobe *p)
|
||||||
{
|
{
|
||||||
unsigned long addr = (unsigned long)p->addr;
|
unsigned long addr = (unsigned long)p->addr;
|
||||||
unsigned long arm_addr = addr & ~0xFULL;
|
unsigned long arm_addr = addr & ~0xFULL;
|
||||||
|
|
||||||
|
flush_insn_slot(p);
|
||||||
memcpy((char *)arm_addr, &p->ainsn.insn.bundle, sizeof(bundle_t));
|
memcpy((char *)arm_addr, &p->ainsn.insn.bundle, sizeof(bundle_t));
|
||||||
flush_icache_range(arm_addr, arm_addr + sizeof(bundle_t));
|
flush_icache_range(arm_addr, arm_addr + sizeof(bundle_t));
|
||||||
}
|
}
|
||||||
|
|
|
@ -958,9 +958,9 @@ remove_palinfo_proc_entries(unsigned int hcpu)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __cpuinit palinfo_cpu_callback(struct notifier_block *nfb,
|
#ifdef CONFIG_HOTPLUG_CPU
|
||||||
unsigned long action,
|
static int palinfo_cpu_callback(struct notifier_block *nfb,
|
||||||
void *hcpu)
|
unsigned long action, void *hcpu)
|
||||||
{
|
{
|
||||||
unsigned int hotcpu = (unsigned long)hcpu;
|
unsigned int hotcpu = (unsigned long)hcpu;
|
||||||
|
|
||||||
|
@ -968,20 +968,19 @@ static int __cpuinit palinfo_cpu_callback(struct notifier_block *nfb,
|
||||||
case CPU_ONLINE:
|
case CPU_ONLINE:
|
||||||
create_palinfo_proc_entries(hotcpu);
|
create_palinfo_proc_entries(hotcpu);
|
||||||
break;
|
break;
|
||||||
#ifdef CONFIG_HOTPLUG_CPU
|
|
||||||
case CPU_DEAD:
|
case CPU_DEAD:
|
||||||
remove_palinfo_proc_entries(hotcpu);
|
remove_palinfo_proc_entries(hotcpu);
|
||||||
break;
|
break;
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
return NOTIFY_OK;
|
return NOTIFY_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct notifier_block __cpuinitdata palinfo_cpu_notifier =
|
static struct notifier_block palinfo_cpu_notifier =
|
||||||
{
|
{
|
||||||
.notifier_call = palinfo_cpu_callback,
|
.notifier_call = palinfo_cpu_callback,
|
||||||
.priority = 0,
|
.priority = 0,
|
||||||
};
|
};
|
||||||
|
#endif
|
||||||
|
|
||||||
static int __init
|
static int __init
|
||||||
palinfo_init(void)
|
palinfo_init(void)
|
||||||
|
@ -1020,7 +1019,7 @@ palinfo_exit(void)
|
||||||
/*
|
/*
|
||||||
* Unregister from cpu notifier callbacks
|
* Unregister from cpu notifier callbacks
|
||||||
*/
|
*/
|
||||||
unregister_cpu_notifier(&palinfo_cpu_notifier);
|
unregister_hotcpu_notifier(&palinfo_cpu_notifier);
|
||||||
}
|
}
|
||||||
|
|
||||||
module_init(palinfo_init);
|
module_init(palinfo_init);
|
||||||
|
|
|
@ -435,7 +435,7 @@ static int __cpuinit cache_sysfs_init(void)
|
||||||
(void *)(long)i);
|
(void *)(long)i);
|
||||||
}
|
}
|
||||||
|
|
||||||
register_cpu_notifier(&cache_cpu_notifier);
|
register_hotcpu_notifier(&cache_cpu_notifier);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -117,11 +117,8 @@ die (const char *str, struct pt_regs *regs, long err)
|
||||||
die.lock_owner = -1;
|
die.lock_owner = -1;
|
||||||
spin_unlock_irq(&die.lock);
|
spin_unlock_irq(&die.lock);
|
||||||
|
|
||||||
if (panic_on_oops) {
|
if (panic_on_oops)
|
||||||
printk(KERN_EMERG "Fatal exception: panic in 5 seconds\n");
|
panic("Fatal exception: panic_on_oops");
|
||||||
ssleep(5);
|
|
||||||
panic("Fatal exception");
|
|
||||||
}
|
|
||||||
|
|
||||||
do_exit(SIGSEGV);
|
do_exit(SIGSEGV);
|
||||||
}
|
}
|
||||||
|
|
|
@ -204,6 +204,7 @@ SECTIONS
|
||||||
*(.dynstr)
|
*(.dynstr)
|
||||||
*(.dynamic)
|
*(.dynamic)
|
||||||
*(.hash)
|
*(.hash)
|
||||||
|
*(.gnu.hash)
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -504,7 +504,7 @@ config CPU_FREQ_PMAC
|
||||||
|
|
||||||
config CPU_FREQ_PMAC64
|
config CPU_FREQ_PMAC64
|
||||||
bool "Support for some Apple G5s"
|
bool "Support for some Apple G5s"
|
||||||
depends on CPU_FREQ && PMAC_SMU && PPC64
|
depends on CPU_FREQ && PPC64
|
||||||
select CPU_FREQ_TABLE
|
select CPU_FREQ_TABLE
|
||||||
help
|
help
|
||||||
This adds support for frequency switching on Apple iMac G5,
|
This adds support for frequency switching on Apple iMac G5,
|
||||||
|
|
|
@ -1,16 +1,18 @@
|
||||||
#
|
#
|
||||||
# Automatically generated make config: don't edit
|
# Automatically generated make config: don't edit
|
||||||
# Linux kernel version: 2.6.17-rc5
|
# Linux kernel version: 2.6.17
|
||||||
# Mon May 29 14:47:49 2006
|
# Mon Jul 3 14:20:49 2006
|
||||||
#
|
#
|
||||||
# CONFIG_PPC64 is not set
|
# CONFIG_PPC64 is not set
|
||||||
CONFIG_PPC32=y
|
CONFIG_PPC32=y
|
||||||
CONFIG_PPC_MERGE=y
|
CONFIG_PPC_MERGE=y
|
||||||
CONFIG_MMU=y
|
CONFIG_MMU=y
|
||||||
CONFIG_GENERIC_HARDIRQS=y
|
CONFIG_GENERIC_HARDIRQS=y
|
||||||
|
CONFIG_IRQ_PER_CPU=y
|
||||||
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
|
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
|
||||||
CONFIG_GENERIC_HWEIGHT=y
|
CONFIG_GENERIC_HWEIGHT=y
|
||||||
CONFIG_GENERIC_CALIBRATE_DELAY=y
|
CONFIG_GENERIC_CALIBRATE_DELAY=y
|
||||||
|
CONFIG_GENERIC_FIND_NEXT_BIT=y
|
||||||
CONFIG_PPC=y
|
CONFIG_PPC=y
|
||||||
CONFIG_EARLY_PRINTK=y
|
CONFIG_EARLY_PRINTK=y
|
||||||
CONFIG_GENERIC_NVRAM=y
|
CONFIG_GENERIC_NVRAM=y
|
||||||
|
@ -29,6 +31,7 @@ CONFIG_CLASSIC32=y
|
||||||
# CONFIG_PPC_82xx is not set
|
# CONFIG_PPC_82xx is not set
|
||||||
# CONFIG_PPC_83xx is not set
|
# CONFIG_PPC_83xx is not set
|
||||||
# CONFIG_PPC_85xx is not set
|
# CONFIG_PPC_85xx is not set
|
||||||
|
# CONFIG_PPC_86xx is not set
|
||||||
# CONFIG_40x is not set
|
# CONFIG_40x is not set
|
||||||
# CONFIG_44x is not set
|
# CONFIG_44x is not set
|
||||||
# CONFIG_8xx is not set
|
# CONFIG_8xx is not set
|
||||||
|
@ -39,6 +42,7 @@ CONFIG_ALTIVEC=y
|
||||||
CONFIG_PPC_STD_MMU=y
|
CONFIG_PPC_STD_MMU=y
|
||||||
CONFIG_PPC_STD_MMU_32=y
|
CONFIG_PPC_STD_MMU_32=y
|
||||||
# CONFIG_SMP is not set
|
# CONFIG_SMP is not set
|
||||||
|
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
|
||||||
|
|
||||||
#
|
#
|
||||||
# Code maturity level options
|
# Code maturity level options
|
||||||
|
@ -72,10 +76,12 @@ CONFIG_PRINTK=y
|
||||||
CONFIG_BUG=y
|
CONFIG_BUG=y
|
||||||
CONFIG_ELF_CORE=y
|
CONFIG_ELF_CORE=y
|
||||||
CONFIG_BASE_FULL=y
|
CONFIG_BASE_FULL=y
|
||||||
|
CONFIG_RT_MUTEXES=y
|
||||||
CONFIG_FUTEX=y
|
CONFIG_FUTEX=y
|
||||||
CONFIG_EPOLL=y
|
CONFIG_EPOLL=y
|
||||||
CONFIG_SHMEM=y
|
CONFIG_SHMEM=y
|
||||||
CONFIG_SLAB=y
|
CONFIG_SLAB=y
|
||||||
|
CONFIG_VM_EVENT_COUNTERS=y
|
||||||
# CONFIG_TINY_SHMEM is not set
|
# CONFIG_TINY_SHMEM is not set
|
||||||
CONFIG_BASE_SMALL=0
|
CONFIG_BASE_SMALL=0
|
||||||
# CONFIG_SLOB is not set
|
# CONFIG_SLOB is not set
|
||||||
|
@ -119,6 +125,9 @@ CONFIG_PPC_MULTIPLATFORM=y
|
||||||
# CONFIG_APUS is not set
|
# CONFIG_APUS is not set
|
||||||
# CONFIG_PPC_CHRP is not set
|
# CONFIG_PPC_CHRP is not set
|
||||||
CONFIG_PPC_PMAC=y
|
CONFIG_PPC_PMAC=y
|
||||||
|
# CONFIG_PPC_CELL is not set
|
||||||
|
# CONFIG_PPC_CELL_NATIVE is not set
|
||||||
|
# CONFIG_UDBG_RTAS_CONSOLE is not set
|
||||||
CONFIG_MPIC=y
|
CONFIG_MPIC=y
|
||||||
# CONFIG_PPC_RTAS is not set
|
# CONFIG_PPC_RTAS is not set
|
||||||
# CONFIG_MMIO_NVRAM is not set
|
# CONFIG_MMIO_NVRAM is not set
|
||||||
|
@ -154,6 +163,7 @@ CONFIG_PREEMPT_NONE=y
|
||||||
# CONFIG_PREEMPT is not set
|
# CONFIG_PREEMPT is not set
|
||||||
CONFIG_BINFMT_ELF=y
|
CONFIG_BINFMT_ELF=y
|
||||||
CONFIG_BINFMT_MISC=m
|
CONFIG_BINFMT_MISC=m
|
||||||
|
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
|
||||||
# CONFIG_KEXEC is not set
|
# CONFIG_KEXEC is not set
|
||||||
CONFIG_ARCH_FLATMEM_ENABLE=y
|
CONFIG_ARCH_FLATMEM_ENABLE=y
|
||||||
CONFIG_SELECT_MEMORY_MODEL=y
|
CONFIG_SELECT_MEMORY_MODEL=y
|
||||||
|
@ -164,6 +174,7 @@ CONFIG_FLATMEM=y
|
||||||
CONFIG_FLAT_NODE_MEM_MAP=y
|
CONFIG_FLAT_NODE_MEM_MAP=y
|
||||||
# CONFIG_SPARSEMEM_STATIC is not set
|
# CONFIG_SPARSEMEM_STATIC is not set
|
||||||
CONFIG_SPLIT_PTLOCK_CPUS=4
|
CONFIG_SPLIT_PTLOCK_CPUS=4
|
||||||
|
# CONFIG_RESOURCES_64BIT is not set
|
||||||
CONFIG_PROC_DEVICETREE=y
|
CONFIG_PROC_DEVICETREE=y
|
||||||
# CONFIG_CMDLINE_BOOL is not set
|
# CONFIG_CMDLINE_BOOL is not set
|
||||||
CONFIG_PM=y
|
CONFIG_PM=y
|
||||||
|
@ -182,6 +193,7 @@ CONFIG_GENERIC_ISA_DMA=y
|
||||||
CONFIG_PPC_INDIRECT_PCI=y
|
CONFIG_PPC_INDIRECT_PCI=y
|
||||||
CONFIG_PCI=y
|
CONFIG_PCI=y
|
||||||
CONFIG_PCI_DOMAINS=y
|
CONFIG_PCI_DOMAINS=y
|
||||||
|
# CONFIG_PCIEPORTBUS is not set
|
||||||
# CONFIG_PCI_DEBUG is not set
|
# CONFIG_PCI_DEBUG is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
|
@ -256,6 +268,8 @@ CONFIG_INET_ESP=y
|
||||||
# CONFIG_INET_IPCOMP is not set
|
# CONFIG_INET_IPCOMP is not set
|
||||||
# CONFIG_INET_XFRM_TUNNEL is not set
|
# CONFIG_INET_XFRM_TUNNEL is not set
|
||||||
# CONFIG_INET_TUNNEL is not set
|
# CONFIG_INET_TUNNEL is not set
|
||||||
|
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
|
||||||
|
# CONFIG_INET_XFRM_MODE_TUNNEL is not set
|
||||||
CONFIG_INET_DIAG=y
|
CONFIG_INET_DIAG=y
|
||||||
CONFIG_INET_TCP_DIAG=y
|
CONFIG_INET_TCP_DIAG=y
|
||||||
# CONFIG_TCP_CONG_ADVANCED is not set
|
# CONFIG_TCP_CONG_ADVANCED is not set
|
||||||
|
@ -268,6 +282,7 @@ CONFIG_TCP_CONG_BIC=y
|
||||||
# CONFIG_IPV6 is not set
|
# CONFIG_IPV6 is not set
|
||||||
# CONFIG_INET6_XFRM_TUNNEL is not set
|
# CONFIG_INET6_XFRM_TUNNEL is not set
|
||||||
# CONFIG_INET6_TUNNEL is not set
|
# CONFIG_INET6_TUNNEL is not set
|
||||||
|
# CONFIG_NETWORK_SECMARK is not set
|
||||||
CONFIG_NETFILTER=y
|
CONFIG_NETFILTER=y
|
||||||
# CONFIG_NETFILTER_DEBUG is not set
|
# CONFIG_NETFILTER_DEBUG is not set
|
||||||
|
|
||||||
|
@ -292,9 +307,11 @@ CONFIG_NETFILTER_XT_MATCH_MARK=m
|
||||||
CONFIG_NETFILTER_XT_MATCH_POLICY=m
|
CONFIG_NETFILTER_XT_MATCH_POLICY=m
|
||||||
CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
|
CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
|
||||||
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
|
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
|
||||||
|
# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
|
||||||
CONFIG_NETFILTER_XT_MATCH_REALM=m
|
CONFIG_NETFILTER_XT_MATCH_REALM=m
|
||||||
CONFIG_NETFILTER_XT_MATCH_SCTP=m
|
CONFIG_NETFILTER_XT_MATCH_SCTP=m
|
||||||
CONFIG_NETFILTER_XT_MATCH_STATE=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_STRING=m
|
||||||
CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
|
CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
|
||||||
|
|
||||||
|
@ -313,6 +330,7 @@ CONFIG_IP_NF_TFTP=m
|
||||||
CONFIG_IP_NF_AMANDA=m
|
CONFIG_IP_NF_AMANDA=m
|
||||||
CONFIG_IP_NF_PPTP=m
|
CONFIG_IP_NF_PPTP=m
|
||||||
CONFIG_IP_NF_H323=m
|
CONFIG_IP_NF_H323=m
|
||||||
|
# CONFIG_IP_NF_SIP is not set
|
||||||
# CONFIG_IP_NF_QUEUE is not set
|
# CONFIG_IP_NF_QUEUE is not set
|
||||||
CONFIG_IP_NF_IPTABLES=m
|
CONFIG_IP_NF_IPTABLES=m
|
||||||
CONFIG_IP_NF_MATCH_IPRANGE=m
|
CONFIG_IP_NF_MATCH_IPRANGE=m
|
||||||
|
@ -457,6 +475,7 @@ CONFIG_IRTTY_SIR=m
|
||||||
# CONFIG_ALI_FIR is not set
|
# CONFIG_ALI_FIR is not set
|
||||||
# CONFIG_VLSI_FIR is not set
|
# CONFIG_VLSI_FIR is not set
|
||||||
# CONFIG_VIA_FIR is not set
|
# CONFIG_VIA_FIR is not set
|
||||||
|
# CONFIG_MCS_FIR is not set
|
||||||
CONFIG_BT=m
|
CONFIG_BT=m
|
||||||
CONFIG_BT_L2CAP=m
|
CONFIG_BT_L2CAP=m
|
||||||
CONFIG_BT_SCO=m
|
CONFIG_BT_SCO=m
|
||||||
|
@ -500,6 +519,7 @@ CONFIG_WIRELESS_EXT=y
|
||||||
CONFIG_PREVENT_FIRMWARE_BUILD=y
|
CONFIG_PREVENT_FIRMWARE_BUILD=y
|
||||||
CONFIG_FW_LOADER=y
|
CONFIG_FW_LOADER=y
|
||||||
# CONFIG_DEBUG_DRIVER is not set
|
# CONFIG_DEBUG_DRIVER is not set
|
||||||
|
# CONFIG_SYS_HYPERVISOR is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
# Connector - unified userspace <-> kernelspace linker
|
# Connector - unified userspace <-> kernelspace linker
|
||||||
|
@ -600,7 +620,6 @@ CONFIG_BLK_DEV_PDC202XX_NEW=y
|
||||||
CONFIG_BLK_DEV_IDE_PMAC=y
|
CONFIG_BLK_DEV_IDE_PMAC=y
|
||||||
CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y
|
CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y
|
||||||
CONFIG_BLK_DEV_IDEDMA_PMAC=y
|
CONFIG_BLK_DEV_IDEDMA_PMAC=y
|
||||||
CONFIG_BLK_DEV_IDE_PMAC_BLINK=y
|
|
||||||
# CONFIG_IDE_ARM is not set
|
# CONFIG_IDE_ARM is not set
|
||||||
CONFIG_BLK_DEV_IDEDMA=y
|
CONFIG_BLK_DEV_IDEDMA=y
|
||||||
# CONFIG_IDEDMA_IVB is not set
|
# CONFIG_IDEDMA_IVB is not set
|
||||||
|
@ -661,6 +680,7 @@ CONFIG_SCSI_AIC7XXX_OLD=m
|
||||||
# CONFIG_MEGARAID_LEGACY is not set
|
# CONFIG_MEGARAID_LEGACY is not set
|
||||||
# CONFIG_MEGARAID_SAS is not set
|
# CONFIG_MEGARAID_SAS is not set
|
||||||
# CONFIG_SCSI_SATA is not set
|
# CONFIG_SCSI_SATA is not set
|
||||||
|
# CONFIG_SCSI_HPTIOP is not set
|
||||||
# CONFIG_SCSI_BUSLOGIC is not set
|
# CONFIG_SCSI_BUSLOGIC is not set
|
||||||
# CONFIG_SCSI_DMX3191D is not set
|
# CONFIG_SCSI_DMX3191D is not set
|
||||||
# CONFIG_SCSI_EATA is not set
|
# CONFIG_SCSI_EATA is not set
|
||||||
|
@ -705,9 +725,7 @@ CONFIG_MD_LINEAR=m
|
||||||
CONFIG_MD_RAID0=m
|
CONFIG_MD_RAID0=m
|
||||||
CONFIG_MD_RAID1=m
|
CONFIG_MD_RAID1=m
|
||||||
CONFIG_MD_RAID10=m
|
CONFIG_MD_RAID10=m
|
||||||
CONFIG_MD_RAID5=m
|
# CONFIG_MD_RAID456 is not set
|
||||||
CONFIG_MD_RAID5_RESHAPE=y
|
|
||||||
CONFIG_MD_RAID6=m
|
|
||||||
CONFIG_MD_MULTIPATH=m
|
CONFIG_MD_MULTIPATH=m
|
||||||
CONFIG_MD_FAULTY=m
|
CONFIG_MD_FAULTY=m
|
||||||
CONFIG_BLK_DEV_DM=m
|
CONFIG_BLK_DEV_DM=m
|
||||||
|
@ -750,7 +768,6 @@ CONFIG_IEEE1394_OHCI1394=m
|
||||||
#
|
#
|
||||||
CONFIG_IEEE1394_VIDEO1394=m
|
CONFIG_IEEE1394_VIDEO1394=m
|
||||||
CONFIG_IEEE1394_SBP2=m
|
CONFIG_IEEE1394_SBP2=m
|
||||||
# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
|
|
||||||
# CONFIG_IEEE1394_ETH1394 is not set
|
# CONFIG_IEEE1394_ETH1394 is not set
|
||||||
CONFIG_IEEE1394_DV1394=m
|
CONFIG_IEEE1394_DV1394=m
|
||||||
CONFIG_IEEE1394_RAWIO=m
|
CONFIG_IEEE1394_RAWIO=m
|
||||||
|
@ -766,9 +783,12 @@ CONFIG_IEEE1394_RAWIO=m
|
||||||
CONFIG_ADB=y
|
CONFIG_ADB=y
|
||||||
CONFIG_ADB_CUDA=y
|
CONFIG_ADB_CUDA=y
|
||||||
CONFIG_ADB_PMU=y
|
CONFIG_ADB_PMU=y
|
||||||
|
CONFIG_ADB_PMU_LED=y
|
||||||
|
CONFIG_ADB_PMU_LED_IDE=y
|
||||||
CONFIG_PMAC_APM_EMU=m
|
CONFIG_PMAC_APM_EMU=m
|
||||||
CONFIG_PMAC_MEDIABAY=y
|
CONFIG_PMAC_MEDIABAY=y
|
||||||
CONFIG_PMAC_BACKLIGHT=y
|
CONFIG_PMAC_BACKLIGHT=y
|
||||||
|
CONFIG_PMAC_BACKLIGHT_LEGACY=y
|
||||||
CONFIG_INPUT_ADBHID=y
|
CONFIG_INPUT_ADBHID=y
|
||||||
CONFIG_MAC_EMUMOUSEBTN=y
|
CONFIG_MAC_EMUMOUSEBTN=y
|
||||||
CONFIG_THERM_WINDTUNNEL=m
|
CONFIG_THERM_WINDTUNNEL=m
|
||||||
|
@ -858,6 +878,7 @@ CONFIG_PCNET32=y
|
||||||
# CONFIG_CHELSIO_T1 is not set
|
# CONFIG_CHELSIO_T1 is not set
|
||||||
# CONFIG_IXGB is not set
|
# CONFIG_IXGB is not set
|
||||||
# CONFIG_S2IO is not set
|
# CONFIG_S2IO is not set
|
||||||
|
# CONFIG_MYRI10GE is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
# Token Ring devices
|
# Token Ring devices
|
||||||
|
@ -908,6 +929,7 @@ CONFIG_APPLE_AIRPORT=m
|
||||||
# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
|
# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
|
||||||
#
|
#
|
||||||
CONFIG_PRISM54=m
|
CONFIG_PRISM54=m
|
||||||
|
# CONFIG_USB_ZD1201 is not set
|
||||||
# CONFIG_HOSTAP is not set
|
# CONFIG_HOSTAP is not set
|
||||||
CONFIG_NET_WIRELESS=y
|
CONFIG_NET_WIRELESS=y
|
||||||
|
|
||||||
|
@ -998,6 +1020,7 @@ CONFIG_SERIO=y
|
||||||
CONFIG_VT=y
|
CONFIG_VT=y
|
||||||
CONFIG_VT_CONSOLE=y
|
CONFIG_VT_CONSOLE=y
|
||||||
CONFIG_HW_CONSOLE=y
|
CONFIG_HW_CONSOLE=y
|
||||||
|
# CONFIG_VT_HW_CONSOLE_BINDING is not set
|
||||||
# CONFIG_SERIAL_NONSTANDARD is not set
|
# CONFIG_SERIAL_NONSTANDARD is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
|
@ -1029,6 +1052,7 @@ CONFIG_LEGACY_PTY_COUNT=256
|
||||||
# Watchdog Cards
|
# Watchdog Cards
|
||||||
#
|
#
|
||||||
# CONFIG_WATCHDOG is not set
|
# CONFIG_WATCHDOG is not set
|
||||||
|
# CONFIG_HW_RANDOM is not set
|
||||||
CONFIG_NVRAM=y
|
CONFIG_NVRAM=y
|
||||||
CONFIG_GEN_RTC=y
|
CONFIG_GEN_RTC=y
|
||||||
# CONFIG_GEN_RTC_X is not set
|
# CONFIG_GEN_RTC_X is not set
|
||||||
|
@ -1040,6 +1064,7 @@ CONFIG_GEN_RTC=y
|
||||||
# Ftape, the floppy tape device driver
|
# Ftape, the floppy tape device driver
|
||||||
#
|
#
|
||||||
CONFIG_AGP=m
|
CONFIG_AGP=m
|
||||||
|
# CONFIG_AGP_SIS is not set
|
||||||
# CONFIG_AGP_VIA is not set
|
# CONFIG_AGP_VIA is not set
|
||||||
CONFIG_AGP_UNINORTH=m
|
CONFIG_AGP_UNINORTH=m
|
||||||
CONFIG_DRM=m
|
CONFIG_DRM=m
|
||||||
|
@ -1092,6 +1117,7 @@ CONFIG_I2C_ALGOBIT=y
|
||||||
CONFIG_I2C_POWERMAC=y
|
CONFIG_I2C_POWERMAC=y
|
||||||
# CONFIG_I2C_MPC is not set
|
# CONFIG_I2C_MPC is not set
|
||||||
# CONFIG_I2C_NFORCE2 is not set
|
# CONFIG_I2C_NFORCE2 is not set
|
||||||
|
# CONFIG_I2C_OCORES is not set
|
||||||
# CONFIG_I2C_PARPORT_LIGHT is not set
|
# CONFIG_I2C_PARPORT_LIGHT is not set
|
||||||
# CONFIG_I2C_PROSAVAGE is not set
|
# CONFIG_I2C_PROSAVAGE is not set
|
||||||
# CONFIG_I2C_SAVAGE4 is not set
|
# CONFIG_I2C_SAVAGE4 is not set
|
||||||
|
@ -1156,12 +1182,13 @@ CONFIG_VIDEO_V4L2=y
|
||||||
#
|
#
|
||||||
# Graphics support
|
# Graphics support
|
||||||
#
|
#
|
||||||
|
# CONFIG_FIRMWARE_EDID is not set
|
||||||
CONFIG_FB=y
|
CONFIG_FB=y
|
||||||
CONFIG_FB_CFB_FILLRECT=y
|
CONFIG_FB_CFB_FILLRECT=y
|
||||||
CONFIG_FB_CFB_COPYAREA=y
|
CONFIG_FB_CFB_COPYAREA=y
|
||||||
CONFIG_FB_CFB_IMAGEBLIT=y
|
CONFIG_FB_CFB_IMAGEBLIT=y
|
||||||
CONFIG_FB_MACMODES=y
|
CONFIG_FB_MACMODES=y
|
||||||
CONFIG_FB_FIRMWARE_EDID=y
|
CONFIG_FB_BACKLIGHT=y
|
||||||
CONFIG_FB_MODE_HELPERS=y
|
CONFIG_FB_MODE_HELPERS=y
|
||||||
CONFIG_FB_TILEBLITTING=y
|
CONFIG_FB_TILEBLITTING=y
|
||||||
# CONFIG_FB_CIRRUS is not set
|
# CONFIG_FB_CIRRUS is not set
|
||||||
|
@ -1178,6 +1205,7 @@ CONFIG_FB_IMSTT=y
|
||||||
# CONFIG_FB_S1D13XXX is not set
|
# CONFIG_FB_S1D13XXX is not set
|
||||||
CONFIG_FB_NVIDIA=y
|
CONFIG_FB_NVIDIA=y
|
||||||
CONFIG_FB_NVIDIA_I2C=y
|
CONFIG_FB_NVIDIA_I2C=y
|
||||||
|
CONFIG_FB_NVIDIA_BACKLIGHT=y
|
||||||
# CONFIG_FB_RIVA is not set
|
# CONFIG_FB_RIVA is not set
|
||||||
CONFIG_FB_MATROX=y
|
CONFIG_FB_MATROX=y
|
||||||
CONFIG_FB_MATROX_MILLENIUM=y
|
CONFIG_FB_MATROX_MILLENIUM=y
|
||||||
|
@ -1187,12 +1215,15 @@ CONFIG_FB_MATROX_MYSTIQUE=y
|
||||||
# CONFIG_FB_MATROX_MULTIHEAD is not set
|
# CONFIG_FB_MATROX_MULTIHEAD is not set
|
||||||
CONFIG_FB_RADEON=y
|
CONFIG_FB_RADEON=y
|
||||||
CONFIG_FB_RADEON_I2C=y
|
CONFIG_FB_RADEON_I2C=y
|
||||||
|
CONFIG_FB_RADEON_BACKLIGHT=y
|
||||||
# CONFIG_FB_RADEON_DEBUG is not set
|
# CONFIG_FB_RADEON_DEBUG is not set
|
||||||
CONFIG_FB_ATY128=y
|
CONFIG_FB_ATY128=y
|
||||||
|
CONFIG_FB_ATY128_BACKLIGHT=y
|
||||||
CONFIG_FB_ATY=y
|
CONFIG_FB_ATY=y
|
||||||
CONFIG_FB_ATY_CT=y
|
CONFIG_FB_ATY_CT=y
|
||||||
# CONFIG_FB_ATY_GENERIC_LCD is not set
|
# CONFIG_FB_ATY_GENERIC_LCD is not set
|
||||||
CONFIG_FB_ATY_GX=y
|
CONFIG_FB_ATY_GX=y
|
||||||
|
CONFIG_FB_ATY_BACKLIGHT=y
|
||||||
# CONFIG_FB_SAVAGE is not set
|
# CONFIG_FB_SAVAGE is not set
|
||||||
# CONFIG_FB_SIS is not set
|
# CONFIG_FB_SIS is not set
|
||||||
# CONFIG_FB_NEOMAGIC is not set
|
# CONFIG_FB_NEOMAGIC is not set
|
||||||
|
@ -1221,7 +1252,11 @@ CONFIG_LOGO=y
|
||||||
CONFIG_LOGO_LINUX_MONO=y
|
CONFIG_LOGO_LINUX_MONO=y
|
||||||
CONFIG_LOGO_LINUX_VGA16=y
|
CONFIG_LOGO_LINUX_VGA16=y
|
||||||
CONFIG_LOGO_LINUX_CLUT224=y
|
CONFIG_LOGO_LINUX_CLUT224=y
|
||||||
# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
|
CONFIG_BACKLIGHT_LCD_SUPPORT=y
|
||||||
|
CONFIG_BACKLIGHT_CLASS_DEVICE=y
|
||||||
|
CONFIG_BACKLIGHT_DEVICE=y
|
||||||
|
CONFIG_LCD_CLASS_DEVICE=m
|
||||||
|
CONFIG_LCD_DEVICE=y
|
||||||
|
|
||||||
#
|
#
|
||||||
# Sound
|
# Sound
|
||||||
|
@ -1278,6 +1313,18 @@ CONFIG_SND_DUMMY=m
|
||||||
# CONFIG_SND_CMIPCI is not set
|
# CONFIG_SND_CMIPCI is not set
|
||||||
# CONFIG_SND_CS4281 is not set
|
# CONFIG_SND_CS4281 is not set
|
||||||
# CONFIG_SND_CS46XX is not set
|
# CONFIG_SND_CS46XX is not set
|
||||||
|
# CONFIG_SND_DARLA20 is not set
|
||||||
|
# CONFIG_SND_GINA20 is not set
|
||||||
|
# CONFIG_SND_LAYLA20 is not set
|
||||||
|
# CONFIG_SND_DARLA24 is not set
|
||||||
|
# CONFIG_SND_GINA24 is not set
|
||||||
|
# CONFIG_SND_LAYLA24 is not set
|
||||||
|
# CONFIG_SND_MONA is not set
|
||||||
|
# CONFIG_SND_MIA is not set
|
||||||
|
# CONFIG_SND_ECHO3G is not set
|
||||||
|
# CONFIG_SND_INDIGO is not set
|
||||||
|
# CONFIG_SND_INDIGOIO is not set
|
||||||
|
# CONFIG_SND_INDIGODJ is not set
|
||||||
# CONFIG_SND_EMU10K1 is not set
|
# CONFIG_SND_EMU10K1 is not set
|
||||||
# CONFIG_SND_EMU10K1X is not set
|
# CONFIG_SND_EMU10K1X is not set
|
||||||
# CONFIG_SND_ENS1370 is not set
|
# CONFIG_SND_ENS1370 is not set
|
||||||
|
@ -1314,6 +1361,17 @@ CONFIG_SND_DUMMY=m
|
||||||
CONFIG_SND_POWERMAC=m
|
CONFIG_SND_POWERMAC=m
|
||||||
CONFIG_SND_POWERMAC_AUTO_DRC=y
|
CONFIG_SND_POWERMAC_AUTO_DRC=y
|
||||||
|
|
||||||
|
#
|
||||||
|
# Apple Onboard Audio driver
|
||||||
|
#
|
||||||
|
CONFIG_SND_AOA=m
|
||||||
|
CONFIG_SND_AOA_FABRIC_LAYOUT=m
|
||||||
|
CONFIG_SND_AOA_ONYX=m
|
||||||
|
CONFIG_SND_AOA_TAS=m
|
||||||
|
CONFIG_SND_AOA_TOONIE=m
|
||||||
|
CONFIG_SND_AOA_SOUNDBUS=m
|
||||||
|
CONFIG_SND_AOA_SOUNDBUS_I2S=m
|
||||||
|
|
||||||
#
|
#
|
||||||
# USB devices
|
# USB devices
|
||||||
#
|
#
|
||||||
|
@ -1355,6 +1413,7 @@ CONFIG_USB_DYNAMIC_MINORS=y
|
||||||
CONFIG_USB_EHCI_HCD=m
|
CONFIG_USB_EHCI_HCD=m
|
||||||
CONFIG_USB_EHCI_SPLIT_ISO=y
|
CONFIG_USB_EHCI_SPLIT_ISO=y
|
||||||
CONFIG_USB_EHCI_ROOT_HUB_TT=y
|
CONFIG_USB_EHCI_ROOT_HUB_TT=y
|
||||||
|
# CONFIG_USB_EHCI_TT_NEWSCHED is not set
|
||||||
# CONFIG_USB_ISP116X_HCD is not set
|
# CONFIG_USB_ISP116X_HCD is not set
|
||||||
CONFIG_USB_OHCI_HCD=y
|
CONFIG_USB_OHCI_HCD=y
|
||||||
# CONFIG_USB_OHCI_BIG_ENDIAN is not set
|
# CONFIG_USB_OHCI_BIG_ENDIAN is not set
|
||||||
|
@ -1431,7 +1490,6 @@ CONFIG_USB_NET_NET1080=m
|
||||||
# CONFIG_USB_NET_RNDIS_HOST is not set
|
# CONFIG_USB_NET_RNDIS_HOST is not set
|
||||||
# CONFIG_USB_NET_CDC_SUBSET is not set
|
# CONFIG_USB_NET_CDC_SUBSET is not set
|
||||||
CONFIG_USB_NET_ZAURUS=m
|
CONFIG_USB_NET_ZAURUS=m
|
||||||
# CONFIG_USB_ZD1201 is not set
|
|
||||||
CONFIG_USB_MON=y
|
CONFIG_USB_MON=y
|
||||||
|
|
||||||
#
|
#
|
||||||
|
@ -1499,10 +1557,12 @@ CONFIG_USB_EZUSB=y
|
||||||
# CONFIG_USB_LEGOTOWER is not set
|
# CONFIG_USB_LEGOTOWER is not set
|
||||||
# CONFIG_USB_LCD is not set
|
# CONFIG_USB_LCD is not set
|
||||||
# CONFIG_USB_LED is not set
|
# CONFIG_USB_LED is not set
|
||||||
|
# CONFIG_USB_CY7C63 is not set
|
||||||
# CONFIG_USB_CYTHERM is not set
|
# CONFIG_USB_CYTHERM is not set
|
||||||
# CONFIG_USB_PHIDGETKIT is not set
|
# CONFIG_USB_PHIDGETKIT is not set
|
||||||
# CONFIG_USB_PHIDGETSERVO is not set
|
# CONFIG_USB_PHIDGETSERVO is not set
|
||||||
# CONFIG_USB_IDMOUSE is not set
|
# CONFIG_USB_IDMOUSE is not set
|
||||||
|
CONFIG_USB_APPLEDISPLAY=m
|
||||||
# CONFIG_USB_SISUSBVGA is not set
|
# CONFIG_USB_SISUSBVGA is not set
|
||||||
# CONFIG_USB_LD is not set
|
# CONFIG_USB_LD is not set
|
||||||
# CONFIG_USB_TEST is not set
|
# CONFIG_USB_TEST is not set
|
||||||
|
@ -1524,7 +1584,8 @@ CONFIG_USB_EZUSB=y
|
||||||
#
|
#
|
||||||
# LED devices
|
# LED devices
|
||||||
#
|
#
|
||||||
# CONFIG_NEW_LEDS is not set
|
CONFIG_NEW_LEDS=y
|
||||||
|
CONFIG_LEDS_CLASS=y
|
||||||
|
|
||||||
#
|
#
|
||||||
# LED drivers
|
# LED drivers
|
||||||
|
@ -1533,6 +1594,10 @@ CONFIG_USB_EZUSB=y
|
||||||
#
|
#
|
||||||
# LED Triggers
|
# LED Triggers
|
||||||
#
|
#
|
||||||
|
CONFIG_LEDS_TRIGGERS=y
|
||||||
|
# CONFIG_LEDS_TRIGGER_TIMER is not set
|
||||||
|
CONFIG_LEDS_TRIGGER_IDE_DISK=y
|
||||||
|
# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
# InfiniBand support
|
# InfiniBand support
|
||||||
|
@ -1548,6 +1613,19 @@ CONFIG_USB_EZUSB=y
|
||||||
#
|
#
|
||||||
# CONFIG_RTC_CLASS is not set
|
# CONFIG_RTC_CLASS is not set
|
||||||
|
|
||||||
|
#
|
||||||
|
# DMA Engine support
|
||||||
|
#
|
||||||
|
# CONFIG_DMA_ENGINE is not set
|
||||||
|
|
||||||
|
#
|
||||||
|
# DMA Clients
|
||||||
|
#
|
||||||
|
|
||||||
|
#
|
||||||
|
# DMA Devices
|
||||||
|
#
|
||||||
|
|
||||||
#
|
#
|
||||||
# File systems
|
# File systems
|
||||||
#
|
#
|
||||||
|
@ -1569,6 +1647,7 @@ CONFIG_FS_POSIX_ACL=y
|
||||||
# CONFIG_MINIX_FS is not set
|
# CONFIG_MINIX_FS is not set
|
||||||
# CONFIG_ROMFS_FS is not set
|
# CONFIG_ROMFS_FS is not set
|
||||||
CONFIG_INOTIFY=y
|
CONFIG_INOTIFY=y
|
||||||
|
CONFIG_INOTIFY_USER=y
|
||||||
# CONFIG_QUOTA is not set
|
# CONFIG_QUOTA is not set
|
||||||
CONFIG_DNOTIFY=y
|
CONFIG_DNOTIFY=y
|
||||||
# CONFIG_AUTOFS_FS is not set
|
# CONFIG_AUTOFS_FS is not set
|
||||||
|
@ -1649,6 +1728,7 @@ CONFIG_RPCSEC_GSS_KRB5=y
|
||||||
CONFIG_SMB_FS=m
|
CONFIG_SMB_FS=m
|
||||||
# CONFIG_SMB_NLS_DEFAULT is not set
|
# CONFIG_SMB_NLS_DEFAULT is not set
|
||||||
# CONFIG_CIFS is not set
|
# CONFIG_CIFS is not set
|
||||||
|
# CONFIG_CIFS_DEBUG2 is not set
|
||||||
# CONFIG_NCP_FS is not set
|
# CONFIG_NCP_FS is not set
|
||||||
# CONFIG_CODA_FS is not set
|
# CONFIG_CODA_FS is not set
|
||||||
# CONFIG_AFS_FS is not set
|
# CONFIG_AFS_FS is not set
|
||||||
|
@ -1732,6 +1812,7 @@ CONFIG_TEXTSEARCH=y
|
||||||
CONFIG_TEXTSEARCH_KMP=m
|
CONFIG_TEXTSEARCH_KMP=m
|
||||||
CONFIG_TEXTSEARCH_BM=m
|
CONFIG_TEXTSEARCH_BM=m
|
||||||
CONFIG_TEXTSEARCH_FSM=m
|
CONFIG_TEXTSEARCH_FSM=m
|
||||||
|
CONFIG_PLIST=y
|
||||||
|
|
||||||
#
|
#
|
||||||
# Instrumentation Support
|
# Instrumentation Support
|
||||||
|
@ -1744,12 +1825,15 @@ CONFIG_OPROFILE=y
|
||||||
#
|
#
|
||||||
# CONFIG_PRINTK_TIME is not set
|
# CONFIG_PRINTK_TIME is not set
|
||||||
# CONFIG_MAGIC_SYSRQ is not set
|
# CONFIG_MAGIC_SYSRQ is not set
|
||||||
|
# CONFIG_UNUSED_SYMBOLS is not set
|
||||||
CONFIG_DEBUG_KERNEL=y
|
CONFIG_DEBUG_KERNEL=y
|
||||||
CONFIG_LOG_BUF_SHIFT=14
|
CONFIG_LOG_BUF_SHIFT=14
|
||||||
CONFIG_DETECT_SOFTLOCKUP=y
|
CONFIG_DETECT_SOFTLOCKUP=y
|
||||||
# CONFIG_SCHEDSTATS is not set
|
# CONFIG_SCHEDSTATS is not set
|
||||||
# CONFIG_DEBUG_SLAB is not set
|
# CONFIG_DEBUG_SLAB is not set
|
||||||
# CONFIG_DEBUG_MUTEXES 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_SPINLOCK is not set
|
||||||
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
|
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
|
||||||
# CONFIG_DEBUG_KOBJECT is not set
|
# CONFIG_DEBUG_KOBJECT is not set
|
||||||
|
@ -1763,11 +1847,7 @@ CONFIG_XMON=y
|
||||||
CONFIG_XMON_DEFAULT=y
|
CONFIG_XMON_DEFAULT=y
|
||||||
# CONFIG_BDI_SWITCH is not set
|
# CONFIG_BDI_SWITCH is not set
|
||||||
CONFIG_BOOTX_TEXT=y
|
CONFIG_BOOTX_TEXT=y
|
||||||
# CONFIG_PPC_EARLY_DEBUG_LPAR is not set
|
# CONFIG_PPC_EARLY_DEBUG 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
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Security options
|
# Security options
|
||||||
|
|
|
@ -191,6 +191,37 @@ exception_marker:
|
||||||
ori reg,reg,(label)@l; /* virt addr of handler ... */
|
ori reg,reg,(label)@l; /* virt addr of handler ... */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Equal to EXCEPTION_PROLOG_PSERIES, except that it forces 64bit mode.
|
||||||
|
* The firmware calls the registered system_reset_fwnmi and
|
||||||
|
* machine_check_fwnmi handlers in 32bit mode if the cpu happens to run
|
||||||
|
* a 32bit application at the time of the event.
|
||||||
|
* This firmware bug is present on POWER4 and JS20.
|
||||||
|
*/
|
||||||
|
#define EXCEPTION_PROLOG_PSERIES_FORCE_64BIT(area, label) \
|
||||||
|
mfspr r13,SPRN_SPRG3; /* get paca address into r13 */ \
|
||||||
|
std r9,area+EX_R9(r13); /* save r9 - r12 */ \
|
||||||
|
std r10,area+EX_R10(r13); \
|
||||||
|
std r11,area+EX_R11(r13); \
|
||||||
|
std r12,area+EX_R12(r13); \
|
||||||
|
mfspr r9,SPRN_SPRG1; \
|
||||||
|
std r9,area+EX_R13(r13); \
|
||||||
|
mfcr r9; \
|
||||||
|
clrrdi r12,r13,32; /* get high part of &label */ \
|
||||||
|
mfmsr r10; \
|
||||||
|
/* force 64bit mode */ \
|
||||||
|
li r11,5; /* MSR_SF_LG|MSR_ISF_LG */ \
|
||||||
|
rldimi r10,r11,61,0; /* insert into top 3 bits */ \
|
||||||
|
/* done 64bit mode */ \
|
||||||
|
mfspr r11,SPRN_SRR0; /* save SRR0 */ \
|
||||||
|
LOAD_HANDLER(r12,label) \
|
||||||
|
ori r10,r10,MSR_IR|MSR_DR|MSR_RI; \
|
||||||
|
mtspr SPRN_SRR0,r12; \
|
||||||
|
mfspr r12,SPRN_SRR1; /* and SRR1 */ \
|
||||||
|
mtspr SPRN_SRR1,r10; \
|
||||||
|
rfid; \
|
||||||
|
b . /* prevent speculative execution */
|
||||||
|
|
||||||
#define EXCEPTION_PROLOG_PSERIES(area, label) \
|
#define EXCEPTION_PROLOG_PSERIES(area, label) \
|
||||||
mfspr r13,SPRN_SPRG3; /* get paca address into r13 */ \
|
mfspr r13,SPRN_SPRG3; /* get paca address into r13 */ \
|
||||||
std r9,area+EX_R9(r13); /* save r9 - r12 */ \
|
std r9,area+EX_R9(r13); /* save r9 - r12 */ \
|
||||||
|
@ -604,14 +635,14 @@ slb_miss_user_pseries:
|
||||||
system_reset_fwnmi:
|
system_reset_fwnmi:
|
||||||
HMT_MEDIUM
|
HMT_MEDIUM
|
||||||
mtspr SPRN_SPRG1,r13 /* save r13 */
|
mtspr SPRN_SPRG1,r13 /* save r13 */
|
||||||
EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, system_reset_common)
|
EXCEPTION_PROLOG_PSERIES_FORCE_64BIT(PACA_EXGEN, system_reset_common)
|
||||||
|
|
||||||
.globl machine_check_fwnmi
|
.globl machine_check_fwnmi
|
||||||
.align 7
|
.align 7
|
||||||
machine_check_fwnmi:
|
machine_check_fwnmi:
|
||||||
HMT_MEDIUM
|
HMT_MEDIUM
|
||||||
mtspr SPRN_SPRG1,r13 /* save r13 */
|
mtspr SPRN_SPRG1,r13 /* save r13 */
|
||||||
EXCEPTION_PROLOG_PSERIES(PACA_EXMC, machine_check_common)
|
EXCEPTION_PROLOG_PSERIES_FORCE_64BIT(PACA_EXMC, machine_check_common)
|
||||||
|
|
||||||
#ifdef CONFIG_PPC_ISERIES
|
#ifdef CONFIG_PPC_ISERIES
|
||||||
/*** ISeries-LPAR interrupt handlers ***/
|
/*** ISeries-LPAR interrupt handlers ***/
|
||||||
|
|
|
@ -112,7 +112,7 @@ static int __init add_legacy_port(struct device_node *np, int want_index,
|
||||||
static int __init add_legacy_soc_port(struct device_node *np,
|
static int __init add_legacy_soc_port(struct device_node *np,
|
||||||
struct device_node *soc_dev)
|
struct device_node *soc_dev)
|
||||||
{
|
{
|
||||||
phys_addr_t addr;
|
u64 addr;
|
||||||
u32 *addrp;
|
u32 *addrp;
|
||||||
upf_t flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_SHARE_IRQ;
|
upf_t flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_SHARE_IRQ;
|
||||||
|
|
||||||
|
@ -143,7 +143,7 @@ static int __init add_legacy_isa_port(struct device_node *np,
|
||||||
u32 *reg;
|
u32 *reg;
|
||||||
char *typep;
|
char *typep;
|
||||||
int index = -1;
|
int index = -1;
|
||||||
phys_addr_t taddr;
|
u64 taddr;
|
||||||
|
|
||||||
DBG(" -> add_legacy_isa_port(%s)\n", np->full_name);
|
DBG(" -> add_legacy_isa_port(%s)\n", np->full_name);
|
||||||
|
|
||||||
|
@ -165,10 +165,13 @@ static int __init add_legacy_isa_port(struct device_node *np,
|
||||||
if (typep && *typep == 'S')
|
if (typep && *typep == 'S')
|
||||||
index = simple_strtol(typep+1, NULL, 0) - 1;
|
index = simple_strtol(typep+1, NULL, 0) - 1;
|
||||||
|
|
||||||
/* Translate ISA address */
|
/* Translate ISA address. If it fails, we still register the port
|
||||||
|
* with no translated address so that it can be picked up as an IO
|
||||||
|
* port later by the serial driver
|
||||||
|
*/
|
||||||
taddr = of_translate_address(np, reg);
|
taddr = of_translate_address(np, reg);
|
||||||
if (taddr == OF_BAD_ADDR)
|
if (taddr == OF_BAD_ADDR)
|
||||||
return -1;
|
taddr = 0;
|
||||||
|
|
||||||
/* Add port, irq will be dealt with later */
|
/* Add port, irq will be dealt with later */
|
||||||
return add_legacy_port(np, index, UPIO_PORT, reg[1], taddr,
|
return add_legacy_port(np, index, UPIO_PORT, reg[1], taddr,
|
||||||
|
@ -180,7 +183,7 @@ static int __init add_legacy_isa_port(struct device_node *np,
|
||||||
static int __init add_legacy_pci_port(struct device_node *np,
|
static int __init add_legacy_pci_port(struct device_node *np,
|
||||||
struct device_node *pci_dev)
|
struct device_node *pci_dev)
|
||||||
{
|
{
|
||||||
phys_addr_t addr, base;
|
u64 addr, base;
|
||||||
u32 *addrp;
|
u32 *addrp;
|
||||||
unsigned int flags;
|
unsigned int flags;
|
||||||
int iotype, index = -1, lindex = 0;
|
int iotype, index = -1, lindex = 0;
|
||||||
|
|
|
@ -687,7 +687,7 @@ _GLOBAL(kexec_sequence)
|
||||||
/* clear out hardware hash page table and tlb */
|
/* clear out hardware hash page table and tlb */
|
||||||
ld r5,0(r27) /* deref function descriptor */
|
ld r5,0(r27) /* deref function descriptor */
|
||||||
mtctr r5
|
mtctr r5
|
||||||
bctrl /* ppc_md.hash_clear_all(void); */
|
bctrl /* ppc_md.hpte_clear_all(void); */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* kexec image calling is:
|
* kexec image calling is:
|
||||||
|
|
|
@ -557,7 +557,9 @@ unsigned long prom_memparse(const char *ptr, const char **retptr)
|
||||||
static void __init early_cmdline_parse(void)
|
static void __init early_cmdline_parse(void)
|
||||||
{
|
{
|
||||||
struct prom_t *_prom = &RELOC(prom);
|
struct prom_t *_prom = &RELOC(prom);
|
||||||
|
#ifdef CONFIG_PPC64
|
||||||
const char *opt;
|
const char *opt;
|
||||||
|
#endif
|
||||||
char *p;
|
char *p;
|
||||||
int l = 0;
|
int l = 0;
|
||||||
|
|
||||||
|
@ -2030,6 +2032,39 @@ static void __init fixup_device_tree_maple(void)
|
||||||
#define fixup_device_tree_maple()
|
#define fixup_device_tree_maple()
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef CONFIG_PPC_CHRP
|
||||||
|
/* Pegasos lacks the "ranges" property in the isa node */
|
||||||
|
static void __init fixup_device_tree_chrp(void)
|
||||||
|
{
|
||||||
|
phandle isa;
|
||||||
|
u32 isa_ranges[6];
|
||||||
|
char *name;
|
||||||
|
int rc;
|
||||||
|
|
||||||
|
name = "/pci@80000000/isa@c";
|
||||||
|
isa = call_prom("finddevice", 1, 1, ADDR(name));
|
||||||
|
if (!PHANDLE_VALID(isa))
|
||||||
|
return;
|
||||||
|
|
||||||
|
rc = prom_getproplen(isa, "ranges");
|
||||||
|
if (rc != 0 && rc != PROM_ERROR)
|
||||||
|
return;
|
||||||
|
|
||||||
|
prom_printf("Fixing up missing ISA range on Pegasos...\n");
|
||||||
|
|
||||||
|
isa_ranges[0] = 0x1;
|
||||||
|
isa_ranges[1] = 0x0;
|
||||||
|
isa_ranges[2] = 0x01006000;
|
||||||
|
isa_ranges[3] = 0x0;
|
||||||
|
isa_ranges[4] = 0x0;
|
||||||
|
isa_ranges[5] = 0x00010000;
|
||||||
|
prom_setprop(isa, name, "ranges",
|
||||||
|
isa_ranges, sizeof(isa_ranges));
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
#define fixup_device_tree_chrp()
|
||||||
|
#endif
|
||||||
|
|
||||||
#if defined(CONFIG_PPC64) && defined(CONFIG_PPC_PMAC)
|
#if defined(CONFIG_PPC64) && defined(CONFIG_PPC_PMAC)
|
||||||
static void __init fixup_device_tree_pmac(void)
|
static void __init fixup_device_tree_pmac(void)
|
||||||
{
|
{
|
||||||
|
@ -2077,6 +2112,7 @@ static void __init fixup_device_tree_pmac(void)
|
||||||
static void __init fixup_device_tree(void)
|
static void __init fixup_device_tree(void)
|
||||||
{
|
{
|
||||||
fixup_device_tree_maple();
|
fixup_device_tree_maple();
|
||||||
|
fixup_device_tree_chrp();
|
||||||
fixup_device_tree_pmac();
|
fixup_device_tree_pmac();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -144,13 +144,15 @@ void smp_message_recv(int msg, struct pt_regs *regs)
|
||||||
|
|
||||||
void smp_send_reschedule(int cpu)
|
void smp_send_reschedule(int cpu)
|
||||||
{
|
{
|
||||||
smp_ops->message_pass(cpu, PPC_MSG_RESCHEDULE);
|
if (likely(smp_ops))
|
||||||
|
smp_ops->message_pass(cpu, PPC_MSG_RESCHEDULE);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_DEBUGGER
|
#ifdef CONFIG_DEBUGGER
|
||||||
void smp_send_debugger_break(int cpu)
|
void smp_send_debugger_break(int cpu)
|
||||||
{
|
{
|
||||||
smp_ops->message_pass(cpu, PPC_MSG_DEBUGGER_BREAK);
|
if (likely(smp_ops))
|
||||||
|
smp_ops->message_pass(cpu, PPC_MSG_DEBUGGER_BREAK);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -158,7 +160,7 @@ void smp_send_debugger_break(int cpu)
|
||||||
void crash_send_ipi(void (*crash_ipi_callback)(struct pt_regs *))
|
void crash_send_ipi(void (*crash_ipi_callback)(struct pt_regs *))
|
||||||
{
|
{
|
||||||
crash_ipi_function_ptr = crash_ipi_callback;
|
crash_ipi_function_ptr = crash_ipi_callback;
|
||||||
if (crash_ipi_callback) {
|
if (crash_ipi_callback && smp_ops) {
|
||||||
mb();
|
mb();
|
||||||
smp_ops->message_pass(MSG_ALL_BUT_SELF, PPC_MSG_DEBUGGER_BREAK);
|
smp_ops->message_pass(MSG_ALL_BUT_SELF, PPC_MSG_DEBUGGER_BREAK);
|
||||||
}
|
}
|
||||||
|
@ -220,6 +222,9 @@ int smp_call_function (void (*func) (void *info), void *info, int nonatomic,
|
||||||
/* Can deadlock when called with interrupts disabled */
|
/* Can deadlock when called with interrupts disabled */
|
||||||
WARN_ON(irqs_disabled());
|
WARN_ON(irqs_disabled());
|
||||||
|
|
||||||
|
if (unlikely(smp_ops == NULL))
|
||||||
|
return -1;
|
||||||
|
|
||||||
data.func = func;
|
data.func = func;
|
||||||
data.info = info;
|
data.info = info;
|
||||||
atomic_set(&data.started, 0);
|
atomic_set(&data.started, 0);
|
||||||
|
@ -357,7 +362,10 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
|
||||||
smp_store_cpu_info(boot_cpuid);
|
smp_store_cpu_info(boot_cpuid);
|
||||||
cpu_callin_map[boot_cpuid] = 1;
|
cpu_callin_map[boot_cpuid] = 1;
|
||||||
|
|
||||||
max_cpus = smp_ops->probe();
|
if (smp_ops)
|
||||||
|
max_cpus = smp_ops->probe();
|
||||||
|
else
|
||||||
|
max_cpus = 1;
|
||||||
|
|
||||||
smp_space_timers(max_cpus);
|
smp_space_timers(max_cpus);
|
||||||
|
|
||||||
|
@ -453,7 +461,7 @@ void generic_mach_cpu_die(void)
|
||||||
|
|
||||||
static int __devinit cpu_enable(unsigned int cpu)
|
static int __devinit cpu_enable(unsigned int cpu)
|
||||||
{
|
{
|
||||||
if (smp_ops->cpu_enable)
|
if (smp_ops && smp_ops->cpu_enable)
|
||||||
return smp_ops->cpu_enable(cpu);
|
return smp_ops->cpu_enable(cpu);
|
||||||
|
|
||||||
return -ENOSYS;
|
return -ENOSYS;
|
||||||
|
@ -467,7 +475,8 @@ int __devinit __cpu_up(unsigned int cpu)
|
||||||
if (!cpu_enable(cpu))
|
if (!cpu_enable(cpu))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
if (smp_ops->cpu_bootable && !smp_ops->cpu_bootable(cpu))
|
if (smp_ops == NULL ||
|
||||||
|
(smp_ops->cpu_bootable && !smp_ops->cpu_bootable(cpu)))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
/* Make sure callin-map entry is 0 (can be leftover a CPU
|
/* Make sure callin-map entry is 0 (can be leftover a CPU
|
||||||
|
@ -568,7 +577,8 @@ void __init smp_cpus_done(unsigned int max_cpus)
|
||||||
old_mask = current->cpus_allowed;
|
old_mask = current->cpus_allowed;
|
||||||
set_cpus_allowed(current, cpumask_of_cpu(boot_cpuid));
|
set_cpus_allowed(current, cpumask_of_cpu(boot_cpuid));
|
||||||
|
|
||||||
smp_ops->setup_cpu(boot_cpuid);
|
if (smp_ops)
|
||||||
|
smp_ops->setup_cpu(boot_cpuid);
|
||||||
|
|
||||||
set_cpus_allowed(current, old_mask);
|
set_cpus_allowed(current, old_mask);
|
||||||
|
|
||||||
|
|
|
@ -278,7 +278,7 @@ static void unregister_cpu_online(unsigned int cpu)
|
||||||
}
|
}
|
||||||
#endif /* CONFIG_HOTPLUG_CPU */
|
#endif /* CONFIG_HOTPLUG_CPU */
|
||||||
|
|
||||||
static int __devinit sysfs_cpu_notify(struct notifier_block *self,
|
static int __cpuinit sysfs_cpu_notify(struct notifier_block *self,
|
||||||
unsigned long action, void *hcpu)
|
unsigned long action, void *hcpu)
|
||||||
{
|
{
|
||||||
unsigned int cpu = (unsigned int)(long)hcpu;
|
unsigned int cpu = (unsigned int)(long)hcpu;
|
||||||
|
@ -296,7 +296,7 @@ static int __devinit sysfs_cpu_notify(struct notifier_block *self,
|
||||||
return NOTIFY_OK;
|
return NOTIFY_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct notifier_block __devinitdata sysfs_cpu_nb = {
|
static struct notifier_block __cpuinitdata sysfs_cpu_nb = {
|
||||||
.notifier_call = sysfs_cpu_notify,
|
.notifier_call = sysfs_cpu_notify,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -150,13 +150,9 @@ int die(const char *str, struct pt_regs *regs, long err)
|
||||||
if (in_interrupt())
|
if (in_interrupt())
|
||||||
panic("Fatal exception in interrupt");
|
panic("Fatal exception in interrupt");
|
||||||
|
|
||||||
if (panic_on_oops) {
|
if (panic_on_oops)
|
||||||
#ifdef CONFIG_PPC64
|
panic("Fatal exception: panic_on_oops");
|
||||||
printk(KERN_EMERG "Fatal exception: panic in 5 seconds\n");
|
|
||||||
ssleep(5);
|
|
||||||
#endif
|
|
||||||
panic("Fatal exception");
|
|
||||||
}
|
|
||||||
do_exit(err);
|
do_exit(err);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -81,10 +81,14 @@ static int udbg_550_getc(void)
|
||||||
void udbg_init_uart(void __iomem *comport, unsigned int speed,
|
void udbg_init_uart(void __iomem *comport, unsigned int speed,
|
||||||
unsigned int clock)
|
unsigned int clock)
|
||||||
{
|
{
|
||||||
unsigned int dll, base_bauds = clock / 16;
|
unsigned int dll, base_bauds;
|
||||||
|
|
||||||
|
if (clock == 0)
|
||||||
|
clock = 1843200;
|
||||||
if (speed == 0)
|
if (speed == 0)
|
||||||
speed = 9600;
|
speed = 9600;
|
||||||
|
|
||||||
|
base_bauds = clock / 16;
|
||||||
dll = base_bauds / speed;
|
dll = base_bauds / speed;
|
||||||
|
|
||||||
if (comport) {
|
if (comport) {
|
||||||
|
|
|
@ -14,7 +14,8 @@ obj-vdso32 := $(addprefix $(obj)/, $(obj-vdso32))
|
||||||
|
|
||||||
|
|
||||||
EXTRA_CFLAGS := -shared -s -fno-common -fno-builtin
|
EXTRA_CFLAGS := -shared -s -fno-common -fno-builtin
|
||||||
EXTRA_CFLAGS += -nostdlib -Wl,-soname=linux-vdso32.so.1
|
EXTRA_CFLAGS += -nostdlib -Wl,-soname=linux-vdso32.so.1 \
|
||||||
|
$(call ld-option, -Wl$(comma)--hash-style=sysv)
|
||||||
EXTRA_AFLAGS := -D__VDSO32__ -s
|
EXTRA_AFLAGS := -D__VDSO32__ -s
|
||||||
|
|
||||||
obj-y += vdso32_wrapper.o
|
obj-y += vdso32_wrapper.o
|
||||||
|
|
|
@ -14,6 +14,7 @@ SECTIONS
|
||||||
{
|
{
|
||||||
. = VDSO32_LBASE + SIZEOF_HEADERS;
|
. = VDSO32_LBASE + SIZEOF_HEADERS;
|
||||||
.hash : { *(.hash) } :text
|
.hash : { *(.hash) } :text
|
||||||
|
.gnu.hash : { *(.gnu.hash) }
|
||||||
.dynsym : { *(.dynsym) }
|
.dynsym : { *(.dynsym) }
|
||||||
.dynstr : { *(.dynstr) }
|
.dynstr : { *(.dynstr) }
|
||||||
.gnu.version : { *(.gnu.version) }
|
.gnu.version : { *(.gnu.version) }
|
||||||
|
|
|
@ -8,7 +8,8 @@ targets := $(obj-vdso64) vdso64.so
|
||||||
obj-vdso64 := $(addprefix $(obj)/, $(obj-vdso64))
|
obj-vdso64 := $(addprefix $(obj)/, $(obj-vdso64))
|
||||||
|
|
||||||
EXTRA_CFLAGS := -shared -s -fno-common -fno-builtin
|
EXTRA_CFLAGS := -shared -s -fno-common -fno-builtin
|
||||||
EXTRA_CFLAGS += -nostdlib -Wl,-soname=linux-vdso64.so.1
|
EXTRA_CFLAGS += -nostdlib -Wl,-soname=linux-vdso64.so.1 \
|
||||||
|
$(call ld-option, -Wl$(comma)--hash-style=sysv)
|
||||||
EXTRA_AFLAGS := -D__VDSO64__ -s
|
EXTRA_AFLAGS := -D__VDSO64__ -s
|
||||||
|
|
||||||
obj-y += vdso64_wrapper.o
|
obj-y += vdso64_wrapper.o
|
||||||
|
|
|
@ -12,6 +12,7 @@ SECTIONS
|
||||||
{
|
{
|
||||||
. = VDSO64_LBASE + SIZEOF_HEADERS;
|
. = VDSO64_LBASE + SIZEOF_HEADERS;
|
||||||
.hash : { *(.hash) } :text
|
.hash : { *(.hash) } :text
|
||||||
|
.gnu.hash : { *(.gnu.hash) }
|
||||||
.dynsym : { *(.dynsym) }
|
.dynsym : { *(.dynsym) }
|
||||||
.dynstr : { *(.dynstr) }
|
.dynstr : { *(.dynstr) }
|
||||||
.gnu.version : { *(.gnu.version) }
|
.gnu.version : { *(.gnu.version) }
|
||||||
|
|
|
@ -320,7 +320,8 @@ void __init lmb_enforce_memory_limit(unsigned long memory_limit)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
lmb.rmo_size = lmb.memory.region[0].size;
|
if (lmb.memory.region[0].size < lmb.rmo_size)
|
||||||
|
lmb.rmo_size = lmb.memory.region[0].size;
|
||||||
|
|
||||||
/* And truncate any reserves above the limit also. */
|
/* And truncate any reserves above the limit also. */
|
||||||
for (i = 0; i < lmb.reserved.cnt; i++) {
|
for (i = 0; i < lmb.reserved.cnt; i++) {
|
||||||
|
|
|
@ -291,10 +291,6 @@ void __init chrp_setup_arch(void)
|
||||||
|
|
||||||
pci_create_OF_bus_map();
|
pci_create_OF_bus_map();
|
||||||
|
|
||||||
#ifdef CONFIG_SMP
|
|
||||||
smp_ops = &chrp_smp_ops;
|
|
||||||
#endif /* CONFIG_SMP */
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Print the banner, then scroll down so boot progress
|
* Print the banner, then scroll down so boot progress
|
||||||
* can be printed. -- Cort
|
* can be printed. -- Cort
|
||||||
|
@ -479,6 +475,14 @@ void __init chrp_init_IRQ(void)
|
||||||
chrp_find_openpic();
|
chrp_find_openpic();
|
||||||
chrp_find_8259();
|
chrp_find_8259();
|
||||||
|
|
||||||
|
#ifdef CONFIG_SMP
|
||||||
|
/* Pegasos has no MPIC, those ops would make it crash. It might be an
|
||||||
|
* option to move setting them to after we probe the PIC though
|
||||||
|
*/
|
||||||
|
if (chrp_mpic != NULL)
|
||||||
|
smp_ops = &chrp_smp_ops;
|
||||||
|
#endif /* CONFIG_SMP */
|
||||||
|
|
||||||
if (_chrp_type == _CHRP_Pegasos)
|
if (_chrp_type == _CHRP_Pegasos)
|
||||||
ppc_md.get_irq = i8259_irq;
|
ppc_md.get_irq = i8259_irq;
|
||||||
|
|
||||||
|
|
|
@ -221,10 +221,17 @@ static void __init maple_init_IRQ(void)
|
||||||
* in Maple device-tree where the type of the controller is
|
* in Maple device-tree where the type of the controller is
|
||||||
* open-pic and not interrupt-controller
|
* open-pic and not interrupt-controller
|
||||||
*/
|
*/
|
||||||
for_each_node_by_type(np, "open-pic") {
|
|
||||||
mpic_node = np;
|
for_each_node_by_type(np, "interrupt-controller")
|
||||||
break;
|
if (device_is_compatible(np, "open-pic")) {
|
||||||
}
|
mpic_node = np;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if (mpic_node == NULL)
|
||||||
|
for_each_node_by_type(np, "open-pic") {
|
||||||
|
mpic_node = np;
|
||||||
|
break;
|
||||||
|
}
|
||||||
if (mpic_node == NULL) {
|
if (mpic_node == NULL) {
|
||||||
printk(KERN_ERR
|
printk(KERN_ERR
|
||||||
"Failed to locate the MPIC interrupt controller\n");
|
"Failed to locate the MPIC interrupt controller\n");
|
||||||
|
@ -252,6 +259,8 @@ static void __init maple_init_IRQ(void)
|
||||||
|
|
||||||
/* XXX Maple specific bits */
|
/* XXX Maple specific bits */
|
||||||
flags |= MPIC_BROKEN_U3 | MPIC_WANTS_RESET;
|
flags |= MPIC_BROKEN_U3 | MPIC_WANTS_RESET;
|
||||||
|
/* All U3/U4 are big-endian, older SLOF firmware doesn't encode this */
|
||||||
|
flags |= MPIC_BIG_ENDIAN;
|
||||||
|
|
||||||
/* Setup the openpic driver. More device-tree junks, we hard code no
|
/* Setup the openpic driver. More device-tree junks, we hard code no
|
||||||
* ISUs for now. I'll have to revisit some stuffs with the folks doing
|
* ISUs for now. I'll have to revisit some stuffs with the folks doing
|
||||||
|
|
|
@ -10,19 +10,32 @@
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
#include <linux/fb.h>
|
#include <linux/fb.h>
|
||||||
#include <linux/backlight.h>
|
#include <linux/backlight.h>
|
||||||
|
#include <linux/adb.h>
|
||||||
|
#include <linux/pmu.h>
|
||||||
|
#include <asm/atomic.h>
|
||||||
#include <asm/prom.h>
|
#include <asm/prom.h>
|
||||||
#include <asm/backlight.h>
|
#include <asm/backlight.h>
|
||||||
|
|
||||||
#define OLD_BACKLIGHT_MAX 15
|
#define OLD_BACKLIGHT_MAX 15
|
||||||
|
|
||||||
static void pmac_backlight_key_worker(void *data);
|
static void pmac_backlight_key_worker(void *data);
|
||||||
static DECLARE_WORK(pmac_backlight_key_work, pmac_backlight_key_worker, NULL);
|
static void pmac_backlight_set_legacy_worker(void *data);
|
||||||
|
|
||||||
/* Although this variable is used in interrupt context, it makes no sense to
|
static DECLARE_WORK(pmac_backlight_key_work, pmac_backlight_key_worker, NULL);
|
||||||
* protect it. No user is able to produce enough key events per second and
|
static DECLARE_WORK(pmac_backlight_set_legacy_work, pmac_backlight_set_legacy_worker, NULL);
|
||||||
|
|
||||||
|
/* Although these variables are used in interrupt context, it makes no sense to
|
||||||
|
* protect them. No user is able to produce enough key events per second and
|
||||||
* notice the errors that might happen.
|
* notice the errors that might happen.
|
||||||
*/
|
*/
|
||||||
static int pmac_backlight_key_queued;
|
static int pmac_backlight_key_queued;
|
||||||
|
static int pmac_backlight_set_legacy_queued;
|
||||||
|
|
||||||
|
/* The via-pmu code allows the backlight to be grabbed, in which case the
|
||||||
|
* in-kernel control of the brightness needs to be disabled. This should
|
||||||
|
* only be used by really old PowerBooks.
|
||||||
|
*/
|
||||||
|
static atomic_t kernel_backlight_disabled = ATOMIC_INIT(0);
|
||||||
|
|
||||||
/* Protect the pmac_backlight variable */
|
/* Protect the pmac_backlight variable */
|
||||||
DEFINE_MUTEX(pmac_backlight_mutex);
|
DEFINE_MUTEX(pmac_backlight_mutex);
|
||||||
|
@ -82,6 +95,9 @@ int pmac_backlight_curve_lookup(struct fb_info *info, int value)
|
||||||
|
|
||||||
static void pmac_backlight_key_worker(void *data)
|
static void pmac_backlight_key_worker(void *data)
|
||||||
{
|
{
|
||||||
|
if (atomic_read(&kernel_backlight_disabled))
|
||||||
|
return;
|
||||||
|
|
||||||
mutex_lock(&pmac_backlight_mutex);
|
mutex_lock(&pmac_backlight_mutex);
|
||||||
if (pmac_backlight) {
|
if (pmac_backlight) {
|
||||||
struct backlight_properties *props;
|
struct backlight_properties *props;
|
||||||
|
@ -107,8 +123,12 @@ static void pmac_backlight_key_worker(void *data)
|
||||||
mutex_unlock(&pmac_backlight_mutex);
|
mutex_unlock(&pmac_backlight_mutex);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* This function is called in interrupt context */
|
||||||
void pmac_backlight_key(int direction)
|
void pmac_backlight_key(int direction)
|
||||||
{
|
{
|
||||||
|
if (atomic_read(&kernel_backlight_disabled))
|
||||||
|
return;
|
||||||
|
|
||||||
/* we can receive multiple interrupts here, but the scheduled work
|
/* we can receive multiple interrupts here, but the scheduled work
|
||||||
* will run only once, with the last value
|
* will run only once, with the last value
|
||||||
*/
|
*/
|
||||||
|
@ -116,7 +136,7 @@ void pmac_backlight_key(int direction)
|
||||||
schedule_work(&pmac_backlight_key_work);
|
schedule_work(&pmac_backlight_key_work);
|
||||||
}
|
}
|
||||||
|
|
||||||
int pmac_backlight_set_legacy_brightness(int brightness)
|
static int __pmac_backlight_set_legacy_brightness(int brightness)
|
||||||
{
|
{
|
||||||
int error = -ENXIO;
|
int error = -ENXIO;
|
||||||
|
|
||||||
|
@ -145,6 +165,28 @@ int pmac_backlight_set_legacy_brightness(int brightness)
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void pmac_backlight_set_legacy_worker(void *data)
|
||||||
|
{
|
||||||
|
if (atomic_read(&kernel_backlight_disabled))
|
||||||
|
return;
|
||||||
|
|
||||||
|
__pmac_backlight_set_legacy_brightness(pmac_backlight_set_legacy_queued);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* This function is called in interrupt context */
|
||||||
|
void pmac_backlight_set_legacy_brightness_pmu(int brightness) {
|
||||||
|
if (atomic_read(&kernel_backlight_disabled))
|
||||||
|
return;
|
||||||
|
|
||||||
|
pmac_backlight_set_legacy_queued = brightness;
|
||||||
|
schedule_work(&pmac_backlight_set_legacy_work);
|
||||||
|
}
|
||||||
|
|
||||||
|
int pmac_backlight_set_legacy_brightness(int brightness)
|
||||||
|
{
|
||||||
|
return __pmac_backlight_set_legacy_brightness(brightness);
|
||||||
|
}
|
||||||
|
|
||||||
int pmac_backlight_get_legacy_brightness()
|
int pmac_backlight_get_legacy_brightness()
|
||||||
{
|
{
|
||||||
int result = -ENXIO;
|
int result = -ENXIO;
|
||||||
|
@ -167,6 +209,16 @@ int pmac_backlight_get_legacy_brightness()
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void pmac_backlight_disable()
|
||||||
|
{
|
||||||
|
atomic_inc(&kernel_backlight_disabled);
|
||||||
|
}
|
||||||
|
|
||||||
|
void pmac_backlight_enable()
|
||||||
|
{
|
||||||
|
atomic_dec(&kernel_backlight_disabled);
|
||||||
|
}
|
||||||
|
|
||||||
EXPORT_SYMBOL_GPL(pmac_backlight);
|
EXPORT_SYMBOL_GPL(pmac_backlight);
|
||||||
EXPORT_SYMBOL_GPL(pmac_backlight_mutex);
|
EXPORT_SYMBOL_GPL(pmac_backlight_mutex);
|
||||||
EXPORT_SYMBOL_GPL(pmac_has_backlight_type);
|
EXPORT_SYMBOL_GPL(pmac_has_backlight_type);
|
||||||
|
|
|
@ -181,13 +181,18 @@ static void __init bootx_add_chosen_props(unsigned long base,
|
||||||
}
|
}
|
||||||
|
|
||||||
static void __init bootx_add_display_props(unsigned long base,
|
static void __init bootx_add_display_props(unsigned long base,
|
||||||
unsigned long *mem_end)
|
unsigned long *mem_end,
|
||||||
|
int has_real_node)
|
||||||
{
|
{
|
||||||
boot_infos_t *bi = bootx_info;
|
boot_infos_t *bi = bootx_info;
|
||||||
u32 tmp;
|
u32 tmp;
|
||||||
|
|
||||||
bootx_dt_add_prop("linux,boot-display", NULL, 0, mem_end);
|
if (has_real_node) {
|
||||||
bootx_dt_add_prop("linux,opened", NULL, 0, mem_end);
|
bootx_dt_add_prop("linux,boot-display", NULL, 0, mem_end);
|
||||||
|
bootx_dt_add_prop("linux,opened", NULL, 0, mem_end);
|
||||||
|
} else
|
||||||
|
bootx_dt_add_prop("linux,bootx-noscreen", NULL, 0, mem_end);
|
||||||
|
|
||||||
tmp = bi->dispDeviceDepth;
|
tmp = bi->dispDeviceDepth;
|
||||||
bootx_dt_add_prop("linux,bootx-depth", &tmp, 4, mem_end);
|
bootx_dt_add_prop("linux,bootx-depth", &tmp, 4, mem_end);
|
||||||
tmp = bi->dispDeviceRect[2] - bi->dispDeviceRect[0];
|
tmp = bi->dispDeviceRect[2] - bi->dispDeviceRect[0];
|
||||||
|
@ -241,11 +246,6 @@ static void __init bootx_scan_dt_build_strings(unsigned long base,
|
||||||
DBG(" detected display ! adding properties names !\n");
|
DBG(" detected display ! adding properties names !\n");
|
||||||
bootx_dt_add_string("linux,boot-display", mem_end);
|
bootx_dt_add_string("linux,boot-display", mem_end);
|
||||||
bootx_dt_add_string("linux,opened", mem_end);
|
bootx_dt_add_string("linux,opened", mem_end);
|
||||||
bootx_dt_add_string("linux,bootx-depth", mem_end);
|
|
||||||
bootx_dt_add_string("linux,bootx-width", mem_end);
|
|
||||||
bootx_dt_add_string("linux,bootx-height", mem_end);
|
|
||||||
bootx_dt_add_string("linux,bootx-linebytes", mem_end);
|
|
||||||
bootx_dt_add_string("linux,bootx-addr", mem_end);
|
|
||||||
strncpy(bootx_disp_path, namep, 255);
|
strncpy(bootx_disp_path, namep, 255);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -329,10 +329,13 @@ static void __init bootx_scan_dt_build_struct(unsigned long base,
|
||||||
ppp = &pp->next;
|
ppp = &pp->next;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (node == bootx_node_chosen)
|
if (node == bootx_node_chosen) {
|
||||||
bootx_add_chosen_props(base, mem_end);
|
bootx_add_chosen_props(base, mem_end);
|
||||||
if (node == bootx_info->dispDeviceRegEntryOffset)
|
if (bootx_info->dispDeviceRegEntryOffset == 0)
|
||||||
bootx_add_display_props(base, mem_end);
|
bootx_add_display_props(base, mem_end, 0);
|
||||||
|
}
|
||||||
|
else if (node == bootx_info->dispDeviceRegEntryOffset)
|
||||||
|
bootx_add_display_props(base, mem_end, 1);
|
||||||
|
|
||||||
/* do all our children */
|
/* do all our children */
|
||||||
cpp = &np->child;
|
cpp = &np->child;
|
||||||
|
@ -374,6 +377,14 @@ static unsigned long __init bootx_flatten_dt(unsigned long start)
|
||||||
mem_end += 4;
|
mem_end += 4;
|
||||||
bootx_dt_strend = mem_end;
|
bootx_dt_strend = mem_end;
|
||||||
bootx_scan_dt_build_strings(base, 4, &mem_end);
|
bootx_scan_dt_build_strings(base, 4, &mem_end);
|
||||||
|
/* Add some strings */
|
||||||
|
bootx_dt_add_string("linux,bootx-noscreen", &mem_end);
|
||||||
|
bootx_dt_add_string("linux,bootx-depth", &mem_end);
|
||||||
|
bootx_dt_add_string("linux,bootx-width", &mem_end);
|
||||||
|
bootx_dt_add_string("linux,bootx-height", &mem_end);
|
||||||
|
bootx_dt_add_string("linux,bootx-linebytes", &mem_end);
|
||||||
|
bootx_dt_add_string("linux,bootx-addr", &mem_end);
|
||||||
|
/* Wrap up strings */
|
||||||
hdr->off_dt_strings = bootx_dt_strbase - mem_start;
|
hdr->off_dt_strings = bootx_dt_strbase - mem_start;
|
||||||
hdr->dt_strings_size = bootx_dt_strend - bootx_dt_strbase;
|
hdr->dt_strings_size = bootx_dt_strend - bootx_dt_strbase;
|
||||||
|
|
||||||
|
@ -471,6 +482,7 @@ void __init bootx_init(unsigned long r3, unsigned long r4)
|
||||||
if (bi->dispDeviceDepth == 16)
|
if (bi->dispDeviceDepth == 16)
|
||||||
bi->dispDeviceDepth = 15;
|
bi->dispDeviceDepth = 15;
|
||||||
|
|
||||||
|
|
||||||
#ifdef CONFIG_BOOTX_TEXT
|
#ifdef CONFIG_BOOTX_TEXT
|
||||||
ptr = (unsigned long)bi->logicalDisplayBase;
|
ptr = (unsigned long)bi->logicalDisplayBase;
|
||||||
ptr += bi->dispDeviceRect[1] * bi->dispDeviceRowBytes;
|
ptr += bi->dispDeviceRect[1] * bi->dispDeviceRowBytes;
|
||||||
|
@ -508,6 +520,7 @@ void __init bootx_init(unsigned long r3, unsigned long r4)
|
||||||
#ifdef CONFIG_BOOTX_TEXT
|
#ifdef CONFIG_BOOTX_TEXT
|
||||||
btext_welcome(bi);
|
btext_welcome(bi);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* New BootX enters kernel with MMU off, i/os are not allowed
|
/* New BootX enters kernel with MMU off, i/os are not allowed
|
||||||
* here. This hack will have been done by the boostrap anyway.
|
* here. This hack will have been done by the boostrap anyway.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -10,6 +10,8 @@
|
||||||
* that is iMac G5 and latest single CPU desktop.
|
* that is iMac G5 and latest single CPU desktop.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#undef DEBUG
|
||||||
|
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/types.h>
|
#include <linux/types.h>
|
||||||
#include <linux/errno.h>
|
#include <linux/errno.h>
|
||||||
|
@ -30,13 +32,7 @@
|
||||||
#include <asm/smu.h>
|
#include <asm/smu.h>
|
||||||
#include <asm/pmac_pfunc.h>
|
#include <asm/pmac_pfunc.h>
|
||||||
|
|
||||||
#undef DEBUG
|
#define DBG(fmt...) pr_debug(fmt)
|
||||||
|
|
||||||
#ifdef DEBUG
|
|
||||||
#define DBG(fmt...) printk(fmt)
|
|
||||||
#else
|
|
||||||
#define DBG(fmt...)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* see 970FX user manual */
|
/* see 970FX user manual */
|
||||||
|
|
||||||
|
@ -82,8 +78,6 @@ static struct freq_attr* g5_cpu_freqs_attr[] = {
|
||||||
/* Power mode data is an array of the 32 bits PCR values to use for
|
/* Power mode data is an array of the 32 bits PCR values to use for
|
||||||
* the various frequencies, retrieved from the device-tree
|
* the various frequencies, retrieved from the device-tree
|
||||||
*/
|
*/
|
||||||
static u32 *g5_pmode_data;
|
|
||||||
static int g5_pmode_max;
|
|
||||||
static int g5_pmode_cur;
|
static int g5_pmode_cur;
|
||||||
|
|
||||||
static void (*g5_switch_volt)(int speed_mode);
|
static void (*g5_switch_volt)(int speed_mode);
|
||||||
|
@ -93,6 +87,11 @@ static int (*g5_query_freq)(void);
|
||||||
static DEFINE_MUTEX(g5_switch_mutex);
|
static DEFINE_MUTEX(g5_switch_mutex);
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef CONFIG_PMAC_SMU
|
||||||
|
|
||||||
|
static u32 *g5_pmode_data;
|
||||||
|
static int g5_pmode_max;
|
||||||
|
|
||||||
static struct smu_sdbp_fvt *g5_fvt_table; /* table of op. points */
|
static struct smu_sdbp_fvt *g5_fvt_table; /* table of op. points */
|
||||||
static int g5_fvt_count; /* number of op. points */
|
static int g5_fvt_count; /* number of op. points */
|
||||||
static int g5_fvt_cur; /* current op. point */
|
static int g5_fvt_cur; /* current op. point */
|
||||||
|
@ -209,6 +208,16 @@ static int g5_scom_query_freq(void)
|
||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Fake voltage switching for platforms with missing support
|
||||||
|
*/
|
||||||
|
|
||||||
|
static void g5_dummy_switch_volt(int speed_mode)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif /* CONFIG_PMAC_SMU */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Platform function based voltage switching for PowerMac7,2 & 7,3
|
* Platform function based voltage switching for PowerMac7,2 & 7,3
|
||||||
*/
|
*/
|
||||||
|
@ -248,6 +257,9 @@ static int g5_pfunc_switch_freq(int speed_mode)
|
||||||
struct pmf_args args;
|
struct pmf_args args;
|
||||||
u32 done = 0;
|
u32 done = 0;
|
||||||
unsigned long timeout;
|
unsigned long timeout;
|
||||||
|
int rc;
|
||||||
|
|
||||||
|
DBG("g5_pfunc_switch_freq(%d)\n", speed_mode);
|
||||||
|
|
||||||
/* If frequency is going up, first ramp up the voltage */
|
/* If frequency is going up, first ramp up the voltage */
|
||||||
if (speed_mode < g5_pmode_cur)
|
if (speed_mode < g5_pmode_cur)
|
||||||
|
@ -255,9 +267,12 @@ static int g5_pfunc_switch_freq(int speed_mode)
|
||||||
|
|
||||||
/* Do it */
|
/* Do it */
|
||||||
if (speed_mode == CPUFREQ_HIGH)
|
if (speed_mode == CPUFREQ_HIGH)
|
||||||
pmf_call_one(pfunc_cpu_setfreq_high, NULL);
|
rc = pmf_call_one(pfunc_cpu_setfreq_high, NULL);
|
||||||
else
|
else
|
||||||
pmf_call_one(pfunc_cpu_setfreq_low, NULL);
|
rc = pmf_call_one(pfunc_cpu_setfreq_low, NULL);
|
||||||
|
|
||||||
|
if (rc)
|
||||||
|
printk(KERN_WARNING "cpufreq: pfunc switch error %d\n", rc);
|
||||||
|
|
||||||
/* It's an irq GPIO so we should be able to just block here,
|
/* It's an irq GPIO so we should be able to just block here,
|
||||||
* I'll do that later after I've properly tested the IRQ code for
|
* I'll do that later after I've properly tested the IRQ code for
|
||||||
|
@ -296,13 +311,6 @@ static int g5_pfunc_query_freq(void)
|
||||||
return val ? CPUFREQ_HIGH : CPUFREQ_LOW;
|
return val ? CPUFREQ_HIGH : CPUFREQ_LOW;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* Fake voltage switching for platforms with missing support
|
|
||||||
*/
|
|
||||||
|
|
||||||
static void g5_dummy_switch_volt(int speed_mode)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Common interface to the cpufreq core
|
* Common interface to the cpufreq core
|
||||||
|
@ -375,6 +383,8 @@ static struct cpufreq_driver g5_cpufreq_driver = {
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef CONFIG_PMAC_SMU
|
||||||
|
|
||||||
static int __init g5_neo2_cpufreq_init(struct device_node *cpus)
|
static int __init g5_neo2_cpufreq_init(struct device_node *cpus)
|
||||||
{
|
{
|
||||||
struct device_node *cpunode;
|
struct device_node *cpunode;
|
||||||
|
@ -525,6 +535,9 @@ static int __init g5_neo2_cpufreq_init(struct device_node *cpus)
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif /* CONFIG_PMAC_SMU */
|
||||||
|
|
||||||
|
|
||||||
static int __init g5_pm72_cpufreq_init(struct device_node *cpus)
|
static int __init g5_pm72_cpufreq_init(struct device_node *cpus)
|
||||||
{
|
{
|
||||||
struct device_node *cpuid = NULL, *hwclock = NULL, *cpunode = NULL;
|
struct device_node *cpuid = NULL, *hwclock = NULL, *cpunode = NULL;
|
||||||
|
@ -533,6 +546,9 @@ static int __init g5_pm72_cpufreq_init(struct device_node *cpus)
|
||||||
u64 max_freq, min_freq, ih, il;
|
u64 max_freq, min_freq, ih, il;
|
||||||
int has_volt = 1, rc = 0;
|
int has_volt = 1, rc = 0;
|
||||||
|
|
||||||
|
DBG("cpufreq: Initializing for PowerMac7,2, PowerMac7,3 and"
|
||||||
|
" RackMac3,1...\n");
|
||||||
|
|
||||||
/* Get first CPU node */
|
/* Get first CPU node */
|
||||||
for (cpunode = NULL;
|
for (cpunode = NULL;
|
||||||
(cpunode = of_get_next_child(cpus, cpunode)) != NULL;) {
|
(cpunode = of_get_next_child(cpus, cpunode)) != NULL;) {
|
||||||
|
@ -636,6 +652,15 @@ static int __init g5_pm72_cpufreq_init(struct device_node *cpus)
|
||||||
*/
|
*/
|
||||||
ih = *((u32 *)(eeprom + 0x10));
|
ih = *((u32 *)(eeprom + 0x10));
|
||||||
il = *((u32 *)(eeprom + 0x20));
|
il = *((u32 *)(eeprom + 0x20));
|
||||||
|
|
||||||
|
/* Check for machines with no useful settings */
|
||||||
|
if (il == ih) {
|
||||||
|
printk(KERN_WARNING "cpufreq: No low frequency mode available"
|
||||||
|
" on this model !\n");
|
||||||
|
rc = -ENODEV;
|
||||||
|
goto bail;
|
||||||
|
}
|
||||||
|
|
||||||
min_freq = 0;
|
min_freq = 0;
|
||||||
if (ih != 0 && il != 0)
|
if (ih != 0 && il != 0)
|
||||||
min_freq = (max_freq * il) / ih;
|
min_freq = (max_freq * il) / ih;
|
||||||
|
@ -643,7 +668,7 @@ static int __init g5_pm72_cpufreq_init(struct device_node *cpus)
|
||||||
/* Sanity check */
|
/* Sanity check */
|
||||||
if (min_freq >= max_freq || min_freq < 1000) {
|
if (min_freq >= max_freq || min_freq < 1000) {
|
||||||
printk(KERN_ERR "cpufreq: Can't calculate low frequency !\n");
|
printk(KERN_ERR "cpufreq: Can't calculate low frequency !\n");
|
||||||
rc = -ENODEV;
|
rc = -ENXIO;
|
||||||
goto bail;
|
goto bail;
|
||||||
}
|
}
|
||||||
g5_cpu_freqs[0].frequency = max_freq;
|
g5_cpu_freqs[0].frequency = max_freq;
|
||||||
|
@ -690,16 +715,10 @@ static int __init g5_pm72_cpufreq_init(struct device_node *cpus)
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __init g5_rm31_cpufreq_init(struct device_node *cpus)
|
|
||||||
{
|
|
||||||
/* NYI */
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int __init g5_cpufreq_init(void)
|
static int __init g5_cpufreq_init(void)
|
||||||
{
|
{
|
||||||
struct device_node *cpus;
|
struct device_node *cpus;
|
||||||
int rc;
|
int rc = 0;
|
||||||
|
|
||||||
cpus = of_find_node_by_path("/cpus");
|
cpus = of_find_node_by_path("/cpus");
|
||||||
if (cpus == NULL) {
|
if (cpus == NULL) {
|
||||||
|
@ -708,12 +727,13 @@ static int __init g5_cpufreq_init(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (machine_is_compatible("PowerMac7,2") ||
|
if (machine_is_compatible("PowerMac7,2") ||
|
||||||
machine_is_compatible("PowerMac7,3"))
|
machine_is_compatible("PowerMac7,3") ||
|
||||||
|
machine_is_compatible("RackMac3,1"))
|
||||||
rc = g5_pm72_cpufreq_init(cpus);
|
rc = g5_pm72_cpufreq_init(cpus);
|
||||||
else if (machine_is_compatible("RackMac3,1"))
|
#ifdef CONFIG_PMAC_SMU
|
||||||
rc = g5_rm31_cpufreq_init(cpus);
|
|
||||||
else
|
else
|
||||||
rc = g5_neo2_cpufreq_init(cpus);
|
rc = g5_neo2_cpufreq_init(cpus);
|
||||||
|
#endif /* CONFIG_PMAC_SMU */
|
||||||
|
|
||||||
of_node_put(cpus);
|
of_node_put(cpus);
|
||||||
return rc;
|
return rc;
|
||||||
|
|
|
@ -501,7 +501,8 @@ static void pseries_dedicated_idle_sleep(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Cede if the other thread is not idle, so that it can
|
* If not SMT, cede processor. If CPU is running SMT
|
||||||
|
* cede if the other thread is not idle, so that it can
|
||||||
* go single-threaded. If the other thread is idle,
|
* go single-threaded. If the other thread is idle,
|
||||||
* we ask the hypervisor if it has pending work it
|
* we ask the hypervisor if it has pending work it
|
||||||
* wants to do and cede if it does. Otherwise we keep
|
* wants to do and cede if it does. Otherwise we keep
|
||||||
|
@ -514,7 +515,8 @@ static void pseries_dedicated_idle_sleep(void)
|
||||||
* very low priority. The cede enables interrupts, which
|
* very low priority. The cede enables interrupts, which
|
||||||
* doesn't matter here.
|
* doesn't matter here.
|
||||||
*/
|
*/
|
||||||
if (!lppaca[cpu ^ 1].idle || poll_pending() == H_PENDING)
|
if (!cpu_has_feature(CPU_FTR_SMT) || !lppaca[cpu ^ 1].idle
|
||||||
|
|| poll_pending() == H_PENDING)
|
||||||
cede_processor();
|
cede_processor();
|
||||||
|
|
||||||
out:
|
out:
|
||||||
|
|
|
@ -8,6 +8,7 @@ SECTIONS
|
||||||
. = + SIZEOF_HEADERS;
|
. = + SIZEOF_HEADERS;
|
||||||
.interp : { *(.interp) }
|
.interp : { *(.interp) }
|
||||||
.hash : { *(.hash) }
|
.hash : { *(.hash) }
|
||||||
|
.gnu.hash : { *(.gnu.hash) }
|
||||||
.dynsym : { *(.dynsym) }
|
.dynsym : { *(.dynsym) }
|
||||||
.dynstr : { *(.dynstr) }
|
.dynstr : { *(.dynstr) }
|
||||||
.rel.text : { *(.rel.text) }
|
.rel.text : { *(.rel.text) }
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue