Commit Graph

3005 Commits

Author SHA1 Message Date
Linux Build Service Account
b72cea7871 Merge "msm: ipa3: fix debugfs creation order" 2018-05-08 08:57:16 -07:00
Linux Build Service Account
62d3930852 Merge "msm: ipa: add support for HW stats to QMI" 2018-05-07 10:04:04 -07:00
Ghanim Fodi
fd9ffeeccd msm: ipa3: fix debugfs creation order
IPA unit-test module is initialized by IPA ready callback.
The ready callback is called before creating IPA debugfs root
folder in which IPA unit-test module depends on.

Change-Id: Id3e867cd074730a3006e124d1074bedef081920a
Signed-off-by: Ghanim Fodi <gfodi@codeaurora.org>
2018-05-06 23:30:02 -07:00
Linux Build Service Account
7d2d47d0ed Merge "msm: ipa: rmnet: Make code changes with respect to CR#2046006" 2018-05-05 15:47:36 -07:00
Skylar Chang
3543bfc26a msm: ipa: add support for HW stats to QMI
Populate new fields in the QMI message to send information
regarding HW stats location in SRAM.

Change-Id: Idaae117081fad6a5cf797eefd5399aa9a4cc35f9
Acked-by: Ady Abraham <adya@qti.qualcomm.com>
Signed-off-by: Mohammed Javid <mjavid@codeaurora.org>
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
2018-05-04 16:09:13 +05:30
Linux Build Service Account
fbe8a1af5d Merge "msm: ipa3: Fix QMB configuration for IPA test pipes" 2018-05-03 20:00:02 -07:00
Linux Build Service Account
cea2207739 Merge "msm: ipa4: MHI register update" 2018-05-03 19:59:43 -07:00
Linux Build Service Account
ba403d36bd Merge "msm: ipa4: add IOCTL for reading vlan mode" 2018-05-03 19:59:16 -07: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
Ghanim Fodi
9f23b6334a msm: ipa3: Fix QMB configuration for IPA test pipes
IPA test pipes which are used for unit-tests has wrong
QMB configuration. It needs to be DDR QMB and not PCIE
QMB which is used for MHI data path.

Change-Id: I7600916835f4d38ae379e5f81212f9717ba1c7e7
Signed-off-by: Ghanim Fodi <gfodi@codeaurora.org>
2018-05-03 00:44:01 -07:00
Michael Adisumarta
271fe36540 msm: ipa4: MHI register update
Update test_client_1 to be MHI instead of non-MHI.

Change-Id: I473bf968096720217f427b3c90236608631e321b
Crs-fixed: 2234199
Signed-off-by: Michael Adisumarta <madisuma@codeaurora.org>
2018-05-02 10:50:26 -07:00
Amir Levy
a5361ab005 msm: ipa4: add IOCTL for reading vlan mode
Add IOCTL for reading LAN interfaces VLAN mode from
user space.

Change-Id: I85634b21adf2b1b79feb1b282597289e89ad1df1
Signed-off-by: Amir Levy <alevy@codeaurora.org>
2018-05-01 16:50:27 +03:00
Mohammed Javid
5bcb0cda43 msm: ipa: rmnet: Make code changes with respect to CR#2046006
Check for CAP_NET_ADMIN capability of the user
space application which tries to access rmnet driver IOCTL.

Change-Id: If6bb4b54659306c5103b5e34bf02c7234c851e0a
CRs-Fixed: 2226355
Signed-off-by: Mohammed Javid <mjavid@codeaurora.org>
2018-04-30 13:02:13 +05:30
Linux Build Service Account
8d7a4b59d9 Merge "arm: msm: ipa: Add support to get MHI config dynamically" 2018-04-26 11:04:05 -07:00
Mohammed Javid
73cd4d290b arm: msm: ipa: Add support to get MHI config dynamically
Add support to get platform info with respect
to MHI dynamically for sdx20.

Change-Id: Ie38df2d3bbe80856a0b7cd49511ce64cb9aa4ce8
Signed-off-by: Mohammed Javid <mjavid@codeaurora.org>
2018-04-26 13:19:51 +05:30
Skylar Chang
1504c604dd msm: ipa3: fix hdr offset issue
Hdr offset calculation is wrong when
driver received clean-up ioctl from
user-space. The fix is to find right
hdr offset to commit ned headers.

