Commit Graph

95 Commits

Author SHA1 Message Date
Srinivasarao P
18ffdaaa38 Merge android-4.19-stable.113 (2b82910d) into msm-4.19
* refs/heads/tmp-2b82910d:
  Reverting incrementalfs, power,usb and scheduler changes
  ANDROID: Incremental fs: Fix four resource bugs
  ANDROID: Bulk update the ABI xml based on the referenced bugs.
  ANDROID: GKI: block: resolve ABI diff when CONFIG_BLK_DEV_BSG is unset
  ANDROID: GKI: bfq-iosched: update struct elevator_mq_ops ABI
  ANDROID: GKI: locking/rwsem: add vendor field to struct rw_semaphore
  ANDROID: GKI: fs: add umount_end() function to struct super_operations
  ANDROID: GKI: perf: Add fields for CPU hotplug feature
  ANDROID: GKI: perf: Add field for struct perf_event
  ANDROID: GKI: cpuset: add field for task affinity for cpusets
  UPSTREAM: ubifs: wire up FS_IOC_GET_ENCRYPTION_NONCE
  UPSTREAM: f2fs: wire up FS_IOC_GET_ENCRYPTION_NONCE
  UPSTREAM: ext4: wire up FS_IOC_GET_ENCRYPTION_NONCE
  UPSTREAM: fscrypt: add FS_IOC_GET_ENCRYPTION_NONCE ioctl
  UPSTREAM: usb: raw_gadget: fix compilation warnings in uapi headers
  BACKPORT: usb: gadget: add raw-gadget interface
  UPSTREAM: usb: gadget: move choice ... endchoice to legacy/Kconfig
  UPSTREAM: ipv6: ndisc: add support for 'PREF64' dns64 prefix identifier
  ANDROID: GKI: Removed cuttlefish configs
  ANDROID: GKI: Removed cuttlefish configs
  ANDROID: clang: update to 10.0.5
  FROMLIST: arm64: define __alloc_zeroed_user_highpage
  ANDROID: Incremental fs: Add INCFS_IOC_GET_FILLED_BLOCKS
  ANDROID: Incremental fs: Fix two typos
  ANDROID: GKI: Update ABI
  ANDROID: GKI: power_supply: add more soc properties
  ANDROID: GKI: Update ABI
  ANDROID: GKI: google_battery: return string type for serial_number property
  ANDROID: GKI: power: supply: Add APSD based power-supply properties
  ANDROID: GKI: power: supply: Remove "Wipower" PSY type
  ANDROID: GKI: power: supply: Add support for HVDCP_3P5
  ANDROID: GKI: power_supply: Define Debug Accessory Mode
  ANDROID: GKI: power: supply: Add POWER_SUPPLY_PROP_AICL_*
  ANDROID: GKI: power: supply: Add POWER_SUPPLY_PROP_ALIGNMENT
  ANDROID: GKI: power_supply: Add CP_ISNS_SLAVE power supply property
  ANDROID: GKI: power_supply: add properties to report parallel connection topology
  ANDROID: GKI: power_supply: add POWER_SUPPLY_PROP_IRQ_STATUS property
  ANDROID: GKI: power: supply: add CHARGE_CHARGER_STATE property
  ANDROID: GKI: power: supply: Add POWER_SUPPLY_PROP_PTMC_ID
  ANDROID: GKI: power: supply: Add POWER_SUPPLY_PROP_OTG_FASTROLESWAP
  ANDROID: GKI: power: supply: Add VOLTAGE_STEP property
  ANDROID: GKI: power: supply: Add AICL_DONE parameter
  ANDROID: GKI: power_supply: Add operating frequency property
  ANDROID: GKI: power: supply: Add POWER_SUPPLY_PROP_CC_UAH
  ANDROID: GKI: power: supply: Add POWER_SUPPLY_PROP_VOLTAGE_FIFO
  ANDROID: GKI: power: supply: Add capacity and resistance estimates
  ANDROID: GKI: power_supply: Add vendor specific dead battery property
  ANDROID: GKI: power-supply: add ADAPTER_DETAILS power supply property
  ANDROID: GKI: power: supply: Add POWER_SUPPLY_PROP_CHARGE_DISABLE
  ANDROID: GKI: power: power_supply: Add property to display skin thermal status
  ANDROID: GKI: power_supply: Add properties to support PPS constant current(CC) mode
  ANDROID: GKI: power: power_supply: Add REAL_CAPACITY property
  ANDROID: GKI: power_supply: Add VOLTAGE_MAX_LIMIT power supply property
  ANDROID: GKI: power_supply: Add DC_RESET power-supply property
  ANDROID: GKI: power_supply: Add "THERM_ICL_LIMIT" property
  ANDROID: GKI: power_supply: add CHIP_VERSION property
  ANDROID: GKI: power-supply: Add VOLTAGE_VPH power supply property
  ANDROID: GKI: power_supply: Add SCALE_MODE_EN power-supply property
  ANDROID: GKI: power_supply: Add local extensions of string property names properly
  ANDROID: GKI: power_supply: add batt_age_level property
  ANDROID: GKI: power-supply: Add CC_SOC power supply property
  ANDROID: GKI: power_supply: add property to disable QC userspace optimizations
  ANDROID: GKI: power: power_supply: Add FG_RESET power supply property
  ANDROID: GKI: power_supply: Add power supply type "Charge Pump"
  ANDROID: GKI: power: supply: Add snapshot of power supply framework files
  ANDROID: GKI: power: power_supply: Add property CHARGE_COUNTER_EXT and 64-bit precision properties
  ANDROID: GKI: power: power_supply: add POWER_SUPPLY_PROP_CHARGE_ENABLED
  ANDROID: GKI: power: power_supply: add POWER_SUPPLY_PROP_USB_OTG
  ANDROID: GKI: power: power_supply: Add custom property for USB High Current mode
  UPSTREAM: coresight: Potential uninitialized variable in probe()
  ANDROID: GKI: Update ABI.
  ANDROID: GKI: Add API to create pagetable mappings.
  ANDROID: GKI: drivers: usb: Add functions usb_func_ep_queue/usb_func_wakeup
  ANDROID: GKI: Add API usb_ep_autoconfig_by_name
  ANDROID: GKI: usb: core: Add helper function to return controller id
  ANDROID: dm-bow: Fix free_show value is incorrect
  ANDROID: GKI: update ABI after fixing cfg80211_chan_def diff
  BACKPORT: nl80211: Add support for EDMG channels
  FROMGIT: sched/rt: cpupri_find: Trigger a full search as fallback
  FROMGIT: sched/rt: Remove unnecessary push for unfit tasks
  BACKPORT: FROMGIT: sched/rt: Allow pulling unfitting task
  FROMGIT: sched/rt: Optimize cpupri_find() on non-heterogenous systems
  FROMGIT: sched/rt: Re-instate old behavior in select_task_rq_rt()
  BACKPORT: FROMGIT: sched/rt: cpupri_find: Implement fallback mechanism for !fit case
  ANDROID: GKI: re-enable LTO, CFI and SCS

 Conflicts:
	arch/arm64/mm/mmu.c
	drivers/net/wireless/ath/wil6210/cfg80211.c
	drivers/usb/gadget/Kconfig
	include/linux/memblock.h
	include/linux/perf_event.h
	include/linux/rwsem.h
	include/uapi/linux/nl80211.h

