android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge android11-5.4.86+ (ccdcd30) into msm-5.4

Browse Source 
* refs/heads/tmp-ccdcd30:
  ANDROID: Update the KMI for virtual platform modules
  ANDROID: ABI: Update symbol list for imx
  ANDROID: clang: update to 12.0.5
  FROMGIT: virt_wifi: Return micros for BSS TSF values
  ANDROID: android/OWNERS: drop gki-abi-approvers@
  ANDROID: Add OWNERS files referring to the respective android-mainline OWNERS

 Conflicts:
	build.config.common

Change-Id: I07e85e0e1c7716ba81317daf1e3274df931dd5b3
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
This commit is contained in:
Srinivasarao P 2021-05-02 23:58:02 +05:30
commit 20eb9c4ec0
27 changed files with 1895 additions and 1861 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/filesystems/OWNERS Normal file
View File

@ -0,0 +1,2 @@
# include OWNERS from the authoritative android-mainline branch
include kernel/common:android-mainline:/Documentation/filesystems/OWNERS

2
OWNERS Normal file
View File

@ -0,0 +1,2 @@
# include OWNERS from the authoritative android-mainline branch
include kernel/common:android-mainline:/OWNERS

2
android/GKI_VERSION
View File

@ -1 +1 @@
LTS_5.4.86_884688fe0cd4
LTS_5.4.86_ccdcd307cf7e

1
android/OWNERS
View File

@ -1,7 +1,6 @@
# If we ever add another OWNERS above this directory, it's likely to be
# more permissive, so don't inherit from it
set noparent
gki-abi-approvers@google.com
adelva@google.com
maennich@google.com
saravanak@google.com

3614
android/abi_gki_aarch64.xml
View File

File diff suppressed because it is too large Load Diff

4
android/abi_gki_aarch64_884688fe0cd4.xml → android/abi_gki_aarch64_ccdcd307cf7e.xml
View File

@ -36664,7 +36664,7 @@
<var-decl name='va' type-id='50bcf651' visibility='default' filepath='include/linux/printk.h' line='95' column='1'/>
</data-member>
</class-decl>
<typedef-decl name='va_list' type-id='7f896fb4' filepath='/local/mnt/workspace/c_spathi/aosp_clang/clang-r416183/lib64/clang/12.0.4/include/stdarg.h' line='14' column='1' id='2aee9912'/>
<typedef-decl name='va_list' type-id='7f896fb4' filepath='/local/mnt/workspace/c_spathi/aosp_clang/clang-r416183b/lib64/clang/12.0.5/include/stdarg.h' line='14' column='1' id='2aee9912'/>
<class-decl name='drm_mode_create_dumb' size-in-bits='256' is-struct='yes' visibility='default' filepath='include/uapi/drm/drm_mode.h' line='811' column='1' id='46d25262'>
<data-member access='public' layout-offset-in-bits='0'>
<var-decl name='height' type-id='3f1a6b60' visibility='default' filepath='include/uapi/drm/drm_mode.h' line='812' column='1'/>
@ -109526,7 +109526,7 @@
<pointer-type-def type-id='705711f5' size-in-bits='64' id='c2c60445'/>
<pointer-type-def type-id='c39df2b8' size-in-bits='64' id='3d15880e'/>
<pointer-type-def type-id='be9189df' size-in-bits='64' id='0a0aff97'/>
<var-decl name='system_state' type-id='2ead22b4' mangled-name='system_state' visibility='default' filepath='init/main.c' line='121' column='1' elf-symbol-id='system_state'/>
<var-decl name='system_state' type-id='2ead22b4' mangled-name='system_state' visibility='default' filepath='init/main.c' line='125' column='1' elf-symbol-id='system_state'/>
<function-decl name='event_triggers_call' mangled-name='event_triggers_call' filepath='include/linux/trace_events.h' line='486' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='event_triggers_call'>
<parameter type-id='3d4ca6d2'/>
<parameter type-id='eaa32e2f'/>

4
android/abi_gki_aarch64_cuttlefish
View File

@ -614,8 +614,8 @@
kmalloc_order_trace
kvfree
kvmalloc_node
memdup_user
mutex_trylock
sg_alloc_table
__sg_alloc_table_from_pages
sg_free_table
sg_next
@ -644,6 +644,8 @@
ttm_eu_fence_buffer_objects
ttm_eu_reserve_buffers
ttm_tt_init
vmalloc_to_page
vmemdup_user
vmemmap
ww_mutex_lock_interruptible
ww_mutex_unlock

