Changes in 4.9.195 Revert "Bluetooth: validate BLE connection interval updates" IB/core: Add an unbound WQ type to the new CQ API HID: prodikeys: Fix general protection fault during probe HID: logitech: Fix general protection fault caused by Logitech driver HID: hidraw: Fix invalid read in hidraw_ioctl mtd: cfi_cmdset_0002: Use chip_good() to retry in do_write_oneword() crypto: talitos - fix missing break in switch statement media: tvp5150: fix switch exit in set control handler ASoC: fsl: Fix of-node refcount unbalance in fsl_ssi_probe_from_dt() ALSA: hda - Add laptop imic fixup for ASUS M9V laptop objtool: Clobber user CFLAGS variable mac80211: Print text for disassociation reason mac80211: handle deauthentication/disassociation from TDLS peer power: supply: sysfs: ratelimit property read error message locking/lockdep: Add debug_locks check in __lock_downgrade() irqchip/gic-v3-its: Fix LPI release for Multi-MSI devices f2fs: check all the data segments against all node ones Revert "f2fs: avoid out-of-range memory access" f2fs: fix to do sanity check on segment bitmap of LFS curseg drm: Flush output polling on shutdown xfs: don't crash on null attr fork xfs_bmapi_read Bluetooth: btrtl: Additional Realtek 8822CE Bluetooth devices arcnet: provide a buffer big enough to actually receive packets cdc_ncm: fix divide-by-zero caused by invalid wMaxPacketSize macsec: drop skb sk before calling gro_cells_receive net/phy: fix DP83865 10 Mbps HDX loopback disable function net: qrtr: Stop rx_worker before freeing node openvswitch: change type of UPCALL_PID attribute to NLA_UNSPEC ppp: Fix memory leak in ppp_write sch_netem: fix a divide by zero in tabledist() skge: fix checksum byte order usbnet: ignore endpoints with invalid wMaxPacketSize usbnet: sanity checking of packet sizes and device mtu mISDN: enforce CAP_NET_RAW for raw sockets appletalk: enforce CAP_NET_RAW for raw sockets ax25: enforce CAP_NET_RAW for raw sockets ieee802154: enforce CAP_NET_RAW for raw sockets nfc: enforce CAP_NET_RAW for raw sockets ALSA: hda: Flush interrupts on disabling regulator: lm363x: Fix off-by-one n_voltages for lm3632 ldo_vpos/ldo_vneg ASoC: sgtl5000: Fix charge pump source assignment dmaengine: bcm2835: Print error in case setting DMA mask fails leds: leds-lp5562 allow firmware files up to the maximum length media: dib0700: fix link error for dibx000_i2c_set_speed media: exynos4-is: fix leaked of_node references media: hdpvr: Add device num check and handling sched/fair: Fix imbalance due to CPU affinity sched/core: Fix CPU controller for !RT_GROUP_SCHED x86/reboot: Always use NMI fallback when shutdown via reboot vector IPI fails x86/apic: Soft disable APIC before initializing it ALSA: hda - Show the fatal CORB/RIRB error more clearly ALSA: i2c: ak4xxx-adda: Fix a possible null pointer dereference in build_adc_controls() media: iguanair: add sanity checks base: soc: Export soc_device_register/unregister APIs ALSA: usb-audio: Skip bSynchAddress endpoint check if it is invalid ia64:unwind: fix double free for mod->arch.init_unw_table EDAC/altera: Use the proper type for the IRQ status bits md: don't call spare_active in md_reap_sync_thread if all member devices can't work md: don't set In_sync if array is frozen efi: cper: print AER info of PCIe fatal error media: gspca: zero usb_buf on error dmaengine: iop-adma: use correct printk format strings media: omap3isp: Don't set streaming state on random subdevs net: lpc-enet: fix printk format strings ARM: dts: imx7d: cl-som-imx7: make ethernet work again media: radio/si470x: kill urb on error media: hdpvr: add terminating 0 at end of string media: dvb-core: fix a memory leak bug PM / devfreq: passive: Use non-devm notifiers PM / devfreq: exynos-bus: Correct clock enable sequence media: saa7146: add cleanup in hexium_attach() media: cpia2_usb: fix memory leaks media: saa7134: fix terminology around saa7134_i2c_eeprom_md7134_gate() media: ov9650: add a sanity check ACPI / CPPC: do not require the _PSD method arm64: kpti: ensure patched kernel text is fetched from PoU nvmet: fix data units read and written counters in SMART log iommu/amd: Silence warnings under memory pressure libtraceevent: Change users plugin directory ARM: dts: exynos: Mark LDO10 as always-on on Peach Pit/Pi Chromebooks ACPI: custom_method: fix memory leaks ACPI / PCI: fix acpi_pci_irq_enable() memory leak hwmon: (acpi_power_meter) Change log level for 'unsafe software power cap' md/raid1: fail run raid1 array when active disk less than one dmaengine: ti: edma: Do not reset reserved paRAM slots kprobes: Prohibit probing on BUG() and WARN() address s390/crypto: xts-aes-s390 fix extra run-time crypto self tests finding ASoC: dmaengine: Make the pcm->name equal to pcm->id if the name is not set mmc: sdhci: Fix incorrect switch to HS mode libertas: Add missing sentinel at end of if_usb.c fw_table e1000e: add workaround for possible stalled packet drm/amd/powerplay/smu7: enforce minimal VBITimeout (v2) media: ttusb-dec: Fix info-leak in ttusb_dec_send_command() ALSA: hda/realtek - Blacklist PC beep for Lenovo ThinkCentre M73/93 btrfs: extent-tree: Make sure we only allocate extents from block groups with the same type media: omap3isp: Set device on omap3isp subdevs PM / devfreq: passive: fix compiler warning ALSA: firewire-tascam: handle error code when getting current source of clock ALSA: firewire-tascam: check intermediate state of clock status and retry IB/hfi1: Define variables as unsigned long to fix KASAN warning printk: remove games with previous record flags printk: Do not lose last line in kmsg buffer dump fuse: fix missing unlock_page in fuse_writepage() parisc: Disable HP HSC-PCI Cards to prevent kernel crash KVM: x86: always stop emulation on page fault KVM: x86: set ctxt->have_exception in x86_decode_insn() KVM: x86: Manually calculate reserved bits when loading PDPTRS media: sn9c20x: Add MSI MS-1039 laptop to flip_dmi_table ASoC: Intel: NHLT: Fix debug print format ASoC: Intel: Fix use of potentially uninitialized variable ARM: zynq: Use memcpy_toio instead of memcpy on smp bring-up alarmtimer: Use EOPNOTSUPP instead of ENOTSUPP regulator: Defer init completion for a while after late_initcall memcg, kmem: do not fail __GFP_NOFAIL charges ovl: filter of trusted xattr results in audit Btrfs: fix use-after-free when using the tree modification log btrfs: Relinquish CPUs in btrfs_compare_trees md/raid6: Set R5_ReadError when there is read failure on parity disk cfg80211: Purge frame registrations on iftype change /dev/mem: Bail out upon SIGKILL. ext4: fix warning inside ext4_convert_unwritten_extents_endio ext4: fix punch hole for inline_data file systems quota: fix wrong condition in is_quota_modification() hwrng: core - don't wait on add_early_randomness() i2c: riic: Clear NACK in tend isr CIFS: fix max ea value size CIFS: Fix oplock handling for SMB 2.1+ protocols btrfs: qgroup: Drop quota_root and fs_info parameters from update_qgroup_status_item Btrfs: fix race setting up and completing qgroup rescan workers Linux 4.9.195 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
170 lines
4.2 KiB
C
170 lines
4.2 KiB
C
/*
|
|
* This file contains Xilinx specific SMP code, used to start up
|
|
* the second processor.
|
|
*
|
|
* Copyright (C) 2011-2013 Xilinx
|
|
*
|
|
* based on linux/arch/arm/mach-realview/platsmp.c
|
|
*
|
|
* Copyright (C) 2002 ARM Ltd.
|
|
*
|
|
* This software is licensed under the terms of the GNU General Public
|
|
* License version 2, as published by the Free Software Foundation, and
|
|
* may be copied, distributed, and modified under those terms.
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
#include <linux/export.h>
|
|
#include <linux/jiffies.h>
|
|
#include <linux/init.h>
|
|
#include <linux/io.h>
|
|
#include <asm/cacheflush.h>
|
|
#include <asm/smp_scu.h>
|
|
#include <linux/irqchip/arm-gic.h>
|
|
#include "common.h"
|
|
|
|
/*
|
|
* Store number of cores in the system
|
|
* Because of scu_get_core_count() must be in __init section and can't
|
|
* be called from zynq_cpun_start() because it is not in __init section.
|
|
*/
|
|
static int ncores;
|
|
|
|
int zynq_cpun_start(u32 address, int cpu)
|
|
{
|
|
u32 trampoline_code_size = &zynq_secondary_trampoline_end -
|
|
&zynq_secondary_trampoline;
|
|
|
|
/* MS: Expectation that SLCR are directly map and accessible */
|
|
/* Not possible to jump to non aligned address */
|
|
if (!(address & 3) && (!address || (address >= trampoline_code_size))) {
|
|
/* Store pointer to ioremap area which points to address 0x0 */
|
|
static u8 __iomem *zero;
|
|
u32 trampoline_size = &zynq_secondary_trampoline_jump -
|
|
&zynq_secondary_trampoline;
|
|
|
|
zynq_slcr_cpu_stop(cpu);
|
|
if (address) {
|
|
if (__pa(PAGE_OFFSET)) {
|
|
zero = ioremap(0, trampoline_code_size);
|
|
if (!zero) {
|
|
pr_warn("BOOTUP jump vectors not accessible\n");
|
|
return -1;
|
|
}
|
|
} else {
|
|
zero = (__force u8 __iomem *)PAGE_OFFSET;
|
|
}
|
|
|
|
/*
|
|
* This is elegant way how to jump to any address
|
|
* 0x0: Load address at 0x8 to r0
|
|
* 0x4: Jump by mov instruction
|
|
* 0x8: Jumping address
|
|
*/
|
|
memcpy_toio(zero, &zynq_secondary_trampoline,
|
|
trampoline_size);
|
|
writel(address, zero + trampoline_size);
|
|
|
|
flush_cache_all();
|
|
outer_flush_range(0, trampoline_code_size);
|
|
smp_wmb();
|
|
|
|
if (__pa(PAGE_OFFSET))
|
|
iounmap(zero);
|
|
}
|
|
zynq_slcr_cpu_start(cpu);
|
|
|
|
return 0;
|
|
}
|
|
|
|
pr_warn("Can't start CPU%d: Wrong starting address %x\n", cpu, address);
|
|
|
|
return -1;
|
|
}
|
|
EXPORT_SYMBOL(zynq_cpun_start);
|
|
|
|
static int zynq_boot_secondary(unsigned int cpu, struct task_struct *idle)
|
|
{
|
|
return zynq_cpun_start(virt_to_phys(secondary_startup), cpu);
|
|
}
|
|
|
|
/*
|
|
* Initialise the CPU possible map early - this describes the CPUs
|
|
* which may be present or become present in the system.
|
|
*/
|
|
static void __init zynq_smp_init_cpus(void)
|
|
{
|
|
int i;
|
|
|
|
ncores = scu_get_core_count(zynq_scu_base);
|
|
|
|
for (i = 0; i < ncores && i < CONFIG_NR_CPUS; i++)
|
|
set_cpu_possible(i, true);
|
|
}
|
|
|
|
static void __init zynq_smp_prepare_cpus(unsigned int max_cpus)
|
|
{
|
|
scu_enable(zynq_scu_base);
|
|
}
|
|
|
|
/**
|
|
* zynq_secondary_init - Initialize secondary CPU cores
|
|
* @cpu: CPU that is initialized
|
|
*
|
|
* This function is in the hotplug path. Don't move it into the
|
|
* init section!!
|
|
*/
|
|
static void zynq_secondary_init(unsigned int cpu)
|
|
{
|
|
zynq_core_pm_init();
|
|
}
|
|
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
|
static int zynq_cpu_kill(unsigned cpu)
|
|
{
|
|
unsigned long timeout = jiffies + msecs_to_jiffies(50);
|
|
|
|
while (zynq_slcr_cpu_state_read(cpu))
|
|
if (time_after(jiffies, timeout))
|
|
return 0;
|
|
|
|
zynq_slcr_cpu_stop(cpu);
|
|
return 1;
|
|
}
|
|
|
|
/**
|
|
* zynq_cpu_die - Let a CPU core die
|
|
* @cpu: Dying CPU
|
|
*
|
|
* Platform-specific code to shutdown a CPU.
|
|
* Called with IRQs disabled on the dying CPU.
|
|
*/
|
|
static void zynq_cpu_die(unsigned int cpu)
|
|
{
|
|
zynq_slcr_cpu_state_write(cpu, true);
|
|
|
|
/*
|
|
* there is no power-control hardware on this platform, so all
|
|
* we can do is put the core into WFI; this is safe as the calling
|
|
* code will have already disabled interrupts
|
|
*/
|
|
for (;;)
|
|
cpu_do_idle();
|
|
}
|
|
#endif
|
|
|
|
const struct smp_operations zynq_smp_ops __initconst = {
|
|
.smp_init_cpus = zynq_smp_init_cpus,
|
|
.smp_prepare_cpus = zynq_smp_prepare_cpus,
|
|
.smp_boot_secondary = zynq_boot_secondary,
|
|
.smp_secondary_init = zynq_secondary_init,
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
|
.cpu_die = zynq_cpu_die,
|
|
.cpu_kill = zynq_cpu_kill,
|
|
#endif
|
|
};
|