Change-Id: I7aa8a1712c323fc5a2eced52a07bfb6df6996ba0
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
2020-07-16 20:55:24 +05:30
Srinivasarao P
c161b2d152 Merge android-4.19.113 (248555d) into msm-4.19
* refs/heads/tmp-248555d:
  Linux 4.19.113
  staging: greybus: loopback_test: fix potential path truncations
  staging: greybus: loopback_test: fix potential path truncation
  drm/bridge: dw-hdmi: fix AVI frame colorimetry
  arm64: smp: fix crash_smp_send_stop() behaviour
  arm64: smp: fix smp_send_stop() behaviour
  ALSA: hda/realtek: Fix pop noise on ALC225
  Revert "ipv6: Fix handling of LLA with VRF and sockets bound to VRF"
  Revert "vrf: mark skb for multicast or link-local as enslaved to VRF"
  futex: Unbreak futex hashing
  futex: Fix inode life-time issue
  kbuild: Disable -Wpointer-to-enum-cast
  iio: light: vcnl4000: update sampling periods for vcnl4200
  USB: cdc-acm: fix rounding error in TIOCSSERIAL
  USB: cdc-acm: fix close_delay and closing_wait units in TIOCSSERIAL
  x86/mm: split vmalloc_sync_all()
  page-flags: fix a crash at SetPageError(THP_SWAP)
  mm, slub: prevent kmalloc_node crashes and memory leaks
  mm: slub: be more careful about the double cmpxchg of freelist
  memcg: fix NULL pointer dereference in __mem_cgroup_usage_unregister_event
  drm/lease: fix WARNING in idr_destroy
  drm/amd/amdgpu: Fix GPR read from debugfs (v2)
  btrfs: fix log context list corruption after rename whiteout error
  xhci: Do not open code __print_symbolic() in xhci trace events
  rtc: max8907: add missing select REGMAP_IRQ
  intel_th: pci: Add Elkhart Lake CPU support
  intel_th: Fix user-visible error codes
  staging/speakup: fix get_word non-space look-ahead
  staging: greybus: loopback_test: fix poll-mask build breakage
  staging: rtl8188eu: Add device id for MERCUSYS MW150US v2
  mmc: sdhci-of-at91: fix cd-gpios for SAMA5D2
  mmc: rtsx_pci: Fix support for speed-modes that relies on tuning
  iio: adc: at91-sama5d2_adc: fix differential channels in triggered mode
  iio: magnetometer: ak8974: Fix negative raw values in sysfs
  iio: trigger: stm32-timer: disable master mode when stopping
  iio: st_sensors: remap SMO8840 to LIS2DH12
  ALSA: pcm: oss: Remove WARNING from snd_pcm_plug_alloc() checks
  ALSA: pcm: oss: Avoid plugin buffer overflow
  ALSA: seq: oss: Fix running status after receiving sysex
  ALSA: seq: virmidi: Fix running status after receiving sysex
  ALSA: line6: Fix endless MIDI read loop
  usb: xhci: apply XHCI_SUSPEND_DELAY to AMD XHCI controller 1022:145c
  USB: serial: pl2303: add device-id for HP LD381
  usb: host: xhci-plat: add a shutdown
  USB: serial: option: add ME910G1 ECM composition 0x110b
  usb: quirks: add NO_LPM quirk for RTL8153 based ethernet adapters
  USB: Disable LPM on WD19's Realtek Hub
  parse-maintainers: Mark as executable
  block, bfq: fix overwrite of bfq_group pointer in bfq_find_set_group()
  xenbus: req->err should be updated before req->state
  xenbus: req->body should be updated before req->state
  drm/amd/display: fix dcc swath size calculations on dcn1
  drm/amd/display: Clear link settings on MST disable connector
  riscv: avoid the PIC offset of static percpu data in module beyond 2G limits
  dm integrity: use dm_bio_record and dm_bio_restore
  dm bio record: save/restore bi_end_io and bi_integrity
  altera-stapl: altera_get_note: prevent write beyond end of 'key'
  drivers/perf: arm_pmu_acpi: Fix incorrect checking of gicc pointer
  drm/exynos: dsi: fix workaround for the legacy clock name
  drm/exynos: dsi: propagate error value and silence meaningless warning
  spi/zynqmp: remove entry that causes a cs glitch
  spi: pxa2xx: Add CS control clock quirk
  ARM: dts: dra7: Add "dma-ranges" property to PCIe RC DT nodes
  powerpc: Include .BTF section
  spi: qup: call spi_qup_pm_resume_runtime before suspending
  drm/mediatek: Find the cursor plane instead of hard coding it
  ANDROID: ABI: Update ABI with CONFIG_SOC_BUS enabled
  ANDROID: GKI: Add CONFIG_SOC_BUS to gki_defconfig
  ANDROID: kbuild: do not merge .section..* into .section in modules
  ANDROID: scsi: ufs: add ->map_sg_crypto() variant op
  ANDROID: GKI: Update ABI after fixing vm_event_item diffs
  ANDROID: GKI: mm: vmstat: add pageoutclean
  ANDROID: GKI: mm: add struct/enum fields for SPECULATIVE_PAGE_FAULTS
  ANDROID: GKI: Update ABI after fixing mm diffs
  ANDROID: GKI: Add write_pending and max_writes fields to swap_info_struct
  ANDROID: GKI: memblock: Add memblock_overlaps_memory() to fix ABI diff
  ANDROID: GKI: net: remove conditional members causing ABI diffs
  ANDROID: GKI: mm: introduce NR_UNRECLAIMABLE_PAGES
  ANDROID: GKI: Update ABI
  ANDROID: GKI: sound: soc: Resolve ABI diff for struct snd_compr_stream
  ANDROID: GKI: sound: pcm: Add field hw_no_buffer to snd_pcm_substream
  ANDROID: GKI: ALSA: core: Add snd_soc_card_change_online_state() API
  ANDROID: GKI: SoC: core: Introduce macro SOC_SINGLE_MULTI_EXT
  ANDROID: GKI: ALSA: PCM: User control API implementation
  ANDROID: GKI: ALSA: PCM: volume API implementation
  ANDROID: GKI: kernel: tick-sched: Add API to get the next wakeup for a CPU
  ANDROID: GKI: extcon: Add extcon_register_blocking_notifier API.
  UPSTREAM: bpf: Explicitly memset some bpf info structures declared on the stack
  UPSTREAM: bpf: Explicitly memset the bpf_attr structure
  ANDROID: ABI: Update abi after enabling CONFIG_USB_PHY
  ANDROID: GKI: Enable CONFIG_USB_PHY for usb drivers like dwc3
  UPSTREAM: driver core: Add device link support for SYNC_STATE_ONLY flag
  ANDROID: Conflict fix for merging 4.19.112

 Conflicts:
	arch/arm64/kernel/smp.c
	drivers/extcon/extcon.c
	include/linux/extcon.h
	include/linux/mm.h
	include/linux/mm_types.h
	include/linux/vm_event_item.h
	include/sound/core.h
	kernel/time/tick-sched.c
	mm/vmstat.c
	sound/core/init.c
	sound/soc/soc-core.c

