Changes in 4.9.229 power: supply: bq24257_charger: Replace depends on REGMAP_I2C with select clk: sunxi: Fix incorrect usage of round_down() i2c: piix4: Detect secondary SMBus controller on AMD AM4 chipsets iio: pressure: bmp280: Tolerate IRQ before registering clk: qcom: msm8916: Fix the address location of pll->config_reg backlight: lp855x: Ensure regulators are disabled on probe failure ARM: integrator: Add some Kconfig selections ALSA: isa/wavefront: prevent out of bounds write in ioctl scsi: qla2xxx: Fix issue with adapter's stopping state iio: bmp280: fix compensation of humidity i2c: pxa: clear all master action bits in i2c_pxa_stop_message() usblp: poison URBs upon disconnect PCI: aardvark: Don't blindly enable ASPM L0s and don't write to read-only register ps3disk: use the default segment boundary vfio/pci: fix memory leaks in alloc_perm_bits() mfd: wm8994: Fix driver operation if loaded as modules scsi: lpfc: Fix lpfc_nodelist leak when processing unsolicited event clk: clk-flexgen: fix clock-critical handling powerpc/perf/hv-24x7: Fix inconsistent output values incase multiple hv-24x7 events run nfsd: Fix svc_xprt refcnt leak when setup callback client failed powerpc/crashkernel: Take "mem=" option into account yam: fix possible memory leak in yam_init_driver mksysmap: Fix the mismatch of '.L' symbols in System.map scsi: sr: Fix sr_probe() missing deallocate of device minor scsi: ibmvscsi: Don't send host info in adapter info MAD after LPM ALSA: usb-audio: Improve frames size computation s390/qdio: put thinint indicator after early error tty: hvc: Fix data abort due to race in hvc_open staging: sm750fb: add missing case while setting FB_VISUAL i2c: pxa: fix i2c_pxa_scream_blue_murder() debug output serial: amba-pl011: Make sure we initialize the port.lock spinlock drivers: base: Fix NULL pointer exception in __platform_driver_probe() if a driver developer is foolish PCI: rcar: Fix incorrect programming of OB windows PCI/ASPM: Allow ASPM on links to PCIe-to-PCI/PCI-X Bridges power: supply: lp8788: Fix an error handling path in 'lp8788_charger_probe()' power: supply: smb347-charger: IRQSTAT_D is volatile scsi: mpt3sas: Fix double free warnings dlm: remove BUG() before panic() clk: ti: composite: fix memory leak tty: n_gsm: Fix SOF skipping tty: n_gsm: Fix waking up upper tty layer when room available powerpc/pseries/ras: Fix FWNMI_VALID off by one powerpc/ps3: Fix kexec shutdown hang vfio-pci: Mask cap zero usb/ohci-platform: Fix a warning when hibernating drm/msm/mdp5: Fix mdp5_init error path for failed mdp5_kms allocation USB: host: ehci-mxc: Add error handling in ehci_mxc_drv_probe() tty: n_gsm: Fix bogus i++ in gsm_data_kick clk: samsung: exynos5433: Add IGNORE_UNUSED flag to sclk_i2s1 powerpc/64s/pgtable: fix an undefined behaviour PCI/PTM: Inherit Switch Downstream Port PTM settings from Upstream Port IB/cma: Fix ports memory leak in cma_configfs watchdog: da9062: No need to ping manually before setting timeout usb: dwc2: gadget: move gadget resume after the core is in L0 state USB: gadget: udc: s3c2410_udc: Remove pointless NULL check in s3c2410_udc_nuke usb: gadget: lpc32xx_udc: don't dereference ep pointer before null check usb: gadget: fix potential double-free in m66592_probe. usb: gadget: Fix issue with config_ep_by_speed function clk: bcm2835: Fix return type of bcm2835_register_gate net: sunrpc: Fix off-by-one issues in 'rpc_ntop6' NFSv4.1 fix rpc_call_done assignment for BIND_CONN_TO_SESSION extcon: adc-jack: Fix an error handling path in 'adc_jack_probe()' ASoC: fsl_asrc_dma: Fix dma_chan leak when config DMA channel failed openrisc: Fix issue with argument clobbering for clone/fork gfs2: Allow lock_nolock mount to specify jid=X scsi: iscsi: Fix reference count leak in iscsi_boot_create_kobj pinctrl: imxl: Fix an error handling path in 'imx1_pinctrl_core_probe()' crypto: omap-sham - add proper load balancing support for multicore lib/zlib: remove outdated and incorrect pre-increment optimization include/linux/bitops.h: avoid clang shift-count-overflow warnings elfnote: mark all .note sections SHF_ALLOC selftests/vm/pkeys: fix alloc_random_pkey() to make it really random selftests/net: in timestamping, strncpy needs to preserve null byte scsi: acornscsi: Fix an error handling path in acornscsi_probe() usb/xhci-plat: Set PM runtime as active on resume usb/ehci-platform: Set PM runtime as active on resume perf report: Fix NULL pointer dereference in hists__fprintf_nr_sample_events() bcache: fix potential deadlock problem in btree_gc_coalesce block: Fix use-after-free in blkdev_get() libata: Use per port sync for detach drm: encoder_slave: fix refcouting error for modules drm/dp_mst: Reformat drm_dp_check_act_status() a bit drm/qxl: Use correct notify port address when creating cursor ring selinux: fix double free ext4: fix partial cluster initialization when splitting extent drm/dp_mst: Increase ACT retry timeout to 3s x86/boot/compressed: Relax sed symbol type regex for LLVM ld.lld block: nr_sects_write(): Disable preemption on seqcount write s390: fix syscall_get_error for compat processes drm/i915: Whitelist context-local timestamp in the gen9 cmdparser crypto: algboss - don't wait during notifier callback kprobes: Fix to protect kick_kprobe_optimizer() by kprobe_mutex powerpc/kprobes: Fixes for kprobe_lookup_name() on BE x86/kprobes: Avoid kretprobe recursion bug kretprobe: Prevent triggering kretprobe from within kprobe_flush_task e1000e: Do not wake up the system via WOL if device wakeup is disabled sched/rt, net: Use CONFIG_PREEMPTION.patch net: core: device_rename: Use rwsem instead of a seqcount media: dvb_frontend: initialize variable s with FE_NONE instead of 0 media: dvb/frontend.h: move out a private internal structure media: dvb/frontend.h: document the uAPI file media: dvb_frontend: get rid of get_property() callback media: stv0288: get rid of set_property boilerplate media: stv6110: get rid of a srate dead code media: friio-fe: get rid of set_property() media: dvb_frontend: get rid of set_property() callback media: dvb_frontend: cleanup dvb_frontend_ioctl_properties() media: dvb_frontend: cleanup ioctl handling logic media: dvb_frontend: get rid of property cache's state media: dvb_frontend: better document the -EPERM condition media: dvb_frontend: fix return values for FE_SET_PROPERTY media: dvb_frontend: dtv_property_process_set() cleanups media: dvb_frontend: be sure to init dvb_frontend_handle_ioctl() return code media: dvb_frontend: Add unlocked_ioctl in dvb_frontend.c media: dvb_frontend: Add compat_ioctl callback media: dvb_frontend: Add commands implementation for compat ioct media: dvb_frontend: fix wrong cast in compat_ioctl media: dvb_frontend: fix return error code mtd: rawnand: Pass a nand_chip object to nand_release() mtd: rawnand: diskonchip: Fix the probe error path mtd: rawnand: sharpsl: Fix the probe error path mtd: rawnand: xway: Fix the probe error path mtd: rawnand: orion: Fix the probe error path mtd: rawnand: socrates: Fix the probe error path mtd: rawnand: plat_nand: Fix the probe error path mtd: rawnand: mtk: Fix the probe error path mtd: rawnand: tmio: Fix the probe error path scsi: scsi_devinfo: handle non-terminated strings l2tp: Allow duplicate session creation with UDP net: sched: export __netdev_watchdog_up() fix a braino in "sparc32: fix register window handling in genregs32_[gs]et()" mld: fix memory leak in ipv6_mc_destroy_dev() net: fix memleak in register_netdevice() net: usb: ax88179_178a: fix packet alignment padding rocker: fix incorrect error handling in dma_rings_init rxrpc: Fix notification call on completion of discarded calls tg3: driver sleeps indefinitely when EEH errors exceed eeh_max_freezes ip_tunnel: fix use-after-free in ip_tunnel_lookup() tcp_cubic: fix spurious HYSTART_DELAY exit upon drop in min RTT ip6_gre: fix use-after-free in ip6gre_tunnel_lookup() tcp: grow window for OOO packets only for SACK flows sctp: Don't advertise IPv4 addresses if ipv6only is set on the socket net: Fix the arp error in some cases net: Do not clear the sock TX queue in sk_set_socket() net: core: reduce recursion limit value USB: ohci-sm501: Add missed iounmap() in remove usb: dwc2: Postponed gadget registration to the udc class driver usb: add USB_QUIRK_DELAY_INIT for Logitech C922 USB: ehci: reopen solution for Synopsys HC bug usb: host: ehci-exynos: Fix error check in exynos_ehci_probe() ALSA: usb-audio: add quirk for Denon DCD-1500RE xhci: Fix incorrect EP_STATE_MASK xhci: Fix enumeration issue when setting max packet size for FS devices. cdc-acm: Add DISABLE_ECHO quirk for Microchip/SMSC chip ALSA: usb-audio: uac1: Invalidate ctl on interrupt ALSA: usb-audio: Clean up mixer element list traverse ALSA: usb-audio: Fix OOB access of mixer element list xhci: Poll for U0 after disabling USB2 LPM cifs/smb3: Fix data inconsistent when punch hole cifs/smb3: Fix data inconsistent when zero file range efi/esrt: Fix reference count leak in esre_create_sysfs_entry. RDMA/mad: Fix possible memory leak in ib_mad_post_receive_mads() net: qed: fix left elements count calculation net: qed: fix NVMe login fails over VFs net: qed: fix excessive QM ILT lines consumption ARM: imx5: add missing put_device() call in imx_suspend_alloc_ocram() usb: gadget: udc: Potential Oops in error handling code netfilter: ipset: fix unaligned atomic access sched/core: Fix PI boosting between RT and DEADLINE tasks ata/libata: Fix usage of page address by page_address in ata_scsi_mode_select_xlat function net: alx: fix race condition in alx_remove s390/ptrace: fix setting syscall number kbuild: improve cc-option to clean up all temporary files blktrace: break out of blktrace setup on concurrent calls ALSA: hda: Add NVIDIA codec IDs 9a & 9d through a0 to patch table ACPI: sysfs: Fix pm_profile_attr type KVM: X86: Fix MSR range of APIC registers in X2APIC mode mm/slab: use memzero_explicit() in kzfree() ocfs2: load global_inode_alloc ocfs2: fix value of OCFS2_INVALID_SLOT ocfs2: fix panic on nfs server over ocfs2 arm64: perf: Report the PC value in REGS_ABI_32 mode tracing: Fix event trigger to accept redundant spaces drm/radeon: fix fb_div check in ni_init_smc_spll_table() sunrpc: fixed rollback in rpc_gssd_dummy_populate() SUNRPC: Properly set the @subbuf parameter of xdr_buf_subsegment() pNFS/flexfiles: Fix list corruption if the mirror count changes NFSv4 fix CLOSE not waiting for direct IO compeletion xfs: add agf freeblocks verify in xfs_agf_verify Revert "tty: hvc: Fix data abort due to race in hvc_open" Linux 4.9.229 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I0ce84c8f4c2c437fee36399c358c3dcc19fdfc1d
281 lines
7.3 KiB
C
281 lines
7.3 KiB
C
/*
|
|
* Code to handle transition of Linux booting another kernel.
|
|
*
|
|
* Copyright (C) 2002-2003 Eric Biederman <ebiederm@xmission.com>
|
|
* GameCube/ppc32 port Copyright (C) 2004 Albert Herranz
|
|
* Copyright (C) 2005 IBM Corporation.
|
|
*
|
|
* This source code is licensed under the GNU General Public License,
|
|
* Version 2. See the file COPYING for more details.
|
|
*/
|
|
|
|
#include <linux/kexec.h>
|
|
#include <linux/reboot.h>
|
|
#include <linux/threads.h>
|
|
#include <linux/memblock.h>
|
|
#include <linux/of.h>
|
|
#include <linux/irq.h>
|
|
#include <linux/ftrace.h>
|
|
|
|
#include <asm/machdep.h>
|
|
#include <asm/pgalloc.h>
|
|
#include <asm/prom.h>
|
|
#include <asm/sections.h>
|
|
|
|
void machine_kexec_mask_interrupts(void) {
|
|
unsigned int i;
|
|
struct irq_desc *desc;
|
|
|
|
for_each_irq_desc(i, desc) {
|
|
struct irq_chip *chip;
|
|
|
|
chip = irq_desc_get_chip(desc);
|
|
if (!chip)
|
|
continue;
|
|
|
|
if (chip->irq_eoi && irqd_irq_inprogress(&desc->irq_data))
|
|
chip->irq_eoi(&desc->irq_data);
|
|
|
|
if (chip->irq_mask)
|
|
chip->irq_mask(&desc->irq_data);
|
|
|
|
if (chip->irq_disable && !irqd_irq_disabled(&desc->irq_data))
|
|
chip->irq_disable(&desc->irq_data);
|
|
}
|
|
}
|
|
|
|
void machine_crash_shutdown(struct pt_regs *regs)
|
|
{
|
|
default_machine_crash_shutdown(regs);
|
|
}
|
|
|
|
/*
|
|
* Do what every setup is needed on image and the
|
|
* reboot code buffer to allow us to avoid allocations
|
|
* later.
|
|
*/
|
|
int machine_kexec_prepare(struct kimage *image)
|
|
{
|
|
if (ppc_md.machine_kexec_prepare)
|
|
return ppc_md.machine_kexec_prepare(image);
|
|
else
|
|
return default_machine_kexec_prepare(image);
|
|
}
|
|
|
|
void machine_kexec_cleanup(struct kimage *image)
|
|
{
|
|
}
|
|
|
|
void arch_crash_save_vmcoreinfo(void)
|
|
{
|
|
|
|
#ifdef CONFIG_NEED_MULTIPLE_NODES
|
|
VMCOREINFO_SYMBOL(node_data);
|
|
VMCOREINFO_LENGTH(node_data, MAX_NUMNODES);
|
|
#endif
|
|
#ifndef CONFIG_NEED_MULTIPLE_NODES
|
|
VMCOREINFO_SYMBOL(contig_page_data);
|
|
#endif
|
|
#if defined(CONFIG_PPC64) && defined(CONFIG_SPARSEMEM_VMEMMAP)
|
|
VMCOREINFO_SYMBOL(vmemmap_list);
|
|
VMCOREINFO_SYMBOL(mmu_vmemmap_psize);
|
|
VMCOREINFO_SYMBOL(mmu_psize_defs);
|
|
VMCOREINFO_STRUCT_SIZE(vmemmap_backing);
|
|
VMCOREINFO_OFFSET(vmemmap_backing, list);
|
|
VMCOREINFO_OFFSET(vmemmap_backing, phys);
|
|
VMCOREINFO_OFFSET(vmemmap_backing, virt_addr);
|
|
VMCOREINFO_STRUCT_SIZE(mmu_psize_def);
|
|
VMCOREINFO_OFFSET(mmu_psize_def, shift);
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
* Do not allocate memory (or fail in any way) in machine_kexec().
|
|
* We are past the point of no return, committed to rebooting now.
|
|
*/
|
|
void machine_kexec(struct kimage *image)
|
|
{
|
|
int save_ftrace_enabled;
|
|
|
|
save_ftrace_enabled = __ftrace_enabled_save();
|
|
|
|
if (ppc_md.machine_kexec)
|
|
ppc_md.machine_kexec(image);
|
|
else
|
|
default_machine_kexec(image);
|
|
|
|
__ftrace_enabled_restore(save_ftrace_enabled);
|
|
|
|
/* Fall back to normal restart if we're still alive. */
|
|
machine_restart(NULL);
|
|
for(;;);
|
|
}
|
|
|
|
void __init reserve_crashkernel(void)
|
|
{
|
|
unsigned long long crash_size, crash_base, total_mem_sz;
|
|
int ret;
|
|
|
|
total_mem_sz = memory_limit ? memory_limit : memblock_phys_mem_size();
|
|
/* use common parsing */
|
|
ret = parse_crashkernel(boot_command_line, total_mem_sz,
|
|
&crash_size, &crash_base);
|
|
if (ret == 0 && crash_size > 0) {
|
|
crashk_res.start = crash_base;
|
|
crashk_res.end = crash_base + crash_size - 1;
|
|
}
|
|
|
|
if (crashk_res.end == crashk_res.start) {
|
|
crashk_res.start = crashk_res.end = 0;
|
|
return;
|
|
}
|
|
|
|
/* We might have got these values via the command line or the
|
|
* device tree, either way sanitise them now. */
|
|
|
|
crash_size = resource_size(&crashk_res);
|
|
|
|
#ifndef CONFIG_NONSTATIC_KERNEL
|
|
if (crashk_res.start != KDUMP_KERNELBASE)
|
|
printk("Crash kernel location must be 0x%x\n",
|
|
KDUMP_KERNELBASE);
|
|
|
|
crashk_res.start = KDUMP_KERNELBASE;
|
|
#else
|
|
if (!crashk_res.start) {
|
|
#ifdef CONFIG_PPC64
|
|
/*
|
|
* On 64bit we split the RMO in half but cap it at half of
|
|
* a small SLB (128MB) since the crash kernel needs to place
|
|
* itself and some stacks to be in the first segment.
|
|
*/
|
|
crashk_res.start = min(0x8000000ULL, (ppc64_rma_size / 2));
|
|
#else
|
|
crashk_res.start = KDUMP_KERNELBASE;
|
|
#endif
|
|
}
|
|
|
|
crash_base = PAGE_ALIGN(crashk_res.start);
|
|
if (crash_base != crashk_res.start) {
|
|
printk("Crash kernel base must be aligned to 0x%lx\n",
|
|
PAGE_SIZE);
|
|
crashk_res.start = crash_base;
|
|
}
|
|
|
|
#endif
|
|
crash_size = PAGE_ALIGN(crash_size);
|
|
crashk_res.end = crashk_res.start + crash_size - 1;
|
|
|
|
/* The crash region must not overlap the current kernel */
|
|
if (overlaps_crashkernel(__pa(_stext), _end - _stext)) {
|
|
printk(KERN_WARNING
|
|
"Crash kernel can not overlap current kernel\n");
|
|
crashk_res.start = crashk_res.end = 0;
|
|
return;
|
|
}
|
|
|
|
/* Crash kernel trumps memory limit */
|
|
if (memory_limit && memory_limit <= crashk_res.end) {
|
|
memory_limit = crashk_res.end + 1;
|
|
total_mem_sz = memory_limit;
|
|
printk("Adjusted memory limit for crashkernel, now 0x%llx\n",
|
|
memory_limit);
|
|
}
|
|
|
|
printk(KERN_INFO "Reserving %ldMB of memory at %ldMB "
|
|
"for crashkernel (System RAM: %ldMB)\n",
|
|
(unsigned long)(crash_size >> 20),
|
|
(unsigned long)(crashk_res.start >> 20),
|
|
(unsigned long)(total_mem_sz >> 20));
|
|
|
|
if (!memblock_is_region_memory(crashk_res.start, crash_size) ||
|
|
memblock_reserve(crashk_res.start, crash_size)) {
|
|
pr_err("Failed to reserve memory for crashkernel!\n");
|
|
crashk_res.start = crashk_res.end = 0;
|
|
return;
|
|
}
|
|
}
|
|
|
|
int overlaps_crashkernel(unsigned long start, unsigned long size)
|
|
{
|
|
return (start + size) > crashk_res.start && start <= crashk_res.end;
|
|
}
|
|
|
|
/* Values we need to export to the second kernel via the device tree. */
|
|
static phys_addr_t kernel_end;
|
|
static phys_addr_t crashk_base;
|
|
static phys_addr_t crashk_size;
|
|
static unsigned long long mem_limit;
|
|
|
|
static struct property kernel_end_prop = {
|
|
.name = "linux,kernel-end",
|
|
.length = sizeof(phys_addr_t),
|
|
.value = &kernel_end,
|
|
};
|
|
|
|
static struct property crashk_base_prop = {
|
|
.name = "linux,crashkernel-base",
|
|
.length = sizeof(phys_addr_t),
|
|
.value = &crashk_base
|
|
};
|
|
|
|
static struct property crashk_size_prop = {
|
|
.name = "linux,crashkernel-size",
|
|
.length = sizeof(phys_addr_t),
|
|
.value = &crashk_size,
|
|
};
|
|
|
|
static struct property memory_limit_prop = {
|
|
.name = "linux,memory-limit",
|
|
.length = sizeof(unsigned long long),
|
|
.value = &mem_limit,
|
|
};
|
|
|
|
#define cpu_to_be_ulong __PASTE(cpu_to_be, BITS_PER_LONG)
|
|
|
|
static void __init export_crashk_values(struct device_node *node)
|
|
{
|
|
/* There might be existing crash kernel properties, but we can't
|
|
* be sure what's in them, so remove them. */
|
|
of_remove_property(node, of_find_property(node,
|
|
"linux,crashkernel-base", NULL));
|
|
of_remove_property(node, of_find_property(node,
|
|
"linux,crashkernel-size", NULL));
|
|
|
|
if (crashk_res.start != 0) {
|
|
crashk_base = cpu_to_be_ulong(crashk_res.start),
|
|
of_add_property(node, &crashk_base_prop);
|
|
crashk_size = cpu_to_be_ulong(resource_size(&crashk_res));
|
|
of_add_property(node, &crashk_size_prop);
|
|
}
|
|
|
|
/*
|
|
* memory_limit is required by the kexec-tools to limit the
|
|
* crash regions to the actual memory used.
|
|
*/
|
|
mem_limit = cpu_to_be_ulong(memory_limit);
|
|
of_update_property(node, &memory_limit_prop);
|
|
}
|
|
|
|
static int __init kexec_setup(void)
|
|
{
|
|
struct device_node *node;
|
|
|
|
node = of_find_node_by_path("/chosen");
|
|
if (!node)
|
|
return -ENOENT;
|
|
|
|
/* remove any stale properties so ours can be found */
|
|
of_remove_property(node, of_find_property(node, kernel_end_prop.name, NULL));
|
|
|
|
/* information needed by userspace when using default_machine_kexec */
|
|
kernel_end = cpu_to_be_ulong(__pa(_end));
|
|
of_add_property(node, &kernel_end_prop);
|
|
|
|
export_crashk_values(node);
|
|
|
|
of_node_put(node);
|
|
return 0;
|
|
}
|
|
late_initcall(kexec_setup);
|