Skip to content

Commit

Permalink
Merge branch 'release-1.3.0'
Browse files Browse the repository at this point in the history
* release-1.3.0:
  Revert "Revert "rtc: alarm: Add power-on alarm feature""
  staging: ion: msm: Apply d82ad70 to msm_ion_custom_ioctl
  BACKPORT: staging: android: ion: Pull out ion ioctls to a separate file
  Linux 3.18.124
  ebtables: arpreply: Add the standard target sanity check
  ubifs: Check for name being NULL while mounting
  cgroup: Fix deadlock in cpu hotplug path
  ext4: avoid running out of journal credits when appending to an inline file
  jbd2: don't mark block as modified if the handle is out of credits
  ext4: add more inode number paranoia checks
  ext4: never move the system.data xattr out of the inode body
  ext4: always verify the magic number in xattr blocks
  ext4: add corruption check in ext4_xattr_set_entry()
  ext4: fix false negatives *and* false positives in ext4_check_descriptors()
  ext4: always check block group bounds in ext4_init_block_bitmap()
  ext4: fix check to prevent initializing reserved inodes
  ext4: only look at the bg_flags field if it is valid
  USB: serial: simple: add Motorola Tetra MTP6550 id
  PM / core: Clear the direct_complete flag on errors
  mac80211: fix setting IEEE80211_KEY_FLAG_RX_MGMT for AP mode keys
  PCI: Reprogram bridge prefetch registers on resume
  x86/vdso: Fix vDSO syscall fallback asm constraint regression
  x86/vdso: Fix asm constraints on vDSO syscall fallbacks
  fbdev/omapfb: fix omapfb_memory_read infoleak
  proc: restrict kernel stack dumps to root
  mtd: fsl-quadspi: fix macro collision problems with READ/WRITE
  Make file credentials available to the seqfile interfaces
  dm thin metadata: fix __udivdi3 undefined on 32-bit
  ocfs2: fix locking for res->tracking and dlm->tracking_list
  crypto: mxs-dcp - Fix wait logic on chan threads
  smb2: fix missing files in root share directory listing
  xen: fix GCC warning and remove duplicate EVTCHN_ROW/EVTCHN_COL usage
  xen/manage: don't complain about an empty value in control/sysrq node
  cifs: read overflow in is_valid_oplock_break()
  s390/qeth: don't dump past end of unknown HW header
  r8169: Clear RTL_FLAG_TASK_*_PENDING when clearing RTL_FLAG_TASK_ENABLED
  hexagon: modify ffs() and fls() to return int
  arch/hexagon: fix kernel/dma.c build warning
  dm thin metadata: try to avoid ever aborting transactions
  fs/cifs: suppress a string overflow warning
  USB: yurex: Check for truncation in yurex_read()
  RDMA/ucma: check fd type in ucma_migrate_id()
  mm: madvise(MADV_DODUMP): allow hugetlbfs pages
  tools/vm/page-types.c: fix "defined but not used" warning
  tools/vm/slabinfo.c: fix sign-compare warning
  mac80211: shorten the IBSS debug messages
  mac80211: Fix station bandwidth setting after channel switch
  mac80211: fix a race between restart and CSA flows
  fs/cifs: don't translate SFM_SLASH (U+F026) to backslash
  net: cadence: Fix a sleep-in-atomic-context bug in macb_halt_tx()
  RAID10 BUG_ON in raise_barrier when force is true and conf->barrier is 0
  cfg80211: nl80211_update_ft_ies() to validate NL80211_ATTR_IE
  gpio: adp5588: Fix sleep-in-atomic-context bug
  mac80211: correct use of IEEE80211_VHT_CAP_RXSTBC_X
  KVM: PPC: Book3S HV: Don't truncate HPTE index in xlate function
  media: v4l: event: Prevent freeing event subscriptions while accessed
  arm64: KVM: Sanitize PSTATE.M when being set from userspace
  hwmon: (adt7475) Make adt7475_read_word() return errors
  e1000: ensure to free old tx/rx rings in set_ringparam()
  e1000: check on netif_running() before calling e1000_up()
  thermal: of-thermal: disable passive polling when thermal zone is disabled
  ext4: verify the depth of extent tree in ext4_find_extent()
  arm64: KVM: Tighten guest core register access from userspace
  staging: android: ion: fix ION_IOC_{MAP,SHARE} use-after-free
  scsi: target: iscsi: Use bin2hex instead of a re-implementation
  USB: remove LPM management from usb_driver_claim_interface()
  Revert "usb: cdc-wdm: Fix a sleep-in-atomic-context bug in service_outstanding_interrupt()"
  USB: usbdevfs: restore warning for nonsensical flags
  USB: usbdevfs: sanitize flags more
  media: uvcvideo: Support realtek's UVC 1.5 device
  slub: make ->cpu_partial unsigned int
  USB: handle NULL config in usb_find_alt_setting()
  USB: fix error handling in usb_driver_claim_interface()
  spi: rspi: Fix interrupted DMA transfers
  spi: sh-msiof: Fix handling of write value for SISTR register
  spi: tegra20-slink: explicitly enable/disable clock
  serial: cpm_uart: return immediately from console poll
  floppy: Do not copy a kernel pointer to user memory in FDGETPRM ioctl
  nfsd: fix corrupted reply to badly ordered compound
  module: exclude SHN_UNDEF symbols from kallsyms api
  ASoC: dapm: Fix potential DAI widget pointer deref when linking DAIs
  scsi: bnx2i: add error handling for ioremap_nocache
  HID: hid-ntrig: add error handling for sysfs_create_group
  ARM: mvebu: declare asm symbols as character arrays in pmsu.c
  wlcore: Add missing PM call for wlcore_cmd_wait_for_event_or_timeout()
  rndis_wlan: potential buffer overflow in rndis_wlan_auth_indication()
  ALSA: hda: Add AZX_DCAPS_PM_RUNTIME for AMD Raven Ridge
  media: tm6000: add error handling for dvb_register_adapter
  drivers/tty: add error handling for pcmcia_loop_config
  staging: android: ashmem: Fix mmap size validation
  media: soc_camera: ov772x: correct setting of banding filter
  media: s3c-camif: ignore -ENOIOCTLCMD from v4l2_subdev_call for s_power
  ALSA: snd-aoa: add of_node_put() in error path
  s390/extmem: fix gcc 8 stringop-overflow warning
  alarmtimer: Prevent overflow for relative nanosleep
  usb: wusbcore: security: cast sizeof to int for comparison
  scsi: ibmvscsi: Improve strings handling
  scsi: target/iscsi: Make iscsit_ta_authentication() respect the output buffer size
  x86/tsc: Add missing header to tsc_msr.c
  powerpc/kdump: Handle crashkernel memory reservation failure
  media: exynos4-is: Prevent NULL pointer dereference in __isp_video_try_fmt()
  USB: serial: kobil_sct: fix modem-status error handling
  uwb: hwa-rc: fix memory leak at probe
  x86/numa_emulation: Fix emulated-to-physical node mapping
  tsl2550: fix lux1_input error in low light
  crypto: skcipher - Fix -Wstringop-truncation warnings
  HID: sony: Support DS4 dongle
  HID: sony: Update device ids
  arm64: Add trace_hardirqs_off annotation in ret_to_user
  ext4: don't mark mmp buffer head dirty
  ext4: fix online resize's handling of a too-small final block group
  ext4: recalucate superblock checksum after updating free blocks/inodes
  ext4: avoid divide by zero fault when deleting corrupted inline directories
  ocfs2: fix ocfs2 read block panic
  scsi: target: iscsi: Use hex2bin instead of a re-implementation
  ipv6: fix possible use-after-free in ip6_xmit()
  neighbour: confirm neigh entries when ARP packet is received
  net: hp100: fix always-true check for link up state
  net/appletalk: fix minor pointer leak to userspace in SIOCFINDIPDDPRT
  gso_segment: Reset skb->mac_len after modifying network header
  mm: shmem.c: Correctly annotate new inodes for lockdep
  ring-buffer: Allow for rescheduling when removing pages
  ALSA: emu10k1: fix possible info leak to userspace on SNDRV_EMU10K1_IOCTL_INFO
  ALSA: bebob: use address returned by kmalloc() instead of kernel stack for streaming DMA mapping
  ASoC: cs4265: fix MMTLR Data switch control
  Linux 3.18.123
  USB: serial: ti_usb_3410_5052: fix array underflow in completion handler
  drm/panel: type promotion bug in s6e8aa0_read_mtp_id()
  ALSA: pcm: Fix snd_interval_refine first/last with open min/max
  rtc: bq4802: add error handling for devm_ioremap
  parport: sunbpp: fix error return code
  ARM: hisi: check of_iomap and fix missing of_node_put
  ARM: hisi: handle of_iomap and fix missing of_node_put
  MIPS: loongson64: cs5536: Fix PCI_OHCI_INT_REG reads
  mtdchar: fix overflows in adjustment of `count`
  audit: fix use-after-free in audit_add_watch
  binfmt_elf: Respect error return from `regset->active'
  CIFS: fix wrapping bugs in num_entries()
  cifs: prevent integer overflow in nxt_dir_entry()
  usb: cdc-wdm: Fix a sleep-in-atomic-context bug in service_outstanding_interrupt()
  USB: yurex: Fix buffer over-read in yurex_write()
  usb: misc: uss720: Fix two sleep-in-atomic-context bugs
  USB: serial: io_ti: fix array underflow in completion handler
  usb: host: u132-hcd: Fix a sleep-in-atomic-context bug in u132_get_frame()
  usb: Avoid use-after-free by flushing endpoints early in usb_set_interface()
  USB: Add quirk to support DJI CineSSD
  usb: Don't die twice if PCI xhci host is not responding in resume
  Tools: hv: Fix a bug in the key delete code
  IB/ipoib: Avoid a race condition between start_xmit and cm_rep_handler
  xen/netfront: fix waiting for xenbus state change
  pstore: Fix incorrect persistent ram buffer mapping
  RDMA/cma: Protect cma dev list with lock
  platform/x86: toshiba_acpi: Fix defined but not used build warnings
  s390/qeth: reset layer2 attribute on layer switch
  s390/qeth: fix race in used-buffer accounting
  mac80211: restrict delayed tailroom needed decrement
  powerpc/powernv: opal_put_chars partial write fix
  perf powerpc: Fix callchain ip filtering
  fbdev: Distinguish between interlaced and progressive modes
  perf powerpc: Fix callchain ip filtering when return address is in a register
  fbdev/via: fix defined but not used warning
  video: goldfishfb: fix memory leak on driver remove
  fbdev: omapfb: off by one in omapfb_register_client()
  mtd/maps: fix solutionengine.c printk format warnings
  MIPS: ath79: fix system restart
  gfs2: Special-case rindex for gfs2_grow
  xfrm: fix 'passing zero to ERR_PTR()' warning
  ALSA: usb-audio: Fix multiple definitions in AU0828_DEVICE() macro
  ALSA: msnd: Fix the default sample sizes
  mm: get rid of vmacache_flush_all() entirely
  netfilter: x_tables: avoid stack-out-of-bounds read in xt_copy_counters_from_user
  xhci: Fix use-after-free in xhci_free_virt_device
  MIPS: WARN_ON invalid DMA cache maintenance, not BUG_ON
  f2fs: fix to do sanity check with {sit,nat}_ver_bitmap_bytesize
  mfd: ti_am335x_tscadc: Fix struct clk memory leak
  partitions/aix: fix usage of uninitialized lv_info and lvname structures
  partitions/aix: append null character to print data from disk
  net: dcb: For wild-card lookups, use priority -1, not 0
  net: mvneta: fix mtu change on port without link
  gpio: ml-ioh: Fix buffer underwrite on probe error path
  x86/mm: Remove in_nmi() warning from vmalloc_fault()
  Bluetooth: hidp: Fix handling of strncpy for hid->name information
  scsi: 3ware: fix return 0 on the error path of probe
  ata: libahci: Correct setting of DEVSLP register
  MIPS: Fix ISA virt/bus conversion for non-zero PHYS_OFFSET
  ath10k: prevent active scans on potential unusable channels
  macintosh/via-pmu: Add missing mmio accessors
  tty: rocket: Fix possible buffer overwrite on register_PCI
  uio: potential double frees if __uio_register_device() fails
  md/raid5: fix data corruption of replacements after originals dropped
  scsi: target: fix __transport_register_session locking
  Bluetooth: h5: Fix missing dependency on BT_HCIUART_SERDEV
  staging/rts5208: Fix read overflow in memcpy
  staging: rt5208: Fix a sleep-in-atomic bug in xd_copy_page
  kthread: fix boot hang (regression) on MIPS/OpenRISC
  kthread: Fix use-after-free if kthread fork fails
  cfq: Give a chance for arming slice idle timer in case of group_idle
  i2c: xiic: Make the start and the byte count write atomic
  ASoC: wm8994: Fix missing break in switch
  Fixes: Commit 86af955 ("mm: numa: avoid waiting on freed migrated pages")
  enic: do not call enic_change_mtu in enic_probe
  irda: Only insert new objects into the global database via setsockopt
  irda: Fix memory leak caused by repeated binds of irda socket
  kbuild: make missing $DEPMOD a Warning instead of an Error
  debugobjects: Make stack check warning more informative
  btrfs: Don't remove block group that still has pinned down bytes
  btrfs: relocation: Only remove reloc rb_trees if reloc control has been initialized
  btrfs: replace: Reset on-disk dev stats value after replace
  powerpc/pseries: Avoid using the size greater than RTAS_ERROR_LOG_MAX.
  SMB3: Number of requests sent should be displayed for SMB3 not just CIFS
  smb3: fix reset of bytes read and written stats
  selftests/powerpc: Kill child processes on SIGINT
  staging: comedi: ni_mio_common: fix subdevice flags for PFI subdevice
  dm kcopyd: avoid softlockup in run_complete_job
  PCI: mvebu: Fix I/O space end address calculation
  scsi: aic94xx: fix an error code in aic94xx_init()
  s390/dasd: fix hanging offline processing due to canceled worker
  powerpc: Fix size calculation using resource_size()
  net/9p: fix error path of p9_virtio_probe
  platform/x86: asus-nb-wmi: Add keymap entry for lid flip action on UX360
  mfd: sm501: Set coherent_dma_mask when creating subdevices
  ipvs: fix race between ip_vs_conn_new() and ip_vs_del_dest()
  mm/fadvise.c: fix signed overflow UBSAN complaint
  scripts: modpost: check memory allocation results
  fat: validate ->i_start before using
  reiserfs: change j_timestamp type to time64_t
  fork: don't copy inconsistent signal handler state to child
  hfs: prevent crash on exit from failed search
  hfsplus: don't return 0 when fill_super() failed
  cifs: check if SMB2 PDU size has been padded and suppress the warning
  ASoC: msm: qdsp6v2: use correct stream id of next session
  msm: mdss: Fix Gamma LUT bounds condition
  msm: kgsl: Add a property to find if secure context is supported
  msm: kgsl: Add a property to find alignment of secure buffers
  ARM: dts: msm: Enable reset via PM_RESIN_N for mdm9650 CV2X
  ARM: dts: msm: Enable use-default-batt-values for apq8009-dragon
  msm: ipa: Validate routing rule id
  net: core: null pointer derefernce in sockev_client_cb
  ASoC: msm: qdsp6v2: Fix rtac memory unmap issue in ASM driver
  netfilter: ebtables: CONFIG_COMPAT: don't trust userland offsets
  netfilter: ebtables: CONFIG_COMPAT: don't trust userland offsets
  ARM: dts: msm: Invert interrupt polarity for K61 on mdm9650 CV2X
  msm:ipa: Prevent NAT table deletion only if public ip is not assigned
  msm: ipa3: Add mutex to prevent race condition
  diag: Prevent out of bound access while initializing msg mask
  ARM: dts: msm: Add wlan naples support to apq8009 dragon refboard
  Revert "rtc: alarm: Add power-on alarm feature"
  ARM: dts: msm: Enable mhi_dev IPC_RTR export for mdm9650 CV2X
  crypto: msm: Fix device stuck issue
  nl80211: nl80211_update_ft_ies to validate NL80211_ATTR_IE
  mmc: sd: limit SD card power limit according to cards capabilities
  ARM: dts: msm: Add QDSD_BOOT_CTL to sdhci node for MSM8953 MTP.
  msm: ais: Fix out-of-bounds read in string class name
  msm:ais:Handling bigger value than upper bound in msm_cpp_irq api
  net: memset smsg to avoid the padding data
  mdss: mdp: Fix fudge factor overflow check
  ARM: dts: msm: Support IPC with PCIe host for mdm9650 EP TTP
  ARM: dts: msm: Enable reset via PM_RESIN_N for mdm9650 PCIe EP TTP
  ASoC: msm: qdsp6v2: align param size of PSPD matrix
  msm: ep_pcie: Apply gpio settings based on the device tree flags
  UPSTREAM: scsi: sg: don't return bogus Sg_requests
  msm: camera: cpp: Check for valid tx level
  ASoC: msm: add new dai link for compress capture for apq8009
  ASoC: msm: qdsp6v2: add routing controls to support compress capture
  ARM: dts: msm: Fix address and size width for common cma node for sdx20
  futex: Replace barrier() in unqueue_me() with READ_ONCE()
  futex: Remove requirement for lock_page() in get_futex_key()
  BACKPORT: futex: Prevent overflow by strengthen input validation
  diag: Allocate DCI memory using vzalloc instead of kzalloc
  defconfig: msm: enable MSM_SYSMON_COMM for 8909
  defconfig: Enable rng driver for msm8909
  msm: ipa: Add WLAN FW SSR event
  msm: camera: Fix for Possible information leak issue
  fbdev: msm: Fix unintialisation of variables
  ASoC: msm: qdsp6v2: update backend name
  power: qpnp-charger: Fix null pointer dereference error
  • Loading branch information
joshchoo committed Oct 25, 2018
2 parents dc712da + 6597ff9 commit a6ba708
Show file tree
Hide file tree
Showing 291 changed files with 5,245 additions and 3,409 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
VERSION = 3
PATCHLEVEL = 18
SUBLEVEL = 122
SUBLEVEL = 124
EXTRAVERSION =
NAME = Diseased Newt

Expand Down
90 changes: 89 additions & 1 deletion arch/arm/boot/dts/qcom/apq8009-dragon.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,33 @@
status = "disabled";
};

cnss_sdio: qcom,cnss_sdio {
compatible = "qcom,cnss_sdio";
subsys-name = "AR6320";
/**
* There is no vdd-wlan on board and this is not for DSRC.
* IO and XTAL share the same vreg.
*/
vdd-wlan-io-supply = <&pm8916_l5>;
qcom,wlan-ramdump-dynamic = <0x200000>;
qcom,msm-bus,name = "msm-cnss";
qcom,msm-bus,num-cases = <4>;
qcom,msm-bus,num-paths = <1>;
qcom,msm-bus,vectors-KBps =
<79 512 0 0>, /* No vote */
<79 512 6250 200000>, /* 50 Mbps */
<79 512 25000 200000>, /* 200 Mbps */
<79 512 2048000 4096000>; /* MAX */
};

qcom,wcnss-wlan@a000000 {
status = "disabled";
};

qcom,pronto@a21b000 {
status = "disabled";
};

bluetooth: bt_qca9379 {
compatible = "qca,qca9379";
qca,bt-reset-gpio = <&msm_gpio 47 0>; /* BT_EN */
Expand All @@ -105,8 +132,62 @@
};
};

&msm_gpio {
sdc2_wlan_gpio_on: sdc2_wlan_gpio_on {
mux {
pins = "gpio43";
function = "gpio";
};
config {
pins = "gpio43";
drive-strength = <10>;
bias-pull-up;
output-high;
};
};

sdc2_wlan_gpio_off: sdc2_wlan_gpio_off {
mux {
pins = "gpio43";
function = "gpio";
};
config {
pins = "gpio43";
drive-strength = <2>;
bias-disable;
output-low;
};
};
};

&sdhc_2 {
status = "disabled";
/delete-property/cd-gpios;
#address-cells = <0>;
interrupt-parent = <&sdhc_2>;
interrupts = <0 1 2>;
#interrupt-cells = <1>;
interrupt-map-mask = <0xffffffff>;
interrupt-map = <0 &intc 0 125 0>,
<1 &intc 0 221 0>,
<2 &msm_gpio 40 0x1>;
interrupt-names = "hc_irq", "pwr_irq", "sdiowakeup_irq";

qcom,vdd-voltage-level = <1800000 2950000>;
qcom,vdd-current-level = <15000 400000>;

qcom,vdd-io-voltage-level = <1800000 1800000>;
qcom,vdd-io-current-level = <200 50000>;
qcom,clk-rates = <400000 25000000 50000000 100000000 200000000>;
qcom,bus-speed-mode = "SDR12", "SDR25", "SDR50", "DDR50", "SDR104";

pinctrl-names = "active", "sleep";
pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on
&sdc2_wlan_gpio_on>;
pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off
&sdc2_wlan_gpio_off>;
qcom,nonremovable;
qcom,core_3_0v_support;
status = "ok";
};

&usb_otg {
Expand Down Expand Up @@ -164,3 +245,10 @@
status = "ok";
qcom,disable-bms;
};

&pm8916_chg {
status = "ok";
qcom,charging-disabled;
qcom,use-default-batt-values;
};

26 changes: 25 additions & 1 deletion arch/arm/boot/dts/qcom/mdm9650-cv2x.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,15 @@
pps {
use-system-time-ts;
};

qcom,ipc_router_external_ap_xprt {
compatible = "qcom,ipc-router-mhi-dev-xprt";
qcom,out-chan-id = <20>;
qcom,in-chan-id = <21>;
qcom,xprt-remote = "external-ap";
qcom,xprt-linkid = <2>;
qcom,xprt-version = <1>;
};
};

&cnss_pcie {
Expand Down Expand Up @@ -97,7 +106,7 @@
spi-max-frequency = <4800000>;
reg = <0>;
interrupt-parent = <&tlmm_pinmux>;
interrupts = <68 0>;
interrupts = <68 IRQ_TYPE_EDGE_RISING>;
reset-gpio = <&tlmm_pinmux 89 GPIO_ACTIVE_LOW>;
pinctrl-names = "active", "sleep";
pinctrl-0 = <&can_rst_on>;
Expand Down Expand Up @@ -321,3 +330,18 @@
qcom,vadc-thermal-node;
};
};

&pmd9650_pon {
interrupts = <0x0 0x8 0x0>, <0x0 0x8 0x1>;
interrupt-names = "kpdpwr", "resin";
qcom,s3-src = "resin";

qcom,pon_2 {
qcom,pon-type = <1>;
qcom,support-reset = <1>;
qcom,s1-timer = <0>;
qcom,s2-timer = <2000>;
qcom,s2-type = <7>;
qcom,pull-up = <1>;
};
};
36 changes: 33 additions & 3 deletions arch/arm/boot/dts/qcom/mdm9650-pcie-ep-ttp.dts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@

/dts-v1/;

#include <dt-bindings/gpio/gpio.h>
#include "mdm9650-v1.1-mtp.dtsi"

/ {
model = "Qualcomm Technologies, Inc. MDM 9650 PCIE EP TTP";
compatible = "qcom,mdm9650-ttp", "qcom,mdm9650", "qcom,ttp";
Expand Down Expand Up @@ -165,7 +167,8 @@

&pcie_ep {
status = "ok";
mdm2apstatus-gpio = <&tlmm_pinmux 85 0>;
mdm2apstatus-gpio = <&tlmm_pinmux 64 GPIO_ACTIVE_LOW>;
clkreq-gpio = <&tlmm_pinmux 85 0>;
};

&pcie0 {
Expand All @@ -182,13 +185,40 @@

&pcie0_mdm2apstatus_default {
mux {
pins = "gpio85";
pins = "gpio64";
function = "gpio";
};

config {
pins = "gpio64";
drive-strength = <2>;
bias-pull-up;
};
};

&pcie0_clkreq_default {
mux {
pins = "gpio85";
function = "gpio";
};
config {
pins = "gpio85";
drive-strength = <2>;
bias-pull-down;
bias-pull-up;
};
};

&pmd9650_pon {
interrupts = <0x0 0x8 0x0>, <0x0 0x8 0x1>;
interrupt-names = "kpdpwr", "resin";
qcom,s3-src = "resin";

qcom,pon_2 {
qcom,pon-type = <1>;
qcom,support-reset = <1>;
qcom,s1-timer = <0>;
qcom,s2-timer = <2000>;
qcom,s2-type = <7>;
qcom,pull-up = <1>;
};
};
8 changes: 5 additions & 3 deletions arch/arm/boot/dts/qcom/msm8953.dtsi
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
Expand Down Expand Up @@ -1772,8 +1772,10 @@

sdhc_1: sdhci@7824900 {
compatible = "qcom,sdhci-msm";
reg = <0x7824900 0x500>, <0x7824000 0x800>, <0x7824e00 0x200>;
reg-names = "hc_mem", "core_mem", "cmdq_mem";
reg = <0x7824900 0x500>, <0x7824000 0x800>, <0x7824e00 0x200>,
<0x0119d000 0x4>;
reg-names = "hc_mem", "core_mem", "cmdq_mem",
"tlmm_mem";

interrupts = <0 123 0>, <0 138 0>;
interrupt-names = "hc_irq", "pwr_irq";
Expand Down
6 changes: 3 additions & 3 deletions arch/arm/boot/dts/qcom/sdx20.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@
&reserved_mem {
linux,cma {
compatible = "shared-dma-pool";
alloc-ranges = <0 0x00000000 0 0x90000000>;
alloc-ranges = <0 0x90000000>;
reusable;
alignment = <0 0x400000>;
size = <0 0xc00000>;
alignment = <0x400000>;
size = <0xc00000>;
linux,cma-default;
};
};
Expand Down
2 changes: 2 additions & 0 deletions arch/arm/configs/msm8909-perf_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,7 @@ CONFIG_SERIAL_MSM_HS=y
CONFIG_SERIAL_MSM_SMD=y
CONFIG_DIAG_CHAR=y
CONFIG_HW_RANDOM=y
CONFIG_HW_RANDOM_MSM_LEGACY=y
CONFIG_MSM_SMD_PKT=y
CONFIG_MSM_ADSPRPC=y
CONFIG_I2C_CHARDEV=y
Expand Down Expand Up @@ -484,6 +485,7 @@ CONFIG_MSM_QMI_INTERFACE=y
CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y
CONFIG_MSM_EVENT_TIMER=y
CONFIG_MSM_SUBSYSTEM_RESTART=y
CONFIG_MSM_SYSMON_COMM=y
CONFIG_MSM_PIL=y
CONFIG_MSM_PIL_SSR_GENERIC=y
CONFIG_MSM_PIL_MSS_QDSP6V5=y
Expand Down
1 change: 1 addition & 0 deletions arch/arm/configs/msm8909_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,7 @@ CONFIG_MSM_QMI_INTERFACE=y
CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y
CONFIG_MSM_EVENT_TIMER=y
CONFIG_MSM_SUBSYSTEM_RESTART=y
CONFIG_MSM_SYSMON_COMM=y
CONFIG_MSM_PIL=y
CONFIG_MSM_PIL_SSR_GENERIC=y
CONFIG_MSM_PIL_MSS_QDSP6V5=y
Expand Down
33 changes: 22 additions & 11 deletions arch/arm/mach-hisi/hotplug.c
Original file line number Diff line number Diff line change
Expand Up @@ -145,13 +145,20 @@ static int hi3xxx_hotplug_init(void)
struct device_node *node;

node = of_find_compatible_node(NULL, NULL, "hisilicon,sysctrl");
if (node) {
ctrl_base = of_iomap(node, 0);
id = HI3620_CTRL;
return 0;
if (!node) {
id = ERROR_CTRL;
return -ENOENT;
}
id = ERROR_CTRL;
return -ENOENT;

ctrl_base = of_iomap(node, 0);
of_node_put(node);
if (!ctrl_base) {
id = ERROR_CTRL;
return -ENOMEM;
}

id = HI3620_CTRL;
return 0;
}

void hi3xxx_set_cpu(int cpu, bool enable)
Expand All @@ -170,11 +177,15 @@ static bool hix5hd2_hotplug_init(void)
struct device_node *np;

np = of_find_compatible_node(NULL, NULL, "hisilicon,cpuctrl");
if (np) {
ctrl_base = of_iomap(np, 0);
return true;
}
return false;
if (!np)
return false;

ctrl_base = of_iomap(np, 0);
of_node_put(np);
if (!ctrl_base)
return false;

return true;
}

void hix5hd2_set_cpu(int cpu, bool enable)
Expand Down
6 changes: 3 additions & 3 deletions arch/arm/mach-mvebu/pmsu.c
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@ void mvebu_pmsu_set_cpu_boot_addr(int hw_cpu, void *boot_addr)
PMSU_BOOT_ADDR_REDIRECT_OFFSET(hw_cpu));
}

extern unsigned char mvebu_boot_wa_start;
extern unsigned char mvebu_boot_wa_end;
extern unsigned char mvebu_boot_wa_start[];
extern unsigned char mvebu_boot_wa_end[];

/*
* This function sets up the boot address workaround needed for SMP
Expand All @@ -131,7 +131,7 @@ int mvebu_setup_boot_addr_wa(unsigned int crypto_eng_target,
phys_addr_t resume_addr_reg)
{
void __iomem *sram_virt_base;
u32 code_len = &mvebu_boot_wa_end - &mvebu_boot_wa_start;
u32 code_len = mvebu_boot_wa_end - mvebu_boot_wa_start;

mvebu_mbus_del_window(BOOTROM_BASE, BOOTROM_SIZE);
mvebu_mbus_add_window_by_id(crypto_eng_target, crypto_eng_attribute,
Expand Down
5 changes: 5 additions & 0 deletions arch/arm64/include/asm/kvm_emulate.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ void kvm_inject_undefined(struct kvm_vcpu *vcpu);
void kvm_inject_dabt(struct kvm_vcpu *vcpu, unsigned long addr);
void kvm_inject_pabt(struct kvm_vcpu *vcpu, unsigned long addr);

static inline bool vcpu_el1_is_32bit(struct kvm_vcpu *vcpu)
{
return !(vcpu->arch.hcr_el2 & HCR_RW);
}

static inline void vcpu_reset_hcr(struct kvm_vcpu *vcpu)
{
vcpu->arch.hcr_el2 = HCR_GUEST_FLAGS;
Expand Down
3 changes: 3 additions & 0 deletions arch/arm64/kernel/entry.S
Original file line number Diff line number Diff line change
Expand Up @@ -845,6 +845,9 @@ work_pending:
bl do_notify_resume
b ret_to_user
work_resched:
#ifdef CONFIG_TRACE_IRQFLAGS
bl trace_hardirqs_off // the IRQs are off here, inform the tracing code
#endif
bl schedule

/*
Expand Down
Loading

0 comments on commit a6ba708

Please sign in to comment.