Skip to content

Commit

Permalink
Merge android13-5.10 into android13-gs-pixel-5.10-tm-qpr2
Browse files Browse the repository at this point in the history 
Merge SHA:
c57ed31 ANDROID: Update the ABI representation

Bug: 255246572
Bug: 229696117 (ACK)
Bug: 245928838 (ACK)
Bug: 254608320 (ACK)
Bug: 255471591 (ACK)
Change-Id: I4741e796ee173c2c157a8085ba550f9b2cf96cd7
Signed-off-by: Joey Lin <[email protected]>
  • Loading branch information
Joey Lin committed Nov 16, 2022
2 parents b4b4c3c + c57ed31 commit 3d3916f
Show file tree
Hide file tree
Showing 6 changed files with 2,275 additions and 914 deletions.
2,847 changes: 1,953 additions & 894 deletions android/abi_gki_aarch64.xml
View file

Large diffs are not rendered by default.

305 changes: 305 additions & 0 deletions android/abi_gki_aarch64_exynos
View file
Original file line number Diff line number Diff line change
Expand Up @@ -777,3 +777,308 @@
wakeup_source_remove
wakeup_source_unregister
__warn_printk

# required by clk_exynos.ko
__clk_get_hw
__clk_get_name
clk_get_parent
clk_hw_get_flags
clk_hw_get_name
clk_hw_get_parent
clk_register
clk_register_clkdev
clk_register_composite
clk_register_fixed_factor
clk_register_fixed_rate
clk_register_gate
clk_round_rate
of_clk_add_provider
of_clk_src_onecell_get

# required by cmupmucal.ko
debugfs_create_x32

# required by cpif.ko
dev_get_by_name
init_dummy_netdev
init_net
register_netdev
si_meminfo
skb_dequeue_tail
unregister_netdev

# required by cqhci.ko
devm_blk_ksm_init
dmam_free_coherent
mmc_cqe_request_done
mmc_hw_reset

# required by dpu.ko
backlight_device_unregister
console_trylock
devm_backlight_device_register
dma_fence_wait_timeout
__do_once_done
__do_once_start
phy_init
regulator_get_exclusive
__v4l2_device_register_subdev_nodes

# required by dss.ko
android_debug_symbol
dump_backtrace
input_close_device
input_open_device
input_register_handle
input_register_handler
input_unregister_handle
kstat
nr_irqs
register_console
register_die_notifier
rtc_time64_to_tm
touch_softlockup_watchdog
__traceiter_android_vh_ipi_stop
__traceiter_hrtimer_expire_entry
__traceiter_hrtimer_expire_exit
__traceiter_irq_handler_entry
__traceiter_irq_handler_exit
__traceiter_sched_switch
__traceiter_workqueue_execute_end
__traceiter_workqueue_execute_start
__tracepoint_android_vh_ipi_stop
__tracepoint_hrtimer_expire_entry
__tracepoint_hrtimer_expire_exit
__tracepoint_irq_handler_entry
__tracepoint_irq_handler_exit
__tracepoint_sched_switch
__tracepoint_workqueue_execute_end
__tracepoint_workqueue_execute_start

# required by dw_mmc-exynos-fmp.ko
blk_ksm_init_passthrough

# required by dw_mmc-exynos.ko
mmc_wait_for_req
sg_init_one

# required by dw_mmc-srpmb.ko
blkdev_get_by_path
blk_execute_rq
blk_get_request
blk_put_request
capable

# required by dw_mmc.ko
debugfs_create_x64
device_property_read_string_array
mmc_add_host
mmc_alloc_host
mmc_can_gpio_cd
mmc_detect_change
mmc_free_host
mmc_gpio_get_cd
mmc_gpio_get_ro
mmc_of_parse
mmc_regulator_get_supply
mmc_regulator_set_ocr
mmc_regulator_set_vqmmc
mmc_remove_host
mmc_request_done
sdio_signal_irq

