Received: by 2002:a05:6a10:c7c6:0:0:0:0 with SMTP id h6csp1426298pxy; Mon, 2 Aug 2021 00:56:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwezTQ+PI/hyYdtsGYAWwhGuMm5b0m9p1AcLhR5irV3LmgyMWFEzSOLM9zYCw9N9MQOp3ql X-Received: by 2002:a17:906:a24c:: with SMTP id bi12mr14398531ejb.530.1627891015736; Mon, 02 Aug 2021 00:56:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627891015; cv=none; d=google.com; s=arc-20160816; b=M7ebtWqKFPKi5o+iR3aQj8kSgE/wk6cbARpuSCPzlfb58nAJciLudev7ub9e9S/mLE zbc7y57UzIutwzU7l1uYQiLaOM6lX2yl1C+M7J0Y7FWXif9qITy0fJlVsYl8roxYv1W5 5chT/1S/v7/pIIqQH2MSREz7ihX/1HJsDguNYysDlW6PBVSwkweV71YINeB6OTWsSg2D F6AUVSogn/TTCq4Zd2q/ENwW8ixPTfKk3uOEfLeGYqe36rFudrjCWmr0nnAvLnKyoFuS K0Vy0YFjU02RGdh1DprbarfvCMHztsEzkpi7KbSSBW+Rc44rUzKckYbwPKytRsqDeDRz 9ZAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:subject:cc:to:from; bh=URCiDma1Gj5BZS56izGZJCvr/dmfAQThbGe2gLc6KCA=; b=YbPKf20c1GBRe5yuoXf9uimK0VQyxhlVlJjnE9mOGnWJ1KCjDjiit1aPs1MgAIaSo9 sY7GT9bTP/oyR85j7zHcTFZ4OGivxOAXz4VBCh4HaQshTtjvyx0VWNqUQTrmUOzDD6vD OWOijSilsdO266fCi2Ytm5OktV4PqeFkw4fRLT8jbn7CHpoyOqy/dxiHqkiRCyZWVhiI iABw/fWS4NfBGnmGTHhMcE2Fta9dbET1OvIC6NRU1g+yIicKQI68F8ORfXxOBqoQV8JR Rol1s+KlDYiq4Tl336eKO343R7U0IMLh2KHHeecyDO1jOGCgFpl5dq+D5ztsh62h0rAh R55g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mediatek.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f10si1304847ejf.597.2021.08.02.00.56.31; Mon, 02 Aug 2021 00:56:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mediatek.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232562AbhHBHxM (ORCPT + 99 others); Mon, 2 Aug 2021 03:53:12 -0400 Received: from mailgw01.mediatek.com ([60.244.123.138]:42434 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S232531AbhHBHxM (ORCPT ); Mon, 2 Aug 2021 03:53:12 -0400 X-UUID: f6ec4a7f6a144ad5b3480e195b80e414-20210802 X-UUID: f6ec4a7f6a144ad5b3480e195b80e414-20210802 Received: from mtkcas07.mediatek.inc [(172.21.101.84)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 653899945; Mon, 02 Aug 2021 15:53:00 +0800 Received: from MTKCAS06.mediatek.inc (172.21.101.30) by mtkmbs02n2.mediatek.inc (172.21.101.101) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 2 Aug 2021 15:52:58 +0800 Received: from localhost.localdomain (10.17.3.153) by MTKCAS06.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Mon, 2 Aug 2021 15:52:57 +0800 From: Yongqiang Niu To: Chun-Kuang Hu , Jassi Brar CC: Rob Herring , Matthias Brugger , Philipp Zabel , David Airlie , Daniel Vetter , Yongqiang Niu , Fabien Parent , Dennis YC Hsieh , , , , , , , Hsin-Yi Wang Subject: [PATCH v3] soc: mediatek: cmdq: add address shift in jump Date: Mon, 2 Aug 2021 15:52:26 +0800 Message-ID: <1627890746-23165-1-git-send-email-yongqiang.niu@mediatek.com> X-Mailer: git-send-email 1.8.1.1.dirty MIME-Version: 1.0 Content-Type: text/plain X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add address shift when compose jump instruction to compatible with 35bit format. Fixes: 0858fde496f8 ("mailbox: cmdq: variablize address shift in platform") Signed-off-by: Yongqiang Niu Reviewed-by: Nicolas Boichat --- drivers/mailbox/mtk-cmdq-mailbox.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/mailbox/mtk-cmdq-mailbox.c b/drivers/mailbox/mtk-cmdq-mailbox.c index 8d39b98..d03bfaf 100644 --- a/drivers/mailbox/mtk-cmdq-mailbox.c +++ b/drivers/mailbox/mtk-cmdq-mailbox.c @@ -174,7 +174,8 @@ static void cmdq_task_insert_into_thread(struct cmdq_task *task) dma_sync_single_for_cpu(dev, prev_task->pa_base, prev_task->pkt->cmd_buf_size, DMA_TO_DEVICE); prev_task_base[CMDQ_NUM_CMD(prev_task->pkt) - 1] = - (u64)CMDQ_JUMP_BY_PA << 32 | task->pa_base; + (u64)CMDQ_JUMP_BY_PA << 32 | + (task->pa_base >> task->cmdq->shift_pa); dma_sync_single_for_device(dev, prev_task->pa_base, prev_task->pkt->cmd_buf_size, DMA_TO_DEVICE); -- 1.8.1.1.dirty