Change-Id: Ibffc219e0859b7d5c9580c930664eea5b822a704
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
2020-07-16 18:45:03 +05:30
Srinivasarao P
d120fe2157 Merge android-4.19.112 (417d28a) into msm-4.19
* refs/heads/tmp-417d28a:
  Reverting rmnet, incrementalfs changes from android-4.19.112
  UPSTREAM: driver core: Add device link support for SYNC_STATE_ONLY flag
  Revert "ANDROID: driver core: Add device link support for SYNC_STATE_ONLY flag"
  ANDROID: update the ABI xml representation
  ANDROID: GKI: Enable V4L2 hidden configs
  Linux 4.19.112
  ipv4: ensure rcu_read_lock() in cipso_v4_error()
  efi: Fix debugobjects warning on 'efi_rts_work'
  HID: google: add moonball USB id
  mm: slub: add missing TID bump in kmem_cache_alloc_bulk()
  ARM: 8958/1: rename missed uaccess .fixup section
  ARM: 8957/1: VDSO: Match ARMv8 timer in cntvct_functional()
  net: qrtr: fix len of skb_put_padto in qrtr_node_enqueue
  driver core: Fix creation of device links with PM-runtime flags
  driver core: Remove device link creation limitation
  driver core: Add device link flag DL_FLAG_AUTOPROBE_CONSUMER
  driver core: Make driver core own stateful device links
  driver core: Fix adding device links to probing suppliers
  driver core: Remove the link if there is no driver with AUTO flag
  mmc: sdhci-omap: Fix Tuning procedure for temperatures < -20C
  mmc: sdhci-omap: Don't finish_mrq() on a command error during tuning
  wimax: i2400: Fix memory leak in i2400m_op_rfkill_sw_toggle
  wimax: i2400: fix memory leak
  jbd2: fix data races at struct journal_head
  sfc: fix timestamp reconstruction at 16-bit rollover points
  net: rmnet: fix packet forwarding in rmnet bridge mode
  net: rmnet: fix bridge mode bugs
  net: rmnet: use upper/lower device infrastructure
  net: rmnet: do not allow to change mux id if mux id is duplicated
  net: rmnet: remove rcu_read_lock in rmnet_force_unassociate_device()
  net: rmnet: fix suspicious RCU usage
  net: rmnet: fix NULL pointer dereference in rmnet_changelink()
  net: rmnet: fix NULL pointer dereference in rmnet_newlink()
  hinic: fix a bug of setting hw_ioctxt
  hinic: fix a irq affinity bug
  slip: not call free_netdev before rtnl_unlock in slip_open
  signal: avoid double atomic counter increments for user accounting
  mac80211: rx: avoid RCU list traversal under mutex
  net: ks8851-ml: Fix IRQ handling and locking
  net: usb: qmi_wwan: restore mtu min/max values after raw_ip switch
  scsi: libfc: free response frame from GPN_ID
  cfg80211: check reg_rule for NULL in handle_channel_custom()
  HID: i2c-hid: add Trekstor Surfbook E11B to descriptor override
  HID: apple: Add support for recent firmware on Magic Keyboards
  ACPI: watchdog: Allow disabling WDAT at boot
  mmc: host: Fix Kconfig warnings on keystone_defconfig
  mmc: sdhci-omap: Workaround errata regarding SDR104/HS200 tuning failures (i929)
  mmc: sdhci-omap: Add platform specific reset callback
  perf/amd/uncore: Replace manual sampling check with CAP_NO_INTERRUPT flag
  ANDROID: GKI: Enable CONFIG_BACKLIGHT_CLASS_DEVICE in gki_defconfig
  ANDROID: Incremental fs: Add INCFS_IOC_PERMIT_FILL
  ANDROID: Incremental fs: Remove signature checks from kernel
  ANDROID: Incremental fs: Pad hash blocks
  ANDROID: Incremental fs: Make fill block an ioctl
  ANDROID: Incremental fs: Remove all access_ok checks

 Conflicts:
	net/qrtr/qrtr.c

