Skip to content

L
linux
Commit 9db73724 authored by David Howells's avatar David Howells Committed by David Howells
Browse files
Options

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 

Conflicts:

	drivers/ata/libata-scsi.c
	include/linux/libata.h

Futher merge of Linus's head and compilation fixups.
Signed-Off-By: default avatarDavid Howells <dhowells@redhat.com>
parents 4c1ac1b4 e6243863
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 32298 additions and 9055 deletions
Documentation/powerpc/booting-without-of.txt
View file @ 9db73724
......@@ -6,6 +6,8 @@
IBM Corp.
(c) 2005 Becky Bruce <becky.bruce at freescale.com>,
Freescale Semiconductor, FSL SOC and 32-bit additions
(c) 2006 MontaVista Software, Inc.
Flash chip node definition
May 18, 2005: Rev 0.1 - Initial draft, no chapter III yet.
......@@ -1693,6 +1695,43 @@ platforms are moved over to use the flattened-device-tree model.
};
};
g) Flash chip nodes
Flash chips (Memory Technology Devices) are often used for solid state
file systems on embedded devices.
Required properties:
- device_type : has to be "rom"
- compatible : Should specify what this ROM device is compatible with
(i.e. "onenand"). Currently, this is most likely to be "direct-mapped"
(which corresponds to the MTD physmap mapping driver).
- regs : Offset and length of the register set (or memory mapping) for
the device.
Recommended properties :
- bank-width : Width of the flash data bus in bytes. Required
for the NOR flashes (compatible == "direct-mapped" and others) ONLY.
- partitions : Several pairs of 32-bit values where the first value is
partition's offset from the start of the device and the second one is
partition size in bytes with LSB used to signify a read only
partititon (so, the parition size should always be an even number).
- partition-names : The list of concatenated zero terminated strings
representing the partition names.
Example:
flash@ff000000 {
device_type = "rom";
compatible = "direct-mapped";
regs = <ff000000 01000000>;
bank-width = <4>;
partitions = <00000000 00f80000
00f80000 00080001>;
partition-names = "fs\0firmware";
};
More devices will be defined as this spec matures.
......
Documentation/powerpc/mpc52xx-device-tree-bindings.txt 0 → 100644
View file @ 9db73724
MPC52xx Device Tree Bindings
----------------------------
(c) 2006 Secret Lab Technologies Ltd
Grant Likely <grant.likely at secretlab.ca>
I - Introduction
================
Boards supported by the arch/powerpc architecture require device tree be
passed by the boot loader to the kernel at boot time. The device tree
describes what devices are present on the board and how they are
connected. The device tree can either be passed as a binary blob (as
described in Documentation/powerpc/booting-without-of.txt), or passed
by Open Firmare (IEEE 1275) compatible firmware using an OF compatible
client interface API.
This document specifies the requirements on the device-tree for mpc52xx
based boards. These requirements are above and beyond the details
specified in either the OpenFirmware spec or booting-without-of.txt
All new mpc52xx-based boards are expected to match this document. In
cases where this document is not sufficient to support a new board port,
this document should be updated as part of adding the new board support.
II - Philosophy
===============
The core of this document is naming convention. The whole point of
defining this convention is to reduce or eliminate the number of
special cases required to support a 52xx board. If all 52xx boards
follow the same convention, then generic 52xx support code will work
rather than coding special cases for each new board.
This section tries to capture the thought process behind why the naming
convention is what it is.
1. Node names
-------------
There is strong convention/requirements already established for children
of the root node. 'cpus' describes the processor cores, 'memory'
describes memory, and 'chosen' provides boot configuration. Other nodes
are added to describe devices attached to the processor local bus.
Following convention already established with other system-on-chip
processors, MPC52xx boards must have an 'soc5200' node as a child of the
root node.
The soc5200 node holds child nodes for all on chip devices. Child nodes
are typically named after the configured function. ie. the FEC node is
named 'ethernet', and a PSC in uart mode is named 'serial'.
2. device_type property
-----------------------
similar to the node name convention above; the device_type reflects the
configured function of a device. ie. 'serial' for a uart and 'spi' for
an spi controller. However, while node names *should* reflect the
configured function, device_type *must* match the configured function
exactly.
3. compatible property
----------------------
Since device_type isn't enough to match devices to drivers, there also
needs to be a naming convention for the compatible property. Compatible
is an list of device descriptions sorted from specific to generic. For
the mpc52xx, the required format for each compatible value is
<chip>-<device>[-<mode>]. At the minimum, the list shall contain two
items; the first specifying the exact chip, and the second specifying
mpc52xx for the chip.
ie. ethernet on mpc5200b: compatible = "mpc5200b-ethernet\0mpc52xx-ethernet"
The idea here is that most drivers will match to the most generic field
in the compatible list (mpc52xx-*), but can also test the more specific
field for enabling bug fixes or extra features.
Modal devices, like PSCs, also append the configured function to the
end of the compatible field. ie. A PSC in i2s mode would specify
"mpc52xx-psc-i2s", not "mpc52xx-i2s". This convention is chosen to
avoid naming conflicts with non-psc devices providing the same
function. For example, "mpc52xx-spi" and "mpc52xx-psc-spi" describe
the mpc5200 simple spi device and a PSC spi mode respectively.
If the soc device is more generic and present on other SOCs, the
compatible property can specify the more generic device type also.
ie. mscan: compatible = "mpc5200-mscan\0mpc52xx-mscan\0fsl,mscan";
At the time of writing, exact chip may be either 'mpc5200' or
'mpc5200b'.
Device drivers should always try to match as generically as possible.
III - Structure
===============
The device tree for an mpc52xx board follows the structure defined in
booting-without-of.txt with the following additional notes:
0) the root node
----------------
Typical root description node; see booting-without-of
1) The cpus node
----------------
The cpus node follows the basic layout described in booting-without-of.
The bus-frequency property holds the XLB bus frequency
The clock-frequency property holds the core frequency
2) The memory node
------------------
Typical memory description node; see booting-without-of.
3) The soc5200 node
-------------------
This node describes the on chip SOC peripherals. Every mpc52xx based
board will have this node, and as such there is a common naming
convention for SOC devices.
Required properties:
name type description
---- ---- -----------
device_type string must be "soc"
ranges int should be <0 baseaddr baseaddr+10000>
reg int must be <baseaddr 10000>
Recommended properties:
name type description
---- ---- -----------
compatible string should be "<chip>-soc\0mpc52xx-soc"
ie. "mpc5200b-soc\0mpc52xx-soc"
#interrupt-cells int must be <3>. If it is not defined
here then it must be defined in every
soc device node.
bus-frequency int IPB bus frequency in HZ. Clock rate
used by most of the soc devices.
Defining it here avoids needing it
added to every device node.
4) soc5200 child nodes
----------------------
Any on chip SOC devices available to Linux must appear as soc5200 child nodes.
Note: in the tables below, '*' matches all <chip> values. ie.
*-pic would translate to "mpc5200-pic\0mpc52xx-pic"
Required soc5200 child nodes:
name device_type compatible Description
---- ----------- ---------- -----------
cdm@<addr> cdm *-cmd Clock Distribution
pic@<addr> interrupt-controller *-pic need an interrupt
controller to boot
bestcomm@<addr> dma-controller *-bestcomm 52xx pic also requires
the bestcomm device
Recommended soc5200 child nodes; populate as needed for your board
name device_type compatible Description
---- ----------- ---------- -----------
gpt@<addr> gpt *-gpt General purpose timers
rtc@<addr> rtc *-rtc Real time clock
mscan@<addr> mscan *-mscan CAN bus controller
pci@<addr> pci *-pci PCI bridge
serial@<addr> serial *-psc-uart PSC in serial mode
i2s@<addr> i2s *-psc-i2s PSC in i2s mode
ac97@<addr> ac97 *-psc-ac97 PSC in ac97 mode
spi@<addr> spi *-psc-spi PSC in spi mode
irda@<addr> irda *-psc-irda PSC in IrDA mode
spi@<addr> spi *-spi MPC52xx spi device
ethernet@<addr> network *-fec MPC52xx ethernet device
ata@<addr> ata *-ata IDE ATA interface
i2c@<addr> i2c *-i2c I2C controller
usb@<addr> usb-ohci-be *-ohci,ohci-be USB controller
xlb@<addr> xlb *-xlb XLB arbritrator
IV - Extra Notes
================
1. Interrupt mapping
--------------------
The mpc52xx pic driver splits hardware IRQ numbers into two levels. The
split reflects the layout of the PIC hardware itself, which groups
interrupts into one of three groups; CRIT, MAIN or PERP. Also, the
Bestcomm dma engine has it's own set of interrupt sources which are
cascaded off of peripheral interrupt 0, which the driver interprets as a
fourth group, SDMA.
The interrupts property for device nodes using the mpc52xx pic consists
of three cells; <L1 L2 level>
L1 := [CRIT=0, MAIN=1, PERP=2, SDMA=3]
L2 := interrupt number; directly mapped from the value in the
"ICTL PerStat, MainStat, CritStat Encoded Register"
level := [LEVEL_HIGH=0, EDGE_RISING=1, EDGE_FALLING=2, LEVEL_LOW=3]
Documentation/s390/CommonIO
View file @ 9db73724
......@@ -74,7 +74,7 @@ Command line parameters
Note: While already known devices can be added to the list of devices to be
ignored, there will be no effect on then. However, if such a device
disappears and then reappeares, it will then be ignored.
disappears and then reappears, it will then be ignored.
For example,
"echo add 0.0.a000-0.0.accc, 0.0.af00-0.0.afff > /proc/cio_ignore"
......@@ -82,7 +82,7 @@ Command line parameters
devices.
The devices can be specified either by bus id (0.0.abcd) or, for 2.4 backward
compatibilty, by the device number in hexadecimal (0xabcd or abcd).
compatibility, by the device number in hexadecimal (0xabcd or abcd).
* /proc/s390dbf/cio_*/ (S/390 debug feature)
......
Documentation/s390/Debugging390.txt
View file @ 9db73724
......@@ -7,7 +7,7 @@
Overview of Document:
=====================
This document is intended to give an good overview of how to debug
This document is intended to give a good overview of how to debug
Linux for s/390 & z/Architecture. It isn't intended as a complete reference & not a
tutorial on the fundamentals of C & assembly. It doesn't go into
390 IO in any detail. It is intended to complement the documents in the
......@@ -300,7 +300,7 @@ On z/Architecture our page indexes are now 2k in size
but only mess with 2 segment indices each time we mess with
a PMD.
3) As z/Architecture supports upto a massive 5-level page table lookup we
3) As z/Architecture supports up to a massive 5-level page table lookup we
can only use 3 currently on Linux ( as this is all the generic kernel
currently supports ) however this may change in future
this allows us to access ( according to my sums )
......@@ -502,7 +502,7 @@ Notes:
------
1) The only requirement is that registers which are used
by the callee are saved, e.g. the compiler is perfectly
capible of using r11 for purposes other than a frame a
capable of using r11 for purposes other than a frame a
frame pointer if a frame pointer is not needed.
2) In functions with variable arguments e.g. printf the calling procedure
is identical to one without variable arguments & the same number of
......@@ -846,7 +846,7 @@ of time searching for debugging info. The following self explanatory line should
instead if the code isn't compiled -g, as it is much faster:
objdump --disassemble-all --syms vmlinux > vmlinux.lst
As hard drive space is valuble most of us use the following approach.
As hard drive space is valuable most of us use the following approach.
1) Look at the emitted psw on the console to find the crash address in the kernel.
2) Look at the file System.map ( in the linux directory ) produced when building
the kernel to find the closest address less than the current PSW to find the
......@@ -902,7 +902,7 @@ A. It is a tool for intercepting calls to the kernel & logging them
to a file & on the screen.
Q. What use is it ?
A. You can used it to find out what files a particular program opens.
A. You can use it to find out what files a particular program opens.
......@@ -911,7 +911,7 @@ Example 1
If you wanted to know does ping work but didn't have the source
strace ping -c 1 127.0.0.1
& then look at the man pages for each of the syscalls below,
( In fact this is sometimes easier than looking at some spagetti
( In fact this is sometimes easier than looking at some spaghetti
source which conditionally compiles for several architectures ).
Not everything that it throws out needs to make sense immediately.
......@@ -1037,7 +1037,7 @@ e.g. man strace, man alarm, man socket.
Performance Debugging
=====================
gcc is capible of compiling in profiling code just add the -p option
gcc is capable of compiling in profiling code just add the -p option
to the CFLAGS, this obviously affects program size & performance.
This can be used by the gprof gnu profiling tool or the
gcov the gnu code coverage tool ( code coverage is a means of testing
......@@ -1419,7 +1419,7 @@ On a SMP guest issue a command to all CPUs try prefixing the command with cpu al
To issue a command to a particular cpu try cpu <cpu number> e.g.
CPU 01 TR I R 2000.3000
If you are running on a guest with several cpus & you have a IO related problem
& cannot follow the flow of code but you know it isnt smp related.
& cannot follow the flow of code but you know it isn't smp related.
from the bash prompt issue
shutdown -h now or halt.
do a Q CPUS to find out how many cpus you have
......@@ -1602,7 +1602,7 @@ V000FFFD0 00010400 80010802 8001085A 000FFFA0
our 3rd return address is 8001085A
as the 04B52002 looks suspiciously like rubbish it is fair to assume that the kernel entry routines
for the sake of optimisation dont set up a backchain.
for the sake of optimisation don't set up a backchain.
now look at System.map to see if the addresses make any sense.
......@@ -1638,11 +1638,11 @@ more useful information.
Unlike other bus architectures modern 390 systems do their IO using mostly
fibre optics & devices such as tapes & disks can be shared between several mainframes,
also S390 can support upto 65536 devices while a high end PC based system might be choking
also S390 can support up to 65536 devices while a high end PC based system might be choking
with around 64. Here is some of the common IO terminology
Subchannel:
This is the logical number most IO commands use to talk to an IO device there can be upto
This is the logical number most IO commands use to talk to an IO device there can be up to
0x10000 (65536) of these in a configuration typically there is a few hundred. Under VM
for simplicity they are allocated contiguously, however on the native hardware they are not
they typically stay consistent between boots provided no new hardware is inserted or removed.
......@@ -1651,7 +1651,7 @@ HALT SUBCHANNEL,MODIFY SUBCHANNEL,RESUME SUBCHANNEL,START SUBCHANNEL,STORE SUBCH
TEST SUBCHANNEL ) we use this as the ID of the device we wish to talk to, the most
important of these instructions are START SUBCHANNEL ( to start IO ), TEST SUBCHANNEL ( to check
whether the IO completed successfully ), & HALT SUBCHANNEL ( to kill IO ), a subchannel
can have up to 8 channel paths to a device this offers redunancy if one is not available.
can have up to 8 channel paths to a device this offers redundancy if one is not available.
Device Number:
......@@ -1659,7 +1659,7 @@ This number remains static & Is closely tied to the hardware, there are 65536 of
also they are made up of a CHPID ( Channel Path ID, the most significant 8 bits )
& another lsb 8 bits. These remain static even if more devices are inserted or removed
from the hardware, there is a 1 to 1 mapping between Subchannels & Device Numbers provided
devices arent inserted or removed.
devices aren't inserted or removed.
Channel Control Words:
CCWS are linked lists of instructions initially pointed to by an operation request block (ORB),
......@@ -1674,7 +1674,7 @@ concurrently, you check how the IO went on by issuing a TEST SUBCHANNEL at each
from which you receive an Interruption response block (IRB). If you get channel & device end
status in the IRB without channel checks etc. your IO probably went okay. If you didn't you
probably need a doctor to examine the IRB & extended status word etc.
If an error occurs, more sophistocated control units have a facitity known as
If an error occurs, more sophisticated control units have a facility known as
concurrent sense this means that if an error occurs Extended sense information will
be presented in the Extended status word in the IRB if not you have to issue a
subsequent SENSE CCW command after the test subchannel.
......@@ -1749,7 +1749,7 @@ Interface (OEMI).
This byte wide Parallel channel path/bus has parity & data on the "Bus" cable
& control lines on the "Tag" cable. These can operate in byte multiplex mode for
sharing between several slow devices or burst mode & monopolize the channel for the
whole burst. Upto 256 devices can be addressed on one of these cables. These cables are
whole burst. Up to 256 devices can be addressed on one of these cables. These cables are
about one inch in diameter. The maximum unextended length supported by these cables is
125 Meters but this can be extended up to 2km with a fibre optic channel extended
such as a 3044. The maximum burst speed supported is 4.5 megabytes per second however
......@@ -1759,7 +1759,7 @@ One of these paths can be daisy chained to up to 8 control units.
ESCON if fibre optic it is also called FICON
Was introduced by IBM in 1990. Has 2 fibre optic cables & uses either leds or lasers
for communication at a signaling rate of upto 200 megabits/sec. As 10bits are transferred
for communication at a signaling rate of up to 200 megabits/sec. As 10bits are transferred
for every 8 bits info this drops to 160 megabits/sec & to 18.6 Megabytes/sec once
control info & CRC are added. ESCON only operates in burst mode.
......@@ -1767,7 +1767,7 @@ ESCONs typical max cable length is 3km for the led version & 20km for the laser
known as XDF ( extended distance facility ). This can be further extended by using an
ESCON director which triples the above mentioned ranges. Unlike Bus & Tag as ESCON is
serial it uses a packet switching architecture the standard Bus & Tag control protocol
is however present within the packets. Upto 256 devices can be attached to each control
is however present within the packets. Up to 256 devices can be attached to each control
unit that uses one of these interfaces.
Common 390 Devices include:
......@@ -2050,7 +2050,7 @@ list test.c:1,10
directory:
Adds directories to be searched for source if gdb cannot find the source.
(note it is a bit sensititive about slashes)
(note it is a bit sensitive about slashes)
e.g. To add the root of the filesystem to the searchpath do
directory //
......@@ -2152,7 +2152,7 @@ program as if it just crashed on your system, it is usually called core & create
current working directory.
This is very useful in that a customer can mail a core dump to a technical support department
& the technical support department can reconstruct what happened.
Provided the have an identical copy of this program with debugging symbols compiled in &
Provided they have an identical copy of this program with debugging symbols compiled in &
the source base of this build is available.
In short it is far more useful than something like a crash log could ever hope to be.
......
Documentation/s390/cds.txt
View file @ 9db73724
......@@ -98,7 +98,7 @@ The following chapters describe the I/O related interface routines the
Linux/390 common device support (CDS) provides to allow for device specific
driver implementations on the IBM ESA/390 hardware platform. Those interfaces
intend to provide the functionality required by every device driver
implementaion to allow to drive a specific hardware device on the ESA/390
implementation to allow to drive a specific hardware device on the ESA/390
platform. Some of the interface routines are specific to Linux/390 and some
of them can be found on other Linux platforms implementations too.
Miscellaneous function prototypes, data declarations, and macro definitions
......@@ -114,7 +114,7 @@ the ESA/390 architecture has implemented a so called channel subsystem, that
provides a unified view of the devices physically attached to the systems.
Though the ESA/390 hardware platform knows about a huge variety of different
peripheral attachments like disk devices (aka. DASDs), tapes, communication
controllers, etc. they can all by accessed by a well defined access method and
controllers, etc. they can all be accessed by a well defined access method and
they are presenting I/O completion a unified way : I/O interruptions. Every
single device is uniquely identified to the system by a so called subchannel,
where the ESA/390 architecture allows for 64k devices be attached.
......@@ -338,7 +338,7 @@ DOIO_REPORT_ALL - report all interrupt conditions
The ccw_device_start() function returns :
0 - successful completion or request successfully initiated
-EBUSY - The device is currently processing a previous I/O request, or ther is
-EBUSY - The device is currently processing a previous I/O request, or there is
a status pending at the device.
-ENODEV - cdev is invalid, the device is not operational or the ccw_device is
not online.
......@@ -361,7 +361,7 @@ first:
-EIO: the common I/O layer terminated the request due to an error state
If the concurrent sense flag in the extended status word in the irb is set, the
field irb->scsw.count describes the numer of device specific sense bytes
field irb->scsw.count describes the number of device specific sense bytes
available in the extended control word irb->scsw.ecw[0]. No device sensing by
the device driver itself is required.
......@@ -410,7 +410,7 @@ ccw_device_start() must be called disabled and with the ccw device lock held.
The device driver is allowed to issue the next ccw_device_start() call from
within its interrupt handler already. It is not required to schedule a
bottom-half, unless an non deterministically long running error recovery procedure
bottom-half, unless a non deterministically long running error recovery procedure
or similar needs to be scheduled. During I/O processing the Linux/390 generic
I/O device driver support has already obtained the IRQ lock, i.e. the handler
must not try to obtain it again when calling ccw_device_start() or we end in a
......@@ -431,7 +431,7 @@ information prior to device-end the device driver urgently relies on. In this
case all I/O interruptions are presented to the device driver until final
status is recognized.
If a device is able to recover from asynchronosly presented I/O errors, it can
If a device is able to recover from asynchronously presented I/O errors, it can
perform overlapping I/O using the DOIO_EARLY_NOTIFICATION flag. While some
devices always report channel-end and device-end together, with a single
interrupt, others present primary status (channel-end) when the channel is
......
Documentation/s390/crypto/crypto-API.txt
View file @ 9db73724
......@@ -17,8 +17,8 @@ arch/s390/crypto directory.
2. Probing for availability of MSA
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
It should be possible to use Kernels with the z990 crypto implementations both
on machines with MSA available an on those without MSA (pre z990 or z990
without MSA). Therefore a simple probing mechanisms has been implemented:
on machines with MSA available and on those without MSA (pre z990 or z990
without MSA). Therefore a simple probing mechanism has been implemented:
In the init function of each crypto module the availability of MSA and of the
respective crypto algorithm in particular will be tested. If the algorithm is
available the module will load and register its algorithm with the crypto API.
......@@ -26,7 +26,7 @@ available the module will load and register its algorithm with the crypto API.
If the respective crypto algorithm is not available, the init function will
return -ENOSYS. In that case a fallback to the standard software implementation
of the crypto algorithm must be taken ( -> the standard crypto modules are
also build when compiling the kernel).
also built when compiling the kernel).
3. Ensuring z990 crypto module preference
......
Documentation/s390/s390dbf.txt
View file @ 9db73724
......@@ -36,7 +36,7 @@ switches to the next debug area. This is done in order to be sure
that the records which describe the origin of the exception are not
overwritten when a wrap around for the current area occurs.
The debug areas itselve are also ordered in form of a ring buffer.
The debug areas themselves are also ordered in form of a ring buffer.
When an exception is thrown in the last debug area, the following debug
entries are then written again in the very first area.
......@@ -55,7 +55,7 @@ The debug logs can be inspected in a live system through entries in
the debugfs-filesystem. Under the toplevel directory "s390dbf" there is
a directory for each registered component, which is named like the
corresponding component. The debugfs normally should be mounted to
/sys/kernel/debug therefore the debug feature can be accessed unter
/sys/kernel/debug therefore the debug feature can be accessed under
/sys/kernel/debug/s390dbf.
The content of the directories are files which represent different views
......@@ -87,11 +87,11 @@ There are currently 2 possible triggers, which stop the debug feature
globally. The first possibility is to use the "debug_active" sysctl. If
set to 1 the debug feature is running. If "debug_active" is set to 0 the
debug feature is turned off.
The second trigger which stops the debug feature is an kernel oops.
The second trigger which stops the debug feature is a kernel oops.
That prevents the debug feature from overwriting debug information that
happened before the oops. After an oops you can reactivate the debug feature
by piping 1 to /proc/sys/s390dbf/debug_active. Nevertheless, its not
suggested to use an oopsed kernel in an production environment.
suggested to use an oopsed kernel in a production environment.
If you want to disallow the deactivation of the debug feature, you can use
the "debug_stoppable" sysctl. If you set "debug_stoppable" to 0 the debug
feature cannot be stopped. If the debug feature is already stopped, it
......
MAINTAINERS
View file @ 9db73724
......@@ -2438,6 +2438,13 @@ M: promise@pnd-pc.demon.co.uk
W: http://www.pnd-pc.demon.co.uk/promise/
S: Maintained
PS3 PLATFORM SUPPORT
P: Geoff Levand
M: geoffrey.levand@am.sony.com
L: linuxppc-dev@ozlabs.org
L: cbe-oss-dev@ozlabs.org
S: Supported
PVRUSB2 VIDEO4LINUX DRIVER
P: Mike Isely
M: isely@pobox.com
......
arch/i386/kernel/acpi/cstate.c
View file @ 9db73724
......@@ -11,6 +11,7 @@
#include <linux/init.h>
#include <linux/acpi.h>
#include <linux/cpu.h>
#include <linux/sched.h>
#include <acpi/processor.h>
#include <asm/acpi.h>
......
arch/i386/kernel/alternative.c
View file @ 9db73724
#include <linux/module.h>
#include <linux/sched.h>
#include <linux/spinlock.h>
#include <linux/list.h>
#include <asm/alternative.h>
......
arch/i386/kernel/cpu/mcheck/therm_throt.c
View file @ 9db73724
......@@ -20,6 +20,7 @@
#include <linux/cpu.h>
#include <asm/cpu.h>
#include <linux/notifier.h>
#include <linux/jiffies.h>
#include <asm/therm_throt.h>
/* How long to wait between reporting thermal events */
......
arch/m68knommu/Kconfig
View file @ 9db73724
......@@ -173,7 +173,7 @@ config CLOCK_DIV
On many SoC style CPUs the master CPU clock is also used to drive
on-chip peripherals. The clock that is distributed to these
peripherals is sometimes a fixed ratio of the master clock
frequency. If so then set this to the divider ration of the
frequency. If so then set this to the divider ratio of the
master clock to the peripheral clock. If not sure then select 1.
config OLDMASK
......@@ -192,7 +192,7 @@ config PILOT3
Support for the Palm Pilot 1000/5000, Personal/Pro and PalmIII.
config XCOPILOT_BUGS
bool " (X)Copilot support"
bool "(X)Copilot support"
depends on PILOT3
help
Support the bugs of Xcopilot.
......@@ -216,20 +216,20 @@ config DRAGEN2
Support for the DragenEngine II board.
config DIRECT_IO_ACCESS
bool " Allow user to access IO directly"
bool "Allow user to access IO directly"
depends on (UCSIMM || UCDIMM || DRAGEN2)
help
Disable the CPU internal registers protection in user mode,
to allow a user application to read/write them.
config INIT_LCD
bool " Initialize LCD"
bool "Initialize LCD"
depends on (UCSIMM || UCDIMM || DRAGEN2)
help
Initialize the LCD controller of the 68x328 processor.
config MEMORY_RESERVE
int " Memory reservation (MiB)"
int "Memory reservation (MiB)"
depends on (UCSIMM || UCDIMM)
help
Reserve certain memory regions on 68x328 based boards.
......@@ -409,7 +409,7 @@ config MOD5272
Support for the Netburner MOD-5272 board.
config ROMFS_FROM_ROM
bool " ROMFS image not RAM resident"
bool "ROMFS image not RAM resident"
depends on (NETtel || SNAPGEAR)
help
The ROMfs filesystem will stay resident in the FLASH/ROM, not be
......
arch/m68knommu/kernel/process.c
View file @ 9db73724
......@@ -290,7 +290,7 @@ void dump(struct pt_regs *fp)
unsigned char *tp;
int i;
printk(KERN_EMERG "\nCURRENT PROCESS:\n\n");
printk(KERN_EMERG "\n" KERN_EMERG "CURRENT PROCESS:\n" KERN_EMERG "\n");
printk(KERN_EMERG "COMM=%s PID=%d\n", current->comm, current->pid);
if (current->mm) {
......@@ -301,7 +301,8 @@ void dump(struct pt_regs *fp)
(int) current->mm->end_data,
(int) current->mm->end_data,
(int) current->mm->brk);
printk(KERN_EMERG "USER-STACK=%08x KERNEL-STACK=%08x\n\n",
printk(KERN_EMERG "USER-STACK=%08x KERNEL-STACK=%08x\n"
KERN_EMERG "\n",
(int) current->mm->start_stack,
(int)(((unsigned long) current) + THREAD_SIZE));
}
......@@ -312,36 +313,35 @@ void dump(struct pt_regs *fp)
fp->d0, fp->d1, fp->d2, fp->d3);
printk(KERN_EMERG "d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n",
fp->d4, fp->d5, fp->a0, fp->a1);
printk(KERN_EMERG "\nUSP: %08x TRAPFRAME: %08x\n", (unsigned int) rdusp(),
(unsigned int) fp);
printk(KERN_EMERG "\n" KERN_EMERG "USP: %08x TRAPFRAME: %08x\n",
(unsigned int) rdusp(), (unsigned int) fp);
printk(KERN_EMERG "\nCODE:");
printk(KERN_EMERG "\n" KERN_EMERG "CODE:");
tp = ((unsigned char *) fp->pc) - 0x20;
for (sp = (unsigned long *) tp, i = 0; (i < 0x40); i += 4) {
if ((i % 0x10) == 0)
printk(KERN_EMERG "\n%08x: ", (int) (tp + i));
printk(KERN_EMERG "%08x ", (int) *sp++);
printk("\n" KERN_EMERG "%08x: ", (int) (tp + i));
printk("%08x ", (int) *sp++);
}
printk(KERN_EMERG "\n");
printk("\n" KERN_EMERG "\n");
printk(KERN_EMERG "\nKERNEL STACK:");
printk(KERN_EMERG "KERNEL STACK:");
tp = ((unsigned char *) fp) - 0x40;
for (sp = (unsigned long *) tp, i = 0; (i < 0xc0); i += 4) {
if ((i % 0x10) == 0)
printk(KERN_EMERG "\n%08x: ", (int) (tp + i));
printk(KERN_EMERG "%08x ", (int) *sp++);
printk("\n" KERN_EMERG "%08x: ", (int) (tp + i));
printk("%08x ", (int) *sp++);
}
printk(KERN_EMERG "\n");
printk(KERN_EMERG "\n");
printk("\n" KERN_EMERG "\n");
printk(KERN_EMERG "\nUSER STACK:");
printk(KERN_EMERG "USER STACK:");
tp = (unsigned char *) (rdusp() - 0x10);
for (sp = (unsigned long *) tp, i = 0; (i < 0x80); i += 4) {
if ((i % 0x10) == 0)
printk(KERN_EMERG "\n%08x: ", (int) (tp + i));
printk(KERN_EMERG "%08x ", (int) *sp++);
printk("\n" KERN_EMERG "%08x: ", (int) (tp + i));
printk("%08x ", (int) *sp++);
}
printk(KERN_EMERG "\n\n");
printk("\n" KERN_EMERG "\n");
}
/*
......
arch/m68knommu/kernel/setup.c
View file @ 9db73724
......@@ -36,10 +36,7 @@
#include <asm/setup.h>
#include <asm/irq.h>
#include <asm/machdep.h>
#ifdef CONFIG_BLK_DEV_INITRD
#include <asm/pgtable.h>
#endif
unsigned long memory_start;
unsigned long memory_end;
......
arch/m68knommu/kernel/sys_m68k.c
View file @ 9db73724
......@@ -137,7 +137,7 @@ asmlinkage int old_select(struct sel_arg_struct *arg)
asmlinkage int sys_ipc (uint call, int first, int second,
int third, void *ptr, long fifth)
{
int version;
int version, ret;
version = call >> 16; /* hack for backward compatibility */
call &= 0xffff;
......@@ -190,6 +190,27 @@ asmlinkage int sys_ipc (uint call, int first, int second,
default:
return -EINVAL;
}
if (call <= SHMCTL)
switch (call) {
case SHMAT:
switch (version) {
default: {
ulong raddr;
ret = do_shmat (first, ptr, second, &raddr);
if (ret)
return ret;
return put_user (raddr, (ulong __user *) third);
}
}
case SHMDT:
return sys_shmdt (ptr);
case SHMGET:
return sys_shmget (first, second, third);
case SHMCTL:
return sys_shmctl (first, second, ptr);
default:
return -ENOSYS;
}
return -EINVAL;
}
......
arch/m68knommu/kernel/traps.c
View file @ 9db73724
......@@ -127,11 +127,12 @@ void show_stack(struct task_struct *task, unsigned long *stack)
if (stack + 1 > endstack)
break;
if (i % 8 == 0)
printk(KERN_EMERG "\n ");
printk(KERN_EMERG " %08lx", *stack++);
printk("\n" KERN_EMERG " ");
printk(" %08lx", *stack++);
}
printk("\n");
printk(KERN_EMERG "\nCall Trace:");
printk(KERN_EMERG "Call Trace:");
i = 0;
while (stack + 1 <= endstack) {
addr = *stack++;
......@@ -146,12 +147,12 @@ void show_stack(struct task_struct *task, unsigned long *stack)
if (((addr >= (unsigned long) &_start) &&
(addr <= (unsigned long) &_etext))) {
if (i % 4 == 0)
printk(KERN_EMERG "\n ");
printk(KERN_EMERG " [<%08lx>]", addr);
printk("\n" KERN_EMERG " ");
printk(" [<%08lx>]", addr);
i++;
}
}
printk(KERN_EMERG "\n");
printk("\n");
}
void bad_super_trap(struct frame *fp)
......
arch/m68knommu/platform/5307/head.S
View file @ 9db73724
......@@ -64,6 +64,26 @@
negl %d0 /* negate bits */
.endm
#elif defined(CONFIG_M520x)
.macro GET_MEM_SIZE
clrl %d0
movel MCF_MBAR+MCFSIM_SDCS0, %d2 /* Get SDRAM chip select 0 config */
andl #0x1f, %d2 /* Get only the chip select size */
beq 3f /* Check if it is enabled */
addql #1, %d2 /* Form exponent */
moveql #1, %d0
lsll %d2, %d0 /* 2 ^ exponent */
3:
movel MCF_MBAR+MCFSIM_SDCS1, %d2 /* Get SDRAM chip select 1 config */
andl #0x1f, %d2 /* Get only the chip select size */
beq 4f /* Check if it is enabled */
addql #1, %d2 /* Form exponent */
moveql #1, %d1
lsll %d2, %d1 /* 2 ^ exponent */
addl %d1, %d0 /* Total size of SDRAM in d0 */
4:
.endm
#else
#error "ERROR: I don't know how to probe your boards memory size?"
#endif
......
arch/m68knommu/platform/68360/head-ram.S
View file @ 9db73724
......@@ -25,6 +25,7 @@
.global _periph_base
#define RAMEND (CONFIG_RAMBASE + CONFIG_RAMSIZE)
#define ROMEND (CONFIG_ROMBASE + CONFIG_ROMSIZE)
#define REGB 0x1000
#define PEPAR (_dprbase + REGB + 0x0016)
......@@ -175,7 +176,7 @@ configure_chip_select_0:
move.l %d0, BR0
configure_chip_select_1:
move.l #__rom_end, %d0
move.l #ROMEND, %d0
subi.l #__rom_start, %d0
subq.l #0x01, %d0
eori.l #SIM_OR_MASK, %d0
......
arch/mips/Kconfig
View file @ 9db73724
......@@ -16,6 +16,7 @@ config MIPS_MTX1
bool "4G Systems MTX-1 board"
select DMA_NONCOHERENT
select HW_HAS_PCI
select RESOURCES_64BIT if PCI
select SOC_AU1500
select SYS_HAS_CPU_MIPS32_R1
select SYS_SUPPORTS_LITTLE_ENDIAN
......@@ -32,6 +33,7 @@ config MIPS_PB1000
select SOC_AU1000
select DMA_NONCOHERENT
select HW_HAS_PCI
select RESOURCES_64BIT if PCI
select SWAP_IO_SPACE
select SYS_HAS_CPU_MIPS32_R1
select SYS_SUPPORTS_LITTLE_ENDIAN
......@@ -41,6 +43,7 @@ config MIPS_PB1100
select SOC_AU1100
select DMA_NONCOHERENT
select HW_HAS_PCI
select RESOURCES_64BIT if PCI
select SWAP_IO_SPACE
select SYS_HAS_CPU_MIPS32_R1
select SYS_SUPPORTS_LITTLE_ENDIAN
......@@ -50,6 +53,7 @@ config MIPS_PB1500
select SOC_AU1500
select DMA_NONCOHERENT
select HW_HAS_PCI
select RESOURCES_64BIT if PCI
select SYS_HAS_CPU_MIPS32_R1
select SYS_SUPPORTS_LITTLE_ENDIAN
......@@ -59,6 +63,7 @@ config MIPS_PB1550
select DMA_NONCOHERENT
select HW_HAS_PCI
select MIPS_DISABLE_OBSOLETE_IDE
select RESOURCES_64BIT if PCI
select SYS_HAS_CPU_MIPS32_R1
select SYS_SUPPORTS_LITTLE_ENDIAN
......@@ -67,6 +72,7 @@ config MIPS_PB1200
select SOC_AU1200
select DMA_NONCOHERENT
select MIPS_DISABLE_OBSOLETE_IDE
select RESOURCES_64BIT if PCI
select SYS_HAS_CPU_MIPS32_R1
select SYS_SUPPORTS_LITTLE_ENDIAN
......@@ -75,6 +81,7 @@ config MIPS_DB1000
select SOC_AU1000
select DMA_NONCOHERENT
select HW_HAS_PCI
select RESOURCES_64BIT if PCI
select SYS_HAS_CPU_MIPS32_R1
select SYS_SUPPORTS_LITTLE_ENDIAN
......@@ -91,6 +98,7 @@ config MIPS_DB1500
select DMA_NONCOHERENT
select HW_HAS_PCI
select MIPS_DISABLE_OBSOLETE_IDE
select RESOURCES_64BIT if PCI
select SYS_HAS_CPU_MIPS32_R1
select SYS_SUPPORTS_BIG_ENDIAN
select SYS_SUPPORTS_LITTLE_ENDIAN
......@@ -101,6 +109,7 @@ config MIPS_DB1550
select HW_HAS_PCI
select DMA_NONCOHERENT
select MIPS_DISABLE_OBSOLETE_IDE
select RESOURCES_64BIT if PCI
select SYS_HAS_CPU_MIPS32_R1
select SYS_SUPPORTS_LITTLE_ENDIAN
......@@ -1268,6 +1277,7 @@ config CPU_RM9000
select CPU_SUPPORTS_32BIT_KERNEL
select CPU_SUPPORTS_64BIT_KERNEL
select CPU_SUPPORTS_HIGHMEM
select WEAK_ORDERING
config CPU_SB1
bool "SB1"
......@@ -1276,6 +1286,7 @@ config CPU_SB1
select CPU_SUPPORTS_32BIT_KERNEL
select CPU_SUPPORTS_64BIT_KERNEL
select CPU_SUPPORTS_HIGHMEM
select WEAK_ORDERING
endchoice
......@@ -1336,6 +1347,8 @@ config SYS_HAS_CPU_RM9000
config SYS_HAS_CPU_SB1
bool
config WEAK_ORDERING
bool
endmenu
#
......@@ -1940,6 +1953,11 @@ config COMPAT
depends on MIPS32_COMPAT
default y
config SYSVIPC_COMPAT
bool
depends on COMPAT && SYSVIPC
default y
config MIPS32_O32
bool "Kernel support for o32 binaries"
depends on MIPS32_COMPAT
......
arch/mips/kernel/linux32.c
View file @ 9db73724
This diff is collapsed.
arch/mips/kernel/scall64-n32.S
View file @ 9db73724
......@@ -149,8 +149,8 @@ EXPORT(sysn32_call_table)
PTR sys_mincore
PTR sys_madvise
PTR sys_shmget
PTR sys32_shmat
PTR sys_shmctl /* 6030 */
PTR sys_shmat
PTR compat_sys_shmctl /* 6030 */
PTR sys_dup
PTR sys_dup2
PTR sys_pause
......@@ -184,12 +184,12 @@ EXPORT(sysn32_call_table)
PTR sys32_newuname
PTR sys_semget
PTR sys_semop
PTR sys_semctl
PTR sysn32_semctl
PTR sys_shmdt /* 6065 */
PTR sys_msgget
PTR sys_msgsnd
PTR sys_msgrcv
PTR sys_msgctl
PTR compat_sys_msgsnd
PTR compat_sys_msgrcv
PTR compat_sys_msgctl
PTR compat_sys_fcntl /* 6070 */
PTR sys_flock
PTR sys_fsync
......@@ -335,7 +335,7 @@ EXPORT(sysn32_call_table)
PTR compat_sys_fcntl64
PTR sys_set_tid_address
PTR sys_restart_syscall
PTR sys_semtimedop /* 6215 */
PTR compat_sys_semtimedop /* 6215 */
PTR sys_fadvise64_64
PTR compat_sys_statfs64
PTR compat_sys_fstatfs64
......
arch/mips/kernel/smp.c
View file @ 9db73724
......@@ -172,7 +172,7 @@ int smp_call_function (void (*func) (void *info), void *info, int retry,
spin_lock(&smp_call_lock);
call_data = &data;
mb();
smp_mb();
/* Send a message to all other CPUs and wait for them to respond */
for_each_online_cpu(i)
......@@ -204,7 +204,7 @@ void smp_call_function_interrupt(void)
* Notify initiating CPU that I've grabbed the data and am
* about to execute the function.
*/
mb();
smp_mb();
atomic_inc(&call_data->started);
/*
......@@ -215,7 +215,7 @@ void smp_call_function_interrupt(void)
irq_exit();
if (wait) {
mb();
smp_mb();
atomic_inc(&call_data->finished);
}
}
......
arch/mips/lib-32/Makefile
View file @ 9db73724
......@@ -2,7 +2,7 @@
# Makefile for MIPS-specific library files..
#
lib-y += csum_partial.o memset.o watch.o
lib-y += memset.o watch.o
obj-$(CONFIG_CPU_MIPS32) += dump_tlb.o
obj-$(CONFIG_CPU_MIPS64) += dump_tlb.o
......
arch/mips/lib-32/csum_partial.S deleted 100644 → 0
View file @ 4c1ac1b4
/*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
* Copyright (C) 1998 Ralf Baechle
*/
#include <asm/asm.h>
#include <asm/regdef.h>
#define ADDC(sum,reg) \
addu sum, reg; \
sltu v1, sum, reg; \
addu sum, v1
#define CSUM_BIGCHUNK(src, offset, sum, t0, t1, t2, t3) \
lw t0, (offset + 0x00)(src); \
lw t1, (offset + 0x04)(src); \
lw t2, (offset + 0x08)(src); \
lw t3, (offset + 0x0c)(src); \
ADDC(sum, t0); \
ADDC(sum, t1); \
ADDC(sum, t2); \
ADDC(sum, t3); \
lw t0, (offset + 0x10)(src); \
lw t1, (offset + 0x14)(src); \
lw t2, (offset + 0x18)(src); \
lw t3, (offset + 0x1c)(src); \
ADDC(sum, t0); \
ADDC(sum, t1); \
ADDC(sum, t2); \
ADDC(sum, t3); \
/*
* a0: source address
* a1: length of the area to checksum
* a2: partial checksum
*/
#define src a0
#define dest a1
#define sum v0
.text
.set noreorder
/* unknown src alignment and < 8 bytes to go */
small_csumcpy:
move a1, t2
andi t0, a1, 4
beqz t0, 1f
andi t0, a1, 2
/* Still a full word to go */
ulw t1, (src)
addiu src, 4
ADDC(sum, t1)
1: move t1, zero
beqz t0, 1f
andi t0, a1, 1
/* Still a halfword to go */
ulhu t1, (src)
addiu src, 2
1: beqz t0, 1f
sll t1, t1, 16
lbu t2, (src)
nop
#ifdef __MIPSEB__
sll t2, t2, 8
#endif
or t1, t2
1: ADDC(sum, t1)
/* fold checksum */
sll v1, sum, 16
addu sum, v1
sltu v1, sum, v1
srl sum, sum, 16
addu sum, v1
/* odd buffer alignment? */
beqz t7, 1f
nop
sll v1, sum, 8
srl sum, sum, 8
or sum, v1
andi sum, 0xffff
1:
.set reorder
/* Add the passed partial csum. */
ADDC(sum, a2)
jr ra
.set noreorder
/* ------------------------------------------------------------------------- */
.align 5
LEAF(csum_partial)
move sum, zero
move t7, zero
sltiu t8, a1, 0x8
bnez t8, small_csumcpy /* < 8 bytes to copy */
move t2, a1
beqz a1, out
andi t7, src, 0x1 /* odd buffer? */
hword_align:
beqz t7, word_align
andi t8, src, 0x2
lbu t0, (src)
subu a1, a1, 0x1
#ifdef __MIPSEL__
sll t0, t0, 8
#endif
ADDC(sum, t0)
addu src, src, 0x1
andi t8, src, 0x2
word_align:
beqz t8, dword_align
sltiu t8, a1, 56
lhu t0, (src)
subu a1, a1, 0x2
ADDC(sum, t0)
sltiu t8, a1, 56
addu src, src, 0x2
dword_align:
bnez t8, do_end_words
move t8, a1
andi t8, src, 0x4
beqz t8, qword_align
andi t8, src, 0x8
lw t0, 0x00(src)
subu a1, a1, 0x4
ADDC(sum, t0)
addu src, src, 0x4
andi t8, src, 0x8
qword_align:
beqz t8, oword_align
andi t8, src, 0x10
lw t0, 0x00(src)
lw t1, 0x04(src)
subu a1, a1, 0x8
ADDC(sum, t0)
ADDC(sum, t1)
addu src, src, 0x8
andi t8, src, 0x10
oword_align:
beqz t8, begin_movement
srl t8, a1, 0x7
lw t3, 0x08(src)
lw t4, 0x0c(src)
lw t0, 0x00(src)
lw t1, 0x04(src)
ADDC(sum, t3)
ADDC(sum, t4)
ADDC(sum, t0)
ADDC(sum, t1)
subu a1, a1, 0x10
addu src, src, 0x10
srl t8, a1, 0x7
begin_movement:
beqz t8, 1f
andi t2, a1, 0x40
move_128bytes:
CSUM_BIGCHUNK(src, 0x00, sum, t0, t1, t3, t4)
CSUM_BIGCHUNK(src, 0x20, sum, t0, t1, t3, t4)
CSUM_BIGCHUNK(src, 0x40, sum, t0, t1, t3, t4)
CSUM_BIGCHUNK(src, 0x60, sum, t0, t1, t3, t4)
subu t8, t8, 0x01
bnez t8, move_128bytes
addu src, src, 0x80
1:
beqz t2, 1f
andi t2, a1, 0x20
move_64bytes:
CSUM_BIGCHUNK(src, 0x00, sum, t0, t1, t3, t4)
CSUM_BIGCHUNK(src, 0x20, sum, t0, t1, t3, t4)
addu src, src, 0x40
1:
beqz t2, do_end_words
andi t8, a1, 0x1c
move_32bytes:
CSUM_BIGCHUNK(src, 0x00, sum, t0, t1, t3, t4)
andi t8, a1, 0x1c
addu src, src, 0x20
do_end_words:
beqz t8, maybe_end_cruft
srl t8, t8, 0x2
end_words:
lw t0, (src)
subu t8, t8, 0x1
ADDC(sum, t0)
bnez t8, end_words
addu src, src, 0x4
maybe_end_cruft:
andi t2, a1, 0x3
small_memcpy:
j small_csumcpy; move a1, t2
beqz t2, out
move a1, t2
end_bytes:
lb t0, (src)
subu a1, a1, 0x1
bnez a2, end_bytes
addu src, src, 0x1
out:
jr ra
move v0, sum
END(csum_partial)
arch/mips/lib-64/Makefile
View file @ 9db73724
......@@ -2,7 +2,7 @@
# Makefile for MIPS-specific library files..
#
lib-y += csum_partial.o memset.o watch.o
lib-y += memset.o watch.o
obj-$(CONFIG_CPU_MIPS32) += dump_tlb.o
obj-$(CONFIG_CPU_MIPS64) += dump_tlb.o
......
arch/mips/lib/Makefile
View file @ 9db73724
......@@ -2,8 +2,8 @@
# Makefile for MIPS-specific library files..
#
lib-y += csum_partial_copy.o memcpy.o promlib.o strlen_user.o strncpy_user.o \
strnlen_user.o uncached.o
lib-y += csum_partial.o csum_partial_copy.o memcpy.o promlib.o \
strlen_user.o strncpy_user.o strnlen_user.o uncached.o
obj-y += iomap.o
......
arch/mips/lib-64/csum_partial.S → arch/mips/lib/csum_partial.S
View file @ 9db73724
......@@ -11,28 +11,44 @@
#include <asm/asm.h>
#include <asm/regdef.h>
#ifdef CONFIG_64BIT
#define T0 ta0
#define T1 ta1
#define T2 ta2
#define T3 ta3
#define T4 t0
#define T7 t3
#else
#define T0 t0
#define T1 t1
#define T2 t2
#define T3 t3
#define T4 t4
#define T7 t7
#endif
#define ADDC(sum,reg) \
addu sum, reg; \
sltu v1, sum, reg; \
addu sum, v1
#define CSUM_BIGCHUNK(src, offset, sum, t0, t1, t2, t3) \
lw t0, (offset + 0x00)(src); \
lw t1, (offset + 0x04)(src); \
lw t2, (offset + 0x08)(src); \
lw t3, (offset + 0x0c)(src); \
ADDC(sum, t0); \
ADDC(sum, t1); \
ADDC(sum, t2); \
ADDC(sum, t3); \
lw t0, (offset + 0x10)(src); \
lw t1, (offset + 0x14)(src); \
lw t2, (offset + 0x18)(src); \
lw t3, (offset + 0x1c)(src); \
ADDC(sum, t0); \
ADDC(sum, t1); \
ADDC(sum, t2); \
ADDC(sum, t3); \
#define CSUM_BIGCHUNK(src, offset, sum, _t0, _t1, _t2, _t3) \
lw _t0, (offset + 0x00)(src); \
lw _t1, (offset + 0x04)(src); \
lw _t2, (offset + 0x08)(src); \
lw _t3, (offset + 0x0c)(src); \
ADDC(sum, _t0); \
ADDC(sum, _t1); \
ADDC(sum, _t2); \
ADDC(sum, _t3); \
lw _t0, (offset + 0x10)(src); \
lw _t1, (offset + 0x14)(src); \
lw _t2, (offset + 0x18)(src); \
lw _t3, (offset + 0x1c)(src); \
ADDC(sum, _t0); \
ADDC(sum, _t1); \
ADDC(sum, _t2); \
ADDC(sum, _t3); \
/*
* a0: source address
......@@ -48,37 +64,37 @@
/* unknown src alignment and < 8 bytes to go */
small_csumcpy:
move a1, ta2
move a1, T2
andi ta0, a1, 4
beqz ta0, 1f
andi ta0, a1, 2
andi T0, a1, 4
beqz T0, 1f
andi T0, a1, 2
/* Still a full word to go */
ulw ta1, (src)
daddiu src, 4
ADDC(sum, ta1)
ulw T1, (src)
PTR_ADDIU src, 4
ADDC(sum, T1)
1: move ta1, zero
beqz ta0, 1f
andi ta0, a1, 1
1: move T1, zero
beqz T0, 1f
andi T0, a1, 1
/* Still a halfword to go */
ulhu ta1, (src)
daddiu src, 2
ulhu T1, (src)
PTR_ADDIU src, 2
1: beqz ta0, 1f
sll ta1, ta1, 16
1: beqz T0, 1f
sll T1, T1, 16
lbu ta2, (src)
lbu T2, (src)
nop
#ifdef __MIPSEB__
sll ta2, ta2, 8
sll T2, T2, 8
#endif
or ta1, ta2
or T1, T2
1: ADDC(sum, ta1)
1: ADDC(sum, T1)
/* fold checksum */
sll v1, sum, 16
......@@ -88,7 +104,7 @@ small_csumcpy:
addu sum, v1
/* odd buffer alignment? */
beqz t3, 1f
beqz T7, 1f
nop
sll v1, sum, 8
srl sum, sum, 8
......@@ -106,37 +122,37 @@ small_csumcpy:
.align 5
LEAF(csum_partial)
move sum, zero
move t3, zero
move T7, zero
sltiu t8, a1, 0x8
bnez t8, small_csumcpy /* < 8 bytes to copy */
move ta2, a1
move T2, a1
beqz a1, out
andi t3, src, 0x1 /* odd buffer? */
andi T7, src, 0x1 /* odd buffer? */
hword_align:
beqz t3, word_align
beqz T7, word_align
andi t8, src, 0x2
lbu ta0, (src)
dsubu a1, a1, 0x1
lbu T0, (src)
LONG_SUBU a1, a1, 0x1
#ifdef __MIPSEL__
sll ta0, ta0, 8
sll T0, T0, 8
#endif
ADDC(sum, ta0)
daddu src, src, 0x1
ADDC(sum, T0)
PTR_ADDU src, src, 0x1
andi t8, src, 0x2
word_align:
beqz t8, dword_align
sltiu t8, a1, 56
lhu ta0, (src)
dsubu a1, a1, 0x2
ADDC(sum, ta0)
lhu T0, (src)
LONG_SUBU a1, a1, 0x2
ADDC(sum, T0)
sltiu t8, a1, 56
daddu src, src, 0x2
PTR_ADDU src, src, 0x2
dword_align:
bnez t8, do_end_words
......@@ -146,95 +162,95 @@ dword_align:
beqz t8, qword_align
andi t8, src, 0x8
lw ta0, 0x00(src)
dsubu a1, a1, 0x4
ADDC(sum, ta0)
daddu src, src, 0x4
lw T0, 0x00(src)
LONG_SUBU a1, a1, 0x4
ADDC(sum, T0)
PTR_ADDU src, src, 0x4
andi t8, src, 0x8
qword_align:
beqz t8, oword_align
andi t8, src, 0x10
lw ta0, 0x00(src)
lw ta1, 0x04(src)
dsubu a1, a1, 0x8
ADDC(sum, ta0)
ADDC(sum, ta1)
daddu src, src, 0x8
lw T0, 0x00(src)
lw T1, 0x04(src)
LONG_SUBU a1, a1, 0x8
ADDC(sum, T0)
ADDC(sum, T1)
PTR_ADDU src, src, 0x8
andi t8, src, 0x10
oword_align:
beqz t8, begin_movement
dsrl t8, a1, 0x7
lw ta3, 0x08(src)
lw t0, 0x0c(src)
lw ta0, 0x00(src)
lw ta1, 0x04(src)
ADDC(sum, ta3)
ADDC(sum, t0)
ADDC(sum, ta0)
ADDC(sum, ta1)
dsubu a1, a1, 0x10
daddu src, src, 0x10
dsrl t8, a1, 0x7
LONG_SRL t8, a1, 0x7
lw T3, 0x08(src)
lw T4, 0x0c(src)
lw T0, 0x00(src)
lw T1, 0x04(src)
ADDC(sum, T3)
ADDC(sum, T4)
ADDC(sum, T0)
ADDC(sum, T1)
LONG_SUBU a1, a1, 0x10
PTR_ADDU src, src, 0x10
LONG_SRL t8, a1, 0x7
begin_movement:
beqz t8, 1f
andi ta2, a1, 0x40
andi T2, a1, 0x40
move_128bytes:
CSUM_BIGCHUNK(src, 0x00, sum, ta0, ta1, ta3, t0)
CSUM_BIGCHUNK(src, 0x20, sum, ta0, ta1, ta3, t0)
CSUM_BIGCHUNK(src, 0x40, sum, ta0, ta1, ta3, t0)
CSUM_BIGCHUNK(src, 0x60, sum, ta0, ta1, ta3, t0)
dsubu t8, t8, 0x01
CSUM_BIGCHUNK(src, 0x00, sum, T0, T1, T3, T4)
CSUM_BIGCHUNK(src, 0x20, sum, T0, T1, T3, T4)
CSUM_BIGCHUNK(src, 0x40, sum, T0, T1, T3, T4)
CSUM_BIGCHUNK(src, 0x60, sum, T0, T1, T3, T4)
LONG_SUBU t8, t8, 0x01
bnez t8, move_128bytes
daddu src, src, 0x80
PTR_ADDU src, src, 0x80
1:
beqz ta2, 1f
andi ta2, a1, 0x20
beqz T2, 1f
andi T2, a1, 0x20
move_64bytes:
CSUM_BIGCHUNK(src, 0x00, sum, ta0, ta1, ta3, t0)
CSUM_BIGCHUNK(src, 0x20, sum, ta0, ta1, ta3, t0)
daddu src, src, 0x40
CSUM_BIGCHUNK(src, 0x00, sum, T0, T1, T3, T4)
CSUM_BIGCHUNK(src, 0x20, sum, T0, T1, T3, T4)
PTR_ADDU src, src, 0x40
1:
beqz ta2, do_end_words
beqz T2, do_end_words
andi t8, a1, 0x1c
move_32bytes:
CSUM_BIGCHUNK(src, 0x00, sum, ta0, ta1, ta3, t0)
CSUM_BIGCHUNK(src, 0x00, sum, T0, T1, T3, T4)
andi t8, a1, 0x1c
daddu src, src, 0x20
PTR_ADDU src, src, 0x20
do_end_words:
beqz t8, maybe_end_cruft
dsrl t8, t8, 0x2
LONG_SRL t8, t8, 0x2
end_words:
lw ta0, (src)
dsubu t8, t8, 0x1
ADDC(sum, ta0)
lw T0, (src)
LONG_SUBU t8, t8, 0x1
ADDC(sum, T0)
bnez t8, end_words
daddu src, src, 0x4
PTR_ADDU src, src, 0x4
maybe_end_cruft:
andi ta2, a1, 0x3
andi T2, a1, 0x3
small_memcpy:
j small_csumcpy; move a1, ta2 /* XXX ??? */
j small_csumcpy; move a1, T2 /* XXX ??? */
beqz t2, out
move a1, ta2
move a1, T2
end_bytes:
lb ta0, (src)
dsubu a1, a1, 0x1
lb T0, (src)
LONG_SUBU a1, a1, 0x1
bnez a2, end_bytes
daddu src, src, 0x1
PTR_ADDU src, src, 0x1
out:
jr ra
......
arch/mips/sibyte/swarm/setup.c
View file @ 9db73724
......@@ -43,7 +43,7 @@
#elif defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X)
#include <asm/sibyte/sb1250_regs.h>
#else
#error invalid SiByte board configuation
#error invalid SiByte board configuration
#endif
#include <asm/sibyte/sb1250_genbus.h>
#include <asm/sibyte/board.h>
......@@ -53,7 +53,7 @@ extern void bcm1480_setup(void);
#elif defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X)
extern void sb1250_setup(void);
#else
#error invalid SiByte board configuation
#error invalid SiByte board configuration
#endif
extern int xicor_probe(void);
......@@ -90,7 +90,7 @@ void __init plat_timer_setup(struct irqaction *irq)
#elif defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X)
sb1250_time_init();
#else
#error invalid SiByte board configuation
#error invalid SiByte board configuration
#endif
}
......@@ -111,7 +111,7 @@ void __init plat_mem_setup(void)
#elif defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X)
sb1250_setup();
#else
#error invalid SiByte board configuation
#error invalid SiByte board configuration
#endif
panic_timeout = 5; /* For debug. */
......
arch/powerpc/Kconfig
View file @ 9db73724
......@@ -112,7 +112,7 @@ choice
default 6xx
config CLASSIC32
bool "6xx/7xx/74xx"
bool "52xx/6xx/7xx/74xx"
select PPC_FPU
select 6xx
help
......@@ -121,16 +121,18 @@ config CLASSIC32
versions (821, 823, 850, 855, 860, 52xx, 82xx, 83xx), the AMCC
embedded versions (403 and 405) and the high end 64 bit Power
processors (POWER 3, POWER4, and IBM PPC970 also known as G5).
This option is the catch-all for 6xx types, including some of the
embedded versions. Unless there is see an option for the specific
chip family you are using, you want this option.
You do not want this if you are building a kernel for a 64 bit
IBM RS/6000 or an Apple G5, choose 6xx.
If unsure, select this option
Unless you are building a kernel for one of the embedded processor
systems, 64 bit IBM RS/6000 or an Apple G5, choose 6xx.
Note that the kernel runs in 32-bit mode even on 64-bit chips.
config PPC_52xx
bool "Freescale 52xx"
select 6xx
select PPC_FPU
config PPC_82xx
bool "Freescale 82xx"
select 6xx
......@@ -160,9 +162,11 @@ config PPC_86xx
config 40x
bool "AMCC 40x"
select PPC_DCR_NATIVE
config 44x
bool "AMCC 44x"
select PPC_DCR_NATIVE
config 8xx
bool "Freescale 8xx"
......@@ -208,6 +212,24 @@ config PPC_FPU
bool
default y if PPC64
config PPC_DCR_NATIVE
bool
default n
config PPC_DCR_MMIO
bool
default n
config PPC_DCR
bool
depends on PPC_DCR_NATIVE || PPC_DCR_MMIO
default y
config PPC_OF_PLATFORM_PCI
bool
depends on PPC64 # not supported on 32 bits yet
default n
config BOOKE
bool
depends on E200 || E500
......@@ -227,6 +249,7 @@ config PTE_64BIT
config PHYS_64BIT
bool 'Large physical address support' if E500
depends on 44x || E500
select RESOURCES_64BIT
default y if 44x
---help---
This option enables kernel support for larger than 32-bit physical
......@@ -369,11 +392,13 @@ config PPC_PSERIES
select PPC_RTAS
select RTAS_ERROR_LOGGING
select PPC_UDBG_16550
select PPC_NATIVE
default y
config PPC_ISERIES
bool "IBM Legacy iSeries"
depends on PPC_MULTIPLATFORM && PPC64
select PPC_INDIRECT_IO
config PPC_CHRP
bool "Common Hardware Reference Platform (CHRP) based machines"
......@@ -384,14 +409,35 @@ config PPC_CHRP
select PPC_RTAS
select PPC_MPC106
select PPC_UDBG_16550
select PPC_NATIVE
default y
config PPC_MPC52xx
bool
default n
config PPC_EFIKA
bool "bPlan Efika 5k2. MPC5200B based computer"
depends on PPC_MULTIPLATFORM && PPC32
select PPC_RTAS
select RTAS_PROC
select PPC_MPC52xx
select PPC_NATIVE
default y
config PPC_LITE5200
bool "Freescale Lite5200 Eval Board"
depends on PPC_MULTIPLATFORM && PPC32
select PPC_MPC52xx
default n
config PPC_PMAC
bool "Apple PowerMac based machines"
depends on PPC_MULTIPLATFORM
select MPIC
select PPC_INDIRECT_PCI if PPC32
select PPC_MPC106 if PPC32
select PPC_NATIVE
default y
config PPC_PMAC64
......@@ -411,6 +457,7 @@ config PPC_PREP
select PPC_I8259
select PPC_INDIRECT_PCI
select PPC_UDBG_16550
select PPC_NATIVE
default y
config PPC_MAPLE
......@@ -422,6 +469,7 @@ config PPC_MAPLE
select GENERIC_TBSYNC
select PPC_UDBG_16550
select PPC_970_NAP
select PPC_NATIVE
default n
help
This option enables support for the Maple 970FX Evaluation Board.
......@@ -434,6 +482,7 @@ config PPC_PASEMI
select MPIC
select PPC_UDBG_16550
select GENERIC_TBSYNC
select PPC_NATIVE
help
This option enables support for PA Semi's PWRficient line
of SoC processors, including PA6T-1682M
......@@ -445,6 +494,11 @@ config PPC_CELL
config PPC_CELL_NATIVE
bool
select PPC_CELL
select PPC_DCR_MMIO
select PPC_OF_PLATFORM_PCI
select PPC_INDIRECT_IO
select PPC_NATIVE
select MPIC
default n
config PPC_IBM_CELL_BLADE
......@@ -456,6 +510,22 @@ config PPC_IBM_CELL_BLADE
select PPC_UDBG_16550
select UDBG_RTAS_CONSOLE
config PPC_PS3
bool "Sony PS3"
depends on PPC_MULTIPLATFORM && PPC64
select PPC_CELL
help
This option enables support for the Sony PS3 game console
and other platforms using the PS3 hypervisor.
config PPC_NATIVE
bool
depends on PPC_MULTIPLATFORM
help
Support for running natively on the hardware, i.e. without
a hypervisor. This option is not user-selectable but should
be selected by all platforms that need it.
config UDBG_RTAS_CONSOLE
bool "RTAS based debug console"
depends on PPC_RTAS
......@@ -517,6 +587,15 @@ config PPC_970_NAP
bool
default n
config PPC_INDIRECT_IO
bool
select GENERIC_IOMAP
default n
config GENERIC_IOMAP
bool
default n
source "drivers/cpufreq/Kconfig"
config CPU_FREQ_PMAC
......@@ -594,12 +673,6 @@ config TAU_AVERAGE
If in doubt, say N here.
config PPC_TODC
depends on EMBEDDED6xx
bool "Generic Time-of-day Clock (TODC) support"
---help---
This adds support for many TODC/RTC chips.
endmenu
source arch/powerpc/platforms/embedded6xx/Kconfig
......@@ -610,6 +683,7 @@ source arch/powerpc/platforms/85xx/Kconfig
source arch/powerpc/platforms/86xx/Kconfig
source arch/powerpc/platforms/8xx/Kconfig
source arch/powerpc/platforms/cell/Kconfig
source arch/powerpc/platforms/ps3/Kconfig
menu "Kernel options"
......@@ -790,7 +864,6 @@ source "arch/powerpc/platforms/prep/Kconfig"
config CMDLINE_BOOL
bool "Default bootloader kernel arguments"
depends on !PPC_ISERIES
config CMDLINE
string "Initial kernel command string"
......@@ -880,7 +953,7 @@ config MCA
config PCI
bool "PCI support" if 40x || CPM2 || PPC_83xx || PPC_85xx || PPC_86xx \
|| PPC_MPC52xx || (EMBEDDED && PPC_ISERIES) || MPC7448HPC2
|| PPC_MPC52xx || (EMBEDDED && PPC_ISERIES) || MPC7448HPC2 || PPC_PS3
default y if !40x && !CPM2 && !8xx && !APUS && !PPC_83xx \
&& !PPC_85xx && !PPC_86xx
default PCI_PERMEDIA if !4xx && !CPM2 && !8xx && APUS
......
arch/powerpc/Kconfig.debug
View file @ 9db73724
......@@ -77,7 +77,7 @@ config KGDB_CONSOLE
config XMON
bool "Include xmon kernel debugger"
depends on DEBUGGER && !PPC_ISERIES
depends on DEBUGGER
help
Include in-kernel hooks for the xmon kernel monitor/debugger.
Unless you are intending to debug the kernel, say N here.
......@@ -98,6 +98,15 @@ config XMON_DEFAULT
xmon is normally disabled unless booted with 'xmon=on'.
Use 'xmon=off' to disable xmon init during runtime.
config XMON_DISASSEMBLY
bool "Include disassembly support in xmon"
depends on XMON
default y
help
Include support for disassembling in xmon. You probably want
to say Y here, unless you're building for a memory-constrained
system.
config IRQSTACKS
bool "Use separate kernel stacks when processing interrupts"
depends on PPC64
......@@ -116,7 +125,7 @@ config BDI_SWITCH
config BOOTX_TEXT
bool "Support for early boot text console (BootX or OpenFirmware only)"
depends PPC_OF && !PPC_ISERIES
depends PPC_OF
help
Say Y here to see progress messages from the boot firmware in text
mode. Requires either BootX or Open Firmware.
......
arch/powerpc/boot/.gitignore
View file @ 9db73724
addnote
empty.c
hack-coff
infblock.c
infblock.h
infcodes.c
infcodes.h
inffast.c
inffast.h
inffixed.h
inflate.c
inflate.h
inftrees.c
inftrees.h
infutil.c
infutil.h
kernel-vmlinux.strip.c
kernel-vmlinux.strip.gz
mktree
uImage
zImage
zImage.chrp
zImage.coff
zImage.coff.lds
zImage.lds
zImage.miboot
zImage.pmac
zImage.pseries
zImage.sandpoint
zImage.vmode
zconf.h
zlib.h
......
arch/powerpc/boot/Makefile
View file @ 9db73724
......@@ -40,7 +40,8 @@ zliblinuxheader := zlib.h zconf.h zutil.h
$(addprefix $(obj)/,$(zlib) main.o): $(addprefix $(obj)/,$(zliblinuxheader)) \
$(addprefix $(obj)/,$(zlibheader))
src-wlib := string.S stdio.c main.c div64.S $(zlib)
src-wlib := string.S stdio.c main.c flatdevtree.c flatdevtree_misc.c \
ns16550.c serial.c simple_alloc.c div64.S util.S $(zlib)
src-plat := of.c
src-boot := crt0.S $(src-wlib) $(src-plat) empty.c
......@@ -74,7 +75,7 @@ $(obj)/zImage.lds $(obj)/zImage.coff.lds: $(obj)/%: $(srctree)/$(src)/%.S
@cp $< $@
clean-files := $(zlib) $(zlibheader) $(zliblinuxheader) \
$(obj)/empty.c
empty.c zImage zImage.coff.lds zImage.lds zImage.sandpoint
quiet_cmd_bootcc = BOOTCC $@
cmd_bootcc = $(CROSS32CC) -Wp,-MD,$(depfile) $(BOOTCFLAGS) -c -o $@ $<
......@@ -93,13 +94,13 @@ $(patsubst %.S,%.o, $(filter %.S, $(src-boot))): %.o: %.S
$(obj)/wrapper.a: $(obj-wlib)
$(call cmd,bootar)
hostprogs-y := addnote addRamDisk hack-coff
hostprogs-y := addnote addRamDisk hack-coff mktree
extra-y := $(obj)/crt0.o $(obj)/wrapper.a $(obj-plat) $(obj)/empty.o \
$(obj)/zImage.lds $(obj)/zImage.coff.lds
wrapper :=$(srctree)/$(src)/wrapper
wrapperbits := $(extra-y) $(addprefix $(obj)/,addnote hack-coff)
wrapperbits := $(extra-y) $(addprefix $(obj)/,addnote hack-coff mktree)
#############
# Bits for building various flavours of zImage
......@@ -148,13 +149,18 @@ $(obj)/zImage.miboot: vmlinux $(wrapperbits)
$(obj)/zImage.initrd.miboot: vmlinux $(wrapperbits)
$(call cmd,wrap_initrd,miboot)
$(obj)/zImage.ps3: vmlinux
$(STRIP) -s -R .comment $< -o $@
$(obj)/uImage: vmlinux $(wrapperbits)
$(call cmd,wrap,uboot)
image-$(CONFIG_PPC_PSERIES) += zImage.pseries
image-$(CONFIG_PPC_MAPLE) += zImage.pseries
image-$(CONFIG_PPC_IBM_CELL_BLADE) += zImage.pseries
image-$(CONFIG_PPC_PS3) += zImage.ps3
image-$(CONFIG_PPC_CHRP) += zImage.chrp
image-$(CONFIG_PPC_EFIKA) += zImage.chrp
image-$(CONFIG_PPC_PMAC) += zImage.pmac
image-$(CONFIG_DEFAULT_UIMAGE) += uImage
......@@ -176,3 +182,4 @@ install: $(CONFIGURE) $(image-y)
clean-files += $(addprefix $(objtree)/, $(obj-boot) vmlinux.strip.gz)
clean-files += $(addprefix $(objtree)/, $(obj-boot) vmlinux.bin.gz)
clean-files += $(image-)
arch/powerpc/boot/dts/kuroboxHG.dts 0 → 100644
View file @ 9db73724
/*
* Device Tree Souce for Buffalo KuroboxHG
*
* Choose CONFIG_LINKSTATION to build a kernel for KuroboxHG, or use
* the default configuration linkstation_defconfig.
*
* Based on sandpoint.dts
*
* 2006 (c) G. Liakhovetski <g.liakhovetski@gmx.de>
*
* This file is licensed under
* the terms of the GNU General Public License version 2. This program
* is licensed "as is" without any warranty of any kind, whether express
* or implied.
XXXX add flash parts, rtc, ??
build with: "dtc -f -I dts -O dtb -o kuroboxHG.dtb -V 16 kuroboxHG.dts"
*/
/ {
linux,phandle = <1000>;
model = "KuroboxHG";
compatible = "linkstation";
#address-cells = <1>;
#size-cells = <1>;
cpus {
linux,phandle = <2000>;
#cpus = <1>;
#address-cells = <1>;
#size-cells = <0>;
PowerPC,603e { /* Really 8241 */
linux,phandle = <2100>;
linux,boot-cpu;
device_type = "cpu";
reg = <0>;
clock-frequency = <fdad680>; /* Fixed by bootwrapper */
timebase-frequency = <1F04000>; /* Fixed by bootwrapper */
bus-frequency = <0>; /* From bootloader */
/* Following required by dtc but not used */
i-cache-line-size = <0>;
d-cache-line-size = <0>;
i-cache-size = <4000>;
d-cache-size = <4000>;
};
};
memory {
linux,phandle = <3000>;
device_type = "memory";
reg = <00000000 08000000>;
};
soc10x { /* AFAICT need to make soc for 8245's uarts to be defined */
linux,phandle = <4000>;
#address-cells = <1>;
#size-cells = <1>;
#interrupt-cells = <2>;
device_type = "soc";
compatible = "mpc10x";
store-gathering = <0>; /* 0 == off, !0 == on */
reg = <80000000 00100000>;
ranges = <80000000 80000000 70000000 /* pci mem space */
fc000000 fc000000 00100000 /* EUMB */
fe000000 fe000000 00c00000 /* pci i/o space */
fec00000 fec00000 00300000 /* pci cfg regs */
fef00000 fef00000 00100000>; /* pci iack */
i2c@80003000 {
linux,phandle = <4300>;
device_type = "i2c";
compatible = "fsl-i2c";
reg = <80003000 1000>;
interrupts = <5 2>;
interrupt-parent = <4400>;
};
serial@80004500 {
linux,phandle = <4511>;
device_type = "serial";
compatible = "ns16550";
reg = <80004500 8>;
clock-frequency = <7c044a8>;
current-speed = <2580>;
interrupts = <9 2>;
interrupt-parent = <4400>;
};
serial@80004600 {
linux,phandle = <4512>;
device_type = "serial";
compatible = "ns16550";
reg = <80004600 8>;
clock-frequency = <7c044a8>;
current-speed = <e100>;
interrupts = <a 0>;
interrupt-parent = <4400>;
};
pic@80040000 {
linux,phandle = <4400>;
#interrupt-cells = <2>;
#address-cells = <0>;
device_type = "open-pic";
compatible = "chrp,open-pic";
interrupt-controller;
reg = <80040000 40000>;
built-in;
};
pci@fec00000 {
linux,phandle = <4500>;
#address-cells = <3>;
#size-cells = <2>;
#interrupt-cells = <1>;
device_type = "pci";
compatible = "mpc10x-pci";
reg = <fec00000 400000>;
ranges = <01000000 0 0 fe000000 0 00c00000
02000000 0 80000000 80000000 0 70000000>;
bus-range = <0 ff>;
clock-frequency = <7f28155>;
interrupt-parent = <4400>;
interrupt-map-mask = <f800 0 0 7>;
interrupt-map = <
/* IDSEL 0x11 - IRQ0 ETH */
5800 0 0 1 4400 0 1
5800 0 0 2 4400 1 1
5800 0 0 3 4400 2 1
5800 0 0 4 4400 3 1
/* IDSEL 0x12 - IRQ1 IDE0 */
6000 0 0 1 4400 1 1
6000 0 0 2 4400 2 1
6000 0 0 3 4400 3 1
6000 0 0 4 4400 0 1
/* IDSEL 0x14 - IRQ3 USB2.0 */
7000 0 0 1 4400 3 1
7000 0 0 2 4400 3 1
7000 0 0 3 4400 3 1
7000 0 0 4 4400 3 1
>;
};
};
};
arch/powerpc/boot/dts/lite5200.dts 0 → 100644
View file @ 9db73724
/*
* Lite5200 board Device Tree Source
*
* Copyright 2006 Secret Lab Technologies Ltd.
* Grant Likely <grant.likely@secretlab.ca>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*/
/ {
model = "Lite5200";
compatible = "lite5200\0lite52xx\0mpc5200\0mpc52xx";
#address-cells = <1>;
#size-cells = <1>;
cpus {
#cpus = <1>;
#address-cells = <1>;
#size-cells = <0>;
PowerPC,5200@0 {
device_type = "cpu";
reg = <0>;
d-cache-line-size = <20>;
i-cache-line-size = <20>;
d-cache-size = <4000>; // L1, 16K
i-cache-size = <4000>; // L1, 16K
timebase-frequency = <0>; // from bootloader
bus-frequency = <0>; // from bootloader
clock-frequency = <0>; // from bootloader
32-bit;
};
};
memory {
device_type = "memory";
reg = <00000000 04000000>; // 64MB
};
soc5200@f0000000 {
#interrupt-cells = <3>;
device_type = "soc";
ranges = <0 f0000000 f0010000>;
reg = <f0000000 00010000>;
bus-frequency = <0>; // from bootloader
cdm@200 {
compatible = "mpc5200-cdm\0mpc52xx-cdm";
reg = <200 38>;
};
pic@500 {
// 5200 interrupts are encoded into two levels;
linux,phandle = <500>;
interrupt-controller;
#interrupt-cells = <3>;
device_type = "interrupt-controller";
compatible = "mpc5200-pic\0mpc52xx-pic";
reg = <500 80>;
built-in;
};
gpt@600 { // General Purpose Timer
compatible = "mpc5200-gpt\0mpc52xx-gpt";
device_type = "gpt";
reg = <600 10>;
interrupts = <1 9 0>;
interrupt-parent = <500>;
};
gpt@610 { // General Purpose Timer
compatible = "mpc5200-gpt\0mpc52xx-gpt";
device_type = "gpt";
reg = <610 10>;
interrupts = <1 a 0>;
interrupt-parent = <500>;
};
gpt@620 { // General Purpose Timer
compatible = "mpc5200-gpt\0mpc52xx-gpt";
device_type = "gpt";
reg = <620 10>;
interrupts = <1 b 0>;
interrupt-parent = <500>;
};
gpt@630 { // General Purpose Timer
compatible = "mpc5200-gpt\0mpc52xx-gpt";
device_type = "gpt";
reg = <630 10>;
interrupts = <1 c 0>;
interrupt-parent = <500>;
};
gpt@640 { // General Purpose Timer
compatible = "mpc5200-gpt\0mpc52xx-gpt";
device_type = "gpt";
reg = <640 10>;
interrupts = <1 d 0>;
interrupt-parent = <500>;
};
gpt@650 { // General Purpose Timer
compatible = "mpc5200-gpt\0mpc52xx-gpt";
device_type = "gpt";
reg = <650 10>;
interrupts = <1 e 0>;
interrupt-parent = <500>;
};
gpt@660 { // General Purpose Timer
compatible = "mpc5200-gpt\0mpc52xx-gpt";
device_type = "gpt";
reg = <660 10>;
interrupts = <1 f 0>;
interrupt-parent = <500>;
};
gpt@670 { // General Purpose Timer
compatible = "mpc5200-gpt\0mpc52xx-gpt";
device_type = "gpt";
reg = <670 10>;
interrupts = <1 10 0>;
interrupt-parent = <500>;
};
rtc@800 { // Real time clock
compatible = "mpc5200-rtc\0mpc52xx-rtc";
device_type = "rtc";
reg = <800 100>;
interrupts = <1 5 0 1 6 0>;
interrupt-parent = <500>;
};
mscan@900 {
device_type = "mscan";
compatible = "mpc5200-mscan\0mpc52xx-mscan";
interrupts = <2 11 0>;
interrupt-parent = <500>;
reg = <900 80>;
};
mscan@980 {
device_type = "mscan";
compatible = "mpc5200-mscan\0mpc52xx-mscan";
interrupts = <1 12 0>;
interrupt-parent = <500>;
reg = <980 80>;
};
gpio@b00 {
compatible = "mpc5200-gpio\0mpc52xx-gpio";
reg = <b00 40>;
interrupts = <1 7 0>;
interrupt-parent = <500>;
};
gpio-wkup@b00 {
compatible = "mpc5200-gpio-wkup\0mpc52xx-gpio-wkup";
reg = <c00 40>;
interrupts = <1 8 0 0 3 0>;
interrupt-parent = <500>;
};
pci@0d00 {
#interrupt-cells = <1>;
#size-cells = <2>;
#address-cells = <3>;
device_type = "pci";
compatible = "mpc5200-pci\0mpc52xx-pci";
reg = <d00 100>;
interrupt-map-mask = <f800 0 0 7>;
interrupt-map = <c000 0 0 1 500 0 0 3
c000 0 0 2 500 0 0 3
c000 0 0 3 500 0 0 3
c000 0 0 4 500 0 0 3>;
clock-frequency = <0>; // From boot loader
interrupts = <2 8 0 2 9 0 2 a 0>;
interrupt-parent = <500>;
bus-range = <0 0>;
ranges = <42000000 0 80000000 80000000 0 20000000
02000000 0 a0000000 a0000000 0 10000000
01000000 0 00000000 b0000000 0 01000000>;
};
spi@f00 {
device_type = "spi";
compatible = "mpc5200-spi\0mpc52xx-spi";
reg = <f00 20>;
interrupts = <2 d 0 2 e 0>;
interrupt-parent = <500>;
};
usb@1000 {
device_type = "usb-ohci-be";
compatible = "mpc5200-ohci\0mpc52xx-ohci\0ohci-be";
reg = <1000 ff>;
interrupts = <2 6 0>;
interrupt-parent = <500>;
};
bestcomm@1200 {
device_type = "dma-controller";
compatible = "mpc5200-bestcomm\0mpc52xx-bestcomm";
reg = <1200 80>;
interrupts = <3 0 0 3 1 0 3 2 0 3 3 0
3 4 0 3 5 0 3 6 0 3 7 0
3 8 0 3 9 0 3 a 0 3 b 0
3 c 0 3 d 0 3 e 0 3 f 0>;
interrupt-parent = <500>;
};
xlb@1f00 {
compatible = "mpc5200-xlb\0mpc52xx-xlb";
reg = <1f00 100>;
};
serial@2000 { // PSC1
device_type = "serial";
compatible = "mpc5200-psc-uart\0mpc52xx-psc-uart";
port-number = <0>; // Logical port assignment
reg = <2000 100>;
interrupts = <2 1 0>;
interrupt-parent = <500>;
};
// PSC2 in spi mode example
spi@2200 { // PSC2
device_type = "spi";
compatible = "mpc5200-psc-spi\0mpc52xx-psc-spi";
reg = <2200 100>;
interrupts = <2 2 0>;
interrupt-parent = <500>;
};
// PSC3 in CODEC mode example
i2s@2400 { // PSC3
device_type = "i2s";
compatible = "mpc5200-psc-i2s\0mpc52xx-psc-i2s";
reg = <2400 100>;
interrupts = <2 3 0>;
interrupt-parent = <500>;
};
// PSC4 unconfigured
//serial@2600 { // PSC4
// device_type = "serial";
// compatible = "mpc5200-psc-uart\0mpc52xx-psc-uart";
// reg = <2600 100>;
// interrupts = <2 b 0>;
// interrupt-parent = <500>;
//};
// PSC5 unconfigured
//serial@2800 { // PSC5
// device_type = "serial";
// compatible = "mpc5200-psc-uart\0mpc52xx-psc-uart";
// reg = <2800 100>;
// interrupts = <2 c 0>;
// interrupt-parent = <500>;
//};
// PSC6 in AC97 mode example
ac97@2c00 { // PSC6
device_type = "ac97";
compatible = "mpc5200-psc-ac97\0mpc52xx-psc-ac97";
reg = <2c00 100>;
interrupts = <2 4 0>;
interrupt-parent = <500>;
};
ethernet@3000 {
device_type = "network";
compatible = "mpc5200-fec\0mpc52xx-fec";
reg = <3000 800>;
mac-address = [ 02 03 04 05 06 07 ]; // Bad!
interrupts = <2 5 0>;
interrupt-parent = <500>;
};
ata@3a00 {
device_type = "ata";
compatible = "mpc5200-ata\0mpc52xx-ata";
reg = <3a00 100>;
interrupts = <2 7 0>;
interrupt-parent = <500>;
};
i2c@3d00 {
device_type = "i2c";
compatible = "mpc5200-i2c\0mpc52xx-i2c";
reg = <3d00 40>;
interrupts = <2 f 0>;
interrupt-parent = <500>;
};
i2c@3d40 {
device_type = "i2c";
compatible = "mpc5200-i2c\0mpc52xx-i2c";
reg = <3d40 40>;
interrupts = <2 10 0>;
interrupt-parent = <500>;
};
sram@8000 {
device_type = "sram";
compatible = "mpc5200-sram\0mpc52xx-sram\0sram";
reg = <8000 4000>;
};
};
};
arch/powerpc/boot/dts/lite5200b.dts 0 → 100644
View file @ 9db73724
/*
* Lite5200B board Device Tree Source
*
* Copyright 2006 Secret Lab Technologies Ltd.
* Grant Likely <grant.likely@secretlab.ca>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*/
/ {
model = "Lite5200b";
compatible = "lite5200b\0lite52xx\0mpc5200b\0mpc52xx";
#address-cells = <1>;
#size-cells = <1>;
cpus {
#cpus = <1>;
#address-cells = <1>;
#size-cells = <0>;
PowerPC,5200@0 {
device_type = "cpu";
reg = <0>;
d-cache-line-size = <20>;
i-cache-line-size = <20>;
d-cache-size = <4000>; // L1, 16K
i-cache-size = <4000>; // L1, 16K
timebase-frequency = <0>; // from bootloader
bus-frequency = <0>; // from bootloader
clock-frequency = <0>; // from bootloader
32-bit;
};
};
memory {
device_type = "memory";
reg = <00000000 10000000>; // 256MB
};
soc5200@f0000000 {
#interrupt-cells = <3>;
device_type = "soc";
ranges = <0 f0000000 f0010000>;
reg = <f0000000 00010000>;
bus-frequency = <0>; // from bootloader
cdm@200 {
compatible = "mpc5200b-cdm\0mpc52xx-cdm";
reg = <200 38>;
};
pic@500 {
// 5200 interrupts are encoded into two levels;
linux,phandle = <500>;
interrupt-controller;
#interrupt-cells = <3>;
device_type = "interrupt-controller";
compatible = "mpc5200b-pic\0mpc52xx-pic";
reg = <500 80>;
built-in;
};
gpt@600 { // General Purpose Timer
compatible = "mpc5200b-gpt\0mpc52xx-gpt";
device_type = "gpt";
reg = <600 10>;
interrupts = <1 9 0>;
interrupt-parent = <500>;
};
gpt@610 { // General Purpose Timer
compatible = "mpc5200b-gpt\0mpc52xx-gpt";
device_type = "gpt";
reg = <610 10>;
interrupts = <1 a 0>;
interrupt-parent = <500>;
};
gpt@620 { // General Purpose Timer
compatible = "mpc5200b-gpt\0mpc52xx-gpt";
device_type = "gpt";
reg = <620 10>;
interrupts = <1 b 0>;
interrupt-parent = <500>;
};
gpt@630 { // General Purpose Timer
compatible = "mpc5200b-gpt\0mpc52xx-gpt";
device_type = "gpt";
reg = <630 10>;
interrupts = <1 c 0>;
interrupt-parent = <500>;
};
gpt@640 { // General Purpose Timer
compatible = "mpc5200b-gpt\0mpc52xx-gpt";
device_type = "gpt";
reg = <640 10>;
interrupts = <1 d 0>;
interrupt-parent = <500>;
};
gpt@650 { // General Purpose Timer
compatible = "mpc5200b-gpt\0mpc52xx-gpt";
device_type = "gpt";
reg = <650 10>;
interrupts = <1 e 0>;
interrupt-parent = <500>;
};
gpt@660 { // General Purpose Timer
compatible = "mpc5200b-gpt\0mpc52xx-gpt";
device_type = "gpt";
reg = <660 10>;
interrupts = <1 f 0>;
interrupt-parent = <500>;
};
gpt@670 { // General Purpose Timer
compatible = "mpc5200b-gpt\0mpc52xx-gpt";
device_type = "gpt";
reg = <670 10>;
interrupts = <1 10 0>;
interrupt-parent = <500>;
};
rtc@800 { // Real time clock
compatible = "mpc5200b-rtc\0mpc52xx-rtc";
device_type = "rtc";
reg = <800 100>;
interrupts = <1 5 0 1 6 0>;
interrupt-parent = <500>;
};
mscan@900 {
device_type = "mscan";
compatible = "mpc5200b-mscan\0mpc52xx-mscan";
interrupts = <2 11 0>;
interrupt-parent = <500>;
reg = <900 80>;
};
mscan@980 {
device_type = "mscan";
compatible = "mpc5200b-mscan\0mpc52xx-mscan";
interrupts = <1 12 0>;
interrupt-parent = <500>;
reg = <980 80>;
};
gpio@b00 {
compatible = "mpc5200b-gpio\0mpc52xx-gpio";
reg = <b00 40>;
interrupts = <1 7 0>;
interrupt-parent = <500>;
};
gpio-wkup@b00 {
compatible = "mpc5200b-gpio-wkup\0mpc52xx-gpio-wkup";
reg = <c00 40>;
interrupts = <1 8 0 0 3 0>;
interrupt-parent = <500>;
};
pci@0d00 {
#interrupt-cells = <1>;
#size-cells = <2>;
#address-cells = <3>;
device_type = "pci";
compatible = "mpc5200b-pci\0mpc52xx-pci";
reg = <d00 100>;
interrupt-map-mask = <f800 0 0 7>;
interrupt-map = <c000 0 0 1 500 0 0 3 // 1st slot
c000 0 0 2 500 1 1 3
c000 0 0 3 500 1 2 3
c000 0 0 4 500 1 3 3
c800 0 0 1 500 1 1 3 // 2nd slot
c800 0 0 2 500 1 2 3
c800 0 0 3 500 1 3 3
c800 0 0 4 500 0 0 3>;
clock-frequency = <0>; // From boot loader
interrupts = <2 8 0 2 9 0 2 a 0>;
interrupt-parent = <500>;
bus-range = <0 0>;
ranges = <42000000 0 80000000 80000000 0 20000000
02000000 0 a0000000 a0000000 0 10000000
01000000 0 00000000 b0000000 0 01000000>;
};
spi@f00 {
device_type = "spi";
compatible = "mpc5200b-spi\0mpc52xx-spi";
reg = <f00 20>;
interrupts = <2 d 0 2 e 0>;
interrupt-parent = <500>;
};
usb@1000 {
device_type = "usb-ohci-be";
compatible = "mpc5200b-ohci\0mpc52xx-ohci\0ohci-be";
reg = <1000 ff>;
interrupts = <2 6 0>;
interrupt-parent = <500>;
};
bestcomm@1200 {
device_type = "dma-controller";
compatible = "mpc5200b-bestcomm\0mpc52xx-bestcomm";
reg = <1200 80>;
interrupts = <3 0 0 3 1 0 3 2 0 3 3 0
3 4 0 3 5 0 3 6 0 3 7 0
3 8 0 3 9 0 3 a 0 3 b 0
3 c 0 3 d 0 3 e 0 3 f 0>;
interrupt-parent = <500>;
};
xlb@1f00 {
compatible = "mpc5200b-xlb\0mpc52xx-xlb";
reg = <1f00 100>;
};
serial@2000 { // PSC1
device_type = "serial";
compatible = "mpc5200b-psc-uart\0mpc52xx-psc-uart";
port-number = <0>; // Logical port assignment
reg = <2000 100>;
interrupts = <2 1 0>;
interrupt-parent = <500>;
};
// PSC2 in spi mode example
spi@2200 { // PSC2
device_type = "spi";
compatible = "mpc5200b-psc-spi\0mpc52xx-psc-spi";
reg = <2200 100>;
interrupts = <2 2 0>;
interrupt-parent = <500>;
};
// PSC3 in CODEC mode example
i2s@2400 { // PSC3
device_type = "i2s";
compatible = "mpc5200b-psc-i2s\0mpc52xx-psc-i2s";
reg = <2400 100>;
interrupts = <2 3 0>;
interrupt-parent = <500>;
};
// PSC4 unconfigured
//serial@2600 { // PSC4
// device_type = "serial";
// compatible = "mpc5200b-psc-uart\0mpc52xx-psc-uart";
// reg = <2600 100>;
// interrupts = <2 b 0>;
// interrupt-parent = <500>;
//};
// PSC5 unconfigured
//serial@2800 { // PSC5
// device_type = "serial";
// compatible = "mpc5200b-psc-uart\0mpc52xx-psc-uart";
// reg = <2800 100>;
// interrupts = <2 c 0>;
// interrupt-parent = <500>;
//};
// PSC6 in AC97 mode example
ac97@2c00 { // PSC6
device_type = "ac97";
compatible = "mpc5200b-psc-ac97\0mpc52xx-psc-ac97";
reg = <2c00 100>;
interrupts = <2 4 0>;
interrupt-parent = <500>;
};
ethernet@3000 {
device_type = "network";
compatible = "mpc5200b-fec\0mpc52xx-fec";
reg = <3000 800>;
mac-address = [ 02 03 04 05 06 07 ]; // Bad!
interrupts = <2 5 0>;
interrupt-parent = <500>;
};
ata@3a00 {
device_type = "ata";
compatible = "mpc5200b-ata\0mpc52xx-ata";
reg = <3a00 100>;
interrupts = <2 7 0>;
interrupt-parent = <500>;
};
i2c@3d00 {
device_type = "i2c";
compatible = "mpc5200b-i2c\0mpc52xx-i2c";
reg = <3d00 40>;
interrupts = <2 f 0>;
interrupt-parent = <500>;
};
i2c@3d40 {
device_type = "i2c";
compatible = "mpc5200b-i2c\0mpc52xx-i2c";
reg = <3d40 40>;
interrupts = <2 10 0>;
interrupt-parent = <500>;
};
sram@8000 {
device_type = "sram";
compatible = "mpc5200b-sram\0mpc52xx-sram\0sram";
reg = <8000 4000>;
};
};
};
arch/powerpc/boot/dts/mpc7448hpc2.dts
View file @ 9db73724
......@@ -161,29 +161,41 @@ pci@1000 {
interrupt-map = <
/* IDSEL 0x11 */
0800 0 0 1 7400 24 0
0800 0 0 2 7400 25 0
0800 0 0 3 7400 26 0
0800 0 0 4 7400 27 0
0800 0 0 1 1180 24 0
0800 0 0 2 1180 25 0
0800 0 0 3 1180 26 0
0800 0 0 4 1180 27 0
/* IDSEL 0x12 */
1000 0 0 1 7400 25 0
1000 0 0 2 7400 26 0
1000 0 0 3 7400 27 0
1000 0 0 4 7400 24 0
1000 0 0 1 1180 25 0
1000 0 0 2 1180 26 0
1000 0 0 3 1180 27 0
1000 0 0 4 1180 24 0
/* IDSEL 0x13 */
1800 0 0 1 7400 26 0
1800 0 0 2 7400 27 0
1800 0 0 3 7400 24 0
1800 0 0 4 7400 25 0
1800 0 0 1 1180 26 0
1800 0 0 2 1180 27 0
1800 0 0 3 1180 24 0
1800 0 0 4 1180 25 0
/* IDSEL 0x14 */
2000 0 0 1 7400 27 0
2000 0 0 2 7400 24 0
2000 0 0 3 7400 25 0
2000 0 0 4 7400 26 0
2000 0 0 1 1180 27 0
2000 0 0 2 1180 24 0
2000 0 0 3 1180 25 0
2000 0 0 4 1180 26 0
>;
router@1180 {
linux,phandle = <1180>;
clock-frequency = <0>;
interrupt-controller;
device_type = "pic-router";
#address-cells = <0>;
#interrupt-cells = <2>;
built-in;
big-endian;
interrupts = <17 2>;
interrupt-parent = <7400>;
};
};
};
......
arch/powerpc/boot/flatdevtree.c 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/powerpc/boot/flatdevtree.h
View file @ 9db73724
......@@ -17,7 +17,7 @@
#ifndef FLATDEVTREE_H
#define FLATDEVTREE_H
#include "types.h"
#include "flatdevtree_env.h"
/* Definitions used by the flattened device tree */
#define OF_DT_HEADER 0xd00dfeed /* marker */
......@@ -43,4 +43,64 @@ struct boot_param_header {
u32 dt_strings_size; /* size of the DT strings block */
};
struct ft_reserve {
u64 start;
u64 len;
};
struct ft_region {
char *start;
unsigned long size;
};
enum ft_rgn_id {
FT_RSVMAP,
FT_STRUCT,
FT_STRINGS,
FT_N_REGION
};
#define FT_MAX_DEPTH 50
struct ft_cxt {
struct boot_param_header *bph;
int max_size; /* maximum size of tree */
int isordered; /* everything in standard order */
void *(*realloc)(void *, unsigned long);
char *str_anchor;
char *p; /* current insertion point in structs */
struct ft_region rgn[FT_N_REGION];
void *genealogy[FT_MAX_DEPTH+1];
char **node_tbl;
unsigned int node_max;
unsigned int nodes_used;
};
int ft_begin_node(struct ft_cxt *cxt, const char *name);
void ft_end_node(struct ft_cxt *cxt);
void ft_begin_tree(struct ft_cxt *cxt);
void ft_end_tree(struct ft_cxt *cxt);
void ft_nop(struct ft_cxt *cxt);
int ft_prop(struct ft_cxt *cxt, const char *name,
const void *data, unsigned int sz);
int ft_prop_str(struct ft_cxt *cxt, const char *name, const char *str);
int ft_prop_int(struct ft_cxt *cxt, const char *name, unsigned int val);
void ft_begin(struct ft_cxt *cxt, void *blob, unsigned int max_size,
void *(*realloc_fn)(void *, unsigned long));
int ft_open(struct ft_cxt *cxt, void *blob, unsigned int max_size,
unsigned int max_find_device,
void *(*realloc_fn)(void *, unsigned long));
int ft_add_rsvmap(struct ft_cxt *cxt, u64 physaddr, u64 size);
void ft_dump_blob(const void *bphp);
void ft_merge_blob(struct ft_cxt *cxt, void *blob);
void *ft_find_device(struct ft_cxt *cxt, const char *srch_path);
void *ft_find_descendent(struct ft_cxt *cxt, void *top, const char *srch_path);
int ft_get_prop(struct ft_cxt *cxt, const void *phandle, const char *propname,
void *buf, const unsigned int buflen);
int ft_set_prop(struct ft_cxt *cxt, const void *phandle, const char *propname,
const void *buf, const unsigned int buflen);
#endif /* FLATDEVTREE_H */
arch/powerpc/boot/flatdevtree_env.h 0 → 100644
View file @ 9db73724
/*
* This file adds the header file glue so that the shared files
* flatdevicetree.[ch] can compile and work in the powerpc bootwrapper.
*
* strncmp & strchr copied from <file:lib/strings.c>
* Copyright (C) 1991, 1992 Linus Torvalds
*
* Maintained by: Mark A. Greer <mgreer@mvista.com>
*/
#ifndef _PPC_BOOT_FLATDEVTREE_ENV_H_
#define _PPC_BOOT_FLATDEVTREE_ENV_H_
#include <stdarg.h>
#include <stddef.h>
#include "types.h"
#include "string.h"
#include "stdio.h"
#include "ops.h"
#define be16_to_cpu(x) (x)
#define cpu_to_be16(x) (x)
#define be32_to_cpu(x) (x)
#define cpu_to_be32(x) (x)
#define be64_to_cpu(x) (x)
#define cpu_to_be64(x) (x)
static inline int strncmp(const char *cs, const char *ct, size_t count)
{
signed char __res = 0;
while (count) {
if ((__res = *cs - *ct++) != 0 || !*cs++)
break;
count--;
}
return __res;
}
static inline char *strchr(const char *s, int c)
{
for (; *s != (char)c; ++s)
if (*s == '\0')
return NULL;
return (char *)s;
}
#endif /* _PPC_BOOT_FLATDEVTREE_ENV_H_ */
arch/powerpc/boot/flatdevtree_misc.c 0 → 100644
View file @ 9db73724
/*
* This file does the necessary interface mapping between the bootwrapper
* device tree operations and the interface provided by shared source
* files flatdevicetree.[ch].
*
* Author: Mark A. Greer <mgreer@mvista.com>
*
* 2006 (c) MontaVista Software, Inc. This file is licensed under
* the terms of the GNU General Public License version 2. This program
* is licensed "as is" without any warranty of any kind, whether express
* or implied.
*/
#include <stddef.h>
#include "flatdevtree.h"
#include "ops.h"
static struct ft_cxt cxt;
static void *ft_finddevice(const char *name)
{
return ft_find_device(&cxt, name);
}
static int ft_getprop(const void *phandle, const char *propname, void *buf,
const int buflen)
{
return ft_get_prop(&cxt, phandle, propname, buf, buflen);
}
static int ft_setprop(const void *phandle, const char *propname,
const void *buf, const int buflen)
{
return ft_set_prop(&cxt, phandle, propname, buf, buflen);
}
static unsigned long ft_finalize(void)
{
ft_end_tree(&cxt);
return (unsigned long)cxt.bph;
}
int ft_init(void *dt_blob, unsigned int max_size, unsigned int max_find_device)
{
dt_ops.finddevice = ft_finddevice;
dt_ops.getprop = ft_getprop;
dt_ops.setprop = ft_setprop;
dt_ops.finalize = ft_finalize;
return ft_open(&cxt, dt_blob, max_size, max_find_device,
platform_ops.realloc);
}
arch/powerpc/boot/io.h 0 → 100644
View file @ 9db73724
#ifndef _IO_H
#define __IO_H
/*
* Low-level I/O routines.
*
* Copied from <file:include/asm-powerpc/io.h> (which has no copyright)
*/
static inline int in_8(const volatile unsigned char *addr)
{
int ret;
__asm__ __volatile__("lbz%U1%X1 %0,%1; twi 0,%0,0; isync"
: "=r" (ret) : "m" (*addr));
return ret;
}
static inline void out_8(volatile unsigned char *addr, int val)
{
__asm__ __volatile__("stb%U0%X0 %1,%0; sync"
: "=m" (*addr) : "r" (val));
}
static inline unsigned in_le32(const volatile unsigned *addr)
{
unsigned ret;
__asm__ __volatile__("lwbrx %0,0,%1; twi 0,%0,0; isync"
: "=r" (ret) : "r" (addr), "m" (*addr));
return ret;
}
static inline unsigned in_be32(const volatile unsigned *addr)
{
unsigned ret;
__asm__ __volatile__("lwz%U1%X1 %0,%1; twi 0,%0,0; isync"
: "=r" (ret) : "m" (*addr));
return ret;
}
static inline void out_le32(volatile unsigned *addr, int val)
{
__asm__ __volatile__("stwbrx %1,0,%2; sync" : "=m" (*addr)
: "r" (val), "r" (addr));
}
static inline void out_be32(volatile unsigned *addr, int val)
{
__asm__ __volatile__("stw%U0%X0 %1,%0; sync"
: "=m" (*addr) : "r" (val));
}
#endif /* _IO_H */
arch/powerpc/boot/main.c
View file @ 9db73724
......@@ -27,6 +27,8 @@ extern char _vmlinux_start[];
extern char _vmlinux_end[];
extern char _initrd_start[];
extern char _initrd_end[];
extern char _dtb_start[];
extern char _dtb_end[];
struct addr_range {
unsigned long addr;
......@@ -167,7 +169,7 @@ static int is_elf32(void *hdr)
return 1;
}
static void prep_kernel(unsigned long *a1, unsigned long *a2)
static void prep_kernel(unsigned long a1, unsigned long a2)
{
int len;
......@@ -203,11 +205,14 @@ static void prep_kernel(unsigned long *a1, unsigned long *a2)
}
/*
* Now we try to alloc memory for the initrd (and copy it there)
* Now find the initrd
*
* First see if we have an image attached to us. If so
* allocate memory for it and copy it there.
*/
initrd.size = (unsigned long)(_initrd_end - _initrd_start);
initrd.memsize = initrd.size;
if ( initrd.size > 0 ) {
if (initrd.size > 0) {
printf("Allocating 0x%lx bytes for initrd ...\n\r",
initrd.size);
initrd.addr = (unsigned long)malloc((u32)initrd.size);
......@@ -216,8 +221,6 @@ static void prep_kernel(unsigned long *a1, unsigned long *a2)
"ramdisk !\n\r");
exit();
}
*a1 = initrd.addr;
*a2 = initrd.size;
printf("initial ramdisk moving 0x%lx <- 0x%lx "
"(0x%lx bytes)\n\r", initrd.addr,
(unsigned long)_initrd_start, initrd.size);
......@@ -225,6 +228,12 @@ static void prep_kernel(unsigned long *a1, unsigned long *a2)
initrd.size);
printf("initrd head: 0x%lx\n\r",
*((unsigned long *)initrd.addr));
} else if (a2 != 0) {
/* Otherwise, see if yaboot or another loader gave us an initrd */
initrd.addr = a1;
initrd.memsize = initrd.size = a2;
printf("Using loader supplied initrd at 0x%lx (0x%lx bytes)\n\r",
initrd.addr, initrd.size);
}
/* Eventually gunzip the kernel */
......@@ -250,10 +259,6 @@ static void prep_kernel(unsigned long *a1, unsigned long *a2)
flush_cache((void *)vmlinux.addr, vmlinux.size);
}
void __attribute__ ((weak)) ft_init(void *dt_blob)
{
}
/* A buffer that may be edited by tools operating on a zImage binary so as to
* edit the command line passed to vmlinux (by setting /chosen/bootargs).
* The buffer is put in it's own section so that tools may locate it easier.
......@@ -285,36 +290,22 @@ static void set_cmdline(char *buf)
setprop(devp, "bootargs", buf, strlen(buf) + 1);
}
/* Section where ft can be tacked on after zImage is built */
union blobspace {
struct boot_param_header hdr;
char space[8*1024];
} dt_blob __attribute__((__section__("__builtin_ft")));
struct platform_ops platform_ops;
struct dt_ops dt_ops;
struct console_ops console_ops;
void start(unsigned long a1, unsigned long a2, void *promptr, void *sp)
{
int have_dt = 0;
kernel_entry_t kentry;
char cmdline[COMMAND_LINE_SIZE];
unsigned long ft_addr = 0;
memset(__bss_start, 0, _end - __bss_start);
memset(&platform_ops, 0, sizeof(platform_ops));
memset(&dt_ops, 0, sizeof(dt_ops));
memset(&console_ops, 0, sizeof(console_ops));
/* Override the dt_ops and device tree if there was an flat dev
* tree attached to the zImage.
*/
if (dt_blob.hdr.magic == OF_DT_HEADER) {
have_dt = 1;
ft_init(&dt_blob);
}
if (platform_init(promptr))
if (platform_init(promptr, _dtb_start, _dtb_end))
exit();
if (console_ops.open && (console_ops.open() < 0))
exit();
......@@ -324,7 +315,7 @@ void start(unsigned long a1, unsigned long a2, void *promptr, void *sp)
printf("\n\rzImage starting: loaded at 0x%p (sp: 0x%p)\n\r",
_start, sp);
prep_kernel(&a1, &a2);
prep_kernel(a1, a2);
/* If cmdline came from zimage wrapper or if we can edit the one
* in the dt, print it out and edit it, if possible.
......@@ -338,15 +329,23 @@ void start(unsigned long a1, unsigned long a2, void *promptr, void *sp)
set_cmdline(cmdline);
}
printf("Finalizing device tree...");
if (dt_ops.finalize)
ft_addr = dt_ops.finalize();
if (ft_addr)
printf(" flat tree at 0x%lx\n\r", ft_addr);
else
printf(" using OF tree (promptr=%p)\n\r", promptr);
if (console_ops.close)
console_ops.close();
kentry = (kernel_entry_t) vmlinux.addr;
if (have_dt)
kentry(dt_ops.ft_addr(), 0, NULL);
if (ft_addr)
kentry(ft_addr, 0, NULL);
else
/* XXX initrd addr/size should be passed in properties */
kentry(a1, a2, promptr);
kentry(initrd.addr, initrd.size, promptr);
/* console closed so printf below may not work */
printf("Error: Linux kernel returned to zImage boot wrapper!\n\r");
......
arch/powerpc/boot/mktree.c 0 → 100644
View file @ 9db73724
/*
* Makes a tree bootable image for IBM Evaluation boards.
* Basically, just take a zImage, skip the ELF header, and stuff
* a 32 byte header on the front.
*
* We use htonl, which is a network macro, to make sure we're doing
* The Right Thing on an LE machine. It's non-obvious, but it should
* work on anything BSD'ish.
*/
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
#include <unistd.h>
#include <netinet/in.h>
#ifdef __sun__
#include <inttypes.h>
#else
#include <stdint.h>
#endif
/* This gets tacked on the front of the image. There are also a few
* bytes allocated after the _start label used by the boot rom (see
* head.S for details).
*/
typedef struct boot_block {
uint32_t bb_magic; /* 0x0052504F */
uint32_t bb_dest; /* Target address of the image */
uint32_t bb_num_512blocks; /* Size, rounded-up, in 512 byte blks */
uint32_t bb_debug_flag; /* Run debugger or image after load */
uint32_t bb_entry_point; /* The image address to start */
uint32_t bb_checksum; /* 32 bit checksum including header */
uint32_t reserved[2];
} boot_block_t;
#define IMGBLK 512
char tmpbuf[IMGBLK];
int main(int argc, char *argv[])
{
int in_fd, out_fd;
int nblks, i;
uint cksum, *cp;
struct stat st;
boot_block_t bt;
if (argc < 3) {
fprintf(stderr, "usage: %s <zImage-file> <boot-image> [entry-point]\n",argv[0]);
exit(1);
}
if (stat(argv[1], &st) < 0) {
perror("stat");
exit(2);
}
nblks = (st.st_size + IMGBLK) / IMGBLK;
bt.bb_magic = htonl(0x0052504F);
/* If we have the optional entry point parameter, use it */
if (argc == 4)
bt.bb_dest = bt.bb_entry_point = htonl(strtoul(argv[3], NULL, 0));
else
bt.bb_dest = bt.bb_entry_point = htonl(0x500000);
/* We know these from the linker command.
* ...and then move it up into memory a little more so the
* relocation can happen.
*/
bt.bb_num_512blocks = htonl(nblks);
bt.bb_debug_flag = 0;
bt.bb_checksum = 0;
/* To be neat and tidy :-).
*/
bt.reserved[0] = 0;
bt.reserved[1] = 0;
if ((in_fd = open(argv[1], O_RDONLY)) < 0) {
perror("zImage open");
exit(3);
}
if ((out_fd = open(argv[2], (O_RDWR | O_CREAT | O_TRUNC), 0666)) < 0) {
perror("bootfile open");
exit(3);
}
cksum = 0;
cp = (void *)&bt;
for (i=0; i<sizeof(bt)/sizeof(uint); i++)
cksum += *cp++;
/* Assume zImage is an ELF file, and skip the 64K header.
*/
if (read(in_fd, tmpbuf, IMGBLK) != IMGBLK) {
fprintf(stderr, "%s is too small to be an ELF image\n",
argv[1]);
exit(4);
}
if ((*(uint *)tmpbuf) != htonl(0x7f454c46)) {
fprintf(stderr, "%s is not an ELF image\n", argv[1]);
exit(4);
}
if (lseek(in_fd, (64 * 1024), SEEK_SET) < 0) {
fprintf(stderr, "%s failed to seek in ELF image\n", argv[1]);
exit(4);
}
nblks -= (64 * 1024) / IMGBLK;
/* And away we go......
*/
if (write(out_fd, &bt, sizeof(bt)) != sizeof(bt)) {
perror("boot-image write");
exit(5);
}
while (nblks-- > 0) {
if (read(in_fd, tmpbuf, IMGBLK) < 0) {
perror("zImage read");
exit(5);
}
cp = (uint *)tmpbuf;
for (i=0; i<sizeof(tmpbuf)/sizeof(uint); i++)
cksum += *cp++;
if (write(out_fd, tmpbuf, sizeof(tmpbuf)) != sizeof(tmpbuf)) {
perror("boot-image write");
exit(5);
}
}
/* rewrite the header with the computed checksum.
*/
bt.bb_checksum = htonl(cksum);
if (lseek(out_fd, 0, SEEK_SET) < 0) {
perror("rewrite seek");
exit(1);
}
if (write(out_fd, &bt, sizeof(bt)) != sizeof(bt)) {
perror("boot-image rewrite");
exit(1);
}
exit(0);
}
arch/powerpc/boot/ns16550.c 0 → 100644
View file @ 9db73724
/*
* 16550 serial console support.
*
* Original copied from <file:arch/ppc/boot/common/ns16550.c>
* (which had no copyright)
* Modifications: 2006 (c) MontaVista Software, Inc.
*
* Modified by: Mark A. Greer <mgreer@mvista.com>
*/
#include <stdarg.h>
#include <stddef.h>
#include "types.h"
#include "string.h"
#include "stdio.h"
#include "io.h"
#include "ops.h"
#define UART_DLL 0 /* Out: Divisor Latch Low */
#define UART_DLM 1 /* Out: Divisor Latch High */
#define UART_FCR 2 /* Out: FIFO Control Register */
#define UART_LCR 3 /* Out: Line Control Register */
#define UART_MCR 4 /* Out: Modem Control Register */
#define UART_LSR 5 /* In: Line Status Register */
#define UART_LSR_THRE 0x20 /* Transmit-hold-register empty */
#define UART_LSR_DR 0x01 /* Receiver data ready */
#define UART_MSR 6 /* In: Modem Status Register */
#define UART_SCR 7 /* I/O: Scratch Register */
static unsigned char *reg_base;
static u32 reg_shift;
static int ns16550_open(void)
{
out_8(reg_base + (UART_FCR << reg_shift), 0x06);
return 0;
}
static void ns16550_putc(unsigned char c)
{
while ((in_8(reg_base + (UART_LSR << reg_shift)) & UART_LSR_THRE) == 0);
out_8(reg_base, c);
}
static unsigned char ns16550_getc(void)
{
while ((in_8(reg_base + (UART_LSR << reg_shift)) & UART_LSR_DR) == 0);
return in_8(reg_base);
}
static u8 ns16550_tstc(void)
{
return ((in_8(reg_base + (UART_LSR << reg_shift)) & UART_LSR_DR) != 0);
}
int ns16550_console_init(void *devp, struct serial_console_data *scdp)
{
int n;
n = getprop(devp, "virtual-reg", &reg_base, sizeof(reg_base));
if (n != sizeof(reg_base))
return -1;
n = getprop(devp, "reg-shift", &reg_shift, sizeof(reg_shift));
if (n != sizeof(reg_shift))
reg_shift = 0;
scdp->open = ns16550_open;
scdp->putc = ns16550_putc;
scdp->getc = ns16550_getc;
scdp->tstc = ns16550_tstc;
scdp->close = NULL;
return 0;
}
arch/powerpc/boot/of.c
View file @ 9db73724
......@@ -256,24 +256,18 @@ static void of_console_write(char *buf, int len)
call_prom("write", 3, 1, of_stdout_handle, buf, len);
}
int platform_init(void *promptr)
int platform_init(void *promptr, char *dt_blob_start, char *dt_blob_end)
{
platform_ops.fixups = NULL;
platform_ops.image_hdr = of_image_hdr;
platform_ops.malloc = of_try_claim;
platform_ops.free = NULL;
platform_ops.exit = of_exit;
dt_ops.finddevice = of_finddevice;
dt_ops.getprop = of_getprop;
dt_ops.setprop = of_setprop;
dt_ops.translate_addr = NULL;
console_ops.open = of_console_open;
console_ops.write = of_console_write;
console_ops.edit_cmdline = NULL;
console_ops.close = NULL;
console_ops.data = NULL;
prom = (int (*)(void *))promptr;
return 0;
......
arch/powerpc/boot/ops.h
View file @ 9db73724
......@@ -22,7 +22,8 @@ struct platform_ops {
void (*fixups)(void);
void (*image_hdr)(const void *);
void * (*malloc)(u32 size);
void (*free)(void *ptr, u32 size);
void (*free)(void *ptr);
void * (*realloc)(void *ptr, unsigned long size);
void (*exit)(void);
};
extern struct platform_ops platform_ops;
......@@ -30,13 +31,11 @@ extern struct platform_ops platform_ops;
/* Device Tree operations */
struct dt_ops {
void * (*finddevice)(const char *name);
int (*getprop)(const void *node, const char *name, void *buf,
int (*getprop)(const void *phandle, const char *name, void *buf,
const int buflen);
int (*setprop)(const void *node, const char *name,
int (*setprop)(const void *phandle, const char *name,
const void *buf, const int buflen);
u64 (*translate_addr)(const char *path, const u32 *in_addr,
const u32 addr_len);
unsigned long (*ft_addr)(void);
unsigned long (*finalize)(void);
};
extern struct dt_ops dt_ops;
......@@ -59,10 +58,13 @@ struct serial_console_data {
void (*close)(void);
};
extern int platform_init(void *promptr);
extern void simple_alloc_init(void);
extern void ft_init(void *dt_blob);
extern int serial_console_init(void);
int platform_init(void *promptr, char *dt_blob_start, char *dt_blob_end);
int ft_init(void *dt_blob, unsigned int max_size, unsigned int max_find_device);
int serial_console_init(void);
int ns16550_console_init(void *devp, struct serial_console_data *scdp);
void *simple_alloc_init(char *base, u32 heap_size, u32 granularity,
u32 max_allocs);
static inline void *finddevice(const char *name)
{
......@@ -84,10 +86,10 @@ static inline void *malloc(u32 size)
return (platform_ops.malloc) ? platform_ops.malloc(size) : NULL;
}
static inline void free(void *ptr, u32 size)
static inline void free(void *ptr)
{
if (platform_ops.free)
platform_ops.free(ptr, size);
platform_ops.free(ptr);
}
static inline void exit(void)
......
arch/powerpc/boot/serial.c 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/powerpc/boot/simple_alloc.c 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/powerpc/boot/stdio.c
View file @ 9db73724
......@@ -320,6 +320,7 @@ printf(const char *fmt, ...)
va_start(args, fmt);
n = vsprintf(sprint_buf, fmt, args);
va_end(args);
console_ops.write(sprint_buf, n);
if (console_ops.write)
console_ops.write(sprint_buf, n);
return n;
}
arch/powerpc/boot/util.S 0 → 100644
View file @ 9db73724
/*
* Copied from <file:arch/powerpc/kernel/misc_32.S>
*
* This file contains miscellaneous low-level functions.
* Copyright (C) 1995-1996 Gary Thomas (gdt@linuxppc.org)
*
* Largely rewritten by Cort Dougan (cort@cs.nmt.edu)
* and Paul Mackerras.
*
* kexec bits:
* Copyright (C) 2002-2003 Eric Biederman <ebiederm@xmission.com>
* GameCube/ppc32 port Copyright (C) 2004 Albert Herranz
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version
* 2 of the License, or (at your option) any later version.
*
*/
#include "ppc_asm.h"
#define SPRN_PVR 0x11F /* Processor Version Register */
.text
/* udelay (on non-601 processors) needs to know the period of the
* timebase in nanoseconds. This used to be hardcoded to be 60ns
* (period of 66MHz/4). Now a variable is used that is initialized to
* 60 for backward compatibility, but it can be overridden as necessary
* with code something like this:
* extern unsigned long timebase_period_ns;
* timebase_period_ns = 1000000000 / bd->bi_tbfreq;
*/
.data
.globl timebase_period_ns
timebase_period_ns:
.long 60
.text
/*
* Delay for a number of microseconds
*/
.globl udelay
udelay:
mfspr r4,SPRN_PVR
srwi r4,r4,16
cmpwi 0,r4,1 /* 601 ? */
bne .udelay_not_601
00: li r0,86 /* Instructions / microsecond? */
mtctr r0
10: addi r0,r0,0 /* NOP */
bdnz 10b
subic. r3,r3,1
bne 00b
blr
.udelay_not_601:
mulli r4,r3,1000 /* nanoseconds */
/* Change r4 to be the number of ticks using:
* (nanoseconds + (timebase_period_ns - 1 )) / timebase_period_ns
* timebase_period_ns defaults to 60 (16.6MHz) */
mflr r5
bl 0f
0: mflr r6
mtlr r5
lis r5,0b@ha
addi r5,r5,0b@l
subf r5,r5,r6 /* In case we're relocated */
addis r5,r5,timebase_period_ns@ha
lwz r5,timebase_period_ns@l(r5)
add r4,r4,r5
addi r4,r4,-1
divw r4,r4,r5 /* BUS ticks */
1: mftbu r5
mftb r6
mftbu r7
cmpw 0,r5,r7
bne 1b /* Get [synced] base time */
addc r9,r6,r4 /* Compute end time */
addze r8,r5
2: mftbu r5
cmpw 0,r5,r8
blt 2b
bgt 3f
mftb r6
cmpw 0,r6,r9
blt 2b
3: blr
arch/powerpc/boot/wrapper
View file @ 9db73724
......@@ -184,6 +184,9 @@ fi
if [ -n "$dtb" ]; then
addsec $tmp "$dtb" .kernel:dtb
if [ -n "$dts" ]; then
rm $dtb
fi
fi
if [ "$platform" != "miboot" ]; then
......
arch/powerpc/boot/zImage.coff.lds.S
View file @ 9db73724
......@@ -21,6 +21,10 @@ SECTIONS
*(.got2)
__got2_end = .;
_dtb_start = .;
*(.kernel:dtb)
_dtb_end = .;
_vmlinux_start = .;
*(.kernel:vmlinux.strip)
_vmlinux_end = .;
......
arch/powerpc/configs/cell_defconfig
View file @ 9db73724
This diff is collapsed.
arch/powerpc/configs/linkstation_defconfig 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/powerpc/configs/lite5200_defconfig 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/powerpc/configs/ppc64_defconfig
View file @ 9db73724
......@@ -1386,8 +1386,8 @@ CONFIG_INOTIFY=y
CONFIG_INOTIFY_USER=y
# CONFIG_QUOTA is not set
CONFIG_DNOTIFY=y
CONFIG_AUTOFS_FS=y
# CONFIG_AUTOFS4_FS is not set
# CONFIG_AUTOFS_FS is not set
CONFIG_AUTOFS4_FS=m
# CONFIG_FUSE_FS is not set
#
......
arch/powerpc/configs/ps3_defconfig 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/powerpc/kernel/Makefile
View file @ 9db73724
This diff is collapsed.
arch/powerpc/kernel/asm-offsets.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/kernel/cpu_setup_ppc970.S
View file @ 9db73724
This diff is collapsed.
arch/powerpc/kernel/cputable.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/kernel/crash.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/kernel/dma_64.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/kernel/entry_64.S
View file @ 9db73724
This diff is collapsed.
arch/powerpc/kernel/head_64.S
View file @ 9db73724
This diff is collapsed.
arch/powerpc/kernel/ibmebus.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/kernel/idle.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/kernel/idle_power4.S
View file @ 9db73724
This diff is collapsed.
arch/powerpc/kernel/io.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/kernel/iomap.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/kernel/iommu.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/kernel/irq.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/kernel/of_device.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/kernel/of_platform.c 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/powerpc/kernel/pci_32.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/kernel/pci_64.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/kernel/pci_direct_iommu.c deleted 100644 → 0
View file @ 4c1ac1b4
This diff is collapsed.
arch/powerpc/kernel/pci_iommu.c deleted 100644 → 0
View file @ 4c1ac1b4
This diff is collapsed.
arch/powerpc/kernel/ppc_ksyms.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/kernel/prom.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/kernel/prom_init.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/kernel/prom_parse.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/kernel/rtas.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/kernel/rtas_flash.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/kernel/rtas_pci.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/kernel/setup_32.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/kernel/setup_64.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/kernel/smp-tbsync.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/kernel/smp.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/kernel/sys_ppc32.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/kernel/sysfs.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/kernel/time.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/kernel/traps.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/kernel/vio.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/mm/Makefile
View file @ 9db73724
This diff is collapsed.
arch/powerpc/mm/fault.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/mm/hash_native_64.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/mm/hash_utils_64.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/mm/init_64.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/mm/pgtable_32.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/mm/pgtable_64.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/mm/slb.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/oprofile/Makefile
View file @ 9db73724
This diff is collapsed.
arch/powerpc/oprofile/common.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/oprofile/op_model_cell.c 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/52xx/Makefile 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/52xx/efika-pci.c 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/52xx/efika-setup.c 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/52xx/efika.h 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/52xx/lite5200.c 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/52xx/mpc52xx_common.c 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/52xx/mpc52xx_pic.c 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/52xx/mpc52xx_pic.h 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/82xx/mpc82xx_ads.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/83xx/mpc832x_mds.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/83xx/mpc834x_itx.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/83xx/mpc834x_sys.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/83xx/mpc8360e_pb.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/83xx/mpc83xx.h
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/83xx/pci.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/85xx/misc.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/85xx/mpc85xx_ads.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/Makefile
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/cell/Kconfig
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/cell/Makefile
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/cell/cbe_cpufreq.c 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/cell/cbe_regs.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/cell/cbe_regs.h
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/cell/cbe_thermal.c 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/cell/interrupt.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/cell/interrupt.h
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/cell/io-workarounds.c 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/cell/iommu.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/cell/iommu.h deleted 100644 → 0
View file @ 4c1ac1b4
This diff is collapsed.
arch/powerpc/platforms/cell/pervasive.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/cell/pmu.c 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/cell/setup.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/cell/spu_base.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/cell/spu_coredump.c 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/cell/spu_priv1_mmio.h 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/cell/spufs/Makefile
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/cell/spufs/context.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/cell/spufs/coredump.c 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/cell/spufs/file.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/cell/spufs/hw_ops.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/cell/spufs/inode.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/cell/spufs/run.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/cell/spufs/spufs.h
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/cell/spufs/switch.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/chrp/chrp.h
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/chrp/pci.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/chrp/setup.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/embedded6xx/Kconfig
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/embedded6xx/Makefile
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/embedded6xx/linkstation.c 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/embedded6xx/ls_uart.c 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/iseries/Makefile
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/iseries/dt.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/iseries/iommu.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/iseries/ksyms.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/iseries/misc.S
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/iseries/pci.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/iseries/setup.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/iseries/viopath.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/maple/maple.h
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/maple/pci.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/maple/setup.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/pasemi/pasemi.h
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/pasemi/pci.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/pasemi/setup.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/powermac/feature.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/powermac/pci.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/powermac/pmac.h
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/powermac/setup.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/ps3/Kconfig 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/ps3/Makefile 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/ps3/exports.c 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/ps3/htab.c 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/ps3/hvcall.S 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/ps3/interrupt.c 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/ps3/mm.c 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/ps3/os-area.c 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/ps3/platform.h 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/ps3/repository.c 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/ps3/setup.c 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/ps3/smp.c 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/ps3/spu.c 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/ps3/time.c 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/pseries/iommu.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/pseries/lpar.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/pseries/pci.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/pseries/pci_dlpar.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/pseries/reconfig.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/pseries/setup.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/platforms/pseries/xics.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/sysdev/Makefile
View file @ 9db73724
This diff is collapsed.
arch/powerpc/sysdev/dart_iommu.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/sysdev/dcr-low.S 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/powerpc/sysdev/dcr.c 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/powerpc/sysdev/fsl_soc.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/sysdev/mpic.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/sysdev/qe_lib/qe.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/sysdev/qe_lib/ucc_fast.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/sysdev/qe_lib/ucc_slow.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/sysdev/rom.c 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/powerpc/sysdev/todc.c deleted 100644 → 0
View file @ 4c1ac1b4
This diff is collapsed.
arch/powerpc/sysdev/tsi108_pci.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/xmon/Makefile
View file @ 9db73724
This diff is collapsed.
arch/powerpc/xmon/dis-asm.h 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/powerpc/xmon/ppc-dis.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/xmon/ppc-opc.c
View file @ 9db73724
This diff is collapsed.
arch/powerpc/xmon/ppc.h
View file @ 9db73724
This diff is collapsed.
arch/powerpc/xmon/spu-dis.c 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/powerpc/xmon/spu-insns.h 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/powerpc/xmon/spu-opc.c 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/powerpc/xmon/spu.h 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/powerpc/xmon/xmon.c
View file @ 9db73724
This diff is collapsed.
arch/ppc/.gitignore 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/ppc/Kconfig
View file @ 9db73724
This diff is collapsed.
arch/ppc/boot/images/.gitignore 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/ppc/boot/lib/.gitignore 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/ppc/boot/utils/.gitignore 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/ppc/kernel/setup.c
View file @ 9db73724
This diff is collapsed.
arch/ppc/kernel/traps.c
View file @ 9db73724
This diff is collapsed.
arch/ppc/platforms/4xx/bubinga.c
View file @ 9db73724
This diff is collapsed.
arch/ppc/platforms/4xx/cpci405.c
View file @ 9db73724
This diff is collapsed.
arch/ppc/platforms/4xx/ep405.c
View file @ 9db73724
This diff is collapsed.
arch/ppc/platforms/83xx/mpc834x_sys.c
View file @ 9db73724
This diff is collapsed.
arch/ppc/platforms/85xx/mpc8540_ads.c
View file @ 9db73724
This diff is collapsed.
arch/ppc/platforms/85xx/mpc8560_ads.c
View file @ 9db73724
This diff is collapsed.
arch/ppc/platforms/85xx/sbc8560.c
View file @ 9db73724
This diff is collapsed.
arch/ppc/platforms/85xx/stx_gp3.c
View file @ 9db73724
This diff is collapsed.
arch/ppc/platforms/85xx/tqm85xx.c
View file @ 9db73724
This diff is collapsed.
arch/ppc/platforms/mpc8272ads_setup.c
View file @ 9db73724
This diff is collapsed.
arch/ppc/platforms/mpc866ads_setup.c
View file @ 9db73724
This diff is collapsed.
arch/ppc/syslib/mpc8xx_devices.c
View file @ 9db73724
This diff is collapsed.
arch/s390/Kconfig
View file @ 9db73724
This diff is collapsed.
arch/s390/Makefile
View file @ 9db73724
This diff is collapsed.
arch/s390/kernel/Makefile
View file @ 9db73724
This diff is collapsed.
arch/s390/kernel/cpcmd.c
View file @ 9db73724
This diff is collapsed.
arch/s390/kernel/head.S
View file @ 9db73724
This diff is collapsed.
arch/s390/kernel/head31.S
View file @ 9db73724
This diff is collapsed.
arch/s390/kernel/head64.S
View file @ 9db73724
This diff is collapsed.
arch/s390/kernel/ipl.c
View file @ 9db73724
This diff is collapsed.
arch/s390/kernel/machine_kexec.c
View file @ 9db73724
This diff is collapsed.
arch/s390/kernel/reipl.S
View file @ 9db73724
This diff is collapsed.
arch/s390/kernel/reipl64.S
View file @ 9db73724
This diff is collapsed.
arch/s390/kernel/relocate_kernel.S
View file @ 9db73724
This diff is collapsed.
arch/s390/kernel/relocate_kernel64.S
View file @ 9db73724
This diff is collapsed.
arch/s390/kernel/reset.S 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/s390/kernel/setup.c
View file @ 9db73724
This diff is collapsed.
arch/s390/kernel/smp.c
View file @ 9db73724
This diff is collapsed.
arch/s390/kernel/traps.c
View file @ 9db73724
This diff is collapsed.
arch/s390/lib/Makefile
View file @ 9db73724
This diff is collapsed.
arch/s390/lib/uaccess_mvcos.c
View file @ 9db73724
This diff is collapsed.
arch/s390/lib/uaccess_pt.c 0 → 100644
View file @ 9db73724
This diff is collapsed.
arch/s390/lib/uaccess_std.c
View file @ 9db73724
This diff is collapsed.
arch/s390/mm/extmem.c
View file @ 9db73724
This diff is collapsed.
arch/s390/mm/fault.c
View file @ 9db73724
This diff is collapsed.
block/Kconfig
View file @ 9db73724
This diff is collapsed.
block/blktrace.c
View file @ 9db73724
This diff is collapsed.
drivers/Makefile
View file @ 9db73724
This diff is collapsed.
drivers/acpi/dock.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/Kconfig
View file @ 9db73724
This diff is collapsed.
drivers/ata/Makefile
View file @ 9db73724
This diff is collapsed.
drivers/ata/ahci.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/ata_generic.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/ata_piix.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/libata-core.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/libata-eh.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/libata-scsi.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/libata-sff.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/libata.h
View file @ 9db73724
This diff is collapsed.
drivers/ata/pata_ali.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/pata_amd.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/pata_artop.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/pata_atiixp.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/pata_cmd64x.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/pata_cs5520.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/pata_cs5530.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/pata_cs5535.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/pata_cypress.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/pata_efar.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/pata_hpt366.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/pata_hpt37x.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/pata_hpt3x2n.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/pata_hpt3x3.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/pata_isapnp.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/pata_it821x.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/pata_ixp4xx_cf.c 0 → 100644
View file @ 9db73724
This diff is collapsed.
drivers/ata/pata_jmicron.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/pata_legacy.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/pata_marvell.c 0 → 100644
View file @ 9db73724
This diff is collapsed.
drivers/ata/pata_mpiix.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/pata_netcell.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/pata_ns87410.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/pata_oldpiix.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/pata_opti.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/pata_optidma.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/pata_pcmcia.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/pata_pdc2027x.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/pata_pdc202xx_old.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/pata_platform.c 0 → 100644
View file @ 9db73724
This diff is collapsed.
drivers/ata/pata_qdi.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/pata_radisys.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/pata_rz1000.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/pata_sc1200.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/pata_serverworks.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/pata_sil680.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/pata_sis.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/pata_sl82c105.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/pata_triflex.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/pata_via.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/pata_winbond.c 0 → 100644
View file @ 9db73724
This diff is collapsed.
drivers/ata/sata_nv.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/sata_promise.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/sata_sil.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/sata_sil24.c
View file @ 9db73724
This diff is collapsed.
drivers/ata/sata_sis.c
View file @ 9db73724
This diff is collapsed.
drivers/base/cpu.c
View file @ 9db73724
This diff is collapsed.
drivers/block/viodasd.c
View file @ 9db73724
This diff is collapsed.
drivers/char/hpet.c
View file @ 9db73724
This diff is collapsed.
drivers/char/hw_random/core.c
View file @ 9db73724
This diff is collapsed.
drivers/char/tpm/tpm.h
View file @ 9db73724
This diff is collapsed.
drivers/hwmon/abituguru.c
View file @ 9db73724
This diff is collapsed.
drivers/hwmon/hdaps.c
View file @ 9db73724
This diff is collapsed.
drivers/ide/pci/via82cxxx.c
View file @ 9db73724
This diff is collapsed.
drivers/infiniband/ulp/iser/iser_memory.c
View file @ 9db73724
This diff is collapsed.
drivers/isdn/divert/isdn_divert.c
View file @ 9db73724
This diff is collapsed.
drivers/leds/ledtrig-ide-disk.c
View file @ 9db73724
This diff is collapsed.
drivers/leds/ledtrig-timer.c
View file @ 9db73724
This diff is collapsed.
drivers/macintosh/Kconfig
View file @ 9db73724
This diff is collapsed.
drivers/macintosh/Makefile
View file @ 9db73724
This diff is collapsed.
drivers/macintosh/rack-meter.c 0 → 100644
View file @ 9db73724
This diff is collapsed.
drivers/macintosh/smu.c
View file @ 9db73724
This diff is collapsed.
drivers/macintosh/therm_adt746x.c
View file @ 9db73724
This diff is collapsed.
drivers/macintosh/therm_pm72.c
View file @ 9db73724
This diff is collapsed.
drivers/macintosh/therm_windtunnel.c
View file @ 9db73724
This diff is collapsed.
drivers/media/dvb/cinergyT2/cinergyT2.c
View file @ 9db73724
This diff is collapsed.
drivers/net/ehea/ehea_qmr.c
View file @ 9db73724
This diff is collapsed.
drivers/net/ibm_emac/ibm_emac_mal.h
View file @ 9db73724
This diff is collapsed.
drivers/net/ibmveth.c
View file @ 9db73724
This diff is collapsed.
drivers/net/ibmveth.h
View file @ 9db73724
This diff is collapsed.
drivers/net/lance.c
View file @ 9db73724
This diff is collapsed.
drivers/net/ne3210.c
View file @ 9db73724
This diff is collapsed.
drivers/net/phy/fixed.c
View file @ 9db73724
This diff is collapsed.
drivers/net/sk98lin/skge.c
View file @ 9db73724
This diff is collapsed.
drivers/net/spider_net.c
View file @ 9db73724
This diff is collapsed.
drivers/net/starfire.c
View file @ 9db73724
This diff is collapsed.
drivers/net/sun3lance.c
View file @ 9db73724
This diff is collapsed.
drivers/net/sungem.c
View file @ 9db73724
This diff is collapsed.
drivers/net/sunhme.c
View file @ 9db73724
This diff is collapsed.
drivers/net/tokenring/ibmtr.c
View file @ 9db73724
This diff is collapsed.
drivers/net/tulip/de4x5.c
View file @ 9db73724
This diff is collapsed.
drivers/net/typhoon.c
View file @ 9db73724
This diff is collapsed.
drivers/pci/access.c
View file @ 9db73724
This diff is collapsed.
drivers/ps3/Makefile 0 → 100644
View file @ 9db73724
This diff is collapsed.
drivers/ps3/system-bus.c 0 → 100644
View file @ 9db73724
This diff is collapsed.
drivers/s390/block/dasd.c
View file @ 9db73724
This diff is collapsed.
drivers/s390/block/dasd_devmap.c
View file @ 9db73724
This diff is collapsed.
drivers/s390/char/con3215.c
View file @ 9db73724
This diff is collapsed.
drivers/s390/char/sclp_quiesce.c
View file @ 9db73724
This diff is collapsed.
drivers/s390/cio/chsc.c
View file @ 9db73724
This diff is collapsed.
drivers/s390/cio/cio.c
View file @ 9db73724
This diff is collapsed.
drivers/s390/cio/css.h
View file @ 9db73724
This diff is collapsed.
drivers/s390/cio/device.c
View file @ 9db73724
This diff is collapsed.
drivers/s390/cio/device_fsm.c
View file @ 9db73724
This diff is collapsed.
drivers/s390/cio/device_id.c
View file @ 9db73724
This diff is collapsed.
drivers/s390/cio/device_pgid.c
View file @ 9db73724
This diff is collapsed.
drivers/s390/cio/device_status.c
View file @ 9db73724
This diff is collapsed.
drivers/s390/cio/qdio.c
View file @ 9db73724
This diff is collapsed.
drivers/s390/cio/qdio.h
View file @ 9db73724
This diff is collapsed.
drivers/s390/crypto/ap_bus.c
View file @ 9db73724
This diff is collapsed.
drivers/s390/net/lcs.c
View file @ 9db73724
This diff is collapsed.
drivers/s390/net/lcs.h
View file @ 9db73724
This diff is collapsed.
drivers/s390/net/qeth.h
View file @ 9db73724
This diff is collapsed.
drivers/s390/net/qeth_main.c
View file @ 9db73724
This diff is collapsed.
drivers/scsi/scsi_transport_sas.c
View file @ 9db73724
This diff is collapsed.
drivers/serial/cpm_uart/cpm_uart_cpm2.c
View file @ 9db73724
This diff is collapsed.
drivers/serial/mpc52xx_uart.c
View file @ 9db73724
This diff is collapsed.
drivers/spi/spi_butterfly.c
View file @ 9db73724
This diff is collapsed.
drivers/video/platinumfb.c
View file @ 9db73724
This diff is collapsed.
drivers/w1/slaves/w1_therm.c
View file @ 9db73724
This diff is collapsed.
fs/9p/conv.c
View file @ 9db73724
This diff is collapsed.
fs/9p/fcall.c
View file @ 9db73724
This diff is collapsed.
fs/9p/fid.c
View file @ 9db73724
This diff is collapsed.
fs/9p/v9fs.c
View file @ 9db73724
This diff is collapsed.
fs/9p/vfs_dir.c
View file @ 9db73724
This diff is collapsed.
fs/9p/vfs_file.c
View file @ 9db73724
This diff is collapsed.
fs/binfmt_elf.c
View file @ 9db73724
This diff is collapsed.
fs/compat.c
View file @ 9db73724
This diff is collapsed.
fs/configfs/dir.c
View file @ 9db73724
This diff is collapsed.
fs/gfs2/locking/dlm/plock.c
View file @ 9db73724
This diff is collapsed.
fs/inotify.c
View file @ 9db73724
This diff is collapsed.
fs/jffs2/acl.c
View file @ 9db73724
This diff is collapsed.
fs/jffs2/wbuf.c
View file @ 9db73724
This diff is collapsed.
fs/jfs/ioctl.c
View file @ 9db73724
This diff is collapsed.
fs/ocfs2/alloc.c
View file @ 9db73724
This diff is collapsed.
fs/ocfs2/alloc.h
View file @ 9db73724
This diff is collapsed.
fs/ocfs2/aops.c
View file @ 9db73724
This diff is collapsed.
fs/ocfs2/aops.h
View file @ 9db73724
This diff is collapsed.
fs/ocfs2/dir.c
View file @ 9db73724
This diff is collapsed.
fs/ocfs2/dir.h
View file @ 9db73724
This diff is collapsed.
fs/ocfs2/dlm/dlmdomain.c
View file @ 9db73724
This diff is collapsed.
fs/ocfs2/dlmglue.c
View file @ 9db73724
This diff is collapsed.
fs/ocfs2/dlmglue.h
View file @ 9db73724
This diff is collapsed.
fs/ocfs2/export.c
View file @ 9db73724
This diff is collapsed.
fs/ocfs2/file.c
View file @ 9db73724
This diff is collapsed.
fs/ocfs2/file.h
View file @ 9db73724
This diff is collapsed.
fs/ocfs2/inode.c
View file @ 9db73724
This diff is collapsed.
fs/ocfs2/inode.h
View file @ 9db73724
This diff is collapsed.
fs/ocfs2/ioctl.c
View file @ 9db73724
This diff is collapsed.
fs/ocfs2/journal.c
View file @ 9db73724
This diff is collapsed.
fs/ocfs2/journal.h
View file @ 9db73724
This diff is collapsed.
fs/ocfs2/localalloc.c
View file @ 9db73724
This diff is collapsed.
fs/ocfs2/localalloc.h
View file @ 9db73724
This diff is collapsed.
fs/ocfs2/mmap.c
View file @ 9db73724
This diff is collapsed.
fs/ocfs2/namei.c
View file @ 9db73724
This diff is collapsed.
fs/ocfs2/namei.h
View file @ 9db73724
This diff is collapsed.
fs/ocfs2/ocfs2.h
View file @ 9db73724
This diff is collapsed.
fs/ocfs2/suballoc.c
View file @ 9db73724
This diff is collapsed.
fs/ocfs2/suballoc.h
View file @ 9db73724
This diff is collapsed.
fs/ocfs2/super.c
View file @ 9db73724
This diff is collapsed.
fs/ocfs2/symlink.c
View file @ 9db73724
This diff is collapsed.
fs/partitions/mac.c
View file @ 9db73724
This diff is collapsed.
fs/proc/root.c
View file @ 9db73724
This diff is collapsed.
fs/super.c
View file @ 9db73724
This diff is collapsed.
fs/sync.c
View file @ 9db73724
This diff is collapsed.
fs/utimes.c
View file @ 9db73724
This diff is collapsed.
include/asm-arm/arch-ixp4xx/platform.h
View file @ 9db73724
This diff is collapsed.
include/asm-avr32/types.h
View file @ 9db73724
This diff is collapsed.
include/asm-h8300/types.h
View file @ 9db73724
This diff is collapsed.
include/asm-i386/types.h
View file @ 9db73724
This diff is collapsed.
include/asm-m68knommu/dma-mapping.h
View file @ 9db73724
This diff is collapsed.
include/asm-m68knommu/m520xsim.h
View file @ 9db73724
This diff is collapsed.
include/asm-m68knommu/scatterlist.h
View file @ 9db73724
This diff is collapsed.
include/asm-mips/atomic.h
View file @ 9db73724
This diff is collapsed.
include/asm-mips/barrier.h 0 → 100644
View file @ 9db73724
This diff is collapsed.
include/asm-mips/bitops.h
View file @ 9db73724
This diff is collapsed.
include/asm-mips/compat.h
View file @ 9db73724
This diff is collapsed.
include/asm-mips/futex.h
View file @ 9db73724
This diff is collapsed.
include/asm-mips/sn/klconfig.h
View file @ 9db73724
This diff is collapsed.
include/asm-mips/spinlock.h
View file @ 9db73724
This diff is collapsed.
include/asm-mips/system.h
View file @ 9db73724
This diff is collapsed.
include/asm-mips/types.h
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/Kbuild
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/cell-pmu.h 0 → 100644
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/cputable.h
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/dbdma.h
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/dcr-mmio.h 0 → 100644
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/dcr-native.h 0 → 100644
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/dcr.h 0 → 100644
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/device.h
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/dma-mapping.h
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/eeh.h
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/elf.h
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/firmware.h
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/hw_irq.h
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/ibmebus.h
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/ide.h
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/immap_qe.h
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/io-defs.h 0 → 100644
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/io.h
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/iommu.h
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/irq.h
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/iseries/iommu.h
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/lv1call.h 0 → 100644
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/machdep.h
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/mmu.h
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/mpc52xx.h 0 → 100644
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/mpc85xx.h
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/mpic.h
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/of_device.h
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/of_platform.h 0 → 100644
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/oprofile_impl.h
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/paca.h
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/pci-bridge.h
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/pci.h
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/ppc-pci.h
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/processor.h
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/prom.h
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/ps3.h 0 → 100644
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/rtas.h
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/sparsemem.h
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/spu.h
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/spu_csa.h
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/spu_info.h 0 → 100644
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/spu_priv1.h
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/todc.h deleted 100644 → 0
View file @ 4c1ac1b4
This diff is collapsed.
include/asm-powerpc/topology.h
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/tsi108.h
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/types.h
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/uaccess.h
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/unistd.h
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/vio.h
View file @ 9db73724
This diff is collapsed.
include/asm-powerpc/xmon.h
View file @ 9db73724
This diff is collapsed.
include/asm-ppc/io.h
View file @ 9db73724
This diff is collapsed.
include/asm-ppc/m48t35.h
View file @ 9db73724
This diff is collapsed.
include/asm-ppc/mpc52xx.h
View file @ 9db73724
This diff is collapsed.
include/asm-ppc/mpc83xx.h
View file @ 9db73724
This diff is collapsed.
include/asm-ppc/mpc85xx.h
View file @ 9db73724
This diff is collapsed.
include/asm-ppc/pci-bridge.h
View file @ 9db73724
This diff is collapsed.
include/asm-s390/cio.h
View file @ 9db73724
This diff is collapsed.
include/asm-s390/cpcmd.h
View file @ 9db73724
This diff is collapsed.
include/asm-s390/kexec.h
View file @ 9db73724
This diff is collapsed.
include/asm-s390/lowcore.h
View file @ 9db73724
This diff is collapsed.
include/asm-s390/pgtable.h
View file @ 9db73724
This diff is collapsed.
include/asm-s390/reset.h 0 → 100644
View file @ 9db73724
This diff is collapsed.
include/asm-s390/setup.h
View file @ 9db73724
This diff is collapsed.
include/asm-s390/smp.h
View file @ 9db73724
This diff is collapsed.
include/asm-s390/system.h
View file @ 9db73724
This diff is collapsed.
include/asm-s390/termios.h
View file @ 9db73724
This diff is collapsed.
include/asm-s390/types.h
View file @ 9db73724
This diff is collapsed.
include/asm-s390/uaccess.h
View file @ 9db73724
This diff is collapsed.
include/asm-s390/zcrypt.h
View file @ 9db73724
This diff is collapsed.
include/asm-sh/types.h
View file @ 9db73724
This diff is collapsed.
include/asm-x86_64/elf.h
View file @ 9db73724
This diff is collapsed.
include/asm-x86_64/types.h
View file @ 9db73724
This diff is collapsed.
include/asm-x86_64/uaccess.h
View file @ 9db73724
This diff is collapsed.
include/linux/acct.h
View file @ 9db73724
This diff is collapsed.
include/linux/ata.h
View file @ 9db73724
This diff is collapsed.
include/linux/cpu.h
View file @ 9db73724
This diff is collapsed.
include/linux/elf.h
View file @ 9db73724
This diff is collapsed.
include/linux/fs.h
View file @ 9db73724
This diff is collapsed.
include/linux/igmp.h
View file @ 9db73724
This diff is collapsed.
include/linux/kernelcapi.h
View file @ 9db73724
This diff is collapsed.
include/linux/libata.h
View file @ 9db73724
This diff is collapsed.
include/linux/module.h
View file @ 9db73724
This diff is collapsed.
include/linux/netdevice.h
View file @ 9db73724
This diff is collapsed.
include/linux/netfilter_ipv4/ip_conntrack.h
View file @ 9db73724
This diff is collapsed.
include/linux/pata_platform.h 0 → 100644
View file @ 9db73724
This diff is collapsed.
include/linux/poll.h
View file @ 9db73724
This diff is collapsed.
include/linux/radix-tree.h
View file @ 9db73724
This diff is collapsed.
include/linux/skbuff.h
View file @ 9db73724
This diff is collapsed.
include/linux/types.h
View file @ 9db73724
This diff is collapsed.
include/net/inet_connection_sock.h
View file @ 9db73724
This diff is collapsed.
include/net/irda/timer.h
View file @ 9db73724
This diff is collapsed.
include/net/netfilter/nf_conntrack.h
View file @ 9db73724
This diff is collapsed.
include/net/netlink.h
View file @ 9db73724
This diff is collapsed.
include/net/sock.h
View file @ 9db73724
This diff is collapsed.
include/net/udp.h
View file @ 9db73724
This diff is collapsed.
include/scsi/libiscsi.h
View file @ 9db73724
This diff is collapsed.
include/sound/pcm.h
View file @ 9db73724
This diff is collapsed.
kernel/auditsc.c
View file @ 9db73724
This diff is collapsed.
kernel/latency.c
View file @ 9db73724
This diff is collapsed.
kernel/module.c
View file @ 9db73724
This diff is collapsed.
lib/iomap.c
View file @ 9db73724
This diff is collapsed.
lib/random32.c
View file @ 9db73724
This diff is collapsed.
mm/filemap.c
View file @ 9db73724
This diff is collapsed.
net/appletalk/ddp.c
View file @ 9db73724
This diff is collapsed.
net/core/kmap_skb.h 0 → 100644
View file @ 9db73724
This diff is collapsed.
net/core/skbuff.c
View file @ 9db73724
This diff is collapsed.
net/core/sock.c
View file @ 9db73724
This diff is collapsed.
net/dccp/ccids/Kconfig
View file @ 9db73724
This diff is collapsed.
net/dccp/ccids/ccid3.c
View file @ 9db73724
This diff is collapsed.
net/dccp/ccids/ccid3.h
View file @ 9db73724
This diff is collapsed.
net/dccp/ccids/lib/tfrc_equation.c
View file @ 9db73724
This diff is collapsed.
net/ieee80211/ieee80211_crypt_tkip.c
View file @ 9db73724
This diff is collapsed.
net/ieee80211/ieee80211_crypt_wep.c
View file @ 9db73724
This diff is collapsed.
net/ipv4/ip_output.c
View file @ 9db73724
This diff is collapsed.
net/ipv4/ipvs/ip_vs_lblc.c
View file @ 9db73724
This diff is collapsed.
net/ipv4/ipvs/ip_vs_lblcr.c
View file @ 9db73724
This diff is collapsed.
net/irda/discovery.c
View file @ 9db73724
This diff is collapsed.
net/irda/iriap.c
View file @ 9db73724
This diff is collapsed.
net/irda/irttp.c
View file @ 9db73724
This diff is collapsed.
net/netfilter/nf_conntrack_core.c
View file @ 9db73724
This diff is collapsed.
net/netfilter/x_tables.c
View file @ 9db73724
This diff is collapsed.
net/netfilter/xt_hashlimit.c
View file @ 9db73724
This diff is collapsed.
net/packet/af_packet.c
View file @ 9db73724
This diff is collapsed.
net/xfrm/xfrm_user.c
View file @ 9db73724
This diff is collapsed.
security/selinux/avc.c
View file @ 9db73724
This diff is collapsed.
security/selinux/hooks.c
View file @ 9db73724
This diff is collapsed.
security/selinux/include/avc.h
View file @ 9db73724
This diff is collapsed.
sound/oss/cs46xx.c
View file @ 9db73724
This diff is collapsed.
sound/oss/dmabuf.c
View file @ 9db73724
This diff is collapsed.
sound/oss/emu10k1/audio.c
View file @ 9db73724
This diff is collapsed.
sound/oss/es1371.c
View file @ 9db73724
This diff is collapsed.
sound/oss/i810_audio.c
View file @ 9db73724
This diff is collapsed.
sound/oss/soundcard.c
View file @ 9db73724
This diff is collapsed.
sound/oss/sscape.c
View file @ 9db73724
This diff is collapsed.
sound/oss/trident.c
View file @ 9db73724
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7