From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7D2A3C433EF for ; Fri, 1 Jul 2022 08:39:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=YKccCrNk7aF19ySILMNmWcxo9HwypiOEBwki3Rs/dZs=; b=XOThdoy/N2yWrh a5mzy71Ot66GP/4C8y4q6N7QCD9AsxiJ4nvLyHiIbWXJPLdQbvAZ1AjOwJ/Ohsm/b4eDejGHUtm7L a8yf5RunvF+DGTjxLPLLw9l+7dIcZGCj0cdAVZ8xrzKQadPxN/Meorri0f+r3JKos1br7P+zRdfF+ 66agi6tlXQPEY6eKV9JTYESfPLRQIPJlTqTl30A1hUUFI9ecFQpC96kKcZf8WsUf4MlvgtTPWyQY1 0BTXlG/MNdPy4DqYSG656C0xwAL1vBJKxwr5Ns84WRfRJWuq1Ks2/aw9VY4/USKn0j9WD89ZKIGAd 0r5la0X8lc87UTp/Mv1w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o7CBU-003gaF-Ak; Fri, 01 Jul 2022 08:39:28 +0000 Received: from perceval.ideasonboard.com ([213.167.242.64]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o7CBR-003gZb-6j for linux-rockchip@lists.infradead.org; Fri, 01 Jul 2022 08:39:26 +0000 Received: from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 8E13325C; Fri, 1 Jul 2022 10:39:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1656664759; bh=YosOc4bryU8HRWr5iT9lcVkOL+hL1YEuNGFAb6rfAbc=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=aDw60PZcphfv+InErsHxKwInNjycKnnr3nxUPk6Z9X9z058lxCHiUM9CGS74pxDuV 6sO4FTpOLFo7qPsq8cWPuvrzWvA2Ap8nl/OhVh9Q8NHzC+yv0KoeBUWc6uG4KHFmWU FRpOSOEFGryVMgXrD4I87dVd34WxiO9yYPfVQsgk= Date: Fri, 1 Jul 2022 11:38:58 +0300 From: Laurent Pinchart To: Dafna Hirschfeld Cc: Paul Elder , linux-media@vger.kernel.org, heiko@sntech.de, jeanmichel.hautbois@ideasonboard.com, jacopo@jmondi.org, djrscally@gmail.com, helen.koike@collabora.com, linux-rockchip@lists.infradead.org Subject: Re: [PATCH 53/55] media: rkisp1: Shift DMA buffer addresses on i.MX8MP Message-ID: References: <20220614191127.3420492-1-paul.elder@ideasonboard.com> <20220614191127.3420492-54-paul.elder@ideasonboard.com> <20220701055342.ryvwbfltt5eemysg@guri> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20220701055342.ryvwbfltt5eemysg@guri> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220701_013925_446049_24D4B212 X-CRM114-Status: GOOD ( 30.48 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Hi Dafna, On Fri, Jul 01, 2022 at 08:53:42AM +0300, Dafna Hirschfeld wrote: > On 26.06.2022 14:38, Laurent Pinchart wrote: > > On Wed, Jun 15, 2022 at 04:11:25AM +0900, Paul Elder wrote: > >> On the ISP that is integrated in the i.MX8MP, the DMA base addresses are > >> encoded in 34-bit. Shift them to the left by 2 bits so that they can be > > > > I think you meant right, not left. > > > >> contained in 32 bits. > > > > The important part here is that this is how the address is encoded in > > the hardware. I suppose it's obvious, otherwise it woudln't work at all, > > but maybe it could be explained more explicitly ? > > > > On the ISP that is integrated in the i.MX8MP, DMA addresses have been > > extended to 34 bits, with the 32 MSBs stored in the DMA address > > registers and the 2 LSBs set to 0. Shift the buffer addresses right by 2 > > on that platform. > > If the 32 MSB are all stored in the in the dma address then why do we > need to shift? On Rokchip SoCs the DMA address is 32-bit wide, and stored as-is in the registers. On i.MX8MP, the DMA address is 34-bit, and must be aligned to a multiple of 4 bytes, so the two LSBs are guaranteed to be 0. The DMA registers are still 32-bit wide, and store bits [33:2] of the DMA addresses, hence the shift. > >> Signed-off-by: Paul Elder > > > > Reviewed-by: Laurent Pinchart > > > >> --- > >> .../platform/rockchip/rkisp1/rkisp1-capture.c | 19 +++++++++++-------- > >> .../platform/rockchip/rkisp1/rkisp1-common.h | 1 + > >> .../platform/rockchip/rkisp1/rkisp1-dev.c | 3 ++- > >> 3 files changed, 14 insertions(+), 9 deletions(-) > >> > >> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c > >> index 35cec263c563..234b1f8488cb 100644 > >> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c > >> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c > >> @@ -624,6 +624,9 @@ static void rkisp1_dummy_buf_destroy(struct rkisp1_capture *cap) > >> > >> static void rkisp1_set_next_buf(struct rkisp1_capture *cap) > >> { > >> + u8 shift = cap->rkisp1->info->features & RKISP1_FEATURE_DMA_34BIT ? > >> + 2 : 0; > >> + > >> cap->buf.curr = cap->buf.next; > >> cap->buf.next = NULL; > >> > >> @@ -636,7 +639,7 @@ static void rkisp1_set_next_buf(struct rkisp1_capture *cap) > >> buff_addr = cap->buf.next->buff_addr; > >> > >> rkisp1_write(cap->rkisp1, cap->config->mi.y_base_ad_init, > >> - buff_addr[RKISP1_PLANE_Y]); > >> + buff_addr[RKISP1_PLANE_Y] >> shift); > >> /* > >> * In order to support grey format we capture > >> * YUV422 planar format from the camera and > >> @@ -645,17 +648,17 @@ static void rkisp1_set_next_buf(struct rkisp1_capture *cap) > >> if (cap->pix.cfg->fourcc == V4L2_PIX_FMT_GREY) { > >> rkisp1_write(cap->rkisp1, > >> cap->config->mi.cb_base_ad_init, > >> - cap->buf.dummy.dma_addr); > >> + cap->buf.dummy.dma_addr >> shift); > >> rkisp1_write(cap->rkisp1, > >> cap->config->mi.cr_base_ad_init, > >> - cap->buf.dummy.dma_addr); > >> + cap->buf.dummy.dma_addr >> shift); > >> } else { > >> rkisp1_write(cap->rkisp1, > >> cap->config->mi.cb_base_ad_init, > >> - buff_addr[RKISP1_PLANE_CB]); > >> + buff_addr[RKISP1_PLANE_CB] >> shift); > >> rkisp1_write(cap->rkisp1, > >> cap->config->mi.cr_base_ad_init, > >> - buff_addr[RKISP1_PLANE_CR]); > >> + buff_addr[RKISP1_PLANE_CR] >> shift); > >> } > >> } else { > >> /* > >> @@ -663,11 +666,11 @@ static void rkisp1_set_next_buf(struct rkisp1_capture *cap) > >> * throw data if there is no available buffer. > >> */ > >> rkisp1_write(cap->rkisp1, cap->config->mi.y_base_ad_init, > >> - cap->buf.dummy.dma_addr); > >> + cap->buf.dummy.dma_addr >> shift); > >> rkisp1_write(cap->rkisp1, cap->config->mi.cb_base_ad_init, > >> - cap->buf.dummy.dma_addr); > >> + cap->buf.dummy.dma_addr >> shift); > >> rkisp1_write(cap->rkisp1, cap->config->mi.cr_base_ad_init, > >> - cap->buf.dummy.dma_addr); > >> + cap->buf.dummy.dma_addr >> shift); > >> } > >> > >> /* Set plane offsets */ > >> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h > >> index 96657e55a5b0..0b834579d08c 100644 > >> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h > >> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h > >> @@ -113,6 +113,7 @@ enum rkisp1_feature { > >> RKISP1_FEATURE_DUAL_CROP = BIT(1), > >> RKISP1_FEATURE_RSZ_CROP = BIT(2), > >> RKISP1_FEATURE_MAIN_STRIDE = BIT(3), > >> + RKISP1_FEATURE_DMA_34BIT = BIT(4), > > doc this field Looks like only RKISP1_FEATURE_MIPI_CSI2 is documented. We'll fix that in v3. > >> }; > >> > >> /* > >> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c > >> index d68a805e8b6b..4c77aa2bc50a 100644 > >> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c > >> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c > >> @@ -506,7 +506,8 @@ static const struct rkisp1_info imx8mp_isp_info = { > >> .isr_size = ARRAY_SIZE(imx8mp_isp_isrs), > >> .isp_ver = IMX8MP_V10, > >> .features = RKISP1_FEATURE_RSZ_CROP > >> - | RKISP1_FEATURE_MAIN_STRIDE, > >> + | RKISP1_FEATURE_MAIN_STRIDE > >> + | RKISP1_FEATURE_DMA_34BIT, > >> }; > >> > >> static const struct of_device_id rkisp1_of_match[] = { -- Regards, Laurent Pinchart _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip