Changes in 4.9.326 Bluetooth: L2CAP: Fix use-after-free caused by l2cap_chan_put ntfs: fix use-after-free in ntfs_ucsncmp() scsi: ufs: host: Hold reference returned by of_parse_phandle() net: ping6: Fix memleak in ipv6_renew_options(). net: sungem_phy: Add of_node_put() for reference returned by of_get_parent() netfilter: nf_queue: do not allow packet truncation below transport header offset ARM: crypto: comment out gcc warning that breaks clang builds mt7601u: add USB device ID for some versions of XiaoDu WiFi Dongle. ion: Make user_ion_handle_put_nolock() a void function selinux: Minor cleanups proc: Pass file mode to proc_pid_make_inode selinux: Clean up initialization of isec->sclass selinux: Convert isec->lock into a spinlock selinux: fix error initialization in inode_doinit_with_dentry() selinux: fix inode_doinit_with_dentry() LABEL_INVALID error handling include/uapi/linux/swab.h: fix userspace breakage, use __BITS_PER_LONG for swap init/main: Fix double "the" in comment init/main: properly align the multi-line comment init: move stack canary initialization after setup_arch init/main.c: extract early boot entropy from the passed cmdline ACPI: video: Force backlight native for some TongFang devices ACPI: video: Shortening quirk list by identifying Clevo by board_name only random: only call boot_init_stack_canary() once macintosh/adb: fix oob read in do_adb_query() function ALSA: bcd2000: Fix a UAF bug on the error path of probing add barriers to buffer_uptodate and set_buffer_uptodate KVM: SVM: Don't BUG if userspace injects an interrupt with GIF=0 KVM: x86: Mark TSS busy during LTR emulation _after_ all fault checks ALSA: hda/conexant: Add quirk for LENOVO 20149 Notebook model ALSA: hda/cirrus - support for iMac 12,1 model vfs: Check the truncate maximum size in inode_newsize_ok() usbnet: Fix linkwatch use-after-free on disconnect parisc: Fix device names in /proc/iomem drm/nouveau: fix another off-by-one in nvbios_addr bpf: fix overflow in prog accounting fuse: limit nsec md-raid10: fix KASAN warning ia64, processor: fix -Wincompatible-pointer-types in ia64_get_irr() PCI: Add defines for normal and subtractive PCI bridges powerpc/fsl-pci: Fix Class Code of PCIe Root Port powerpc/powernv: Avoid crashing if rng is NULL MIPS: cpuinfo: Fix a warning for CONFIG_CPUMASK_OFFSTACK USB: HCD: Fix URB giveback issue in tasklet function netfilter: nf_tables: fix null deref due to zeroed list head scsi: zfcp: Fix missing auto port scan and thus missing target ports x86/olpc: fix 'logical not is only applied to the left hand side' spmi: trace: fix stack-out-of-bound access in SPMI tracing functions ext4: add EXT4_INODE_HAS_XATTR_SPACE macro in xattr.h ext4: make sure ext4_append() always allocates new block ext4: fix use-after-free in ext4_xattr_set_entry ext4: update s_overhead_clusters in the superblock during an on-line resize ext4: fix extent status tree race in writeback error recovery path ext4: correct max_inline_xattr_value_size computing dm raid: fix address sanitizer warning in raid_status net_sched: cls_route: remove from list when handle is 0 btrfs: reject log replay if there is unsupported RO compat flag tcp: fix over estimation in sk_forced_mem_schedule() scsi: sg: Allow waiting for commands to complete on removed device Revert "net: usb: ax88179_178a needs FLAG_SEND_ZLP" Bluetooth: L2CAP: Fix l2cap_global_chan_by_psm regression nios2: time: Read timer in get_cycles only if initialized net/9p: Initialize the iounit field during fid creation net_sched: cls_route: disallow handle of 0 ALSA: info: Fix llseek return value when using callback rds: add missing barrier to release_refill ata: libata-eh: Add missing command name btrfs: fix lost error handling when looking up extended ref on log replay can: ems_usb: fix clang's -Wunaligned-access warning NFSv4.1: RECLAIM_COMPLETE must handle EACCES SUNRPC: Reinitialise the backchannel request buffers before reuse pinctrl: nomadik: Fix refcount leak in nmk_pinctrl_dt_subnode_to_map pinctrl: qcom: msm8916: Allow CAMSS GP clocks to be muxed vsock: Fix memory leak in vsock_connect() xen/xenbus: fix return type in xenbus_file_read() atm: idt77252: fix use-after-free bugs caused by tst_timer nios2: page fault et.al. are *not* restartable syscalls... nios2: don't leave NULLs in sys_call_table[] nios2: traced syscall does need to check the syscall number nios2: fix syscall restart checks nios2: restarts apply only to the first sigframe we build... nios2: add force_successful_syscall_return() netfilter: nf_tables: really skip inactive sets when allocating name fec: Fix timer capture timing in `fec_ptp_enable_pps()` irqchip/tegra: Fix overflow implicit truncation warnings usb: host: ohci-ppc-of: Fix refcount leak bug gadgetfs: ep_io - wait until IRQ finishes cxl: Fix a memory leak in an error handling path drivers:md:fix a potential use-after-free bug ext4: avoid remove directory when directory is corrupted ext4: avoid resizing to a partial cluster size tty: serial: Fix refcount leak bug in ucc_uart.c vfio: Clear the caps->buf to NULL after free mips: cavium-octeon: Fix missing of_node_put() in octeon2_usb_clocks_start ALSA: core: Add async signal helpers ALSA: timer: Use deferred fasync helper powerpc/64: Init jump labels before parse_early_param() video: fbdev: i740fb: Check the argument of i740_calc_vclk() MIPS: tlbex: Explicitly compare _PAGE_NO_EXEC against 0 Linux 4.9.326 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I3ca17af58cd0c61bd81028c496849592cfd22f0f
360 lines
8.4 KiB
C
360 lines
8.4 KiB
C
/*
|
|
* Copyright (C) 2013-2014 Altera Corporation
|
|
* Copyright (C) 2010 Tobias Klauser <tklauser@distanz.ch>
|
|
* Copyright (C) 2004 Microtronix Datacom Ltd.
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
#include <linux/export.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/clockchips.h>
|
|
#include <linux/clocksource.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of_address.h>
|
|
#include <linux/of_irq.h>
|
|
#include <linux/io.h>
|
|
#include <linux/slab.h>
|
|
|
|
#define ALTR_TIMER_COMPATIBLE "altr,timer-1.0"
|
|
|
|
#define ALTERA_TIMER_STATUS_REG 0
|
|
#define ALTERA_TIMER_CONTROL_REG 4
|
|
#define ALTERA_TIMER_PERIODL_REG 8
|
|
#define ALTERA_TIMER_PERIODH_REG 12
|
|
#define ALTERA_TIMER_SNAPL_REG 16
|
|
#define ALTERA_TIMER_SNAPH_REG 20
|
|
|
|
#define ALTERA_TIMER_CONTROL_ITO_MSK (0x1)
|
|
#define ALTERA_TIMER_CONTROL_CONT_MSK (0x2)
|
|
#define ALTERA_TIMER_CONTROL_START_MSK (0x4)
|
|
#define ALTERA_TIMER_CONTROL_STOP_MSK (0x8)
|
|
|
|
struct nios2_timer {
|
|
void __iomem *base;
|
|
unsigned long freq;
|
|
};
|
|
|
|
struct nios2_clockevent_dev {
|
|
struct nios2_timer timer;
|
|
struct clock_event_device ced;
|
|
};
|
|
|
|
struct nios2_clocksource {
|
|
struct nios2_timer timer;
|
|
struct clocksource cs;
|
|
};
|
|
|
|
static inline struct nios2_clockevent_dev *
|
|
to_nios2_clkevent(struct clock_event_device *evt)
|
|
{
|
|
return container_of(evt, struct nios2_clockevent_dev, ced);
|
|
}
|
|
|
|
static inline struct nios2_clocksource *
|
|
to_nios2_clksource(struct clocksource *cs)
|
|
{
|
|
return container_of(cs, struct nios2_clocksource, cs);
|
|
}
|
|
|
|
static u16 timer_readw(struct nios2_timer *timer, u32 offs)
|
|
{
|
|
return readw(timer->base + offs);
|
|
}
|
|
|
|
static void timer_writew(struct nios2_timer *timer, u16 val, u32 offs)
|
|
{
|
|
writew(val, timer->base + offs);
|
|
}
|
|
|
|
static inline unsigned long read_timersnapshot(struct nios2_timer *timer)
|
|
{
|
|
unsigned long count;
|
|
|
|
timer_writew(timer, 0, ALTERA_TIMER_SNAPL_REG);
|
|
count = timer_readw(timer, ALTERA_TIMER_SNAPH_REG) << 16 |
|
|
timer_readw(timer, ALTERA_TIMER_SNAPL_REG);
|
|
|
|
return count;
|
|
}
|
|
|
|
static cycle_t nios2_timer_read(struct clocksource *cs)
|
|
{
|
|
struct nios2_clocksource *nios2_cs = to_nios2_clksource(cs);
|
|
unsigned long flags;
|
|
u32 count;
|
|
|
|
local_irq_save(flags);
|
|
count = read_timersnapshot(&nios2_cs->timer);
|
|
local_irq_restore(flags);
|
|
|
|
/* Counter is counting down */
|
|
return ~count;
|
|
}
|
|
|
|
static struct nios2_clocksource nios2_cs = {
|
|
.cs = {
|
|
.name = "nios2-clksrc",
|
|
.rating = 250,
|
|
.read = nios2_timer_read,
|
|
.mask = CLOCKSOURCE_MASK(32),
|
|
.flags = CLOCK_SOURCE_IS_CONTINUOUS,
|
|
},
|
|
};
|
|
|
|
cycles_t get_cycles(void)
|
|
{
|
|
/* Only read timer if it has been initialized */
|
|
if (nios2_cs.timer.base)
|
|
return nios2_timer_read(&nios2_cs.cs);
|
|
return 0;
|
|
}
|
|
EXPORT_SYMBOL(get_cycles);
|
|
|
|
static void nios2_timer_start(struct nios2_timer *timer)
|
|
{
|
|
u16 ctrl;
|
|
|
|
ctrl = timer_readw(timer, ALTERA_TIMER_CONTROL_REG);
|
|
ctrl |= ALTERA_TIMER_CONTROL_START_MSK;
|
|
timer_writew(timer, ctrl, ALTERA_TIMER_CONTROL_REG);
|
|
}
|
|
|
|
static void nios2_timer_stop(struct nios2_timer *timer)
|
|
{
|
|
u16 ctrl;
|
|
|
|
ctrl = timer_readw(timer, ALTERA_TIMER_CONTROL_REG);
|
|
ctrl |= ALTERA_TIMER_CONTROL_STOP_MSK;
|
|
timer_writew(timer, ctrl, ALTERA_TIMER_CONTROL_REG);
|
|
}
|
|
|
|
static void nios2_timer_config(struct nios2_timer *timer, unsigned long period,
|
|
bool periodic)
|
|
{
|
|
u16 ctrl;
|
|
|
|
/* The timer's actual period is one cycle greater than the value
|
|
* stored in the period register. */
|
|
period--;
|
|
|
|
ctrl = timer_readw(timer, ALTERA_TIMER_CONTROL_REG);
|
|
/* stop counter */
|
|
timer_writew(timer, ctrl | ALTERA_TIMER_CONTROL_STOP_MSK,
|
|
ALTERA_TIMER_CONTROL_REG);
|
|
|
|
/* write new count */
|
|
timer_writew(timer, period, ALTERA_TIMER_PERIODL_REG);
|
|
timer_writew(timer, period >> 16, ALTERA_TIMER_PERIODH_REG);
|
|
|
|
ctrl |= ALTERA_TIMER_CONTROL_START_MSK | ALTERA_TIMER_CONTROL_ITO_MSK;
|
|
if (periodic)
|
|
ctrl |= ALTERA_TIMER_CONTROL_CONT_MSK;
|
|
else
|
|
ctrl &= ~ALTERA_TIMER_CONTROL_CONT_MSK;
|
|
timer_writew(timer, ctrl, ALTERA_TIMER_CONTROL_REG);
|
|
}
|
|
|
|
static int nios2_timer_set_next_event(unsigned long delta,
|
|
struct clock_event_device *evt)
|
|
{
|
|
struct nios2_clockevent_dev *nios2_ced = to_nios2_clkevent(evt);
|
|
|
|
nios2_timer_config(&nios2_ced->timer, delta, false);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int nios2_timer_shutdown(struct clock_event_device *evt)
|
|
{
|
|
struct nios2_clockevent_dev *nios2_ced = to_nios2_clkevent(evt);
|
|
struct nios2_timer *timer = &nios2_ced->timer;
|
|
|
|
nios2_timer_stop(timer);
|
|
return 0;
|
|
}
|
|
|
|
static int nios2_timer_set_periodic(struct clock_event_device *evt)
|
|
{
|
|
unsigned long period;
|
|
struct nios2_clockevent_dev *nios2_ced = to_nios2_clkevent(evt);
|
|
struct nios2_timer *timer = &nios2_ced->timer;
|
|
|
|
period = DIV_ROUND_UP(timer->freq, HZ);
|
|
nios2_timer_config(timer, period, true);
|
|
return 0;
|
|
}
|
|
|
|
static int nios2_timer_resume(struct clock_event_device *evt)
|
|
{
|
|
struct nios2_clockevent_dev *nios2_ced = to_nios2_clkevent(evt);
|
|
struct nios2_timer *timer = &nios2_ced->timer;
|
|
|
|
nios2_timer_start(timer);
|
|
return 0;
|
|
}
|
|
|
|
irqreturn_t timer_interrupt(int irq, void *dev_id)
|
|
{
|
|
struct clock_event_device *evt = (struct clock_event_device *) dev_id;
|
|
struct nios2_clockevent_dev *nios2_ced = to_nios2_clkevent(evt);
|
|
|
|
/* Clear the interrupt condition */
|
|
timer_writew(&nios2_ced->timer, 0, ALTERA_TIMER_STATUS_REG);
|
|
evt->event_handler(evt);
|
|
|
|
return IRQ_HANDLED;
|
|
}
|
|
|
|
static int __init nios2_timer_get_base_and_freq(struct device_node *np,
|
|
void __iomem **base, u32 *freq)
|
|
{
|
|
*base = of_iomap(np, 0);
|
|
if (!*base) {
|
|
pr_crit("Unable to map reg for %s\n", np->name);
|
|
return -ENXIO;
|
|
}
|
|
|
|
if (of_property_read_u32(np, "clock-frequency", freq)) {
|
|
pr_crit("Unable to get %s clock frequency\n", np->name);
|
|
return -EINVAL;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct nios2_clockevent_dev nios2_ce = {
|
|
.ced = {
|
|
.name = "nios2-clkevent",
|
|
.features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
|
|
.rating = 250,
|
|
.shift = 32,
|
|
.set_next_event = nios2_timer_set_next_event,
|
|
.set_state_shutdown = nios2_timer_shutdown,
|
|
.set_state_periodic = nios2_timer_set_periodic,
|
|
.set_state_oneshot = nios2_timer_shutdown,
|
|
.tick_resume = nios2_timer_resume,
|
|
},
|
|
};
|
|
|
|
static __init int nios2_clockevent_init(struct device_node *timer)
|
|
{
|
|
void __iomem *iobase;
|
|
u32 freq;
|
|
int irq, ret;
|
|
|
|
ret = nios2_timer_get_base_and_freq(timer, &iobase, &freq);
|
|
if (ret)
|
|
return ret;
|
|
|
|
irq = irq_of_parse_and_map(timer, 0);
|
|
if (!irq) {
|
|
pr_crit("Unable to parse timer irq\n");
|
|
return -EINVAL;
|
|
}
|
|
|
|
nios2_ce.timer.base = iobase;
|
|
nios2_ce.timer.freq = freq;
|
|
|
|
nios2_ce.ced.cpumask = cpumask_of(0);
|
|
nios2_ce.ced.irq = irq;
|
|
|
|
nios2_timer_stop(&nios2_ce.timer);
|
|
/* clear pending interrupt */
|
|
timer_writew(&nios2_ce.timer, 0, ALTERA_TIMER_STATUS_REG);
|
|
|
|
ret = request_irq(irq, timer_interrupt, IRQF_TIMER, timer->name,
|
|
&nios2_ce.ced);
|
|
if (ret) {
|
|
pr_crit("Unable to setup timer irq\n");
|
|
return ret;
|
|
}
|
|
|
|
clockevents_config_and_register(&nios2_ce.ced, freq, 1, ULONG_MAX);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static __init int nios2_clocksource_init(struct device_node *timer)
|
|
{
|
|
unsigned int ctrl;
|
|
void __iomem *iobase;
|
|
u32 freq;
|
|
int ret;
|
|
|
|
ret = nios2_timer_get_base_and_freq(timer, &iobase, &freq);
|
|
if (ret)
|
|
return ret;
|
|
|
|
nios2_cs.timer.base = iobase;
|
|
nios2_cs.timer.freq = freq;
|
|
|
|
ret = clocksource_register_hz(&nios2_cs.cs, freq);
|
|
if (ret)
|
|
return ret;
|
|
|
|
timer_writew(&nios2_cs.timer, USHRT_MAX, ALTERA_TIMER_PERIODL_REG);
|
|
timer_writew(&nios2_cs.timer, USHRT_MAX, ALTERA_TIMER_PERIODH_REG);
|
|
|
|
/* interrupt disable + continuous + start */
|
|
ctrl = ALTERA_TIMER_CONTROL_CONT_MSK | ALTERA_TIMER_CONTROL_START_MSK;
|
|
timer_writew(&nios2_cs.timer, ctrl, ALTERA_TIMER_CONTROL_REG);
|
|
|
|
/* Calibrate the delay loop directly */
|
|
lpj_fine = freq / HZ;
|
|
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* The first timer instance will use as a clockevent. If there are two or
|
|
* more instances, the second one gets used as clocksource and all
|
|
* others are unused.
|
|
*/
|
|
static int __init nios2_time_init(struct device_node *timer)
|
|
{
|
|
static int num_called;
|
|
int ret;
|
|
|
|
switch (num_called) {
|
|
case 0:
|
|
ret = nios2_clockevent_init(timer);
|
|
break;
|
|
case 1:
|
|
ret = nios2_clocksource_init(timer);
|
|
break;
|
|
default:
|
|
ret = 0;
|
|
break;
|
|
}
|
|
|
|
num_called++;
|
|
|
|
return ret;
|
|
}
|
|
|
|
void read_persistent_clock(struct timespec *ts)
|
|
{
|
|
ts->tv_sec = mktime(2007, 1, 1, 0, 0, 0);
|
|
ts->tv_nsec = 0;
|
|
}
|
|
|
|
void __init time_init(void)
|
|
{
|
|
struct device_node *np;
|
|
int count = 0;
|
|
|
|
for_each_compatible_node(np, NULL, ALTR_TIMER_COMPATIBLE)
|
|
count++;
|
|
|
|
if (count < 2)
|
|
panic("%d timer is found, it needs 2 timers in system\n", count);
|
|
|
|
clocksource_probe();
|
|
}
|
|
|
|
CLOCKSOURCE_OF_DECLARE(nios2_timer, ALTR_TIMER_COMPATIBLE, nios2_time_init);
|