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 CDDD3C0219D for ; Sun, 9 Feb 2025 13:13:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6F72410E18D; Sun, 9 Feb 2025 13:13:41 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="VnwsrXCZ"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) by gabe.freedesktop.org (Postfix) with ESMTPS id 54C5110E18D for ; Sun, 9 Feb 2025 13:13:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1739106820; x=1770642820; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=qzNRGAkQYf/AxGvM1MjxYQudYrtB+u/wIposON9vNCM=; b=VnwsrXCZv+zfrL/ddbYu3J0MOlcYzB5DCq1+DR7Ymv27IgwcCWm+Cu4f 27ANnqi2qBbkrpkePHvUNDi/VP2MkHVH+uU2K3joSRcojax7Z8aJMSe70 T8+15Gm12pF9FExG3EQ8ej8KtcWVlgoHgwbnVpTtXcicc3yc/d3/mXNlC pu46DMJ3UZvulMsZYyJyFRV0obfJXGtYCeNfYBJAVWp09RCc5PIzipT4R 0/S0KWET9xgCK+lgzqmw71j+adCz82O0rMNk7VyyJxCa7h6rHwXo2GYAj AIQ2mb+EHSya/PqKccI2c8oHuoxhkHFaVD0f5SV4ekeYc8qzHWcvWW6UK A==; X-CSE-ConnectionGUID: +R0bjLfQRF6NoDXZV4wA+g== X-CSE-MsgGUID: z5WihG49RMWNcmJgPOgwEQ== X-IronPort-AV: E=McAfee;i="6700,10204,11340"; a="57113667" X-IronPort-AV: E=Sophos;i="6.13,272,1732608000"; d="scan'208";a="57113667" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Feb 2025 05:13:39 -0800 X-CSE-ConnectionGUID: sUOxFP/CQ9OOckP4m9j9vw== X-CSE-MsgGUID: Y0qMq51sT06iZV8rja/v9w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,272,1732608000"; d="scan'208";a="111718604" Received: from ilevi-mobl.ger.corp.intel.com (HELO ilevi-mobl.intel.com) ([10.245.163.72]) by orviesa009-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Feb 2025 05:13:36 -0800 From: Ilia Levi To: intel-xe@lists.freedesktop.org Cc: ilia.levi@intel.com, michal.wajdeczko@intel.com, matthew.d.roper@intel.com, lucas.demarchi@intel.com, koby.elbaz@intel.com, yaron.avizrat@intel.com Subject: [PATCH v3 2/2] drm/xe: Add xe_mmio_init() initialization function Date: Sun, 9 Feb 2025 15:13:19 +0200 Message-Id: <20250209131319.3346-1-ilia.levi@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" Add a convenience function for minimal initialization of struct xe_mmio. This function also validates that the entirety of the provided mmio region is usable with struct xe_reg. v2: Modify commit message, add kernel doc, refactor assert (Michal) v3: Fix off-by-one bug, add clarifying macro (Michal) Signed-off-by: Ilia Levi --- drivers/gpu/drm/xe/regs/xe_reg_defs.h | 4 ++- drivers/gpu/drm/xe/xe_gt.c | 7 ++--- drivers/gpu/drm/xe/xe_mmio.c | 43 ++++++++++++++++++++------- drivers/gpu/drm/xe/xe_mmio.h | 2 ++ 4 files changed, 40 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/xe/regs/xe_reg_defs.h b/drivers/gpu/drm/xe/regs/xe_reg_defs.h index 89716172fbb8..26d00d825454 100644 --- a/drivers/gpu/drm/xe/regs/xe_reg_defs.h +++ b/drivers/gpu/drm/xe/regs/xe_reg_defs.h @@ -10,6 +10,8 @@ #include "compat-i915-headers/i915_reg_defs.h" +#define XE_REG_ADDR_WIDTH 22 + /** * struct xe_reg - Register definition * @@ -21,7 +23,7 @@ struct xe_reg { union { struct { /** @addr: address */ - u32 addr:22; + u32 addr:XE_REG_ADDR_WIDTH; /** * @masked: register is "masked", with upper 16bits used * to identify the bits that are updated on the lower diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c index 01a4a852b8f4..f10c1f5fbbe1 100644 --- a/drivers/gpu/drm/xe/xe_gt.c +++ b/drivers/gpu/drm/xe/xe_gt.c @@ -637,10 +637,9 @@ int xe_gt_init(struct xe_gt *gt) void xe_gt_mmio_init(struct xe_gt *gt) { struct xe_tile *tile = gt_to_tile(gt); + struct xe_device *xe = tile_to_xe(tile); - gt->mmio.regs = tile->mmio.regs; - gt->mmio.regs_size = tile->mmio.regs_size; - gt->mmio.tile = tile; + xe_mmio_init(>->mmio, tile, tile->mmio.regs, tile->mmio.regs_size); if (gt->info.type == XE_GT_TYPE_MEDIA) { gt->mmio.adj_offset = MEDIA_GT_GSI_OFFSET; @@ -650,7 +649,7 @@ void xe_gt_mmio_init(struct xe_gt *gt) gt->mmio.adj_limit = 0; } - if (IS_SRIOV_VF(gt_to_xe(gt))) + if (IS_SRIOV_VF(xe)) gt->mmio.sriov_vf_gt = gt; } diff --git a/drivers/gpu/drm/xe/xe_mmio.c b/drivers/gpu/drm/xe/xe_mmio.c index 3aed849a128b..ebbed4ba7ea6 100644 --- a/drivers/gpu/drm/xe/xe_mmio.c +++ b/drivers/gpu/drm/xe/xe_mmio.c @@ -55,7 +55,6 @@ static void tiles_fini(void *arg) static void mmio_multi_tile_setup(struct xe_device *xe, size_t tile_mmio_size) { struct xe_tile *tile; - void __iomem *regs; u8 id; /* @@ -94,13 +93,8 @@ static void mmio_multi_tile_setup(struct xe_device *xe, size_t tile_mmio_size) } } - regs = xe->mmio.regs; - for_each_tile(tile, xe, id) { - tile->mmio.regs_size = SZ_4M; - tile->mmio.regs = regs; - tile->mmio.tile = tile; - regs += tile_mmio_size; - } + for_each_remote_tile(tile, xe, id) + xe_mmio_init(&tile->mmio, tile, xe->mmio.regs + id * tile_mmio_size, SZ_4M); } int xe_mmio_probe_tiles(struct xe_device *xe) @@ -140,13 +134,40 @@ int xe_mmio_probe_early(struct xe_device *xe) } /* Setup first tile; other tiles (if present) will be setup later. */ - root_tile->mmio.regs_size = SZ_4M; - root_tile->mmio.regs = xe->mmio.regs; - root_tile->mmio.tile = root_tile; + xe_mmio_init(&root_tile->mmio, root_tile, xe->mmio.regs, SZ_4M); return devm_add_action_or_reset(xe->drm.dev, mmio_fini, xe); } +/** + * XE_MMIO_SIZE_MAX - The maximum supported size for an MMIO instance + * + * This size is limited by the number of bits dedicated to the address field in + * struct xe_reg. For example, with 22 bits, the address can be up to (but not + * including) 4 MiB (2^22 bytes). In such a case, the xe_mmio read/write + * operations are not possible past those 4 MiB; therefore, it makes no sense + * for the MMIO region to be larger than 4 MiB. + */ +#define XE_MMIO_SIZE_MAX BIT(XE_REG_ADDR_WIDTH) + +/** + * xe_mmio_init() - Initialize an MMIO instance + * @mmio: Pointer to the MMIO instance to initialize + * @tile: The tile to which the MMIO region belongs + * @ptr: Pointer to the start of the MMIO region + * @size: The size of the MMIO region in bytes + * + * This is a convenience function for minimal initialization of struct xe_mmio. + */ +void xe_mmio_init(struct xe_mmio *mmio, struct xe_tile *tile, void __iomem *ptr, u32 size) +{ + xe_tile_assert(tile, size <= XE_MMIO_SIZE_MAX); + + mmio->regs = ptr; + mmio->regs_size = size; + mmio->tile = tile; +} + static void mmio_flush_pending_writes(struct xe_mmio *mmio) { #define DUMMY_REG_OFFSET 0x130030 diff --git a/drivers/gpu/drm/xe/xe_mmio.h b/drivers/gpu/drm/xe/xe_mmio.h index b32e7ee4b23e..c151ba569003 100644 --- a/drivers/gpu/drm/xe/xe_mmio.h +++ b/drivers/gpu/drm/xe/xe_mmio.h @@ -14,6 +14,8 @@ struct xe_reg; int xe_mmio_probe_early(struct xe_device *xe); int xe_mmio_probe_tiles(struct xe_device *xe); +void xe_mmio_init(struct xe_mmio *mmio, struct xe_tile *tile, void __iomem *ptr, u32 size); + u8 xe_mmio_read8(struct xe_mmio *mmio, struct xe_reg reg); u16 xe_mmio_read16(struct xe_mmio *mmio, struct xe_reg reg); void xe_mmio_write32(struct xe_mmio *mmio, struct xe_reg reg, u32 val); -- 2.43.2