Received: by 10.223.185.116 with SMTP id b49csp5392470wrg; Wed, 7 Mar 2018 10:58:43 -0800 (PST) X-Google-Smtp-Source: AG47ELtjWv+ZGonhrPgDrEN7BrbzSvyYWroF1wpvKdw8K4phMN3IRNOvSOy8pYJ8qphs0bcq6mV0 X-Received: by 2002:a17:902:5609:: with SMTP id h9-v6mr21264715pli.302.1520449123633; Wed, 07 Mar 2018 10:58:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520449123; cv=none; d=google.com; s=arc-20160816; b=fnmhqESScCfJOd+BwF199o//D8hu2kiqzisqgrQUbPq80Pnyd/mUGA5LAZunkNChPr 7WUruBUL4h1ZpoUswt//vqQ03lu7HbVLUc8+qE3V0SFNvN/UkIs6tnUP7tik1B1epdVO paLUWmJB24wuU14fvDK1SEG/Jnl1FJN8fg6rqAexL7ntHNfDdRHf6NYwvU0KjRvU4yx7 Pq8M1BzpUonpOXTjVIC1p4rz2CkmH6u0LgRhhuB3hAyhqAFPFHtaNfGtpMtc1PspZg7M olYbJxaL3pte/oRei374FQo6EGafLJB3n6NylDr2xHQUTruZp0zK2xmpYpjeet6xtivA BEUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=mdYJEHbyeHB+QQ3BVoH9RfvZnkUBZOuzpNiCDzpHkkQ=; b=XqdbL25vc3exvPzwX9WB9HEhLV4fWfr9OGVqeV8F3yP5KfjC4EWnQXBDEJDcvlpCbN T9yNJRmGQeHiu3kqR1xzN8YS8IRHktFoxlWPrk3ST12R/svmeZ5AjFoJGE2H3IdBgU7D 4TrHBSmY5Wnxb2Xz2RVXuzt/gBmrRknFftB6P5I5r20YZnnIJG5W9tri9i4o0kDSpvhP WY72L9Fz/SBzz+ed2Yon/As5MpfE8xDZTgzOvJyqqjTp5J/3ykHFDYJhJmJP8gic6tHp IdLZe6BMpa+VoxImYZxRuvn5nB7Q2oi5YqSwyNUB27XoLNRmvnoA2ZX9gJHG2reLh5nk Qj1Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i189si11747927pgc.505.2018.03.07.10.58.29; Wed, 07 Mar 2018 10:58:43 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933890AbeCGS51 (ORCPT + 99 others); Wed, 7 Mar 2018 13:57:27 -0500 Received: from anholt.net ([50.246.234.109]:40230 "EHLO anholt.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933412AbeCGS5X (ORCPT ); Wed, 7 Mar 2018 13:57:23 -0500 Received: from localhost (localhost [127.0.0.1]) by anholt.net (Postfix) with ESMTP id CFDBD10A14DA; Wed, 7 Mar 2018 10:57:22 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at anholt.net Received: from anholt.net ([127.0.0.1]) by localhost (kingsolver.anholt.net [127.0.0.1]) (amavisd-new, port 10024) with LMTP id KCWr_2zVlkRb; Wed, 7 Mar 2018 10:57:21 -0800 (PST) Received: from eliezer.anholt.net (localhost [127.0.0.1]) by anholt.net (Postfix) with ESMTP id F2E5D10A14F4; Wed, 7 Mar 2018 10:57:17 -0800 (PST) Received: by eliezer.anholt.net (Postfix, from userid 1000) id 4BD8F2FE2D44; Wed, 7 Mar 2018 10:57:16 -0800 (PST) From: Eric Anholt To: Florian Fainelli , Mark Rutland , Rob Herring , devicetree@vger.kernel.org, Greg Kroah-Hartman , Phil Elwell Cc: linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Stefan Wahren , bcm-kernel-feedback-list@broadcom.com, Eric Anholt Subject: [PATCH v2 2/6] staging: vc04_services: Add comments describing g_cache_line_size. Date: Wed, 7 Mar 2018 10:57:12 -0800 Message-Id: <20180307185716.17449-2-eric@anholt.net> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180307185716.17449-1-eric@anholt.net> References: <20180307185716.17449-1-eric@anholt.net> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It's been tempting to replace this with (L1) cache_line_size(), but that's really not what the value is about. It's about coordinating the condition for the pagelist fragment behavior between the two sides. Signed-off-by: Eric Anholt --- v2: new patch to replace the cache_line_size() patch. .../staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c | 10 +++++++++- .../staging/vc04_services/interface/vchiq_arm/vchiq_pagelist.h | 1 - 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c index b59ef14890aa..3aeffa189f64 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c @@ -77,7 +77,11 @@ struct vchiq_pagelist_info { }; static void __iomem *g_regs; -static unsigned int g_cache_line_size = sizeof(CACHE_LINE_SIZE); +/* This value is the size of the L2 cache lines as understood by the + * VPU firmware, which determines the required alignment of the + * offsets/sizes in pagelists. + */ +static unsigned int g_cache_line_size = 32; static unsigned int g_fragments_size; static char *g_fragments_base; static char *g_free_fragments; @@ -117,6 +121,10 @@ int vchiq_platform_init(struct platform_device *pdev, VCHIQ_STATE_T *state) if (err < 0) return err; + /* Get the L2 cache-line-size as set by the VPU. If the + * property is missing, then the firmware assumes an older + * kernel using a 32-byte cache line size for compatibility. + */ err = of_property_read_u32(dev->of_node, "cache-line-size", &g_cache_line_size); diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_pagelist.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_pagelist.h index a6c5f7cc78f0..bec411061554 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_pagelist.h +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_pagelist.h @@ -34,7 +34,6 @@ #ifndef VCHIQ_PAGELIST_H #define VCHIQ_PAGELIST_H -#define CACHE_LINE_SIZE 32 #define PAGELIST_WRITE 0 #define PAGELIST_READ 1 #define PAGELIST_READ_WITH_FRAGMENTS 2 -- 2.16.2