86
android/abi_gki_aarch64_imx
View File

@ -255,12 +255,14 @@
fwnode_graph_get_next_endpoint
fwnode_handle_put
fwnode_property_read_u32_array
gcd
generic_handle_irq
get_cpu_device
__get_free_pages
get_random_bytes
get_unused_fd_flags
gpiod_direction_output_raw
gpiod_set_raw_value
gpiod_set_raw_value_cansleep
gpiod_set_value_cansleep
gpio_request
@ -272,6 +274,7 @@
i2c_add_adapter
i2c_del_adapter
i2c_del_driver
i2c_put_adapter
i2c_register_driver
i2c_transfer
i2c_transfer_buffer_flags
@ -306,9 +309,9 @@
kmalloc_caches
kmalloc_order_trace
kmem_cache_alloc_trace
kmemdup
kobject_create_and_add
kobject_put
kstrtoull
kthread_create_on_node
kthread_should_stop
ktime_get
@ -323,6 +326,7 @@
media_entity_remote_pad
memcpy
memset
__memset_io
mipi_dsi_attach
mipi_dsi_detach
mipi_dsi_driver_register_full
@ -359,7 +363,6 @@
of_clk_get
of_clk_get_by_name
of_clk_src_onecell_get
of_count_phandle_with_args
of_device_get_match_data
of_device_is_available
of_device_is_compatible
@ -394,6 +397,7 @@
of_property_read_string
of_property_read_u32_index
of_property_read_variable_u32_array
of_reserved_mem_device_init_by_idx
of_reset_control_array_get
param_array_ops
param_ops_bool
@ -478,6 +482,7 @@
__register_chrdev
register_netdev
__register_rpmsg_driver
register_virtio_device
register_virtio_driver
regmap_attach_dev
regmap_read
@ -547,7 +552,9 @@
snd_soc_info_volsw
snd_soc_jack_add_gpios
snd_soc_of_parse_audio_routing
snd_soc_of_parse_audio_simple_widgets
snd_soc_of_parse_card_name
snd_soc_of_parse_daifmt
snd_soc_params_to_bclk
snd_soc_pm_ops
snd_soc_put_enum_double
@ -665,6 +672,9 @@
vmalloc
vmalloc_to_page
vmemmap
vring_del_virtqueue
vring_interrupt
vring_new_virtqueue
vsnprintf
wait_for_completion_interruptible_timeout
wait_for_completion_timeout
@ -777,7 +787,6 @@
drm_scdc_set_high_tmds_clock_ratio
drm_scdc_set_scrambling
drm_scdc_write
i2c_put_adapter
of_get_i2c_adapter_by_node
# required by dw_hdmi-imx.ko
@ -794,6 +803,7 @@
# required by dwc3-qcom.ko
devm_extcon_register_notifier
kmemdup
of_clk_get_parent_count
# required by dwc3.ko
@ -845,7 +855,6 @@
of_mdiobus_register
of_phy_connect
of_phy_deregister_fixed_link
of_phy_find_device
of_phy_is_fixed_link
of_phy_register_fixed_link
param_ops_byte
@ -977,7 +986,6 @@
clk_notifier_register
clk_notifier_unregister
dma_request_chan
gpiod_set_raw_value
i2c_add_numbered_adapter
i2c_generic_scl_recovery
i2c_recover_bus
@ -1117,6 +1125,13 @@
# required by imx8mp-ldb.ko
devm_of_phy_get
# required by imx_rpmsg.ko
mbox_free_channel
mbox_request_channel_byname
mbox_send_message
of_reserved_mem_device_release
vring_transport_features
# required by imx_rpmsg_tty.ko
print_hex_dump
put_tty_driver
@ -1132,30 +1147,6 @@
tty_std_termios
tty_unregister_driver
# required by imx_rproc.ko
mbox_free_channel
mbox_request_channel_byname
mbox_send_message
of_phandle_iterator_init
of_phandle_iterator_next
of_reserved_mem_lookup
reset_control_status
rproc_add
rproc_add_carveout
rproc_alloc
rproc_coredump_add_segment
rproc_da_to_va
rproc_del
rproc_elf_find_loaded_rsc_table
rproc_elf_get_boot_addr
rproc_elf_load_rsc_table
rproc_elf_load_segments
rproc_elf_sanity_check
rproc_free
rproc_mem_entry_init
rproc_of_resm_mem_entry_init
rproc_vq_interrupt
# required by imxdrm.ko
component_bind_all
component_master_add_with_match
@ -1225,13 +1216,11 @@
match_token
mutex_is_locked
notify_change
override_creds
pagecache_get_page
path_get
path_put
__put_cred
register_filesystem
revert_creds
set_anon_super
sget
simple_getattr
@ -1276,6 +1265,9 @@
i2c_new_dummy
regmap_bulk_read
# required by lpa_ctrl.ko
sysfs_create_groups
# required by moal.ko
alloc_netdev_mqs
__alloc_skb
@ -1626,7 +1618,7 @@
# required by snd-soc-fsl-dsp.ko
dev_pm_domain_attach_by_id
__memset_io
of_count_phandle_with_args
of_irq_get
pm_system_wakeup
sysfs_streq
@ -1634,7 +1626,6 @@
# required by snd-soc-fsl-easrc.ko
completion_done
gcd
snd_pcm_format_big_endian
snd_pcm_format_linear
snd_pcm_format_unsigned
@ -1643,7 +1634,6 @@
# required by snd-soc-fsl-micfil.ko
kobject_uevent_env
kstrtoull
snd_soc_get_volsw_sx
snd_soc_info_volsw_sx
snd_soc_put_volsw_sx
@ -1666,9 +1656,6 @@
snd_pcm_hw_constraint_eld
snd_soc_jack_report
# required by snd-soc-imx-rpmsg.ko
of_reserved_mem_device_init_by_idx
# required by snd-soc-imx-wm8960.ko
gpiod_get_raw_value_cansleep
of_parse_phandle_with_fixed_args
@ -1684,6 +1671,22 @@
# required by snd-soc-rpmsg-cs42xx8.ko
regcache_cache_bypass
# required by snd-soc-rpmsg-imx-pcm512x.ko
i2c_get_adapter
i2c_smbus_read_byte
snd_soc_dai_set_bclk_ratio
snd_soc_get_pcm_runtime
snd_soc_limit_volume
snd_soc_unregister_card
# required by snd-soc-rpmsg-pcm512x.ko
devm_regulator_register_notifier
snd_ctl_boolean_stereo_info
snd_interval_ranges
snd_pcm_hw_constraint_ratnums
snd_pcm_hw_rule_add
snd_soc_params_to_frame_size
# required by snd-soc-simple-card-utils.ko
devm_get_clk_from_child
devm_kasprintf
@ -1692,14 +1695,15 @@
snd_soc_dapm_get_pin_switch
snd_soc_dapm_info_pin_switch
snd_soc_dapm_put_pin_switch
snd_soc_of_parse_audio_simple_widgets
snd_soc_of_parse_daifmt
# required by snd-soc-simple-card.ko
snd_soc_of_get_dai_name
snd_soc_of_parse_node_prefix
snd_soc_of_parse_tdm_slot
# required by snd-soc-tpa6130a2.ko
devm_gpio_request
# required by snvs_pwrkey.ko
devm_input_allocate_device
pm_relax
@ -1763,11 +1767,7 @@
panic_notifier_list
# required by trusty-virtio.ko
register_virtio_device
unregister_virtio_device
vring_del_virtqueue
vring_interrupt
vring_new_virtqueue
# required by trusty.ko
atomic_notifier_call_chain