# required by dwc3-exynos-usb.ko
platform_device_add
platform_device_add_properties
platform_device_add_resources
platform_device_alloc
platform_device_del
platform_device_put
pm_runtime_allow
__traceiter_dwc3_ep_queue
__traceiter_dwc3_readl
__traceiter_dwc3_writel
__tracepoint_dwc3_ep_queue
__tracepoint_dwc3_readl
__tracepoint_dwc3_writel
usb_gadget_set_state
usb_otg_state_string

# required by ems.ko
activate_task
android_rvh_probe_register
available_idle_cpu
bpf_trace_run10
bpf_trace_run11
bpf_trace_run8
bpf_trace_run9
cgroup_taskset_first
cgroup_taskset_next
check_preempt_curr
cpufreq_add_update_util_hook
cpufreq_disable_fast_switch
cpufreq_driver_fast_switch
__cpufreq_driver_target
cpufreq_enable_fast_switch
cpufreq_frequency_table_get_index
cpufreq_register_governor
cpufreq_remove_update_util_hook
cpufreq_this_cpu_can_update
cpu_topology
deactivate_task
dev_pm_qos_add_notifier
dev_pm_qos_add_request
dev_pm_qos_remove_request
dev_pm_qos_update_request
get_pid_task
housekeeping_cpumask
irq_work_queue
irq_work_sync
kthread_cancel_work_sync
match_string
memory_read_from_buffer
raw_notifier_chain_unregister
_raw_write_trylock
reciprocal_value
resched_curr
runqueues
sched_feat_keys
sched_feat_names
sched_uclamp_used
set_next_entity
set_task_cpu
static_key_disable
stop_one_cpu_nowait
sysctl_sched_features
system_32bit_el0_cpumask
task_rq_lock
__traceiter_android_rvh_can_migrate_task
__traceiter_android_rvh_check_preempt_wakeup
__traceiter_android_rvh_cpu_cgroup_can_attach
__traceiter_android_rvh_dequeue_task
__traceiter_android_rvh_enqueue_task
__traceiter_android_rvh_find_busiest_queue
__traceiter_android_rvh_find_lowest_rq
__traceiter_android_rvh_find_new_ilb
__traceiter_android_rvh_post_init_entity_util_avg
__traceiter_android_rvh_replace_next_task_fair
__traceiter_android_rvh_sched_fork_init
__traceiter_android_rvh_sched_newidle_balance
__traceiter_android_rvh_sched_nohz_balancer_kick
__traceiter_android_rvh_sched_rebalance_domains
__traceiter_android_rvh_select_fallback_rq
__traceiter_android_rvh_select_task_rq_fair
__traceiter_android_rvh_select_task_rq_rt
__traceiter_android_rvh_set_task_cpu
__traceiter_android_rvh_uclamp_rq_util_with
__traceiter_android_vh_arch_set_freq_scale
__traceiter_android_vh_binder_restore_priority
__traceiter_android_vh_binder_set_priority
__traceiter_android_vh_binder_wakeup_ilocked
__traceiter_android_vh_scheduler_tick
__traceiter_binder_transaction_received
__traceiter_pelt_dl_tp
__traceiter_pelt_irq_tp
__traceiter_pelt_rt_tp
__traceiter_pelt_se_tp
__traceiter_sched_overutilized_tp
__tracepoint_android_rvh_can_migrate_task
__tracepoint_android_rvh_check_preempt_wakeup
__tracepoint_android_rvh_cpu_cgroup_can_attach
__tracepoint_android_rvh_dequeue_task
__tracepoint_android_rvh_enqueue_task
__tracepoint_android_rvh_find_busiest_queue
__tracepoint_android_rvh_find_lowest_rq
__tracepoint_android_rvh_find_new_ilb
__tracepoint_android_rvh_post_init_entity_util_avg
__tracepoint_android_rvh_replace_next_task_fair
__tracepoint_android_rvh_sched_fork_init
__tracepoint_android_rvh_sched_newidle_balance
__tracepoint_android_rvh_sched_nohz_balancer_kick
__tracepoint_android_rvh_sched_rebalance_domains
__tracepoint_android_rvh_select_fallback_rq
__tracepoint_android_rvh_select_task_rq_fair
__tracepoint_android_rvh_select_task_rq_rt
__tracepoint_android_rvh_set_task_cpu
__tracepoint_android_rvh_uclamp_rq_util_with
__tracepoint_android_vh_arch_set_freq_scale
__tracepoint_android_vh_binder_restore_priority
__tracepoint_android_vh_binder_set_priority
__tracepoint_android_vh_binder_wakeup_ilocked
__tracepoint_android_vh_scheduler_tick
__tracepoint_binder_transaction_received
__tracepoint_pelt_dl_tp
__tracepoint_pelt_irq_tp
__tracepoint_pelt_rt_tp
__tracepoint_pelt_se_tp
__tracepoint_sched_overutilized_tp
uclamp_eff_value
update_rq_clock
wake_up_if_idle