Change-Id: I70878a19b64c3defa6101bd68d435f0b74bcfb9b
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
2018-04-25 10:33:06 -07:00
Linux Build Service Account
65380d9f97 Merge "msm: ipa: disable prefetch for MHI" 2018-04-24 23:37:27 -07:00
Linux Build Service Account
d300d690ad Merge "msm: ipa: support ipacm cleanup" 2018-04-24 23:37:23 -07:00
Skylar Chang
840996939b msm: ipa: disable prefetch for MHI
MHI might be configured to MBIM aggregation.
For this to work TX prefetch needs to be disabled.

Change-Id: I52510f3a7fbe90d5a472703363136e6e909d301c
Acked-by: Ady Abraham <adya@qti.qualcomm.com>
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
2018-04-24 14:43:03 -07:00
Skylar Chang
68c37d886a msm: ipa: support ipacm cleanup
Support header/filter, routing rules
cleanup when user-space module
crashed like ipacm and also cached
the wlan client connect messages
for ipacm to query.

Change-Id: Ib09cbe0e9114aa5a5673898ff796de7e7944af35
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
2018-04-24 14:19:04 -07:00
Michael Adisumarta
b1bafa41f3 msm: ipa4: add SMMU support for EMAC
Implement APIs to map EMAC SMMU values for IPA.

Change-Id: I8424c95aa502f6d019057b569af2adab26067c94
Crs-fixed: 2209573
Signed-off-by: Michael Adisumarta <madisuma@codeaurora.org>
2018-04-23 11:32:20 -07:00
Linux Build Service Account
5372f46598 Merge "msm: ep_pcie: Update core initialization sequence" 2018-04-21 00:34:43 -07:00
Linux Build Service Account
79952f80cb Merge "serial: msm_geni_serial: Remove manual flow control and set as RFR OPEN" 2018-04-21 00:34:26 -07:00
Siddartha Mohanadoss
eeaa334e2d msm: ep_pcie: Update core initialization sequence
On newer PHY version there is no need to adjust the DBI
address.

Change-Id: I23da953cf40b96e315e6d081051b1921741625c4
Signed-off-by: Siddartha Mohanadoss <smohanad@codeaurora.org>
2018-04-20 09:13:39 -07:00
Michael Adisumarta
edba22d7fc msm: ipa4: Dump IPA registers during panic handling
Print out IPA registers to DMESG and IPC_logs so their
values can be seen without the need of modem dumps.

Change-Id: I175a71b242bfe7821f6c6fde976c8c818eb435a2
CRs-fixed: 2220253
Signed-off-by: Michael Adisumarta <madisuma@codeaurora.org>
2018-04-19 12:28:33 -07:00
Mukesh Kumar Savaliya
17692d9456 serial: msm_geni_serial: Remove manual flow control and set as RFR OPEN
This patch removes the manual flow control and instead gives the RFR
control to the HW depending on the FIFO level. In case of Manual flow
control FW introduced a race and caused RFR to remain High at RX shutdown
which blocked peer device from sending any data.

The latest FW along with this patch makes sure RFR gets configured as an
RFR OPEN post RX cancel and removes the need to have any manual flow. Also
wait for the RX EOT bit post cancel command as per the suggested sequence.

Also Log the GENI FW version for primary and secondary sequencer.