2
arch/arm/OWNERS Normal file
View File

@ -0,0 +1,2 @@
# include OWNERS from the authoritative android-mainline branch
include kernel/common:android-mainline:/arch/arm/OWNERS

2
arch/arm64/OWNERS Normal file
View File

@ -0,0 +1,2 @@
# include OWNERS from the authoritative android-mainline branch
include kernel/common:android-mainline:/arch/arm64/OWNERS

2
arch/x86/OWNERS Normal file
View File

@ -0,0 +1,2 @@
# include OWNERS from the authoritative android-mainline branch
include kernel/common:android-mainline:/arch/x86/OWNERS

2
block/OWNERS Normal file
View File

@ -0,0 +1,2 @@
# include OWNERS from the authoritative android-mainline branch
include kernel/common:android-mainline:/block/OWNERS

2
build.config.common
View File

@ -5,7 +5,7 @@ CC=clang
LD=ld.lld
NM=llvm-nm
OBJCOPY=llvm-objcopy
CLANG_PREBUILT_BIN=prebuilts-master/clang/host/linux-x86/clang-r416183/bin
CLANG_PREBUILT_BIN=prebuilts-master/clang/host/linux-x86/clang-r416183b/bin
DEPMOD=depmod
BUILDTOOLS_PREBUILT_BIN=build/build-tools/path/linux-x86

