From 9885e7fec0d417ff45d2db755f096ab2ed327e89 Mon Sep 17 00:00:00 2001 From: Macpaul Lin Date: Fri, 18 Dec 2020 17:43:10 +0800 Subject: [PATCH 1/6] ANDROID: usb: gadget: f_accessory: fix CTS test stuck f_accessory: fix CTS test stuck since CTS 9.0. - Refine acc_read() process. The data length that user (test program) wants to read is different from they really requested. This will cause the test flow stuck on the 2nd or the 3rd transfers in accessory test. (By connecting 2 phones with CtsVerifier.apk and CtsVerifierUSBCompanion.apk installed.) Bug: 174729307 Change-Id: I5367c8075ed37534e8bed94b60cc79135ae5aebc Signed-off-by: Macpaul Lin --- drivers/usb/gadget/function/f_accessory.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/usb/gadget/function/f_accessory.c b/drivers/usb/gadget/function/f_accessory.c index 7aa2656a2328..3e0b8b5d7d14 100644 --- a/drivers/usb/gadget/function/f_accessory.c +++ b/drivers/usb/gadget/function/f_accessory.c @@ -568,6 +568,7 @@ static ssize_t acc_read(struct file *fp, char __user *buf, struct acc_dev *dev = fp->private_data; struct usb_request *req; ssize_t r = count; + ssize_t data_length; unsigned xfer; int ret = 0; @@ -589,6 +590,15 @@ static ssize_t acc_read(struct file *fp, char __user *buf, goto done; } + /* + * Calculate the data length by considering termination character. + * Then compansite the difference of rounding up to + * integer multiple of maxpacket size. + */ + data_length = count; + data_length += dev->ep_out->maxpacket - 1; + data_length -= data_length % dev->ep_out->maxpacket; + if (dev->rx_done) { // last req cancelled. try to get it. req = dev->rx_req[0]; @@ -598,7 +608,7 @@ static ssize_t acc_read(struct file *fp, char __user *buf, requeue_req: /* queue a request */ req = dev->rx_req[0]; - req->length = count; + req->length = data_length; dev->rx_done = 0; ret = usb_ep_queue(dev->ep_out, req, GFP_KERNEL); if (ret < 0) { From cf6a51d18ba555107b54a08268081b70457d8193 Mon Sep 17 00:00:00 2001 From: "jian.gong" Date: Tue, 22 Dec 2020 15:05:59 +0800 Subject: [PATCH 2/6] ANDROID: ABI: add symbols of gpiod_get to unisoc Add symbols of gpiod_get to unisoc, and updates the ABI representation accordingly. Leaf changes summary: 1 artifact changed Changed leaf types summary: 0 leaf type changed Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 1 Added function Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable 1 Added function: [A] 'function gpio_desc* gpiod_get(device*, const char*, gpiod_flags)' Bug: 160255258 Change-Id: I899fc91f196d8c31a2fa9adeb626ba08478bf39c Signed-off-by: jian.gong --- android/abi_gki_aarch64.xml | 348 ++++++++++++++++----------------- android/abi_gki_aarch64_unisoc | 2 + 2 files changed, 167 insertions(+), 183 deletions(-) diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml index 6b95c840677f..c9dc61b290de 100644 --- a/android/abi_gki_aarch64.xml +++ b/android/abi_gki_aarch64.xml @@ -1706,6 +1706,7 @@ + @@ -4712,6 +4713,7 @@ + @@ -4733,7 +4735,6 @@ - @@ -11891,17 +11892,6 @@ - - - - - - - - - - - @@ -14595,6 +14585,17 @@ + + + + + + + + + + + @@ -14963,7 +14964,7 @@ - + @@ -23695,26 +23696,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -27302,7 +27283,6 @@ - @@ -27342,7 +27322,7 @@ - + @@ -27399,6 +27379,7 @@ + @@ -30858,6 +30839,12 @@ + + + + + + @@ -45572,6 +45559,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -56033,14 +56046,6 @@ - - - - - - - - @@ -68335,7 +68340,7 @@ - + @@ -89406,6 +89411,14 @@ + + + + + + + + @@ -89472,20 +89485,6 @@ - - - - - - - - - - - - - - @@ -89511,14 +89510,6 @@ - - - - - - - - @@ -89557,6 +89548,14 @@ + + + + + + + + @@ -93738,28 +93737,17 @@ - - - - - - + + + - - + + - - + + - - - - - - - - - + @@ -94512,7 +94500,7 @@ - + @@ -95373,7 +95361,7 @@ - + @@ -103817,7 +103805,7 @@ - + @@ -108267,34 +108255,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -108972,14 +108934,6 @@ - - - - - - - - @@ -109754,12 +109708,26 @@ + + + + + + + + + + + + + + - + @@ -110052,7 +110020,7 @@ - + @@ -110234,6 +110202,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -112509,14 +112503,6 @@ - - - - - - - - @@ -112697,7 +112683,7 @@ - + @@ -112705,6 +112691,22 @@ + + + + + + + + + + + + + + + + @@ -113067,7 +113069,7 @@ - + @@ -113110,42 +113112,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -113238,7 +113204,6 @@ - @@ -113269,7 +113234,7 @@ - + @@ -113326,7 +113291,7 @@ - + @@ -115479,7 +115444,7 @@ - + @@ -118065,7 +118030,7 @@ - + @@ -118104,7 +118069,7 @@ - + @@ -118186,7 +118151,7 @@ - + @@ -118201,7 +118166,7 @@ - + @@ -118213,7 +118178,7 @@ - + @@ -118222,7 +118187,7 @@ - + @@ -123304,6 +123269,25 @@ + + + + + + + + + + + + + + + + + + + @@ -126874,8 +126858,6 @@ - - diff --git a/android/abi_gki_aarch64_unisoc b/android/abi_gki_aarch64_unisoc index 5b300379d79e..0f3c2df59e3b 100644 --- a/android/abi_gki_aarch64_unisoc +++ b/android/abi_gki_aarch64_unisoc @@ -225,6 +225,7 @@ gpiochip_line_is_irq gpiod_direction_input gpiod_direction_output_raw + gpiod_get gpiod_get_raw_value gpiod_set_raw_value gpiod_set_raw_value_cansleep @@ -2026,6 +2027,7 @@ sg_nents_for_len # required by wcn_bsp.ko + gpiod_set_value memdup_user pci_disable_device pci_disable_msi From 64eade86ae6cb7a4132fd4633cb27af3d4faf972 Mon Sep 17 00:00:00 2001 From: Chanho Park Date: Tue, 22 Dec 2020 15:56:08 +0900 Subject: [PATCH 3/6] ANDROID: ABI: update allowed list for exynosauto SoC This patch is for updating GKI allowed symbol list without adding any new symbol. Next patch will introduce newly added symbols for Exynosauto SoC GKI vendor modules. To avoid unnecessary symbols, this patch also adds "preserved by --additions-only" even though we don't need them anymore. Bug: 176138611 Signed-off-by: Chanho Park Change-Id: I9fa9eb313ef1e2aeb8c853bae1c8cde18cdd9188 --- android/abi_gki_aarch64_exynosauto | 94 ++++++++++++++++++++---------- 1 file changed, 64 insertions(+), 30 deletions(-) diff --git a/android/abi_gki_aarch64_exynosauto b/android/abi_gki_aarch64_exynosauto index c981b860389b..1f8c085a3dba 100644 --- a/android/abi_gki_aarch64_exynosauto +++ b/android/abi_gki_aarch64_exynosauto @@ -6,6 +6,7 @@ alloc_workqueue __arch_copy_from_user __arch_copy_to_user + arch_setup_dma_ops arm64_const_caps_ready __arm_smccc_smc atomic_notifier_call_chain @@ -43,6 +44,7 @@ clk_unregister complete complete_all + complete_and_exit __const_udelay cpu_bit_bitmap cpu_hwcap_keys @@ -134,9 +136,8 @@ dma_request_slave_channel dma_set_coherent_mask dma_set_mask - down + down_interruptible down_read - down_trylock drm_add_edid_modes drm_atomic_helper_connector_destroy_state drm_atomic_helper_connector_duplicate_state @@ -162,6 +163,7 @@ eth_type_trans event_triggers_call fd_install + filp_open find_next_bit find_vma finish_wait @@ -211,6 +213,8 @@ iommu_register_device_fault_handler iommu_unregister_device_fault_handler ion_alloc + __ion_device_add_heap + ion_device_remove_heap ion_query_heaps_kernel __ioremap iounmap @@ -240,6 +244,7 @@ kmem_cache_free kmemdup kobject_create_and_add + kobject_init_and_add kobject_put krealloc kstrdup @@ -279,10 +284,10 @@ mod_delayed_work_on mod_timer module_layout + module_put __msecs_to_jiffies msleep __mutex_init - mutex_is_locked mutex_lock mutex_lock_interruptible mutex_unlock @@ -397,6 +402,10 @@ put_unused_fd queue_delayed_work_on queue_work_on + radix_tree_delete + radix_tree_insert + radix_tree_lookup + radix_tree_next_chunk ___ratelimit _raw_spin_lock _raw_spin_lock_irq @@ -467,6 +476,7 @@ snd_soc_of_get_dai_link_codecs snd_soc_of_get_dai_name snd_soc_of_parse_audio_routing + snd_soc_of_put_dai_link_codecs snd_soc_pm_ops snprintf sprintf @@ -557,7 +567,6 @@ vmalloc_to_page vmap vmemmap - vscnprintf vsnprintf vunmap vzalloc @@ -730,7 +739,6 @@ console_trylock console_unlock device_rename - drm_atomic_helper_async_check drm_atomic_helper_check drm_atomic_helper_cleanup_planes drm_atomic_helper_commit @@ -872,9 +880,9 @@ drm_vblank_init mipi_dsi_host_register mipi_dsi_host_unregister + mutex_is_locked of_drm_find_bridge of_drm_find_panel - of_get_next_available_child of_graph_get_endpoint_by_regs of_graph_get_endpoint_count of_graph_get_next_endpoint @@ -882,10 +890,8 @@ of_graph_get_remote_port of_graph_get_remote_port_parent of_graph_parse_endpoint - of_io_request_and_map - of_platform_device_create - of_platform_device_destroy - of_property_match_string + of_phandle_iterator_init + of_phandle_iterator_next strlcat videomode_from_timings @@ -947,6 +953,9 @@ snd_soc_dai_set_tdm_slot snd_soc_dai_set_tristate +# required by fmp-core.ko + bcmp + # required by g2d.ko __arch_copy_in_user compat_alloc_user_space @@ -976,7 +985,6 @@ # required by ion_exynos_mod.ko adjust_managed_page_count - arch_setup_dma_ops cma_alloc cma_get_name cma_release @@ -988,8 +996,6 @@ gen_pool_free_owner ion_buffer_prep_noncached ion_buffer_zero - __ion_device_add_heap - ion_device_remove_heap ion_free ion_heap_map_kernel ion_heap_map_user @@ -1013,7 +1019,9 @@ dev_pm_opp_put_regulators dev_pm_opp_set_regulators dma_fence_get_status + down downgrade_write + down_trylock down_write dump_stack __get_task_comm @@ -1027,7 +1035,6 @@ kfree_call_rcu ktime_get_raw __mmdrop - module_put of_machine_is_compatible param_ops_byte rb_erase @@ -1219,21 +1226,14 @@ v4l2_i2c_subdev_init # required by sam-is.ko - down_interruptible - filp_close - filp_open - get_random_u32 get_task_pid i2c_new_device jiffies_to_msecs kobject_del kstrtou16 kthread_flush_work - kthread_flush_worker ktime_get_ts64 ktime_get_with_offset - map_vm_area - mutex_trylock ns_to_timespec param_ops_string phy_configure @@ -1243,7 +1243,6 @@ regulator_is_enabled regulator_set_voltage sched_setscheduler_nocheck - unmap_kernel_range v4l2_device_register_subdev v4l2_device_set_name v4l2_device_unregister_subdev @@ -1335,7 +1334,6 @@ iommu_group_get iommu_group_get_for_dev iommu_group_get_iommudata - iommu_group_put iommu_group_remove_device iommu_group_set_iommudata iommu_put_dma_cookie @@ -1367,7 +1365,6 @@ __devm_regmap_init __devm_regmap_init_mmio_clk dma_mmap_attrs - iommu_attach_device __platform_register_drivers platform_unregister_drivers pm_runtime_no_callbacks @@ -1380,7 +1377,6 @@ snd_pcm_lib_preallocate_pages snd_pcm_period_elapsed snd_pcm_release_substream - snd_soc_component_exit_regmap snd_soc_component_init_regmap snd_soc_component_read snd_soc_dapm_add_routes @@ -1389,7 +1385,6 @@ snd_soc_dapm_new_controls snd_soc_dapm_put_enum_double snd_soc_info_enum_double - snd_soc_register_component snd_soc_set_runtime_hwparams snd_soc_unregister_component @@ -1417,6 +1412,8 @@ stream_open # required by ufs-exynos-core.ko + bio_crypt_should_process + keyslot_manager_create_passthrough ufshcd_config_pwr_mode ufshcd_dme_get_attr ufshcd_dme_set_attr @@ -1441,6 +1438,10 @@ vb2_expbuf vb2_request_object_is_buffer +# required by vbufq-be-module.ko + drain_workqueue + filp_close + # required by vdriver-lib-module.ko kobject_get kset_create_and_add @@ -1462,7 +1463,7 @@ vm_unmap_ram # required by vlx-clk-ctrl-common-module.ko - kobject_init_and_add + vscnprintf # required by vlx-hyp-module.ko ioremap_cache @@ -1475,6 +1476,25 @@ # required by vlx-last-kmsg-module.ko proc_set_size +# required by vlx-prop-module.ko + kobject_uevent + kset_unregister + sysfs_create_bin_file + sysfs_remove_bin_file + +# required by vlx-vion-module.ko + dma_buf_fd + idr_alloc_cyclic + idr_find + idr_remove + __module_get + platform_device_register_full + __platform_driver_probe + radix_tree_iter_delete + refcount_dec_and_mutex_lock + uuid_gen + __vmalloc + # required by vlx-vmq-module.ko default_wake_function remove_wait_queue @@ -1488,9 +1508,6 @@ pci_alloc_irq_vectors_affinity pci_free_irq_vectors pci_irq_vector - radix_tree_delete - radix_tree_insert - radix_tree_lookup radix_tree_maybe_preload schedule_timeout_uninterruptible sg_pcopy_from_buffer @@ -1539,3 +1556,20 @@ pci_bus_type __usb_create_hcd usb_hcd_platform_shutdown + +# preserved by --additions-only + drm_atomic_helper_async_check + get_random_u32 + iommu_attach_device + iommu_group_put + kthread_flush_worker + map_vm_area + mutex_trylock + of_get_next_available_child + of_io_request_and_map + of_platform_device_create + of_platform_device_destroy + of_property_match_string + snd_soc_component_exit_regmap + snd_soc_register_component + unmap_kernel_range From 662e2b3ab8fbee830d2aabe7b8de5349c4b59571 Mon Sep 17 00:00:00 2001 From: Chanho Park Date: Tue, 22 Dec 2020 16:41:10 +0900 Subject: [PATCH 4/6] ANDROID: ABI: add allowed GKI symbol for Exynosauto SoC This patch adds below two symbols to GKI allowed symbol list. - pcie_get_mps: get PCI Express maximum payload size for PCIe EP and RC - platform_find_device_by_driver: To find a platform device which are matched with exynos DRM driver Leaf changes summary: 2 artifacts changed Changed leaf types summary: 0 leaf type changed Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 2 Added functions Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable 2 Added functions: [A] 'function int pcie_get_mps(pci_dev*)' [A] 'function device* platform_find_device_by_driver(device*, const device_driver*)' Bug: 176138611 Signed-off-by: Chanho Park Change-Id: Ib06675b7431f247071f873fa8e44a7e5b90e764a --- android/abi_gki_aarch64.xml | 157 ++++++++++++++++------------- android/abi_gki_aarch64_exynosauto | 2 + 2 files changed, 87 insertions(+), 72 deletions(-) diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml index c9dc61b290de..541fa1afd553 100644 --- a/android/abi_gki_aarch64.xml +++ b/android/abi_gki_aarch64.xml @@ -2758,6 +2758,7 @@ + @@ -2870,6 +2871,7 @@ + @@ -15484,6 +15486,20 @@ + + + + + + + + + + + + + + @@ -23202,6 +23218,8 @@ + + @@ -23257,6 +23275,11 @@ + + + + + @@ -33088,7 +33111,7 @@ - + @@ -34472,7 +34495,7 @@ - + @@ -34733,7 +34756,7 @@ - + @@ -35744,7 +35767,7 @@ - + @@ -37777,14 +37800,6 @@ - - - - - - - - @@ -54274,6 +54289,7 @@ + @@ -54361,8 +54377,6 @@ - - @@ -54545,6 +54559,7 @@ + @@ -67765,6 +67780,10 @@ + + + + @@ -72195,6 +72214,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -82071,6 +82114,17 @@ + + + + + + + + + + + @@ -82364,17 +82418,6 @@ - - - - - - - - - - - @@ -93835,6 +93878,14 @@ + + + + + + + + @@ -100735,13 +100786,13 @@ - + - + - + @@ -100783,7 +100834,7 @@ - + @@ -104946,7 +104997,7 @@ - + @@ -104962,7 +105013,7 @@ - + @@ -104970,7 +105021,7 @@ - + @@ -104984,7 +105035,7 @@ - + @@ -124763,44 +124814,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -130967,6 +130980,6 @@ diff --git a/android/abi_gki_aarch64_exynosauto b/android/abi_gki_aarch64_exynosauto index 1f8c085a3dba..7dc2d76ffe84 100644 --- a/android/abi_gki_aarch64_exynosauto +++ b/android/abi_gki_aarch64_exynosauto @@ -892,6 +892,7 @@ of_graph_parse_endpoint of_phandle_iterator_init of_phandle_iterator_next + platform_find_device_by_driver strlcat videomode_from_timings @@ -1137,6 +1138,7 @@ irq_domain_get_irq_data irq_domain_set_info irq_domain_update_bus_token + pcie_get_mps pcie_set_mps pci_find_bus pci_get_device From 8038bc2bb90a14027e85669553263cfc6468ac9d Mon Sep 17 00:00:00 2001 From: "jian.gong" Date: Thu, 24 Dec 2020 19:36:54 +0800 Subject: [PATCH 5/6] ANDROID: ABI: add symbols of __dynamic_netdev_dbg to unisoc Add symbols of __dynamic_netdev_dbg to unisoc, and updates the ABI representation accordingly. Leaf changes summary: 1 artifact changed Changed leaf types summary: 0 leaf type changed Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 1 Added function Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable 1 Added function: [A] 'function void __dynamic_netdev_dbg(_ddebug*, const net_device*, const char*, ...)' Bug: 160255258 Change-Id: I357d2f430fbe76f061fbc85919eaba9f95ce7e2e Signed-off-by: jian.gong --- android/abi_gki_aarch64.xml | 946 ++++++++++++++++----------------- android/abi_gki_aarch64_unisoc | 2 + 2 files changed, 450 insertions(+), 498 deletions(-) diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml index 541fa1afd553..fd29c947a4cb 100644 --- a/android/abi_gki_aarch64.xml +++ b/android/abi_gki_aarch64.xml @@ -88,6 +88,7 @@ + @@ -4701,7 +4702,7 @@ - + @@ -4737,6 +4738,7 @@ + @@ -11463,23 +11465,6 @@ - - - - - - - - - - - - - - - - - @@ -14489,6 +14474,23 @@ + + + + + + + + + + + + + + + + + @@ -15486,20 +15488,6 @@ - - - - - - - - - - - - - - @@ -27306,6 +27294,7 @@ + @@ -27345,7 +27334,7 @@ - + @@ -27402,7 +27391,6 @@ - @@ -33111,7 +33099,7 @@ - + @@ -34495,7 +34483,7 @@ - + @@ -34756,7 +34744,7 @@ - + @@ -35767,7 +35755,7 @@ - + @@ -37331,8 +37319,6 @@ - - @@ -37842,6 +37828,8 @@ + + @@ -54289,7 +54277,6 @@ - @@ -54377,6 +54364,8 @@ + + @@ -54559,7 +54548,6 @@ - @@ -54783,6 +54771,17 @@ + + + + + + + + + + + @@ -56061,6 +56060,14 @@ + + + + + + + + @@ -72214,30 +72221,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -82114,17 +82097,6 @@ - - - - - - - - - - - @@ -82418,6 +82390,17 @@ + + + + + + + + + + + @@ -88359,7 +88342,7 @@ - + @@ -88585,7 +88568,6 @@ - @@ -88605,7 +88587,7 @@ - + @@ -88784,27 +88766,27 @@ - - + + - + - + - + - + @@ -89454,14 +89436,6 @@ - - - - - - - - @@ -89517,6 +89491,14 @@ + + + + + + + + @@ -89528,6 +89510,20 @@ + + + + + + + + + + + + + + @@ -89553,6 +89549,14 @@ + + + + + + + + @@ -89591,14 +89595,6 @@ - - - - - - - - @@ -89965,23 +89961,6 @@ - - - - - - - - - - - - - - - - - @@ -90856,6 +90835,23 @@ + + + + + + + + + + + + + + + + + @@ -91583,7 +91579,7 @@ - + @@ -91729,64 +91725,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -100786,13 +100724,13 @@ - + - + - + @@ -100834,7 +100772,7 @@ - + @@ -103730,6 +103668,23 @@ + + + + + + + + + + + + + + + + + @@ -104997,7 +104952,7 @@ - + @@ -105013,7 +104968,7 @@ - + @@ -105021,7 +104976,7 @@ - + @@ -105035,7 +104990,7 @@ - + @@ -107156,6 +107111,13 @@ + + + + + + + @@ -108982,9 +108944,240 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -109137,7 +109330,18 @@ + + + + + + + + + + + @@ -109326,6 +109530,13 @@ + + + + + + + @@ -109333,6 +109544,10 @@ + + + + @@ -109759,18 +109974,15 @@ - + - + - + - - - - + @@ -109778,7 +109990,7 @@ - + @@ -115495,7 +115707,7 @@ - + @@ -117898,17 +118110,6 @@ - - - - - - - - - - - @@ -118320,268 +118521,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -118665,17 +118605,6 @@ - - - - - - - - - - - @@ -123320,25 +123249,6 @@ - - - - - - - - - - - - - - - - - - - @@ -124814,6 +124724,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -126871,6 +126819,8 @@ + + @@ -130980,6 +130930,6 @@ diff --git a/android/abi_gki_aarch64_unisoc b/android/abi_gki_aarch64_unisoc index 0f3c2df59e3b..4266cbe0bcea 100644 --- a/android/abi_gki_aarch64_unisoc +++ b/android/abi_gki_aarch64_unisoc @@ -64,6 +64,7 @@ complete complete_all config_ep_by_speed + config_group_init_type_name console_lock console_unlock __const_udelay @@ -186,6 +187,7 @@ dst_release dump_stack __dynamic_dev_dbg + __dynamic_netdev_dbg __dynamic_pr_debug enable_irq ether_setup From 032e643834def0159c90a0a3612a278cf6d33163 Mon Sep 17 00:00:00 2001 From: Zhiqiang Tu Date: Fri, 25 Dec 2020 13:05:31 +0800 Subject: [PATCH 6/6] ANDROID: ABI: Update allowed list for QCOM Leaf changes summary: 0 artifact changed Changed leaf types summary: 0 leaf type 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 Bug: 176306856 Change-Id: I52e0bbea0f41d97ca4241f6309babfad7dac82f8 Signed-off-by: Zhiqiang Tu --- android/abi_gki_aarch64_qcom | 1 + 1 file changed, 1 insertion(+) diff --git a/android/abi_gki_aarch64_qcom b/android/abi_gki_aarch64_qcom index a09d7f31e4f1..b4744eb24073 100644 --- a/android/abi_gki_aarch64_qcom +++ b/android/abi_gki_aarch64_qcom @@ -1041,6 +1041,7 @@ __hwspin_unlock hypervisor_kobj i2c_add_adapter + i2c_add_numbered_adapter i2c_del_adapter i2c_del_driver i2c_get_dma_safe_msg_buf