Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7e0337c authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 05e27497 on remote branch 

Change-Id: If3e8e32a04d91fe26d5adfe9530369236a5aefdd
parents 328284e6 05e27497

Makefile

+0 −1
Original line number Diff line number Diff line
@@ -736,7 +736,6 @@ KBUILD_CFLAGS += $(call cc-disable-warning, gnu) 
KBUILD_CFLAGS += $(call cc-disable-warning, duplicate-decl-specifier)

KBUILD_CFLAGS += -Wno-asm-operand-widths

KBUILD_CFLAGS += -Wno-initializer-overrides

KBUILD_CFLAGS += -fno-builtin

KBUILD_CFLAGS += $(call cc-option, -Wno-undefined-optimized)

KBUILD_CFLAGS += $(call cc-option, -Wno-tautological-constant-out-of-range-compare)

KBUILD_CFLAGS += $(call cc-option, -mllvm -disable-struct-const-merge)

arch/arm64/configs/vendor/lito-perf_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -418,7 +418,6 @@ CONFIG_DVB_MPQ_SW=y 
CONFIG_VIDEO_V4L2_VIDEOBUF2_CORE=y

CONFIG_DRM=y

# CONFIG_DRM_MSM is not set

CONFIG_FB_VIRTUAL=y

CONFIG_BACKLIGHT_LCD_SUPPORT=y

CONFIG_BACKLIGHT_CLASS_DEVICE=y

CONFIG_BACKLIGHT_QCOM_SPMI_WLED=y
@@ -670,7 +669,7 @@ CONFIG_DEBUG_INFO=y 
CONFIG_PAGE_OWNER=y

# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set

CONFIG_MAGIC_SYSRQ=y

CONFIG_PANIC_TIMEOUT=-1

CONFIG_PANIC_TIMEOUT=5

CONFIG_SCHEDSTATS=y

# CONFIG_DEBUG_PREEMPT is not set

CONFIG_IPC_LOGGING=y
@@ -681,6 +680,7 @@ CONFIG_CORESIGHT_LINK_AND_SINK_TMC=y 
CONFIG_CORESIGHT_DYNAMIC_REPLICATOR=y

CONFIG_CORESIGHT_STM=y

CONFIG_CORESIGHT_CTI=y

CONFIG_CORESIGHT_CTI_SAVE_DISABLE=y

CONFIG_CORESIGHT_TPDA=y

CONFIG_CORESIGHT_TPDM=y

CONFIG_CORESIGHT_HWEVENT=y

arch/arm64/configs/vendor/lito_defconfig

+1 −2
Original line number Diff line number Diff line
@@ -426,7 +426,6 @@ CONFIG_DVB_MPQ_SW=y 
CONFIG_VIDEO_V4L2_VIDEOBUF2_CORE=y

CONFIG_DRM=y

# CONFIG_DRM_MSM is not set

CONFIG_FB_VIRTUAL=y

CONFIG_BACKLIGHT_LCD_SUPPORT=y

CONFIG_BACKLIGHT_CLASS_DEVICE=y

CONFIG_BACKLIGHT_QCOM_SPMI_WLED=y
@@ -711,7 +710,7 @@ CONFIG_DEBUG_STACK_USAGE=y 
CONFIG_DEBUG_MEMORY_INIT=y

CONFIG_SOFTLOCKUP_DETECTOR=y

CONFIG_WQ_WATCHDOG=y

CONFIG_PANIC_TIMEOUT=-1

CONFIG_PANIC_TIMEOUT=5

CONFIG_PANIC_ON_SCHED_BUG=y

CONFIG_PANIC_ON_RT_THROTTLING=y

CONFIG_SCHEDSTATS=y

block/bfq-iosched.c

+12 −4
Original line number Diff line number Diff line
@@ -5090,20 +5090,28 @@ static struct bfq_queue *bfq_init_rq(struct request *rq) 
	return bfqq;

}



static void bfq_idle_slice_timer_body(struct bfq_queue *bfqq)

static void

bfq_idle_slice_timer_body(struct bfq_data *bfqd, struct bfq_queue *bfqq)