Change-Id: I8148fa8ed43dfc13b2ee6333573df1d93b14db87
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
2020-07-16 16:22:32 +05:30
Srinivasarao P
bf97791c2c Merge android-4.19.111 (bfe2901) into msm-4.19
* refs/heads/tmp-bfe2901:
  Linux 4.19.111
  batman-adv: Avoid free/alloc race when handling OGM2 buffer
  efi: Add a sanity check to efivar_store_raw()
  net/smc: cancel event worker during device removal
  net/smc: check for valid ib_client_data
  ipv6: restrict IPV6_ADDRFORM operation
  i2c: acpi: put device when verifying client fails
  iommu/vt-d: Ignore devices with out-of-spec domain number
  iommu/vt-d: Fix the wrong printing in RHSA parsing
  netfilter: nft_tunnel: add missing attribute validation for tunnels
  netfilter: nft_payload: add missing attribute validation for payload csum flags
  netfilter: cthelper: add missing attribute validation for cthelper
  perf bench futex-wake: Restore thread count default to online CPU count
  nl80211: add missing attribute validation for channel switch
  nl80211: add missing attribute validation for beacon report scanning
  nl80211: add missing attribute validation for critical protocol indication
  i2c: gpio: suppress error on probe defer
  drm/i915/gvt: Fix unnecessary schedule timer when no vGPU exits
  pinctrl: core: Remove extra kref_get which blocks hogs being freed
  pinctrl: meson-gxl: fix GPIOX sdio pins
  batman-adv: Don't schedule OGM for disabled interface
  iommu/vt-d: Fix a bug in intel_iommu_iova_to_phys() for huge page
  iommu/vt-d: dmar: replace WARN_TAINT with pr_warn + add_taint
  iommu/dma: Fix MSI reservation allocation
  x86/mce: Fix logic and comments around MSR_PPIN_CTL
  mt76: fix array overflow on receiving too many fragments for a packet
  efi: Make efi_rts_work accessible to efi page fault handler
  efi: Fix a race and a buffer overflow while reading efivars via sysfs
  macintosh: windfarm: fix MODINFO regression
  ARC: define __ALIGN_STR and __ALIGN symbols for ARC
  KVM: x86: clear stale x86_emulate_ctxt->intercept value
  gfs2_atomic_open(): fix O_EXCL|O_CREAT handling on cold dcache
  cifs_atomic_open(): fix double-put on late allocation failure
  ktest: Add timeout for ssh sync testing
  drm/amd/display: remove duplicated assignment to grph_obj_type
  workqueue: don't use wq_select_unbound_cpu() for bound works
  netfilter: x_tables: xt_mttg_seq_next should increase position index
  netfilter: xt_recent: recent_seq_next should increase position index
  netfilter: synproxy: synproxy_cpu_seq_next should increase position index
  netfilter: nf_conntrack: ct_cpu_seq_next should increase position index
  iommu/vt-d: quirk_ioat_snb_local_iommu: replace WARN_TAINT with pr_warn + add_taint
  virtio-blk: fix hw_queue stopped on arbitrary error
  iwlwifi: mvm: Do not require PHY_SKU NVM section for 3168 devices
  cgroup: Iterate tasks that did not finish do_exit()
  cgroup: cgroup_procs_next should increase position index
  macvlan: add cond_resched() during multicast processing
  net: fec: validate the new settings in fec_enet_set_coalesce()
  slip: make slhc_compress() more robust against malicious packets
  bonding/alb: make sure arp header is pulled before accessing it
  devlink: validate length of region addr/len
  tipc: add missing attribute validation for MTU property
  net/ipv6: remove the old peer route if change it to a new one
  net/ipv6: need update peer route when modify metric
  selftests/net/fib_tests: update addr_metric_test for peer route testing
  net: phy: fix MDIO bus PM PHY resuming
  nfc: add missing attribute validation for vendor subcommand
  nfc: add missing attribute validation for deactivate target
  nfc: add missing attribute validation for SE API
  team: add missing attribute validation for array index
  team: add missing attribute validation for port ifindex
  net: fq: add missing attribute validation for orphan mask
  macsec: add missing attribute validation for port
  can: add missing attribute validation for termination
  nl802154: add missing attribute validation for dev_type
  nl802154: add missing attribute validation
  fib: add missing attribute validation for tun_id
  devlink: validate length of param values
  net: memcg: fix lockdep splat in inet_csk_accept()
  net: memcg: late association of sock to memcg
  cgroup: memcg: net: do not associate sock with unrelated cgroup
  bnxt_en: reinitialize IRQs when MTU is modified
  sfc: detach from cb_page in efx_copy_channel()
  r8152: check disconnect status after long sleep
  net: systemport: fix index check to avoid an array out of bounds access
  net: stmmac: dwmac1000: Disable ACS if enhanced descs are not used
  net/packet: tpacket_rcv: do not increment ring index on drop
  net: nfc: fix bounds checking bugs on "pipe"
  net: macsec: update SCI upon MAC address change.
  netlink: Use netlink header as base to calculate bad attribute offset
  net/ipv6: use configured metric when add peer route
  ipvlan: don't deref eth hdr before checking it's set
  ipvlan: do not use cond_resched_rcu() in ipvlan_process_multicast()
  ipvlan: do not add hardware address of master to its unicast filter list
  ipvlan: add cond_resched_rcu() while processing muticast backlog
  ipv6/addrconf: call ipv6_mc_up() for non-Ethernet interface
  inet_diag: return classid for all socket types
  gre: fix uninit-value in __iptunnel_pull_header
  cgroup, netclassid: periodically release file_lock on classid updating
  net: phy: Avoid multiple suspends
  phy: Revert toggling reset changes.
  ANDROID: kbuild: fix module linker script flags for LTO
  ANDROID: kbuild: avoid excessively long argument lists
  UPSTREAM: cgroup: Iterate tasks that did not finish do_exit()
  ANDROID: update the ABI xml representation
  Revert "ANDROID: gki_defconfig: Temporarily disable CFI"
  ANDROID: GKI: dma-buf: Add support for XXX_cpu_access_umapped ops
  ANDROID: GKI: dma-buf: Add support to set a destructor on a dma-buf
  ANDROID: GKI: dma-buf: use spinlock to protect set/get name operation
  ANDROID: GKI: dma-buf: Add support to get flags associated with a buffer
  ANDROID: GKI: dma-buf: Add support for mapping buffers with DMA attributes
  ANDROID: GKI: dma-buf: Add support for partial cache maintenance
  ANDROID: GKI: arm64: mm: Support setting removed_dma_ops in arch_setup_dma_ops
  ANDROID: GKI: drivers: Add dma removed ops
  ANDROID: GKI: add dma_map_ops remap/unremap operations
  ANDROID: Add build.config files for ARM 32-bit
  ANDROID: GKI: update abi due to CONFIG_JUMP_LABEL being enabled
  ANDROID: GKI: enable CONFIG_JUMP_LABEL
  ANDROID: Add build.config.gki-debug.x86_64
  ANDROID: Add build.config.gki-debug.aarch64

 Conflicts:
	arch/arm64/mm/dma-mapping.c
	drivers/dma-buf/dma-buf.c
	include/linux/dma-buf.h
	include/linux/dma-mapping.h
	kernel/dma/removed.c

