265 Commits

Author SHA1 Message Date
JohnnLee
19a8d1300c Merge branch 'LA.UM.7.8.9.C2.08.00.00.618.110' via branch 'qcom-msm-4.9' into android-msm-pixel-4.9
Conflicts:
	Makefile
	drivers/char/adsprpc.c
	drivers/char/diag/diag_usb.c
	drivers/misc/qseecom.c
	drivers/mmc/core/sdio_cis.c
	drivers/mmc/host/sdhci-msm-ice.c
	drivers/net/usb/lan78xx.c
	drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c
	drivers/soc/qcom/msm_smp2p.c
	drivers/usb/gadget/function/f_gsi.c
	include/linux/sched/sysctl.h
	net/netfilter/xt_qtaguid.c

Bug: 171355577
Change-Id: I0a4d226a334a5cc7e6013dba9e0857ae197e3ca7
Signed-off-by: Johnny Lee <johnnlee@google.com>
2021-01-08 15:04:03 +08:00
lucaswei
bac74c1ae4 Merge android-4.9-q (4.9.237) into android-msm-pixel-4.9-lts
Merge 4.9.237 into android-4.9-q
Linux 4.9.237
    x86/defconfig: Enable CONFIG_USB_XHCI_HCD=y
    powerpc/dma: Fix dma_map_ops::get_required_mask
    ehci-hcd: Move include to keep CRC stable
    serial: 8250_pci: Add Realtek 816a and 816b
    Input: i8042 - add Entroware Proteus EL07R4 to nomux and reset lists
    usblp: fix race between disconnect() and read()
    USB: UAS: fix disconnect by unplugging a hub
  * USB: quirks: Add USB_QUIRK_IGNORE_REMOTE_WAKEUP quirk for BYD zhaoxin notebook
      drivers/usb/core/quirks.c
    drm/mediatek: Add exception handing in mtk_drm_probe() if component init fail
    MIPS: SNI: Fix spurious interrupts
    fbcon: Fix user font detection test at fbcon_resize().
    perf test: Free formats for perf pmu parse test
    MIPS: SNI: Fix MIPS_L1_CACHE_SHIFT
    Drivers: hv: vmbus: Add timeout to vmbus_wait_for_unload
    clk: rockchip: Fix initialization of mux_pll_src_4plls_p
    i2c: algo: pca: Reapply i2c bus settings after reset
    rapidio: Replace 'select' DMAENGINES 'with depends on'
    SUNRPC: stop printk reading past end of string
    spi: spi-loopback-test: Fix out-of-bounds read
    scsi: lpfc: Fix FLOGI/PLOGI receive race condition in pt2pt discovery
    scsi: pm8001: Fix memleak in pm8001_exec_internal_task_abort
    NFSv4.1 handle ERR_DELAY error reclaiming locking state on delegation recall
  * net: handle the return value of pskb_carve_frag_list() correctly
      net/core/skbuff.c
  * gcov: add support for GCC 10.1
      kernel/gcov/Kconfig
    RDMA/rxe: Fix the parent sysfs read when the interface has 15 chars
    IB/rxe: Remove a pointless indirection layer
  * usb: Fix out of sync data toggle if a configured device is reconfigured
      drivers/usb/core/message.c
    USB: serial: option: add support for SIM7070/SIM7080/SIM7090 modules
    USB: serial: ftdi_sio: add IDs for Xsens Mti USB converter
  * usb: core: fix slab-out-of-bounds Read in read_descriptors
      drivers/usb/core/sysfs.c
    staging: greybus: audio: fix uninitialized value issue
    video: fbdev: fix OOB read in vga_8planes_imageblit()
    KVM: VMX: Don't freeze guest when event delivery causes an APIC-access exit
  * vgacon: remove software scrollback support
      drivers/video/console/Kconfig
    fbcon: remove now unusued 'softback_lines' cursor() argument
    fbcon: remove soft scrollback code
    rbd: require global CAP_SYS_ADMIN for mapping and unmapping
    scsi: target: iscsi: Fix hang in iscsit_access_np() when getting tpg->np_login_sem
    scsi: target: iscsi: Fix data digest calculation
  * regulator: push allocation in set_consumer_device_supply() out of lock
      drivers/regulator/core.c
    btrfs: fix wrong address when faulting in pages in the search ioctl
    staging: wlan-ng: fix out of bounds read in prism2sta_probe_usb()
  * USB: core: add helpers to retrieve endpoints
      drivers/usb/core/usb.c
      include/linux/usb.h
    iio:accel:mma8452: Fix timestamp alignment and prevent data leak.
    iio:accel:mma7455: Fix timestamp alignment and prevent data leak.
    iio: accel: kxsd9: Fix alignment of local buffer.
    iio:light:max44000 Fix timestamp alignment and prevent data leak.
    iio:magnetometer:ak8975 Fix alignment and data leak issues.
    drivers: iio: magnetometer: Fix sparse endianness warnings cast to restricted __be16
    iio:adc:ti-adc081c Fix alignment and data leak issues
    iio:adc:ina2xx Fix timestamp alignment issue.
    iio:accel:bmc150-accel: Fix timestamp alignment and prevent data leak.
    iio:light:ltr501 Fix timestamp alignment issue.
    iio: adc: ti-ads1015: fix conversion when CONFIG_PM is not set
    iio: adc: mcp3422: fix locking on error path
    iio: adc: mcp3422: fix locking scope
  * gcov: Disable gcov build with GCC 10
      kernel/gcov/Kconfig
    ALSA: hda: fix a runtime pm issue in SOF when integrated GPU is disabled
    drivers/net/wan/hdlc_cisco: Add hard_header_len
    irqchip/eznps: Fix build error for !ARC700 builds
    xfs: initialize the shortform attr header padding entry
    drivers/net/wan/lapbether: Set network_header before transmitting
    ALSA: hda: Fix 2 channel swapping for Tegra
    firestream: Fix memleak in fs_open
    NFC: st95hf: Fix memleak in st95hf_in_send_cmd
    drivers/net/wan/lapbether: Added needed_tailroom
    scsi: libsas: Set data_dir as DMA_NONE if libata marks qc as NODATA
    RDMA/rxe: Drop pointless checks in rxe_init_ports
    RDMA/rxe: Fix memleak in rxe_mem_init_user
    ARM: dts: socfpga: fix register entry for timer3 on Arria10
    Merge 4.9.236 into android-4.9-q
Linux 4.9.236
  * net: disable netpoll on fresh napis
      net/core/dev.c
    sctp: not disable bh in the whole sctp_get_port_local()
    net: usb: dm9601: Add USB ID of Keenetic Plus DSL
  * netlabel: fix problems with mapping removal
      net/netlabel/netlabel_domainhash.c
    bnxt: don't enable NAPI until rings are ready
    net: ethernet: mlx4: Fix memory allocation in mlx4_buddy_init()
    affs: fix basic permission bits to actually work
    fs/affs: use octal for permissions
    ALSA; firewire-tascam: exclude Tascam FE-8 from detection
  * net: usb: Fix uninit-was-stored issue in asix_read_phy_addr()
      drivers/net/usb/asix_common.c
  * cfg80211: regulatory: reject invalid hints
      net/wireless/reg.c
    mm/hugetlb: fix a race between hugetlb sysctl handlers
    checkpatch: fix the usage of capture group ( ... )
    vfio/pci: Fix SR-IOV VF handling with MMIO blocking
  * net: initialize fastreuse on inet_inherit_port
      net/ipv4/inet_hashtables.c
  * net: refactor bind_bucket fastreuse into helper
      include/net/inet_connection_sock.h
      net/ipv4/inet_connection_sock.c
  * KVM: arm64: Set HCR_EL2.PTW to prevent AT taking synchronous exception
      arch/arm64/include/asm/kvm_arm.h
  * KVM: arm64: Survive synchronous exceptions caused by AT instructions
      arch/arm64/include/asm/kvm_asm.h
    KVM: arm64: Defer guest entry when an asynchronous exception is pending
  * KVM: arm64: Add kvm_extable for vaxorcism code
      arch/arm64/include/asm/kvm_asm.h
      arch/arm64/kernel/vmlinux.lds.S
    vfio-pci: Invalidate mmaps and block MMIO access on disabled memory
    vfio-pci: Fault mmaps to enable vma tracking
    vfio/type1: Support faulting PFNMAP vmas
  * mm: slub: fix conversion of freelist_corrupted()
      mm/slub.c
    dm thin metadata: Avoid returning cmd->bm wild pointer on error
    dm cache metadata: Avoid returning cmd->bm wild pointer on error
    libata: implement ATA_HORKAGE_MAX_TRIM_128M and apply to Sandisks
  * block: Move SECTOR_SIZE and SECTOR_SHIFT definitions into <linux/blkdev.h>
      drivers/block/brd.c
      drivers/block/zram/zram_drv.h
      include/linux/blkdev.h
      include/linux/device-mapper.h
      include/uapi/linux/msdos_fs.h
  * block: allow for_each_bvec to support zero len bvec
      include/linux/bvec.h
    ALSA: firewire-digi00x: exclude Avid Adrenaline from detection
    ALSA: pcm: oss: Remove superfluous WARN_ON() for mulaw sanity check
    ALSA: ca0106: fix error code handling
    usb: qmi_wwan: add D-Link DWM-222 A2 device ID
    qmi_wwan: new Telewell and Sierra device IDs
    drivers: net: usb: qmi_wwan: add QMI_QUIRK_SET_DTR for Telit PID 0x1201
    net: usb: qmi_wwan: add Telit 0x1050 composition
    btrfs: fix potential deadlock in the search ioctl
  * uaccess: Add non-pagefault user-space write function
      include/linux/uaccess.h
      mm/maccess.c
  * uaccess: Add non-pagefault user-space read functions
      include/linux/uaccess.h
      mm/maccess.c
    btrfs: set the lockdep class for log tree extent buffers
    btrfs: Remove extraneous extent_buffer_get from tree_mod_log_rewind
    btrfs: Remove redundant extent_buffer_get in get_old_root
    btrfs: drop path before adding new uuid tree entry
  * include/linux/log2.h: add missing () around n in roundup_pow_of_two()
      include/linux/log2.h
    thermal: ti-soc-thermal: Fix bogus thermal shutdowns for omap4430
    iommu/vt-d: Serialize IOMMU GCMD register modifications
    tg3: Fix soft lockup when tg3_reset_task() fails.
  * fix regression in "epoll: Keep a reference on files added to the check list"
      fs/eventpoll.c
    bnxt_en: Fix PCI AER error recovery flow
    bnxt_en: Check for zero dir entries in NVRAM.
    dmaengine: pl330: Fix burst length if burst size is smaller than bus width
    net: arc_emac: Fix memleak in arc_mdio_probe
    ravb: Fixed to be able to unload modules
    net: hns: Fix memleak in hns_nic_dev_probe
    netfilter: nf_tables: fix destination register zeroing
    netfilter: nf_tables: incorrect enum nft_list_attributes definition
    netfilter: nf_tables: add NFTA_SET_USERDATA if not null
    MIPS: BMIPS: Also call bmips_cpu_setup() for secondary cores
    MIPS: mm: BMIPS5000 has inclusive physical caches
    dmaengine: at_hdmac: check return value of of_find_device_by_node() in at_dma_xlate()
    batman-adv: bla: use netif_rx_ni when not in interrupt context
    batman-adv: Avoid uninitialized chaddr when handling DHCP
  * dmaengine: of-dma: Fix of_dma_router_xlate's of_dma_xlate handling
      drivers/dma/of-dma.c
    xen/xenbus: Fix granting of vmalloc'd memory
    s390: don't trace preemption in percpu macros
    ceph: don't allow setlease on cephfs
    nvmet: Disable keep-alive timer when kato is cleared to 0h
    hwmon: (applesmc) check status earlier.
    perf record/stat: Explicitly call out event modifiers in the documentation
  * HID: core: Sanitize event code and type when mapping input
      drivers/hid/hid-input.c
      drivers/hid/hid-multitouch.c
      include/linux/hid.h
  * HID: core: Correctly handle ReportSize being zero
      drivers/hid/hid-core.c
  * ANDROID: overflow.h: fix merge issue with 4.9.235
      include/linux/overflow.h
    Merge 4.9.235 into android-4.9-q