# required by exynos-acme.ko
cpufreq_freq_transition_begin
cpufreq_freq_transition_end
cpufreq_generic_attr
cpufreq_register_driver
cpuhp_tasks_frozen
dev_pm_opp_of_register_em
refresh_frequency_limits
topology_set_thermal_pressure

# required by exynos-bcm_dbg.ko
caches_clean_inval_pou
hrtimer_try_to_cancel
kick_all_cpus_sync
__platform_driver_probe

# required by exynos-bts.ko
devm_kstrdup

# required by exynos-chipid_v2.ko
soc_device_register
subsys_system_register

# required by exynos-coresight.ko
__cpuhp_setup_state_cpuslocked
cpu_pm_register_notifier

# required by exynos-cpuhp.ko
add_cpu

# required by exynos-cpupm.ko
cpuidle_get_cpu_driver
of_find_node_by_type
smp_call_function_many
__traceiter_ipi_entry
__traceiter_ipi_exit
__traceiter_ipi_raise
__tracepoint_ipi_entry
__tracepoint_ipi_exit
__tracepoint_ipi_raise

# required by exynos-debug-test.ko
_dev_crit

# required by exynos-ecc-handler.ko
cpu_hotplug_disable
cpu_hotplug_enable

# required by exynos-itmon.ko
int_pow

# required by exynos-pd.ko
of_genpd_add_provider_simple
pm_genpd_add_subdomain
pm_genpd_init

# required by exynos-reboot.ko
pm_power_off

# required by exynos-ssld.ko
bus_register
bus_unregister
device_register
device_unregister
driver_register
tracepoint_probe_unregister
22 changes: 11 additions & 11 deletions drivers/gpu/drm/meson/meson_viu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -469,17 +469,17 @@ void meson_viu_init(struct meson_drm *priv)
priv->io_base + _REG(VD2_IF0_LUMA_FIFO_SIZE));