2
crypto/OWNERS Normal file
View File

@ -0,0 +1,2 @@
# include OWNERS from the authoritative android-mainline branch
include kernel/common:android-mainline:/crypto/OWNERS

2
drivers/OWNERS Normal file
View File

@ -0,0 +1,2 @@
# include OWNERS from the authoritative android-mainline branch
include kernel/common:android-mainline:/drivers/OWNERS

5
drivers/net/wireless/virt_wifi.c
View File

@ -12,6 +12,7 @@
#include <net/cfg80211.h>
#include <net/rtnetlink.h>
#include <linux/etherdevice.h>
#include <linux/math64.h>
#include <linux/module.h>
#include <net/virt_wifi.h>
@ -173,11 +174,11 @@ static void virt_wifi_scan_result(struct work_struct *work)
scan_result.work);
struct wiphy *wiphy = priv_to_wiphy(priv);
struct cfg80211_scan_info scan_info = { .aborted = false };
u64 tsf = div_u64(ktime_get_boottime_ns(), 1000);
informed_bss = cfg80211_inform_bss(wiphy, &channel_5ghz,
CFG80211_BSS_FTYPE_PRESP,
fake_router_bssid,
ktime_get_boottime_ns(),
fake_router_bssid, tsf,
WLAN_CAPABILITY_ESS, 0,
(void *)&ssid, sizeof(ssid),
DBM_TO_MBM(-50), GFP_KERNEL);

2
fs/OWNERS Normal file
View File

@ -0,0 +1,2 @@
# include OWNERS from the authoritative android-mainline branch
include kernel/common:android-mainline:/fs/OWNERS

2
fs/f2fs/OWNERS Normal file
View File

@ -0,0 +1,2 @@
# include OWNERS from the authoritative android-mainline branch
include kernel/common:android-mainline:/fs/f2fs/OWNERS

2
fs/incfs/OWNERS Normal file
View File

@ -0,0 +1,2 @@
# include OWNERS from the authoritative android-mainline branch
include kernel/common:android-mainline:/fs/incfs/OWNERS

2
include/OWNERS Normal file
View File

@ -0,0 +1,2 @@
# include OWNERS from the authoritative android-mainline branch
include kernel/common:android-mainline:/include/OWNERS

2
include/linux/OWNERS Normal file
View File

@ -0,0 +1,2 @@
# include OWNERS from the authoritative android-mainline branch
include kernel/common:android-mainline:/include/linux/OWNERS

2
include/trace/events/OWNERS Normal file
View File

@ -0,0 +1,2 @@
# include OWNERS from the authoritative android-mainline branch
include kernel/common:android-mainline:/include/trace/events/OWNERS

2
include/uapi/linux/OWNERS Normal file
View File

@ -0,0 +1,2 @@
# include OWNERS from the authoritative android-mainline branch
include kernel/common:android-mainline:/include/uapi/linux/OWNERS

2
kernel/sched/OWNERS Normal file
View File

@ -0,0 +1,2 @@
# include OWNERS from the authoritative android-mainline branch
include kernel/common:android-mainline:/kernel/sched/OWNERS

2
mm/OWNERS Normal file
View File

@ -0,0 +1,2 @@
# include OWNERS from the authoritative android-mainline branch
include kernel/common:android-mainline:/mm/OWNERS

2
net/OWNERS Normal file
View File

@ -0,0 +1,2 @@
# include OWNERS from the authoritative android-mainline branch
include kernel/common:android-mainline:/net/OWNERS

2
tools/testing/selftests/filesystems/incfs/OWNERS Normal file
View File

@ -0,0 +1,2 @@
# include OWNERS from the authoritative android-mainline branch
include kernel/common:android-mainline:/tools/testing/selftests/filesystems/incfs/OWNERS