Changes in 4.9.291 binder: use euid from cred instead of using task binder: use cred instead of task for selinux checks xhci: Fix USB 3.1 enumeration issues by increasing roothub power-on-good delay Input: elantench - fix misreporting trackpoint coordinates Input: i8042 - Add quirk for Fujitsu Lifebook T725 libata: fix read log timeout value ocfs2: fix data corruption on truncate mmc: dw_mmc: Dont wait for DRTO on Write RSP error parisc: Fix ptrace check on syscall return media: ite-cir: IR receiver stop working after receive overflow ALSA: ua101: fix division by zero at probe ALSA: 6fire: fix control and bulk message timeouts ALSA: line6: fix control and interrupt message timeouts ALSA: synth: missing check for possible NULL after the call to kstrdup ALSA: timer: Fix use-after-free problem ALSA: timer: Unconditionally unlink slave instances, too x86/irq: Ensure PI wakeup handler is unregistered before module unload sfc: Don't use netif_info before net_device setup hyperv/vmbus: include linux/bitops.h mmc: winbond: don't build on M68K bpf: Prevent increasing bpf_jit_limit above max xen/netfront: stop tx queues during live migration spi: spl022: fix Microwire full duplex mode watchdog: Fix OMAP watchdog early handling vmxnet3: do not stop tx queues after netif_device_detach() btrfs: fix lost error handling when replaying directory deletes hwmon: (pmbus/lm25066) Add offset coefficients regulator: s5m8767: do not use reset value as DVS voltage if GPIO DVS is disabled regulator: dt-bindings: samsung,s5m8767: correct s5m8767,pmic-buck-default-dvs-idx property EDAC/sb_edac: Fix top-of-high-memory value for Broadwell/Haswell mwifiex: fix division by zero in fw download path ath6kl: fix division by zero in send path ath6kl: fix control-message timeout PCI: Mark Atheros QCA6174 to avoid bus reset rtl8187: fix control-message timeouts evm: mark evm_fixmode as __ro_after_init wcn36xx: Fix HT40 capability for 2Ghz band mwifiex: Read a PCI register after writing the TX ring write pointer wcn36xx: handle connection loss indication RDMA/qedr: Fix NULL deref for query_qp on the GSI QP signal: Remove the bogus sigkill_pending in ptrace_stop signal/mips: Update (_save|_restore)_fp_context to fail with -EFAULT power: supply: max17042_battery: Prevent int underflow in set_soc_threshold power: supply: max17042_battery: use VFSOC for capacity when no rsns powerpc/85xx: Fix oops when mpc85xx_smp_guts_ids node cannot be found serial: core: Fix initializing and restoring termios speed ALSA: mixer: oss: Fix racy access to slots ALSA: mixer: fix deadlock in snd_mixer_oss_set_volume PCI: aardvark: Read all 16-bits from PCIE_MSI_PAYLOAD_REG quota: check block number when reading the block in quota file quota: correct error number in free_dqentry() iio: dac: ad5446: Fix ad5622_write() return value USB: serial: keyspan: fix memleak on probe errors USB: iowarrior: fix control-message timeouts Bluetooth: sco: Fix lock_sock() blockage by memcpy_from_msg() Bluetooth: fix use-after-free error in lock_sock_nested() platform/x86: wmi: do not fail if disabling fails MIPS: lantiq: dma: add small delay after reset MIPS: lantiq: dma: reset correct number of channel locking/lockdep: Avoid RCU-induced noinstr fail smackfs: Fix use-after-free in netlbl_catmap_walk() x86: Increase exception stack sizes media: mt9p031: Fix corrupted frame after restarting stream media: netup_unidvb: handle interrupt properly according to the firmware media: uvcvideo: Set capability in s_param media: s5p-mfc: fix possible null-pointer dereference in s5p_mfc_probe() media: mceusb: return without resubmitting URB in case of -EPROTO error. ia64: don't do IA64_CMPXCHG_DEBUG without CONFIG_PRINTK ACPICA: Avoid evaluating methods too early during system resume media: usb: dvd-usb: fix uninit-value bug in dibusb_read_eeprom_byte() tracefs: Have tracefs directories not set OTH permission bits by default ath: dfs_pattern_detector: Fix possible null-pointer dereference in channel_detector_create() ACPI: battery: Accept charges over the design capacity as full memstick: r592: Fix a UAF bug when removing the driver lib/xz: Avoid overlapping memcpy() with invalid input with in-place decompression lib/xz: Validate the value before assigning it to an enum variable tracing/cfi: Fix cmp_entries_* functions signature mismatch mwl8k: Fix use-after-free in mwl8k_fw_state_machine() PM: hibernate: Get block device exclusively in swsusp_check() iwlwifi: mvm: disable RX-diversity in powersave smackfs: use __GFP_NOFAIL for smk_cipso_doi() ARM: clang: Do not rely on lr register for stacktrace ARM: 9136/1: ARMv7-M uses BE-8, not BE-32 spi: bcm-qspi: Fix missing clk_disable_unprepare() on error in bcm_qspi_probe() parisc: fix warning in flush_tlb_all parisc/kgdb: add kgdb_roundup() to make kgdb work with idle polling cgroup: Make rebind_subsystems() disable v2 controllers all at once media: dvb-usb: fix ununit-value in az6027_rc_query media: mtk-vpu: Fix a resource leak in the error handling path of 'mtk_vpu_probe()' media: si470x: Avoid card name truncation cpuidle: Fix kobject memory leaks in error paths ath9k: Fix potential interrupt storm on queue reset crypto: qat - detect PFVF collision after ACK crypto: qat - disregard spurious PFVF interrupts b43legacy: fix a lower bounds test b43: fix a lower bounds test memstick: avoid out-of-range warning memstick: jmb38x_ms: use appropriate free function in jmb38x_ms_alloc_host() hwmon: Fix possible memleak in __hwmon_device_register() ath10k: fix max antenna gain unit drm/msm: uninitialized variable in msm_gem_import() net: stream: don't purge sk_error_queue in sk_stream_kill_queues() mmc: mxs-mmc: disable regulator on error and in the remove function platform/x86: thinkpad_acpi: Fix bitwise vs. logical warning mwifiex: Send DELBA requests according to spec phy: micrel: ksz8041nl: do not use power down mode smackfs: use netlbl_cfg_cipsov4_del() for deleting cipso_v4_doi s390/gmap: don't unconditionally call pte_unmap_unlock() in __gmap_zap() irq: mips: avoid nested irq_enter() samples/kretprobes: Fix return value if register_kretprobe() failed libertas_tf: Fix possible memory leak in probe and disconnect libertas: Fix possible memory leak in probe and disconnect crypto: pcrypt - Delay write to padata->info RDMA/rxe: Fix wrong port_cap_flags ARM: s3c: irq-s3c24xx: Fix return value check for s3c24xx_init_intc() scsi: dc395: Fix error case unwinding MIPS: loongson64: make CPU_LOONGSON64 depends on MIPS_FP_SUPPORT JFS: fix memleak in jfs_mount arm: dts: omap3-gta04a4: accelerometer irq fix soc/tegra: Fix an error handling path in tegra_powergate_power_up() memory: fsl_ifc: fix leak of irq and nand_irq in fsl_ifc_ctrl_probe video: fbdev: chipsfb: use memset_io() instead of memset() serial: 8250_dw: Drop wrong use of ACPI_PTR() usb: gadget: hid: fix error code in do_config() power: supply: rt5033_battery: Change voltage values to µV scsi: csiostor: Uninitialized data in csio_ln_vnp_read_cbfn() RDMA/mlx4: Return missed an error if device doesn't support steering serial: xilinx_uartps: Fix race condition causing stuck TX power: supply: bq27xxx: Fix kernel crash on IRQ handler register error pnfs/flexfiles: Fix misplaced barrier in nfs4_ff_layout_prepare_ds drm/plane-helper: fix uninitialized variable reference PCI: aardvark: Don't spam about PIO Response Status fs: orangefs: fix error return code of orangefs_revalidate_lookup() mtd: spi-nor: hisi-sfc: Remove excessive clk_disable_unprepare() dmaengine: at_xdmac: fix AT_XDMAC_CC_PERID() macro auxdisplay: img-ascii-lcd: Fix lock-up when displaying empty string netfilter: nfnetlink_queue: fix OOB when mac header was cleared dmaengine: dmaengine_desc_callback_valid(): Check for `callback_result` m68k: set a default value for MEMORY_RESERVE watchdog: f71808e_wdt: fix inaccurate report in WDIOC_GETTIMEOUT scsi: qla2xxx: Turn off target reset during issue_lip i2c: xlr: Fix a resource leak in the error handling path of 'xlr_i2c_probe()' xen-pciback: Fix return in pm_ctrl_init() net: davinci_emac: Fix interrupt pacing disable ACPI: PMIC: Fix intel_pmic_regs_handler() read accesses bonding: Fix a use-after-free problem when bond_sysfs_slave_add() failed mm/zsmalloc.c: close race window between zs_pool_dec_isolated() and zs_unregister_migration() llc: fix out-of-bound array index in llc_sk_dev_hash() nfc: pn533: Fix double free when pn533_fill_fragment_skbs() fails vsock: prevent unnecessary refcnt inc for nonblocking connect USB: chipidea: fix interrupt deadlock ARM: 9156/1: drop cc-option fallbacks for architecture selection powerpc/bpf: Validate branch ranges powerpc/bpf: Fix BPF_SUB when imm == 0x80000000 mm, oom: pagefault_out_of_memory: don't force global OOM for dying tasks mm, oom: do not trigger out_of_memory from the #PF PCI: Add PCI_EXP_DEVCTL_PAYLOAD_* macros net: mdio-mux: fix unbalanced put_device parisc/entry: fix trace test in syscall exit path PCI/MSI: Destroy sysfs before freeing entries scsi: lpfc: Fix list_add() corruption in lpfc_drain_txq() usb: musb: tusb6010: check return value after calling platform_get_resource() scsi: advansys: Fix kernel pointer leak ARM: dts: omap: fix gpmc,mux-add-data type usb: host: ohci-tmio: check return value after calling platform_get_resource() tty: tty_buffer: Fix the softlockup issue in flush_to_ldisc MIPS: sni: Fix the build scsi: target: Fix ordered tag handling scsi: target: Fix alua_tg_pt_gps_count tracking powerpc/5200: dts: fix memory node unit name ALSA: gus: fix null pointer dereference on pointer block powerpc/dcr: Use cmplwi instead of 3-argument cmpli sh: check return code of request_irq maple: fix wrong return value of maple_bus_init(). sh: fix kconfig unmet dependency warning for FRAME_POINTER sh: define __BIG_ENDIAN for math-emu mips: BCM63XX: ensure that CPU_SUPPORTS_32BIT_KERNEL is set sched/core: Mitigate race cpus_share_cache()/update_top_cache_domain() net: bnx2x: fix variable dereferenced before check iavf: Fix for the false positive ASQ/ARQ errors while issuing VF reset mips: bcm63xx: add support for clk_get_parent() platform/x86: hp_accel: Fix an error handling path in 'lis3lv02d_probe()' NFC: reorganize the functions in nci_request NFC: reorder the logic in nfc_{un,}register_device perf/x86/intel/uncore: Fix filter_tid mask for CHA events on Skylake Server perf/x86/intel/uncore: Fix IIO event constraints for Skylake Server tun: fix bonding active backup with arp monitoring hexagon: export raw I/O routines for modules mm: kmemleak: slob: respect SLAB_NOLEAKTRACE flag btrfs: fix memory ordering between normal and ordered work functions parisc/sticon: fix reverse colors cfg80211: call cfg80211_stop_ap when switch from P2P_GO type drm/udl: fix control-message timeout drm/amdgpu: fix set scaling mode Full/Full aspect/Center not works on vga and dvi connectors batman-adv: Keep fragments equally sized batman-adv: Fix own OGM check in aggregated OGMs batman-adv: mcast: fix duplicate mcast packets in BLA backbone from LAN batman-adv: mcast: fix duplicate mcast packets from BLA backbone to mesh batman-adv: Consider fragmentation for needed_headroom batman-adv: Reserve needed_*room for fragments batman-adv: Don't always reallocate the fragmentation skb head ASoC: DAPM: Cover regression by kctl change notification fix usb: max-3421: Use driver data instead of maintaining a list of bound devices soc/tegra: pmc: Fix imbalanced clock disabling in error code path Linux 4.9.291 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I23d798c10aebab1e51add60ccb34a8b289d49a4d
179 lines
4.5 KiB
C
179 lines
4.5 KiB
C
#include <linux/types.h>
|
|
#include <linux/i8253.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/irq.h>
|
|
#include <linux/smp.h>
|
|
#include <linux/time.h>
|
|
#include <linux/clockchips.h>
|
|
|
|
#include <asm/sni.h>
|
|
#include <asm/time.h>
|
|
|
|
#define SNI_CLOCK_TICK_RATE 3686400
|
|
#define SNI_COUNTER2_DIV 64
|
|
#define SNI_COUNTER0_DIV ((SNI_CLOCK_TICK_RATE / SNI_COUNTER2_DIV) / HZ)
|
|
|
|
static int a20r_set_periodic(struct clock_event_device *evt)
|
|
{
|
|
*(volatile u8 *)(A20R_PT_CLOCK_BASE + 12) = 0x34;
|
|
wmb();
|
|
*(volatile u8 *)(A20R_PT_CLOCK_BASE + 0) = SNI_COUNTER0_DIV & 0xff;
|
|
wmb();
|
|
*(volatile u8 *)(A20R_PT_CLOCK_BASE + 0) = SNI_COUNTER0_DIV >> 8;
|
|
wmb();
|
|
|
|
*(volatile u8 *)(A20R_PT_CLOCK_BASE + 12) = 0xb4;
|
|
wmb();
|
|
*(volatile u8 *)(A20R_PT_CLOCK_BASE + 8) = SNI_COUNTER2_DIV & 0xff;
|
|
wmb();
|
|
*(volatile u8 *)(A20R_PT_CLOCK_BASE + 8) = SNI_COUNTER2_DIV >> 8;
|
|
wmb();
|
|
return 0;
|
|
}
|
|
|
|
static struct clock_event_device a20r_clockevent_device = {
|
|
.name = "a20r-timer",
|
|
.features = CLOCK_EVT_FEAT_PERIODIC,
|
|
|
|
/* .mult, .shift, .max_delta_ns and .min_delta_ns left uninitialized */
|
|
|
|
.rating = 300,
|
|
.irq = SNI_A20R_IRQ_TIMER,
|
|
.set_state_periodic = a20r_set_periodic,
|
|
};
|
|
|
|
static irqreturn_t a20r_interrupt(int irq, void *dev_id)
|
|
{
|
|
struct clock_event_device *cd = dev_id;
|
|
|
|
*(volatile u8 *)A20R_PT_TIM0_ACK = 0;
|
|
wmb();
|
|
|
|
cd->event_handler(cd);
|
|
|
|
return IRQ_HANDLED;
|
|
}
|
|
|
|
static struct irqaction a20r_irqaction = {
|
|
.handler = a20r_interrupt,
|
|
.flags = IRQF_PERCPU | IRQF_TIMER,
|
|
.name = "a20r-timer",
|
|
};
|
|
|
|
/*
|
|
* a20r platform uses 2 counters to divide the input frequency.
|
|
* Counter 2 output is connected to Counter 0 & 1 input.
|
|
*/
|
|
static void __init sni_a20r_timer_setup(void)
|
|
{
|
|
struct clock_event_device *cd = &a20r_clockevent_device;
|
|
struct irqaction *action = &a20r_irqaction;
|
|
unsigned int cpu = smp_processor_id();
|
|
|
|
cd->cpumask = cpumask_of(cpu);
|
|
clockevents_register_device(cd);
|
|
action->dev_id = cd;
|
|
setup_irq(SNI_A20R_IRQ_TIMER, &a20r_irqaction);
|
|
}
|
|
|
|
#define SNI_8254_TICK_RATE 1193182UL
|
|
|
|
#define SNI_8254_TCSAMP_COUNTER ((SNI_8254_TICK_RATE / HZ) + 255)
|
|
|
|
static __init unsigned long dosample(void)
|
|
{
|
|
u32 ct0, ct1;
|
|
volatile u8 msb;
|
|
|
|
/* Start the counter. */
|
|
outb_p(0x34, 0x43);
|
|
outb_p(SNI_8254_TCSAMP_COUNTER & 0xff, 0x40);
|
|
outb(SNI_8254_TCSAMP_COUNTER >> 8, 0x40);
|
|
|
|
/* Get initial counter invariant */
|
|
ct0 = read_c0_count();
|
|
|
|
/* Latch and spin until top byte of counter0 is zero */
|
|
do {
|
|
outb(0x00, 0x43);
|
|
(void) inb(0x40);
|
|
msb = inb(0x40);
|
|
ct1 = read_c0_count();
|
|
} while (msb);
|
|
|
|
/* Stop the counter. */
|
|
outb(0x38, 0x43);
|
|
/*
|
|
* Return the difference, this is how far the r4k counter increments
|
|
* for every 1/HZ seconds. We round off the nearest 1 MHz of master
|
|
* clock (= 1000000 / HZ / 2).
|
|
*/
|
|
/*return (ct1 - ct0 + (500000/HZ/2)) / (500000/HZ) * (500000/HZ);*/
|
|
return (ct1 - ct0) / (500000/HZ) * (500000/HZ);
|
|
}
|
|
|
|
/*
|
|
* Here we need to calibrate the cycle counter to at least be close.
|
|
*/
|
|
void __init plat_time_init(void)
|
|
{
|
|
unsigned long r4k_ticks[3];
|
|
unsigned long r4k_tick;
|
|
|
|
/*
|
|
* Figure out the r4k offset, the algorithm is very simple and works in
|
|
* _all_ cases as long as the 8254 counter register itself works ok (as
|
|
* an interrupt driving timer it does not because of bug, this is why
|
|
* we are using the onchip r4k counter/compare register to serve this
|
|
* purpose, but for r4k_offset calculation it will work ok for us).
|
|
* There are other very complicated ways of performing this calculation
|
|
* but this one works just fine so I am not going to futz around. ;-)
|
|
*/
|
|
printk(KERN_INFO "Calibrating system timer... ");
|
|
dosample(); /* Prime cache. */
|
|
dosample(); /* Prime cache. */
|
|
/* Zero is NOT an option. */
|
|
do {
|
|
r4k_ticks[0] = dosample();
|
|
} while (!r4k_ticks[0]);
|
|
do {
|
|
r4k_ticks[1] = dosample();
|
|
} while (!r4k_ticks[1]);
|
|
|
|
if (r4k_ticks[0] != r4k_ticks[1]) {
|
|
printk("warning: timer counts differ, retrying... ");
|
|
r4k_ticks[2] = dosample();
|
|
if (r4k_ticks[2] == r4k_ticks[0]
|
|
|| r4k_ticks[2] == r4k_ticks[1])
|
|
r4k_tick = r4k_ticks[2];
|
|
else {
|
|
printk("disagreement, using average... ");
|
|
r4k_tick = (r4k_ticks[0] + r4k_ticks[1]
|
|
+ r4k_ticks[2]) / 3;
|
|
}
|
|
} else
|
|
r4k_tick = r4k_ticks[0];
|
|
|
|
printk("%d [%d.%04d MHz CPU]\n", (int) r4k_tick,
|
|
(int) (r4k_tick / (500000 / HZ)),
|
|
(int) (r4k_tick % (500000 / HZ)));
|
|
|
|
mips_hpt_frequency = r4k_tick * HZ;
|
|
|
|
switch (sni_brd_type) {
|
|
case SNI_BRD_10:
|
|
case SNI_BRD_10NEW:
|
|
case SNI_BRD_TOWER_OASIC:
|
|
case SNI_BRD_MINITOWER:
|
|
sni_a20r_timer_setup();
|
|
break;
|
|
}
|
|
setup_pit_timer();
|
|
}
|
|
|
|
void read_persistent_clock(struct timespec *ts)
|
|
{
|
|
ts->tv_sec = -1;
|
|
ts->tv_nsec = 0;
|
|
}
|