Re: [PATCH 17/22] gpu: host1x: Check waits in the firewall

Reviewed-by: Mikko Perttunen mperttunen@nvidia.com

On 05/23/2017 03:14 AM, Dmitry Osipenko wrote:

Check waits in the firewall in a way it is done for relocations.

Signed-off-by: Dmitry Osipenko digetx@gmail.com

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 65e12219405a..7bc7d0c64559 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)

@@ -339,6 +341,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;

@@ -346,6 +359,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;

@@ -372,6 +388,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; }

@@ -536,6 +566,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++) {

@@ -574,8 +606,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;