Merge 4.9.264 into android-4.9-q
Linux 4.9.264
xen-blkback: don't leak persistent grants from xen_blkbk_map()
mac80211: fix double free in ibss_leave
net: qrtr: fix a kernel-infoleak in qrtr_recvmsg()
net: sched: validate stab values
* can: dev: Move device back to init netns on owning netns delete
include/net/rtnetlink.h
net/core/dev.c
* futex: Handle transient "ownerless" rtmutex state correctly
kernel/futex.c
* futex: Fix incorrect should_fail_futex() handling
kernel/futex.c
* futex: Prevent robust futex exit race
kernel/futex.c
* arm64: futex: Bound number of LDXR/STXR loops in FUTEX_WAKE_OP
arch/arm64/include/asm/futex.h
* locking/futex: Allow low-level atomic operations to return -EAGAIN
kernel/futex.c
* futex: Fix (possible) missed wakeup
kernel/futex.c
* futex: Handle early deadlock return correctly
kernel/futex.c
kernel/locking/rtmutex.c
* futex,rt_mutex: Fix rt_mutex_cleanup_proxy_lock()
kernel/locking/rtmutex.c
* futex: Avoid freeing an active timer
kernel/futex.c
* futex: Drop hb->lock before enqueueing on the rtmutex
kernel/futex.c
kernel/locking/rtmutex.c
kernel/locking/rtmutex_common.h
* futex: Rework futex_lock_pi() to use rt_mutex_*_proxy_lock()
kernel/futex.c
kernel/locking/rtmutex.c
kernel/locking/rtmutex_common.h
* futex,rt_mutex: Introduce rt_mutex_init_waiter()
kernel/futex.c
kernel/locking/rtmutex.c
kernel/locking/rtmutex_common.h
* futex: Use smp_store_release() in mark_wake_futex()
kernel/futex.c
* idr: add ida_is_empty
drivers/usb/gadget/function/f_hid.c
include/linux/idr.h
perf auxtrace: Fix auxtrace queue conflict
ACPI: scan: Use unique number for instance_no
ACPI: scan: Rearrange memory allocation in acpi_device_add()
RDMA/cxgb4: Fix adapter LE hash errors while destroying ipv6 listening server
net: cdc-phonet: fix data-interface release on probe failure
mac80211: fix rate mask reset
can: m_can: m_can_do_rx_poll(): fix extraneous msg loss warning
can: c_can: move runtime PM enable/disable to c_can_platform
can: c_can_pci: c_can_pci_remove(): fix use-after-free
net/qlcnic: Fix a use after free in qlcnic_83xx_get_minidump_template
e1000e: Fix error handling in e1000_set_d0_lplu_state_82571
e1000e: add rtnl_lock() to e1000_reset_task
net: dsa: bcm_sf2: Qualify phydev->dev_flags based on port
* macvlan: macvlan_count_rx() needs to be aware of preemption
include/linux/if_macvlan.h
bus: omap_l3_noc: mark l3 irqs as IRQF_NO_THREAD
arm64: dts: ls1043a: mark crypto engine dma coherent
squashfs: fix xattr id and id lookup sanity checks
* squashfs: fix inode lookup sanity checks
fs/squashfs/squashfs_fs.h
x86/tlb: Flush global mappings when KAISER is disabled
ia64: fix ptrace(PTRACE_SYSCALL_INFO_EXIT) sign
ia64: fix ia64_syscall_get_set_arguments() for break-based syscalls
nfs: we don't support removing system.nfs4_acl
* u64_stats,lockdep: Fix u64_stats_init() vs lockdep
include/linux/u64_stats_sync.h
atm: idt77252: fix null-ptr-dereference
atm: uPD98402: fix incorrect allocation
net: wan: fix error return code of uhdlc_init()
NFS: Correct size calculation for create reply length
* nfs: fix PNFS_FLEXFILE_LAYOUT Kconfig default
fs/nfs/Kconfig
sun/niu: fix wrong RXMAC_BC_FRM_CNT_COUNT count
net: tehuti: fix error return code in bdx_probe()
ixgbe: Fix memleak in ixgbe_configure_clsu32
atm: lanai: dont run lanai_dev_close if not open
atm: eni: dont release is never initialized
powerpc/4xx: Fix build errors from mfdcr()
net: fec: ptp: avoid register access when ipg clock is disabled
ANDROID: Make vsock virtio packet buff size configurable
Merge 4.9.263 into android-4.9-q
Linux 4.9.263
* genirq: Disable interrupts for force threaded handlers
kernel/irq/manage.c
* ext4: fix potential error in ext4_do_update_inode
fs/ext4/inode.c
* ext4: find old entry again if failed to rename whiteout
fs/ext4/namei.c
x86: Introduce TS_COMPAT_RESTART to fix get_nr_restart_syscall()
x86: Move TS_COMPAT back to asm/thread_info.h
* kernel, fs: Introduce and use set_restart_fn() and arch_set_restart_data()
fs/select.c
include/linux/thread_info.h
kernel/futex.c
kernel/time/alarmtimer.c
kernel/time/hrtimer.c
kernel/time/posix-cpu-timers.c
x86/ioapic: Ignore IRQ2 again
perf/x86/intel: Fix a crash caused by zero PEBS status
PCI: rpadlpar: Fix potential drc_name corruption in store functions
iio: adis16400: Fix an error code in adis16400_initial_setup()
* usb: gadget: configfs: Fix KASAN use-after-free
drivers/usb/gadget/configfs.c
* USB: replace hardcode maximum usb string length by definition
drivers/usb/gadget/composite.c
drivers/usb/gadget/configfs.c
drivers/usb/gadget/usbstring.c
include/uapi/linux/usb/ch9.h
scsi: lpfc: Fix some error codes in debugfs
net/qrtr: fix __netdev_alloc_skb call
sunrpc: fix refcount leak for rpc auth modules
svcrdma: disable timeouts on rdma backchannel
NFSD: Repair misuse of sv_lock in 5.10.16-rt30.
nvmet: don't check iosqes,iocqes for discovery controllers
btrfs: fix race when cloning extent buffer during rewind of an old root
ixgbe: prevent ptp_rx_hang from running when in FILTER_ALL mode
ixgbe: check for Tx timestamp timeouts during watchdog
net: dsa: b53: Support setting learning on port
* ext4: check journal inode extents more carefully
fs/ext4/block_validity.c
fs/ext4/ext4.h
fs/ext4/extents.c
fs/ext4/indirect.c
fs/ext4/inode.c
fs/ext4/mballoc.c
* ext4: don't allow overlapping system zones
fs/ext4/block_validity.c
* ext4: handle error of ext4_setup_system_zone() on remount
fs/ext4/super.c
Merge 4.9.262 into android-4.9-q
* FROMGIT: configfs: fix a use-after-free in __configfs_open_file
fs/configfs/file.c
Linux 4.9.262
xen/events: avoid handling the same event on two cpus at the same time
xen/events: don't unmask an event channel when an eoi is pending
xen/events: reset affinity of 2-level event when tearing it down
iio: imu: adis16400: fix memory leak
iio: imu: adis16400: release allocated memory on failure
KVM: arm64: Fix exclusive limit for IPA size
hwmon: (lm90) Fix max6658 sporadic wrong temperature reading
binfmt_misc: fix possible deadlock in bm_register_write
powerpc/64s: Fix instruction encoding for lis in ppc_function_entry()
alpha: switch __copy_user() and __do_clean_user() to normal calling conventions
alpha: Package string routines together
alpha: make short build log available for division routines
alpha: merge build rules of division routines
alpha: add $(src)/ rather than $(obj)/ to make source file path
* configfs: fix a use-after-free in __configfs_open_file
fs/configfs/file.c
block: rsxx: fix error return code of rsxx_pci_probe()
NFSv4.2: fix return value of _nfs4_get_security_label()
sh_eth: fix TRSCER mask for R7S72100
staging: comedi: pcl818: Fix endian problem for AI command data
staging: comedi: pcl711: Fix endian problem for AI command data
staging: comedi: me4000: Fix endian problem for AI command data
staging: comedi: dmm32at: Fix endian problem for AI command data
staging: comedi: das800: Fix endian problem for AI command data
staging: comedi: das6402: Fix endian problem for AI command data
staging: comedi: adv_pci1710: Fix endian problem for AI command data
staging: comedi: addi_apci_1500: Fix endian problem for command sample
staging: comedi: addi_apci_1032: Fix endian problem for COS sample
staging: rtl8192e: Fix possible buffer overflow in _rtl92e_wx_set_scan
staging: rtl8712: Fix possible buffer overflow in r8712_sitesurvey_cmd
staging: ks7010: prevent buffer overflow in ks_wlan_set_scan()
staging: rtl8188eu: fix potential memory corruption in rtw_check_beacon_data()
staging: rtl8712: unterminated string leads to read overflow
staging: rtl8188eu: prevent ->ssid overflow in rtw_wx_set_scan()
staging: rtl8192u: fix ->ssid overflow in r8192_wx_set_scan()
usbip: fix vhci_hcd attach_store() races leading to gpf
usbip: fix stub_dev usbip_sockfd_store() races leading to gpf
usbip: fix vudc to check for stream socket
usbip: fix vhci_hcd to check for stream socket
usbip: fix stub_dev to check for stream socket
USB: serial: cp210x: add some more GE USB IDs
USB: serial: cp210x: add ID for Acuity Brands nLight Air Adapter
USB: serial: ch341: add new Product ID
USB: serial: io_edgeport: fix memory leak in edge_startup
* xhci: Improve detection of device initiated wake signal.
drivers/usb/host/xhci.c
usb: renesas_usbhs: Clear PIPECFG for re-enabling pipe with other EPNUM
usb: gadget: f_uac2: always increase endpoint max_packet_size by one audio slot
Goodix Fingerprint device is not a modem
scripts/recordmcount.{c,pl}: support -ffunction-sections .text.* section names
* mmc: core: Fix partition switch time for eMMC
drivers/mmc/core/mmc.c
s390/dasd: fix hanging DASD driver unbind
* ALSA: usb-audio: Fix "cannot get freq eq" errors on Dell AE515 sound bar
sound/usb/quirks.c
ALSA: hda: Avoid spurious unsol event handling during S3/S4
ALSA: hda/hdmi: Cancel pending works before suspend
scsi: libiscsi: Fix iscsi_prep_scsi_cmd_pdu() error handling
s390/smp: __smp_rescan_cpus() - move cpumask away from stack
PCI: xgene-msi: Fix race in installing chained irq handler
powerpc/perf: Record counter overflow always if SAMPLE_IP is unset
mmc: mediatek: fix race condition between msdc_request_timeout and irq
mmc: mxs-mmc: Fix a resource leak in an error handling path in 'mxs_mmc_probe()'
udf: fix silent AED tagLocation corruption
media: usbtv: Fix deadlock on suspend
net: davicom: Fix regulator not turned off on driver removal
net: davicom: Fix regulator not turned off on failed probe
net: lapbether: Remove netif_start_queue / netif_stop_queue
* net: sched: avoid duplicates in classes dump
net/sched/sch_api.c
net/mlx4_en: update moderation when config reset
* Revert "mm, slub: consider rest of partial list if acquire_slab() fails"
mm/slub.c
cifs: return proper error code in statfs(2)
* netfilter: x_tables: gpf inside xt_find_revision()
net/netfilter/x_tables.c
can: flexcan: enable RX FIFO after FRZ/HALT valid
can: flexcan: assert FRZ bit in flexcan_chip_freeze()
can: skb: can_skb_set_owner(): fix ref counting if socket was closed before setting skb ownership
net: avoid infinite loop in mpls_gso_segment when mpls_hlen == 0
* net: Fix gro aggregation for udp encaps with zero csum
net/ipv4/udp_offload.c
ath9k: fix transmitting to stations in dynamic SMPS mode
ethernet: alx: fix order of calls on resume
uapi: nfnetlink_cthelper.h: fix userspace compilation error
Merge 4.9.261 into android-4.9-q
Linux 4.9.261
misc: eeprom_93xx46: Add quirk to support Microchip 93LC46B eeprom
* PCI: Add function 1 DMA alias quirk for Marvell 9215 SATA controller
drivers/pci/quirks.c
platform/x86: acer-wmi: Add new force_caps module parameter
iommu/amd: Fix sleeping in atomic in increase_address_space()
* dm table: fix DAX iterate_devices based device capability checks
drivers/md/dm-table.c
* dm table: fix iterate_devices based device capability checks
drivers/md/dm-table.c
rsxx: Return -EFAULT if copy_to_user() fails
ALSA: ctxfi: cthw20k2: fix mask on conf to allow 4 bits
usbip: tools: fix build error for multiple definition
btrfs: fix raid6 qstripe kmap
btrfs: raid56: simplify tracking of Q stripe presence
Merge 4.9.260 into android-4.9-q
Linux 4.9.260
* media: v4l: ioctl: Fix memory leak in video_usercopy
drivers/media/v4l2-core/v4l2-ioctl.c
* swap: fix swapfile read/write offset
mm/page_io.c
mm/swapfile.c
* zsmalloc: account the number of compacted pages correctly
drivers/block/zram/zram_drv.c
include/linux/zsmalloc.h
mm/zsmalloc.c
xen-netback: respect gnttab_map_refs()'s return value
Xen/gnttab: handle p2m update errors on a per-slot basis
scsi: iscsi: Verify lengths on passthrough PDUs
scsi: iscsi: Ensure sysfs attributes are limited to PAGE_SIZE
* sysfs: Add sysfs_emit and sysfs_emit_at to format sysfs output
fs/sysfs/file.c
include/linux/sysfs.h
scsi: iscsi: Restrict sessions and handles to admin capabilities
media: uvcvideo: Allow entities with no pads
staging: most: sound: add sanity check for function argument
* Bluetooth: Fix null pointer dereference in amp_read_loc_assoc_final_data
net/bluetooth/amp.c
x86/build: Treat R_386_PLT32 relocation as R_386_PC32
ath10k: fix wmi mgmt tx queue full due to race condition
pktgen: fix misuse of BUG_ON() in pktgen_thread_worker()
wlcore: Fix command execute failure 19 for wl12xx
* vt/consolemap: do font sum unsigned
drivers/tty/vt/consolemap.c
x86/reboot: Add Zotac ZBOX CI327 nano PCI reboot quirk
staging: fwserial: Fix error handling in fwserial_create
mm/hugetlb.c: fix unnecessary address expansion of pmd sharing
* net: fix up truesize of cloned skb in skb_prepare_for_shift()
net/core/skbuff.c
* smackfs: restrict bytes count in smackfs write functions
security/smack/smackfs.c
xfs: Fix assert failure in xfs_setattr_size()
JFS: more checks for invalid superblock
* arm64: Use correct ll/sc atomic constraints
arch/arm64/include/asm/atomic_ll_sc.h
* arm64: cmpxchg: Use "K" instead of "L" for ll/sc immediate constraint
arch/arm64/include/asm/atomic_ll_sc.h
* arm64: Avoid redundant type conversions in xchg() and cmpxchg()
arch/arm64/include/asm/atomic_ll_sc.h
arch/arm64/include/asm/cmpxchg.h
* arm64: Remove redundant mov from LL/SC cmpxchg
arch/arm64/include/asm/atomic_ll_sc.h
printk: fix deadlock when kernel panic
hugetlb: fix update_and_free_page contig page struct assumption
* scripts: set proper OpenSSL include dir also for sign-file
scripts/Makefile
* scripts: use pkg-config to locate libcrypto
scripts/Makefile
arm: kprobes: Allow to handle reentered kprobe on single-stepping
net: usb: qmi_wwan: support ZTE P685M modem
* futex: Don't enable IRQs unconditionally in put_pi_state()
kernel/futex.c
* futex: Fix more put_pi_state() vs. exit_pi_state_list() races
kernel/futex.c
* futex: Fix pi_state->owner serialization
kernel/futex.c
* futex: Futex_unlock_pi() determinism
kernel/futex.c
* futex: Pull rt_mutex_futex_unlock() out from under hb->lock
kernel/futex.c
* futex: Cleanup refcounting
kernel/futex.c
* futex: Cleanup variable names for futex_top_waiter()
kernel/futex.c
Merge 4.9.259 into android-4.9-q
Linux 4.9.259
dm era: Update in-core bitset after committing the metadata
* net: icmp: pass zeroed opts from icmp{,v6}_ndo_send before sending
include/linux/icmpv6.h
include/linux/ipv6.h
include/net/icmp.h
net/ipv4/icmp.c
net/ipv6/icmp.c
net/ipv6/ip6_icmp.c
* ipv6: silence compilation warning for non-IPV6 builds
include/linux/icmpv6.h
* ipv6: icmp6: avoid indirect call for icmpv6_send()
include/linux/icmpv6.h
net/ipv6/icmp.c
net/ipv6/ip6_icmp.c
sunvnet: use icmp_ndo_send helper
gtp: use icmp_ndo_send helper
* icmp: allow icmpv6_ndo_send to work with CONFIG_IPV6=n
include/linux/icmpv6.h
* icmp: introduce helper for nat'd source address in network device context
include/linux/icmpv6.h
include/net/icmp.h
net/ipv4/icmp.c
net/ipv6/ip6_icmp.c
* futex: fix dead code in attach_to_pi_owner()
kernel/futex.c
* futex: Fix OWNER_DEAD fixup
kernel/futex.c
dm era: only resize metadata in preresume
dm era: Reinitialize bitset cache before digesting a new writeset
dm era: Use correct value size in equality function of writeset tree
dm era: Fix bitset memory leaks
dm era: Verify the data block size hasn't changed
dm era: Recover committed writeset after crash
gfs2: Don't skip dlm unlock if glock has an lvb
sparc32: fix a user-triggerable oops in clear_user()
* f2fs: fix out-of-repair __setattr_copy()
fs/f2fs/file.c
gpio: pcf857x: Fix missing first interrupt
mmc: sdhci-esdhc-imx: fix kernel panic when remove module
* module: Ignore _GLOBAL_OFFSET_TABLE_ when warning for undefined symbols
kernel/module.c
libnvdimm/dimm: Avoid race between probe and available_slots_show()
usb: renesas_usbhs: Clear pipe running flag in usbhs_pkt_pop()
mm: hugetlb: fix a race between freeing and dissolving the page
mtd: spi-nor: hisi-sfc: Put child node np on error path
floppy: reintroduce O_NDELAY fix
x86/reboot: Force all cpus to exit VMX root if VMX is supported
staging: rtl8188eu: Add Edimax EW-7811UN V2 to device table
drivers/misc/vmw_vmci: restrict too big queue size in qp_host_alloc_queue
* seccomp: Add missing return in non-void function
kernel/seccomp.c
btrfs: fix extent buffer leak on failure to copy root
btrfs: fix reloc root leak with 0 ref reloc roots on recovery
btrfs: abort the transaction if we fail to inc ref in btrfs_copy_root
KEYS: trusted: Fix migratable=1 failing
* usb: dwc3: gadget: Fix dep->interval for fullspeed interrupt
drivers/usb/dwc3/gadget.c
* usb: dwc3: gadget: Fix setting of DEPCFG.bInterval_m1
drivers/usb/dwc3/gadget.c
USB: serial: mos7720: fix error code in mos7720_write()
USB: serial: mos7840: fix error code in mos7840_write()
usb: musb: Fix runtime PM race in musb_queue_resume_work
USB: serial: option: update interface mapping for ZTE P685M
Input: i8042 - add ASUS Zenbook Flip to noselftest list
Input: joydev - prevent potential read overflow in ioctl
* Input: xpad - add support for PowerA Enhanced Wired Controller for Xbox Series X|S
drivers/input/joystick/xpad.c
Input: raydium_ts_i2c - do not send zero length
ACPI: configfs: add missing check after configfs_register_default_group()
* blk-settings: align max_sectors on "logical_block_size" boundary
block/blk-settings.c
* scsi: bnx2fc: Fix Kconfig warning & CNIC build errors
drivers/scsi/bnx2fc/Kconfig
i2c: brcmstb: Fix brcmstd_send_i2c_cmd condition
* arm64: Add missing ISB after invalidating TLB in __primary_switch
arch/arm64/kernel/head.S
mm/hugetlb: fix potential double free in hugetlb_register_node() error path
* mm/memory.c: fix potential pte_unmap_unlock pte error
mm/memory.c
ocfs2: fix a use after free on error
net/mlx4_core: Add missed mlx4_free_cmd_mailbox()
i40e: Fix flow for IPv6 next header (extension header)
drm/msm/dsi: Correct io_start for MSM8994 (20nm PHY)
* PCI: Align checking of syscall user config accessors
drivers/pci/syscall.c
VMCI: Use set_page_dirty_lock() when unregistering guest memory
pwm: rockchip: rockchip_pwm_probe(): Remove superfluous clk_unprepare()
misc: eeprom_93xx46: Add module alias to avoid breaking support for non device tree users
misc: eeprom_93xx46: Fix module alias to enable module autoprobe
sparc64: only select COMPAT_BINFMT_ELF if BINFMT_ELF is set
Input: elo - fix an error code in elo_connect()
perf test: Fix unaligned access in sample parsing test
perf intel-pt: Fix missing CYC processing in PSB
spi: pxa2xx: Fix the controller numbering for Wildcat Point
powerpc/pseries/dlpar: handle ibm, configure-connector delay status
mfd: wm831x-auxadc: Prevent use after free in wm831x_auxadc_read_irq()
RDMA/rxe: Fix coding error in rxe_recv.c
perf tools: Fix DSO filtering when not finding a map for a sampled address
* tracepoint: Do not fail unregistering a probe due to memory failure
kernel/tracepoint.c
* amba: Fix resource leak for drivers without .remove
drivers/amba/bus.c
ARM: 9046/1: decompressor: Do not clear SCTLR.nTLSMD for ARMv7+ cores
mmc: usdhi6rol0: Fix a resource leak in the error handling path of the probe
powerpc/47x: Disable 256k page size
IB/umad: Return EIO in case of when device disassociated
isofs: release buffer head before return
regulator: axp20x: Fix reference cout leak
clocksource/drivers/mxs_timer: Add missing semicolon when DEBUG is defined
power: reset: at91-sama5d2_shdwc: fix wkupdbc mask
* of/fdt: Make sure no-map does not remove already reserved regions
drivers/of/fdt.c
* fdt: Properly handle "no-map" field in the memory region
drivers/of/fdt.c
dmaengine: fsldma: Fix a resource leak in an error handling path of the probe function
dmaengine: fsldma: Fix a resource leak in the remove function
* HID: core: detect and skip invalid inputs to snto32()
drivers/hid/hid-core.c
spi: cadence-quadspi: Abort read if dummy cycles required are too many
clk: meson: clk-pll: fix initializing the old rate (fallback) for a PLL
jffs2: fix use after free in jffs2_sum_write_data()
fs/jfs: fix potential integer overflow on shift of a int
crypto: ecdh_helper - Ensure 'len >= secret.len' in decode_key()
btrfs: clarify error returns values in __load_free_space_cache
ata: ahci_brcm: Add back regulators management
media: uvcvideo: Accept invalid bFormatIndex and bFrameIndex values
media: pxa_camera: declare variable when DEBUG is defined
media: cx25821: Fix a bug when reallocating some dma memory
media: qm1d1c0042: fix error return code in qm1d1c0042_init()
media: lmedm04: Fix misuse of comma
ASoC: cs42l56: fix up error handling in probe
media: tm6000: Fix memleak in tm6000_start_stream
media: media/pci: Fix memleak in empress_init
media: vsp1: Fix an error handling path in the probe function
MIPS: lantiq: Explicitly compare LTQ_EBU_PCC_ISTAT against 0
MIPS: c-r4k: Fix section mismatch for loongson2_sc_init
gma500: clean up error handling in init
drm/gma500: Fix error return code in psb_driver_load()
* fbdev: aty: SPARC64 requires FB_ATY_CT
drivers/video/fbdev/Kconfig
b43: N-PHY: Fix the update of coef for the PHY revision >= 3case
mac80211: fix potential overflow when multiplying to u32 integers
xen/netback: fix spurious event detection for common event case
bnxt_en: reverse order of TX disable and carrier off
ARM: s3c: fix fiq for clang IAS
arm64: dts: msm8916: Fix reserved and rfsa nodes unit address
usb: dwc2: Make "trimming xfer length" a debug message
usb: dwc2: Abort transaction after errors with unknown reason
usb: dwc2: Do not update data length if it is 0 on inbound transfers
ARM: dts: Configure missing thermal interrupt for 4430
* Bluetooth: Put HCI device if inquiry procedure interrupts
net/bluetooth/hci_core.c
* Bluetooth: drop HCI device reference before return
net/bluetooth/a2mp.c
arm64: dts: exynos: correct PMIC interrupt trigger level on Espresso
ARM: dts: exynos: correct PMIC interrupt trigger level on Arndale Octa
ARM: dts: exynos: correct PMIC interrupt trigger level on Spring
* Bluetooth: Fix initializing response id after clearing struct
net/bluetooth/a2mp.c
mm, thp: make do_huge_pmd_wp_page() lock page for testing mapcount
* random: fix the RNDRESEEDCRNG ioctl
drivers/char/random.c
MIPS: vmlinux.lds.S: add missing PAGE_ALIGNED_DATA() section
* kdb: Make memory allocations more robust
kernel/debug/kdb/kdb_private.h
scripts/recordmcount.pl: support big endian for ARCH sh
cifs: Set CIFS_MOUNT_USE_PREFIX_PATH flag on setting cifs_sb->prepath.
NET: usb: qmi_wwan: Adding support for Cinterion MV31
arm64: tegra: Add power-domain for Tegra210 HDA
igb: Remove incorrect "unexpected SYS WRAP" log message
ntfs: check for valid standard information attribute
* usb: quirks: add quirk to start video capture on ELMO L-12F document camera reliable
drivers/usb/core/quirks.c
* HID: make arrays usage and value to be the same
drivers/hid/hid-core.c
Bug: 184596728
Change-Id: I50e867d3e8d2d62938b73e54b8d6e614bb3f2d1b
Signed-off-by: Lucas Wei <lucaswei@google.com>
925 lines
22 KiB
C
925 lines
22 KiB
C
/*
|
|
* Alarmtimer interface
|
|
*
|
|
* This interface provides a timer which is similarto hrtimers,
|
|
* but triggers a RTC alarm if the box is suspend.
|
|
*
|
|
* This interface is influenced by the Android RTC Alarm timer
|
|
* interface.
|
|
*
|
|
* Copyright (C) 2010 IBM Corperation
|
|
*
|
|
* Author: John Stultz <john.stultz@linaro.org>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
#include <linux/delay.h>
|
|
#include <linux/time.h>
|
|
#include <linux/hrtimer.h>
|
|
#include <linux/timerqueue.h>
|
|
#include <linux/rtc.h>
|
|
#include <linux/alarmtimer.h>
|
|
#include <linux/mutex.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/posix-timers.h>
|
|
#include <linux/workqueue.h>
|
|
#include <linux/freezer.h>
|
|
|
|
/**
|
|
* struct alarm_base - Alarm timer bases
|
|
* @lock: Lock for syncrhonized access to the base
|
|
* @timerqueue: Timerqueue head managing the list of events
|
|
* @gettime: Function to read the time correlating to the base
|
|
* @base_clockid: clockid for the base
|
|
*/
|
|
static struct alarm_base {
|
|
spinlock_t lock;
|
|
struct timerqueue_head timerqueue;
|
|
ktime_t (*gettime)(void);
|
|
clockid_t base_clockid;
|
|
} alarm_bases[ALARM_NUMTYPE];
|
|
|
|
/* freezer delta & lock used to handle clock_nanosleep triggered wakeups */
|
|
static ktime_t freezer_delta;
|
|
static DEFINE_SPINLOCK(freezer_delta_lock);
|
|
|
|
static struct wakeup_source *ws;
|
|
|
|
#ifdef CONFIG_RTC_CLASS
|
|
/* rtc timer and device for setting alarm wakeups at suspend */
|
|
static struct rtc_timer rtctimer;
|
|
static struct rtc_device *rtcdev;
|
|
static DEFINE_SPINLOCK(rtcdev_lock);
|
|
|
|
static void alarmtimer_triggered_func(void *p)
|
|
{
|
|
struct rtc_device *rtc = rtcdev;
|
|
|
|
if (!(rtc->irq_data & RTC_AF))
|
|
return;
|
|
__pm_wakeup_event(ws, 2 * MSEC_PER_SEC);
|
|
}
|
|
|
|
static struct rtc_task alarmtimer_rtc_task = {
|
|
.func = alarmtimer_triggered_func
|
|
};
|
|
/**
|
|
* alarmtimer_get_rtcdev - Return selected rtcdevice
|
|
*
|
|
* This function returns the rtc device to use for wakealarms.
|
|
* If one has not already been chosen, it checks to see if a
|
|
* functional rtc device is available.
|
|
*/
|
|
struct rtc_device *alarmtimer_get_rtcdev(void)
|
|
{
|
|
unsigned long flags;
|
|
struct rtc_device *ret = NULL;
|
|
|
|
spin_lock_irqsave(&rtcdev_lock, flags);
|
|
ret = rtcdev;
|
|
spin_unlock_irqrestore(&rtcdev_lock, flags);
|
|
|
|
return ret;
|
|
}
|
|
EXPORT_SYMBOL_GPL(alarmtimer_get_rtcdev);
|
|
|
|
static int alarmtimer_rtc_add_device(struct device *dev,
|
|
struct class_interface *class_intf)
|
|
{
|
|
unsigned long flags;
|
|
int err = 0;
|
|
struct rtc_device *rtc = to_rtc_device(dev);
|
|
if (rtcdev)
|
|
return -EBUSY;
|
|
if (!rtc->ops->set_alarm)
|
|
return -1;
|
|
|
|
spin_lock_irqsave(&rtcdev_lock, flags);
|
|
if (!rtcdev) {
|
|
err = rtc_irq_register(rtc, &alarmtimer_rtc_task);
|
|
if (err)
|
|
goto rtc_irq_reg_err;
|
|
rtcdev = rtc;
|
|
/* hold a reference so it doesn't go away */
|
|
get_device(dev);
|
|
}
|
|
|
|
rtc_irq_reg_err:
|
|
spin_unlock_irqrestore(&rtcdev_lock, flags);
|
|
return err;
|
|
|
|
}
|
|
|
|
static void alarmtimer_rtc_remove_device(struct device *dev,
|
|
struct class_interface *class_intf)
|
|
{
|
|
if (rtcdev && dev == &rtcdev->dev) {
|
|
rtc_irq_unregister(rtcdev, &alarmtimer_rtc_task);
|
|
rtcdev = NULL;
|
|
}
|
|
}
|
|
|
|
static inline void alarmtimer_rtc_timer_init(void)
|
|
{
|
|
rtc_timer_init(&rtctimer, NULL, NULL);
|
|
}
|
|
|
|
static struct class_interface alarmtimer_rtc_interface = {
|
|
.add_dev = &alarmtimer_rtc_add_device,
|
|
.remove_dev = &alarmtimer_rtc_remove_device,
|
|
};
|
|
|
|
static int alarmtimer_rtc_interface_setup(void)
|
|
{
|
|
alarmtimer_rtc_interface.class = rtc_class;
|
|
return class_interface_register(&alarmtimer_rtc_interface);
|
|
}
|
|
static void alarmtimer_rtc_interface_remove(void)
|
|
{
|
|
class_interface_unregister(&alarmtimer_rtc_interface);
|
|
}
|
|
#else
|
|
struct rtc_device *alarmtimer_get_rtcdev(void)
|
|
{
|
|
return NULL;
|
|
}
|
|
#define rtcdev (NULL)
|
|
static inline int alarmtimer_rtc_interface_setup(void) { return 0; }
|
|
static inline void alarmtimer_rtc_interface_remove(void) { }
|
|
static inline void alarmtimer_rtc_timer_init(void) { }
|
|
#endif
|
|
|
|
/**
|
|
* alarmtimer_enqueue - Adds an alarm timer to an alarm_base timerqueue
|
|
* @base: pointer to the base where the timer is being run
|
|
* @alarm: pointer to alarm being enqueued.
|
|
*
|
|
* Adds alarm to a alarm_base timerqueue
|
|
*
|
|
* Must hold base->lock when calling.
|
|
*/
|
|
static void alarmtimer_enqueue(struct alarm_base *base, struct alarm *alarm)
|
|
{
|
|
if (alarm->state & ALARMTIMER_STATE_ENQUEUED)
|
|
timerqueue_del(&base->timerqueue, &alarm->node);
|
|
|
|
timerqueue_add(&base->timerqueue, &alarm->node);
|
|
alarm->state |= ALARMTIMER_STATE_ENQUEUED;
|
|
}
|
|
|
|
/**
|
|
* alarmtimer_dequeue - Removes an alarm timer from an alarm_base timerqueue
|
|
* @base: pointer to the base where the timer is running
|
|
* @alarm: pointer to alarm being removed
|
|
*
|
|
* Removes alarm to a alarm_base timerqueue
|
|
*
|
|
* Must hold base->lock when calling.
|
|
*/
|
|
static void alarmtimer_dequeue(struct alarm_base *base, struct alarm *alarm)
|
|
{
|
|
if (!(alarm->state & ALARMTIMER_STATE_ENQUEUED))
|
|
return;
|
|
|
|
timerqueue_del(&base->timerqueue, &alarm->node);
|
|
alarm->state &= ~ALARMTIMER_STATE_ENQUEUED;
|
|
}
|
|
|
|
|
|
/**
|
|
* alarmtimer_fired - Handles alarm hrtimer being fired.
|
|
* @timer: pointer to hrtimer being run
|
|
*
|
|
* When a alarm timer fires, this runs through the timerqueue to
|
|
* see which alarms expired, and runs those. If there are more alarm
|
|
* timers queued for the future, we set the hrtimer to fire when
|
|
* when the next future alarm timer expires.
|
|
*/
|
|
static enum hrtimer_restart alarmtimer_fired(struct hrtimer *timer)
|
|
{
|
|
struct alarm *alarm = container_of(timer, struct alarm, timer);
|
|
struct alarm_base *base = &alarm_bases[alarm->type];
|
|
unsigned long flags;
|
|
int ret = HRTIMER_NORESTART;
|
|
int restart = ALARMTIMER_NORESTART;
|
|
|
|
spin_lock_irqsave(&base->lock, flags);
|
|
alarmtimer_dequeue(base, alarm);
|
|
spin_unlock_irqrestore(&base->lock, flags);
|
|
|
|
if (alarm->function)
|
|
restart = alarm->function(alarm, base->gettime());
|
|
|
|
spin_lock_irqsave(&base->lock, flags);
|
|
if (restart != ALARMTIMER_NORESTART) {
|
|
hrtimer_set_expires(&alarm->timer, alarm->node.expires);
|
|
alarmtimer_enqueue(base, alarm);
|
|
ret = HRTIMER_RESTART;
|
|
}
|
|
spin_unlock_irqrestore(&base->lock, flags);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
ktime_t alarm_expires_remaining(const struct alarm *alarm)
|
|
{
|
|
struct alarm_base *base = &alarm_bases[alarm->type];
|
|
return ktime_sub(alarm->node.expires, base->gettime());
|
|
}
|
|
EXPORT_SYMBOL_GPL(alarm_expires_remaining);
|
|
|
|
#ifdef CONFIG_RTC_CLASS
|
|
/**
|
|
* alarmtimer_suspend - Suspend time callback
|
|
* @dev: unused
|
|
* @state: unused
|
|
*
|
|
* When we are going into suspend, we look through the bases
|
|
* to see which is the soonest timer to expire. We then
|
|
* set an rtc timer to fire that far into the future, which
|
|
* will wake us from suspend.
|
|
*/
|
|
static int alarmtimer_suspend(struct device *dev)
|
|
{
|
|
struct rtc_time tm;
|
|
ktime_t min, now;
|
|
unsigned long flags;
|
|
struct rtc_device *rtc;
|
|
int i;
|
|
int ret;
|
|
|
|
spin_lock_irqsave(&freezer_delta_lock, flags);
|
|
min = freezer_delta;
|
|
freezer_delta = ktime_set(0, 0);
|
|
spin_unlock_irqrestore(&freezer_delta_lock, flags);
|
|
|
|
rtc = alarmtimer_get_rtcdev();
|
|
/* If we have no rtcdev, just return */
|
|
if (!rtc)
|
|
return 0;
|
|
|
|
/* Find the soonest timer to expire*/
|
|
for (i = 0; i < ALARM_NUMTYPE; i++) {
|
|
struct alarm_base *base = &alarm_bases[i];
|
|
struct timerqueue_node *next;
|
|
ktime_t delta;
|
|
|
|
spin_lock_irqsave(&base->lock, flags);
|
|
next = timerqueue_getnext(&base->timerqueue);
|
|
spin_unlock_irqrestore(&base->lock, flags);
|
|
if (!next)
|
|
continue;
|
|
delta = ktime_sub(next->expires, base->gettime());
|
|
if (!min.tv64 || (delta.tv64 < min.tv64))
|
|
min = delta;
|
|
}
|
|
if (min.tv64 == 0)
|
|
return 0;
|
|
|
|
if (ktime_to_ns(min) < 2 * NSEC_PER_SEC) {
|
|
__pm_wakeup_event(ws, 2 * MSEC_PER_SEC);
|
|
return -EBUSY;
|
|
}
|
|
|
|
/* Setup an rtc timer to fire that far in the future */
|
|
rtc_timer_cancel(rtc, &rtctimer);
|
|
rtc_read_time(rtc, &tm);
|
|
now = rtc_tm_to_ktime(tm);
|
|
now = ktime_add(now, min);
|
|
|
|
/* Set alarm, if in the past reject suspend briefly to handle */
|
|
ret = rtc_timer_start(rtc, &rtctimer, now, ktime_set(0, 0));
|
|
if (ret < 0)
|
|
__pm_wakeup_event(ws, MSEC_PER_SEC);
|
|
return ret;
|
|
}
|
|
|
|
static int alarmtimer_resume(struct device *dev)
|
|
{
|
|
struct rtc_device *rtc;
|
|
|
|
rtc = alarmtimer_get_rtcdev();
|
|
if (rtc)
|
|
rtc_timer_cancel(rtc, &rtctimer);
|
|
return 0;
|
|
}
|
|
|
|
#else
|
|
static int alarmtimer_suspend(struct device *dev)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static int alarmtimer_resume(struct device *dev)
|
|
{
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
static void alarmtimer_freezerset(ktime_t absexp, enum alarmtimer_type type)
|
|
{
|
|
ktime_t delta;
|
|
unsigned long flags;
|
|
struct alarm_base *base = &alarm_bases[type];
|
|
|
|
delta = ktime_sub(absexp, base->gettime());
|
|
|
|
spin_lock_irqsave(&freezer_delta_lock, flags);
|
|
if (!freezer_delta.tv64 || (delta.tv64 < freezer_delta.tv64))
|
|
freezer_delta = delta;
|
|
spin_unlock_irqrestore(&freezer_delta_lock, flags);
|
|
}
|
|
|
|
|
|
/**
|
|
* alarm_init - Initialize an alarm structure
|
|
* @alarm: ptr to alarm to be initialized
|
|
* @type: the type of the alarm
|
|
* @function: callback that is run when the alarm fires
|
|
*/
|
|
void alarm_init(struct alarm *alarm, enum alarmtimer_type type,
|
|
enum alarmtimer_restart (*function)(struct alarm *, ktime_t))
|
|
{
|
|
timerqueue_init(&alarm->node);
|
|
hrtimer_init(&alarm->timer, alarm_bases[type].base_clockid,
|
|
HRTIMER_MODE_ABS);
|
|
alarm->timer.function = alarmtimer_fired;
|
|
alarm->function = function;
|
|
alarm->type = type;
|
|
if (type >= ALARM_NUMTYPE) {
|
|
/* use ALARM_BOOTTIME as the default */
|
|
alarm->type = ALARM_BOOTTIME;
|
|
}
|
|
alarm->state = ALARMTIMER_STATE_INACTIVE;
|
|
}
|
|
EXPORT_SYMBOL_GPL(alarm_init);
|
|
|
|
/**
|
|
* alarm_start - Sets an absolute alarm to fire
|
|
* @alarm: ptr to alarm to set
|
|
* @start: time to run the alarm
|
|
*/
|
|
void alarm_start(struct alarm *alarm, ktime_t start)
|
|
{
|
|
struct alarm_base *base = &alarm_bases[alarm->type];
|
|
unsigned long flags;
|
|
|
|
spin_lock_irqsave(&base->lock, flags);
|
|
alarm->node.expires = start;
|
|
alarmtimer_enqueue(base, alarm);
|
|
hrtimer_start(&alarm->timer, alarm->node.expires, HRTIMER_MODE_ABS);
|
|
spin_unlock_irqrestore(&base->lock, flags);
|
|
}
|
|
EXPORT_SYMBOL_GPL(alarm_start);
|
|
|
|
/**
|
|
* alarm_start_relative - Sets a relative alarm to fire
|
|
* @alarm: ptr to alarm to set
|
|
* @start: time relative to now to run the alarm
|
|
*/
|
|
void alarm_start_relative(struct alarm *alarm, ktime_t start)
|
|
{
|
|
struct alarm_base *base = &alarm_bases[alarm->type];
|
|
|
|
start = ktime_add_safe(start, base->gettime());
|
|
alarm_start(alarm, start);
|
|
}
|
|
EXPORT_SYMBOL_GPL(alarm_start_relative);
|
|
|
|
void alarm_restart(struct alarm *alarm)
|
|
{
|
|
struct alarm_base *base = &alarm_bases[alarm->type];
|
|
unsigned long flags;
|
|
|
|
spin_lock_irqsave(&base->lock, flags);
|
|
hrtimer_set_expires(&alarm->timer, alarm->node.expires);
|
|
hrtimer_restart(&alarm->timer);
|
|
alarmtimer_enqueue(base, alarm);
|
|
spin_unlock_irqrestore(&base->lock, flags);
|
|
}
|
|
EXPORT_SYMBOL_GPL(alarm_restart);
|
|
|
|
/**
|
|
* alarm_try_to_cancel - Tries to cancel an alarm timer
|
|
* @alarm: ptr to alarm to be canceled
|
|
*
|
|
* Returns 1 if the timer was canceled, 0 if it was not running,
|
|
* and -1 if the callback was running
|
|
*/
|
|
int alarm_try_to_cancel(struct alarm *alarm)
|
|
{
|
|
struct alarm_base *base = &alarm_bases[alarm->type];
|
|
unsigned long flags;
|
|
int ret;
|
|
|
|
spin_lock_irqsave(&base->lock, flags);
|
|
ret = hrtimer_try_to_cancel(&alarm->timer);
|
|
if (ret >= 0)
|
|
alarmtimer_dequeue(base, alarm);
|
|
spin_unlock_irqrestore(&base->lock, flags);
|
|
return ret;
|
|
}
|
|
EXPORT_SYMBOL_GPL(alarm_try_to_cancel);
|
|
|
|
|
|
/**
|
|
* alarm_cancel - Spins trying to cancel an alarm timer until it is done
|
|
* @alarm: ptr to alarm to be canceled
|
|
*
|
|
* Returns 1 if the timer was canceled, 0 if it was not active.
|
|
*/
|
|
int alarm_cancel(struct alarm *alarm)
|
|
{
|
|
for (;;) {
|
|
int ret = alarm_try_to_cancel(alarm);
|
|
if (ret >= 0)
|
|
return ret;
|
|
udelay(1);
|
|
}
|
|
}
|
|
EXPORT_SYMBOL_GPL(alarm_cancel);
|
|
|
|
|
|
u64 alarm_forward(struct alarm *alarm, ktime_t now, ktime_t interval)
|
|
{
|
|
u64 overrun = 1;
|
|
ktime_t delta;
|
|
|
|
delta = ktime_sub(now, alarm->node.expires);
|
|
|
|
if (delta.tv64 < 0)
|
|
return 0;
|
|
|
|
if (unlikely(delta.tv64 >= interval.tv64)) {
|
|
s64 incr = ktime_to_ns(interval);
|
|
|
|
overrun = ktime_divns(delta, incr);
|
|
|
|
alarm->node.expires = ktime_add_ns(alarm->node.expires,
|
|
incr*overrun);
|
|
|
|
if (alarm->node.expires.tv64 > now.tv64)
|
|
return overrun;
|
|
/*
|
|
* This (and the ktime_add() below) is the
|
|
* correction for exact:
|
|
*/
|
|
overrun++;
|
|
}
|
|
|
|
alarm->node.expires = ktime_add_safe(alarm->node.expires, interval);
|
|
return overrun;
|
|
}
|
|
EXPORT_SYMBOL_GPL(alarm_forward);
|
|
|
|
u64 alarm_forward_now(struct alarm *alarm, ktime_t interval)
|
|
{
|
|
struct alarm_base *base = &alarm_bases[alarm->type];
|
|
|
|
return alarm_forward(alarm, base->gettime(), interval);
|
|
}
|
|
EXPORT_SYMBOL_GPL(alarm_forward_now);
|
|
|
|
|
|
/**
|
|
* clock2alarm - helper that converts from clockid to alarmtypes
|
|
* @clockid: clockid.
|
|
*/
|
|
static enum alarmtimer_type clock2alarm(clockid_t clockid)
|
|
{
|
|
if (clockid == CLOCK_REALTIME_ALARM)
|
|
return ALARM_REALTIME;
|
|
if (clockid == CLOCK_BOOTTIME_ALARM)
|
|
return ALARM_BOOTTIME;
|
|
return -1;
|
|
}
|
|
|
|
/**
|
|
* alarm_handle_timer - Callback for posix timers
|
|
* @alarm: alarm that fired
|
|
*
|
|
* Posix timer callback for expired alarm timers.
|
|
*/
|
|
static enum alarmtimer_restart alarm_handle_timer(struct alarm *alarm,
|
|
ktime_t now)
|
|
{
|
|
unsigned long flags;
|
|
struct k_itimer *ptr = container_of(alarm, struct k_itimer,
|
|
it.alarm.alarmtimer);
|
|
enum alarmtimer_restart result = ALARMTIMER_NORESTART;
|
|
|
|
spin_lock_irqsave(&ptr->it_lock, flags);
|
|
if ((ptr->it_sigev_notify & ~SIGEV_THREAD_ID) != SIGEV_NONE) {
|
|
if (posix_timer_event(ptr, 0) != 0)
|
|
ptr->it_overrun++;
|
|
}
|
|
|
|
/* Re-add periodic timers */
|
|
if (ptr->it.alarm.interval.tv64) {
|
|
ptr->it_overrun += alarm_forward(alarm, now,
|
|
ptr->it.alarm.interval);
|
|
result = ALARMTIMER_RESTART;
|
|
}
|
|
spin_unlock_irqrestore(&ptr->it_lock, flags);
|
|
|
|
return result;
|
|
}
|
|
|
|
/**
|
|
* alarm_clock_getres - posix getres interface
|
|
* @which_clock: clockid
|
|
* @tp: timespec to fill
|
|
*
|
|
* Returns the granularity of underlying alarm base clock
|
|
*/
|
|
static int alarm_clock_getres(const clockid_t which_clock, struct timespec *tp)
|
|
{
|
|
if (!alarmtimer_get_rtcdev())
|
|
return -EINVAL;
|
|
|
|
tp->tv_sec = 0;
|
|
tp->tv_nsec = hrtimer_resolution;
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* alarm_clock_get - posix clock_get interface
|
|
* @which_clock: clockid
|
|
* @tp: timespec to fill.
|
|
*
|
|
* Provides the underlying alarm base time.
|
|
*/
|
|
static int alarm_clock_get(clockid_t which_clock, struct timespec *tp)
|
|
{
|
|
struct alarm_base *base = &alarm_bases[clock2alarm(which_clock)];
|
|
|
|
if (!alarmtimer_get_rtcdev())
|
|
return -EINVAL;
|
|
|
|
*tp = ktime_to_timespec(base->gettime());
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* alarm_timer_create - posix timer_create interface
|
|
* @new_timer: k_itimer pointer to manage
|
|
*
|
|
* Initializes the k_itimer structure.
|
|
*/
|
|
static int alarm_timer_create(struct k_itimer *new_timer)
|
|
{
|
|
enum alarmtimer_type type;
|
|
|
|
if (!alarmtimer_get_rtcdev())
|
|
return -EOPNOTSUPP;
|
|
|
|
if (!capable(CAP_WAKE_ALARM))
|
|
return -EPERM;
|
|
|
|
type = clock2alarm(new_timer->it_clock);
|
|
alarm_init(&new_timer->it.alarm.alarmtimer, type, alarm_handle_timer);
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* alarm_timer_get - posix timer_get interface
|
|
* @new_timer: k_itimer pointer
|
|
* @cur_setting: itimerspec data to fill
|
|
*
|
|
* Copies out the current itimerspec data
|
|
*/
|
|
static void alarm_timer_get(struct k_itimer *timr,
|
|
struct itimerspec *cur_setting)
|
|
{
|
|
ktime_t relative_expiry_time =
|
|
alarm_expires_remaining(&(timr->it.alarm.alarmtimer));
|
|
|
|
if (ktime_to_ns(relative_expiry_time) > 0) {
|
|
cur_setting->it_value = ktime_to_timespec(relative_expiry_time);
|
|
} else {
|
|
cur_setting->it_value.tv_sec = 0;
|
|
cur_setting->it_value.tv_nsec = 0;
|
|
}
|
|
|
|
cur_setting->it_interval = ktime_to_timespec(timr->it.alarm.interval);
|
|
}
|
|
|
|
/**
|
|
* alarm_timer_del - posix timer_del interface
|
|
* @timr: k_itimer pointer to be deleted
|
|
*
|
|
* Cancels any programmed alarms for the given timer.
|
|
*/
|
|
static int alarm_timer_del(struct k_itimer *timr)
|
|
{
|
|
if (!rtcdev)
|
|
return -EOPNOTSUPP;
|
|
|
|
if (alarm_try_to_cancel(&timr->it.alarm.alarmtimer) < 0)
|
|
return TIMER_RETRY;
|
|
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* alarm_timer_set - posix timer_set interface
|
|
* @timr: k_itimer pointer to be deleted
|
|
* @flags: timer flags
|
|
* @new_setting: itimerspec to be used
|
|
* @old_setting: itimerspec being replaced
|
|
*
|
|
* Sets the timer to new_setting, and starts the timer.
|
|
*/
|
|
static int alarm_timer_set(struct k_itimer *timr, int flags,
|
|
struct itimerspec *new_setting,
|
|
struct itimerspec *old_setting)
|
|
{
|
|
ktime_t exp;
|
|
|
|
if (!rtcdev)
|
|
return -EOPNOTSUPP;
|
|
|
|
if (flags & ~TIMER_ABSTIME)
|
|
return -EINVAL;
|
|
|
|
if (old_setting)
|
|
alarm_timer_get(timr, old_setting);
|
|
|
|
/* If the timer was already set, cancel it */
|
|
if (alarm_try_to_cancel(&timr->it.alarm.alarmtimer) < 0)
|
|
return TIMER_RETRY;
|
|
|
|
/* start the timer */
|
|
timr->it.alarm.interval = timespec_to_ktime(new_setting->it_interval);
|
|
|
|
/*
|
|
* Rate limit to the tick as a hot fix to prevent DOS. Will be
|
|
* mopped up later.
|
|
*/
|
|
if (timr->it.alarm.interval.tv64 &&
|
|
ktime_to_ns(timr->it.alarm.interval) < TICK_NSEC)
|
|
timr->it.alarm.interval = ktime_set(0, TICK_NSEC);
|
|
|
|
exp = timespec_to_ktime(new_setting->it_value);
|
|
/* Convert (if necessary) to absolute time */
|
|
if (flags != TIMER_ABSTIME) {
|
|
ktime_t now;
|
|
|
|
now = alarm_bases[timr->it.alarm.alarmtimer.type].gettime();
|
|
exp = ktime_add_safe(now, exp);
|
|
}
|
|
|
|
alarm_start(&timr->it.alarm.alarmtimer, exp);
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* alarmtimer_nsleep_wakeup - Wakeup function for alarm_timer_nsleep
|
|
* @alarm: ptr to alarm that fired
|
|
*
|
|
* Wakes up the task that set the alarmtimer
|
|
*/
|
|
static enum alarmtimer_restart alarmtimer_nsleep_wakeup(struct alarm *alarm,
|
|
ktime_t now)
|
|
{
|
|
struct task_struct *task = (struct task_struct *)alarm->data;
|
|
|
|
alarm->data = NULL;
|
|
if (task)
|
|
wake_up_process(task);
|
|
return ALARMTIMER_NORESTART;
|
|
}
|
|
|
|
/**
|
|
* alarmtimer_do_nsleep - Internal alarmtimer nsleep implementation
|
|
* @alarm: ptr to alarmtimer
|
|
* @absexp: absolute expiration time
|
|
*
|
|
* Sets the alarm timer and sleeps until it is fired or interrupted.
|
|
*/
|
|
static int alarmtimer_do_nsleep(struct alarm *alarm, ktime_t absexp)
|
|
{
|
|
alarm->data = (void *)current;
|
|
do {
|
|
set_current_state(TASK_INTERRUPTIBLE);
|
|
alarm_start(alarm, absexp);
|
|
if (likely(alarm->data))
|
|
schedule();
|
|
|
|
alarm_cancel(alarm);
|
|
} while (alarm->data && !signal_pending(current));
|
|
|
|
__set_current_state(TASK_RUNNING);
|
|
|
|
return (alarm->data == NULL);
|
|
}
|
|
|
|
|
|
/**
|
|
* update_rmtp - Update remaining timespec value
|
|
* @exp: expiration time
|
|
* @type: timer type
|
|
* @rmtp: user pointer to remaining timepsec value
|
|
*
|
|
* Helper function that fills in rmtp value with time between
|
|
* now and the exp value
|
|
*/
|
|
static int update_rmtp(ktime_t exp, enum alarmtimer_type type,
|
|
struct timespec __user *rmtp)
|
|
{
|
|
struct timespec rmt;
|
|
ktime_t rem;
|
|
|
|
rem = ktime_sub(exp, alarm_bases[type].gettime());
|
|
|
|
if (rem.tv64 <= 0)
|
|
return 0;
|
|
rmt = ktime_to_timespec(rem);
|
|
|
|
if (copy_to_user(rmtp, &rmt, sizeof(*rmtp)))
|
|
return -EFAULT;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
/**
|
|
* alarm_timer_nsleep_restart - restartblock alarmtimer nsleep
|
|
* @restart: ptr to restart block
|
|
*
|
|
* Handles restarted clock_nanosleep calls
|
|
*/
|
|
static long __sched alarm_timer_nsleep_restart(struct restart_block *restart)
|
|
{
|
|
enum alarmtimer_type type = restart->nanosleep.clockid;
|
|
ktime_t exp;
|
|
struct timespec __user *rmtp;
|
|
struct alarm alarm;
|
|
int ret = 0;
|
|
|
|
exp.tv64 = restart->nanosleep.expires;
|
|
alarm_init(&alarm, type, alarmtimer_nsleep_wakeup);
|
|
|
|
if (alarmtimer_do_nsleep(&alarm, exp))
|
|
goto out;
|
|
|
|
if (freezing(current))
|
|
alarmtimer_freezerset(exp, type);
|
|
|
|
rmtp = restart->nanosleep.rmtp;
|
|
if (rmtp) {
|
|
ret = update_rmtp(exp, type, rmtp);
|
|
if (ret <= 0)
|
|
goto out;
|
|
}
|
|
|
|
|
|
/* The other values in restart are already filled in */
|
|
ret = -ERESTART_RESTARTBLOCK;
|
|
out:
|
|
return ret;
|
|
}
|
|
|
|
/**
|
|
* alarm_timer_nsleep - alarmtimer nanosleep
|
|
* @which_clock: clockid
|
|
* @flags: determins abstime or relative
|
|
* @tsreq: requested sleep time (abs or rel)
|
|
* @rmtp: remaining sleep time saved
|
|
*
|
|
* Handles clock_nanosleep calls against _ALARM clockids
|
|
*/
|
|
static int alarm_timer_nsleep(const clockid_t which_clock, int flags,
|
|
struct timespec *tsreq, struct timespec __user *rmtp)
|
|
{
|
|
enum alarmtimer_type type = clock2alarm(which_clock);
|
|
struct alarm alarm;
|
|
ktime_t exp;
|
|
int ret = 0;
|
|
struct restart_block *restart;
|
|
|
|
if (!alarmtimer_get_rtcdev())
|
|
return -EOPNOTSUPP;
|
|
|
|
if (flags & ~TIMER_ABSTIME)
|
|
return -EINVAL;
|
|
|
|
if (!capable(CAP_WAKE_ALARM))
|
|
return -EPERM;
|
|
|
|
alarm_init(&alarm, type, alarmtimer_nsleep_wakeup);
|
|
|
|
exp = timespec_to_ktime(*tsreq);
|
|
/* Convert (if necessary) to absolute time */
|
|
if (flags != TIMER_ABSTIME) {
|
|
ktime_t now = alarm_bases[type].gettime();
|
|
|
|
exp = ktime_add_safe(now, exp);
|
|
}
|
|
|
|
if (alarmtimer_do_nsleep(&alarm, exp))
|
|
goto out;
|
|
|
|
if (freezing(current))
|
|
alarmtimer_freezerset(exp, type);
|
|
|
|
/* abs timers don't set remaining time or restart */
|
|
if (flags == TIMER_ABSTIME) {
|
|
ret = -ERESTARTNOHAND;
|
|
goto out;
|
|
}
|
|
|
|
if (rmtp) {
|
|
ret = update_rmtp(exp, type, rmtp);
|
|
if (ret <= 0)
|
|
goto out;
|
|
}
|
|
|
|
restart = ¤t->restart_block;
|
|
restart->nanosleep.clockid = type;
|
|
restart->nanosleep.expires = exp.tv64;
|
|
restart->nanosleep.rmtp = rmtp;
|
|
set_restart_fn(restart, alarm_timer_nsleep_restart);
|
|
ret = -ERESTART_RESTARTBLOCK;
|
|
|
|
out:
|
|
return ret;
|
|
}
|
|
|
|
|
|
/* Suspend hook structures */
|
|
static const struct dev_pm_ops alarmtimer_pm_ops = {
|
|
.suspend = alarmtimer_suspend,
|
|
.resume = alarmtimer_resume,
|
|
};
|
|
|
|
static struct platform_driver alarmtimer_driver = {
|
|
.driver = {
|
|
.name = "alarmtimer",
|
|
.pm = &alarmtimer_pm_ops,
|
|
}
|
|
};
|
|
|
|
/**
|
|
* alarmtimer_init - Initialize alarm timer code
|
|
*
|
|
* This function initializes the alarm bases and registers
|
|
* the posix clock ids.
|
|
*/
|
|
static int __init alarmtimer_init(void)
|
|
{
|
|
struct platform_device *pdev;
|
|
int error = 0;
|
|
int i;
|
|
struct k_clock alarm_clock = {
|
|
.clock_getres = alarm_clock_getres,
|
|
.clock_get = alarm_clock_get,
|
|
.timer_create = alarm_timer_create,
|
|
.timer_set = alarm_timer_set,
|
|
.timer_del = alarm_timer_del,
|
|
.timer_get = alarm_timer_get,
|
|
.nsleep = alarm_timer_nsleep,
|
|
};
|
|
|
|
alarmtimer_rtc_timer_init();
|
|
|
|
posix_timers_register_clock(CLOCK_REALTIME_ALARM, &alarm_clock);
|
|
posix_timers_register_clock(CLOCK_BOOTTIME_ALARM, &alarm_clock);
|
|
|
|
/* Initialize alarm bases */
|
|
alarm_bases[ALARM_REALTIME].base_clockid = CLOCK_REALTIME;
|
|
alarm_bases[ALARM_REALTIME].gettime = &ktime_get_real;
|
|
alarm_bases[ALARM_BOOTTIME].base_clockid = CLOCK_BOOTTIME;
|
|
alarm_bases[ALARM_BOOTTIME].gettime = &ktime_get_boottime;
|
|
for (i = 0; i < ALARM_NUMTYPE; i++) {
|
|
timerqueue_init_head(&alarm_bases[i].timerqueue);
|
|
spin_lock_init(&alarm_bases[i].lock);
|
|
}
|
|
|
|
error = alarmtimer_rtc_interface_setup();
|
|
if (error)
|
|
return error;
|
|
|
|
error = platform_driver_register(&alarmtimer_driver);
|
|
if (error)
|
|
goto out_if;
|
|
|
|
pdev = platform_device_register_simple("alarmtimer", -1, NULL, 0);
|
|
if (IS_ERR(pdev)) {
|
|
error = PTR_ERR(pdev);
|
|
goto out_drv;
|
|
}
|
|
ws = wakeup_source_register("alarmtimer");
|
|
return 0;
|
|
|
|
out_drv:
|
|
platform_driver_unregister(&alarmtimer_driver);
|
|
out_if:
|
|
alarmtimer_rtc_interface_remove();
|
|
return error;
|
|
}
|
|
device_initcall(alarmtimer_init);
|