Change-Id: Ib51bde74d4edba43447c670e9a8d5f9fd3691db2
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
2020-07-16 13:51:27 +05:30
Ivaylo Georgiev
1180b8e62b Restore "ANDROID: security,perf: Allow further restriction of perf_event_open"
This reverts commit 025a1ee618.

Restore CONFIG_SECURITY_PERF_EVENTS_RESTRICT to fix vintf checker
failure.

Change-Id: I41742532de583329ab802e55ab62eae747f91f13
Signed-off-by: Ivaylo Georgiev <irgeorgiev@codeaurora.org>
2020-06-01 03:37:43 -07:00
Sandeep Patil
374ed837f2 ANDROID: GKI: re-enable LTO, CFI and SCS
The configuration options were accidentally disabled in
aosp/1261171

Bug: none
Test: builds

Signed-off-by: Sandeep Patil <sspatil@google.com>
Change-Id: I5ba11e8cde97dd484c55e10488610f6da3fe0a4b
2020-03-25 18:11:06 +00:00
Sandeep Patil
5ea2cc2db6 ANDROID: GKI: Enable CONFIG_USB_PHY for usb drivers like dwc3
The configuration is only selected by other drivers, so add it in
the list of hidden gki configurations. USB_PHY also autoselects
CONFIG_EXTCON, so EXTCON now disappears from gki_defconfig

Bug: 151969174
Test: Builds

Signed-off-by: Sandeep Patil <sspatil@google.com>
Change-Id: I0cc55d2f06fcb5a46daf0578629e1f0a653ac48b
2020-03-21 18:11:11 +00:00
Sandeep Patil
cb451596b6 ANDROID: GKI: Enable CONFIG_BACKLIGHT_CLASS_DEVICE in gki_defconfig
Bug: 151952955
Test: Builds

Signed-off-by: Sandeep Patil <sspatil@google.com>
Change-Id: I4cd8086f185735daec1df7d52d4ec668249f6a3e
2020-03-19 13:26:02 -07:00
Will McVicker
5a00b43e5e Revert "ANDROID: gki_defconfig: Temporarily disable CFI"
This reverts commit 11118ecdc9.

Bug: 148458318
Signed-off-by: Will McVicker <willmcvicker@google.com>
Change-Id: I039969c9e72facf844d0183f6b9cfaace1db0951
2020-03-16 11:28:42 -07:00
Greg Kroah-Hartman
0afc77c5c8 ANDROID: GKI: enable CONFIG_JUMP_LABEL
It's needed to speed up trace points and other dynamic debugging stuff.

Bug: 145162121
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I811b538bc5280a633c56e0544ba1f54cd6b234f2
2020-03-16 15:55:53 +01:00
Alistair Delva
855b3593c4 ANDROID: gki_defconfig: Enable USB_CONFIGFS_MASS_STORAGE
Bug: 151405649
Change-Id: I809f87ecdfbb261cd4e0cc73a4a56a7deef020e7
Signed-off-by: Alistair Delva <adelva@google.com>
2020-03-15 15:57:44 -07:00
A. Cody Schuffelen
36f746c2b7 ANDROID: Add TPM support and the vTPM proxy to Cuttlefish.
This module allows presenting the kernel TPM interface while proxying
the TPM commands into a file descriptor. The module was originally
implemented to support running a TPM simulator on the same host system
and exposing a kernel TPM interface to a Linux container, but it is also
a convenient incremental step while we figure out our long-term strategy
with crosvm, which does not have TPM support following the same
standards as qemu.

CONFIG_TCG_TPM, the base config for the various TPM drivers, required
CONFIG_SECURITYFS. CONFIG_SECURITYFS exists only as a boolean and not a
tristate, so we can't install it as a module.

Bug: 148102533
Test: Build and run locally with cuttlefish, check for /dev/vtpmx
Change-Id: I568a50c2ecb7899aae70e7a20efaedc84443511d
Signed-off-by: A. Cody Schuffelen <schuffelen@google.com>
2020-03-13 17:19:53 +00:00
Alistair Delva
70a6392a3c ANDROID: gki_defconfig: Enable CONFIG_VM_EVENT_COUNTERS
This was "default y" but disabled manually because we set
CONFIG_EXPERT=y. Disabling it does not seem to be a big win and we have
had requests to enable it.