Linux 4.9.235
  * ALSA: usb-audio: Update documentation comment for MS2109 quirk
      sound/usb/quirks-table.h
  * HID: hiddev: Fix slab-out-of-bounds write in hiddev_ioctl_usage()
      drivers/hid/usbhid/hiddev.c
    btrfs: check the right error variable in btrfs_del_dir_entries_in_log
    usb: storage: Add unusual_uas entry for Sony PSZ drives
  * USB: gadget: u_f: Unbreak offset calculation in VLAs
      drivers/usb/gadget/u_f.h
    USB: gadget: f_ncm: add bounds checks to ncm_unwrap_ntb()
  * USB: gadget: u_f: add overflow checks to VLA macros
      drivers/usb/gadget/u_f.h
  * overflow.h: Add allocation size calculation helpers
      drivers/md/dm-table.c
      include/linux/overflow.h
    usb: host: ohci-exynos: Fix error handling in exynos_ohci_probe()
  * USB: Ignore UAS for JMicron JMS567 ATA/ATAPI Bridge
      drivers/usb/storage/unusual_devs.h
  * USB: quirks: Add no-lpm quirk for another Raydium touchscreen
      drivers/usb/core/quirks.c
    usb: uas: Add quirk for PNY Pro Elite
    USB: yurex: Fix bad gfp argument
  * device property: Fix the secondary firmware node handling in set_primary_fwnode()
      drivers/base/core.c
  * PM: sleep: core: Fix the handling of pending runtime resume requests
      drivers/base/power/main.c
  * xhci: Do warm-reset when both CAS and XDEV_RESUME are set
      drivers/usb/host/xhci-hub.c
    XEN uses irqdesc::irq_data_common::handler_data to store a per interrupt XEN data pointer which contains XEN specific information.
  * writeback: Fix sync livelock due to b_dirty_time processing
      fs/fs-writeback.c
      include/trace/events/writeback.h
  * writeback: Avoid skipping inode writeback
      fs/fs-writeback.c
      include/linux/fs.h
  * writeback: Protect inode->i_io_list with inode->i_lock
      fs/fs-writeback.c
    serial: 8250: change lock order in serial8250_do_startup()
    serial: pl011: Don't leak amba_ports entry on driver register error
    serial: pl011: Fix oops on -EPROBE_DEFER
    serial: samsung: Removes the IRQ not found warning
  * vt_ioctl: change VT_RESIZEX ioctl to check for error return from vc_resize()
      drivers/tty/vt/vt_ioctl.c
  * vt: defer kfree() of vc_screenbuf in vc_do_resize()
      drivers/tty/vt/vt.c
  * USB: lvtest: return proper error code in probe
      drivers/usb/misc/lvstest.c
    fbcon: prevent user font height or width change from causing potential out-of-bounds access
    btrfs: fix space cache memory leak after transaction abort
    HID: i2c-hid: Always sleep 60ms after I2C_HID_PWR_ON commands
    powerpc/perf: Fix soft lockups due to missed interrupt accounting
    net: gianfar: Add of_node_put() before goto statement
  * scsi: ufs: Improve interrupt handling for shared interrupts
      drivers/scsi/ufs/ufshcd.c
  * scsi: ufs: Fix possible infinite loop in ufshcd_hold
      drivers/scsi/ufs/ufshcd.c
    s390/cio: add cond_resched() in the slow_eval_known_fn() loop
  * fs: prevent BUG_ON in submit_bh_wbc()
      fs/buffer.c
      fs/ext4/super.c
  * jbd2: abort journal if free a async write error metadata buffer
      fs/jbd2/transaction.c
  * jbd2: make sure jh have b_transaction set in refile/unfile_buffer
      fs/jbd2/transaction.c
    usb: gadget: f_tcm: Fix some resource leaks in some error paths
    i2c: rcar: in slave mode, clear NACK earlier
    Revert "ath10k: fix DMA related firmware crashes on multiple devices"
  * efi: provide empty efi_enter_virtual_mode implementation
      include/linux/efi.h
    USB: sisusbvga: Fix a potential UB casued by left shifting a negative value
    powerpc/spufs: add CONFIG_COREDUMP dependency
    KVM: arm64: Fix symbol dependency in __hyp_call_panic_nvhe
    media: davinci: vpif_capture: fix potential double free
    EDAC/ie31200: Fallback if host bridge device is already initialized
    scsi: fcoe: Memory leak fix in fcoe_sysfs_fcf_del()
    ceph: fix potential mdsc use-after-free crash
    scsi: iscsi: Do not put host in iscsi_set_flashnode_param()
    locking/lockdep: Fix overflow in presentation of average lock-time
    drm/nouveau: Fix reference count leak in nouveau_connector_detect
    drm/nouveau/drm/noveau: fix reference count leak in nouveau_fbcon_open
    cec-api: prevent leaking memory through hole in structure
    mips/vdso: Fix resource leaks in genvdso.c
    rtlwifi: rtl8192cu: Prevent leaking urb
  * PCI: Fix pci_create_slot() reference count leak
      drivers/pci/slot.c
    omapfb: fix multiple reference count leaks due to pm_runtime_get_sync
    selftests/powerpc: Purge extra count_pmc() calls of ebb selftests
    scsi: lpfc: Fix shost refcount mismatch when deleting vport
    drm/amdgpu/display: fix ref count leak when pm_runtime_get_sync fails
    drm/amdgpu: fix ref count leak in amdgpu_display_crtc_set_config
    drm/amd/display: fix ref count leak in amdgpu_drm_ioctl
    drm/amdgpu: fix ref count leak in amdgpu_driver_open_kms
    drm/radeon: fix multiple reference count leak
    drm/amdkfd: Fix reference count leaks.
  * iommu/iova: Don't BUG on invalid PFNs
      drivers/iommu/iova.c
    scsi: target: tcmu: Fix crash on ARM during cmd completion
    media: pci: ttpci: av7110: fix possible buffer overflow caused by bad DMA value in debiirq()
    arm64: dts: qcom: msm8916: Pull down PDM GPIOs during sleep
    ASoC: tegra: Fix reference count leaks.
    ALSA: pci: delete repeated words in comments
  * gre6: Fix reception with IP6_TNL_F_RCV_DSCP_COPY
      net/ipv6/ip6_tunnel.c
    ipvlan: fix device features
    tipc: fix uninit skb->data in tipc_nl_compat_dumpit()
  * net: Fix potential wrong skb->protocol in skb_vlan_untag()
      net/core/skbuff.c
  * bonding: show saner speed for broadcast mode
      drivers/net/bonding/bond_main.c
  * bonding: fix a potential double-unregister
      drivers/net/bonding/bond_main.c

Change-Id: Ic5e975d213782585fedbf8a5869b9b0aaad0bf66
Signed-off-by: lucaswei <lucaswei@google.com>
2020-10-20 17:40:55 +08:00
Vineet Gupta
ad892d310e irqchip/eznps: Fix build error for !ARC700 builds
[ Upstream commit 89d29997f103d08264b0685796b420d911658b96 ]

eznps driver is supposed to be platform independent however it ends up
including stuff from inside arch/arc headers leading to rand config
build errors.