Change-Id: Ifc06a3f1c971eb7490ff8e678779e7163008f999
Signed-off-by: Mukesh Kumar Savaliya <msavaliy@codeaurora.org>
2018-04-19 22:52:57 +05:30
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
Blagovest Kolenichev
a8a3aff106 Merge android-4.9.86 (b324a70) into msm-4.9
* refs/heads/tmp-b324a70:
  Linux 4.9.86
  MIPS: Implement __multi3 for GCC7 MIPS64r6 builds
  KVM: arm/arm64: Fix check for hugepage size when allocating at Stage 2
  net: gianfar_ptp: move set_fipers() to spinlock protecting area
  sctp: make use of pre-calculated len
  xen/gntdev: Fix partial gntdev_mmap() cleanup
  xen/gntdev: Fix off-by-one error when unmapping with holes
  SolutionEngine771x: fix Ether platform data
  mdio-sun4i: Fix a memory leak
  xen-netfront: enable device after manual module load
  bnxt_en: Fix the 'Invalid VF' id check in bnxt_vf_ndo_prep routine.
  can: flex_can: Correct the checking for frame length in flexcan_start_xmit()
  mac80211: mesh: drop frames appearing to be from us
  nl80211: Check for the required netlink attribute presence
  i40e/i40evf: Account for frags split over multiple descriptors in check linearize
  uapi libc compat: add fallback for unsupported libcs
  drm/ttm: check the return value of kzalloc
  NET: usb: qmi_wwan: add support for YUGA CLM920-NC5 PID 0x9625
  e1000: fix disabling already-disabled warning
  macvlan: Fix one possible double free
  xfs: quota: check result of register_shrinker()
  xfs: quota: fix missed destroy of qi_tree_lock
  IB/ipoib: Fix race condition in neigh creation
  IB/mlx4: Fix mlx4_ib_alloc_mr error flow
  s390/dasd: fix wrongly assigned configuration data
  genirq: Guard handle_bad_irq log messages
  IB/mlx5: Fix mlx5_ib_alloc_mr error flow
  led: core: Fix brightness setting when setting delay_off=0
  bnx2x: Improve reliability in case of nested PCI errors
  tg3: Enable PHY reset in MTU change path for 5720
  tg3: Add workaround to restrict 5762 MRRS to 2048
  tipc: fix tipc_mon_delete() oops in tipc_enable_bearer() error path
  tipc: error path leak fixes in tipc_enable_bearer()
  lib/mpi: Fix umul_ppmm() for MIPS64r6
  ARM: dts: ls1021a: fix incorrect clock references
  scsi: storvsc: Fix scsi_cmd error assignments in storvsc_handle_error
  net: stmmac: Fix TX timestamp calculation
  ip6_tunnel: get the min mtu properly in ip6_tnl_xmit
  net: arc_emac: fix arc_emac_rx() error paths
  net: mediatek: setup proper state for disabled GMAC on the default
  ASoC: nau8825: fix issue that pop noise when start capture
  spi: atmel: fixed spin_lock usage inside atmel_spi_remove
  mac80211_hwsim: Fix a possible sleep-in-atomic bug in hwsim_get_radio_nl
  drm/nouveau/pci: do a msi rearm on init
  net: phy: xgene: disable clk on error paths
  sget(): handle failures of register_shrinker()
  x86/asm: Allow again using asm.h when building for the 'bpf' clang target
  ARM: 8731/1: Fix csum_partial_copy_from_user() stack mismatch
  ipv6: icmp6: Allow icmp messages to be looped back
  mtd: nand: brcmnand: Zero bitflip is not an error
  mtd: nand: gpmi: Fix failure when a erased page has a bitflip at BBM
  net: usb: qmi_wwan: add Telit ME910 PID 0x1101 support
  nvme: check hw sectors before setting chunk sectors
  dmaengine: fsl-edma: disable clks on all error paths
  f2fs: fix a bug caused by NULL extent tree
  i2c: designware: must wait for enable
  hrtimer: Ensure POSIX compliance (relative CLOCK_REALTIME hrtimers)
  ANDROID: kbuild: change LTO into a choice
  ANDROID: arm64: crypto: fix AES CE when built as a module
  ANDROID: staging: lustre: fix filler function type
  ANDROID: fs: logfs: fix filler function type
  ANDROID: fs: gfs2: fix filler function type
  ANDROID: fs: exofs: fix filler function type
  ANDROID: fs: afs: fix filler function type
  ANDROID: keychord: Check for write data size
  media-device: fix ioctl function types
  drivers/perf: arm_pmu: fix function type mismatch
  dummycon: fix function types
  fs: nfs: fix filler function type
  mm: fix filler function type mismatch
  mm: fix drain_local_pages function type
  BACKPORT: vfs: pass type instead of fn to do_{loop,iter}_readv_writev()
  arch/arm64/crypto: fix CFI in AES CE
  arch/arm64/crypto: fix CFI in SHA CE
  arm64: disable CFI for cpu_replace_ttbr1
  v4l2-ioctl: fix function types for IOCTL_INFO_STD
  UPSTREAM: module: Do not paper over type mismatches in module_param_call()
  BACKPORT: treewide: Fix function prototypes for module_param_call()
  UPSTREAM: module: Prepare to convert all module_param_call() prototypes
  bpf: fix function type for __bpf_prog_run
  kallsyms: strip the .cfi postfix from symbols with CONFIG_CFI_CLANG
  add support for clang Control Flow Integrity (CFI)
  HACK: init: ensure initcall ordering with LTO
  xen/efi: don't use -fshort-wchar
  drivers/misc: disable LTO for lkdtm_rodata.o
  arm64: vdso: disable LTO
  FROMLIST: BACKPORT: arm64: select ARCH_SUPPORTS_LTO_CLANG
  FROMLIST: BACKPORT: arm64: disable RANDOMIZE_MODULE_REGION_FULL with LTO_CLANG
  FROMLIST: arch/arm64/crypto: disable LTO for aes-ce-cipher.c
  arm64: disable ARM64_ERRATUM_843419 for clang LTO
  arm64: pass code model to LLVMgold
  FROMLIST: BACKPORT: arm64: make mrs_s and msr_s macros work with LTO
  FROMLIST: arm64: kvm: use -fno-jump-tables with clang
  FROMLIST: efi/libstub: disable LTO
  FROMLIST: scripts/mod: disable LTO for empty.c
  FROMLIST: BACKPORT: kbuild: fix dynamic ftrace with clang LTO
  FROMLIST: BACKPORT: kbuild: add support for clang LTO
  FROMLIST: BACKPORT: arm64: add a workaround for GNU gold with ARM64_MODULE_PLTS
  FROMLIST: arm64: explicitly pass --no-fix-cortex-a53-843419 to GNU gold
  FROMLIST: kbuild: add __ld-ifversion and linker-specific macros
  FROMLIST: kbuild: add ld-name macro
  FROMLIST: BACKPORT: arm64: keep .altinstructions and .altinstr_replacement
  arm64: fix LD_DEAD_CODE_DATA_ELIMINATION
  FROMLIST: kbuild: fix LD_DEAD_CODE_DATA_ELIMINATION
  FROMLIST: BACKPORT: kbuild: add __cc-ifversion and compiler-specific variants
  FROMLIST: kbuild: add clang-version.sh
  Revert "binder: add missing binder_unlock()"
  Linux 4.9.85
  x86/entry/64: Clear extra registers beyond syscall arguments, to reduce speculation attack surface
  mm: fail get_vaddr_frames() for filesystem-dax mappings
  mm: Fix devm_memremap_pages() collision handling
  libnvdimm, dax: fix 1GB-aligned namespaces vs physical misalignment
  IB/core: disable memory registration of filesystem-dax vmas
  v4l2: disable filesystem-dax mapping support
  mm: introduce get_user_pages_longterm
  device-dax: implement ->split() to catch invalid munmap attempts
  libnvdimm: fix integer overflow static analysis warning
  fs/dax.c: fix inefficiency in dax_writeback_mapping_range()
  mm: avoid spurious 'bad pmd' warning messages
  X.509: fix NULL dereference when restricting key with unsupported_sig
  binder: add missing binder_unlock()
  drm/amdgpu: add new device to use atpx quirk
  drm/amdgpu: Avoid leaking PM domain on driver unbind (v2)
  drm/amdgpu: add atpx quirk handling (v2)
  drm/amdgpu: Add dpm quirk for Jet PRO (v2)
  usb: renesas_usbhs: missed the "running" flag in usb_dmac with rx path
  usb: gadget: f_fs: Process all descriptors during bind
  Revert "usb: musb: host: don't start next rx urb if current one failed"
  usb: ldusb: add PIDs for new CASSY devices supported by this driver
  usb: dwc3: gadget: Set maxpacket size for ep0 IN
  drm/edid: Add 6 bpc quirk for CPT panel in Asus UX303LA
  Add delay-init quirk for Corsair K70 RGB keyboards
  arm64: Disable unhandled signal log messages by default
  usb: ohci: Proper handling of ed_rm_list to handle race condition between usb_kill_urb() and finish_unlinks()
  ohci-hcd: Fix race condition caused by ohci_urb_enqueue() and io_watchdog_func()
  PCI/cxgb4: Extend T3 PCI quirk to T4+ devices
  irqchip/gic-v3: Use wmb() instead of smb_wmb() in gic_raise_softirq()
  x86/oprofile: Fix bogus GCC-8 warning in nmi_setup()
  iio: adis_lib: Initialize trigger before requesting interrupt
  iio: buffer: check if a buffer has been set up when poll is called
  RDMA/uverbs: Protect from command mask overflow
  PKCS#7: fix certificate chain verification
  X.509: fix BUG_ON() when hash algorithm is unsupported
  cfg80211: fix cfg80211_beacon_dup
  scsi: ibmvfc: fix misdefined reserved field in ibmvfc_fcp_rsp_info
  xtensa: fix high memory/reserved memory collision
  netfilter: drop outermost socket lock in getsockopt()
  ANDROID: sdcardfs: Set num in extension_details during make_item

