Florian Fainelli
baf69e2753
MIPS: DEC: use IS_ENABLED()
...
Signed-off-by: Florian Fainelli <florian@openwrt.org >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/3333/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-23 13:55:54 +01:00
Florian Fainelli
dbebd6b1c5
MIPS: TX49XX: use IS_ENABLED()
...
Signed-off-by: Florian Fainelli <florian@openwrt.org >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/3335/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-23 13:55:54 +01:00
Florian Fainelli
b33b440737
MIPS: TXX9: use IS_ENABLED() macro
...
Signed-off-by: Florian Fainelli <florian@openwrt.org >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/3334/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-23 13:55:54 +01:00
Florian Fainelli
c1d7f41cfe
MIPS: PNX833x: use IS_ENABLED() macro
...
Signed-off-by: Florian Fainelli <florian@openwrt.org >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/3332/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-23 13:55:53 +01:00
Florian Fainelli
4bd5a5740e
MIPS: Alchemy: use IS_ENABLED() macro
...
Signed-off-by: Florian Fainelli <florian@openwrt.org >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/3331/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-23 13:55:53 +01:00
Steven J. Hill
889a4c7b33
MIPS: SMTC: Support for Multi-threaded FPUs
...
Signed-off-by: Steven J. Hill <sjhill@mips.com >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/3603/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-23 13:55:53 +01:00
Steven J. Hill
2244f12865
MIPS: Remove dead code related to 1004K oprofile support.
...
Signed-off-by: Steven J. Hill <sjhill@mips.com >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/3854/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-23 13:55:16 +01:00
David Daney
b59b284101
MIPS: Octeon: Use device tree to register serial ports.
...
Switch to using the device tree to register serial ports.
Add all the ports with compatible = "cavium,octeon-3860-uart". Octeon serial
ports have their own device type, required port flags, and I/O
functions, so using of_serial.c is not indicated.
We need to do this as late_initcall, as the 8250 driver must be
initialized before we add any ports. 8250 initialization is done at
device_initcall time.
The OCTEON_IRQ_UART{0,1,2} symbols are removed as they are now unused
and interfere with irq_domain used by the device tree code.
Signed-off-by: David Daney <david.daney@cavium.com >
Acked-by: Grant Likely <grant.likely@secretlab.ca >
Cc: linux-mips@linux-mips.org
Cc: devicetree-discuss@lists.ozlabs.org
Cc: Rob Herring <rob.herring@calxeda.com >
Cc: linux-kernel@vger.kernel.org
Cc: David Daney <david.daney@cavium.com >
Patchwork: https://patchwork.linux-mips.org/patch/3942/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-23 13:54:53 +01:00
David Daney
368bec0d4a
netdev: octeon_mgmt: Convert to use device tree.
...
The device tree will supply the register bank base addresses, make
register addressing relative to those. PHY connection is now
described by the device tree.
The OCTEON_IRQ_MII{0,1} symbols are also removed as they are now
unused and interfere with the irq_domain used for device tree irq
mapping.
Signed-off-by: David Daney <david.daney@cavium.com >
Acked-by: David S. Miller <davem@davemloft.net >
Cc: linux-mips@linux-mips.org
Cc: devicetree-discuss@lists.ozlabs.org
Cc: Grant Likely <grant.likely@secretlab.ca >
Cc: Rob Herring <rob.herring@calxeda.com >
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/3941/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-23 13:54:53 +01:00
David Daney
2fd46f47be
netdev: mdio-octeon.c: Convert to use device tree.
...
Get the MDIO bus controller addresses from the device tree, small
clean up in use of devm_*
Remove, now unused, platform device setup code.
Signed-off-by: David Daney <david.daney@cavium.com >
Acked-by: David S. Miller <davem@davemloft.net >
Cc: linux-mips@linux-mips.org
Cc: devicetree-discuss@lists.ozlabs.org
Cc: Grant Likely <grant.likely@secretlab.ca >
Cc: Rob Herring <rob.herring@calxeda.com >
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/3938/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-23 13:54:53 +01:00
David Daney
f353a218de
i2c: Convert i2c-octeon.c to use device tree.
...
There are three parts to this:
1) Remove the definitions of OCTEON_IRQ_TWSI and OCTEON_IRQ_TWSI2.
The interrupts are specified by the device tree and these hard
coded irq numbers block the used of the irq lines by the irq_domain
code.
2) Remove platform device setup code from octeon-platform.c, it is
now unused.
3) Convert i2c-octeon.c to use device tree. Part of this includes
using the devm_* functions instead of the raw counterparts, thus
simplifying error handling. No functionality is changed.
Signed-off-by: David Daney <david.daney@cavium.com >
Acked-by: Rob Herring <rob.herring@calxeda.com >
Acked-by: Wolfram Sang <w.sang@pengutronix.de >
Cc: linux-mips@linux-mips.org
Cc: devicetree-discuss@lists.ozlabs.org
Cc: Grant Likely <grant.likely@secretlab.ca >
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/3939/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-23 13:54:53 +01:00
David Daney
a0c16582b5
MIPS: Octeon: Setup irq_domains for interrupts.
...
Create two domains. One for the GPIO lines, and the other for on-chip
sources.
Signed-off-by: David Daney <david.daney@cavium.com >
Cc: linux-mips@linux-mips.org
Cc: devicetree-discuss@lists.ozlabs.org
Cc: Grant Likely <grant.likely@secretlab.ca >
Cc: Rob Herring <rob.herring@calxeda.com >
Cc: linux-kernel@vger.kernel.org
Cc: David Daney <david.daney@cavium.com >
Patchwork: https://patchwork.linux-mips.org/patch/3936/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-23 13:54:53 +01:00
David Daney
7ed1815296
MIPS: Octeon: Initialize and fixup device tree.
...
If a compiled in device tree template is used, trim out unwanted parts
based on legacy platform probing.
Signed-off-by: David Daney <david.daney@cavium.com >
Cc: linux-mips@linux-mips.org
Cc: devicetree-discuss@lists.ozlabs.org
Cc: Grant Likely <grant.likely@secretlab.ca >
Cc: Rob Herring <rob.herring@calxeda.com >
Cc: linux-kernel@vger.kernel.org
Cc: David Daney <david.daney@cavium.com >
Patchwork: https://patchwork.linux-mips.org/patch/3935/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-23 13:54:52 +01:00
David Daney
b01da9f130
MIPS: Prune some target specific code out of prom.c
...
This code is not common enough to be in a shared file. It is also not
used by any existing boards, so just remove it.
[ralf@linux-mips.org: Dropped removal of irq_create_of_mapping which was
already removed by abd2363f6a
[irq_domain/mips: Allow irq_domain on MIPS]. Moved device_tree_init() and
dependencies to its sole user, the XLP code.]
Signed-off-by: David Daney <david.daney@cavium.com >
Cc: linux-mips@linux-mips.org
Cc: devicetree-discuss@lists.ozlabs.org
Cc: grant.likely@secretlab.ca
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/2946/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-23 13:54:52 +01:00
David Daney
736b1c9c95
MIPS: Octeon: Add device tree source files.
...
The two device tree files octeon_3xxx.dts and octeon_68xx.dts are
trimmed by code in a subsequent patch to reflect the hardware actually
present on the board. To this end several properties that are not
part of the declared bindings are added to aid in trimming off
unwanted nodes. Since the device tree and the code that trims it are
bound into the kernel binary, these 'marker' properties never escape
into the wild, and are purely an implementation detail of the kernel
early boot process. This is done for backwards compatibility with
existing boards (identified by a board type enumeration value by their
bootloaders). New boards will always pass a device tree from the
bootloader, the built-in trees are ignored in this case.
Signed-off-by: David Daney <david.daney@cavium.com >
Cc: linux-mips@linux-mips.org
Cc: devicetree-discuss@lists.ozlabs.org
Cc: Grant Likely <grant.likely@secretlab.ca >
Cc: Rob Herring <rob.herring@calxeda.com >
Cc: linux-kernel@vger.kernel.org
Cc: David Daney <david.daney@cavium.com >
Patchwork: https://patchwork.linux-mips.org/patch/3937/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-23 13:54:52 +01:00
David Daney
a339aef904
MIPS: OCTEON: Consolidate the edge and level irq_chip structures.
...
We can consolidate octeon_irq_chip_ciu_edge and octeon_irq_chip_ciu as
they only differ in the .irq_ack element, and that is unused by the
level handler. This gets rid of a bunch of duplicate definitions.
Signed-off-by: David Daney <david.daney@cavium.com >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/3931/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-23 13:54:52 +01:00
David Daney
f5e0828421
MIPS: OCTEON: Remove unneeded OCTEON_IRQ_* defines.
...
The follow-on patch to add irq_domain support will be the supported
method for using these irq lines, so get these defines out of the way
in preperation for that.
Signed-off-by: David Daney <david.daney@cavium.com >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/3930/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-23 13:54:52 +01:00
David Daney
0b28b823ac
MIPS: Octeon: Remove use of OCTEON_IRQ_RST.
...
This symbol will be removed, so don't use it as part of the definition of
OCTEON_IRQ_LAST.
Set OCTEON_IRQ_LAST to 127 so there is space for all the automatically
allocated (via irq_domain) irqs.
Signed-off-by: David Daney <david.daney@cavium.com >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/3946/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-23 13:54:52 +01:00
David Daney
6d1ab4c22d
MIPS: Octeon: Add irq handlers for GPIO interrupts.
...
This is needed for follow-on on patches for Octeon to use the Device
Tree to configure GPIO interrupts.
Signed-off-by: David Daney <david.daney@cavium.com >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/3932/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-23 13:54:51 +01:00
David Daney
05b8c8c128
MIPS: OCTEON: Remove some unused files.
...
These FPA related files are not used anywhere in the kernel. Remove
them.
Signed-off-by: David Daney <david.daney@cavium.com >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/3892/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-23 13:54:51 +01:00
Florian Fainelli
76ca4e1484
MIPS: BCM63xx: Make board setup code register the spi platform device
...
Signed-off-by: Florian Fainelli <florian@openwrt.org >
Cc: linux-mips@linux-mips.org
Cc: grant.likely@secretlab.ca
Cc: spi-devel-general@lists.sourceforge.net
Patchwork: https://patchwork.linux-mips.org/patch/3317/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-23 13:54:34 +01:00
Florian Fainelli
39ca476e34
MIPS: BCM63xx: Add stub to register the SPI platform driver
...
This patch adds the necessary stub to register the SPI platform driver.
Since the registers are shuffled between the 4 BCM63xx CPUs supported by
this SPI driver we also need to generate the internal register layout and
export this layout for the driver to use it properly.
Signed-off-by: Florian Fainelli <florian@openwrt.org >
Cc: linux-mips@linux-mips.org
Cc: grant.likely@secretlab.ca
Cc: spi-devel-general@lists.sourceforge.net
Patchwork: https://patchwork.linux-mips.org/patch/3321/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-23 13:54:33 +01:00
Florian Fainelli
0f6db0d072
MIPS: BCM63xx: Define internal registers offsets of the SPI controller
...
BCM6338, BCM6348, BCM6358 and BCM6368 basically use the same SPI controller
though the internal registers are shuffled, which still allows a common
driver to drive that IP block.
Signed-off-by: Florian Fainelli <florian@openwrt.org >
Cc: linux-mips@linux-mips.org
Cc: grant.likely@secretlab.ca
Cc: spi-devel-general@lists.sourceforge.net
Patchwork: https://patchwork.linux-mips.org/patch/3318/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-23 13:54:33 +01:00
Florian Fainelli
15514e7838
MIPS: BCM63xx: Remove SPI2 register
...
This register was introduced with the support of the BCM6368 CPU in the idea
that its internal layout was different from the other CPUs SPI controller.
The controller is actually the same as the one present on BCM6358 so we can
remove this register and use the usual SPI register instead.
Signed-off-by: Florian Fainelli <florian@openwrt.org >
Cc: linux-mips@linux-mips.org
Cc: grant.likely@secretlab.ca
Cc: spi-devel-general@lists.sourceforge.net
Patchwork: https://patchwork.linux-mips.org/patch/3316/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-23 13:54:33 +01:00
Florian Fainelli
7546d71a9c
MIPS: BCM63xx: Define SPI register sizes.
...
There are two distinct sizes for the SPI register depending on the SoC
generation (6338 & 6348 vs 6358 & 6368).
Signed-off-by: Florian Fainelli <florian@openwrt.org >
Cc: linux-mips@linux-mips.org
Cc: grant.likely@secretlab.ca
Cc: spi-devel-general@lists.sourceforge.net
Patchwork: https://patchwork.linux-mips.org/patch/3314/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-23 13:54:33 +01:00
Florian Fainelli
19372b2478
MIPS: BCM63xx: Add BCM6368 SPI clock mask
...
Signed-off-by: Florian Fainelli <florian@openwrt.org >
Cc: linux-mips@linux-mips.org
Cc: grant.likely@secretlab.ca
Cc: spi-devel-general@lists.sourceforge.net
Patchwork: https://patchwork.linux-mips.org/patch/3319/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-23 13:54:32 +01:00
Florian Fainelli
9e368e49da
MIPS: BCM63xx: Define BCM6358 SPI base address
...
Signed-off-by: Florian Fainelli <florian@openwrt.org >
Cc: linux-mips@linux-mips.org
Cc: grant.likely@secretlab.ca
Cc: spi-devel-general@lists.sourceforge.net
Patchwork: https://patchwork.linux-mips.org/patch/3315/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-23 13:54:32 +01:00
Florian Fainelli
0aeee715b0
MIPS: BCM63xx: Add IRQ_SPI and CPU specific SPI IRQ values
...
Signed-off-by: Florian Fainelli <florian@openwrt.org >
Cc: linux-mips@linux-mips.org
Cc: grant.likely@secretlab.ca
Cc: spi-devel-general@lists.sourceforge.net
Patchwork: https://patchwork.linux-mips.org/patch/3320/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-23 13:54:32 +01:00
Florian Fainelli
d9831a41e3
MIPS: BCM63XX: Be consistent in clock bits enable naming
...
Remove the _CLK suffix from the BCM6368 clock bits definitions to be
consistent with what is already present.
Signed-off-by: Florian Fainelli <florian@openwrt.org >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/3312/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-23 13:54:32 +01:00
Manuel Lauss
6c2be5cf1d
MIPS: Alchemy: handle db1200 cpld ints as they come in
...
Remove the loop in the cascade handler and instead unconditionally
handle just the first set interrupt coming from the CPLD.
This gets rid of a lot of spurious interrupts being triggered for
the SMSC91111 ethernet chip especially under high(er) IDE load:
"eth0: spurious interrupt (mask = 0xb3)"
Verified on DB1200 and DB1300.
Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/3288/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-23 13:53:38 +01:00
Manuel Lauss
278bf05cf6
MIPS: Alchemy: devboards: kill prom.c
...
move contents to already existing platform.c file.
Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/3287/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-23 13:53:38 +01:00
Manuel Lauss
3e25f4f243
MIPS: Alchemy: use 64MB RAM as minimum for devboards
...
YAMON on all devboards provides the "memsize" envvar; in the unlikely
case that it can't be parsed just assume 64MB, which all boards have
at least.
Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/3286/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-23 13:53:37 +01:00
Linus Torvalds
d75e2c9ad9
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
...
Pull late MIPS fixes from Ralf Baechle:
"This fixes a number of lose ends in the MIPS code and various bug
fixes.
Aside of dropping some patch that should not be in this pull request
everything has sat in -next for quite a while and there are no known
issues.
The biggest patch in this patch set moves the allocation of an array
that is aliased to a function (for runtime generated code) to
assembler code. This avoids an issue with certain toolchains when
building for microMIPS."
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (35 commits)
MIPS: PCI: Move fixups from __init to __devinit.
MIPS: Fix bug.h MIPS build regression
MIPS: sync-r4k: remove redundant irq operation
MIPS: smp: Warn on too early irq enable
MIPS: call set_cpu_online() on cpu being brought up with irq disabled
MIPS: call ->smp_finish() a little late
MIPS: Yosemite: delay irq enable to ->smp_finish()
MIPS: SMTC: delay irq enable to ->smp_finish()
MIPS: BMIPS: delay irq enable to ->smp_finish()
MIPS: Octeon: delay enable irq to ->smp_finish()
MIPS: Oprofile: Fix build as a module.
MIPS: BCM63XX: Fix BCM6368 IPSec clock bit
MIPS: perf: Fix build error caused by unused counters_per_cpu_to_total()
MIPS: Fix Magic SysRq L kernel crash.
MIPS: BMIPS: Fix duplicate header inclusion.
mips: mark const init data with __initconst instead of __initdata
MIPS: cmpxchg.h: Add missing include
MIPS: Malta may also be equipped with MIPS64 R2 processors.
MIPS: Fix typo multipy -> multiply
MIPS: Cavium: Fix duplicate ARCH_SPARSEMEM_ENABLE in kconfig.
...
2012-07-20 12:02:02 -07:00
David S. Miller
abaa72d7fd
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
...
Conflicts:
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
2012-07-19 11:17:30 -07:00
Sebastian Andrzej Siewior
85a053fa5f
MIPS: PCI: Move fixups from __init to __devinit.
...
Fixups are executed once the pci-device is found which is during boot
process so __init seems fine as long as the platform does not support
hotplug.
However it is possible to remove the PCI bus at run time and have it
rediscovered again via "echo 1 > /sys/bus/pci/rescan" and this will call
the fixups again.
[ralf@linux-mips.org: Made piixirqmap[] in malta_piix_func0_fixup()
__initdata.]
Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
Cc: linux-mips@linux-mips.org
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2012-07-19 11:27:23 +02:00
Yoichi Yuasa
3592c3cd06
MIPS: Fix bug.h MIPS build regression
...
Commit: 3777808873 [bug.h: need linux/kernel.h
for TAINT_WARN.] breaks all MIPS builds.
CC arch/mips/kernel/machine_kexec.o
In file included from include/linux/kernel.h:20:0,
from include/asm-generic/bug.h:35,
from /home/yuasa/src/linux/kernel/git/linux-2.6/arch/mips/include/asm/bug.h:41,
from /home/yuasa/src/linux/kernel/git/linux-2.6/arch/mips/include/asm/bitops.h:20,
from include/linux/bitops.h:22,
from include/linux/signal.h:38,
from include/linux/elfcore.h:5,
from include/linux/kexec.h:60,
from arch/mips/kernel/machine_kexec.c:9:
include/linux/log2.h: In function '__ilog2_u32':
include/linux/log2.h:34:2: error: implicit declaration of function 'fls' [-Werror=implicit-function-declaration]
include/linux/log2.h: In function '__ilog2_u64':
include/linux/log2.h:42:2: error: implicit declaration of function 'fls64' [-Werror=implicit-function-declaration]
include/linux/log2.h: In function '__roundup_pow_of_two':
include/linux/log2.h:63:2: error: implicit declaration of function 'fls_long' [-Werror=implicit-function-declaration]
In file included from include/linux/bitops.h:22:0,
from include/linux/signal.h:38,
from include/linux/elfcore.h:5,
from include/linux/kexec.h:60,
from arch/mips/kernel/machine_kexec.c:9:
/home/yuasa/src/linux/kernel/git/linux-2.6/arch/mips/include/asm/bitops.h: At top level:
/home/yuasa/src/linux/kernel/git/linux-2.6/arch/mips/include/asm/bitops.h:615:19: error: static declaration of 'fls' follows non-static declaration
include/linux/log2.h:34:9: note: previous implicit declaration of 'fls' was here
In file included from /home/yuasa/src/linux/kernel/git/linux-2.6/arch/mips/include/asm/bitops.h:651:0,
from include/linux/bitops.h:22,
from include/linux/signal.h:38,
from include/linux/elfcore.h:5,
from include/linux/kexec.h:60,
from arch/mips/kernel/machine_kexec.c:9:
include/asm-generic/bitops/fls64.h:18:28: error: static declaration of 'fls64' follows non-static declaration
include/linux/log2.h:42:9: note: previous implicit declaration of 'fls64' was here
In file included from include/linux/signal.h:38:0,
from include/linux/elfcore.h:5,
from include/linux/kexec.h:60,
from arch/mips/kernel/machine_kexec.c:9:
include/linux/bitops.h:160:24: error: conflicting types for 'fls_long'
include/linux/log2.h:63:16: note: previous implicit declaration of 'fls_long' was here
cc1: all warnings being treated as errors
make[2]: *** [arch/mips/kernel/machine_kexec.o] Error 1
Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org >
Cc: Geert Uytterhoeven <geert@linux-m68k.org >
Cc: Paul Mundt <lethal@linux-sh.org >
Cc: yuasa@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Cc: Linuxppc-dev <linuxppc-dev@ozlabs.org >
Cc: Linux MIPS Mailing List <linux-mips@linux-mips.org >
Cc: Linux-sh list <linux-sh@vger.kernel.org >
Cc: Chris Zankel <chris@zankel.net >
Patchwork: https://patchwork.linux-mips.org/patch/4000/
Tested-by: John Crispin <blogic@openwrt.org >
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-19 11:27:17 +02:00
Yong Zhang
f2b88d65aa
MIPS: sync-r4k: remove redundant irq operation
...
Since we have delayed irq enabling to ->smp_finish()
Signed-off-by: Yong Zhang <yong.zhang0@gmail.com >
Cc: Sergei Shtylyov <sshtylyov@mvista.com >
Cc: David Daney <david.daney@cavium.com >
Acked-by: David Daney <david.daney@cavium.com >
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-19 11:23:44 +02:00
Yong Zhang
b789ad63ac
MIPS: smp: Warn on too early irq enable
...
Just to catch a potential issue.
Signed-off-by: Yong Zhang <yong.zhang0@gmail.com >
Cc: Sergei Shtylyov <sshtylyov@mvista.com >
Cc: David Daney <david.daney@cavium.com >
Acked-by: David Daney <david.daney@cavium.com >
Patchwork: https://patchwork.linux-mips.org/patch/3852/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-19 11:23:44 +02:00
Yong Zhang
b9a09a0660
MIPS: call set_cpu_online() on cpu being brought up with irq disabled
...
To prevent a problem as commit 5fbd036b [sched: Cleanup cpu_active madness]
and commit 2baab4e9 [sched: Fix select_fallback_rq() vs cpu_active/cpu_online]
try to resolve, move set_cpu_online() to the brought up CPU and with irq
disabled.
Signed-off-by: Yong Zhang <yong.zhang0@gmail.com >
Cc: Sergei Shtylyov <sshtylyov@mvista.com >
Cc: David Daney <david.daney@cavium.com >
Acked-by: David Daney <david.daney@cavium.com >
Patchwork: https://patchwork.linux-mips.org/patch/3851/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-19 11:23:44 +02:00
Yong Zhang
5309bdac70
MIPS: call ->smp_finish() a little late
...
We have move irq enable to ->smp_finish. Place ->smp_finish() a little
late to prepare for move set_cpu_online() into start_secondary.
And it's not necessary to call cpu_set(cpu, cpu_callin_map) and
synchronise_count_slave() with irq enabled.
Signed-off-by: Yong Zhang <yong.zhang0@gmail.com >
Cc: Sergei Shtylyov <sshtylyov@mvista.com >
Cc: David Daney <david.daney@cavium.com >
Acked-by: David Daney <david.daney@cavium.com >
Patchwork: https://patchwork.linux-mips.org/patch/3850/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-19 11:23:44 +02:00
Yong Zhang
263afbdd1c
MIPS: Yosemite: delay irq enable to ->smp_finish()
...
To prepare for smoothing set_cpu_[active|online]() mess up
Signed-off-by: Yong Zhang <yong.zhang0@gmail.com >
Cc: Sergei Shtylyov <sshtylyov@mvista.com >
Cc: David Daney <david.daney@cavium.com >
Acked-by: David Daney <david.daney@cavium.com >
Patchwork: https://patchwork.linux-mips.org/patch/3848/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-19 11:23:44 +02:00
Yong Zhang
70dc8fa782
MIPS: SMTC: delay irq enable to ->smp_finish()
...
To prepare for smoothing set_cpu_[active|online]() mess up
Signed-off-by: Yong Zhang <yong.zhang0@gmail.com >
Cc: Sergei Shtylyov <sshtylyov@mvista.com >
Cc: David Daney <david.daney@cavium.com >
Acked-by: David Daney <david.daney@cavium.com >
Patchwork: https://patchwork.linux-mips.org/patch/3847/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-19 11:23:44 +02:00
Yong Zhang
856ac3c6e0
MIPS: BMIPS: delay irq enable to ->smp_finish()
...
To prepare for smoothing set_cpu_[active|online]() mess up
Signed-off-by: Yong Zhang <yong.zhang0@gmail.com >
Cc: Sergei Shtylyov <sshtylyov@mvista.com >
Cc: David Daney <david.daney@cavium.com >
Acked-by: David Daney <david.daney@cavium.com >
Patchwork: https://patchwork.linux-mips.org/patch/3846/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-19 11:23:44 +02:00
Yong Zhang
1bcfecc028
MIPS: Octeon: delay enable irq to ->smp_finish()
...
To prepare for smoothing set_cpu_[active|online]() mess up
Signed-off-by: Yong Zhang <yong.zhang0@gmail.com >
Cc: Sergei Shtylyov <sshtylyov@mvista.com >
Cc: David Daney <david.daney@cavium.com >
Acked-by: David Daney <david.daney@cavium.com >
Patchwork: https://patchwork.linux-mips.org/patch/3845/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-19 11:23:44 +02:00
Ralf Baechle
68b6352cdc
MIPS: Oprofile: Fix build as a module.
...
When building oprofile as a module for R10000 or R7000 class processors,
E9000 or MIPSxx class cores since 3572a2c37f
[MIPS: make oprofile use cp0_perfcount_irq if it is set] an
ERROR: "cp0_compare_irq" [arch/mips/oprofile/oprofile.ko] undefined!
error will happen. Fixed by exporting cp0_compare_irq.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-19 11:23:44 +02:00
Florian Fainelli
38be3c7e77
MIPS: BCM63XX: Fix BCM6368 IPSec clock bit
...
The IPsec clock bit is 18 and not 17.
Signed-off-by: Florian Fainelli <florian@openwrt.org >
Cc: linux-mips@linux-mips.org
Cc: mpm@selenic.com
Cc: herbert@gondor.apana.org.au
Patchwork: https://patchwork.linux-mips.org/patch/3323/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-19 11:23:44 +02:00
Florian Fainelli
6c37c95804
MIPS: perf: Fix build error caused by unused counters_per_cpu_to_total()
...
cc1: warnings being treated as errors
arch/mips/kernel/perf_event_mipsxx.c:166: error: 'counters_per_cpu_to_total' defined but not used
make[2]: *** [arch/mips/kernel/perf_event_mipsxx.o] Error 1
make[2]: *** Waiting for unfinished jobs....
It was first introduced by 82091564cf [MIPS:
perf: Add support for 64-bit perf counters.] in 3.2.
Signed-off-by: Florian Fainelli <florian@openwrt.org >
Cc: linux-mips@linux-mips.org
Cc: david.daney@cavium.com
Patchwork: https://patchwork.linux-mips.org/patch/3357/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-19 11:23:44 +02:00
Vincent Wen
e909be8252
MIPS: Fix Magic SysRq L kernel crash.
...
show_backtrace() was passed a NULL pointer which caused paging
request fail. Set to current task as other architectures (ARM,
etc) do when passed a NULL task pointer.
Signed-off-by: Vincent Wen <vincentwenlinux@gmail.com >
Cc: linux-mips@linux-mips.org
Cc: cernekee@gmail.com
Patchwork: https://patchwork.linux-mips.org/patch/3524/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-19 11:23:44 +02:00
Danny Kukawka
ca760ca523
MIPS: BMIPS: Fix duplicate header inclusion.
...
Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de >
Cc: Danny Kukawka <dkukawka@suse.de >
Cc: Kevin Cernekee <cernekee@gmail.com >
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/3369/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-19 11:23:44 +02:00
Uwe Kleine-König
4a043d79dc
mips: mark const init data with __initconst instead of __initdata
...
As long as there is no other non-const variable marked __initdata in the
same compilation unit it doesn't hurt. If there were one however
compilation would fail with
error: $variablename causes a section type conflict
because a section containing const variables is marked read only and so
cannot contain non-const variables.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de >
Cc: linux-mips@linux-mips.org
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Cc: kernel@pengutronix.de
Patchwork: https://patchwork.linux-mips.org/patch/3565/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-19 11:23:43 +02:00