Bug: 150871026
Change-Id: I4a7f8da1e8480dc46f168def89016a5152e421ea
Signed-off-by: Alistair Delva <adelva@google.com>
2020-03-11 18:36:45 +00:00
Alistair Delva
c3f8a4aeac ANDROID: gki_defconfig: Enable CONFIG_CLEANCACHE
Bug: 150870780
Change-Id: Ib48738ee065492c4545ebbd525827c5e3c3c162a
Signed-off-by: Alistair Delva <adelva@google.com>
2020-03-11 18:36:37 +00:00
Suren Baghdasaryan
5f71d61342 ANDROID: gki_defconfig: disable CONFIG_DEBUG_DEVRES
Disable CONFIG_DEBUG_DEVRES to fix ABI differences caused by changes to
devres_alloc_node function when this debug option is enabled.

Bug: 151110905
Test: build
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I27ba172843c80ffd1dfbcc6cc4d706c5b18eb5d3
2020-03-11 09:05:23 -07:00
Greg Kroah-Hartman
3d86bc0840 ANDROID: enable CONFIG_WATCHDOG_CORE=y
WATCHDOG was enabled, but we forgot about the watchdog core code, so
turn it on as well so that all vendors do not have to enable it in their
configs.

Reported-by: Orson Zhai <orsonzhai@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Iac14e304b15f774d52fb07aa65df86f3dd71797f
2020-03-10 16:03:30 +01:00
Suren Baghdasaryan
df51b1d5b4 ANDROID: arm64: gki_defconfig: disable CONFIG_ZONE_DMA32
We don't need this. So disable to improve the ABI diff with vendors.

Bug: 150898578
Test: build
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I16568f2a1a04a0e4733470f2a4f92a451729682a
2020-03-06 16:30:58 -08:00
Will McVicker
822cdec17a ANDROID: gki_defconfig: enable CONFIG_TYPEC
This is a common config across many devices that we'd like to stablize.

Signed-off-by: Will McVicker <willmcvicker@google.com>
Bug: 150877929
Change-Id: Id56250664324ecbac2c1497ab5eb49c3306ee535
2020-03-06 14:48:27 -08:00
Todd Kjos
fa7ff12724 ANDROID: gki_defconfig: disable KPROBES, update ABI
Security teams from Google and Qualcomm request disabling
due to "large attack vector".

Leaf changes summary: 2 artifacts changed
Changed leaf types summary: 0 leaf type changed
Removed/Changed/Added functions summary: 2 Removed, 0 Changed, 0 Added function
Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable

2 Removed functions:

  [D] 'function int register_kprobe(kprobe*)'
  [D] 'function void unregister_kprobe(kprobe*)'

Bug: 149659981
Signed-off-by: Todd Kjos <tkjos@google.com>
Change-Id: Ie0a8e835bca8c7111f74440b1a44680856aae182
2020-03-04 14:50:31 -08:00
Suren Baghdasaryan
f78dc61d0e ANDROID: gki_defconfig: Disable CONFIG_RT_GROUP_SCHED
Disable CONFIG_RT_GROUP_SCHED to control RT cpu allowance globally.

ABI update report:

 ABI DIFFERENCES HAVE BEEN DETECTED! (RC=8)
========================================================
Leaf changes summary: 2 artifacts changed
Changed leaf types summary: 2 leaf types changed
Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 0 Added function
Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable

'struct sched_rt_entity at sched.h:481:1' changed:
  type size changed from 576 to 384 (in bits)
  3 data member deletions:
    'sched_rt_entity* sched_rt_entity::parent', at offset 384 (in bits) at sched.h:491:1

    'rt_rq* sched_rt_entity::rt_rq', at offset 448 (in bits) at sched.h:493:1

    'rt_rq* sched_rt_entity::my_q', at offset 512 (in bits) at sched.h:495:1

  1033 impacted interfaces
========================================================

Bug: 149954332
Change-Id: I9487bd113502e52f19637e43109433cb13e97a23
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2020-03-02 13:40:28 -08:00
Ram Muthiah
c2eb4abe93 ANDROID: GKI: Remove CONFIG_BRIDGE from arm64 config
CONFIG_BRIDGE is not needed at boot time and is tristate.
Any GKI device which requires this config can load the bridge module
during init.

Bug: 135666008
Test: Treehugger
Signed-off-by: Ram Muthiah <rammuthiah@google.com>
Change-Id: If22ceac2982a0f6b7a922393fb1dd08c68f6bc70
2020-03-01 01:53:17 +00:00
Siarhei Vishniakou
9906480a03 ANDROID: Enable HID_NINTENDO as y
This config will enable the Nintendo Switch Pro controller driver.

Change-Id: I50645a611566928e20a1afd4024f71803ed5fefa
Signed-off-by: Siarhei Vishniakou <svv@google.com>
Bug: 135136477
Test: tested via custom test app
Test: atest NintendoSwitchProTest
2020-02-28 21:32:52 +00:00
Roman Kiryanov
b99814ce58 ANDROID: gki_defconfig: Remove 'BRIDGE_NETFILTER is not set'
BRIDGE_NETFILTER is disabled by default now.

Bug: 147493341
Bug: 150463745
Test: presubmit
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: Ife8bb0bf2aacf64ad2594a449389e3706e54c5b5
2020-02-28 10:43:10 -08:00
Alistair Delva
b21b12720e ANDROID: gki_defconfig: Enable CONFIG_RD_LZ4
Support future decompression of LZ4-compressed ramdisk images.

This support is in addition to the default support for gzip.