Conflicts:
	Makefile
	arch/arm64/include/asm/arch_gicv3.h
	arch/arm64/kernel/module.lds
	drivers/usb/gadget/function/f_fs.c
	scripts/link-vmlinux.sh

Change in module_param_call() definition requires alignment in:

	drivers/hwtracing/coresight/coresight-event.c
	drivers/media/radio/radio-iris-transport.c
	drivers/power/reset/msm-poweroff.c
	drivers/soc/qcom/wcnss/wcnss_wlan.c
	drivers/video/fbdev/msm/mdss_dsi_status.c

Change-Id: I2fa32c39bd4ba8a132f8f8abc8132a2ceb32907a
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>
2018-04-17 10:33:48 -07:00
Linux Build Service Account
8bdbb5d38a Merge "usb: gadget: Fix ep_flush issue on composition switch" 2018-04-17 03:59:25 -07:00
Linux Build Service Account
ee3d7107ec Merge "usb: gadget: Enable/Disable USB_BAM based on composition" 2018-04-17 03:59:24 -07:00
Linux Build Service Account
13574891a4 Merge "msm: ipa: enable hdr_metadata_reg_valid for usb" 2018-04-14 20:49:23 -07:00
Linux Build Service Account
919c65ba16 Merge "msm: mhi_dev: Send uevents during device reset" 2018-04-14 20:49:21 -07:00
Skylar Chang
043cf22cc9 msm: ipa: enable hdr_metadata_reg_valid for usb
Set the hdr_metadata_reg_valid to true on endpoint
configuration when usb connected as rndis and ecm
protocol for IPA_CLIENT_USB_PROD pipe.

