Changes in 4.9.190 usb: usbfs: fix double-free of usb memory upon submiturb error usb: iowarrior: fix deadlock on disconnect sound: fix a memory leak bug x86/mm: Check for pfn instead of page in vmalloc_sync_one() x86/mm: Sync also unmappings in vmalloc_sync_all() mm/vmalloc: Sync unmappings in __purge_vmap_area_lazy() perf record: Fix wrong size in perf_record_mmap for last kernel module perf db-export: Fix thread__exec_comm() perf record: Fix module size on s390 usb: yurex: Fix use-after-free in yurex_delete can: peak_usb: fix potential double kfree_skb() netfilter: nfnetlink: avoid deadlock due to synchronous request_module iscsi_ibft: make ISCSI_IBFT dependson ACPI instead of ISCSI_IBFT_FIND mac80211: don't warn about CW params when not using them hwmon: (nct6775) Fix register address and added missed tolerance for nct6106 cpufreq/pasemi: fix use-after-free in pas_cpufreq_cpu_init() s390/qdio: add sanity checks to the fast-requeue path ALSA: compress: Fix regression on compressed capture streams ALSA: compress: Prevent bypasses of set_params ALSA: compress: Don't allow paritial drain operations on capture streams ALSA: compress: Be more restrictive about when a drain is allowed perf probe: Avoid calling freeing routine multiple times for same pointer drbd: dynamically allocate shash descriptor ACPI/IORT: Fix off-by-one check in iort_dev_find_its_id() ARM: davinci: fix sleep.S build error on ARMv4 scsi: megaraid_sas: fix panic on loading firmware crashdump scsi: ibmvfc: fix WARN_ON during event pool release scsi: scsi_dh_alua: always use a 2 second delay before retrying RTPG tty/ldsem, locking/rwsem: Add missing ACQUIRE to read_failed sleep loop perf/core: Fix creating kernel counters for PMUs that override event->cpu can: peak_usb: pcan_usb_pro: Fix info-leaks to USB devices can: peak_usb: pcan_usb_fd: Fix info-leaks to USB devices hwmon: (nct7802) Fix wrong detection of in4 presence ALSA: firewire: fix a memory leak bug ALSA: hda - Don't override global PCM hw info flag mac80211: don't WARN on short WMM parameters from AP SMB3: Fix deadlock in validate negotiate hits reconnect smb3: send CAP_DFS capability during session setup mwifiex: fix 802.11n/WPA detection iwlwifi: don't unmap as page memory that was mapped as single scsi: mpt3sas: Use 63-bit DMA addressing on SAS35 HBA sh: kernel: hw_breakpoint: Fix missing break in switch statement mm/usercopy: use memory range to be accessed for wraparound check mm/memcontrol.c: fix use after free in mem_cgroup_iter() bpf: get rid of pure_initcall dependency to enable jits bpf: restrict access to core bpf sysctls bpf: add bpf_jit_limit knob to restrict unpriv allocations vhost-net: set packet weight of tx polling to 2 * vq size vhost_net: use packet weight for rx handler, too vhost_net: introduce vhost_exceeds_weight() vhost: introduce vhost_exceeds_weight() vhost_net: fix possible infinite loop vhost: scsi: add weight support siphash: add cryptographically secure PRF siphash: implement HalfSipHash1-3 for hash tables inet: switch IP ID generator to siphash netfilter: ctnetlink: don't use conntrack/expect object addresses as id xtensa: add missing isync to the cpu_reset TLB code ALSA: hda - Fix a memory leak bug ALSA: hda - Add a generic reboot_notify ALSA: hda - Let all conexant codec enter D3 when rebooting HID: holtek: test for sanity of intfdata HID: hiddev: avoid opening a disconnected device HID: hiddev: do cleanup in failure of opening a device Input: kbtab - sanity check for endpoint type Input: iforce - add sanity checks net: usb: pegasus: fix improper read if get_registers() fail xen/pciback: remove set but not used variable 'old_state' irqchip/irq-imx-gpcv2: Forward irq type to parent perf header: Fix divide by zero error if f_header.attr_size==0 perf header: Fix use of unitialized value warning libata: zpodd: Fix small read overflow in zpodd_get_mech_type() scsi: hpsa: correct scsi command status issue after reset ata: libahci: do not complain in case of deferred probe kbuild: modpost: handle KBUILD_EXTRA_SYMBOLS only for external modules arm64/efi: fix variable 'si' set but not used arm64/mm: fix variable 'pud' set but not used IB/core: Add mitigation for Spectre V1 IB/mad: Fix use-after-free in ib mad completion handling ocfs2: remove set but not used variable 'last_hash' staging: comedi: dt3000: Fix signed integer overflow 'divider * base' staging: comedi: dt3000: Fix rounding up of timer divisor USB: core: Fix races in character device registration and deregistraion usb: cdc-acm: make sure a refcount is taken early enough USB: CDC: fix sanity checks in CDC union parser USB: serial: option: add D-Link DWM-222 device ID USB: serial: option: Add support for ZTE MF871A USB: serial: option: add the BroadMobi BM818 card USB: serial: option: Add Motorola modem UARTs asm-generic: fix -Wtype-limits compiler warnings bpf: fix bpf_jit_limit knob for PAGE_SIZE >= 64K arm64: compat: Allow single-byte watchpoints on all addresses netfilter: conntrack: Use consistent ct id hash calculation Input: psmouse - fix build error of multiple definition iommu/amd: Move iommu_init_pci() to .init section bnx2x: Fix VF's VLAN reconfiguration in reload. net/packet: fix race in tpacket_snd() sctp: fix the transport error_count check xen/netback: Reset nr_frags before freeing skb net/mlx5e: Only support tx/rx pause setting for port owner net/mlx5e: Use flow keys dissector to parse packets for ARFS team: Add vlan tx offload to hw_enc_features bonding: Add vlan tx offload to hw_enc_features Linux 4.9.190 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
230 lines
5.4 KiB
ArmAsm
230 lines
5.4 KiB
ArmAsm
/*
|
|
* (C) Copyright 2009, Texas Instruments, Inc. http://www.ti.com/
|
|
*
|
|
* 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.
|
|
*
|
|
* 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
|
|
*/
|
|
|
|
/* replicated define because linux/bitops.h cannot be included in assembly */
|
|
#define BIT(nr) (1 << (nr))
|
|
|
|
#include <linux/linkage.h>
|
|
#include <asm/assembler.h>
|
|
#include "psc.h"
|
|
#include "ddr2.h"
|
|
|
|
#include "clock.h"
|
|
|
|
/* Arbitrary, hardware currently does not update PHYRDY correctly */
|
|
#define PHYRDY_CYCLES 0x1000
|
|
|
|
/* Assume 25 MHz speed for the cycle conversions since PLLs are bypassed */
|
|
#define PLL_BYPASS_CYCLES (PLL_BYPASS_TIME * 25)
|
|
#define PLL_RESET_CYCLES (PLL_RESET_TIME * 25)
|
|
#define PLL_LOCK_CYCLES (PLL_LOCK_TIME * 25)
|
|
|
|
#define DEEPSLEEP_SLEEPENABLE_BIT BIT(31)
|
|
|
|
.text
|
|
.arch armv5te
|
|
/*
|
|
* Move DaVinci into deep sleep state
|
|
*
|
|
* Note: This code is copied to internal SRAM by PM code. When the DaVinci
|
|
* wakes up it continues execution at the point it went to sleep.
|
|
* Register Usage:
|
|
* r0: contains virtual base for DDR2 controller
|
|
* r1: contains virtual base for DDR2 Power and Sleep controller (PSC)
|
|
* r2: contains PSC number for DDR2
|
|
* r3: contains virtual base DDR2 PLL controller
|
|
* r4: contains virtual address of the DEEPSLEEP register
|
|
*/
|
|
ENTRY(davinci_cpu_suspend)
|
|
stmfd sp!, {r0-r12, lr} @ save registers on stack
|
|
|
|
ldr ip, CACHE_FLUSH
|
|
blx ip
|
|
|
|
ldmia r0, {r0-r4}
|
|
|
|
/*
|
|
* Switch DDR to self-refresh mode.
|
|
*/
|
|
|
|
/* calculate SDRCR address */
|
|
ldr ip, [r0, #DDR2_SDRCR_OFFSET]
|
|
bic ip, ip, #DDR2_SRPD_BIT
|
|
orr ip, ip, #DDR2_LPMODEN_BIT
|
|
str ip, [r0, #DDR2_SDRCR_OFFSET]
|
|
|
|
ldr ip, [r0, #DDR2_SDRCR_OFFSET]
|
|
orr ip, ip, #DDR2_MCLKSTOPEN_BIT
|
|
str ip, [r0, #DDR2_SDRCR_OFFSET]
|
|
|
|
mov ip, #PHYRDY_CYCLES
|
|
1: subs ip, ip, #0x1
|
|
bne 1b
|
|
|
|
/* Disable DDR2 LPSC */
|
|
mov r7, r0
|
|
mov r0, #0x2
|
|
bl davinci_ddr_psc_config
|
|
mov r0, r7
|
|
|
|
/* Disable clock to DDR PHY */
|
|
ldr ip, [r3, #PLLDIV1]
|
|
bic ip, ip, #PLLDIV_EN
|
|
str ip, [r3, #PLLDIV1]
|
|
|
|
/* Put the DDR PLL in bypass and power down */
|
|
ldr ip, [r3, #PLLCTL]
|
|
bic ip, ip, #PLLCTL_PLLENSRC
|
|
bic ip, ip, #PLLCTL_PLLEN
|
|
str ip, [r3, #PLLCTL]
|
|
|
|
/* Wait for PLL to switch to bypass */
|
|
mov ip, #PLL_BYPASS_CYCLES
|
|
2: subs ip, ip, #0x1
|
|
bne 2b
|
|
|
|
/* Power down the PLL */
|
|
ldr ip, [r3, #PLLCTL]
|
|
orr ip, ip, #PLLCTL_PLLPWRDN
|
|
str ip, [r3, #PLLCTL]
|
|
|
|
/* Go to deep sleep */
|
|
ldr ip, [r4]
|
|
orr ip, ip, #DEEPSLEEP_SLEEPENABLE_BIT
|
|
/* System goes to sleep beyond after this instruction */
|
|
str ip, [r4]
|
|
|
|
/* Wake up from sleep */
|
|
|
|
/* Clear sleep enable */
|
|
ldr ip, [r4]
|
|
bic ip, ip, #DEEPSLEEP_SLEEPENABLE_BIT
|
|
str ip, [r4]
|
|
|
|
/* initialize the DDR PLL controller */
|
|
|
|
/* Put PLL in reset */
|
|
ldr ip, [r3, #PLLCTL]
|
|
bic ip, ip, #PLLCTL_PLLRST
|
|
str ip, [r3, #PLLCTL]
|
|
|
|
/* Clear PLL power down */
|
|
ldr ip, [r3, #PLLCTL]
|
|
bic ip, ip, #PLLCTL_PLLPWRDN
|
|
str ip, [r3, #PLLCTL]
|
|
|
|
mov ip, #PLL_RESET_CYCLES
|
|
3: subs ip, ip, #0x1
|
|
bne 3b
|
|
|
|
/* Bring PLL out of reset */
|
|
ldr ip, [r3, #PLLCTL]
|
|
orr ip, ip, #PLLCTL_PLLRST
|
|
str ip, [r3, #PLLCTL]
|
|
|
|
/* Wait for PLL to lock (assume prediv = 1, 25MHz OSCIN) */
|
|
mov ip, #PLL_LOCK_CYCLES
|
|
4: subs ip, ip, #0x1
|
|
bne 4b
|
|
|
|
/* Remove PLL from bypass mode */
|
|
ldr ip, [r3, #PLLCTL]
|
|
bic ip, ip, #PLLCTL_PLLENSRC
|
|
orr ip, ip, #PLLCTL_PLLEN
|
|
str ip, [r3, #PLLCTL]
|
|
|
|
/* Start 2x clock to DDR2 */
|
|
|
|
ldr ip, [r3, #PLLDIV1]
|
|
orr ip, ip, #PLLDIV_EN
|
|
str ip, [r3, #PLLDIV1]
|
|
|
|
/* Enable VCLK */
|
|
|
|
/* Enable DDR2 LPSC */
|
|
mov r7, r0
|
|
mov r0, #0x3
|
|
bl davinci_ddr_psc_config
|
|
mov r0, r7
|
|
|
|
/* clear MCLKSTOPEN */
|
|
|
|
ldr ip, [r0, #DDR2_SDRCR_OFFSET]
|
|
bic ip, ip, #DDR2_MCLKSTOPEN_BIT
|
|
str ip, [r0, #DDR2_SDRCR_OFFSET]
|
|
|
|
ldr ip, [r0, #DDR2_SDRCR_OFFSET]
|
|
bic ip, ip, #DDR2_LPMODEN_BIT
|
|
str ip, [r0, #DDR2_SDRCR_OFFSET]
|
|
|
|
/* Restore registers and return */
|
|
ldmfd sp!, {r0-r12, pc}
|
|
|
|
ENDPROC(davinci_cpu_suspend)
|
|
|
|
/*
|
|
* Disables or Enables DDR2 LPSC
|
|
* Register Usage:
|
|
* r0: Enable or Disable LPSC r0 = 0x3 => Enable, r0 = 0x2 => Disable LPSC
|
|
* r1: contains virtual base for DDR2 Power and Sleep controller (PSC)
|
|
* r2: contains PSC number for DDR2
|
|
*/
|
|
ENTRY(davinci_ddr_psc_config)
|
|
/* Set next state in mdctl for DDR2 */
|
|
mov r6, #MDCTL
|
|
add r6, r6, r2, lsl #2
|
|
ldr ip, [r1, r6]
|
|
bic ip, ip, #MDSTAT_STATE_MASK
|
|
orr ip, ip, r0
|
|
str ip, [r1, r6]
|
|
|
|
/* Enable the Power Domain Transition Command */
|
|
ldr ip, [r1, #PTCMD]
|
|
orr ip, ip, #0x1
|
|
str ip, [r1, #PTCMD]
|
|
|
|
/* Check for Transition Complete (PTSTAT) */
|
|
ptstat_done:
|
|
ldr ip, [r1, #PTSTAT]
|
|
and ip, ip, #0x1
|
|
cmp ip, #0x0
|
|
bne ptstat_done
|
|
|
|
/* Check for DDR2 clock disable completion; */
|
|
mov r6, #MDSTAT
|
|
add r6, r6, r2, lsl #2
|
|
ddr2clk_stop_done:
|
|
ldr ip, [r1, r6]
|
|
and ip, ip, #MDSTAT_STATE_MASK
|
|
cmp ip, r0
|
|
bne ddr2clk_stop_done
|
|
|
|
ret lr
|
|
ENDPROC(davinci_ddr_psc_config)
|
|
|
|
CACHE_FLUSH:
|
|
#ifdef CONFIG_CPU_V6
|
|
.word v6_flush_kern_cache_all
|
|
#else
|
|
.word arm926_flush_kern_cache_all
|
|
#endif
|
|
|
|
ENTRY(davinci_cpu_suspend_sz)
|
|
.word . - davinci_cpu_suspend
|
|
ENDPROC(davinci_cpu_suspend_sz)
|