Bug: 150391496
Test: TreeHugger
Change-Id: I8c07e9363333c53cd6ff9c7e16fc42cbe318fe83
Signed-off-by: Alistair Delva <adelva@google.com>
2020-02-27 23:56:57 +00:00
Ram Muthiah
5950d08698 ANDROID: gki: Enable BINFMT_MISC as part of GKI
Bug: 150328771
Signed-off-by: Ram Muthiah <rammuthiah@google.com>
Test: Treehugger
Change-Id: I2e9ba3a214295a63e3a0d4cc3407f93644f00db2
2020-02-27 20:47:03 +00:00
Eric Biggers
7a59be0a8a ANDROID: gki_defconfig: disable CONFIG_CRYPTO_MD4
The MD4 algorithm is heavily broken and obsolete, and there seems to be
no reason for it to be enabled in GKI.  It originally got enabled at
partner request alongside many other options with the rationale that
they changed the kernel ABI, so they needed to be enabled in GKI for any
module to use it.  But that doesn't apply to MD4 because it doesn't
change the kernel ABI.  Nor should any module be using MD4 anyway.

So let's disable MD4 again.

Bug: 135666008
Bug: 150302692
Change-Id: Iec0946984c4e58bffeab7888e689af035cdd512b
Signed-off-by: Eric Biggers <ebiggers@google.com>
2020-02-27 18:52:26 +00:00
Will McVicker
2e00ac5c21 ANDROID: arm64: gki_defconfig: disable CONFIG_DEBUG_PREEMPT
We don't need this. So disable to improve the ABI diff with vendors.

Signed-off-by: Will McVicker <willmcvicker@google.com>
Bug: 148870985
Test: compile test
Change-Id: I70690c8be2c3ffcc77f7c8c1d472be0ffffd0587
2020-02-21 15:46:04 -08:00
Will McVicker
93511073ec ANDROID: GKI: arm64: gki_defconfig: follow-up to removing DRM_MSM driver
These configs are selected by CONFIG_DRM_MSM. Explicitly add them now
that CONFIG_DRM_MSM isn't auto-selected.

Signed-off-by: Will McVicker <willmcvicker@google.com>
Bug: 147895101
Test: compile, verify the ABI is updated
Test: verify the module is loaded on the reference device
Change-Id: I084f785010ce85be4841d59e0809f844b26baeff
2020-02-21 15:26:04 -08:00
Will McVicker
ae54445e56 ANDROID: GKI: arm64: gki_defconfig: remove qcom,cmd-db driver
It can be compiled as a module. So, drop from gki_defconfig

Signed-off-by: Will McVicker <willmcvicker@google.com>
Bug: 149128810
Test: compile, verify ABI is updated
Test: verify module loads on reference device
Change-Id: I1fe926ab1e41de9d76ec9ba85ba84e5a9c9b379b
2020-02-21 15:26:04 -08:00
Will McVicker
336dfa707c ANDROID: GKI: arm64: gki_defconfig: remove qcom,rpmh-rsc driver
It can be compiled as a module. So, do that instead.

Change-Id: I3f0bf1a2d16cba80bc8bff4a5acc07c3bf5768f9
Signed-off-by: Will McVicker <willmcvicker@google.com>
Bug: 133440650
Test: compile, verify the ABI has been updated accordingly
Test: verify the module loads on reference device
2020-02-21 15:26:04 -08:00
Alistair Delva
c05bf9c3e6 ANDROID: gki_defconfig: Enable CONFIG_NET_NS
Bug: 144061615
Bug: 147493341
Change-Id: I6392a7ee9c8ab26ca3e033889d8311661e6ec4aa
Signed-off-by: Alistair Delva <adelva@google.com>
2020-02-19 18:05:12 +00:00
Alistair Delva
5174266903 ANDROID: gki_defconfig: Enable XDP_SOCKETS
Bug: 145685190
Bug: 144061615
Change-Id: I8f2fdf61473916e5e8dbb15e12d49cb0777cb42e
Signed-off-by: Alistair Delva <adelva@google.com>
2020-02-19 18:04:54 +00:00
Alistair Delva
280cae2765 ANDROID: gki_defconfig: Enable MAC80211_RC_MINSTREL
This feature was noticed missing on the android emulator, but it's
normally default 'on', we just were able to disable it because we
turn CONFIG_EXPERT on too.

Bug: 147493341
Change-Id: Ia81b4f841a5b5d4a37ad8a1f3450dff70abc341d
Signed-off-by: Alistair Delva <adelva@google.com>
2020-02-19 04:24:14 +00:00
Alistair Delva
823487844c ANDROID: gki_defconfig: Disable SDCARD_FS
Move SDCARD_FS into the fragments for cuttlefish and db845c as this
feature is still being used by AOSP master. These will be removed later.

Bug: 149410031
Change-Id: I9142338cd0709aa8ec067b9e7d8c22390630de02
Signed-off-by: Alistair Delva <adelva@google.com>
2020-02-14 21:40:44 +00:00
Daniel Rosenberg
65b1d86f95 ANDROID: gki_defconfig: Add CONFIG_UNICODE
This adds support for unicode to gki_defconfig

Signed-off-by: Daniel Rosenberg <drosen@google.com>
Test: Boots, /data/media is case insensitive
Bug: 138322712
Change-Id: I177d0b301087733234de3d6d283af946213eebca
2020-02-14 15:26:07 +00:00
Alexander Potapenko
31c2f618de ANDROID: gki_defconfig: enable CONFIG_RUNTIME_TESTING_MENU
Certain runtime tests depend on this config, so enable it in
gki_defconfig, so that config fragments can enable runtime tests.

This change should not have ABI impact.

Bug: 144999193
Change-Id: I6686ce299af189f63658b70b9973bb4ac1b6011c
Suggested-by: Alistair Delva <adelva@google.com>
Signed-off-by: Alexander Potapenko <glider@google.com>
2020-02-13 19:54:26 -08:00
Alexander Potapenko
236c394629 ANDROID: gki_defconfig: enable heap and stack initialization.
This patch enables CONFIG_INIT_STACK_ALL=y and
CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y, effectively turning on stack and heap
initialization in GKI kernels.

Doing so will help us mitigate information leaks and make code that
depends on uninitialized memory execute deterministically. We'll also
get coverage for the initialization features on the existing kernel
tests.