The quick hack to fix this (proper fix is too much chrun for non active
user-base) is to add following to nps platform agnostic header.
 - copy AUX_IENABLE from arch/arc header
 - move CTOP_AUX_IACK from arch/arc/plat-eznps/*/**

Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Link: https://lkml.kernel.org/r/20200824095831.5lpkmkafelnvlpi2@linutronix.de
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2020-09-23 08:46:10 +02:00
wenchangliu
2f43fbc303 msm: vidc: support subsystem crash reason for venus ssr
Classify the four kinds of crash reason for venus ssr
1. Fatal Error
2. Watchdog Timeout
3. Hardware Response Timeout
4. Unkonwn Error

Bug: 159099160
Test: adb shell "echo 0x1 >d/msm_vidc/core0/trigger_ssr"
Test: adb shell "echo 0x3 >d/msm_vidc/core0/trigger_ssr"
Test: force trigger hardware response timeout
Change-Id: I32e78256c80c9b228a2091d19acdf329ed40e061
Signed-off-by: wenchangliu <wenchangliu@google.com>
2020-07-22 08:11:55 +00:00
Anmolpreet Kaur
b382ca7f0c qseecom: Fix clang compilation in qseecom driver
Make changes to ensure qseecom driver compiles
fine with clang enabled.

Change-Id: I390a1438425d77c23438fceb5c2c52063b472c90
Signed-off-by: Anmolpreet Kaur <anmolpre@codeaurora.org>
Signed-off-by: Swetha Chikkaboraiah <schikk@codeaurora.org>
2020-04-29 01:18:36 -07:00
Petri Gynther
a7d848ab42 Merge 4.9.117 into android-msm-bluecross-4.9-lts
Linux 4.9.117
    net: dsa: qca8k: Allow overwriting CPU port setting
    net: dsa: qca8k: Add QCA8334 binding documentation
    net: dsa: qca8k: Enable RXMAC when bringing up a port
    net: dsa: qca8k: Force CPU port to its highest bandwidth
    RDMA/uverbs: Protect from attempts to create flows on unsupported QP
  * ext4: check for allocation block validity with block group locked
      fs/ext4/balloc.c
      fs/ext4/ialloc.c
  * ext4: fix inline data updates with checksums enabled
      fs/ext4/inline.c
      fs/ext4/inode.c
  * squashfs: be more careful about metadata corruption
      fs/squashfs/squashfs_fs.h
  * random: mix rdrand with entropy sent in from userspace
      drivers/char/random.c
  * drm: Add DP PSR2 sink enable bit
      include/drm/drm_dp_helper.h
    media: si470x: fix __be16 annotations
    scsi: megaraid_sas: Increase timeout by 1 sec for non-RAID fastpath IOs
    scsi: scsi_dh: replace too broad "TP9" string with the exact models
    media: omap3isp: fix unbalanced dma_iommu_mapping
  * crypto: authenc - don't leak pointers to authenc keys
      crypto/authenc.c
  * crypto: authencesn - don't leak pointers to authenc keys
      crypto/authencesn.c
  * usb: hub: Don't wait for connect state at resume for powered-off ports
      drivers/usb/core/hub.c
    microblaze: Fix simpleImage format generation
  * serial: core: Make sure compiler barfs for 16-byte earlycon names
      include/linux/serial_core.h
    staging: lustre: ldlm: free resource when ldlm_lock_create() fails.
    staging: lustre: llite: correct removexattr detection
  * audit: allow not equal op for audit by executable
      kernel/auditfilter.c
    rsi: Fix 'invalid vdd' warning in mmc
  * ipconfig: Correctly initialise ic_nameservers
      net/ipv4/ipconfig.c
    drm/gma500: fix psb_intel_lvds_mode_valid()'s return type
    arm64: defconfig: Enable Rockchip io-domain driver
    memory: tegra: Apply interrupts mask per SoC
    memory: tegra: Do not handle spurious interrupts
  * stop_machine: Use raw spinlocks
      kernel/stop_machine.c
    dt-bindings: net: meson-dwmac: new compatible name for AXG SoC
    dt-bindings: pinctrl: meson: add support for the Meson8m2 SoC
    mmc: pwrseq: Use kmalloc_array instead of stack VLA
    mmc: dw_mmc: update actual clock for mmc debugfs
    ALSA: hda/ca0132: fix build failure when a local macro is defined
  * drm/atomic: Handling the case when setting old crtc for plane
      drivers/gpu/drm/drm_atomic.c
    media: siano: get rid of __le32/__le16 cast warnings
  * bpf: fix references to free_bpf_prog_info() in comments
      kernel/bpf/verifier.c
    thermal: exynos: fix setting rising_threshold for Exynos5433
    staging: lustre: o2iblnd: fix race at kiblnd_connect_peer
    scsi: megaraid: silence a static checker bug
    scsi: 3w-xxxx: fix a missing-check bug
    scsi: 3w-9xxx: fix a missing-check bug
    bnxt_en: Check unsupported speeds in bnxt_update_link() on PF only.
    perf: fix invalid bit in diagnostic entry
    s390/cpum_sf: Add data entry sizes to sampling trailer entry
    brcmfmac: Add support for bcm43364 wireless chipset
    mtd: rawnand: fsl_ifc: fix FSL NAND driver to read all ONFI parameter pages
    media: saa7164: Fix driver name in debug output
  * media: media-device: fix ioctl function types
      drivers/media/media-device.c
    libata: Fix command retry decision
    media: rcar_jpu: Add missing clk_disable_unprepare() on error in jpu_open()
  * dma-iommu: Fix compilation when !CONFIG_IOMMU_DMA
      include/linux/dma-iommu.h
  * tty: Fix data race in tty_insert_flip_string_fixed_flag
      drivers/tty/pty.c
    nvmem: properly handle returned value nvmem_reg_read
    ARM: dts: sh73a0: Add missing interrupt-affinity to PMU node
    ARM: dts: emev2: Add missing interrupt-affinity to PMU node
    EDAC, altera: Fix ARM64 build warning
    HID: i2c-hid: check if device is there before really probing
    powerpc/embedded6xx/hlwd-pic: Prevent interrupts from being handled by Starlet
    drm/radeon: fix mode_valid's return type
  * HID: hid-plantronics: Re-resend Update to map button for PTT products
      drivers/hid/hid-plantronics.c
  * arm64: cmpwait: Clear event register before arming exclusive monitor
      arch/arm64/include/asm/cmpxchg.h
  * ALSA: usb-audio: Apply rate limit to warning messages in URB complete callback
      sound/usb/pcm.c
    net: ethernet: ti: cpsw-phy-sel: check bus_find_device() ret value
    media: smiapp: fix timeout checking in smiapp_read_nvm
    ixgbevf: fix MAC address changes through ixgbevf_set_mac()
    md: fix NULL dereference of mddev->pers in remove_and_add_spares()
    regulator: pfuze100: add .is_enable() for pfuze100_swb_regulator_ops
    ALSA: emu10k1: Rate-limit error messages about page errors
  * scsi: ufs: fix exception event handling
      drivers/scsi/ufs/ufshcd.c
  * fscrypt: use unbound workqueue for decryption
      fs/crypto/crypto.c
    drivers/perf: arm-ccn: don't log to dmesg in event_init
    ima: based on policy verify firmware signatures (pre-allocated buffer)
    mwifiex: correct histogram data with appropriate index
    net: dsa: qca8k: Add support for QCA8334 switch
    PCI: pciehp: Request control of native hotplug only if supported
    bpf: powerpc64: pad function address loads with NOPs
    pinctrl: at91-pio4: add missing of_node_put
    powerpc/8xx: fix invalid register expression in head_8xx.S
    powerpc/powermac: Mark variable x as unused
    powerpc/powermac: Add missing prototype for note_bootable_part()
    powerpc/chrp/time: Make some functions static, add missing header include
    powerpc/32: Add a missing include header
    ath: Add regulatory mapping for Bahamas
    ath: Add regulatory mapping for Bermuda
    ath: Add regulatory mapping for Serbia
    ath: Add regulatory mapping for Tanzania
    ath: Add regulatory mapping for Uganda
    ath: Add regulatory mapping for APL2_FCCA
    ath: Add regulatory mapping for APL13_WORLD
    ath: Add regulatory mapping for ETSI8_WORLD
    ath: Add regulatory mapping for FCC3_ETSIC
  * PCI: Prevent sysfs disable of device while driver is attached
      drivers/pci/pci-sysfs.c
    btrfs: qgroup: Finish rescan when hit the last leaf of extent tree
    btrfs: add barriers to btrfs_sync_log before log_commit_wait wakeups
  * media: videobuf2-core: don't call memop 'finish' when queueing
      drivers/media/v4l2-core/videobuf2-core.c
    media: tw686x: Fix incorrect vb2_mem_ops GFP flags
    wlcore: sdio: check for valid platform device data before suspend
    mwifiex: handle race during mwifiex_usb_disconnect
    mfd: cros_ec: Fail early if we cannot identify the EC
  * ASoC: dpcm: fix BE dai not hw_free and shutdown
      sound/soc/soc-pcm.c
    Bluetooth: btusb: Add a new Realtek 8723DE ID 2ff8:b011
    Bluetooth: hci_qca: Fix "Sleep inside atomic section" warning
    iwlwifi: pcie: fix race in Rx buffer allocator
    selftests/intel_pstate: Improve test, minor fixes
    perf/x86/intel/uncore: Correct fixed counter index check for NHM
    perf/x86/intel/uncore: Correct fixed counter index check in generic code
    usbip: usbip_detach: Fix memory, udev context and udev leak
  * f2fs: fix race in between GC and atomic open
      fs/f2fs/file.c
  * f2fs: Fix deadlock in shutdown ioctl
      fs/f2fs/file.c
  * f2fs: fix to wait page writeback during revoking atomic write
      fs/f2fs/segment.c
  * f2fs: fix to don't trigger writeback during recovery
      fs/f2fs/segment.c
  * f2fs: fix error path of move_data_page
      fs/f2fs/gc.c
  * disable loading f2fs module on PAGE_SIZE > 4KB
      fs/f2fs/super.c
    pnfs: Don't release the sequence slot until we've processed layoutget on open
    netfilter: nf_tables: check msg_type before nft_trans_set(trans)
    RDMA/mad: Convert BUG_ONs to error flows
    powerpc/64s: Fix compiler store ordering to SLB shadow area
    hvc_opal: don't set tb_ticks_per_usec in udbg_init_opal_common()
    powerpc/eeh: Fix use-after-release of EEH driver
    infiniband: fix a possible use-after-free bug
    netfilter: ipset: List timing out entries with "timeout 1" instead of zero
    perf tools: Fix pmu events parsing rule
  * rtc: ensure rtc_set_alarm fails when alarms are not supported
      drivers/rtc/interface.c
  * mm/slub.c: add __printf verification to slab_err()
      mm/slub.c
  * mm: vmalloc: avoid racy handling of debugobjects in vunmap
      mm/vmalloc.c
    vfio: platform: Fix reset module leak in error path
    nfsd: fix potential use-after-free in nfsd4_decode_getdeviceinfo
    ALSA: fm801: add error handling for snd_ctl_add
    ALSA: emu10k1: add error handling for snd_ctl_add
    xen/netfront: raise max number of slots in xennet_get_responses()
    kcov: ensure irq code sees a valid area
    usb: dwc2: Fix DMA alignment to start at allocated boundary
  * arm64: fix vmemmap BUILD_BUG_ON() triggering on !vmemmap setups
      arch/arm64/mm/init.c
  * tracing: Quiet gcc warning about maybe unused link variable
      kernel/trace/trace_kprobe.c
  * tracing/kprobes: Fix trace_probe flags on enable_trace_kprobe() failure
      kernel/trace/trace_kprobe.c
  * kthread, tracing: Don't expose half-written comm when creating kthreads
      kernel/kthread.c
  * tracing: Fix possible double free in event_enable_trigger_func()
      kernel/trace/trace_events_trigger.c
  * tracing: Fix double free of event_trigger_data
      kernel/trace/trace_events_trigger.c
    kvm, mm: account shadow page tables to kmemcg
    Input: elan_i2c - add another ACPI ID for Lenovo Ideapad 330-15AST
    Input: i8042 - add Lenovo LaVie Z to the i8042 reset list
    Input: elan_i2c - add ACPI ID for lenovo ideapad 330

Change-Id: Ibdefd19225c51396172426223364ca861da5f5a0
Signed-off-by: Petri Gynther <pgynther@google.com>
2018-09-20 18:54:56 -07:00
Dmitry Osipenko
dc6afdde4b memory: tegra: Apply interrupts mask per SoC
[ Upstream commit 1c74d5c0de0c2cc29fef97a19251da2ad6f579bd ]

Currently we are enabling handling of interrupts specific to Tegra124+
which happen to overlap with previous generations. Let's specify
interrupts mask per SoC generation for consistency and in a preparation
of squashing of Tegra20 driver into the common one that will enable
handling of GART faults which may be undesirable by newer generations.

Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2018-08-03 07:55:24 +02:00
Chungjui Fan
6d73bcf205 power: reset: Record reboot_longkey bootreason
While holding power key to trigger reset, the bootreason is
reboot_longkey and also stored in RAMDUMP_MSG.txt.

Bug: 79553608
Bug: 110231796
Change-Id: I17ec89337d754e83d7dd218430af1f92f72173cb
Signed-off-by: Chungjui Fan <chungjuifan@google.com>
Signed-off-by: Chris Fries <cfries@google.com>
2018-06-18 04:24:55 +00:00
Cyan_Hsieh
dcfd484d24 Merge LA.UM.7.3.9.08.00.00.385.356 via branch qcom-msm-4.9 into android-msm-bluecross-4.9
Merge Qualcomm's LA.UM.7.3.9.08.00.00.385.356

Removed camera related changes with

git checkout partner/android-msm-bluecross-4.9 -- drivers/media/platform/msm/camera/ \
drivers/media/platform/msm/camera_v2/ \
include/uapi/media/cam_req_mgr.h

Conflicts:
	block/bio.c
	block/blk-merge.c
	drivers/gpu/drm/msm/dsi-staging/dsi_ctrl.c
	drivers/gpu/drm/msm/sde/sde_crtc.c
	drivers/gpu/drm/msm/sde/sde_crtc.h
	drivers/input/misc/Makefile
	drivers/input/touchscreen/Makefile
	drivers/platform/msm/ipa/Makefile
	drivers/power/supply/power_supply_sysfs.c
	drivers/scsi/ufs/ufs-qcom-ice.c
	drivers/soc/qcom/Kconfig
	drivers/soc/qcom/Makefile
	drivers/spi/spi-geni-qcom.c
	fs/crypto/fscrypt_private.h
	fs/crypto/keyinfo.c
	fs/direct-io.c
	fs/ext4/inode.c
	fs/ext4/page-io.c
	include/linux/pfk.h
	include/linux/power_supply.h
	include/linux/security.h
	security/Kconfig
	security/pfe/Kconfig
	security/pfe/Makefile
	security/pfe/pfk.c
	security/pfe/pfk_ice.h
	security/pfe/pfk_internal.h
	security/pfe/pfk_kc.c
	security/pfe/pfk_kc.h
	security/security.c
	security/selinux/include/objsec.h

Bug: 109547412
Change-Id: I236523a91c58491e65ff2915b26da15e50dc2b8c
Signed-off-by: aaronding <aaronding@google.com>
Signed-off-by: Cyan_Hsieh <cyanhsieh@google.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2018-06-07 18:40:58 +08:00
Cyan_Hsieh
e9eb3984e2 Merge LA.UM.7.3.9.08.00.00.385.328 via branch qcom-msm-4.9 into android-msm-bluecross-4.9
Merge Qualcomm's LA.UM.7.3.9.08.00.00.385.328

Removed camera related changes with

git checkout partner/android-msm-bluecross-4.9 -- drivers/media/platform/msm/camera/ \
drivers/media/platform/msm/camera_v2/ \
include/uapi/media/cam_req_mgr.h

Conflicts:
	Documentation/devicetree/bindings/drm/msm/mdss-dsi-panel.txt
	Documentation/filesystems/f2fs.txt
	Makefile
	arch/Kconfig
	arch/arm64/Kconfig
	arch/arm64/boot/dts/qcom/sdm845-v2.dtsi
	arch/arm64/crypto/Makefile
	arch/arm64/kernel/entry.S
	arch/arm64/kernel/vdso/Makefile
	drivers/firmware/efi/libstub/Makefile
	drivers/gpu/drm/msm/dsi-staging/dsi_display.c
	drivers/gpu/drm/msm/sde/sde_kms.c
	drivers/hwtracing/coresight/coresight-event.c
	drivers/media/platform/msm/camera_v2/sensor/csiphy/msm_csiphy.c
	drivers/misc/Makefile
	drivers/power/supply/qcom/Kconfig
	drivers/power/supply/qcom/Makefile
	fs/crypto/fscrypt_private.h
	fs/f2fs/data.c
	fs/f2fs/f2fs.h
	fs/f2fs/file.c
	fs/f2fs/segment.c
	fs/f2fs/super.c
	fs/f2fs/inode.c
	fs/f2fs/sysfs.c
	include/linux/compiler-clang.h
	include/linux/compiler.h
	include/linux/fscrypt.h
	include/linux/init.h
	include/linux/jiffies.h
	include/trace/events/sched.h
	kernel/Makefile
	kernel/cfi.c
	kernel/sched/core.c
	kernel/sched/fair.c
	mm/filemap.c

Bug: 80274434
Change-Id: I8640c44aa3978666364fd08bb9b8748e95a1e3ff
Signed-off-by: aaronding <aaronding@google.com>
Signed-off-by: Cyan_Hsieh <cyanhsieh@google.com>
2018-06-01 15:59:44 +08:00
Maulik Shah
735e1e7d5e drivers: lpm-levels-legacy: Allow rpm handshake only with cluster LPM
CPU spm is programmed to handshake with rpm for single cpu devices.
If cluster level LPM is not selected even then spm handshakes with
rpm.

Fix this issue by allowing rpm handshake only if cluster level
LPM is selected.

CRs-Fixed: 1043098
Change-Id: I54babda27ecf7a931f844b8c7219a9582221abca
Signed-off-by: Maulik Shah <mkshah@codeaurora.org>
Signed-off-by: Chinkit Kumar,Kirti Kumar Parmar <parma@codeaurora.org>
2018-05-22 02:18:01 -07:00
Anil Kumar Mamidala
3b23717246 cpuidle: lpm-workarounds: Skip L2 SPM enabling in HLOS
Due to a hardware issue on 8909, secure world needs to disable
and enable L2 SPM to get the proper context in secure watchdog
bite cases.

With this workaround there is a race in programming L2 SPM between
HLOS and secure world. This leads to stability issues. To avoid
this program L2 SPM enable in secure world.

Change-Id: I426289e1fc66664ed9c4ecf81c4106ce2c7c1145
Signed-off-by: Anil Kumar Mamidala <amami@codeaurora.org>
Signed-off-by: Chinkit Kumar,Kirti Kumar Parmar <parma@codeaurora.org>
2018-05-22 02:17:31 -07:00
Raja Mallik
078db46952 drivers: soc: qcom: pm: Add legacy PM and Warmboot set address API support
Add legacy msm pm sleep mode support for MSM8909 target.

Add warmboot set address support for multi cluster cpu's.

Snapshot is taken from msm-3.18 kernel version @ commit 9bbf4c38e5b9e8
("soc: qcom: bgrsb: Increase time out for RSB channel opening")

Change-Id: Ia90f7b97e4cfaf6a691d178968cb515da6e9ddc0
Signed-off-by: Chinkit Kumar,Kirti Kumar Parmar <parma@codeaurora.org>
Signed-off-by: Sundara Vinayagam <sundvi@codeaurora.org>
2018-05-22 02:16:51 -07:00
Raja Mallik
b9ad452666 cpuidle: lpm-levels: Enable LPM support for non psci target
Add non psci legacy lpm support. Modify and align changes
for clock event, MPM and cpu hotplug for LPM callback notification.

Remove deprecated scheduler c-state(idle cpu), d-state(idle cluster)
setting from lpm driver.

Snapshot is taken from msm-3.18 kernel version @commit 9bbf4c38e5b9e8
("soc: qcom: bgrsb: Increase time out for RSB channel opening")

Change-Id: I2d81dbb81efdc9593cdfcca8f56806acdb210b81
Signed-off-by: Raja Mallik <rmallik@codeaurora.org>
Signed-off-by: Chinkit Kumar,Kirti Kumar Parmar <parma@codeaurora.org>
Signed-off-by: Sundara Vinayagam <sundvi@codeaurora.org>
2018-05-22 02:10:46 -07:00
Blagovest Kolenichev
2e229cb024 Merge android-4.9.94 (8683408) into msm-4.9
* refs/heads/tmp-8683408:
  ANDROID: Add build server config for cuttlefish.
  ANDROID: Add defconfig for cuttlefish.
  FROMLIST: staging: Android: Add 'vsoc' driver for cuttlefish.
  Revert "ANDROID: proc: make oom adjustment files user read-only"
  Revert "ANDROID: fixup! proc: make oom adjustment files user read-only"
  Linux 4.9.94
  Revert "xhci: plat: Register shutdown for xhci_plat"
  vrf: Fix use after free and double free in vrf_finish_output
  net sched actions: fix dumping which requires several messages to user space
  strparser: Fix sign of err codes
  net/mlx4_core: Fix memory leak while delete slave's resources
  vhost_net: add missing lock nesting notation
  team: move dev_mc_sync after master_upper_dev_link in team_port_add
  route: check sysctl_fib_multipath_use_neigh earlier than hash
  vhost: validate log when IOTLB is enabled
  net/mlx4_en: Fix mixed PFC and Global pause user control requests
  net/sched: fix NULL dereference on the error path of tcf_skbmod_init()
  net/sched: fix NULL dereference in the error path of tunnel_key_init()
  net/mlx5e: Sync netdev vxlan ports at open
  vti6: better validate user provided tunnel names
  ip6_tunnel: better validate user provided tunnel names
  ip6_gre: better validate user provided tunnel names
  ipv6: sit: better validate user provided tunnel names
  ip_tunnel: better validate user provided tunnel names
  net: fool proof dev_valid_name()
  bonding: process the err returned by dev_set_allmulti properly in bond_enslave
  bonding: move dev_mc_sync after master_upper_dev_link in bond_enslave
  bonding: fix the err path for dev hwaddr sync in bond_enslave
  vlan: also check phy_driver ts_info for vlan's real device
  vhost: correctly remove wait queue during poll failure
  sky2: Increase D3 delay to sky2 stops working after suspend
  sctp: sctp_sockaddr_af must check minimal addr length for AF_INET6
  sctp: do not leak kernel memory to user space
  r8169: fix setting driver_data after register_netdev
  pptp: remove a buggy dst release in pptp_connect()
  net/sched: fix NULL dereference in the error path of tcf_bpf_init()
  netlink: make sure nladdr has correct size in netlink_connect()
  net/ipv6: Increment OUTxxx counters after netfilter hook
  net/ipv6: Fix route leaking between VRFs
  net: fix possible out-of-bound read in skb_network_protocol()
  ipv6: the entire IPv6 header chain must fit the first fragment
  arp: fix arp_filter on l3slave devices
  clk: at91: fix clk-generated compilation
  random: use lockless method of accessing and updating f->reg_idx
  virtio_net: check return value of skb_to_sgvec in one more location
  virtio_net: check return value of skb_to_sgvec always
  rxrpc: check return value of skb_to_sgvec always
  ipsec: check return value of skb_to_sgvec always
  perf tools: Fix copyfile_offset update of output offset
  mtd: mtd_oobtest: Handle bitflips during reads
  Input: goodix - disable IRQs while suspended
  sdhci: Advertise 2.0v supply on SDIO host controller
  cxgb4vf: Fix SGE FL buffer initialization logic for 64K pages
  EDAC, mv64x60: Fix an error handling path
  tty: n_gsm: Allow ADM response in addition to UA for control dlci
  blk-mq: fix kernel oops in blk_mq_tag_idle()
  scsi: libsas: initialize sas_phy status according to response of DISCOVER
  scsi: libsas: fix error when getting phy events
  scsi: libsas: fix memory leak in sas_smp_get_phy_events()
  bcache: segregate flash only volume write streams
  bcache: stop writeback thread after detaching
  drm/vc4: Fix resource leak in 'vc4_get_hang_state_ioctl()' in error handling path
  selftests: kselftest_harness: Fix compile warning
  hsr: fix incorrect warning
  vxlan: dont migrate permanent fdb entries during learn
  s390/dasd: fix hanging safe offline
  ACPICA: Disassembler: Abort on an invalid/unknown AML opcode
  ACPICA: Events: Add runtime stub support for event APIs
  ACPICA: OSL: Add support to exclude stdarg.h
  cpuidle: dt: Add missing 'of_node_put()'
  Bluetooth: Send HCI Set Event Mask Page 2 command only when needed
  clk: meson: meson8b: add compatibles for Meson8 and Meson8m2
  net: ena: disable admin msix while working in polling mode
  net: ena: add missing unmap bars on device removal
  net: ena: add missing return when ena_com_get_io_handlers() fails
  net: ena: fix race condition between submit and completion admin command
  net: ena: fix rare uncompleted admin command false alarm
  iio: magnetometer: st_magn_spi: fix spi_device_id table
  sparc64: ldc abort during vds iso boot
  net: fec: Add a fec_enet_clear_ethtool_stats() stub for CONFIG_M5272
  sctp: fix recursive locking warning in sctp_do_peeloff
  bnx2x: Allow vfs to disable txvlan offload
  crypto: omap-sham - fix closing of hash with separate finalize call
  crypto: omap-sham - buffer handling fixes for hashing later
  geneve: add missing rx stats accounting
  stmmac: fix ptp header for GMAC3 hw timestamp
  coresight: tmc: Configure DMA mask appropriately
  coresight: Fix reference count for software sources
  pinctrl: meson-gxbb: remove non-existing pin GPIOX_22
  X.509: Fix error code in x509_cert_parse()
  xen: avoid type warning in xchg_xen_ulong
  skbuff: only inherit relevant tx_flags
  perf tests: Decompress kernel module before objdump
  perf tools: Decompress kernel module when reading DSO data
  net: emac: fix reset timeout with AR8035 phy
  Fix loop device flush before configure v3
  ARM: dts: armadillo800eva: Split LCD mux and gpio
  MIPS: kprobes: flush_insn_slot should flush only if probe initialised
  MIPS: mm: adjust PKMAP location
  MIPS: mm: fixed mappings: correct initialisation
  sched/deadline: Use the revised wakeup rule for suspending constrained dl tasks
  perf/core: Correct event creation with PERF_FORMAT_GROUP
  e1000e: Undo e1000e_pm_freeze if __e1000_shutdown fails
  KVM: nVMX: Update vmcs12->guest_linear_address on nested VM-exit
  nvme: fix hang in remove path
  nvme-pci: fix multiple ctrl removal scheduling
  ARM: imx: Add MXC_CPU_IMX6ULL and cpu_is_imx6ull
  net: phy: avoid genphy_aneg_done() for PHYs without clause 22 support
  mceusb: sporadic RX truncation corruption fix
  cx25840: fix unchecked return values
  cxl: Unlock on error in probe
  igb: fix race condition with PTP_TX_IN_PROGRESS bits
  e1000e: fix race condition around skb_tstamp_tx()
  ARM: dts: qcom: ipq4019: fix i2c_0 node
  tags: honor COMPILED_SOURCE with apart output directory
  iwlwifi: fix min API version for 7265D, 3168, 8000 and 8265
  iwlwifi: pcie: only use d0i3 in suspend/resume if system_pm is set to d0i3
  iwlwifi: tt: move ucode_loaded check under mutex
  iwlwifi: mvm: Fix command queue number on d0i3 flow
  watchdog: f71808e_wdt: Add F71868 support
  iwlwifi: mvm: fix firmware debug restart recording
  perf report: Ensure the perf DSO mapping matches what libdw sees
  perf header: Set proper module name when build-id event found
  net/mlx4: Check if Granular QoS per VF has been enabled before updating QP qos_vport
  net/mlx4: Fix the check in attaching steering rules
  sit: reload iphdr in ipip6_rcv
  macsec: check return value of skb_to_sgvec always
  skbuff: return -EMSGSIZE in skb_to_sgvec to prevent overflow
  ip6_tunnel: fix traffic class routing for tunnels
  bio-integrity: Do not allocate integrity context for bio w/o data
  Fix serial console on SNI RM400 machines
  cxgb4: fix incorrect cim_la output for T6
  powerpc/8xx: fix mpc8xx_get_irq() return on no irq
  drm/omap: fix tiled buffer stride calculations
  RDMA/hfi1: fix array termination by appending NULL to attr array
  RDMA/iw_cxgb4: Avoid touch after free error in ARP failure handlers
  net: phy: micrel: Restore led_mode and clk_sel on resume
  mISDN: Fix a sleep-in-atomic bug
  arm64: kernel: restrict /dev/mem read() calls to linear region
  qlcnic: Fix a sleep-in-atomic bug in qlcnic_82xx_hw_write_wx_2M and qlcnic_82xx_hw_read_wx_2M
  perf trace: Add mmap alias for s390
  ath10k: add BMI parameters to fix calibration from DT/pre-cal
  drm/amdkfd: NULL dereference involving create_process()
  powerpc/spufs: Fix coredump of SPU contexts
  clk: Fix __set_clk_rates error print-string
  clk: scpi: fix return type of __scpi_dvfs_round_rate
  KVM: SVM: do not zero out segment attributes if segment is unusable or not present
  mtd: nand: check ecc->total sanity in nand_scan_tail
  mtd: nand: gpmi: Fix gpmi_nand_init() error path
  dt-bindings: display: sun4i: Add allwinner,tcon-channel property
  drm/sun4i: Ignore the generic connectors for components
  clk: at91: fix clk-generated parenting
  net: freescale: fix potential null pointer dereference
  SUNRPC: ensure correct error is reported by xs_tcp_setup_socket()
  rtc: interface: Validate alarm-time before handling rollover
  rtc: opal: Handle disabled TPO in opal_get_tpo_time()
  i40evf: fix merge error in older patch
  rtc: m41t80: fix SQW dividers override when setting a date
  cxgb4: Fix netdev_features flag
  cxgb4: FW upgrade fixes
  net/mlx5: avoid build warning for uniprocessor
  arm64: futex: Fix undefined behaviour with FUTEX_OP_OPARG_SHIFT usage
  backlight: Report error on failure
  dmaengine: imx-sdma: Handle return value of clk_prepare_enable
  powerpc/[booke|4xx]: Don't clobber TCR[WP] when setting TCR[DIE]
  ovl: filter trusted xattr for non-admin
  HID: i2c: Call acpi_device_fix_up_power for ACPI-enumerated devices
  netfilter: conntrack: don't call iter for non-confirmed conntracks
  x86/efi: Disable runtime services on kexec kernel if booted with efi=old_map
  hdlcdrv: Fix divide by zero in hdlcdrv_ioctl
  wl1251: check return from call to wl1251_acx_arp_ip_filter
  rt2x00: do not pause queue unconditionally on error path
  ASoC: Intel: sst: Fix the return value of 'sst_send_byte_stream_mrfld()'
  pinctrl: baytrail: Enable glitch filter for GPIOs used as interrupts
  backlight: tdo24m: Fix the SPI CS between transfers
  blk-mq: fix race between updating nr_hw_queues and switching io sched
  IB/rdmavt: Allocate CQ memory on the correct node
  gpio: label descriptors using the device name
  vfb: fix video mode and line_length being set when loaded
  mac80211: Fix setting TX power on monitor interfaces
  ACPI: EC: Fix debugfs_create_*() usage
  irqchip/gic-v3: Fix the driver probe() fail due to disabled GICC entry
  scsi: mpt3sas: Proper handling of set/clear of "ATA command pending" flag.
  scsi: libiscsi: Allow sd_shutdown on bad transport
  ASoC: Intel: cht_bsw_rt5645: Analog Mic support
  ASoC: Intel: Skylake: Disable clock gating during firmware and library download
  media: videobuf2-core: don't go out of the buffer range
  hwmon: (ina2xx) Make calibration register value fixed
  PM / devfreq: Fix potential NULL pointer dereference in governor_store
  VFS: close race between getcwd() and d_move()
  net/mlx4_en: Change default QoS settings
  ACPI / video: Default lcd_only to true on Win8-ready and newer machines
  rds; Reset rs->rs_bound_addr in rds_add_bound() failure path
  l2tp: fix missing print session offset info
  perf probe: Add warning message if there is unexpected event name
  thermal: power_allocator: fix one race condition issue for thermal_instances list
  ARM: dts: ls1021a: add "fsl,ls1021a-esdhc" compatible string to esdhc node
  i40iw: Correct Q1/XF object count equation
  i40iw: Fix sequence number for the first partial FPDU
  drm/msm: Take the mutex before calling msm_gem_new_impl
  net: llc: add lock_sock in llc_ui_bind to avoid a race condition
  KVM: nVMX: Fix handling of lmsw instruction
  KVM: X86: Fix preempt the preemption timer cancel
  PCI/msi: fix the pci_alloc_irq_vectors_affinity stub
  cpuhotplug: Link lock stacks for hotplug callbacks
  bonding: Don't update slave->link until ready to commit
  Input: elan_i2c - clear INT before resetting controller
  net: move somaxconn init from sysctl code
  tcp: better validation of received ack sequences
  ARM64: PCI: Fix struct acpi_pci_root_ops allocation failure path
  ext4: fix off-by-one on max nr_pages in ext4_find_unwritten_pgoff()
  fix race in drivers/char/random.c:get_reg()
  scsi: bnx2fc: fix race condition in bnx2fc_get_host_stats()
  ASoC: rsnd: SSI PIO adjust to 24bit mode
  pNFS/flexfiles: missing error code in ff_layout_alloc_lseg()
  netfilter: ctnetlink: fix incorrect nf_ct_put during hash resize
  perf report: Fix off-by-one for non-activation frames
  libceph: NULL deref on crush_decode() error path
  net: ieee802154: fix net_device reference release too early
  mlx5: fix bug reading rss_hash_type from CQE
  block: fix an error code in add_partition()
  selinux: do not check open permission on sockets
  net/mlx5: Tolerate irq_set_affinity_hint() failures
  gpio: crystalcove: Do not write regular gpio registers for virtual GPIOs
  sched/numa: Use down_read_trylock() for the mmap_sem
  perf/core: Fix error handling in perf_event_alloc()
  leds: pca955x: Correct I2C Functionality
  net/wan/fsl_ucc_hdlc: fix muram allocation error
  ray_cs: Avoid reading past end of buffer
  ARM: davinci: da8xx: Create DSP device only when assigned memory
  md-cluster: fix potential lock issue in add_new_disk
  ext4: handle the rest of ext4_mb_load_buddy() ENOMEM errors
  iio: light: rpr0521 poweroff for probe fails
  iio: hi8435: cleanup reset gpio
  iio: hi8435: avoid garbage event at first enable
  ASoC: simple-card: fix mic jack initialization
  xfrm: fix state migration copy replay sequence numbers
  selftests/powerpc: Fix TM resched DSCR test with some compilers
  ath5k: fix memory leak on buf on failed eeprom read
  powerpc/mm: Fix virt_addr_valid() etc. on 64-bit hash
  scsi: csiostor: fix use after free in csio_hw_use_fwconfig()
  mlxsw: spectrum: Avoid possible NULL pointer dereference
  sh_eth: Use platform device for printing before register_netdev()
  fsl/qe: add bit description for SYNL register for GUMR
  net/wan/fsl_ucc_hdlc: fix incorrect memory allocation
  net/wan/fsl_ucc_hdlc: fix unitialized variable warnings
  serial: sh-sci: Fix race condition causing garbage during shutdown
  serial: 8250: omap: Disable DMA for console UART
  USB: ene_usb6250: fix SCSI residue overwriting
  net: x25: fix one potential use-after-free issue
  USB: ene_usb6250: fix first command execution
  pxa_camera: fix module remove codepath for v4l2 clock
  usb: chipidea: properly handle host or gadget initialization failure
  ARM: dts: rockchip: fix rk322x i2s1 pinctrl error
  arp: honour gratuitous ARP _replies_
  neighbour: update neigh timestamps iff update is effective
  uio: fix incorrect memory leak cleanup
  ipmr: vrf: Find VIFs using the actual device
  ata: libahci: properly propagate return value of platform_get_irq()
  btrfs: fix incorrect error return ret being passed to mapping_set_error
  usb: dwc3: keystone: check return value
  KVM: arm64: Restore host physical timer access on hyp_panic()
  KVM: arm: Restore banked registers and physical timer access on hyp_panic()
  async_tx: Fix DMA_PREP_FENCE usage in do_async_gen_syndrome()
  ipv6: avoid dad-failures for addresses with NODAD
  mdio: mux: fix device_node_continue.cocci warnings
  arm64: perf: Ignore exclude_hv when kernel is running in HYP
  i2c: mux: reg: put away the parent i2c adapter on probe failure
  ARM: dts: imx6qdl-wandboard: Fix audio channel swap
  powerpc/modules: If mprofile-kernel is enabled add it to vermagic
  x86/tsc: Provide 'tsc=unstable' boot parameter
  clk: renesas: rcar-gen2: Fix PLL0 on R-Car V2H and E2
  staging: wlan-ng: prism2mgmt.c: fixed a double endian conversion before calling hfa384x_drvr_setconfig16, also fixes relative sparse warning
  ARM: dts: imx53-qsrb: Pulldown PMIC IRQ pin
  iio: pressure: zpa2326: report interrupted case as failure
  PowerCap: Fix an error code in powercap_register_zone()
  bus: brcmstb_gisb: correct support for 64-bit address output
  bus: brcmstb_gisb: Use register offsets with writes too
  SMB2: Fix share type handling
  mm, vmstat: Remove spurious WARN() during zoneinfo print
  vmxnet3: ensure that adapter is in proper state during force_close
  irqchip/mbigen: Fix the clear register offset calculation
  KVM: PPC: Book3S PR: Check copy_to/from_user return values
  Input: elantech - force relative mode on a certain module
  Input: elan_i2c - check if device is there before really probing
  mdio: mux: Correct mdio_mux_init error path issues
  netxen_nic: set rcode to the return status from the call to netxen_issue_cmd
  net: qca_spi: Fix alignment issues in rx path
  blk-mq: NVMe 512B/4K+T10 DIF/DIX format returns I/O error on dd with split op
  perf/callchain: Force USER_DS when invoking perf_callchain_user()
  CIFS: silence lockdep splat in cifs_relock_file()
  NFSv4.1: Work around a Linux server bug...
  qed: Correct doorbell configuration for !4Kb pages
  net/mlx4_en: Avoid adding steering rules with invalid ring
  s390: move _text symbol to address higher than zero
  pidns: disable pid allocation if pid_ns_prepare_proc() is failed in alloc_pid()
  drivers/misc/vmw_vmci/vmci_queue_pair.c: fix a couple integer overflow tests
  lockd: fix lockd shutdown race
  net: ethernet: ti: cpsw: adjust cpsw fifos depth for fullduplex flow control
  net: cdc_ncm: Fix TX zero padding
  ipmi_ssif: unlock on allocation failure
  ubi: fastmap: Fix slab corruption
  qlge: Avoid reading past end of buffer
  bna: Avoid reading past end of buffer
  mac80211: bail out from prep_connection() if a reconfig is ongoing
  af_key: Fix slab-out-of-bounds in pfkey_compile_policy.
  IB/srpt: Avoid that aborting a command triggers a kernel warning
  IB/srpt: Fix abort handling
  x86/boot: Declare error() as noreturn
  NFSv4.1: RECLAIM_COMPLETE must handle NFS4ERR_CONN_NOT_BOUND_TO_SESSION
  ovl: persistent inode numbers for upper hardlinks
  x86/mm/kaslr: Use the _ASM_MUL macro for multiplication to work around Clang incompatibility
  x86/asm: Don't use RBP as a temporary register in csum_partial_copy_generic()
  rtc: snvs: fix an incorrect check of return value
  md/raid5: make use of spin_lock_irq over local_irq_disable + spin_lock
  cfg80211: make RATE_INFO_BW_20 the default
  qed: Fix overriding of supported autoneg value.
  ANDROID: proc: add null check in proc_uid_init
  f2fs/fscrypt: updates to v4.17-rc1
  Revert "ANDROID: sched/tune: Initialize raw_spin_lock in boosted_groups"
  ANDROID: uid_sys_stats: Replace tasklist lock with RCU in uid_cputime_show
  ANDROID: arm64: mark kpti_install_ng_mappings as __nocfi

Conflicts:
	arch/arm64/kernel/perf_event.c
	drivers/gpu/drm/msm/msm_gem.c
	drivers/hwtracing/coresight/coresight-tmc.c
	drivers/hwtracing/coresight/coresight.c

Change-Id: I3a1bd6216f55601cff0a2b4344c480b2e1a771a6
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
2018-05-11 03:07:46 -07:00
aaronding
295634fccf Merge LA.UM.7.3.9.08.00.00.385.267 via branch qcom-msm-4.9 into android-msm-bluecross-4.9
Merge Qualcomm's LA.UM.7.3.9.08.00.00.385.267

Removed camera related changes with

git checkout partner/android-msm-bluecross-4.9 -- drivers/media/platform/msm/camera/ drivers/media/platform/msm/camera_v2/
git rm drivers/media/platform/msm/camera_v2/sensor/csiphy/include/msm_csiphy_10_0_0_hwreg.h

Conflicts:
	drivers/media/platform/msm/camera/cam_sensor_module/cam_sensor_utils/cam_sensor_util.c
	drivers/power/supply/power_supply_sysfs.c
	include/linux/power_supply.h

Bug: 78481303
Change-Id: Ib8fe89c2ea5559d69a26982e6e789ccef668d97e
Signed-off-by: Daniel Mentz <danielmentz@google.com>
2018-05-08 08:02:15 +08:00
Linux Build Service Account
78667dedc6 Merge "Merge android-4.9.90 (dd1e37e) into msm-4.9" 2018-05-03 09:02:10 -07:00
Daniel Mentz
9c715ce859 Merge LA.UM.7.3.9.08.00.00.385.245 via branch qcom-msm-4.9 into android-msm-bluecross-4.9
Merge Qualcomm's LA.UM.7.3.9.08.00.00.385.245

Conflicts:
	Makefile
	arch/arm64/Makefile
	arch/arm64/boot/dts/qcom/pfk_ecryptfs.h
	arch/arm64/include/asm/signal32.h
	arch/arm64/kernel/vdso/gettimeofday.S
	block/bio.c
	block/blk-core.c
	block/blk-merge.c
	drivers/crypto/msm/ice.c
	drivers/input/touchscreen/Makefile
	drivers/media/platform/msm/camera/cam_isp/cam_isp_context.c
	drivers/media/platform/msm/camera/cam_isp/cam_isp_context.h
	drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c
	drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.c
	drivers/power/supply/power_supply_sysfs.c
	drivers/power/supply/qcom/Makefile
	drivers/scsi/ufs/ufs-qcom-ice.c
	drivers/scsi/ufs/ufshcd.c
	drivers/video/console/dummycon.c
	fs/crypto/Kconfig
	fs/crypto/Makefile
	fs/crypto/fscrypt_private.h
	fs/crypto/keyinfo.c
	fs/direct-io.c
	fs/ext4/inode.c
	fs/ext4/page-io.c
	fs/f2fs/data.c
	fs/f2fs/f2fs.h
	fs/f2fs/file.c
	fs/f2fs/node.c
	fs/f2fs/super.c
	include/linux/blkdev.h
	include/linux/f2fs_fs.h
	include/linux/fscrypt.h
	include/linux/fscrypt_notsupp.h
	include/linux/fscrypt_supp.h
	include/linux/pfk.h
	include/linux/power_supply.h
	include/linux/security.h
	include/linux/tcp.h
	include/uapi/linux/fs.h
	kernel/sched/cpufreq_schedutil.c
	kernel/sched/fair.c
	net/ipv4/tcp.c
	scripts/Kbuild.include
	security/Kconfig
	security/pfe/Kconfig
	security/pfe/Makefile
	security/pfe/pfk.c
	security/pfe/pfk_internal.h
	security/pfe/pfk_kc.c
	security/pfe/pfk_kc.h
	security/security.c
	security/selinux/include/objsec.h

Change-Id: I7601101b4be54a5f662908bc51d1f60793346885
2018-04-19 17:20:26 -07:00
Blagovest Kolenichev
dc9767ff92 Merge android-4.9.90 (dd1e37e) into msm-4.9
* refs/heads/tmp-dd1e37e:
  Linux 4.9.90
  usb: gadget: f_hid: fix: Move IN request allocation to set_alt()
  RDMA/ucma: Don't allow join attempts for unsupported AF family
  RDMA/ucma: Fix access to non-initialized CM_ID object
  clk: migrate the count of orphaned clocks at init
  IB/mlx5: Fix out-of-bounds read in create_raw_packet_qp_rq
  IB/mlx5: Fix integer overflows in mlx5_ib_create_srq
  dmaengine: ti-dma-crossbar: Fix event mapping for TPCC_EVT_MUX_60_63
  clk: si5351: Rename internal plls to avoid name collisions
  clk: axi-clkgen: Correctly handle nocount bit in recalc_rate()
  clk: Don't touch hardware when reparenting during registration
  nfsd4: permit layoutget of executable-only files
  ARM: dts: aspeed-evb: Add unit name to memory node
  RDMA/ocrdma: Fix permissions for OCRDMA_RESET_STATS
  ip6_vti: adjust vti mtu according to mtu of lower device
  iommu/vt-d: clean up pr_irq if request_threaded_irq fails
  pinctrl: rockchip: enable clock when reading pin direction register
  pinctrl: Really force states during suspend/resume
  coresight: Fix disabling of CoreSight TPIU
  pty: cancel pty slave port buf's work in tty_release
  drm/omap: DMM: Check for DMM readiness after successful transaction commit
  omapdrm: panel: fix compatible vendor string for td028ttec1
  vgacon: Set VGA struct resource types
  iser-target: avoid reinitializing rdma contexts for isert commands
  IB/umem: Fix use of npages/nmap fields
  RDMA/cma: Use correct size when writing netlink stats
  IB/ipoib: Avoid memory leak if the SA returns a different DGID
  mmc: avoid removing non-removable hosts during suspend
  drm/tilcdc: ensure nonatomic iowrite64 is not used
  dmaengine: zynqmp_dma: Fix race condition in the probe
  platform/chrome: Use proper protocol transfer function
  watchdog: Fix potential kref imbalance when opening watchdog
  cros_ec: fix nul-termination for firmware build info
  serial: 8250_dw: Disable clock on error
  qmi_wwan: set FLAG_SEND_ZLP to avoid network initiated disconnect
  media: [RESEND] media: dvb-frontends: Add delay to Si2168 restart
  ath10k: handling qos at STA side based on AP WMM enable/disable
  media: bt8xx: Fix err 'bt878_probe()'
  rtlwifi: rtl_pci: Fix the bug when inactiveps is enabled.
  RDMA/iwpm: Fix uninitialized error code in iwpm_send_mapinfo()
  drm/msm: fix leak in failed get_pages
  media: c8sectpfe: fix potential NULL pointer dereference in c8sectpfe_timer_interrupt
  Bluetooth: btqcomsmd: Fix skb double free corruption
  Bluetooth: hci_qca: Avoid setup failure on missing rampatch
  block/mq: Cure cpu hotplug lock inversion
  perf tests kmod-path: Don't fail if compressed modules aren't supported
  ath10k: fix out of bounds access to local buffer
  rtc: ds1374: wdt: Fix stop/start ioctl always returning -EINVAL
  rtc: ds1374: wdt: Fix issue with timeout scaling from secs to wdt ticks
  mm: hwpoison: call shake_page() after try_to_unmap() for mlocked page
  mm, vmstat: suppress pcp stats for unpopulated zones in zoneinfo
  mm: fix check for reclaimable pages in PF_MEMALLOC reclaim throttling
  cifs: small underflow in cnvrtDosUnixTm()
  net: hns: fix ethtool_get_strings overflow in hns driver
  pNFS: Fix a deadlock when coalescing writes and returning the layout
  sm501fb: don't return zero on failure path in sm501fb_start()
  video: fbdev: udlfb: Fix buffer on stack
  x86/xen: split xen_smp_prepare_boot_cpu()
  tcm_fileio: Prevent information leak for short reads
  ia64: fix module loading for gcc-5.4
  ACPI / power: Delay turning off unused power resources after suspend
  md/raid10: skip spare disk as 'first' disk
  IB/rxe: Don't clamp residual length to mtu
  Input: twl4030-pwrbutton - use correct device for irq request
  power: supply: pda_power: move from timer to delayed_work
  power: supply: isp1704: Fix unchecked return value of devm_kzalloc
  power: supply: bq24190_charger: Add disable-reset device-property
  bnx2x: Align RX buffers
  qed: Unlock on error in qed_vf_pf_acquire()
  vxlan: correctly handle ipv6.disable module parameter
  Bluetooth: hci_ldisc: Add protocol check to hci_uart_tx_wakeup()
  Bluetooth: hci_ldisc: Add protocol check to hci_uart_dequeue()
  soc/fsl/qe: round brg_freq to 1kHz granularity
  net: ethernet: ucc_geth: fix MEM_PART_MURAM mode
  ixgbevf: fix size of queue stats length
  jbd2: Fix lockdep splat with generic/270 test
  drm/nouveau/kms: Increase max retries in scanout position queries.
  drm/amdgpu: fix gpu reset crash
  ACPI / PMIC: xpower: Fix power_table addresses
  ipmi/watchdog: fix wdog hang on panic waiting for ipmi response
  platform/x86: asus-wmi: try to set als by default
  IB/hfi1: Fix softlockup issue
  IB/rdmavt: restore IRQs on error path in rvt_create_ah()
  ARM: DRA7: clockdomain: Change the CLKTRCTRL of CM_PCIE_CLKSTCTRL to SW_WKUP
  netfilter: x_tables: unlock on error in xt_find_table_lock()
  mmc: sdhci-of-esdhc: limit SD clock for ls1012a/ls1046a
  mac80211: Fix possible sband related NULL pointer de-reference
  ipvs: explicitly forbid ipv6 service/dest creation if ipv6 mod is disabled
  staging: wilc1000: fix unchecked return value
  staging: unisys: visorhba: fix s-Par to boot with option CONFIG_VMAP_STACK set to y
  gpio: gpio-wcove: fix GPIO IRQ status mask
  x86/KASLR: Fix kexec kernel boot crash when KASLR randomization fails
  mtip32xx: use runtime tag to initialize command header
  mfd: palmas: Reset the POWERHOLD mux during power off
  dt-bindings: mfd: axp20x: Add "xpowers,master-mode" property for AXP806 PMICs
  iio: hid-sensor: fix return of -EINVAL on invalid values in ret or value
  ACPICA: iasl: Fix IORT SMMU GSI disassembling
  mac80211: don't parse encrypted management frames in ieee80211_frame_acked
  orangefs: do not wait for timeout if umounting
  Btrfs: fix extent map leak during fallocate error path
  Btrfs: send, fix file hole not being preserved due to inline extent
  Btrfs: fix incorrect space accounting after failure to insert inline extent
  rndis_wlan: add return value validation
  libertas: check return value of alloc_workqueue
  mt7601u: check return value of alloc_skb
  iio: st_pressure: st_accel: Initialise sensor platform data properly
  NFS: don't try to cross a mountpount when there isn't one there.
  xprtrdma: Cancel refresh worker during buffer shutdown
  pNFS: Fix use after free issues in pnfs_do_read()
  infiniband/uverbs: Fix integer overflows
  scsi: mac_esp: Replace bogus memory barrier with spinlock
  platform/x86: intel-vbtn: add volume up and down
  netfilter: nft_dynset: continue to next expr if _OP_ADD succeeded
  qlcnic: fix unchecked return value
  wan: pc300too: abort path on failure
  tipc: check return value of nlmsg_new
  mmc: host: omap_hsmmc: checking for NULL instead of IS_ERR()
  netfilter: nf_ct_helper: permit cthelpers with different names via nfnetlink
  openvswitch: Delete conntrack entry clashing with an expectation.
  netfilter: xt_CT: fix refcnt leak on error path
  gpio: gpio-wcove: fix irq pending status bit width
  Fix Express lane queue creation.
  Fix driver usage of 128B WQEs when WQ_CREATE is V1.
  netvsc: Deal with rescinded channels correctly
  ibmvnic: Disable irq prior to close
  ASoC: Intel: Skylake: Uninitialized variable in probe_codec()
  IB/mlx5: Set correct SL in completion for RoCE
  IB/mlx5: Change vma from shared to private
  IB/mlx5: Take write semaphore when changing the vma struct
  IB/mlx4: Change vma from shared to private
  IB/mlx4: Take write semaphore when changing the vma struct
  HSI: ssi_protocol: double free in ssip_pn_xmit()
  IB/ipoib: Update broadcast object if PKey value was changed in index 0
  IB/ipoib: Fix deadlock between ipoib_stop and mcast join flow
  ALSA: hda - Fix headset microphone detection for ASUS N551 and N751
  e1000e: fix timing for 82579 Gigabit Ethernet controller
  tcp: remove poll() flakes with FastOpen
  NFS: Fix missing pg_cleanup after nfs_pageio_cond_complete()
  md/raid10: wait up frozen array in handle_write_completed
  iommu/omap: Register driver before setting IOMMU ops
  irqchip/mips-gic: Separate IPI reservation & usage tracking
  ARM: 8668/1: ftrace: Fix dynamic ftrace with DEBUG_RODATA and !FRAME_POINTER
  x86/reboot: Turn off KVM when halting a CPU
  mwifiex: don't leak 'chan_stats' on reset
  KVM: PPC: Book3S PR: Exit KVM on failed mapping
  scsi: virtio_scsi: Always try to read VPD pages
  iwlwifi: a000: fix memory offsets and lengths
  iwlwifi: split the handler and the wake parts of the notification infra
  clk: ns2: Correct SDIO bits
  ath: Fix updating radar flags for coutry code India
  powerpc/64s: Remove SAO feature from Power9 DD1
  spi: dw: Disable clock after unregistering the host
  tools/testing/nvdimm: fix nfit_test shutdown crash
  ASoC: Intel: Atom: update Thinkpad 10 quirk
  btrfs: fix a bogus warning when converting only data or metadata
  media/dvb-core: Race condition when writing to CAM
  net: ipv6: send unsolicited NA on admin up
  i2c: i2c-scmi: add a MS HID
  genirq: Use irqd_get_trigger_type to compare the trigger type for shared IRQs
  cpufreq/sh: Replace racy task affinity logic
  ACPI/processor: Replace racy task affinity logic
  ACPI/processor: Fix error handling in __acpi_processor_start()
  time: Change posix clocks ops interfaces to use timespec64
  Input: ar1021_i2c - fix too long name in driver's device table
  rtc: cmos: Do not assume irq 8 for rtc when there are no legacy irqs
  x86: i8259: export legacy_pic symbol
  power: supply: bq24190_charger: Limit over/under voltage fault logging
  regulator: anatop: set default voltage selector for pcie
  bonding: handle link transition from FAIL to UP correctly
  platform/x86: asus-nb-wmi: Add wapf4 quirk for the X302UA
  led: core: Clear LED_BLINK_SW flag in led_blink_set()
  Revert "led: core: Fix brightness setting when setting delay_off=0"
  staging: android: ashmem: Fix possible deadlock in ashmem_ioctl
  CIFS: Enable encryption during session setup phase
  SMB3: Validate negotiate request must always be signed
  ASoC: rsnd: check src mod pointer for rsnd_mod_id()
  tpm: fix potential buffer overruns caused by bit glitches on the bus
  BACKPORT, FROMLIST: crypto: arm64/speck - add NEON-accelerated implementation of Speck-XTS
  ANDROID: debugobjects: Make stack check warning more informative
  PM / OPP: list_del_rcu should be used in function _remove_opp_dev
  trace/sched: Fix compilation for 32 bit systems
  sched/fair: select the most energy-efficient CPU candidate on wake-up
  sched/fair: fix array out of bounds access in select_energy_cpu_idx()
  sched/fair: use min capacity when evaluating active cpus
  sched/fair: use min capacity when evaluating idle backup cpus
  sched/fair: use min capacity when evaluating placement energy costs
  sched/fair: introduce minimum capacity capping sched feature
  arm/topology: link arch_scale_min_freq_capacity to cpufreq
  arm64/topology: link arch_scale_min_freq_capacity to cpufreq
  sched: add arch_scale_min_freq_capacity to track minimum capacity caps
  cpufreq: add scaled minimum capacity tracking for policy changes
  arm64: enable max frequency capping
  arm: enable max frequency capping
  cpufreq: implement max frequency capping
  sched/fair: introduce an arch scaling function for max frequency capping
  cpufreq: remove max frequency capping from scale_freq_capacity()
  Revert "ANDROID: cpufreq: Max freq invariant scheduler load-tracking and cpu capacity support"
  Revert "ANDROID: arm: Enable max freq invariant scheduler load-tracking and capacity support"
  Revert "ANDROID: arm64: Enable max freq invariant scheduler load-tracking and capacity support"
  sched/fair: reduce rounding errors in energy computations
  sched/fair: re-factor energy_diff to use a single (extensible) energy_env
  sched/fair: cleanup select_energy_cpu_brute to be more consistent
  sched/fair: remove capacity tracking from energy_diff
  sched/fair: remove energy_diff tracepoint in preparation to re-factoring
  sched/fair: use *p to reference task_structs
  sched: EAS: Fix the calculation of group util in group_idle_state()

Conflicts:
	drivers/clk/clk.c
	drivers/gpu/drm/msm/msm_gem.c
	include/trace/events/sched.h
	kernel/sched/fair.c
	kernel/sched/features.h

Change-Id: I875b8c298dc6a8151abf740126a2d1881d498203
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
2018-04-17 10:46:05 -07:00
Linux Build Service Account
c2d4b82543 Merge "soc: qcom: socinfo: Add support for SDA439/SDA429 soc-id" 2018-04-14 20:49:16 -07:00
Holger Brunck
247e2136c3 fsl/qe: add bit description for SYNL register for GUMR
[ Upstream commit c7f235a7c2d09b1b83671ba2d93ebee981554467 ]

Add the bitmask for the two bit SYNL register according to the QUICK
Engine Reference Manual.

Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
Cc: Zhao Qiang <qiang.zhao@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2018-04-13 19:48:01 +02:00
Tingwei Zhang
89b9927cb5 soc: qcom: socinfo: Add support for SDA439/SDA429 soc-id
Add socinfo support for SDA439 and SDA429 SoC and update
the bindings for the same.

Change-Id: I03f2ebd1a8b4e745d8dfe62a65320db1500296a6
Signed-off-by: Tingwei Zhang <tingwei@codeaurora.org>
2018-04-12 13:14:36 +08:00
Linux Build Service Account
a98239792b Merge "defconfig: msm: Enable SYSMON on msm8953" 2018-04-11 19:33:03 -07:00
Tingwei Zhang
4fff60ad7d soc: qcom: add support for sysmon drivers
Add support for sysmon drivers on msm-4.9 Kernel.
This driver is needed for msm8953 to communicate
with other subsystem.

Change-Id: I3048b84c28e859369193867fa80dc0159cd7c22c
Signed-off-by: Tingwei Zhang <tingwei@codeaurora.org>
2018-04-09 09:41:54 +08:00
Daniel Mentz
0c6c232677 Merge LA.UM.7.3.9.08.00.00.385.217 via branch qcom-msm-4.9 into android-msm-bluecross-4.9
Merge Qualcomm's LA.UM.7.3.9.08.00.00.385.217

Conflicts:
	drivers/media/platform/msm/camera/cam_sensor_module/cam_sensor/cam_sensor_dev.h

Change-Id: I1d89b41c9974d0069c59b119175a92ff51a23147
2018-04-05 18:23:08 -07:00
Linux Build Service Account
27cb80aec0 Merge "soc: qcom: memory_dump: Support ETB/ETR register dump" 2018-03-30 15:09:18 -07:00
Linux Build Service Account
c395302cd3 Merge "soc: qcom: scm: Add a noretry variant for scm_call2" 2018-03-30 15:08:40 -07:00
Kaushal Kumar
8fca99cfd6 soc: qcom: scm: Add a noretry variant for scm_call2
scm_call2 can block scm calls up to 2s due to its
retry mechanism whenever the secure firmware is
busy waiting for certain processing by the client
who in turn is waiting upon its scm call to either
complete or return with failure.

Upon early return, client can process the pending
requests to free up secure firmware and unblock
processing of all pending scm calls. Add a noretry
variant for scm_call2 which can be used by clients
who do not intend to wait for 2s for return status.

Change-Id: I1f0849464a64c32a4de4510fa5787b0ab328725c
Signed-off-by: Kaushal Kumar <kaushalk@codeaurora.org>
2018-03-28 15:43:59 +05:30
Abinaya P
a28c903dfa ARM: dts: mdm: Add initial device node support for MDM9607
Add snapshot of initial set of device tree files, pinctrl
driver and config options required to build MDM9607 from
msm-3.18 'commit fc7eae29037d ("Merge soc: qcom:
bgspi: soft reset Blackghost on failure to resume")'.

Change-Id: Icbeb61b062c9b2b2fbbe4c2fb9fd0edad0efcac0
Signed-off-by: Abinaya P <abinayap@codeaurora.org>
2018-03-25 22:28:30 -07:00
Christophe Leroy
b0d0441f2a net: ethernet: ucc_geth: fix MEM_PART_MURAM mode
[ Upstream commit 8b8642af15ed14b9a7a34d3401afbcc274533e13 ]

Since commit 5093bb965a ("powerpc/QE: switch to the cpm_muram
implementation"), muram area is not part of immrbar mapping anymore
so immrbar_virt_to_phys() is not usable anymore.

Fixes: 5093bb965a ("powerpc/QE: switch to the cpm_muram implementation")
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Acked-by: David S. Miller <davem@davemloft.net>
Acked-by: Li Yang <pku.leo@gmail.com>
Signed-off-by: Scott Wood <oss@buserror.net>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2018-03-24 11:00:19 +01:00
Linux Build Service Account
00644d3ab2 Merge "ARM: dts: mdm: Add initial device node support for MDM9650" 2018-03-23 05:51:12 -07:00
Linux Build Service Account
937bf2eb6e Merge "ion: msm: Add support for VMID_CP_CDSP" 2018-03-23 05:51:10 -07:00
Patrick Daly
f92b061e25 ion: msm: Add support for VMID_CP_CDSP
Add necessary flags for userspace to request this type of memory.

Change-Id: Ic603cb6cf186f3dec483b5a769ed4c405667d9e4
Signed-off-by: Patrick Daly <pdaly@codeaurora.org>
2018-03-21 14:30:42 -07:00
Abinaya P
b444e832bc ARM: dts: mdm: Add initial device node support for MDM9650
Add snapshot of initial set of device tree files, pinctrl
driver and config options required to build MDM9650 from
msm-3.18 'commit fc7eae29037d ("Merge soc: qcom:
bgspi: soft reset Blackghost on failure to resume")'.

Change-Id: I58d6e4d345730c6b5b0b5de02b9b1786c5aa2c28
Signed-off-by: Abinaya P <abinayap@codeaurora.org>
2018-03-21 16:19:44 +05:30
Daniel Mentz
c546a1f595 Merge branch 'qcom-msm-4.9' into android-msm-bluecross-4.9
Merge Qualcomm's LA.UM.7.3.9.08.00.00.385.190

Conflicts:
	drivers/gpu/drm/msm/dsi-staging/dsi_panel.c
	drivers/power/supply/qcom/Makefile

Change-Id: If727feac46acf44231556aeb194ec8a0e81b9c6f
2018-03-16 15:06:17 -07:00
Kaushal Kumar
bf346d5f53 soc: qcom: socinfo: add support for sdm710
Add support for getting soc-id and dummy handle
on sdm710.

Change-Id: Id77f7db25aac1aaf1cfc0b7a8e826e4dd69cd064
Signed-off-by: Kaushal Kumar <kaushalk@codeaurora.org>
2018-03-16 15:12:48 +05:30
Charan Teja Reddy
313991e71f iommu/arm-smmu: msm map/unmap calls for slave side secure targets
On slave side access control based targets, TZ is responsible to
prepare and program page table mapping for secure context banks.
Implement separate map/unmap calls accordingly.

Change-Id: Icb366067b39ce6eaae204c42a067d2a1fc4b8cf0
Signed-off-by: Charan Teja Reddy <charante@codeaurora.org>
2018-03-14 07:02:47 -07:00
Tingwei Zhang
525f1035fd soc: qcom: memory_dump: Support ETB/ETR register dump
Add support to dump ETB/ETR register when enabling
ETB/ETR.

Change-Id: Ia4d4d49fe313adb4d1fe15413495909bc5f226fc
Signed-off-by: Tingwei Zhang <tingwei@codeaurora.org>
2018-03-08 19:17:43 +08:00
Daniel Mentz
2502678cbf Merge branch 'qcom-msm-4.9' into android-msm-bluecross-4.9
Merge Qualcomm's LA.UM.7.3.9.08.00.00.385.165

Conflicts:
	drivers/gpu/drm/msm/dsi-staging/dsi_panel.c
	drivers/media/platform/msm/camera/cam_fd/cam_fd_dev.c
	drivers/power/supply/power_supply_sysfs.c
	drivers/thermal/Makefile
	include/linux/init.h
	include/linux/power_supply.h

Change-Id: I1b5421163a17278dc391d8d16db78bc4b347640c
2018-03-06 17:00:49 -08:00
Daniel Mentz
fbdcf61b3c Merge branch 'qcom-msm-4.9' into android-msm-bluecross-4.9
Conflicts:
	drivers/input/touchscreen/Kconfig
	drivers/nfc/nq-nci.c
	drivers/pinctrl/qcom/pinctrl-msm.c
	drivers/power/supply/qcom/Makefile
	include/linux/tcp.h
	security/pfe/pfk_ice.c

Change-Id: I8c54f50d6c67c68e109d1b1576cf0cd65a1e29a2
2018-02-22 12:39:20 -08:00
Amit Nischal
05bd8759e3 clk: msm: Add support to configure calibration L value
For some PLLs, there could be need to configure the calibration
L value for auto calibration which PLL would use whenever it will
come out of reset. Add support for the same by writing into
USER_CTL_HI register.

Change-Id: I864d5086f4e77b38827c0286caa3f64b9a37a7a7
Signed-off-by: Amit Nischal <anischal@codeaurora.org>
2018-02-22 11:30:00 +05:30
Linux Build Service Account
8e5ca73ffa Merge "drivers: irqchip: qcom: Add MSM8953 pin data for MPM" 2018-02-21 08:23:17 -08:00
Linux Build Service Account
892b3aa78e Merge "msm: camera: Port msm-4.4 camera kernel on msm-4.9 kernel" 2018-02-20 14:23:56 -08:00
Pratap Nirujogi
6e759914be msm: camera: Port msm-4.4 camera kernel on msm-4.9 kernel
This snapshot is taken from msm-4.4 branch as of:

'commit ee294a60356a ("msm: jpegdma: Fix for ASAN issues in jpegdma module")'

Change-Id: I3aba3098a986a5dec84b4bb4144dda19d1db5790
Signed-off-by: Pratap Nirujogi <pratapn@codeaurora.org>
Signed-off-by: Trishansh Bhardwaj <tbhardwa@codeaurora.org>
2018-02-20 15:56:39 +05:30
Raju P.L.S.S.S.N
99d241ea3d cpuidle: lpm-levels: Add system_pm ops for system level LPMs
Add system_pm ops that are used by LPM driver to configure sleep
and wake votes as well as next wake up time. LPM driver uses them
during system level LPMs.

Change-Id: I72b89aeb3408b89a73d1f0c821649f4f998ab85c
Signed-off-by: Raju P.L.S.S.S.N <rplsssn@codeaurora.org>
2018-02-19 16:29:49 +05:30
Ajay Agarwal
ff0b560347 usb: gadget: Add snapshot of USB BAM DMUX driver
This change adds USB BAM DMUX driver which is required by RmNET
and DPL functions to work in SW mode.

This snapshot is taken as of msm-3.18 'commit 4a06b0168aeb ("ANDROID:
sdcardfs: Make WARN_RATELIMIT to pr_debug")'.

This change also fixes the coding style errors.

Change-Id: Ie565a3354765a1d042182cfcd9f9812225a0d2f7
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
2018-02-15 22:59:33 +05:30
Jingbiao Lu
6c7a3bd4ae soc: qcom: socinfo: add support for sdm429 and sdm439
Add support for getting soc-id and dummy handle on sdm429
and sdm439.

Change-Id: I93b9578bed5b0d9b18d7496fcda69c1cdc4c949b
Signed-off-by: Jingbiao Lu <jingbiao@codeaurora.org>
2018-02-09 14:16:59 +08:00
Shawn Yang
0bdeb63fdd ssr: subsystem crash info node
Bug: 73043223

record and export subsystem's crash info: crash_reason,
crash_count, crash_timestamp into file note. provide interfaces
for userspace's processes read the subsystem restart info.


Change-Id: I9f191aa66b600455f2451cc0f295bf2294853229
Signed-off-by: Shawn Yang <shawny@google.com>
2018-02-07 15:43:39 +00:00
Daniel Mentz
03f7a6a6f5 Merge branch qcom-msm-4.9 into android-msm-bluecross-4.9
Conflicts:
	drivers/power/supply/qcom/fg-memif.c
	drivers/soc/qcom/Makefile
	drivers/usb/dwc3/dwc3-msm.c

Change-Id: Ia21beaf6f72ad578aaab2d2772c0270b11e3c150
Signed-off-by: Daniel Mentz <danielmentz@google.com>
2018-02-02 16:39:55 -08:00
Jingbiao Lu
21074344ca soc: qcom: socinfo: Add support for msm8937 soc-id
Add support for getting soc-id and dummy handle on msm8937.

Change-Id: I7a592b4cefbbe6054bd62469bbeb6bf58e59156f
Signed-off-by: Jingbiao Lu <jingbiao@codeaurora.org>
2018-02-02 10:38:27 +08:00