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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 EF989C433EF for ; Wed, 20 Jul 2022 02:49:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 32EA210FEBC; Wed, 20 Jul 2022 02:49:50 +0000 (UTC) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id E479B10FA69 for ; Wed, 20 Jul 2022 02:49:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1658285388; x=1689821388; h=date:message-id:from:to:cc:subject:in-reply-to: references:mime-version; bh=HTrBFBi6s5ePxx4sMAgOSaMKQS1ZcX9mx9jQLEzEXAw=; b=YTTUT5DyjcvnhAtySElq9WBdXfpjwVeYjhH1CG/m818q6eirYzYutp5r GJEexu3jSc16dAADr+dsOi5gwHnP+pw4DWZj8ItseCHb0mDZHlMMdCl5B FFRYSnhMQR2m+sAZzRHz+QxKwAb+xWlj5NL/Bm9TRQ9LTV8TdmN3pr4kt wkklgsgGMH+Ku+3ruUuxoZNnoXioDOY7w4YpCSUkFZK5DBoMmdguHoMcv avhvEpzSbJypCp+fnFO5g8QpXIO3IUtRfkFD+54tXIsYdfk4iJ6vrK391 0o76rLCu5DByrS4hVDuwiGrYU++87Jrtyyxo1qDN1ne4f0Q7nOAXOP2pU A==; X-IronPort-AV: E=McAfee;i="6400,9594,10413"; a="286672974" X-IronPort-AV: E=Sophos;i="5.92,285,1650956400"; d="scan'208";a="286672974" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jul 2022 19:49:48 -0700 X-IronPort-AV: E=Sophos;i="5.92,285,1650956400"; d="scan'208";a="601809615" Received: from adixit-mobl.amr.corp.intel.com (HELO adixit-arch.intel.com) ([10.209.70.164]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jul 2022 19:49:48 -0700 Date: Tue, 19 Jul 2022 19:49:47 -0700 Message-ID: <87mtd4bir8.wl-ashutosh.dixit@intel.com> From: "Dixit, Ashutosh" To: Alan Previn In-Reply-To: <20220509210151.1843173-4-alan.previn.teres.alexis@intel.com> References: <20220509210151.1843173-1-alan.previn.teres.alexis@intel.com> <20220509210151.1843173-4-alan.previn.teres.alexis@intel.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?ISO-8859-4?Q?Goj=F2?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/28.1 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII Subject: Re: [Intel-gfx] [Intel-gfx 3/6] drm/i915/guc: Add a helper for log buffer size X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: intel-gfx@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Mon, 09 May 2022 14:01:48 -0700, Alan Previn wrote: > > Add a helper to get GuC log buffer size. > > Signed-off-by: Alan Previn > --- > drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 49 ++++++++++++---------- > 1 file changed, 27 insertions(+), 22 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c > index d902b40ded0e..f454d53a8bca 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c > @@ -15,6 +15,32 @@ > > static void guc_log_copy_debuglogs_for_relay(struct intel_guc_log *log); > > +static u32 intel_guc_log_size(struct intel_guc_log *log) > +{ > + /* > + * GuC Log buffer Layout: > + * > + * NB: Ordering must follow "enum guc_log_buffer_type". > + * > + * +===============================+ 00B > + * | Debug state header | > + * +-------------------------------+ 32B > + * | Crash dump state header | > + * +-------------------------------+ 64B > + * | Capture state header | > + * +-------------------------------+ 96B > + * | | > + * +===============================+ PAGE_SIZE (4KB) > + * | Debug logs | > + * +===============================+ + DEBUG_SIZE > + * | Crash Dump logs | > + * +===============================+ + CRASH_SIZE > + * | Capture logs | > + * +===============================+ + CAPTURE_SIZE > + */ > + return PAGE_SIZE + CRASH_BUFFER_SIZE + DEBUG_BUFFER_SIZE + CAPTURE_BUFFER_SIZE; > +} > + > /** > * DOC: GuC firmware log > * > @@ -464,32 +490,11 @@ int intel_guc_log_create(struct intel_guc_log *log) > > GEM_BUG_ON(log->vma); > > - /* > - * GuC Log buffer Layout > - * (this ordering must follow "enum guc_log_buffer_type" definition) > - * > - * +===============================+ 00B > - * | Debug state header | > - * +-------------------------------+ 32B > - * | Crash dump state header | > - * +-------------------------------+ 64B > - * | Capture state header | > - * +-------------------------------+ 96B > - * | | > - * +===============================+ PAGE_SIZE (4KB) > - * | Debug logs | > - * +===============================+ + DEBUG_SIZE > - * | Crash Dump logs | > - * +===============================+ + CRASH_SIZE > - * | Capture logs | > - * +===============================+ + CAPTURE_SIZE > - */ > if (intel_guc_capture_output_min_size_est(guc) > CAPTURE_BUFFER_SIZE) > DRM_WARN("GuC log buffer for state_capture maybe too small. %d < %d\n", > CAPTURE_BUFFER_SIZE, intel_guc_capture_output_min_size_est(guc)); > > - guc_log_size = PAGE_SIZE + CRASH_BUFFER_SIZE + DEBUG_BUFFER_SIZE + > - CAPTURE_BUFFER_SIZE; > + guc_log_size = intel_guc_log_size(log); > > vma = intel_guc_allocate_vma(guc, guc_log_size); > if (IS_ERR(vma)) { My nit-pick suggestions are: * Call the static function guc_log_size() (don't append intel_ prefix for static/internal functions) * Eliminate the guc_log_size variable and just do * vma = intel_guc_allocate_vma(guc, guc_log_size()); Otherwise this is: Reviewed-by: Ashutosh Dixit