Bug: 144999193
Change-Id: I40ad526b2e595c84b122b0308d967a3874564252
Signed-off-by: Alexander Potapenko <glider@google.com>
2020-02-13 19:45:56 +01:00
Hridya Valsaraju
9c87d22d11 ANDROID: gki_defconfig: Set CONFIG_ANDROID_BINDERFS=y
Enable binderfs.

Bug: 136497735
Test: build, boot, binder devices created in /dev/binderfs
Change-Id: I551ed59e108f49dc0a198fbfd453cde6a2eea0fd
Signed-off-by: Hridya Valsaraju <hridya@google.com>
2020-02-11 22:07:30 +00:00
Sandeep Patil
4cf5c45850 ANDROID: Revert "ANDROID: gki_defconfig: removed CONFIG_PM_WAKELOCKS"
CONFIG_PM_WAKELOCKS are needed by existing driver code that uses
APIs like pm_wake_lock/unlock(). We can't disable yet just yet even
though userspace has stopped using the /sys/power/wake_lock interface.

This reverts commit b82fc46d57.

Bug: 148922129
Test: Boot
Change-Id: I8b8f4f46db3647313485abff21a5659bd881b687
Signed-off-by: Sandeep Patil <sspatil@google.com>
2020-02-11 05:16:34 +00:00
Ram Muthiah
cc8657ff73 ANDROID: gki: Removed cf modules from gki_defconfig
Bug: 139431025
Test: Treehugger
Change-Id: Ib1de19b851f8dc07f77e4b6ec5acf88b6051b070
Signed-off-by: Ram Muthiah <rammuthiah@google.com>
2020-01-31 16:23:38 -08:00
Ram Muthiah
9bb9de3b9f ANDROID: Remove default y for VIRTIO_PCI_LEGACY
Bug: 139431025
Test: Treehugger
Change-Id: I6943cf6b1fedc2b82332c1dcf9a91281a3ca5627
Signed-off-by: Ram Muthiah <rammuthiah@google.com>
2020-01-31 16:12:00 -08:00
Ram Muthiah
c4c4d3ec26 ANDROID: gki_defconfig: Remove SND_8X0
SND_8X0 and AC_97 should not be part of GKI.

Test: Treehugger
Bug: 139431025
Change-Id: I26fafd66abf639415ec8666cefd61db58b38578d
Signed-off-by: Ram Muthiah <rammuthiah@google.com>
2020-01-31 16:11:59 -08:00
Paul Lawrence
cd46498a22 ANDROID: Incremental fs: Enable incrementalfs in GKI
Bug: 133435829
Test: Builds, incfs_test passes
Change-Id: I334088b3aadcffe3f42f991b0d2039ff7b221ac5
Signed-off-by: Paul Lawrence <paullawrence@google.com>
2020-01-30 11:25:57 -08:00
Ram Muthiah
ec4281acb0 ANDROID: gki_defconfig: Set IKHEADERS back to =y
This reverts I3624fa4eb40a8aa726275027aa2b2d5bd635ceda
The build time vintf check has been updated to expect IKHEADERS=y.

Bug: 139431025
Bug: 143488798
Test: TreeHugger
Change-Id: I60ede1c1fde3b8e011450a94d467f6c393613a7a
Signed-off-by: Ram Muthiah <rammuthiah@google.com>
2020-01-29 19:44:25 +00:00
Alistair Delva
987e06d290 ANDROID: gki_defconfig: Enable CONFIG_BTT
Without this, the virtio_pmem driver does not seem to work.

Bug: 146400078
Change-Id: I2689aa4739b83a0a5a0e9930dc50b57e4f612525
Signed-off-by: Alistair Delva <adelva@google.com>
2020-01-28 12:44:59 -08:00
Alistair Delva
11118ecdc9 ANDROID: gki_defconfig: Temporarily disable CFI
Do this on arm64 only for now.

Bug: 148458318
Change-Id: Iaa70603f1a85ce93826c5939dcff59dd68472bf9
Signed-off-by: Alistair Delva <adelva@google.com>
2020-01-28 19:16:59 +00:00
Alistair Delva
45a6d3f518 ANDROID: gki_defconfig: Set IKHEADERS back to =m
This partially reverts I56e59e1a6232dada090d720f43e0d1036f43d064.

The build/runtime vintf check validates that CONFIG_IKHEADERS=m, it is
not allowed to be set to =y. While we figure out what the right course
of action is here, modify it back to =m.

Bug: 139431025
Test: TreeHugger
Change-Id: I3624fa4eb40a8aa726275027aa2b2d5bd635ceda
Signed-off-by: Alistair Delva <adelva@google.com>
2020-01-26 14:58:02 -08:00
Kenny Root
89a7be58e8 ANDROID: gki_defconfig: enable NVDIMM/PMEM options
Options needed for the virtual platform and physical platforms via DT
to define PMEM regions for resume-on-reboot feature

Bug: 146400078
Change-Id: Icaffbd3a7425ac3d9914378fb356d32f9393eec0
Signed-off-by: Kenny Root <kroot@google.com>
2020-01-26 19:05:05 +00:00
Eric Biggers
3d7bea608b ANDROID: gki_defconfig: enable dm-default-key
dm-default-key is needed for metadata encryption
(https://source.android.com/security/encryption/metadata).

The new version of dm-default-key is vendor-independent and can be used
both with and without inline encryption hardware.

Bug: 137270441
Bug: 147814592
Change-Id: I92ce45c4b1543ff8bc5cdb5ebe4ddcdb740c2dc7
Signed-off-by: Eric Biggers <ebiggers@google.com>
2020-01-24 12:02:45 -08:00
Hridya Valsaraju
b2af33d051 ANDROID: gki_defconfig: Set CONFIG_ION=m
Test: build, boot and video playback works on cuttlefish
Bug: 147914088

Change-Id: I6143f0def4047a84eb0f7a4c33df1c1cf3b6ffe2
Signed-off-by: Hridya Valsaraju <hridya@google.com>
2020-01-23 15:37:27 -08:00