Snap for 7960433 from 43670409b2
to android12-5.10-keystone-qcom-release
Change-Id: I9766c79324b930527127bff602fd425f7bbbc8cd
This commit is contained in:
File diff suppressed because it is too large
Load Diff
4
android/abi_gki_aarch64_mtk
Normal file → Executable file
4
android/abi_gki_aarch64_mtk
Normal file → Executable file
@@ -975,6 +975,7 @@
|
|||||||
kfree_skb
|
kfree_skb
|
||||||
kfree_skb_list
|
kfree_skb_list
|
||||||
kill_anon_super
|
kill_anon_super
|
||||||
|
kill_pid
|
||||||
kimage_vaddr
|
kimage_vaddr
|
||||||
kimage_voffset
|
kimage_voffset
|
||||||
__kmalloc
|
__kmalloc
|
||||||
@@ -1022,6 +1023,7 @@
|
|||||||
kthread_destroy_worker
|
kthread_destroy_worker
|
||||||
kthread_flush_work
|
kthread_flush_work
|
||||||
kthread_flush_worker
|
kthread_flush_worker
|
||||||
|
kthread_freezable_should_stop
|
||||||
__kthread_init_worker
|
__kthread_init_worker
|
||||||
kthread_queue_delayed_work
|
kthread_queue_delayed_work
|
||||||
kthread_queue_work
|
kthread_queue_work
|
||||||
@@ -2056,6 +2058,7 @@
|
|||||||
trace_raw_output_prep
|
trace_raw_output_prep
|
||||||
trace_seq_printf
|
trace_seq_printf
|
||||||
trace_seq_putc
|
trace_seq_putc
|
||||||
|
trace_set_clr_event
|
||||||
tracing_off
|
tracing_off
|
||||||
try_wait_for_completion
|
try_wait_for_completion
|
||||||
tty_flip_buffer_push
|
tty_flip_buffer_push
|
||||||
@@ -2370,6 +2373,7 @@
|
|||||||
vscnprintf
|
vscnprintf
|
||||||
vsnprintf
|
vsnprintf
|
||||||
vsprintf
|
vsprintf
|
||||||
|
vsscanf
|
||||||
vunmap
|
vunmap
|
||||||
vzalloc
|
vzalloc
|
||||||
wait_for_completion
|
wait_for_completion
|
||||||
|
1
arch/arm64/configs/fips140_gki_eval_testing.fragment
Normal file
1
arch/arm64/configs/fips140_gki_eval_testing.fragment
Normal file
@@ -0,0 +1 @@
|
|||||||
|
CONFIG_CRYPTO_FIPS140_MOD_EVAL_TESTING=y
|
3
build.config.gki.aarch64.fips140_eval_testing
Normal file
3
build.config.gki.aarch64.fips140_eval_testing
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki.aarch64.fips140
|
||||||
|
|
||||||
|
PRE_DEFCONFIG_CMDS+=" cat ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/fips140_gki_eval_testing.fragment >> ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG};"
|
@@ -3264,6 +3264,9 @@ static bool dwc3_gadget_endpoint_trbs_complete(struct dwc3_ep *dep,
|
|||||||
struct dwc3 *dwc = dep->dwc;
|
struct dwc3 *dwc = dep->dwc;
|
||||||
bool no_started_trb = true;
|
bool no_started_trb = true;
|
||||||
|
|
||||||
|
if (!dep->endpoint.desc)
|
||||||
|
return no_started_trb;
|
||||||
|
|
||||||
dwc3_gadget_ep_cleanup_completed_requests(dep, event, status);
|
dwc3_gadget_ep_cleanup_completed_requests(dep, event, status);
|
||||||
|
|
||||||
if (dep->flags & DWC3_EP_END_TRANSFER_PENDING)
|
if (dep->flags & DWC3_EP_END_TRANSFER_PENDING)
|
||||||
@@ -3311,6 +3314,9 @@ static void dwc3_gadget_endpoint_transfer_in_progress(struct dwc3_ep *dep,
|
|||||||
{
|
{
|
||||||
int status = 0;
|
int status = 0;
|
||||||
|
|
||||||
|
if (!dep->endpoint.desc)
|
||||||
|
return;
|
||||||
|
|
||||||
if (usb_endpoint_xfer_isoc(dep->endpoint.desc))
|
if (usb_endpoint_xfer_isoc(dep->endpoint.desc))
|
||||||
dwc3_gadget_endpoint_frame_from_event(dep, event);
|
dwc3_gadget_endpoint_frame_from_event(dep, event);
|
||||||
|
|
||||||
|
@@ -376,11 +376,10 @@ static bool z_erofs_try_inplace_io(struct z_erofs_collector *clt,
|
|||||||
|
|
||||||
/* callers must be with collection lock held */
|
/* callers must be with collection lock held */
|
||||||
static int z_erofs_attach_page(struct z_erofs_collector *clt,
|
static int z_erofs_attach_page(struct z_erofs_collector *clt,
|
||||||
struct page *page,
|
struct page *page, enum z_erofs_page_type type,
|
||||||
enum z_erofs_page_type type)
|
bool pvec_safereuse)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
bool occupied;
|
|
||||||
|
|
||||||
/* give priority for inplaceio */
|
/* give priority for inplaceio */
|
||||||
if (clt->mode >= COLLECT_PRIMARY &&
|
if (clt->mode >= COLLECT_PRIMARY &&
|
||||||
@@ -388,10 +387,9 @@ static int z_erofs_attach_page(struct z_erofs_collector *clt,
|
|||||||
z_erofs_try_inplace_io(clt, page))
|
z_erofs_try_inplace_io(clt, page))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
ret = z_erofs_pagevec_enqueue(&clt->vector,
|
ret = z_erofs_pagevec_enqueue(&clt->vector, page, type,
|
||||||
page, type, &occupied);
|
pvec_safereuse);
|
||||||
clt->cl->vcnt += (unsigned int)ret;
|
clt->cl->vcnt += (unsigned int)ret;
|
||||||
|
|
||||||
return ret ? 0 : -EAGAIN;
|
return ret ? 0 : -EAGAIN;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -737,7 +735,8 @@ hitted:
|
|||||||
tight &= (clt->mode >= COLLECT_PRIMARY_FOLLOWED);
|
tight &= (clt->mode >= COLLECT_PRIMARY_FOLLOWED);
|
||||||
|
|
||||||
retry:
|
retry:
|
||||||
err = z_erofs_attach_page(clt, page, page_type);
|
err = z_erofs_attach_page(clt, page, page_type,
|
||||||
|
clt->mode >= COLLECT_PRIMARY_FOLLOWED);
|
||||||
/* should allocate an additional short-lived page for pagevec */
|
/* should allocate an additional short-lived page for pagevec */
|
||||||
if (err == -EAGAIN) {
|
if (err == -EAGAIN) {
|
||||||
struct page *const newpage =
|
struct page *const newpage =
|
||||||
@@ -745,7 +744,7 @@ retry:
|
|||||||
|
|
||||||
set_page_private(newpage, Z_EROFS_SHORTLIVED_PAGE);
|
set_page_private(newpage, Z_EROFS_SHORTLIVED_PAGE);
|
||||||
err = z_erofs_attach_page(clt, newpage,
|
err = z_erofs_attach_page(clt, newpage,
|
||||||
Z_EROFS_PAGE_TYPE_EXCLUSIVE);
|
Z_EROFS_PAGE_TYPE_EXCLUSIVE, true);
|
||||||
if (!err)
|
if (!err)
|
||||||
goto retry;
|
goto retry;
|
||||||
}
|
}
|
||||||
|
@@ -108,12 +108,17 @@ static inline void z_erofs_pagevec_ctor_init(struct z_erofs_pagevec_ctor *ctor,
|
|||||||
static inline bool z_erofs_pagevec_enqueue(struct z_erofs_pagevec_ctor *ctor,
|
static inline bool z_erofs_pagevec_enqueue(struct z_erofs_pagevec_ctor *ctor,
|
||||||
struct page *page,
|
struct page *page,
|
||||||
enum z_erofs_page_type type,
|
enum z_erofs_page_type type,
|
||||||
bool *occupied)
|
bool pvec_safereuse)
|
||||||
{
|
{
|
||||||
*occupied = false;
|
if (!ctor->next) {
|
||||||
if (!ctor->next && type)
|
/* some pages cannot be reused as pvec safely without I/O */
|
||||||
if (ctor->index + 1 == ctor->nr)
|
if (type == Z_EROFS_PAGE_TYPE_EXCLUSIVE && !pvec_safereuse)
|
||||||
|
type = Z_EROFS_VLE_PAGE_TYPE_TAIL_SHARED;
|
||||||
|
|
||||||
|
if (type != Z_EROFS_PAGE_TYPE_EXCLUSIVE &&
|
||||||
|
ctor->index + 1 == ctor->nr)
|
||||||
return false;
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
if (ctor->index >= ctor->nr)
|
if (ctor->index >= ctor->nr)
|
||||||
z_erofs_pagevec_ctor_pagedown(ctor, false);
|
z_erofs_pagevec_ctor_pagedown(ctor, false);
|
||||||
@@ -125,7 +130,6 @@ static inline bool z_erofs_pagevec_enqueue(struct z_erofs_pagevec_ctor *ctor,
|
|||||||
/* should remind that collector->next never equal to 1, 2 */
|
/* should remind that collector->next never equal to 1, 2 */
|
||||||
if (type == (uintptr_t)ctor->next) {
|
if (type == (uintptr_t)ctor->next) {
|
||||||
ctor->next = page;
|
ctor->next = page;
|
||||||
*occupied = true;
|
|
||||||
}
|
}
|
||||||
ctor->pages[ctor->index++] = tagptr_fold(erofs_vtptr_t, page, type);
|
ctor->pages[ctor->index++] = tagptr_fold(erofs_vtptr_t, page, type);
|
||||||
return true;
|
return true;
|
||||||
|
@@ -2843,6 +2843,9 @@ EXPORT_SYMBOL_GPL(wake_up_if_idle);
|
|||||||
|
|
||||||
bool cpus_share_cache(int this_cpu, int that_cpu)
|
bool cpus_share_cache(int this_cpu, int that_cpu)
|
||||||
{
|
{
|
||||||
|
if (this_cpu == that_cpu)
|
||||||
|
return true;
|
||||||
|
|
||||||
return per_cpu(sd_llc_id, this_cpu) == per_cpu(sd_llc_id, that_cpu);
|
return per_cpu(sd_llc_id, this_cpu) == per_cpu(sd_llc_id, that_cpu);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user