Change-Id: Ic08e95cdfdb72cbc8d915bde1f4b430c2edf7b81
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
2018-04-11 18:05:26 -07:00
Linux Build Service Account
967d980b02 Merge "msm: ipa4: USB_CONS QMB update" 2018-04-09 09:20:20 -07:00
Linux Build Service Account
1581460886 Merge "USB: gadget: Fix USB EP flush issues on disconnect" 2018-04-09 09:20:04 -07:00
Linux Build Service Account
9ad8008b0b Merge "msm_rmnet_bam: Changes to support SMD BAM DMUX." 2018-04-08 17:15:27 -07:00
Tejaswi Tanikella
80f971a60c msm_rmnet_bam: Changes to support SMD BAM DMUX.
Changes to support SMD BAM DMUX in kernel 4.9.

This snapshot is taken as of msm-3.18
'commit 9907621a6015 ("cnss2: Remove utils")'.

Fixed minor compilation errors.

Change-Id: I7f48ff358c2686632bf6450c5442b971c16b9b47
Acked-by: Mayank Vishwari <mayankvi@qti.qualcomm.com>
Signed-off-by: Tejaswi Tanikella <tejaswit@codeaurora.org>
2018-04-06 12:55:34 +05:30
Michael Adisumarta
a1f3c6edbb msm: ipa4: USB_CONS QMB update
Change USB CONS register to use DDR instead of PCIE

Change-Id: I1f6c629daad13904501357dbc80499267b05a304
Crs-fixed: 2219398
Signed-off-by: Michael Adisumarta <madisuma@codeaurora.org>
2018-04-05 18:02:23 -07:00
Michael Adisumarta
c8c404a095 msm: ipa4: SMMU additional support for APPS
Change return result at the end of ap_cb_probe to return 0
to prevent a failed error message from printing. Remove
smmu_present flag.

Change-Id: I8b296b68341436f1a0dea2cd7ddbe0096ed17fe2
Crs:fixed: 2219398
Signed-off-by: Michael Adisumarta <madisuma@codeaurora.org>
2018-04-05 18:01:45 -07:00
Chandana Kishori Chiluveru
f5d3acfe64 usb: gadget: Fix ep_flush issue on composition switch
Currently if composition switch happens from BAM composition to
NON BAM composition. USB driver tries to flush USB endpoint as
part of composition switch, which is failing. Fix the issue by
performing usb core soft reset before disabling bam for NON BAM
composition.