if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_G12A)) {
writel_relaxed(VIU_OSD_BLEND_REORDER(0, 1) |
VIU_OSD_BLEND_REORDER(1, 0) |
VIU_OSD_BLEND_REORDER(2, 0) |
VIU_OSD_BLEND_REORDER(3, 0) |
VIU_OSD_BLEND_DIN_EN(1) |
VIU_OSD_BLEND1_DIN3_BYPASS_TO_DOUT1 |
VIU_OSD_BLEND1_DOUT_BYPASS_TO_BLEND2 |
VIU_OSD_BLEND_DIN0_BYPASS_TO_DOUT0 |
VIU_OSD_BLEND_BLEN2_PREMULT_EN(1) |
VIU_OSD_BLEND_HOLD_LINES(4),
priv->io_base + _REG(VIU_OSD_BLEND_CTRL));
u32 val = (u32)VIU_OSD_BLEND_REORDER(0, 1) |
(u32)VIU_OSD_BLEND_REORDER(1, 0) |
(u32)VIU_OSD_BLEND_REORDER(2, 0) |
(u32)VIU_OSD_BLEND_REORDER(3, 0) |
(u32)VIU_OSD_BLEND_DIN_EN(1) |
(u32)VIU_OSD_BLEND1_DIN3_BYPASS_TO_DOUT1 |
(u32)VIU_OSD_BLEND1_DOUT_BYPASS_TO_BLEND2 |
(u32)VIU_OSD_BLEND_DIN0_BYPASS_TO_DOUT0 |
(u32)VIU_OSD_BLEND_BLEN2_PREMULT_EN(1) |
(u32)VIU_OSD_BLEND_HOLD_LINES(4);
writel_relaxed(val, priv->io_base + _REG(VIU_OSD_BLEND_CTRL));

writel_relaxed(OSD_BLEND_PATH_SEL_ENABLE,
priv->io_base + _REG(OSD1_BLEND_SRC_CTRL));
Expand Down
10 changes: 5 additions & 5 deletions drivers/irqchip/irq-tegra.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,10 +148,10 @@ static int tegra_ictlr_suspend(void)
lic->cop_iep[i] = readl_relaxed(ictlr + ICTLR_COP_IEP_CLASS);

/* Disable COP interrupts */
writel_relaxed(~0ul, ictlr + ICTLR_COP_IER_CLR);
writel_relaxed(GENMASK(31, 0), ictlr + ICTLR_COP_IER_CLR);

/* Disable CPU interrupts */
writel_relaxed(~0ul, ictlr + ICTLR_CPU_IER_CLR);
writel_relaxed(GENMASK(31, 0), ictlr + ICTLR_CPU_IER_CLR);

/* Enable the wakeup sources of ictlr */
writel_relaxed(lic->ictlr_wake_mask[i], ictlr + ICTLR_CPU_IER_SET);
Expand All @@ -172,12 +172,12 @@ static void tegra_ictlr_resume(void)

writel_relaxed(lic->cpu_iep[i],
ictlr + ICTLR_CPU_IEP_CLASS);
writel_relaxed(~0ul, ictlr + ICTLR_CPU_IER_CLR);
writel_relaxed(GENMASK(31, 0), ictlr + ICTLR_CPU_IER_CLR);
writel_relaxed(lic->cpu_ier[i],
ictlr + ICTLR_CPU_IER_SET);
writel_relaxed(lic->cop_iep[i],
ictlr + ICTLR_COP_IEP_CLASS);
writel_relaxed(~0ul, ictlr + ICTLR_COP_IER_CLR);
writel_relaxed(GENMASK(31, 0), ictlr + ICTLR_COP_IER_CLR);
writel_relaxed(lic->cop_ier[i],
ictlr + ICTLR_COP_IER_SET);
}
Expand Down Expand Up @@ -312,7 +312,7 @@ static int __init tegra_ictlr_init(struct device_node *node,
lic->base[i] = base;

/* Disable all interrupts */
writel_relaxed(~0UL, base + ICTLR_CPU_IER_CLR);
writel_relaxed(GENMASK(31, 0), base + ICTLR_CPU_IER_CLR);
/* All interrupts target IRQ */
writel_relaxed(0, base + ICTLR_CPU_IEP_CLASS);

Expand Down
3 changes: 0 additions & 3 deletions drivers/md/dm-user.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,6 @@ static void message_kill(struct message *m, mempool_t *pool)
{
m->bio->bi_status = BLK_STS_IOERR;
bio_endio(m->bio);
bio_put(m->bio);
mempool_free(m, pool);
}

Expand Down Expand Up @@ -989,7 +988,6 @@ static ssize_t dev_write(struct kiocb *iocb, struct iov_iter *from)
*/
WARN_ON(bio_size(c->cur_from_user->bio) != 0);
bio_endio(c->cur_from_user->bio);
bio_put(c->cur_from_user->bio);

/*
* We don't actually need to take the target lock here, as all
Expand Down Expand Up @@ -1227,7 +1225,6 @@ static int user_map(struct dm_target *ti, struct bio *bio)
return DM_MAPIO_REQUEUE;
}

bio_get(bio);
entry->msg.type = bio_type_to_user_type(bio);
entry->msg.flags = bio_flags_to_user_flags(bio);
entry->msg.sector = bio->bi_iter.bi_sector;
Expand Down
Loading

0 comments on commit 3d3916f

Please sign in to comment.