bfaf245022
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
...
Pull MIPS updates from Ralf Baechle:
"This is the main pull request for MIPS for Linux 4.1. Most
noteworthy:
- Add more Octeon-optimized crypto functions
- Octeon crypto preemption and locking fixes
- Little endian support for Octeon
- Use correct CSR to soft reset Octeons
- Support LEDs on the Octeon-based DSR-1000N
- Fix PCI interrupt mapping for the Octeon-based DSR-1000N
- Mark prom_free_prom_memory() as __init for a number of systems
- Support for Imagination's Pistachio SOC. This includes arch and
CLK bits. I'd like to merge pinctrl bits later
- Improve parallelism of csum_partial for certain pipelines
- Organize DTB files in subdirs like other architectures
- Implement read_sched_clock for all MIPS platforms other than
Octeon
- Massive series of 38 fixes and cleanups for the FPU emulator /
kernel
- Further FPU remulator work to support new features. This sits on a
separate branch which also has been pulled into the 4.1 KVM branch
- Clean up and fixes for the SEAD3 eval board; remove unused file
- Various updates for Netlogic platforms
- A number of small updates for Loongson 3 platforms
- Increase the memory limit for ATH79 platforms to 256MB
- A fair number of fixes and updates for BCM47xx platforms
- Finish the implementation of XPA support
- MIPS FDC support. No, not floppy controller but Fast Debug Channel :)
- Detect the R16000 used in SGI legacy platforms
- Fix Kconfig dependencies for the SSB bus support"
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (265 commits)
MIPS: Makefile: Fix MIPS ASE detection code
MIPS: asm: elf: Set O32 default FPU flags
MIPS: BCM47XX: Fix detecting Microsoft MN-700 & Asus WL500G
MIPS: Kconfig: Disable SMP/CPS for 64-bit
MIPS: Hibernate: flush TLB entries earlier
MIPS: smp-cps: cpu_set FPU mask if FPU present
MIPS: lose_fpu(): Disable FPU when MSA enabled
MIPS: ralink: add missing symbol for RALINK_ILL_ACC
MIPS: ralink: Fix bad config symbol in PCI makefile.
SSB: fix Kconfig dependencies
MIPS: Malta: Detect and fix bad memsize values
Revert "MIPS: Avoid pipeline stalls on some MIPS32R2 cores."
MIPS: Octeon: Delete override of cpu_has_mips_r2_exec_hazard.
MIPS: Fix cpu_has_mips_r2_exec_hazard.
MIPS: kernel: entry.S: Set correct ISA level for mips_ihb
MIPS: asm: spinlock: Fix addiu instruction for R10000_LLSC_WAR case
MIPS: r4kcache: Use correct base register for MIPS R6 cache flushes
MIPS: Kconfig: Fix typo for the r2-to-r6 emulator kernel parameter
MIPS: unaligned: Fix regular load/store instruction emulation for EVA
MIPS: unaligned: Surround load/store macros in do {} while statements
...
2015-04-17 15:50:54 -04:00
cb850717b0
ARM, clocksource/drivers: Provide read_boot_clock64() and read_persistent_clock64() and use them
...
As part of addressing "y2038 problem" for in-kernel uses, this
patch converts read_boot_clock() to read_boot_clock64() and
read_persistent_clock() to read_persistent_clock64() using
timespec64 by converting clock_access_fn to use timespec64.
Signed-off-by: Xunlei Pang <pang.xunlei@linaro.org >
Signed-off-by: John Stultz <john.stultz@linaro.org >
Acked-by: Thierry Reding <treding@nvidia.com > (for tegra part)
Cc: Russell King <rmk@dyn-67.arm.linux.org.uk >
Cc: Peter Zijlstra <peterz@infradead.org >
Cc: Thomas Gleixner <tglx@linutronix.de >
Link: http://lkml.kernel.org/r/1427945681-29972-7-git-send-email-john.stultz@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org >
2015-04-03 08:18:23 +02:00
a0c2998f91
clocksource/drivers/tegra: Provide y2038-safe tegra_read_persistent_clock() replacement
...
As part of addressing "y2038 problem" for in-kernel uses, this
patch adds the y2038-safe tegra_read_persistent_clock64() using
timespec64.
Because we rely on some subsequent changes to convert arm
multiarch support, tegra_read_persistent_clock() will be removed
then.
Signed-off-by: Xunlei Pang <pang.xunlei@linaro.org >
Signed-off-by: John Stultz <john.stultz@linaro.org >
Acked-by: Thierry Reding <treding@nvidia.com >
Cc: Peter Zijlstra <peterz@infradead.org >
Cc: Thomas Gleixner <tglx@linutronix.de >
Link: http://lkml.kernel.org/r/1427945681-29972-6-git-send-email-john.stultz@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org >
2015-04-03 08:18:22 +02:00
5b4e845393
CLOCKSOURCE: mips-gic: Allow GIC clock to be specified in device-tree
...
As an alternative to the "clock-frequency" property, allow the GIC
timer operating clock to be specified in the device-tree instead.
This is useful on systems which use common clock or where the GIC
is not fixed to a particular frequency and is instead, for example,
derived from the CPU clock.
Signed-off-by: Andrew Bresticker <abrestic@chromium.org >
Cc: James Hogan <james.hogan@imgtec.com >
Cc: Rob Herring <robh+dt@kernel.org >
Cc: Pawel Moll <pawel.moll@arm.com >
Cc: Mark Rutland <mark.rutland@arm.com >
Cc: Ian Campbell <ijc+devicetree@hellion.org.uk >
Cc: Kumar Gala <galak@codeaurora.org >
Cc: Daniel Lezcano <daniel.lezcano@linaro.org >
Cc: Thomas Gleixner <tglx@linutronix.de >
Cc: devicetree@vger.kernel.org
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/9309/
2015-04-01 17:22:11 +02:00
ff37015b6d
CLOCKSOURCE: versatile: Add PLAT_VERSATILE dependency
...
GENERIC_SCHED_CLOCK can be selected by architectures other than ARM. The
current dependencies of CLKSRC_VERSATILE make it possible that other
architectures will have CLKSRC_VERSATILE available in configuration once
they select GENERIC_SCHED_CLOCK, whereas this clock source should be solely
available to ARM in reality.
This patch adds one more dependency to CLKSRC_VERSATILE to fix the issue.
Signed-off-by: Deng-Cheng Zhu <dengcheng.zhu@imgtec.com >
Reported-by: Maciej W. Rozycki <macro@linux-mips.org >
Cc: Russell King <linux@arm.linux.org.uk >
Cc: LKML <linux-kernel@vger.kernel.org >
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/9476/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2015-04-01 17:21:26 +02:00
3071efa466
clocksource/drivers/sun5i: Add clock notifiers
...
The parent clock of the sun5i timer is the AHB clock, which rate
might change because of other devices requirements.
This is for example the case on the Allwinner A31, where the DMA
controller needs a minimum rate higher than the default, that is
enforced after the timer driver has probed.
Add clock notifiers to make sure we reflect the clock rate
changes in the timer rates.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com >
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org >
Cc: linux-arm-kernel@lists.infradead.org
Link: http://lkml.kernel.org/r/1427796746-373-5-git-send-email-daniel.lezcano@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org >
2015-03-31 17:53:58 +02:00
4a59058f0b
clocksource/drivers/sun5i: Refactor the current code
...
Refactor the code in order to remove the global variables and
split the clock source and clock events registration in order to
ease the addition of the clock notifiers needed to handle the
parent clock rate changes.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com >
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org >
Cc: linux-arm-kernel@lists.infradead.org
Link: http://lkml.kernel.org/r/1427796746-373-4-git-send-email-daniel.lezcano@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org >
2015-03-31 17:53:58 +02:00
a45860d0ba
clocksource/drivers/sun5i: Use of_io_request_and_map()
...
of_iomap doesn't do a request_mem_region() on the memory area
defined in the DT it maps. Switch to of_io_request_and_map() to
make sure we're the only users.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com >
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org >
Cc: linux-arm-kernel@lists.infradead.org
Link: http://lkml.kernel.org/r/1427796746-373-3-git-send-email-daniel.lezcano@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org >
2015-03-31 17:53:58 +02:00
5673bc5a86
clocksource/drivers/sun5i: Switch to request_irq()
...
The current code uses setup_irq(), while it could perfectly use
the much simpler request_irq(). Switch to that.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com >
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org >
Cc: linux-arm-kernel@lists.infradead.org
Link: http://lkml.kernel.org/r/1427796746-373-2-git-send-email-daniel.lezcano@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org >
2015-03-31 17:53:57 +02:00
566e6dfad5
clocksource/drivers/arm_arch_timer: Rename 'arch_timer_probed()' to 'arch_timer_needs_probing()' to reflect behaviour
...
The arch_timer_probed() function returns whether the given time
doesn't need to be probed. This can be the case when the timer
has been probed already, but also when it has no corresponding
enabled node in DT.
Rename the function to arch_timer_needs_probing() and invert its
return value to better reflect the function's purpose and
behaviour.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com >
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org >
Acked-by: Sudeep Holla <sudeep.holla@arm.com >
Cc: linux-arm-kernel@lists.infradead.org
Link: http://lkml.kernel.org/r/1427796746-373-1-git-send-email-daniel.lezcano@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org >
2015-03-31 17:53:57 +02:00
7d9cd1f518
CLOCKSOURCE: mips-gic-timer: Ensure GIC counter is running
...
Start the GIC counter after configuring the clocksource since there
are no guarantees the counter will be running after a CPU reset.
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com >
Cc: Daniel Lezcano <daniel.lezcano@linaro.org >
Cc: Thomas Gleixner <tglx@linutronix.de >
Cc: linux-kernel@vger.kernel.org
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/9595/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2015-03-31 12:04:13 +02:00
4806c87f01
clocksource/drivers/at91: Fix IO endianness
...
Fix the use of __raw IO accessor with the readl/writel_relaxed()
versions to allow the code to be used on a system running in big
endian mode.
Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk >
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org >
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com >
Cc: Andrew Victor <linux@maxim.org.za >
Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com >
Cc: Linux ARM Kernel <linux-arm-kernel@lists.infradead.org >
Cc: Thomas Gleixner <tglx@linutronix.de >
Cc: digetx@gmail.com
Cc: hdegoede@redhat.com
Cc: laurent.pinchart+renesas@ideasonboard.com
Cc: maxime.ripard@free-electrons.com
Cc: viresh.kumar@linaro.org
Link: http://lkml.kernel.org/r/1427746633-9137-7-git-send-email-daniel.lezcano@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org >
2015-03-31 09:15:58 +02:00
37b8b003c4
clocksource/drivers/sun4i-timer: Only register a sched_clock on sun4i and sun5i
...
sun6i and newer have an arm arch timer which is a better
sched_clock source then the sun4i-timer, and sched_clock does
not have priorities, so do not register the sun4i-timer
sched_clock at all on sun6i and newer.
Signed-off-by: Hans de Goede <hdegoede@redhat.com >
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org >
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com >
Cc: ben.dooks@codethink.co.uk
Cc: digetx@gmail.com
Cc: laurent.pinchart+renesas@ideasonboard.com
Cc: linux-arm-kernel@lists.infradead.org
Cc: viresh.kumar@linaro.org
Link: http://lkml.kernel.org/r/1427746633-9137-8-git-send-email-daniel.lezcano@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org >
2015-03-31 09:15:58 +02:00
59196bcef5
clocksource/drivers/tegra: Fix IO endianness
...
Support big-endian kernel by using endian-aware register access
functions.
Signed-off-by: Dmitry Osipenko <digetx@gmail.com >
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org >
Acked-by: Thierry Reding <treding@nvidia.com >
Cc: ben.dooks@codethink.co.uk
Cc: hdegoede@redhat.com
Cc: laurent.pinchart+renesas@ideasonboard.com
Cc: linux-arm-kernel@lists.infradead.org
Cc: maxime.ripard@free-electrons.com
Cc: viresh.kumar@linaro.org
Link: http://lkml.kernel.org/r/1427746633-9137-9-git-send-email-daniel.lezcano@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org >
2015-03-31 09:15:58 +02:00
3a10013b6a
clocksource/drivers/dw_apb_timers_of: Fix IO endianness causing time jumps
...
The dw_apb_timer_of timer is using __raw_readl() to access the
timer register, which is causing issues when the system is
running in big endian mode. Fix this by using readl_relaxed()
which should account for the endian settings.
This fixes issues where the time jumps around in the dmesg
output due to returnling __le32 values.
For an example, these two console lines show time running
backwards:
[ 49.882572] CPU1: failed to come online
[ 43.282457] Brought up 1 CPUs
Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk >
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org >
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com >
Cc: Dinh Nguyen <dinguyen@opensource.altera.com >
Cc: Linux ARM Kernel <linux-arm-kernel@lists.infradead.org >
Cc: Thomas Gleixner <tglx@linutronix.de >
Cc: digetx@gmail.com
Cc: hdegoede@redhat.com
Cc: laurent.pinchart+renesas@ideasonboard.com
Cc: maxime.ripard@free-electrons.com
Cc: viresh.kumar@linaro.org
Link: http://lkml.kernel.org/r/1427746633-9137-10-git-send-email-daniel.lezcano@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org >
2015-03-31 09:15:57 +02:00
ad834a3468
clocksource/drivers/efm32: Use CLOCK_EVT_FEAT_PERIODIC for defining features
...
We have used CLOCK_EVT_MODE_PERIODIC instead of
CLOCK_EVT_FEAT_PERIODIC while defining features. Fix it.
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org >
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org >
Acked-by: Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.de >
Cc: ben.dooks@codethink.co.uk
Cc: digetx@gmail.com
Cc: hdegoede@redhat.com
Cc: laurent.pinchart+renesas@ideasonboard.com
Cc: linux-arm-kernel@lists.infradead.org
Cc: maxime.ripard@free-electrons.com
Link: http://lkml.kernel.org/r/1427746633-9137-11-git-send-email-daniel.lezcano@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org >
2015-03-31 09:15:57 +02:00
c5e77f5216
Merge tag 'v4.0-rc6' into timers/core, before applying new patches
...
Signed-off-by: Ingo Molnar <mingo@kernel.org >
2015-03-31 09:08:13 +02:00
6e20602032
clocksource/drivers/sun5i: Fix cpufreq interaction with sched_clock()
...
The sun5i timer is used as the sched-clock on certain systems, and ever
since we started using cpufreq, the cpu clock (that is one of the
timer's clock indirect parent) now changes as well, along with the
actual sched_clock() rate.
This is not accurate and not desirable.
We can safely remove the sun5i sched-clock on those systems, since we
have other reliable sched_clock() sources in the system.
Tested-by: Hans de Goede <hdegoede@redhat.com >
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com >
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org >
[ Improved the changelog. ]
Cc: richard@nod.at
Link: http://lkml.kernel.org/r/1427362029-6511-4-git-send-email-daniel.lezcano@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org >
2015-03-26 10:59:40 +01:00
11bc26fe37
clocksource/drivers: Fix various !CONFIG_HAS_IOMEM build errors
...
Fix !CONFIG_HAS_IOMEM related build failures in three clocksource drivers.
The build failures have the pattern of:
drivers/clocksource/sh_cmt.c: In function ‘sh_cmt_map_memory’: drivers/clocksource/sh_cmt.c:920:2:
error: implicit declaration of function ‘ioremap_nocache’ [-Werror=implicit-function-declaration] cmt->mapbase = ioremap_nocache(mem->start, resource_size(mem));
Signed-off-by: Richard Weinberger <richard@nod.at >
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org >
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be >
Cc: maxime.ripard@free-electrons.com
Link: http://lkml.kernel.org/r/1427362029-6511-1-git-send-email-daniel.lezcano@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org >
2015-03-26 10:59:40 +01:00
2557d215a3
Merge branch 'timers/urgent' into timers/core, to pick up fixes before applying new changes
...
Signed-off-by: Ingo Molnar <mingo@kernel.org >
2015-03-17 11:11:24 +01:00
fba9e07208
clocksource: Rename __clocksource_updatefreq_*() to __clocksource_update_freq_*()
...
Ingo requested this function be renamed to improve readability,
so I've renamed __clocksource_updatefreq_scale() as well as the
__clocksource_updatefreq_hz/khz() functions to avoid
squishedtogethernames.
This touches some of the sh clocksources, which I've not tested.
The arch/arm/plat-omap change is just a comment change for
consistency.
Signed-off-by: John Stultz <john.stultz@linaro.org >
Cc: Daniel Lezcano <daniel.lezcano@linaro.org >
Cc: Dave Jones <davej@codemonkey.org.uk >
Cc: Linus Torvalds <torvalds@linux-foundation.org >
Cc: Peter Zijlstra <peterz@infradead.org >
Cc: Prarit Bhargava <prarit@redhat.com >
Cc: Richard Cochran <richardcochran@gmail.com >
Cc: Stephen Boyd <sboyd@codeaurora.org >
Cc: Thomas Gleixner <tglx@linutronix.de >
Link: http://lkml.kernel.org/r/1426133800-29329-13-git-send-email-john.stultz@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org >
2015-03-13 08:07:08 +01:00
1096be084a
clockevents: sun5i: Fix setup_irq init sequence
...
The interrupt is enabled before the handler is set. Even this bug
did not appear, it is potentially dangerous as it can lead to a
NULL pointer dereference.
Fix the error by enabling the interrupt after
clockevents_config_and_register() is called.
Cc: stable@vger.kernel.org
Signed-off-by: Yongbae Park <yongbae2@gmail.com >
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org >
2015-03-05 15:01:37 +01:00
7b8f10da3b
clocksource: efm32: Fix a NULL pointer dereference
...
The initialisation of the efm32 clocksource first sets up the irq and only
after that initialises the data needed for irq handling. In case this
initialisation is delayed the irq handler would dereference a NULL pointer.
I'm not aware of anything that could delay the process in such a way, but it's
better to be safe than sorry, so setup the irq only when the clock event device
is ready.
Cc: stable@vger.kernel.org
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de >
Signed-off-by: Yongbae Park <yongbae2@gmail.com >
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org >
2015-03-05 15:01:36 +01:00
6f2116ebe2
clocksource: pxa: Fix section mismatch
...
As pxa_timer_common_init() is only called in init context, mark it as
such, and quiesce the compiler warnings :
WARNING: vmlinux.o(.text.unlikely+0x45d4): Section mismatch in reference
from the function pxa_timer_common_init() to the function
.init.text:sched_clock_register()
WARNING: vmlinux.o(.text.unlikely+0x4610): Section mismatch in reference
from the function pxa_timer_common_init() to the function
.init.text:clocksource_mmio_init()
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr >
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org >
2015-02-25 10:28:55 +01:00
d4a19eb3b1
clocksource: mtk: Fix race conditions in probe code
...
We have two race conditions in the probe code which could lead to a null
pointer dereference in the interrupt handler.
The interrupt handler accesses the clockevent device, which may not yet be
registered.
First race condition happens when the interrupt handler gets registered before
the interrupts get disabled. The second race condition happens when the
interrupts get enabled, but the clockevent device is not yet registered.
Fix that by disabling the interrupts before we register the interrupt and enable
the interrupts after the clockevent device got registered.
Reported-by: Gongbae Park <yongbae2@gmail.com >
Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com >
Cc: stable@vger.kernel.org
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org >
2015-02-25 10:28:49 +01:00
Linus Torvalds
Xunlei Pang
Andrew Bresticker
Deng-Cheng Zhu
Maxime Ripard
Laurent Pinchart
Markos Chandras
Ben Dooks
Hans de Goede
Dmitry Osipenko
Viresh Kumar
Ingo Molnar
Richard Weinberger
John Stultz
Yongbae Park
Robert Jarzmik
Matthias Brugger