OSDN Git Service
Srinivasarao P [Tue, 26 Dec 2017 12:57:12 +0000 (18:27 +0530)]
Merge android-4.4.100 (
482cc74) into msm-4.4
* refs/heads/tmp-
482cc74
Linux 4.4.100
USB: serial: garmin_gps: fix memory leak on probe errors
USB: serial: garmin_gps: fix I/O after failed probe and remove
USB: serial: qcserial: add pid/vid for Sierra Wireless EM7355 fw update
USB: Add delay-init quirk for Corsair K70 LUX keyboards
USB: usbfs: compute urb->actual_length for isochronous
uapi: fix linux/rds.h userspace compilation errors
uapi: fix linux/rds.h userspace compilation error
Revert "uapi: fix linux/rds.h userspace compilation errors"
Revert "crypto: xts - Add ECB dependency"
MIPS: Netlogic: Exclude netlogic,xlp-pic code from XLR builds
MIPS: init: Ensure reserved memory regions are not added to bootmem
MIPS: init: Ensure bootmem does not corrupt reserved memory
mm: add PHYS_PFN, use it in __phys_to_pfn()
MIPS: End asm function prologue macros with .insn
staging: rtl8712: fixed little endian problem
ixgbe: do not disable FEC from the driver
ixgbe: add mask for 64 RSS queues
ixgbe: Reduce I2C retry count on X550 devices
ixgbe: handle close/suspend race with netif_device_detach/present
ixgbe: fix AER error handling
arm64: dts: NS2: reserve memory for Nitro firmware
ALSA: hda/realtek - Add new codec ID ALC299
gpu: drm: mgag200: mgag200_main:- Handle error from pci_iomap
backlight: adp5520: Fix error handling in adp5520_bl_probe()
backlight: lcd: Fix race condition during register
ALSA: vx: Fix possible transfer overflow
ALSA: vx: Don't try to update capture stream before running
scsi: lpfc: Clear the VendorVersion in the PLOGI/PLOGI ACC payload
scsi: lpfc: Correct issue leading to oops during link reset
scsi: lpfc: Correct host name in symbolic_name field
scsi: lpfc: FCoE VPort enable-disable does not bring up the VPort
scsi: lpfc: Add missing memory barrier
staging: rtl8188eu: fix incorrect ERROR tags from logs
scsi: ufs: add capability to keep auto bkops always enabled
scsi: ufs-qcom: Fix module autoload
igb: Fix hw_dbg logging in igb_update_flash_i210
igb: close/suspend race in netif_device_detach
igb: reset the PHY before reading the PHY ID
drm/sti: sti_vtg: Handle return NULL error from devm_ioremap_nocache
ata: SATA_MV should depend on HAS_DMA
ata: SATA_HIGHBANK should depend on HAS_DMA
ata: ATA_BMDMA should depend on HAS_DMA
ARM: dts: Fix omap3 off mode pull defines
ARM: OMAP2+: Fix init for multiple quirks for the same SoC
ARM: dts: Fix am335x and dm814x scm syscon to probe children
ARM: dts: Fix compatible for ti81xx uarts for 8250
fm10k: request reset when mbx->state changes
extcon: palmas: Check the parent instance to prevent the NULL
dmaengine: dmatest: warn user when dma test times out
Bluetooth: btusb: fix QCA Rome suspend/resume
arm: crypto: reduce priority of bit-sliced AES cipher
net: qmi_wwan: fix divide by 0 on bad descriptors
net: cdc_ether: fix divide by 0 on bad descriptors
sctp: do not peel off an assoc from one netns to another one
xen-blkback: don't leak stack data via response ring
bpf: don't let ldimm64 leak map addresses on unprivileged
KVM: x86: fix singlestepping over syscall
ext4: fix data exposure after a crash
media: dib0700: fix invalid dvb_detach argument
media: imon: Fix null-ptr-deref in imon_probe
BACKPORT: arm64: Use __pa_symbol for empty_zero_page
BACKPORT: arm64: Use __pa_symbol for kernel symbols
UPSTREAM: mm: Introduce lm_alias
Conflicts:
arch/arm64/kernel/insn.c
arch/arm64/kernel/setup.c
arch/arm64/mm/mmu.c
drivers/scsi/ufs/ufshcd.h
Change-Id: I4ffc41779ec115eecab09d72dd8042151514be39
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
Srinivasarao P [Tue, 26 Dec 2017 12:05:16 +0000 (17:35 +0530)]
Merge android-4.4.99 (
7eab308) into msm-4.4
* refs/heads/tmp-
7eab308
Linux 4.4.99
misc: panel: properly restore atomic counter on error path
target: Fix node_acl demo-mode + uncached dynamic shutdown regression
target/iscsi: Fix iSCSI task reassignment handling
brcmfmac: remove setting IBSS mode when stopping AP
tipc: fix link attribute propagation bug
security/keys: add CONFIG_KEYS_COMPAT to Kconfig
tcp/dccp: fix other lockdep splats accessing ireq_opt
tcp/dccp: fix lockdep splat in inet_csk_route_req()
tcp/dccp: fix ireq->opt races
ipip: only increase err_count for some certain type icmp in ipip_err
ppp: fix race in ppp device destruction
sctp: reset owner sk for data chunks on out queues when migrating a sock
tun: allow positive return values on dev_get_valid_name() call
ip6_gre: only increase err_count for some certain type icmpv6 in ip6gre_err
net/unix: don't show information about sockets from other namespaces
ipv6: flowlabel: do not leave opt->tot_len with garbage
packet: avoid panic in packet_getsockopt()
sctp: add the missing sock_owned_by_user check in sctp_icmp_redirect
tun: call dev_get_valid_name() before register_netdevice()
l2tp: check ps->sock before running pppol2tp_session_ioctl()
tcp: fix tcp_mtu_probe() vs highest_sack
tun/tap: sanitize TUNSETSNDBUF input
ALSA: seq: Cancel pending autoload work at unbinding device
Input: ims-psu - check if CDC union descriptor is sane
usb: usbtest: fix NULL pointer dereference
mac80211: don't compare TKIP TX MIC key in reinstall prevention
mac80211: use constant time comparison with keys
mac80211: accept key reinstall without changing anything
FROMLIST: binder: fix proc->files use-after-free
Change-Id: I9aaf4f803a5da1fc983879a214b2fddda7879f41
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
Srinivasarao P [Tue, 26 Dec 2017 11:53:34 +0000 (17:23 +0530)]
Merge android-4.4.98 (3d4af8) into msm-4.4
* refs/heads/tmp-
03d4af8
Linux 4.4.98
PKCS#7: fix unitialized boolean 'want'
x86/oprofile/ppro: Do not use __this_cpu*() in preemptible context
can: c_can: don't indicate triple sampling support for D_CAN
can: sun4i: handle overrun in RX FIFO
rbd: use GFP_NOIO for parent stat and data requests
drm/vmwgfx: Fix Ubuntu 17.10 Wayland black screen issue
Input: elan_i2c - add ELAN060C to the ACPI table
MIPS: AR7: Ensure that serial ports are properly set up
MIPS: AR7: Defer registration of GPIO
tools: firmware: check for distro fallback udev cancel rule
selftests: firmware: send expected errors to /dev/null
selftests: firmware: add empty string and async tests
test: firmware_class: report errors properly on failure
MIPS: SMP: Fix deadlock & online race
MIPS: Fix race on setting and getting cpu_online_mask
MIPS: SMP: Use a completion event to signal CPU up
MIPS: Fix CM region target definitions
MIPS: microMIPS: Fix incorrect mask in insn_table_MM
ALSA: seq: Avoid invalid lockdep class warning
ALSA: seq: Fix OSS sysex delivery in OSS emulation
ARM: 8720/1: ensure dump_instr() checks addr_limit
KEYS: fix NULL pointer dereference during ASN.1 parsing [ver #2]
crypto: x86/sha1-mb - fix panic due to unaligned access
workqueue: Fix NULL pointer dereference
x86/uaccess, sched/preempt: Verify access_ok() context
platform/x86: hp-wmi: Do not shadow error values
platform/x86: hp-wmi: Fix error value for hp_wmi_tablet_state
KEYS: trusted: fix writing past end of buffer in trusted_read()
KEYS: trusted: sanitize all key material
cdc_ncm: Set NTB format again after altsetting switch for Huawei devices
platform/x86: hp-wmi: Fix detection for dock and tablet mode
net: dsa: select NET_SWITCHDEV
s390/qeth: issue STARTLAN as first IPA command
IB/ipoib: Change list_del to list_del_init in the tx object
Input: mpr121 - set missing event capability
Input: mpr121 - handle multiple bits change of status register
IPsec: do not ignore crypto err in ah4 input
netfilter: nft_meta: deal with PACKET_LOOPBACK in netdev family
usb: hcd: initialize hcd->flags to 0 when rm hcd
serial: sh-sci: Fix register offsets for the IRDA serial port
phy: increase size of MII_BUS_ID_SIZE and bus_id
iio: trigger: free trigger resource correctly
crypto: vmx - disable preemption to enable vsx in aes_ctr.c
ARM: omap2plus_defconfig: Fix probe errors on UARTs 5 and 6
powerpc/corenet: explicitly disable the SDHC controller on kmcoge4
iommu/arm-smmu-v3: Clear prior settings when updating STEs
KVM: PPC: Book 3S: XICS: correct the real mode ICP rejecting counter
drm: drm_minor_register(): Clean up debugfs on failure
xen/netback: set default upper limit of tx/rx queues to 8
PCI: mvebu: Handle changes to the bridge windows while enabled
video: fbdev: pmag-ba-fb: Remove bad `__init' annotation
adv7604: Initialize drive strength to default when using DT
ANDROID: binder: clarify deferred thread work.
FROMLIST: arm64: Avoid aligning normal memory pointers in __memcpy_{to,from}io
Conflicts:
arch/arm64/kernel/io.c
Change-Id: I992fcf368dbc672ad7d6ae31e87f289f4d7df2bf
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
Srinivasarao P [Mon, 18 Dec 2017 08:44:52 +0000 (14:14 +0530)]
Merge android-4.4.97 (
46d256d) into msm-4.4
* refs/heads/tmp-
46d256d
Linux 4.4.97
staging: r8712u: Fix Sparse warning in rtl871x_xmit.c
xen: don't print error message in case of missing Xenstore entry
bt8xx: fix memory leak
s390/dasd: check for device error pointer within state change interrupts
mei: return error on notification request to a disconnected client
exynos4-is: fimc-is: Unmap region obtained by of_iomap()
staging: lustre: ptlrpc: skip lock if export failed
staging: lustre: hsm: stack overrun in hai_dump_data_field
staging: lustre: llite: don't invoke direct_IO for the EOF case
platform/x86: intel_mid_thermal: Fix module autoload
scsi: aacraid: Process Error for response I/O
xen/manage: correct return value check on xenbus_scanf()
cx231xx: Fix I2C on Internal Master 3 Bus
perf tools: Only increase index if perf_evsel__new_idx() succeeds
drm/amdgpu: when dpm disabled, also need to stop/start vce.
i2c: riic: correctly finish transfers
ext4: do not use stripe_width if it is not set
ext4: fix stripe-unaligned allocations
staging: rtl8712u: Fix endian settings for structs describing network packets
mfd: axp20x: Fix axp288 PEK_DBR and PEK_DBF irqs being swapped
mfd: ab8500-sysctrl: Handle probe deferral
ARM: pxa: Don't rely on public mmc header to include leds.h
mmc: s3cmci: include linux/interrupt.h for tasklet_struct
PM / wakeirq: report a wakeup_event on dedicated wekup irq
Fix tracing sample code warning.
tracing/samples: Fix creation and deletion of simple_thread_fn creation
drm/msm: fix an integer overflow test
drm/msm: Fix potential buffer overflow issue
perf tools: Fix build failure on perl script context
ocfs2: fstrim: Fix start offset of first cluster group during fstrim
ARM: 8715/1: add a private asm/unaligned.h
ARM: dts: mvebu: pl310-cache disable double-linefill
arm64: ensure __dump_instr() checks addr_limit
ASoC: adau17x1: Workaround for noise bug in ADC
KEYS: fix out-of-bounds read during ASN.1 parsing
KEYS: return full count in keyring_read() if buffer is too small
cifs: check MaxPathNameComponentLength != 0 before using it
ALSA: seq: Fix nested rwsem annotation for lockdep splat
ALSA: timer: Add missing mutex lock for compat ioctls
BACKPORT: xfrm: Clear sk_dst_cache when applying per-socket policy.
Revert "ANDROID: sched/rt: schedtune: Add boost retention to RT"
cpufreq: Drop schedfreq governor
ANDROID: sched/rt: schedtune: Add boost retention to RT
ANDROID: sched/rt: add schedtune accounting
ANDROID: Revert "arm64: move ELF_ET_DYN_BASE to 4GB / 4MB"
ANDROID: Revert "arm: move ELF_ET_DYN_BASE to 4MB"
sched: EAS: Fix the calculation of group util in group_idle_state()
sched: EAS: update trg_cpu to backup_cpu if no energy saving for target_cpu
sched: EAS: Fix the condition to distinguish energy before/after
Conflicts:
drivers/cpufreq/Kconfig
drivers/gpu/drm/msm/msm_gem_submit.c
kernel/sched/core.c
kernel/sched/fair.c
kernel/sched/rt.c
kernel/sched/sched.h
Change-Id: I0d8c5287cb67fd47c8944a002c0ca71adcdef537
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
Linux Build Service Account [Sat, 16 Dec 2017 08:56:46 +0000 (00:56 -0800)]
Merge "qseecom: support listener request from smcinvoke without reentrancy"
Linux Build Service Account [Sat, 16 Dec 2017 08:56:45 +0000 (00:56 -0800)]
Merge "qseecom: fix an issue when requested listener svc id does not exist"
Zhen Kong [Thu, 19 Oct 2017 19:32:07 +0000 (12:32 -0700)]
qseecom: support listener request from smcinvoke without reentrancy
Add support to process listener request from smcinvoke when
reentrancy is disabled.
Change-Id: I2ce030cf6d5104ca2dec1402634a05d425e6d474
Signed-off-by: Zhen Kong <zkong@codeaurora.org>
Linux Build Service Account [Fri, 15 Dec 2017 22:14:38 +0000 (14:14 -0800)]
Merge "adv7481: Remove conditional compilation for PM functions"
Linux Build Service Account [Fri, 15 Dec 2017 22:14:37 +0000 (14:14 -0800)]
Merge "drm/msm: Correctly retrieve gpu's active power level"
Linux Build Service Account [Fri, 15 Dec 2017 22:14:36 +0000 (14:14 -0800)]
Merge "ARM: dts: msm: blsp and sdhci switch to virtual clock on msm8996 vplatform"
Linux Build Service Account [Fri, 15 Dec 2017 22:14:35 +0000 (14:14 -0800)]
Merge "clk: msm: virtual clock adds support for usb, lpass and modem"
Linux Build Service Account [Fri, 15 Dec 2017 22:14:34 +0000 (14:14 -0800)]
Merge "msm: ipa: Fix to validate routing table index for filter exception"
Linux Build Service Account [Fri, 15 Dec 2017 22:14:33 +0000 (14:14 -0800)]
Merge "msm: mdss: Trigger idle fallback when no update due to touch"
Linux Build Service Account [Fri, 15 Dec 2017 22:14:32 +0000 (14:14 -0800)]
Merge "drivers: net: can: Add suspend/resume routine for CAN driver"
Linux Build Service Account [Fri, 15 Dec 2017 22:14:31 +0000 (14:14 -0800)]
Merge "spi: spi_qsd: Poll for valid state after software Reset"
Zhen Kong [Sat, 9 Dec 2017 20:51:36 +0000 (12:51 -0800)]
qseecom: fix an issue when requested listener svc id does not exist
When listener svc id does not exist, the listener svc entry pointer
is actualy invalid, and should be set to NULL to avoid invalid pointer
deference on cache operation when sending listener resp to TZ.
Change-Id: I6af0c7405c9dc5dfe481396979023968a8324dd0
Signed-off-by: Zhen Kong <zkong@codeaurora.org>
Rahul Sharma [Wed, 6 Dec 2017 19:37:10 +0000 (01:07 +0530)]
adv7481: Remove conditional compilation for PM functions
Remove conditional compilation for power management functions,
so that suspend and resume are called always.
Change-Id: I6309df0d12db16c90a10127293bb2715cde15a29
Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
Mohammed Javid [Thu, 5 Oct 2017 18:09:39 +0000 (23:39 +0530)]
msm: ipa: Fix to validate routing table index for filter exception
Fix to validate routing table index for filter action
IPA_PASS_TO_EXCEPTION case to avoid ipa assert
during commit filter rule.
Change-Id: I957f7ffc415ea1a042f6b3a948e94410d41b2262
Acked-by: Ashok Vuyyuru <avuyyuru@qti.qualcomm.com>
Signed-off-by: Mohammed Javid <mjavid@codeaurora.org>
Krishna Manikandan [Fri, 15 Dec 2017 09:02:07 +0000 (14:32 +0530)]
msm: mdss: Trigger idle fallback when no update due to touch
Trigger an idle fallback with a reasonable timeout value when
there is no update despite of a touch event and idle_time is 0.
This will reset the refresh rate to minimum fps.
CRs-Fixed:
2003247
Change-Id: I4a2964038f23984bf1ea39c63bf679d80ad12cba
Signed-off-by: Krishna Manikandan <mkrishn@codeaurora.org>
Linux Build Service Account [Fri, 15 Dec 2017 07:58:54 +0000 (23:58 -0800)]
Merge "Merge android-4.4.96 (
aed4c54) into msm-4.4"
Linux Build Service Account [Thu, 14 Dec 2017 21:44:24 +0000 (13:44 -0800)]
Merge "ARM: dts: msm: Override vendor node entires in fstab for MSM8996ProAU"
Abinaya P [Tue, 7 Nov 2017 11:09:22 +0000 (16:39 +0530)]
drivers: net: can: Add suspend/resume routine for CAN driver
Make the CAN interrupt as a wakeup capable interrupt and also add
suspend/resume routine to handle the suspend/resume states of
the device
Change-Id: I0e972f3c4b005b52fb8d2e03f83995ecd3c47538
Signed-off-by: Abinaya P <abinayap@codeaurora.org>
Dilip Kota [Mon, 4 Dec 2017 07:20:45 +0000 (12:50 +0530)]
spi: spi_qsd: Poll for valid state after software Reset
For SPI slave, software reset performs long pulse
reset. Software should wait for QUP to be in valid
state before doing operations on QUP.
Change-Id: Ifbed295df87a6c5c383cedb431b368b3dffca676
Signed-off-by: Dilip Kota <dkota@codeaurora.org>
Linux Build Service Account [Thu, 14 Dec 2017 08:14:44 +0000 (00:14 -0800)]
Merge "drivers: power: reset: Do cold reset when doing oem reboot"
Linux Build Service Account [Thu, 14 Dec 2017 08:14:42 +0000 (00:14 -0800)]
Merge "ARM: dts: msm: enable drm msm-hyp driver for msm8996"
Linux Build Service Account [Thu, 14 Dec 2017 08:14:41 +0000 (00:14 -0800)]
Merge "scsi: ufs: Trigger runtime-idle in a separate work"
Linux Build Service Account [Thu, 14 Dec 2017 08:14:40 +0000 (00:14 -0800)]
Merge "dwc3-msm: Notify proper current values in case of floating charger"
Linux Build Service Account [Thu, 14 Dec 2017 08:14:39 +0000 (00:14 -0800)]
Merge "net: cnss2: restore pci config space before enable device"
Linux Build Service Account [Thu, 14 Dec 2017 08:14:37 +0000 (00:14 -0800)]
Merge "power: smb-lib: fix OTG enable error handling"
Linux Build Service Account [Thu, 14 Dec 2017 08:14:36 +0000 (00:14 -0800)]
Merge "ion: ensure CMO target is valid"
Camus Wong [Sat, 9 Dec 2017 19:28:54 +0000 (14:28 -0500)]
ARM: dts: msm: enable drm msm-hyp driver for msm8996
Enable virtual kernel drm driver for hypervisor environment for msm8996.
Change-Id: I6305e088e4b844d3f7dfe1620bd6d68cdaf6432f
Signed-off-by: Camus Wong <camusw@codeaurora.org>
Camus Wong [Mon, 14 Aug 2017 20:51:07 +0000 (16:51 -0400)]
drm/msm-hyp: new virtual msm driver
This driver is enabled on hypervisor builds for the purpose of
creating a DRM device that DRM Master can open and listen on for
VBlank and Page Flip events.
Change-Id: Ib9b2df5ae0e2c33145663b3f515595e8f433a850
Signed-off-by: Camus Wong <camusw@codeaurora.org>
Asutosh Das [Tue, 14 Nov 2017 11:31:40 +0000 (17:01 +0530)]
scsi: ufs: Trigger runtime-idle in a separate work
In case of an exception, there could be a deadlock:
-000|__switch_to()
-001|context_switch(inline)
-001|__schedule()
-002|schedule()
-003|schedule_timeout()
-004|do_wait_for_common(inline)
-004|__wait_for_common(inline)
-004|wait_for_common()
-005|wait_for_completion()
-006|destroy_work_on_stack(inline)
-006|flush_work()
-007|ufshcd_suspend()
-008|ufshcd_runtime_suspend()
-009|ufshcd_pltfrm_runtime_suspend()
-010|pm_generic_runtime_suspend()
-011|__rpm_callback(inline)
-011|rpm_callback()
-012|rpm_suspend()
-013|rpm_idle()
-014|__pm_runtime_idle()
-015|ufshcd_exception_event_handler()
-016|__read_once_size(inline)
-016|static_key_count(inline)
-016|static_key_false(inline)
-016|trace_workqueue_execute_end(inline)
-016|process_one_work()
-017|__read_once_size(inline)
-017|list_empty(inline)
-017|worker_thread()
-018|kthread()
-019|ret_from_fork(asm)
This is caused because in exception handler
pm_runtime_put_sync is invoked which calls ufshcd_suspend.
And ufshcd_suspend flushes the exception handler work
& deadlocks.
Hence, schedule the suspend work in a different context.
Change-Id: I02524cee5ab2b64e0ad5de873d5318aef7b6ac95
Signed-off-by: Asutosh Das <asutoshd@codeaurora.org>
Signed-off-by: Sayali Lokhande <sayalil@codeaurora.org>
Binoy Jayan [Thu, 9 Nov 2017 10:16:26 +0000 (15:46 +0530)]
ARM: dts: msm: Override vendor node entires in fstab for MSM8996ProAU
Override the property fsmgr_flags by adding the options verify and
slotselect for the vendor node in the fstab so that A/B is enabled and the
partition is verified by the device mapper target dm-verity. Also delete
the system node from the fstab as it is already mounted by the kernel.
Change-Id: Ib65f1d261c95b995f3999ba24517a69488346ca9
Signed-off-by: Binoy Jayan <bjayan@codeaurora.org>
Zhiqiang Tu [Mon, 11 Dec 2017 08:54:05 +0000 (16:54 +0800)]
clk: msm: virtual clock adds support for usb, lpass and modem
Support usb, lpass and modem clocks in msm8996 virtual clock
frontend driver.
Change-Id: I5ee4f2d951f133a8403442707e633563efdc5c65
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
Zhiqiang Tu [Wed, 13 Dec 2017 09:08:26 +0000 (17:08 +0800)]
ARM: dts: msm: blsp and sdhci switch to virtual clock on msm8996 vplatform
Enable virtual clock for uart, spi, i2c and sdhci.
Change-Id: Id0dd32c520eeb956390fb1e0e1a4f762c6ae47f9
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
Sai Krishna Juturi [Fri, 8 Dec 2017 09:30:43 +0000 (15:00 +0530)]
dwc3-msm: Notify proper current values in case of floating charger
Currently our driver is notifying ETIMEDOUT to PMIC
incase of floating charger. Consider if we are inserting
an SDP charger slowly that time also we will detect
it as floating charger then also we are notifying
ETIMEDOUT irrespective of current that is notified from
gadget driver. Hence notify charging current properly
if enumeration happens even in case of
floating charger so that PMIC can update real charger
type to SDP
Signed-off-by: Sai Krishna Juturi <jsaikrishna@codeaurora.org>
Change-Id: Ibeeeafac0834c9df7099a3f0bad274ddb393de47
Linux Build Service Account [Wed, 13 Dec 2017 03:00:52 +0000 (19:00 -0800)]
Merge "smb1351: add MODEL_NAME property in parallel power_supply"
Linux Build Service Account [Wed, 13 Dec 2017 03:00:51 +0000 (19:00 -0800)]
Merge "ARM: dts: msm: Change rh850 interrupt to gpio_122 on auto cdp boards"
Linux Build Service Account [Wed, 13 Dec 2017 03:00:50 +0000 (19:00 -0800)]
Merge "soc: qcom: pil: NULL check before pil_memset_io"
Linux Build Service Account [Wed, 13 Dec 2017 03:00:48 +0000 (19:00 -0800)]
Merge "drivers: lmh_dcvsh: Defer cluster cooling register until core comes online"
Linux Build Service Account [Wed, 13 Dec 2017 03:00:46 +0000 (19:00 -0800)]
Merge "usb: pd: qpnp-pdphy: move RX handling to hard IRQ"
Linux Build Service Account [Wed, 13 Dec 2017 03:00:45 +0000 (19:00 -0800)]
Merge "usb: pd: qpnp-pdphy: Remove rx_busy flag"
Linux Build Service Account [Wed, 13 Dec 2017 03:00:44 +0000 (19:00 -0800)]
Merge "defconfig: msm: Enable CONFIG_INET_LRO"
Blagovest Kolenichev [Tue, 12 Dec 2017 11:32:55 +0000 (03:32 -0800)]
Merge android-4.4.96 (
aed4c54) into msm-4.4
* refs/heads/tmp-
aed4c54
Linux 4.4.96
Revert "drm: bridge: add DT bindings for TI ths8135"
ecryptfs: fix dereference of NULL user_key_payload
x86/microcode/intel: Disable late loading on model 79
regulator: fan53555: fix I2C device ids
can: kvaser_usb: Ignore CMD_FLUSH_QUEUE_REPLY messages
can: kvaser_usb: Correct return value in printout
can: sun4i: fix loopback mode
scsi: sg: Re-fix off by one in sg_fill_request_table()
scsi: zfcp: fix erp_action use-before-initialize in REC action trace
assoc_array: Fix a buggy node-splitting case
Input: gtco - fix potential out-of-bound access
Input: elan_i2c - add ELAN0611 to the ACPI table
xen/gntdev: avoid out of bounds access in case of partial gntdev_mmap()
fuse: fix READDIRPLUS skipping an entry
spi: uapi: spidev: add missing ioctl header
usb: xhci: Handle error condition in xhci_stop_device()
ceph: unlock dangling spinlock in try_flush_caps()
ALSA: hda - fix headset mic problem for Dell machines with alc236
ALSA: hda/realtek - Add support for ALC236/ALC3204
workqueue: replace pool->manager_arb mutex with a flag
sched: EAS: upmigrate misfit current task
sched: avoid pushing tasks to an offline CPU
sched: Extend active balance to accept 'push_task' argument
Revert "sched/core: Warn if ENERGY_AWARE is enabled but data is missing"
Revert "sched/core: fix have_sched_energy_data build warning"
FROMLIST: kbuild: clang: fix build failures with sparse check
Revert "Revert "UPSTREAM: efi/libstub/arm64: Set -fpie when building the EFI stub""
BACKPORT: efi/libstub: Unify command line param parsing
Conflicts:
drivers/usb/host/xhci-hub.c
kernel/sched/core.c
kernel/sched/fair.c
Change-Id: Ie36ce5de516f02b2d553043009d9afee64e7ff24
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
Linux Build Service Account [Tue, 12 Dec 2017 06:33:57 +0000 (22:33 -0800)]
Merge "ARM: dts: msm: Set values for MDM shutdown and reset on msm8996 CV2X"
Linux Build Service Account [Tue, 12 Dec 2017 06:33:56 +0000 (22:33 -0800)]
Merge "defconfig: arm64: fsm: Modify configs for FSM"
Linux Build Service Account [Tue, 12 Dec 2017 06:33:55 +0000 (22:33 -0800)]
Merge "pwm: pwm-qpnp: Enable glitch removal after PWM enabled"
Linux Build Service Account [Tue, 12 Dec 2017 06:33:54 +0000 (22:33 -0800)]
Merge "clk: msm: Add virtual clock frontend driver"
Linux Build Service Account [Tue, 12 Dec 2017 06:33:52 +0000 (22:33 -0800)]
Merge "usb: pd: Send pending VDM message upon entering SNK/SRC_Ready"
Lijuan Gao [Wed, 6 Dec 2017 08:20:35 +0000 (16:20 +0800)]
drivers: power: reset: Do cold reset when doing oem reboot
As the IMEM approach to store reset reason is deprecated, so use
the spare register in PMIC power-on peripheral to store the oem
restart reason.
Bit-2 to bit-7 of SOFT_RB_SPARE for hard reset reason, so divide
existing range into regions, value 0 to 31 for common defined features
and 32 to 63 values are for OEMs/ODMs specific features.
Change-Id: Ib8e64d6dd5a335325d0469280e41e9d10ec9b893
Signed-off-by: Lijuan Gao <lijuang@codeaurora.org>
Ashay Jaiswal [Wed, 15 Nov 2017 12:39:19 +0000 (18:09 +0530)]
power: smb-lib: fix OTG enable error handling
Fix OTG enable error path and drop stale votes
on USB_ICL votable.
Change-Id: Ia0fce0ef75bb83ece72cc6a5a8f294b2500a0166
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
Swetha Chikkaboraiah [Wed, 20 Sep 2017 07:12:45 +0000 (12:42 +0530)]
soc: qcom: pil: NULL check before pil_memset_io
In existing implementation if vmap fails device panics for
NULL pointer access while doing pil_memset_io.
Instead check for the NULL pointer.
Change-Id: I1b9fd084a8c168b70f6e01134e4122445e4873b4
Signed-off-by: Swetha Chikkaboraiah <schikk@codeaurora.org>
Yasir Malik [Fri, 8 Dec 2017 20:41:25 +0000 (15:41 -0500)]
defconfig: arm64: fsm: Modify configs for FSM
* Enable POSIX message queues
* Disable ANDROID_PARANOID_NETWORK
* Disable IPC_ROUTER_SECURITY
* Disable unnecessary drivers:
- Graphics
- Sound
- Bluetooth
- Wireless LAN
- Most input devices
Change-Id: I134e94ad21ed2d9c8f247b5c1523510cdd9ecb0a
CRs-Fixed:
2130054
Acked-by: Jennifer L. Zenner <jzenner@qti.qualcomm.com>
Signed-off-by: Yasir Malik <ymalik@codeaurora.org>
Jack Pham [Thu, 2 Nov 2017 17:51:48 +0000 (10:51 -0700)]
usb: pd: qpnp-pdphy: move RX handling to hard IRQ
For improved performance, move RX handling from a thread to
a hard IRQ handler. This helps to decrease the chance of missing
incoming back-to-back messages (e.g. Accept -> PS_Ready following
a successful power request) due to the pending RX token in case
the IRQ thread is delayed due to high system load. policy_engine
needs to perform the buffer allocation with the GFP_ATOMIC flag.
Change-Id: Iacb2623280f1ac4de9f483a8abbf5dc055041be7
Signed-off-by: Jack Pham <jackp@codeaurora.org>
Linux Build Service Account [Fri, 8 Dec 2017 10:17:03 +0000 (02:17 -0800)]
Merge "defconfig: Add android-verity support for system"
Linux Build Service Account [Fri, 8 Dec 2017 10:17:02 +0000 (02:17 -0800)]
Merge "ARM: dts: msm: Add NTN_CLK_SYNC pin for msm8996 agave and auto cdp board"
Linux Build Service Account [Fri, 8 Dec 2017 10:17:00 +0000 (02:17 -0800)]
Merge "ARM: dts: msm: Disable PCIe L1 and L1ss for msm8996 CV2X"
Linux Build Service Account [Fri, 8 Dec 2017 10:16:59 +0000 (02:16 -0800)]
Merge "diag: Free the memory in diagfwd_peripheral_exit()"
Zhiqiang Tu [Tue, 7 Nov 2017 02:23:37 +0000 (10:23 +0800)]
clk: msm: Add virtual clock frontend driver
It is virtual clock frontend driver which communicates
with host backend clock service/driver over HABMM. It
only supports msm8996 virtual platform currently.
Change-Id: Icfee28c301fa4a583b45e5d364432535643eb9b7
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
Jack Pham [Thu, 12 Oct 2017 16:41:51 +0000 (09:41 -0700)]
usb: pd: qpnp-pdphy: Remove rx_busy flag
Having this flag was causing PD TX messages to incorrectly
get blocked in the case where the policy engine state machine
worker got scheduled to run in the RX IRQ, but before the
handler exits and clears the flag. This caused false errors
that an RX message is pending. Remove usage of this flag as
it was doing more harm than good.
Change-Id: Iffccfc9ffafac6017192d86d8d97d5534890c7b5
Signed-off-by: Jack Pham <jackp@codeaurora.org>
Jack Pham [Tue, 10 Oct 2017 23:59:32 +0000 (16:59 -0700)]
usb: pd: Avoid blocking wait in SRC_TRANSITION_TO_DEFAULT
When sending/receiving a hard reset in source mode, the
PE_SRC_TRANSITION_TO_DEFAULT state turns off VBUS/VCONN and
sleeps for 750ms. During this fairly long period any Type-C
event such as cable disconnect or reconnect won't get
processed as the workqueue is blocked by this wait condition.
This can lead to incorrect state handling, for example when
a sink is removed and a source is attached; the state machine
will think a sink is still attached. Fix this by removing
the msleep() and set a timer to restart the state machine
to PE_UNKNOWN which will turn VBUS/VCONN back on and start
again in PE_SRC_STARTUP. This frees up the workqueue to
process any potential incoming events in the meantime.
Change-Id: I282551a58252a672f319d1559eac9f4ad4c3ca8a
Signed-off-by: Jack Pham <jackp@codeaurora.org>
Jack Pham [Thu, 5 Oct 2017 19:51:26 +0000 (12:51 -0700)]
usb: pd: Send pending VDM message upon entering SNK/SRC_Ready
Entering SNK_Ready or SRC_Ready state from usbpd_set_state()
is somewhat terminal as it is the end state of a contract
negotiation. If there was a previous pending VDM message
waiting to be sent, for example the start of a Discovery which
was queued prior to a PR Swap, it would not get sent. Check for
this and enqueue usbpd_sm once again so that it could be sent
out. Otherwise, start the Discovery process in case we are
in DFP mode, and do that for SNK_Ready as well.
Change-Id: I4516ccb0deec8cdabdb62d539d7d2b66dc23f1ee
Signed-off-by: Jack Pham <jackp@codeaurora.org>
Binoy Jayan [Thu, 9 Nov 2017 10:20:17 +0000 (15:50 +0530)]
defconfig: Add android-verity support for system
Add android-verity support so that the system image is verified by
the kernel during the boot time. Also set the x509 key file to be
used for verification.
Change-Id: I17ffc2944ef9af556d9fdc05d62734de384dc27c
Signed-off-by: Binoy Jayan <bjayan@codeaurora.org>
Manaf Meethalavalappu Pallikunhi [Tue, 5 Dec 2017 01:53:04 +0000 (07:23 +0530)]
drivers: lmh_dcvsh: Defer cluster cooling register until core comes online
If all cores for a cluster are offline or not brought up during
lmh dcvsh probe, it fails to register cooling device and it leads
to probe failure. If later these cores come online, lmh dcvsh doesn't
re-probe it and eventually that cluster lmh dcvsh is broken.
Register for cpu online notification and register cpu cooling device
in cpu online notification callback context. It makes sure that
both lmh dcvsh probing and cooling device register are proper.
Change-Id: Id5345a578aab920d12bd9d9e2ccf1d5059582de9
Signed-off-by: Manaf Meethalavalappu Pallikunhi <manafm@codeaurora.org>
Alex Yakavenka [Mon, 4 Dec 2017 23:43:49 +0000 (15:43 -0800)]
ARM: dts: msm: Change rh850 interrupt to gpio_122 on auto cdp boards
rh850_2_apq interrupt is connected to gpio_122 on auto cdp boards
CRs-Fixed:
2009305
Change-Id: Id60ec07a7bc4757050ad2a1c39123ec561581082
Signed-off-by: Alex Yakavenka <ayakav@codeaurora.org>
Poddar, Siddarth [Thu, 7 Dec 2017 06:04:21 +0000 (11:34 +0530)]
defconfig: msm: Enable CONFIG_INET_LRO
WLAN module supports LRO, so enable CONFIG_INET_LRO for SDM660.
Remove it from defconfig to enable as Kconfig has default set to enable.
Change-Id: I5681c47caa18931ab1a3ea2b09c3a1f9abc38777
CRs-Fixed:
2144533
Signed-off-by: Poddar Siddarth <siddpodd@codeaurora.org>
Zou Shunxiang [Tue, 5 Dec 2017 01:39:29 +0000 (09:39 +0800)]
ARM: dts: msm: Add NTN_CLK_SYNC pin for msm8996 agave and auto cdp board
NTN_CLK_SYNC line should be set low before bringing Neutrino out
of reset for msm8996 agave board and auto CDP board.
Change-Id: I7b213a7dad2dbdedd3fe42a88972dc36cbf2e5b5
Signed-off-by: Zou Shunxiang <shunxian@codeaurora.org>
Linux Build Service Account [Wed, 6 Dec 2017 15:00:32 +0000 (07:00 -0800)]
Merge "wcnss: fix the potential buffer overflow in wlan ctrl data process"
Linux Build Service Account [Wed, 6 Dec 2017 15:00:31 +0000 (07:00 -0800)]
Merge "icnss: Reject driver reinit request when FW is down"
Linux Build Service Account [Wed, 6 Dec 2017 15:00:30 +0000 (07:00 -0800)]
Merge "Revert "DRM: SDE: Update the hdmi bridge to handle HPD clock""
Linux Build Service Account [Wed, 6 Dec 2017 15:00:29 +0000 (07:00 -0800)]
Merge "ath10k: enable gtk offload for the wcn3990 wlan module"
Linux Build Service Account [Wed, 6 Dec 2017 15:00:28 +0000 (07:00 -0800)]
Merge "ANDROID: sdcardfs: Make WARN_RATELIMIT to pr_debug"
Linux Build Service Account [Wed, 6 Dec 2017 15:00:27 +0000 (07:00 -0800)]
Merge "drm/msm: Add API support for getting GPU hang timeout"
Linux Build Service Account [Wed, 6 Dec 2017 15:00:26 +0000 (07:00 -0800)]
Merge "drm/msm: Save buffer iova's for rd-dump"
Sreelakshmi Gownipalli [Mon, 18 Sep 2017 19:41:47 +0000 (12:41 -0700)]
diag: Free the memory in diagfwd_peripheral_exit()
In diagfwd_peripheral_exit() free the memory associated with
early_init_info.
Change-Id: I862b6d806d67dad38316f1608827a4bf6f5a691f
Signed-off-by: Sreelakshmi Gownipalli <sgownipa@codeaurora.org>
Gustavo Solaira [Tue, 5 Dec 2017 19:44:02 +0000 (11:44 -0800)]
ARM: dts: msm: Disable PCIe L1 and L1ss for msm8996 CV2X
Disable L1 and L1ss PCIe low power modes for msm8996 CV2X
since it causes problems with WLAN (RC0) and not supported
by Neutrino Ethernet (RC1).
Change-Id: I7d9358a2cb5921f5e5d5da858faec553197063ee
Signed-off-by: Gustavo Solaira <gustavos@codeaurora.org>
Gustavo Solaira [Tue, 5 Dec 2017 23:25:03 +0000 (15:25 -0800)]
ARM: dts: msm: Set values for MDM shutdown and reset on msm8996 CV2X
Set properties of the esoc driver for MDM shutdown and reset
time intervals for msm8996 CV2X.
Change-Id: Ic86f6b441b369a3ea4845425930724d5e6fed149
Signed-off-by: Gustavo Solaira <gustavos@codeaurora.org>
Gustavo Solaira [Tue, 5 Dec 2017 23:22:54 +0000 (15:22 -0800)]
esoc: Convert timeout for reset and shutdown to device tree option
Convert the timeout and shutdown intervals to be read from
the device tree and set default values in case no option is
provided.
Change-Id: I90efb5910ddf1667db5cde79f46a4a94da1668ec
Signed-off-by: Gustavo Solaira <gustavos@codeaurora.org>
Linux Build Service Account [Wed, 6 Dec 2017 02:52:34 +0000 (18:52 -0800)]
Merge "defconfig: msm: add touchscreen config for gvm"
Yuanyuan Liu [Tue, 5 Dec 2017 00:01:31 +0000 (16:01 -0800)]
icnss: Reject driver reinit request when FW is down
Reject driver reinit request when WLAN FW is down as FW
is in a bad state and can't communicate with host driver.
CRs-Fixed:
2153375
Change-Id: Id16cbfc05984091d61b18c98f7397baa871f82b4
Signed-off-by: Yuanyuan Liu <yuanliu@codeaurora.org>
Linux Build Service Account [Tue, 5 Dec 2017 17:35:14 +0000 (09:35 -0800)]
Merge "USB: CCID: Select TPDU level exchanges for CCID communication"
Linux Build Service Account [Tue, 5 Dec 2017 17:35:13 +0000 (09:35 -0800)]
Merge "power: smb1351-charger: Fix the float voltage unit passed to its set method"
Rahul Sharma [Tue, 5 Dec 2017 07:13:40 +0000 (12:43 +0530)]
Revert "DRM: SDE: Update the hdmi bridge to handle HPD clock"
This reverts commit
b31584ba6835d6b3c5e0c59df4faf5f93a0b00d2.
Change-Id: I8c58fb3124b946224028df75e4963f9331ac2ec3
Signed-off-by: Rahul Sharma <sharah@codeaurora.org>
Sarada Prasanna Garnayak [Fri, 24 Nov 2017 09:57:46 +0000 (15:27 +0530)]
ath10k: enable gtk offload for the wcn3990 wlan module
Register ops to store the gtk rekey data from the wlan
utility(wpa_supplicant) and configure the GTK offload
during wow suspend.
If the wlan module in suspend state with wowlan mode
this feature adds support to prevent the device to wakeup
from sleep state on gtk rekey failure in wlan firmware.
CRs-Fixed:
2150959
Change-Id: I968acfe65bd082d37c855f89d4460a09c055ffd8
Signed-off-by: Sarada Prasanna Garnayak <sgarna@codeaurora.org>
Sarada Prasanna Garnayak [Fri, 1 Dec 2017 09:59:54 +0000 (15:29 +0530)]
wcnss: fix the potential buffer overflow in wlan ctrl data process
Validate the userspace wlan control cmd data, info and length
before copy into wcnss driver buffer. Avoid unnecessary string
manipulation and use kernel defined format specifier to print
wlan MAC address.
CRs-Fixed:
2149331
Change-Id: Ib59fdcc0e6b84cdd73972dcb62b2c05e4741f5f7
Signed-off-by: Yuanyuan Liu <yuanliu@codeaurora.org>
Signed-off-by: Sarada Prasanna Garnayak <sgarna@codeaurora.org>
Ritesh Harjani [Tue, 5 Dec 2017 07:07:43 +0000 (12:37 +0530)]
ANDROID: sdcardfs: Make WARN_RATELIMIT to pr_debug
With WARN_RATELIMIT lot of warning messages are
sometimes causing watchdog bite or spinlock lockup
(due to continuous logging). Thus change it to
pr_debug.
Change-Id: I2f0670bd20a39d289c105f9896e6fc509fb87de6
Signed-off-by: Ritesh Harjani <riteshh@codeaurora.org>
Yimin Peng [Wed, 22 Nov 2017 04:07:37 +0000 (12:07 +0800)]
defconfig: msm: add touchscreen config for gvm
With USB Host pass through, touchscreen is available on gvm.
Change-Id: I129f2cc65e5d11a6d69e7afde13356a3bee98df6
Signed-off-by: Yimin Peng <yiminp@codeaurora.org>
Vijayavardhan Vennapusa [Thu, 2 Nov 2017 10:27:28 +0000 (15:57 +0530)]
USB: CCID: Select TPDU level exchanges for CCID communication
Current CCID daemon is supporting TPDU level exhanges for CCID
communication. Hence report same in dwFeatures field of CCID class
descriptor.
Change-Id: If66a54bd74c76ccb417b202b224de5c79e9dfa05
Signed-off-by: Vijayavardhan Vennapusa <vvreddy@codeaurora.org>
Kai Liu [Tue, 5 Dec 2017 03:07:58 +0000 (11:07 +0800)]
net: cnss2: restore pci config space before enable device
When loading wlan driver, driver will check if chip is initialized
by reading pci io FW_IND_INITIALIZED status. While timeout occurred
when wait for above status randomly in multi load-unload process.
Restore pci config space before enable device during resume pci link.
Change-Id: Ib10f739b2321c7cb0e71ad40db571075a56ae48a
Signed-off-by: Kai Liu <kaliu@codeaurora.org>
Linux Build Service Account [Mon, 4 Dec 2017 23:19:50 +0000 (15:19 -0800)]
Merge "icnss: Reject register_driver request when WLAN FW is down"
Linux Build Service Account [Mon, 4 Dec 2017 23:19:49 +0000 (15:19 -0800)]
Merge "ARM: dts: msm: mount system & vendor partitions in early init for 8996"
Linux Build Service Account [Mon, 4 Dec 2017 23:19:48 +0000 (15:19 -0800)]
Merge "msm: ADSPRPC: use access_ok to validate pointers"
Linux Build Service Account [Mon, 4 Dec 2017 23:19:46 +0000 (15:19 -0800)]
Merge "msm: ipa3: Fix to set QMB on USB ep"
Liam Mark [Mon, 4 Dec 2017 18:58:55 +0000 (10:58 -0800)]
ion: ensure CMO target is valid
Cleanup ION cache maintenance code to properly validate the target of
userspace cache maintenance requests.
Change-Id: I55b8e3584c59634f95250bc7c0bce5d8d70e6a13
Signed-off-by: Liam Mark <lmark@codeaurora.org>
Yuanyuan Liu [Thu, 30 Nov 2017 19:11:42 +0000 (11:11 -0800)]
icnss: Reject register_driver request when WLAN FW is down
Reject regsiter_driver request when WLAN FW is already down as
WLAN FW is in a bad state and can't communicate with host driver.
Change-Id: I57ba839101f5c0a361e74060b18b45f87c71634c
CRs-Fixed:
2151726
Signed-off-by: Yuanyuan Liu <yuanliu@codeaurora.org>
Linux Build Service Account [Mon, 4 Dec 2017 14:17:02 +0000 (06:17 -0800)]
Merge "ARM: dts: msm: Remove adv7533 power commands for 600p DSI panel"
Linux Build Service Account [Mon, 4 Dec 2017 14:17:01 +0000 (06:17 -0800)]
Merge "usb: gadget: f_fs: Fix kernel panic if use_os_string not set"
Linux Build Service Account [Mon, 4 Dec 2017 14:17:00 +0000 (06:17 -0800)]
Merge "msm: ADSPRPC: validate context pointer with magic number"
Mohammed Javid [Wed, 22 Nov 2017 10:44:10 +0000 (16:14 +0530)]
msm: ipa3: Fix to set QMB on USB ep
Fix to config USB end point with QMB.
Change-Id: I2d4691024aa4fc9856c9c4213491a76a1033ae04
Signed-off-by: Mohammed Javid <mjavid@codeaurora.org>