* refs/heads/tmp-b834e92 Revert "USB: gadget: u_ether: Fix data stall issue in RNDIS tethering mode" Linux 4.4.63 MIPS: fix Select HAVE_IRQ_EXIT_ON_IRQ_STACK patch. sctp: deny peeloff operation on asocs with threads sleeping on it net: ipv6: check route protocol when deleting routes tty/serial: atmel: RS485 half duplex w/DMA: enable RX after TX is done SUNRPC: fix refcounting problems with auth_gss messages. ibmveth: calculate gso_segs for large packets catc: Use heap buffer for memory size test catc: Combine failure cleanup code in catc_probe() rtl8150: Use heap buffers for all register access pegasus: Use heap buffers for all register access virtio-console: avoid DMA from stack dvb-usb-firmware: don't do DMA on stack dvb-usb: don't use stack for firmware load mm: Tighten x86 /dev/mem with zeroing reads rtc: tegra: Implement clock handling platform/x86: acer-wmi: setup accelerometer when machine has appropriate notify event ext4: fix inode checksum calculation problem if i_extra_size is small dvb-usb-v2: avoid use-after-free ath9k: fix NULL pointer dereference crypto: ahash - Fix EINPROGRESS notification callback powerpc: Disable HFSCR[TM] if TM is not supported zram: do not use copy_page with non-page aligned address kvm: fix page struct leak in handle_vmon Revert "MIPS: Lantiq: Fix cascaded IRQ setup" char: lack of bool string made CONFIG_DEVPORT always on char: Drop bogus dependency of DEVPORT on !M68K ftrace: Fix removing of second function probe irqchip/irq-imx-gpcv2: Fix spinlock initialization libnvdimm: fix reconfig_mutex, mmap_sem, and jbd2_handle lockdep splat xen, fbfront: fix connecting to backend scsi: sd: Fix capacity calculation with 32-bit sector_t scsi: sd: Consider max_xfer_blocks if opt_xfer_blocks is unusable scsi: sr: Sanity check returned mode data iscsi-target: Drop work-around for legacy GlobalSAN initiator iscsi-target: Fix TMR reference leak during session shutdown acpi, nfit, libnvdimm: fix interleave set cookie calculation (64-bit comparison) x86/vdso: Plug race between mapping and ELF header setup x86/vdso: Ensure vdso32_enabled gets set to valid values only perf/x86: Avoid exposing wrong/stale data in intel_pmu_lbr_read_32() Input: xpad - add support for Razer Wildcat gamepad CIFS: store results of cifs_reopen_file to avoid infinite wait drm/nouveau/mmu/nv4a: use nv04 mmu rather than the nv44 one drm/nouveau/mpeg: mthd returns true on success now thp: fix MADV_DONTNEED vs clear soft dirty race cgroup, kthread: close race window where new kthreads can be migrated to non-root cgroups ANDROID: uid_sys_stats: reduce update_io_stats overhead UPSTREAM: char: lack of bool string made CONFIG_DEVPORT always on UPSTREAM: char: Drop bogus dependency of DEVPORT on !M68K Revert "Android: sdcardfs: Don't do d_add for lower fs" ANDROID: usb: gadget: fix MTP enumeration issue under super speed mode Android: sdcardfs: Don't complain in fixup_lower_ownership Android: sdcardfs: Don't do d_add for lower fs ANDROID: sdcardfs: ->iget fixes Android: sdcardfs: Change cache GID value BACKPORT: [UPSTREAM] ext2: convert to mbcache2 BACKPORT [UPSTREAM] ext4: convert to mbcache2 BACKPORT: [UPSTREAM] mbcache2: reimplement mbcache Linux 4.4.62 ibmveth: set correct gso_size and gso_type net/mlx4_core: Fix when to save some qp context flags for dynamic VST to VGT transitions net/mlx4_core: Fix racy CQ (Completion Queue) free net/mlx4_en: Fix bad WQE issue usb: hub: Wait for connection to be reestablished after port reset blk-mq: Avoid memory reclaim when remapping queues net/packet: fix overflow in check for priv area size crypto: caam - fix RNG deinstantiation error checking MIPS: IRQ Stack: Fix erroneous jal to plat_irq_dispatch MIPS: Select HAVE_IRQ_EXIT_ON_IRQ_STACK MIPS: Switch to the irq_stack in interrupts MIPS: Only change $28 to thread_info if coming from user mode MIPS: Stack unwinding while on IRQ stack MIPS: Introduce irq_stack mtd: bcm47xxpart: fix parsing first block after aligned TRX usb: dwc3: gadget: delay unmap of bounced requests drm/i915: Stop using RP_DOWN_EI on Baytrail drm/i915: Avoid tweaking evaluation thresholds on Baytrail v3 UPSTREAM: net: socket: Make unnecessarily global sockfs_setattr() static UPSTREAM: net: ipv4: Don't crash if passing a null sk to ip_do_redirect. UPSTREAM: net/packet: fix overflow in check for priv area size Linux 4.4.61 mm/mempolicy.c: fix error handling in set_mempolicy and mbind. MIPS: Flush wrong invalid FTLB entry for huge page MIPS: Lantiq: fix missing xbar kernel panic MIPS: End spinlocks with .insn MIPS: ralink: Fix typos in rt3883 pinctrl MIPS: Force o32 fp64 support on 32bit MIPS64r6 kernels s390/uaccess: get_user() should zero on failure (again) s390/decompressor: fix initrd corruption caused by bss clear nios2: reserve boot memory for device tree powerpc: Don't try to fix up misaligned load-with-reservation instructions powerpc/mm: Add missing global TLB invalidate if cxl is active metag/usercopy: Add missing fixups metag/usercopy: Fix src fixup in from user rapf loops metag/usercopy: Set flags before ADDZ metag/usercopy: Zero rest of buffer from copy_from_user metag/usercopy: Add early abort to copy_to_user metag/usercopy: Fix alignment error checking metag/usercopy: Drop unused macros ring-buffer: Fix return value check in test_ringbuffer() ptrace: fix PTRACE_LISTEN race corrupting task->state Reset TreeId to zero on SMB2 TREE_CONNECT iio: bmg160: reset chip when probing arm/arm64: KVM: Take mmap_sem in kvm_arch_prepare_memory_region arm/arm64: KVM: Take mmap_sem in stage2_unmap_vm staging: android: ashmem: lseek failed due to no FMODE_LSEEK. sysfs: be careful of error returns from ops->show() drm/vmwgfx: fix integer overflow in vmw_surface_define_ioctl() drm/vmwgfx: Remove getparam error message drm/ttm, drm/vmwgfx: Relax permission checking when opening surfaces drm/vmwgfx: avoid calling vzalloc with a 0 size in vmw_get_cap_3d_ioctl() drm/vmwgfx: NULL pointer dereference in vmw_surface_define_ioctl() drm/vmwgfx: Type-check lookups of fence objects Revert "Revert "Revert "CHROMIUM: android: binder: Fix potential scheduling-while-atomic""" ANDROID: sdcardfs: Directly pass lower file for mmap UPSTREAM: checkpatch: special audit for revert commit line UPSTREAM: PM / sleep: make PM notifiers called symmetrically Revert "Revert "CHROMIUM: android: binder: Fix potential scheduling-while-atomic"" Linux 4.4.60 padata: avoid race in reordering blk: Ensure users for current->bio_list can see the full list. blk: improve order of bio handling in generic_make_request() power: reset: at91-poweroff: timely shutdown LPDDR memories KVM: kvm_io_bus_unregister_dev() should never fail rtc: s35390a: improve irq handling rtc: s35390a: implement reset routine as suggested by the reference rtc: s35390a: make sure all members in the output are set rtc: s35390a: fix reading out alarm MIPS: Lantiq: Fix cascaded IRQ setup mm, hugetlb: use pte_present() instead of pmd_present() in follow_huge_pmd() drm/radeon: Override fpfn for all VRAM placements in radeon_evict_flags KVM: x86: clear bus pointer when destroyed USB: fix linked-list corruption in rh_call_control() tty/serial: atmel: fix TX path in atmel_console_write() tty/serial: atmel: fix race condition (TX+DMA) ACPI: Do not create a platform_device for IOAPIC/IOxAPIC ACPI: Fix incompatibility with mcount-based function graph tracing ASoC: atmel-classd: fix audio clock rate ALSA: hda - fix a problem for lineout on a Dell AIO machine ALSA: seq: Fix race during FIFO resize scsi: libsas: fix ata xfer length scsi: sg: check length passed to SG_NEXT_CMD_LEN scsi: mpt3sas: fix hang on ata passthrough commands xen/setup: Don't relocate p2m over existing one libceph: force GFP_NOIO for socket allocations Linux 4.4.59 sched/rt: Add a missing rescheduling point fscrypt: remove broken support for detecting keyring key revocation metag/ptrace: Reject partial NT_METAG_RPIPE writes metag/ptrace: Provide default TXSTATUS for short NT_PRSTATUS metag/ptrace: Preserve previous registers for short regset write sparc/ptrace: Preserve previous registers for short regset write mips/ptrace: Preserve previous registers for short regset write h8300/ptrace: Fix incorrect register transfer count c6x/ptrace: Remove useless PTRACE_SETREGSET implementation pinctrl: qcom: Don't clear status bit on irq_unmask virtio_balloon: init 1st buffer in stats vq xfrm_user: validate XFRM_MSG_NEWAE incoming ESN size harder xfrm_user: validate XFRM_MSG_NEWAE XFRMA_REPLAY_ESN_VAL replay_window xfrm: policy: init locks early Conflicts: drivers/scsi/sd.c drivers/usb/gadget/function/f_mtp.c drivers/usb/gadget/function/u_ether.c Change-Id: I80501cf02d04204f8c0f3a7f5a036eaa4d54546e Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
299 lines
8.3 KiB
C
299 lines
8.3 KiB
C
#include <linux/suspend.h>
|
|
#include <linux/suspend_ioctls.h>
|
|
#include <linux/utsname.h>
|
|
#include <linux/freezer.h>
|
|
#include <linux/compiler.h>
|
|
|
|
struct swsusp_info {
|
|
struct new_utsname uts;
|
|
u32 version_code;
|
|
unsigned long num_physpages;
|
|
int cpus;
|
|
unsigned long image_pages;
|
|
unsigned long pages;
|
|
unsigned long size;
|
|
} __aligned(PAGE_SIZE);
|
|
|
|
#ifdef CONFIG_HIBERNATION
|
|
/* kernel/power/snapshot.c */
|
|
extern void __init hibernate_reserved_size_init(void);
|
|
extern void __init hibernate_image_size_init(void);
|
|
|
|
#ifdef CONFIG_ARCH_HIBERNATION_HEADER
|
|
/* Maximum size of architecture specific data in a hibernation header */
|
|
#define MAX_ARCH_HEADER_SIZE (sizeof(struct new_utsname) + 4)
|
|
|
|
extern int arch_hibernation_header_save(void *addr, unsigned int max_size);
|
|
extern int arch_hibernation_header_restore(void *addr);
|
|
|
|
static inline int init_header_complete(struct swsusp_info *info)
|
|
{
|
|
return arch_hibernation_header_save(info, MAX_ARCH_HEADER_SIZE);
|
|
}
|
|
|
|
static inline char *check_image_kernel(struct swsusp_info *info)
|
|
{
|
|
return arch_hibernation_header_restore(info) ?
|
|
"architecture specific data" : NULL;
|
|
}
|
|
#endif /* CONFIG_ARCH_HIBERNATION_HEADER */
|
|
|
|
/*
|
|
* Keep some memory free so that I/O operations can succeed without paging
|
|
* [Might this be more than 4 MB?]
|
|
*/
|
|
#define PAGES_FOR_IO ((4096 * 1024) >> PAGE_SHIFT)
|
|
|
|
/*
|
|
* Keep 1 MB of memory free so that device drivers can allocate some pages in
|
|
* their .suspend() routines without breaking the suspend to disk.
|
|
*/
|
|
#define SPARE_PAGES ((1024 * 1024) >> PAGE_SHIFT)
|
|
|
|
asmlinkage int swsusp_save(void);
|
|
|
|
/* kernel/power/hibernate.c */
|
|
extern bool freezer_test_done;
|
|
|
|
extern int hibernation_snapshot(int platform_mode);
|
|
extern int hibernation_restore(int platform_mode);
|
|
extern int hibernation_platform_enter(void);
|
|
|
|
#else /* !CONFIG_HIBERNATION */
|
|
|
|
static inline void hibernate_reserved_size_init(void) {}
|
|
static inline void hibernate_image_size_init(void) {}
|
|
#endif /* !CONFIG_HIBERNATION */
|
|
|
|
extern int pfn_is_nosave(unsigned long);
|
|
|
|
#define power_attr(_name) \
|
|
static struct kobj_attribute _name##_attr = { \
|
|
.attr = { \
|
|
.name = __stringify(_name), \
|
|
.mode = 0644, \
|
|
}, \
|
|
.show = _name##_show, \
|
|
.store = _name##_store, \
|
|
}
|
|
|
|
#define power_attr_ro(_name) \
|
|
static struct kobj_attribute _name##_attr = { \
|
|
.attr = { \
|
|
.name = __stringify(_name), \
|
|
.mode = S_IRUGO, \
|
|
}, \
|
|
.show = _name##_show, \
|
|
}
|
|
|
|
/* Preferred image size in bytes (default 500 MB) */
|
|
extern unsigned long image_size;
|
|
/* Size of memory reserved for drivers (default SPARE_PAGES x PAGE_SIZE) */
|
|
extern unsigned long reserved_size;
|
|
extern int in_suspend;
|
|
extern dev_t swsusp_resume_device;
|
|
extern sector_t swsusp_resume_block;
|
|
|
|
extern asmlinkage int swsusp_arch_suspend(void);
|
|
extern asmlinkage int swsusp_arch_resume(void);
|
|
|
|
extern int create_basic_memory_bitmaps(void);
|
|
extern void free_basic_memory_bitmaps(void);
|
|
extern int hibernate_preallocate_memory(void);
|
|
|
|
/**
|
|
* Auxiliary structure used for reading the snapshot image data and
|
|
* metadata from and writing them to the list of page backup entries
|
|
* (PBEs) which is the main data structure of swsusp.
|
|
*
|
|
* Using struct snapshot_handle we can transfer the image, including its
|
|
* metadata, as a continuous sequence of bytes with the help of
|
|
* snapshot_read_next() and snapshot_write_next().
|
|
*
|
|
* The code that writes the image to a storage or transfers it to
|
|
* the user land is required to use snapshot_read_next() for this
|
|
* purpose and it should not make any assumptions regarding the internal
|
|
* structure of the image. Similarly, the code that reads the image from
|
|
* a storage or transfers it from the user land is required to use
|
|
* snapshot_write_next().
|
|
*
|
|
* This may allow us to change the internal structure of the image
|
|
* in the future with considerably less effort.
|
|
*/
|
|
|
|
struct snapshot_handle {
|
|
unsigned int cur; /* number of the block of PAGE_SIZE bytes the
|
|
* next operation will refer to (ie. current)
|
|
*/
|
|
void *buffer; /* address of the block to read from
|
|
* or write to
|
|
*/
|
|
int sync_read; /* Set to one to notify the caller of
|
|
* snapshot_write_next() that it may
|
|
* need to call wait_on_bio_chain()
|
|
*/
|
|
};
|
|
|
|
/* This macro returns the address from/to which the caller of
|
|
* snapshot_read_next()/snapshot_write_next() is allowed to
|
|
* read/write data after the function returns
|
|
*/
|
|
#define data_of(handle) ((handle).buffer)
|
|
|
|
extern unsigned int snapshot_additional_pages(struct zone *zone);
|
|
extern unsigned long snapshot_get_image_size(void);
|
|
extern int snapshot_read_next(struct snapshot_handle *handle);
|
|
extern int snapshot_write_next(struct snapshot_handle *handle);
|
|
extern void snapshot_write_finalize(struct snapshot_handle *handle);
|
|
extern int snapshot_image_loaded(struct snapshot_handle *handle);
|
|
|
|
/* If unset, the snapshot device cannot be open. */
|
|
extern atomic_t snapshot_device_available;
|
|
|
|
extern sector_t alloc_swapdev_block(int swap);
|
|
extern void free_all_swap_pages(int swap);
|
|
extern int swsusp_swap_in_use(void);
|
|
|
|
/*
|
|
* Flags that can be passed from the hibernatig hernel to the "boot" kernel in
|
|
* the image header.
|
|
*/
|
|
#define SF_PLATFORM_MODE 1
|
|
#define SF_NOCOMPRESS_MODE 2
|
|
#define SF_CRC32_MODE 4
|
|
|
|
/* kernel/power/hibernate.c */
|
|
extern int swsusp_check(void);
|
|
extern void swsusp_free(void);
|
|
extern int swsusp_read(unsigned int *flags_p);
|
|
extern int swsusp_write(unsigned int flags);
|
|
extern void swsusp_close(fmode_t);
|
|
#ifdef CONFIG_SUSPEND
|
|
extern int swsusp_unmark(void);
|
|
#endif
|
|
|
|
struct timeval;
|
|
/* kernel/power/swsusp.c */
|
|
extern void swsusp_show_speed(ktime_t, ktime_t, unsigned int, char *);
|
|
|
|
#ifdef CONFIG_SUSPEND
|
|
/* kernel/power/suspend.c */
|
|
extern const char *pm_labels[];
|
|
extern const char *pm_states[];
|
|
|
|
extern int suspend_devices_and_enter(suspend_state_t state);
|
|
#else /* !CONFIG_SUSPEND */
|
|
static inline int suspend_devices_and_enter(suspend_state_t state)
|
|
{
|
|
return -ENOSYS;
|
|
}
|
|
#endif /* !CONFIG_SUSPEND */
|
|
|
|
#ifdef CONFIG_PM_TEST_SUSPEND
|
|
/* kernel/power/suspend_test.c */
|
|
extern void suspend_test_start(void);
|
|
extern void suspend_test_finish(const char *label);
|
|
#else /* !CONFIG_PM_TEST_SUSPEND */
|
|
static inline void suspend_test_start(void) {}
|
|
static inline void suspend_test_finish(const char *label) {}
|
|
#endif /* !CONFIG_PM_TEST_SUSPEND */
|
|
|
|
#ifdef CONFIG_PM_SLEEP
|
|
/* kernel/power/main.c */
|
|
extern int __pm_notifier_call_chain(unsigned long val, int nr_to_call,
|
|
int *nr_calls);
|
|
extern int pm_notifier_call_chain(unsigned long val);
|
|
#endif
|
|
|
|
#ifdef CONFIG_HIGHMEM
|
|
int restore_highmem(void);
|
|
#else
|
|
static inline unsigned int count_highmem_pages(void) { return 0; }
|
|
static inline int restore_highmem(void) { return 0; }
|
|
#endif
|
|
|
|
/*
|
|
* Suspend test levels
|
|
*/
|
|
enum {
|
|
/* keep first */
|
|
TEST_NONE,
|
|
TEST_CORE,
|
|
TEST_CPUS,
|
|
TEST_PLATFORM,
|
|
TEST_DEVICES,
|
|
TEST_FREEZER,
|
|
/* keep last */
|
|
__TEST_AFTER_LAST
|
|
};
|
|
|
|
#define TEST_FIRST TEST_NONE
|
|
#define TEST_MAX (__TEST_AFTER_LAST - 1)
|
|
|
|
extern int pm_test_level;
|
|
|
|
#ifdef CONFIG_SUSPEND_FREEZER
|
|
static inline int suspend_freeze_processes(void)
|
|
{
|
|
int error;
|
|
|
|
error = freeze_processes();
|
|
/*
|
|
* freeze_processes() automatically thaws every task if freezing
|
|
* fails. So we need not do anything extra upon error.
|
|
*/
|
|
if (error)
|
|
return error;
|
|
|
|
error = freeze_kernel_threads();
|
|
/*
|
|
* freeze_kernel_threads() thaws only kernel threads upon freezing
|
|
* failure. So we have to thaw the userspace tasks ourselves.
|
|
*/
|
|
if (error)
|
|
thaw_processes();
|
|
|
|
return error;
|
|
}
|
|
|
|
static inline void suspend_thaw_processes(void)
|
|
{
|
|
thaw_processes();
|
|
}
|
|
#else
|
|
static inline int suspend_freeze_processes(void)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline void suspend_thaw_processes(void)
|
|
{
|
|
}
|
|
#endif
|
|
|
|
#ifdef CONFIG_PM_AUTOSLEEP
|
|
|
|
/* kernel/power/autosleep.c */
|
|
extern int pm_autosleep_init(void);
|
|
extern int pm_autosleep_lock(void);
|
|
extern void pm_autosleep_unlock(void);
|
|
extern suspend_state_t pm_autosleep_state(void);
|
|
extern int pm_autosleep_set_state(suspend_state_t state);
|
|
|
|
#else /* !CONFIG_PM_AUTOSLEEP */
|
|
|
|
static inline int pm_autosleep_init(void) { return 0; }
|
|
static inline int pm_autosleep_lock(void) { return 0; }
|
|
static inline void pm_autosleep_unlock(void) {}
|
|
static inline suspend_state_t pm_autosleep_state(void) { return PM_SUSPEND_ON; }
|
|
|
|
#endif /* !CONFIG_PM_AUTOSLEEP */
|
|
|
|
#ifdef CONFIG_PM_WAKELOCKS
|
|
|
|
/* kernel/power/wakelock.c */
|
|
extern ssize_t pm_show_wakelocks(char *buf, bool show_active);
|
|
extern int pm_wake_lock(const char *buf);
|
|
extern int pm_wake_unlock(const char *buf);
|
|
|
|
#endif /* !CONFIG_PM_WAKELOCKS */
|