Changes in 4.9.249 spi: bcm2835aux: Fix use-after-free on unbind spi: bcm2835aux: Restore err assignment in bcm2835aux_spi_probe iwlwifi: pcie: limit memory read spin time arm64: dts: rockchip: Assign a fixed index to mmc devices on rk3399 boards. ARC: stack unwinding: don't assume non-current task is sleeping platform/x86: acer-wmi: add automatic keyboard background light toggle key as KEY_LIGHTS_TOGGLE Input: cm109 - do not stomp on control URB Input: i8042 - add Acer laptops to the i8042 reset list pinctrl: amd: remove debounce filter setting in IRQ type setting scsi: be2iscsi: Revert "Fix a theoretical leak in beiscsi_create_eqs()" spi: Prevent adding devices below an unregistering controller net/mlx4_en: Avoid scheduling restart task if it is already running tcp: fix cwnd-limited bug for TSO deferral where we send nothing net: stmmac: delete the eee_ctrl_timer after napi disabled net: stmmac: dwmac-meson8b: fix mask definition of the m250_sel mux net: bridge: vlan: fix error return code in __vlan_add() mac80211: mesh: fix mesh_pathtbl_init() error path USB: dummy-hcd: Fix uninitialized array use in init() USB: add RESET_RESUME quirk for Snapscan 1212 ALSA: usb-audio: Fix potential out-of-bounds shift ALSA: usb-audio: Fix control 'access overflow' errors from chmap xhci: Give USB2 ports time to enter U3 in bus suspend USB: sisusbvga: Make console support depend on BROKEN ALSA: pcm: oss: Fix potential out-of-bounds shift serial: 8250_omap: Avoid FIFO corruption caused by MDR1 access pinctrl: merrifield: Set default bias in case no particular value given pinctrl: baytrail: Avoid clearing debounce value when turning it off scsi: bnx2i: Requires MMU can: softing: softing_netdev_open(): fix error handling RDMA/cm: Fix an attempt to use non-valid pointer when cleaning timewait kernel/cpu: add arch override for clear_tasks_mm_cpumask() mm handling drm/tegra: sor: Disable clocks on error in tegra_sor_init() scsi: mpt3sas: Increase IOCInit request timeout to 30s dm table: Remove BUG_ON(in_interrupt()) soc/tegra: fuse: Fix index bug in get_process_id USB: serial: option: add interface-number sanity check to flag handling USB: gadget: f_acm: add support for SuperSpeed Plus USB: gadget: f_midi: setup SuperSpeed Plus descriptors USB: gadget: f_rndis: fix bitrate for SuperSpeed and above usb: gadget: f_fs: Re-use SS descriptors for SuperSpeedPlus usb: chipidea: ci_hdrc_imx: Pass DISABLE_DEVICE_STREAMING flag to imx6ul ARM: dts: exynos: fix roles of USB 3.0 ports on Odroid XU ARM: dts: exynos: fix USB 3.0 VBUS control and over-current pins on Exynos5410 ARM: dts: exynos: fix USB 3.0 pins supply being turned off on Odroid XU HID: i2c-hid: add Vero K147 to descriptor override serial_core: Check for port state when tty is in error state media: msi2500: assign SPI bus number dynamically md: fix a warning caused by a race between concurrent md_ioctl()s Bluetooth: Fix slab-out-of-bounds read in hci_le_direct_adv_report_evt() drm/gma500: fix double free of gma_connector RDMA/rxe: Compute PSN windows correctly ARM: p2v: fix handling of LPAE translation in BE mode crypto: talitos - Fix return type of current_desc_hdr() spi: img-spfi: fix reference leak in img_spfi_resume ASoC: pcm: DRAIN support reactivation arm64: dts: exynos: Correct psci compatible used on Exynos7 Bluetooth: Fix null pointer dereference in hci_event_packet() spi: spi-ti-qspi: fix reference leak in ti_qspi_setup spi: tegra20-slink: fix reference leak in slink ops of tegra20 spi: tegra20-sflash: fix reference leak in tegra_sflash_resume spi: tegra114: fix reference leak in tegra spi ops RDMa/mthca: Work around -Wenum-conversion warning MIPS: BCM47XX: fix kconfig dependency bug for BCM47XX_BCMA staging: greybus: codecs: Fix reference counter leak in error handling media: solo6x10: fix missing snd_card_free in error handling case drm/omap: dmm_tiler: fix return error code in omap_dmm_probe() Input: ads7846 - fix integer overflow on Rt calculation Input: ads7846 - fix unaligned access on 7845 powerpc/feature: Fix CPU_FTRS_ALWAYS by removing CPU_FTRS_GENERIC_32 crypto: omap-aes - Fix PM disable depth imbalance in omap_aes_probe soc: ti: knav_qmss: fix reference leak in knav_queue_probe soc: ti: Fix reference imbalance in knav_dma_probe drivers: soc: ti: knav_qmss_queue: Fix error return code in knav_queue_probe RDMA/cxgb4: Validate the number of CQEs memstick: fix a double-free bug in memstick_check ARM: dts: at91: sama5d4_xplained: add pincontrol for USB Host ARM: dts: at91: sama5d3_xplained: add pincontrol for USB Host orinoco: Move context allocation after processing the skb cw1200: fix missing destroy_workqueue() on error in cw1200_init_common media: siano: fix memory leak of debugfs members in smsdvb_hotplug mips: cdmm: fix use-after-free in mips_cdmm_bus_discover HSI: omap_ssi: Don't jump to free ID in ssi_add_controller() ARM: dts: at91: at91sam9rl: fix ADC triggers NFSv4.2: condition READDIR's mask for security label based on LSM state SUNRPC: xprt_load_transport() needs to support the netid "rdma6" lockd: don't use interval-based rebinding over TCP NFS: switch nfsiod to be an UNBOUND workqueue. vfio-pci: Use io_remap_pfn_range() for PCI IO memory media: saa7146: fix array overflow in vidioc_s_audio() clocksource/drivers/cadence_ttc: Fix memory leak in ttc_setup_clockevent() pinctrl: falcon: add missing put_device() call in pinctrl_falcon_probe() memstick: r592: Fix error return in r592_probe() ASoC: jz4740-i2s: add missed checks for clk_get() dm ioctl: fix error return code in target_message clocksource/drivers/arm_arch_timer: Correct fault programming of CNTKCTL_EL1.EVNTI cpufreq: highbank: Add missing MODULE_DEVICE_TABLE cpufreq: st: Add missing MODULE_DEVICE_TABLE cpufreq: loongson1: Add missing MODULE_ALIAS cpufreq: scpi: Add missing MODULE_ALIAS scsi: pm80xx: Fix error return in pm8001_pci_probe() seq_buf: Avoid type mismatch for seq_buf_init scsi: fnic: Fix error return code in fnic_probe() powerpc/pseries/hibernation: drop pseries_suspend_begin() from suspend ops usb: ehci-omap: Fix PM disable depth umbalance in ehci_hcd_omap_probe usb: oxu210hp-hcd: Fix memory leak in oxu_create speakup: fix uninitialized flush_lock nfsd: Fix message level for normal termination nfs_common: need lock during iterate through the list x86/kprobes: Restore BTF if the single-stepping is cancelled clk: tegra: Fix duplicated SE clock entry extcon: max77693: Fix modalias string ASoC: wm_adsp: remove "ctl" from list on error in wm_adsp_create_control() irqchip/alpine-msi: Fix freeing of interrupts on allocation error path um: chan_xterm: Fix fd leak nfc: s3fwrn5: Release the nfc firmware powerpc/ps3: use dma_mapping_error() checkpatch: fix unescaped left brace net: bcmgenet: Fix a resource leak in an error handling path in the probe functin net: allwinner: Fix some resources leak in the error handling path of the probe and in the remove function net: korina: fix return value watchdog: qcom: Avoid context switch in restart handler clk: ti: Fix memleak in ti_fapll_synth_setup perf record: Fix memory leak when using '--user-regs=?' to list registers qlcnic: Fix error code in probe clk: s2mps11: Fix a resource leak in error handling paths in the probe function cfg80211: initialize rekey_data Input: cros_ec_keyb - send 'scancodes' in addition to key events Input: goodix - add upside-down quirk for Teclast X98 Pro tablet media: gspca: Fix memory leak in probe media: sunxi-cir: ensure IR is handled when it is continuous media: netup_unidvb: Don't leak SPI master in probe error path Input: cyapa_gen6 - fix out-of-bounds stack access Revert "ACPI / resources: Use AE_CTRL_TERMINATE to terminate resources walks" ACPI: PNP: compare the string length in the matching_id() ALSA: pcm: oss: Fix a few more UBSAN fixes ALSA: usb-audio: Disable sample read check if firmware doesn't give back s390/dasd: prevent inconsistent LCU device data s390/dasd: fix list corruption of pavgroup group list s390/dasd: fix list corruption of lcu list staging: comedi: mf6x4: Fix AI end-of-conversion detection powerpc/perf: Exclude kernel samples while counting events in user space. USB: serial: mos7720: fix parallel-port state restore USB: serial: keyspan_pda: fix dropped unthrottle interrupts USB: serial: keyspan_pda: fix write deadlock USB: serial: keyspan_pda: fix stalled writes USB: serial: keyspan_pda: fix write-wakeup use-after-free USB: serial: keyspan_pda: fix tx-unthrottle use-after-free USB: serial: keyspan_pda: fix write unthrottling btrfs: quota: Set rescan progress to (u64)-1 if we hit last leaf btrfs: scrub: Don't use inode page cache in scrub_handle_errored_block() Btrfs: fix selftests failure due to uninitialized i_mode in test inodes btrfs: fix return value mixup in btrfs_get_extent ext4: fix a memory leak of ext4_free_data KVM: arm64: Introduce handling of AArch32 TTBCR2 traps powerpc/xmon: Change printk() to pr_cont() ceph: fix race in concurrent __ceph_remove_cap invocations jffs2: Fix GC exit abnormally jfs: Fix array index bounds check in dbAdjTree drm/dp_aux_dev: check aux_dev before use in drm_dp_aux_dev_get_by_minor() spi: spi-sh: Fix use-after-free on unbind spi: davinci: Fix use-after-free on unbind spi: pic32: Don't leak DMA channels in probe error path spi: rb4xx: Don't leak SPI master in probe error path spi: sc18is602: Don't leak SPI master in probe error path spi: st-ssc4: Fix unbalanced pm_runtime_disable() in probe error path soc: qcom: smp2p: Safely acquire spinlock without IRQs mtd: parser: cmdline: Fix parsing of part-names with colons iio: buffer: Fix demux update iio: adc: rockchip_saradc: fix missing clk_disable_unprepare() on error in rockchip_saradc_resume iio:pressure:mpl3115: Force alignment of buffer clk: mvebu: a3700: fix the XTAL MODE pin to MPP1_9 xen-blkback: set ring->xenblkd to NULL after kthread_stop() PCI: Fix pci_slot_release() NULL pointer dereference Linux 4.9.249 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I4829a32e2ea6e76eefea716f35f42ee02b75c265
283 lines
6.6 KiB
C
283 lines
6.6 KiB
C
/*
|
|
* Copyright (C) 2010 Brian King IBM Corporation
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*/
|
|
|
|
#include <linux/cpu.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/suspend.h>
|
|
#include <linux/stat.h>
|
|
#include <asm/firmware.h>
|
|
#include <asm/hvcall.h>
|
|
#include <asm/machdep.h>
|
|
#include <asm/mmu.h>
|
|
#include <asm/rtas.h>
|
|
#include <asm/topology.h>
|
|
#include "../../kernel/cacheinfo.h"
|
|
|
|
static u64 stream_id;
|
|
static struct device suspend_dev;
|
|
static DECLARE_COMPLETION(suspend_work);
|
|
static struct rtas_suspend_me_data suspend_data;
|
|
static atomic_t suspending;
|
|
|
|
/**
|
|
* pseries_suspend_begin - First phase of hibernation
|
|
*
|
|
* Check to ensure we are in a valid state to hibernate
|
|
*
|
|
* Return value:
|
|
* 0 on success / other on failure
|
|
**/
|
|
static int pseries_suspend_begin(suspend_state_t state)
|
|
{
|
|
long vasi_state, rc;
|
|
unsigned long retbuf[PLPAR_HCALL_BUFSIZE];
|
|
|
|
/* Make sure the state is valid */
|
|
rc = plpar_hcall(H_VASI_STATE, retbuf, stream_id);
|
|
|
|
vasi_state = retbuf[0];
|
|
|
|
if (rc) {
|
|
pr_err("pseries_suspend_begin: vasi_state returned %ld\n",rc);
|
|
return rc;
|
|
} else if (vasi_state == H_VASI_ENABLED) {
|
|
return -EAGAIN;
|
|
} else if (vasi_state != H_VASI_SUSPENDING) {
|
|
pr_err("pseries_suspend_begin: vasi_state returned state %ld\n",
|
|
vasi_state);
|
|
return -EIO;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* pseries_suspend_cpu - Suspend a single CPU
|
|
*
|
|
* Makes the H_JOIN call to suspend the CPU
|
|
*
|
|
**/
|
|
static int pseries_suspend_cpu(void)
|
|
{
|
|
if (atomic_read(&suspending))
|
|
return rtas_suspend_cpu(&suspend_data);
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* pseries_suspend_enable_irqs
|
|
*
|
|
* Post suspend configuration updates
|
|
*
|
|
**/
|
|
static void pseries_suspend_enable_irqs(void)
|
|
{
|
|
/*
|
|
* Update configuration which can be modified based on device tree
|
|
* changes during resume.
|
|
*/
|
|
cacheinfo_cpu_offline(smp_processor_id());
|
|
post_mobility_fixup();
|
|
cacheinfo_cpu_online(smp_processor_id());
|
|
}
|
|
|
|
/**
|
|
* pseries_suspend_enter - Final phase of hibernation
|
|
*
|
|
* Return value:
|
|
* 0 on success / other on failure
|
|
**/
|
|
static int pseries_suspend_enter(suspend_state_t state)
|
|
{
|
|
int rc = rtas_suspend_last_cpu(&suspend_data);
|
|
|
|
atomic_set(&suspending, 0);
|
|
atomic_set(&suspend_data.done, 1);
|
|
return rc;
|
|
}
|
|
|
|
/**
|
|
* pseries_prepare_late - Prepare to suspend all other CPUs
|
|
*
|
|
* Return value:
|
|
* 0 on success / other on failure
|
|
**/
|
|
static int pseries_prepare_late(void)
|
|
{
|
|
atomic_set(&suspending, 1);
|
|
atomic_set(&suspend_data.working, 0);
|
|
atomic_set(&suspend_data.done, 0);
|
|
atomic_set(&suspend_data.error, 0);
|
|
suspend_data.complete = &suspend_work;
|
|
reinit_completion(&suspend_work);
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* store_hibernate - Initiate partition hibernation
|
|
* @dev: subsys root device
|
|
* @attr: device attribute struct
|
|
* @buf: buffer
|
|
* @count: buffer size
|
|
*
|
|
* Write the stream ID received from the HMC to this file
|
|
* to trigger hibernating the partition
|
|
*
|
|
* Return value:
|
|
* number of bytes printed to buffer / other on failure
|
|
**/
|
|
static ssize_t store_hibernate(struct device *dev,
|
|
struct device_attribute *attr,
|
|
const char *buf, size_t count)
|
|
{
|
|
cpumask_var_t offline_mask;
|
|
int rc;
|
|
|
|
if (!capable(CAP_SYS_ADMIN))
|
|
return -EPERM;
|
|
|
|
if (!alloc_cpumask_var(&offline_mask, GFP_TEMPORARY))
|
|
return -ENOMEM;
|
|
|
|
stream_id = simple_strtoul(buf, NULL, 16);
|
|
|
|
do {
|
|
rc = pseries_suspend_begin(PM_SUSPEND_MEM);
|
|
if (rc == -EAGAIN)
|
|
ssleep(1);
|
|
} while (rc == -EAGAIN);
|
|
|
|
if (!rc) {
|
|
/* All present CPUs must be online */
|
|
cpumask_andnot(offline_mask, cpu_present_mask,
|
|
cpu_online_mask);
|
|
rc = rtas_online_cpus_mask(offline_mask);
|
|
if (rc) {
|
|
pr_err("%s: Could not bring present CPUs online.\n",
|
|
__func__);
|
|
goto out;
|
|
}
|
|
|
|
stop_topology_update();
|
|
rc = pm_suspend(PM_SUSPEND_MEM);
|
|
start_topology_update();
|
|
|
|
/* Take down CPUs not online prior to suspend */
|
|
if (!rtas_offline_cpus_mask(offline_mask))
|
|
pr_warn("%s: Could not restore CPUs to offline "
|
|
"state.\n", __func__);
|
|
}
|
|
|
|
stream_id = 0;
|
|
|
|
if (!rc)
|
|
rc = count;
|
|
out:
|
|
free_cpumask_var(offline_mask);
|
|
return rc;
|
|
}
|
|
|
|
#define USER_DT_UPDATE 0
|
|
#define KERN_DT_UPDATE 1
|
|
|
|
/**
|
|
* show_hibernate - Report device tree update responsibilty
|
|
* @dev: subsys root device
|
|
* @attr: device attribute struct
|
|
* @buf: buffer
|
|
*
|
|
* Report whether a device tree update is performed by the kernel after a
|
|
* resume, or if drmgr must coordinate the update from user space.
|
|
*
|
|
* Return value:
|
|
* 0 if drmgr is to initiate update, and 1 otherwise
|
|
**/
|
|
static ssize_t show_hibernate(struct device *dev,
|
|
struct device_attribute *attr,
|
|
char *buf)
|
|
{
|
|
return sprintf(buf, "%d\n", KERN_DT_UPDATE);
|
|
}
|
|
|
|
static DEVICE_ATTR(hibernate, S_IWUSR | S_IRUGO,
|
|
show_hibernate, store_hibernate);
|
|
|
|
static struct bus_type suspend_subsys = {
|
|
.name = "power",
|
|
.dev_name = "power",
|
|
};
|
|
|
|
static const struct platform_suspend_ops pseries_suspend_ops = {
|
|
.valid = suspend_valid_only_mem,
|
|
.prepare_late = pseries_prepare_late,
|
|
.enter = pseries_suspend_enter,
|
|
};
|
|
|
|
/**
|
|
* pseries_suspend_sysfs_register - Register with sysfs
|
|
*
|
|
* Return value:
|
|
* 0 on success / other on failure
|
|
**/
|
|
static int pseries_suspend_sysfs_register(struct device *dev)
|
|
{
|
|
int rc;
|
|
|
|
if ((rc = subsys_system_register(&suspend_subsys, NULL)))
|
|
return rc;
|
|
|
|
dev->id = 0;
|
|
dev->bus = &suspend_subsys;
|
|
|
|
if ((rc = device_create_file(suspend_subsys.dev_root, &dev_attr_hibernate)))
|
|
goto subsys_unregister;
|
|
|
|
return 0;
|
|
|
|
subsys_unregister:
|
|
bus_unregister(&suspend_subsys);
|
|
return rc;
|
|
}
|
|
|
|
/**
|
|
* pseries_suspend_init - initcall for pSeries suspend
|
|
*
|
|
* Return value:
|
|
* 0 on success / other on failure
|
|
**/
|
|
static int __init pseries_suspend_init(void)
|
|
{
|
|
int rc;
|
|
|
|
if (!firmware_has_feature(FW_FEATURE_LPAR))
|
|
return 0;
|
|
|
|
suspend_data.token = rtas_token("ibm,suspend-me");
|
|
if (suspend_data.token == RTAS_UNKNOWN_SERVICE)
|
|
return 0;
|
|
|
|
if ((rc = pseries_suspend_sysfs_register(&suspend_dev)))
|
|
return rc;
|
|
|
|
ppc_md.suspend_disable_cpu = pseries_suspend_cpu;
|
|
ppc_md.suspend_enable_irqs = pseries_suspend_enable_irqs;
|
|
suspend_set_ops(&pseries_suspend_ops);
|
|
return 0;
|
|
}
|
|
machine_device_initcall(pseries, pseries_suspend_init);
|