Change-Id: I60d008341ab2788b2eeae5cc4671bb97ef5b792d
Signed-off-by: Chandana Kishori Chiluveru <cchiluve@codeaurora.org>
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
2018-04-05 06:25:31 -07:00
Chandana Kishori Chiluveru
9ff1e2f9c2 usb: gadget: Enable/Disable USB_BAM based on composition
BAM is used only in USB BAM mode. If platform has BAM enabled
by default in peripheral mode then it may slow down DDR access
by USB and also observing throughput degradation for software path
transfers. Since, USB legacy mode doesn't use BAM2BAM mode disable
the same for USB legacy mode and enable USB BAM based on composition.

Change-Id: I564caea896fb6b7b7acef12dc72e1bf179977b3f
Signed-off-by: Chandana Kishori Chiluveru <cchiluve@codeaurora.org>
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
2018-04-05 18:53:25 +05:30
Siddartha Mohanadoss
1a1d8f0ec7 msm: mhi_dev: Send uevents during device reset
Notify clients during MHI device reset on channel and
device reset.

Change-Id: Id3b6f564bd85346e9177b27c8a7647c504998a64
Signed-off-by: Siddartha Mohanadoss <smohanad@codeaurora.org>
2018-04-04 15:24:31 -07:00
Vijayavardhan Vennapusa
2f66a26f7d USB: gadget: Fix USB EP flush issues on disconnect
Currently if cable is disconnected or composition switch happens
during BAM2BAM data transfers, USB driver tries to flush USB
endpoint as part of disconnect, which is failing. This eventually
leads to NOC error. Fix the issue by making sure pipes are empty
and IPA endpoints are disabled and perform USB bam reset before
disabling USB endpoints as part of new sequence implementation
recommended by HW designers.

Change-Id: I17000fd380d95497629372a9f6371902f04ca2d9
Signed-off-by: Vijayavardhan Vennapusa <vvreddy@codeaurora.org>
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
2018-04-04 09:31:12 -07:00
Linux Build Service Account
e4e9163f1d Merge "msm: ipa4: set s1 bypass flag for AP" 2018-04-03 12:04:07 -07:00
Skylar Chang
e87894f30b msm: ipa4: set s1 bypass flag for AP
Update s1 bypass flag for IPA AP context bank with
the correct value whether SMMU S1 is bypassed or not.

Change-Id: Ie95028ffff892ffe876c4e00b113d642692d95a9
CRs-Fixed: 2202562
Acked-by: Ady Abraham <adya@qti.qualcomm.com>
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
2018-04-02 15:50:15 -07:00
Shihuan Liu
e4832306cd msm: ipa: add wdi unified api in defconfig
Add CONFIG_IPA_WDI_UNIFIED_API in defconfig file.

Change-Id: Ia48151db2e732f8988f1c72b45278bc63d52586f
Acked-by: Shihuan Liu <shihuanl@qti.qualcomm.com>
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
2018-04-01 22:40:42 -07:00
Linux Build Service Account
af57eb7072 Merge "msm: ipa4: bypass smmu for MHI" 2018-03-31 02:31:32 -07:00
Skylar Chang
efc0a0f8ed msm: ipa4: bypass smmu for MHI
Implement changes to disable SMMU after knowing
whether IPA is in MHI mode.

Change-Id: I98335b7cb74a6bbe20c8f25288ffaf4ea341e5a1
CRs-fixed: 2202562
Signed-off-by: Michael Adisumarta <madisuma@codeaurora.org>
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
2018-03-29 11:17:40 -07:00
Linux Build Service Account
67138a4d13 Merge "msm: sps: Add support to perform BAM reset with pipes connected" 2018-03-29 02:11:15 -07:00
Rama Krishna Phani A
a0550c97a2 msm: sps: Add support to perform BAM reset with pipes connected
Few clients require to reset BAM forcefully with pipes still
connected. Add support to perform BAM reset with pipes connected.

Change-Id: I19264d78a06f7e324bb6aa75c13774c404586480
Signed-off-by: Rama Krishna Phani A <rphani@codeaurora.org>
2018-03-27 18:44:10 +05:30