From patchwork Thu Jan 19 13:38:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikko Perttunen X-Patchwork-Id: 45762 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp339811wrn; Thu, 19 Jan 2023 05:57:24 -0800 (PST) X-Google-Smtp-Source: AMrXdXti61mZcBl+Krvi+8xaOf/Cz2beUD+35mZGJd6kLzz+f3QvhPIc4cT9MhOWhoEfzNzlyH+R X-Received: by 2002:a05:6402:d63:b0:49e:9711:3178 with SMTP id ec35-20020a0564020d6300b0049e97113178mr308957edb.32.1674136644642; Thu, 19 Jan 2023 05:57:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674136644; cv=none; d=google.com; s=arc-20160816; b=nPE0x7MbSz0TczRZ4Wx7hxZ/93L4CnnejXjCSxGaV+SzBkhQt8T64yxeJHqokZCPHr 5uQPEK58yTtUy2fiJqXjTtApzgpcl+J7W5n9yzjBy2bWWrA8voSAEL3ODdw6apEat3hS Zu3HrXPT+C/cHQ2QOHfoAU3XhFxxmaROc3395rW0Yu8WO5xKvl/rdBCmOQNN3IG0h634 Vwdl5FAOaIpWlOEEJAB4Je2Otct92FtQ4lXl6XwvbA/hxy3Np/JI10QiCvGZzzhXFzVq WsdCw5J5ZrzwCDPJxwSsz3CE0F37rkCsil1HXki8BV0KDQL9XLoRKbAWO1gTHunusMot fRAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=wZnguLYFHx/nkdscInTbXfSlsq7FjSguDdlCNRKnzBw=; b=Au9ySNB7d4jI8anbGQTo3dTSC+vE6xx6v682jTwiewKGPlCkiCpoPFltzNvrVBIqC7 fXVc+7p0CzDgKGLtJ9aJ/QfDxWNSsijs9naLvPl6arpppuxRaIhUHMzKSCkl3vDQTKGk VZaIeEF1nIt5x7l//O9U0aN0H43g3rM6KFkqV0PzG5lzFkmG0sNZLizxvvj6NMKM50Qt Lqa3xnb511tuRWR2HrL1lBk7r2dTLI0nCsWRQFkM1VO8HBxjwfJj1qutOBUGnn5vrIki u80WdUX+GyuSQpkAPW5OnWjAbLW/t8ItElax29u2EY5r4YmPhBcRd0eV1/N4fd73swKN AAJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@kapsi.fi header.s=20161220 header.b=XicZjbPh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kapsi.fi Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d8-20020a50cd48000000b0048e64784ec8si25628497edj.72.2023.01.19.05.57.00; Thu, 19 Jan 2023 05:57:24 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail header.i=@kapsi.fi header.s=20161220 header.b=XicZjbPh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kapsi.fi Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231295AbjASNjN (ORCPT + 99 others); Thu, 19 Jan 2023 08:39:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45248 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229787AbjASNjM (ORCPT ); Thu, 19 Jan 2023 08:39:12 -0500 Received: from mail.kapsi.fi (mail.kapsi.fi [IPv6:2001:67c:1be8::25]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5C36148A3A; Thu, 19 Jan 2023 05:39:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=kapsi.fi; s=20161220; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject: Cc:To:From:Sender:Reply-To:Content-Type:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=wZnguLYFHx/nkdscInTbXfSlsq7FjSguDdlCNRKnzBw=; b=XicZjbPhRQCftEw6C0ulux3+3Q /7XEYhsGvVsTGkhvq8KI+QJiiiTtFOfLCqIsTw0z1LMfudM+KZkBrw4iX2PHXOnvSBE46SM1lDmqO X8wzj2XCbiBM+3J3wUbXun/RqGwx88cW7X9nzse1wYa5RMwB6XcTJ2OTQeDF6xNwbcYozB6s6dFvK 221GgG6W+UxloSROcn/RTISqqsRwO/BhPMX/nOMR1UdLWe2w1bsk7XVcLJ7Z5+RwY23GnywXF/IqL b2hDLYHuHZp3ziuh3TRsJMcnowUTDFmz1ATTL/qZq6zgSh3pZL1rfWl8Fgijf4DizxXcRbUoE0fOn 2qkzdqcQ==; Received: from 91-158-25-70.elisa-laajakaista.fi ([91.158.25.70] helo=toshino.localdomain) by mail.kapsi.fi with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1pIV8G-0016bd-DX; Thu, 19 Jan 2023 15:39:08 +0200 From: Mikko Perttunen To: Thierry Reding , Jonathan Hunter Cc: Mikko Perttunen , linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH 1/4] arm64: tegra: Mark host1x as dma-coherent on Tegra194/234 Date: Thu, 19 Jan 2023 15:38:58 +0200 Message-Id: <20230119133901.1892413-1-cyndis@kapsi.fi> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 X-SA-Exim-Connect-IP: 91.158.25.70 X-SA-Exim-Mail-From: cyndis@kapsi.fi X-SA-Exim-Scanned: No (on mail.kapsi.fi); SAEximRunCond expanded to false X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755459506740166989?= X-GMAIL-MSGID: =?utf-8?q?1755459506740166989?= From: Mikko Perttunen Ensure appropriate configuration is done to make the host1x device and context devices DMA coherent by adding the dma-coherent flag. Fixes: b35f5b53a87b ("arm64: tegra: Add context isolation domains on Tegra234") Signed-off-by: Mikko Perttunen --- arch/arm64/boot/dts/nvidia/tegra194.dtsi | 1 + arch/arm64/boot/dts/nvidia/tegra234.dtsi | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm64/boot/dts/nvidia/tegra194.dtsi b/arch/arm64/boot/dts/nvidia/tegra194.dtsi index 4afcbd60e144..d8169920b33b 100644 --- a/arch/arm64/boot/dts/nvidia/tegra194.dtsi +++ b/arch/arm64/boot/dts/nvidia/tegra194.dtsi @@ -1918,6 +1918,7 @@ host1x@13e00000 { interconnects = <&mc TEGRA194_MEMORY_CLIENT_HOST1XDMAR &emc>; interconnect-names = "dma-mem"; iommus = <&smmu TEGRA194_SID_HOST1X>; + dma-coherent; /* Context isolation domains */ iommu-map = <0 &smmu TEGRA194_SID_HOST1X_CTX0 1>, diff --git a/arch/arm64/boot/dts/nvidia/tegra234.dtsi b/arch/arm64/boot/dts/nvidia/tegra234.dtsi index eaf05ee9acd1..77ceed615b7f 100644 --- a/arch/arm64/boot/dts/nvidia/tegra234.dtsi +++ b/arch/arm64/boot/dts/nvidia/tegra234.dtsi @@ -571,6 +571,7 @@ host1x@13e00000 { interconnects = <&mc TEGRA234_MEMORY_CLIENT_HOST1XDMAR &emc>; interconnect-names = "dma-mem"; iommus = <&smmu_niso1 TEGRA234_SID_HOST1X>; + dma-coherent; /* Context isolation domains */ iommu-map = <0 &smmu_niso0 TEGRA234_SID_HOST1X_CTX0 1>, From patchwork Thu Jan 19 13:38:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikko Perttunen X-Patchwork-Id: 45765 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp340699wrn; Thu, 19 Jan 2023 05:59:39 -0800 (PST) X-Google-Smtp-Source: AMrXdXs68cF3ilotMyjrEj2IIGle4hv+5QAM+yGo4dM7j/cy3elVR8MJQIdDpxqja+w0RaAIAKcP X-Received: by 2002:a17:906:b317:b0:84e:d302:1551 with SMTP id n23-20020a170906b31700b0084ed3021551mr11400434ejz.37.1674136779272; Thu, 19 Jan 2023 05:59:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674136779; cv=none; d=google.com; s=arc-20160816; b=ViWHu3d0xVVm/oqlbYtn0kvqjq9mx6FIViBLbBHRdxzMX1NjtVZNT/x3pqoUhjiusN EwUeNt1/rLzc/vMZjMuwh/IkDrgMdYY/LKysn9GF2uko3R/YUtzglmf4ELdaWx1lYxl0 Jw+Cldhx3q3JUNVFEEV6rnq6P80WViqCSlRRga5qVodldyvi5TmRsvdSKp6NodwVMhEX e1qOzJjUlskGTcSvZYSkfbW+Xl9ujFSQdGR+X90wmZXbZQyIJK1xUkQbiSOK7WEXOHYF VJIk/c0VSjqnZw1U+bd7uqOlGaGsq87H4azQs1vDaK+H4IURjlbXcPw5zyWCFDLQ2iCR jKiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Jivjnyq0RsdNk+dfRSFWoVxnKfMC/ohHGj4x1noVlTU=; b=ZML/otQZ8lwkdW5ZFJ83Vd7kt+nkL+mtOo+E+ZIPFXcPyfZFMHgrJfh++smW2+3Wxc HEmFfvTl3tdSdLnDcbtqycQu2YCSbMxhrrV7VhSOqrb+6v/h1vFxDBPhMGdkkykY0hQ4 UElcijBuPSmYi5qMTuurgxQZbeND/lHt2OvUwHo/t6TPsw9ERbmj3dy9/n7aVKVvoX0l pvjqVcS3TYmaKfVBdbw5k4jWJPj/YdFNBW8k8+oNV97k6e4pvz3QxzE75tagjONx5MJJ Ln2pLLxRKniT4Ps+KibdFxSEMHX+KZGj4pzn6GxAhaj02Tyd2fkvHUAaNm3gzKT6gg9O K4rQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@kapsi.fi header.s=20161220 header.b=do5zi8kP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kapsi.fi Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id oz13-20020a1709077d8d00b008702a59fe03si15766133ejc.548.2023.01.19.05.59.15; Thu, 19 Jan 2023 05:59:39 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail header.i=@kapsi.fi header.s=20161220 header.b=do5zi8kP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kapsi.fi Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231312AbjASNjP (ORCPT + 99 others); Thu, 19 Jan 2023 08:39:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45252 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229862AbjASNjM (ORCPT ); Thu, 19 Jan 2023 08:39:12 -0500 Received: from mail.kapsi.fi (mail.kapsi.fi [IPv6:2001:67c:1be8::25]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 866454A235; Thu, 19 Jan 2023 05:39:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=kapsi.fi; s=20161220; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=Jivjnyq0RsdNk+dfRSFWoVxnKfMC/ohHGj4x1noVlTU=; b=do5zi8kPg3+yz9iO2RNEZC5DRy q/6ZMZUVkRDm4OHyhEj/qGq7TUlFMxFb0ksOE03w24Sp3iOm/t1a6FEm3gjjoiGOSHT/nQKVnuHVQ 9C7Urg+WgbY1OBj9I33b1ynOFCujBEYj2eMN4cIne5DASGeLbMZWOiAiR5p7in5/zFvnbIWVfKi1d 24FSl0KB0iY807oWSpswDjsRlNa3aNyoG1gbkT/qVjUWpJ3PcSipFL2iuFdwe12V7zfhLvAUhS3Kv 1Y3Xp2DaDoPI2amiicXH4Jt121wEuPY1nQaAWNhbAFWAjqbdGexrPfcqgxE62cAOp9jTF0vj4G02o us5N0HWg==; Received: from 91-158-25-70.elisa-laajakaista.fi ([91.158.25.70] helo=toshino.localdomain) by mail.kapsi.fi with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1pIV8G-0016bd-MF; Thu, 19 Jan 2023 15:39:08 +0200 From: Mikko Perttunen To: Thierry Reding , Jonathan Hunter Cc: Mikko Perttunen , linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH 2/4] gpu: host1x: Fix mask for syncpoint increment register Date: Thu, 19 Jan 2023 15:38:59 +0200 Message-Id: <20230119133901.1892413-2-cyndis@kapsi.fi> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230119133901.1892413-1-cyndis@kapsi.fi> References: <20230119133901.1892413-1-cyndis@kapsi.fi> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 91.158.25.70 X-SA-Exim-Mail-From: cyndis@kapsi.fi X-SA-Exim-Scanned: No (on mail.kapsi.fi); SAEximRunCond expanded to false X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755459647208571249?= X-GMAIL-MSGID: =?utf-8?q?1755459647208571249?= From: Mikko Perttunen On Tegra186+, the syncpoint ID has 10 bits of space. To allow using more than 256 syncpoints, fix the mask. Fixes: 9abdd497cd0a ("gpu: host1x: Tegra234 device data and headers") Signed-off-by: Mikko Perttunen --- drivers/gpu/host1x/hw/hw_host1x06_uclass.h | 2 +- drivers/gpu/host1x/hw/hw_host1x07_uclass.h | 2 +- drivers/gpu/host1x/hw/hw_host1x08_uclass.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/host1x/hw/hw_host1x06_uclass.h b/drivers/gpu/host1x/hw/hw_host1x06_uclass.h index 5f831438d19b..50c32de452fb 100644 --- a/drivers/gpu/host1x/hw/hw_host1x06_uclass.h +++ b/drivers/gpu/host1x/hw/hw_host1x06_uclass.h @@ -53,7 +53,7 @@ static inline u32 host1x_uclass_incr_syncpt_cond_f(u32 v) host1x_uclass_incr_syncpt_cond_f(v) static inline u32 host1x_uclass_incr_syncpt_indx_f(u32 v) { - return (v & 0xff) << 0; + return (v & 0x3ff) << 0; } #define HOST1X_UCLASS_INCR_SYNCPT_INDX_F(v) \ host1x_uclass_incr_syncpt_indx_f(v) diff --git a/drivers/gpu/host1x/hw/hw_host1x07_uclass.h b/drivers/gpu/host1x/hw/hw_host1x07_uclass.h index 8cd2ef087d5d..887b878f92f7 100644 --- a/drivers/gpu/host1x/hw/hw_host1x07_uclass.h +++ b/drivers/gpu/host1x/hw/hw_host1x07_uclass.h @@ -53,7 +53,7 @@ static inline u32 host1x_uclass_incr_syncpt_cond_f(u32 v) host1x_uclass_incr_syncpt_cond_f(v) static inline u32 host1x_uclass_incr_syncpt_indx_f(u32 v) { - return (v & 0xff) << 0; + return (v & 0x3ff) << 0; } #define HOST1X_UCLASS_INCR_SYNCPT_INDX_F(v) \ host1x_uclass_incr_syncpt_indx_f(v) diff --git a/drivers/gpu/host1x/hw/hw_host1x08_uclass.h b/drivers/gpu/host1x/hw/hw_host1x08_uclass.h index 724cccd71aa1..4fb1d090edae 100644 --- a/drivers/gpu/host1x/hw/hw_host1x08_uclass.h +++ b/drivers/gpu/host1x/hw/hw_host1x08_uclass.h @@ -53,7 +53,7 @@ static inline u32 host1x_uclass_incr_syncpt_cond_f(u32 v) host1x_uclass_incr_syncpt_cond_f(v) static inline u32 host1x_uclass_incr_syncpt_indx_f(u32 v) { - return (v & 0xff) << 0; + return (v & 0x3ff) << 0; } #define HOST1X_UCLASS_INCR_SYNCPT_INDX_F(v) \ host1x_uclass_incr_syncpt_indx_f(v) From patchwork Thu Jan 19 13:39:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikko Perttunen X-Patchwork-Id: 45764 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp340030wrn; Thu, 19 Jan 2023 05:58:01 -0800 (PST) X-Google-Smtp-Source: AMrXdXufl5KSWmdSg5wD7gwwOKlkH7IZqj/o3LKCCYZvXAAx0271fycXeDkY96ci4JtoihqGetcF X-Received: by 2002:a05:6402:1008:b0:47a:e008:8662 with SMTP id c8-20020a056402100800b0047ae0088662mr10643494edu.34.1674136681689; Thu, 19 Jan 2023 05:58:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674136681; cv=none; d=google.com; s=arc-20160816; b=mFgV7CLwuqA7mLPQJ36dRCTSET//JIBu3yCuAiDV3W80Nd1n5wBXK6YoGYwfaBnpjh h4tDNf4LfJzg/AFZzjauAqY+Cwq1js0Nt89Dp91iO81ILuBadFyp0PCrrxrYh65GRagy udy0Op3CsBdEd3R7SrtuJTzNkjB1YgFKbg5KSybIZRldLhu+G5NwNSYJyFpuYlzpsWaO tm2urusQGk4T+ylGWRC0msnRsQmdP/LPGZEXqikFlUJyPvmyaJj1Bh/433sONNTjooBf Fd7JwXIqWi69aQ1KN2eReWzE0gvZr/jmMSTCoqHsfPDwaODyL2FSTnl1cabiB6EJip21 brKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=pSBlzVNRHQd7wtZ4sR6t5nQ9V/Kgda0MekRZ/Y74+PQ=; b=vYDou2S1VmJ76YD13liybAlSA1g4Zt+/d+2cVnlUM9MDj35nWJXN2XzYxI412959Jk oIHvUbVNQ7azJY96R4Hs+eP02fJ0i62m3Jm2DGqbRNrWrRaAU3OFMKe7EjxqB1NBCjos ZS2uqkICSN50RkgKJWCLLPbYEA9e+n0xFcEMCFxV2h+8RRykZt7PxkywLfGsMruWpGWJ fJDrqj1LxKLp4NbzT1GRaarUNMjv3uQk1Uchd2f+Gsppm1Sk/5dKEP6GhbtXt3OvmHaw mEUfAEjfO3hv03Faccvpxl54PZcIvwpvL13B1Prc/2aa2ErUNj3lCI+cu+kAWn2Nuu0X NSHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@kapsi.fi header.s=20161220 header.b=QIkW7uyH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kapsi.fi Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f11-20020a056402068b00b0048bffdbb775si19353103edy.202.2023.01.19.05.57.37; Thu, 19 Jan 2023 05:58:01 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail header.i=@kapsi.fi header.s=20161220 header.b=QIkW7uyH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kapsi.fi Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231326AbjASNjU (ORCPT + 99 others); Thu, 19 Jan 2023 08:39:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45258 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230456AbjASNjM (ORCPT ); Thu, 19 Jan 2023 08:39:12 -0500 Received: from mail.kapsi.fi (mail.kapsi.fi [IPv6:2001:67c:1be8::25]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 86FE4521F9; Thu, 19 Jan 2023 05:39:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=kapsi.fi; s=20161220; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=pSBlzVNRHQd7wtZ4sR6t5nQ9V/Kgda0MekRZ/Y74+PQ=; b=QIkW7uyH6M5M7Ab9XQOeyLMYBd uTEDj9wQugKmf8eb6NMkCNjkY0SxwkQhsLlkboZ9YBml4gJE/GFdyyIk3rBkc+KT3SQjGVZPXP4L8 tGLFVRQu/ld48e02pZ38Ob0LRBtoiE5ZNYpiTo41cCGvyrxpwYzRo3FSDIbfeb5yjemf1vpN7beKT z421Jesqv4Ids0xc/golwxoFwjne/VHCaetIStClOovcDntHX1sA0p+tlQH+ZcdwwCCI0LUZbpo6i Avy9jj59IgJb0M1fhQ2ZOFfwfPQ/Gnb2eJhBr0Al66nzOQ75lGW1WKeK10nt9XPLdjrXkPmlwC2Rf rUxH/5CA==; Received: from 91-158-25-70.elisa-laajakaista.fi ([91.158.25.70] helo=toshino.localdomain) by mail.kapsi.fi with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1pIV8H-0016bd-0m; Thu, 19 Jan 2023 15:39:09 +0200 From: Mikko Perttunen To: Thierry Reding , Jonathan Hunter Cc: Mikko Perttunen , linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH 3/4] gpu: host1x: Don't skip assigning syncpoints to channels Date: Thu, 19 Jan 2023 15:39:00 +0200 Message-Id: <20230119133901.1892413-3-cyndis@kapsi.fi> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230119133901.1892413-1-cyndis@kapsi.fi> References: <20230119133901.1892413-1-cyndis@kapsi.fi> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 91.158.25.70 X-SA-Exim-Mail-From: cyndis@kapsi.fi X-SA-Exim-Scanned: No (on mail.kapsi.fi); SAEximRunCond expanded to false X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755459545021344301?= X-GMAIL-MSGID: =?utf-8?q?1755459545021344301?= From: Mikko Perttunen The code to write the syncpoint channel assignment register incorrectly skips the write if hypervisor registers are not available. The register, however, is within the guest aperture so remove the check and assign syncpoints properly even on virtualized systems. Fixes: c3f52220f276 ("gpu: host1x: Enable Tegra186 syncpoint protection") Signed-off-by: Mikko Perttunen --- drivers/gpu/host1x/hw/syncpt_hw.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/gpu/host1x/hw/syncpt_hw.c b/drivers/gpu/host1x/hw/syncpt_hw.c index dd39d67ccec3..8cf35b2eff3d 100644 --- a/drivers/gpu/host1x/hw/syncpt_hw.c +++ b/drivers/gpu/host1x/hw/syncpt_hw.c @@ -106,9 +106,6 @@ static void syncpt_assign_to_channel(struct host1x_syncpt *sp, #if HOST1X_HW >= 6 struct host1x *host = sp->host; - if (!host->hv_regs) - return; - host1x_sync_writel(host, HOST1X_SYNC_SYNCPT_CH_APP_CH(ch ? ch->id : 0xff), HOST1X_SYNC_SYNCPT_CH_APP(sp->id)); From patchwork Thu Jan 19 13:39:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikko Perttunen X-Patchwork-Id: 45763 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp339946wrn; Thu, 19 Jan 2023 05:57:47 -0800 (PST) X-Google-Smtp-Source: AMrXdXtkaQXMgruiV3R1D5RpxGcKXHg7Xr68YR8/m2QFiEYwNIzrwZTnwVa8z3dHxGoOPROYEmw4 X-Received: by 2002:a17:907:6745:b0:86c:f7ac:71f7 with SMTP id qm5-20020a170907674500b0086cf7ac71f7mr12131461ejc.8.1674136667731; Thu, 19 Jan 2023 05:57:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674136667; cv=none; d=google.com; s=arc-20160816; b=WcK5NCI4FptTFxpDKvO6SGwP+Sir6zsQBTpXjY+lqwzc6Yd1hDQQhV4A97BRxEZ4uP X2DQkC+qMOJ1l7SkBB/Q7DTE6blLXwlsyp7jKuYs7zYNwONROuWwSBpMLyNaz2/j4e7t jsL4bLkte8RZpG7kyljeivQORTFSCQfT69Ju6qLuFENrfsbZPcE5Pqle78YjmGeE6vak D123SI7ooYVay0RO1TmXhjDVOlpyQBCVUwLrTGk9VIo0MKQqnFRrbHKmFFkIYO+pC/ga j7j6C0azmpxsmC099yNW4Ge7NgjRtJ0LreKMD/DIXk63P3MNLE5V7H7hefypLXeRB/bX HSzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=cCRPUE11I9wW6gD+lY0+1Jt5X4C0ntbc38lYEy0+g/A=; b=AvnfQv5VC9q2mb2h01UPj8Ip9mHujtR0AdIgc4et737sjkuQ+uJOFkKcoNnnXHZhpR mIopDne2ckSHk2vYSbk5Ui2nLcWdMi/H3wY5VFP3yEgZBpgLVIlK6CyKzGZcEu5/yD1p McpIIPdFfTRoGOzR2TKKUUmwXUvy0WuAXq8/nZtn7VOWRzNeMgkOGsKi6pEtbsPwZ8No s5It56OVAsypSjB0L7mb2J8gw9LciqgrSv5zlIye1hQ3NZvpsmVCvBlVXAFnd1/SPTcf dstCXmLuRVJNN1F2PRG4NNddxJyfZQJCMXKhaBMga+JgfVR92qSw+60i+uj6I3+crqkU ePew== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@kapsi.fi header.s=20161220 header.b=15TLyCCW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kapsi.fi Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id nd32-20020a17090762a000b007c0a1b684f8si43116280ejc.695.2023.01.19.05.57.23; Thu, 19 Jan 2023 05:57:47 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail header.i=@kapsi.fi header.s=20161220 header.b=15TLyCCW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kapsi.fi Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231344AbjASNjW (ORCPT + 99 others); Thu, 19 Jan 2023 08:39:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45260 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231263AbjASNjN (ORCPT ); Thu, 19 Jan 2023 08:39:13 -0500 Received: from mail.kapsi.fi (mail.kapsi.fi [IPv6:2001:67c:1be8::25]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BDCE3568BB; Thu, 19 Jan 2023 05:39:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=kapsi.fi; s=20161220; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=cCRPUE11I9wW6gD+lY0+1Jt5X4C0ntbc38lYEy0+g/A=; b=15TLyCCWQtQEJR3z4yDIfqLMgP JaVqVFodu42tudZ8L/Ko/nuZTv2buHzhIjCjisR/vTpsphfa43AAays8wddolbEto9xofoW1/N+iG PbqWKI7Uxu4GAJczSEv5YZSeqRquA8SXEoAvmB8aY2Y5PypGk8hhuw/XdmFdZZHS+2xeyYBunZa2q 1YWbE18e5u9mJzpIluDXIF4MhUg59zuh6vAsH5kVEaXYsaJsPMIB4zfi62URrvPpHFEvttru2geWP zpZyCSxvVu7ZUgU9mPnPdfoVS8gRrcPqeVuigcU//zmTvr7uMaR2GkV79PAQugGbwGFj3IrYLoBW1 MUUhzclg==; Received: from 91-158-25-70.elisa-laajakaista.fi ([91.158.25.70] helo=toshino.localdomain) by mail.kapsi.fi with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1pIV8H-0016bd-AX; Thu, 19 Jan 2023 15:39:09 +0200 From: Mikko Perttunen To: Thierry Reding , Jonathan Hunter Cc: Mikko Perttunen , linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH 4/4] drm/tegra: firewall: Check for is_addr_reg existence in IMM check Date: Thu, 19 Jan 2023 15:39:01 +0200 Message-Id: <20230119133901.1892413-4-cyndis@kapsi.fi> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230119133901.1892413-1-cyndis@kapsi.fi> References: <20230119133901.1892413-1-cyndis@kapsi.fi> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 91.158.25.70 X-SA-Exim-Mail-From: cyndis@kapsi.fi X-SA-Exim-Scanned: No (on mail.kapsi.fi); SAEximRunCond expanded to false X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755459530424725529?= X-GMAIL-MSGID: =?utf-8?q?1755459530424725529?= From: Mikko Perttunen In the IMM opcode check, don't call is_addr_reg if it's not set. Fixes: 8cc95f3fd35e ("drm/tegra: Add job firewall") Signed-off-by: Mikko Perttunen --- drivers/gpu/drm/tegra/firewall.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/tegra/firewall.c b/drivers/gpu/drm/tegra/firewall.c index 1824d2db0e2c..d53f890fa689 100644 --- a/drivers/gpu/drm/tegra/firewall.c +++ b/drivers/gpu/drm/tegra/firewall.c @@ -97,6 +97,9 @@ static int fw_check_regs_imm(struct tegra_drm_firewall *fw, u32 offset) { bool is_addr; + if (!fw->client->ops->is_addr_reg) + return 0; + is_addr = fw->client->ops->is_addr_reg(fw->client->base.dev, fw->class, offset); if (is_addr)