{

	struct bfq_data *bfqd = bfqq->bfqd;

	enum bfqq_expiration reason;

	unsigned long flags;



	spin_lock_irqsave(&bfqd->lock, flags);

	bfq_clear_bfqq_wait_request(bfqq);



	/*

	 * Considering that bfqq may be in race, we should firstly check

	 * whether bfqq is in service before doing something on it. If

	 * the bfqq in race is not in service, it has already been expired

	 * through __bfq_bfqq_expire func and its wait_request flags has

	 * been cleared in __bfq_bfqd_reset_in_service func.

	 */

	if (bfqq != bfqd->in_service_queue) {

		spin_unlock_irqrestore(&bfqd->lock, flags);

		return;

	}



	bfq_clear_bfqq_wait_request(bfqq);



	if (bfq_bfqq_budget_timeout(bfqq))

		/*

		 * Also here the queue can be safely expired
@@ -5148,7 +5156,7 @@ static enum hrtimer_restart bfq_idle_slice_timer(struct hrtimer *timer) 
	 * early.

	 */

	if (bfqq)

		bfq_idle_slice_timer_body(bfqq);

		bfq_idle_slice_timer_body(bfqd, bfqq);



	return HRTIMER_NORESTART;

}

drivers/char/adsprpc.c

+11 −14
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.

 */

#include <linux/dma-buf.h>

#include <linux/dma-mapping.h>
@@ -1871,6 +1871,7 @@ static int get_args(uint32_t kernel, struct smq_invoke_ctx *ctx) 
	}

	PERF_END);

	for (i = bufs; rpra && i < bufs + handles; i++) {

		if (ctx->fds)

			rpra[i].dma.fd = ctx->fds[i];

		rpra[i].dma.len = (uint32_t)lpra[i].buf.len;

		rpra[i].dma.offset = (uint32_t)(uintptr_t)lpra[i].buf.pv;
@@ -3417,10 +3418,9 @@ static int fastrpc_rpmsg_callback(struct rpmsg_device *rpdev, void *data, 
	struct smq_invoke_rspv2 *rspv2 = NULL;

	struct fastrpc_apps *me = &gfa;

	uint32_t index, rspFlags = 0, earlyWakeTime = 0;

	int err = 0, cid;

	struct fastrpc_channel_ctx *chan = 0;

	int err = 0, cid = -1;

	struct fastrpc_channel_ctx *chan = NULL;

	unsigned long irq_flags = 0;

	bool is_ctxtable_locked = false;



	cid = get_cid_from_rpdev(rpdev);

	VERIFY(err, (cid >= ADSP_DOMAIN_ID && cid <= NUM_CHANNELS));
@@ -3454,31 +3454,28 @@ static int fastrpc_rpmsg_callback(struct rpmsg_device *rpdev, void *data, 
	if (err)

		goto bail;



	if (rspFlags == COMPLETE_SIGNAL) {

	spin_lock_irqsave(&chan->ctxlock, irq_flags);

		is_ctxtable_locked = true;

	}

	VERIFY(err, !IS_ERR_OR_NULL(chan->ctxtable[index]));

	if (err)

		goto bail;

		goto bail_unlock;



	VERIFY(err, ((chan->ctxtable[index]->ctxid ==

		(rsp->ctx & ~CONTEXT_PD_CHECK)) &&

			chan->ctxtable[index]->magic ==

				FASTRPC_CTX_MAGIC));

	if (err)

		goto bail;

		goto bail_unlock;



	if (rspv2) {

		VERIFY(err, rspv2->version == FASTRPC_RSP_VERSION2);

		if (err)

			goto bail;

			goto bail_unlock;

	}

	context_notify_user(chan->ctxtable[index], rsp->retval,

				 rspFlags, earlyWakeTime);

bail:

	if (rspFlags == COMPLETE_SIGNAL && is_ctxtable_locked)

bail_unlock:

	spin_unlock_irqrestore(&chan->ctxlock, irq_flags);

bail:

	if (err)

		pr_err("adsprpc: ERROR: %s: invalid response (data %pK, len %d) from remote subsystem (err %d)\n",

				__func__, data, len, err);