From patchwork Wed Jun 14 23:18:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 776034 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3wp2db3fX2z9s4s for ; Thu, 15 Jun 2017 09:19:15 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Kc8jhJL6"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752740AbdFNXTP (ORCPT ); Wed, 14 Jun 2017 19:19:15 -0400 Received: from mail-lf0-f68.google.com ([209.85.215.68]:36360 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752647AbdFNXTO (ORCPT ); Wed, 14 Jun 2017 19:19:14 -0400 Received: by mail-lf0-f68.google.com with SMTP id x81so1602666lfb.3 for ; Wed, 14 Jun 2017 16:19:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=eDoLFFScMtSBkGeHQm9WEjwB6n2PlBAaoGn53GTNJ/0=; b=Kc8jhJL69ZHj/NLgdpuvaPhCMswxcpwMmSiZ0SS+rJwjlJkh9VO5BFHdznkgfbonjv xV/kfgFo78j+iPIxDA9uMjyVFZFHb22G9oEwYD9v+xcXARbHUMRlV9TLb8iBHsibfUaL HQtJfgaxSG9cOiYqe75v3/FV3K0EgN3kRV0v9blFqfKvu8B+bGAut1iwx80nQMw1EwOG cRrQdeNBH5sYTPvWkyl4PHIMhhYHqwFnZiwe9LhF2yLGcv9QmPjqUTxy5ylW58KixqXY y6NbfcrHi75bKFwWQfViuG15OkJmDERfVmRldXpfebuTkqlGPFNt88zhBo8/7Rrc9udn PtzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=eDoLFFScMtSBkGeHQm9WEjwB6n2PlBAaoGn53GTNJ/0=; b=DsOgI79Q0Z1y0Mb3KjvUrxkHqqeGrY+CsvMB2tU6Jnb+bK4jpG/Mt9YGG11fyB3Ds4 2Bd7o+GO+7hOTdpOC/NfKNUO/jGz2+wsKO62XhxJwvUgoxx96jfPveYHhkTTBISqzuiO k75WsQvMG0Lt+BvoDj5j85vinA9fCbQhwt1J6Rh0WZ5hF1sq7UMxbXtJ0HvYOr06tTyS MsC/SIsr34/Im6cTZFXpAsEy44Ty39COgBDX28XcgsTbLLdmOM/dtT8xyZYAthZblZnA wzghikVIw3We32kFV/Bink5rPGlMfTGW8vxWoxSDX7l/6A2xG3Xl3mhR6HUq10v8/RBI PAGg== X-Gm-Message-State: AKS2vOzNDq8089wT67W6lytGHITgj86kSefPO6Cp15xYIRsGJytezrI4 KhuaR5vwT+sFarcOO24= X-Received: by 10.25.29.20 with SMTP id d20mr795709lfd.77.1497482352763; Wed, 14 Jun 2017 16:19:12 -0700 (PDT) Received: from localhost.localdomain (ppp109-252-91-7.pppoe.spdop.ru. [109.252.91.7]) by smtp.gmail.com with ESMTPSA id i24sm290165ljb.63.2017.06.14.16.19.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Jun 2017 16:19:12 -0700 (PDT) From: Dmitry Osipenko To: Thierry Reding , Mikko Perttunen , Erik Faye-Lund Cc: linux-tegra@vger.kernel.org, DRI Development Subject: [PATCH v3 16/20] gpu: host1x: Check waits in the firewall Date: Thu, 15 Jun 2017 02:18:39 +0300 Message-Id: <6f3c72dc6f12a0436b1587cb73cf82885df13385.1497480757.git.digetx@gmail.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: References: In-Reply-To: References: Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org Check waits in the firewall in a way it is done for relocations. Signed-off-by: Dmitry Osipenko Reviewed-by: Mikko Perttunen Reviewed-by: Erik Faye-Lund --- drivers/gpu/host1x/job.c | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/host1x/job.c b/drivers/gpu/host1x/job.c index ef746f7afb88..f32ae69a68c7 100644 --- a/drivers/gpu/host1x/job.c +++ b/drivers/gpu/host1x/job.c @@ -31,6 +31,8 @@ #include "job.h" #include "syncpt.h" +#define HOST1X_WAIT_SYNCPT_OFFSET 0x8 + struct host1x_job *host1x_job_alloc(struct host1x_channel *ch, u32 num_cmdbufs, u32 num_relocs, u32 num_waitchks) @@ -337,6 +339,17 @@ static bool check_reloc(struct host1x_reloc *reloc, struct host1x_bo *cmdbuf, return true; } +static bool check_wait(struct host1x_waitchk *wait, struct host1x_bo *cmdbuf, + unsigned int offset) +{ + offset *= sizeof(u32); + + if (wait->bo != cmdbuf || wait->offset != offset) + return false; + + return true; +} + struct host1x_firewall { struct host1x_job *job; struct device *dev; @@ -344,6 +357,9 @@ struct host1x_firewall { unsigned int num_relocs; struct host1x_reloc *reloc; + unsigned int num_waitchks; + struct host1x_waitchk *waitchk; + struct host1x_bo *cmdbuf; unsigned int offset; @@ -370,6 +386,20 @@ static int check_register(struct host1x_firewall *fw, unsigned long offset) fw->reloc++; } + if (offset == HOST1X_WAIT_SYNCPT_OFFSET) { + if (fw->class != HOST1X_CLASS_HOST1X) + return -EINVAL; + + if (!fw->num_waitchks) + return -EINVAL; + + if (!check_wait(fw->waitchk, fw->cmdbuf, fw->offset)) + return -EINVAL; + + fw->num_waitchks--; + fw->waitchk++; + } + return 0; } @@ -534,6 +564,8 @@ static inline int copy_gathers(struct host1x_job *job, struct device *dev) fw.dev = dev; fw.reloc = job->relocarray; fw.num_relocs = job->num_relocs; + fw.waitchk = job->waitchk; + fw.num_waitchks = job->num_waitchk; fw.class = job->class; for (i = 0; i < job->num_gathers; i++) { @@ -572,8 +604,8 @@ static inline int copy_gathers(struct host1x_job *job, struct device *dev) offset += g->words * sizeof(u32); } - /* No relocs should remain at this point */ - if (fw.num_relocs) + /* No relocs and waitchks should remain at this point */ + if (fw.num_relocs || fw.num_waitchks) return -EINVAL; return 0;