From patchwork Wed Sep 20 09:19:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Usyskin, Alexander" X-Patchwork-Id: 142345 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp4032082vqi; Wed, 20 Sep 2023 03:37:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGFj+2MWZM+3BwOcwpDkRBApIIpmKLLmdQHGjg5LueUjxRgyA8uVMarBmSzcQGjDXqGr/nA X-Received: by 2002:a05:6a00:a1b:b0:690:bc3f:4ffa with SMTP id p27-20020a056a000a1b00b00690bc3f4ffamr2406122pfh.14.1695206256025; Wed, 20 Sep 2023 03:37:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695206256; cv=none; d=google.com; s=arc-20160816; b=k7BwTy14VdwNyuLro2otp5uZ+ulKMO4mYcGTgvyb0nqCwUiCz+hymGrkZrUALlZ9We 0WBGbnlVOgAW9nGJGNqlszSTUIqOXM1FvLsY5WQqjLHUgB9MLZCk/M9zv1zYYIQtMHrg RsJ19kba1sOJg0HPdDTYdEKK0Ab8UTgJhRTIhU2AxDv5F/+8TPmBUi0G8t/K6A1lScVq R2i8MvK7gcS1zPwt5mEMfZP5GrftcLysc9agCXTjdX8ZQ6ZBrMKj7yxGjfFUkHVZAbn4 0R4ZZ0f2ACxvtWLoRaRDvXBE/Wu1JVfIC2CNSQVA8GxPo5sQDclP+j7uvG+znsXMU6C+ PMIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Ptj05q6vg/lTz40TJXX94qDI/QVgwLhJ6x9jsEt6AxA=; fh=7xjKU1xkhmTazBlAQtMk+Chl7JSt/CUyagAgyiLWmTI=; b=hUB02rh3/yAGR8mIv1vsbKZlCdEEhQI/SrqRW62qRZcYBaWnaoHzPTLV//kdjpr+Eg 8ItZe03eY2IsIIN+VUrwZlwi7Jtuav4KibC0Cr5uIuJ2yIawletJlQ42Nyvnuq7bnBkD BN84/TK0VJZgqzgaJz2OBd0ew4VIvBy7Ht2Z5gIIXnQky/6hE+tWIuAL04KwwsfDpQgG tDtWtxwU+43OnomISV7ow0iAmhQCEy7kaDVhQc7sH3SeiV/SAe/sdIPNywr098Vv9xko ky/aMgec5BMTndPL12ygRv13XpjEE2haXp06LrF2W55Bi8JYnupDRnTaJ5ExefaXJ438 BEYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=DwNpYhgF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id y7-20020a636407000000b00573fb0d8728si370943pgb.98.2023.09.20.03.37.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Sep 2023 03:37:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=DwNpYhgF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 4CAA4806B06C; Wed, 20 Sep 2023 02:25:18 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234102AbjITJZA (ORCPT + 26 others); Wed, 20 Sep 2023 05:25:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55846 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234077AbjITJYu (ORCPT ); Wed, 20 Sep 2023 05:24:50 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3E15DCF7 for ; Wed, 20 Sep 2023 02:24:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1695201856; x=1726737856; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=PU/+VooEDTR8KIjZIhosROtp+J92FMcpEeYpHRPxDe4=; b=DwNpYhgF50WRx0TZ8btvBXtKw9NLFCqqrenpEzxMD5dSF9erzE0+CmCl 6PjKaIyQ/l2pNwy3+6+7a0ta0o128oS4CqRI4W5XBL91w2Sc/Y8BziLNO LBaMAJCPfUHH19vQu4RQVYcxbhWZ9aUlHhvcQa+Gw96Q2rJOhV137p1NP PVuI6i/i7OX3t3P8AvdRT47P7P+upIdXbhZvHe4LS4xBxUTP3pfYbxUUZ zOPZvgWSyhRPQ4XaYtERgg+7AxqTSb6lBjgLfXLswCChJctDXlDhbAE9z XRG4gAlCoTFfuAnu1CBAWY6iivN7qsRX/LfcA4ZKQuAQh67w0gG9Bj/m2 w==; X-IronPort-AV: E=McAfee;i="6600,9927,10838"; a="444267605" X-IronPort-AV: E=Sophos;i="6.02,161,1688454000"; d="scan'208";a="444267605" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Sep 2023 02:23:49 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10838"; a="781625280" X-IronPort-AV: E=Sophos;i="6.02,161,1688454000"; d="scan'208";a="781625280" Received: from sannilnx-dsk.jer.intel.com ([10.12.231.107]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Sep 2023 02:23:46 -0700 From: Alexander Usyskin To: Greg Kroah-Hartman , Lucas De Marchi , Daniele Ceraolo Spurio , Rodrigo Vivi Cc: Tomas Winkler , Alexander Usyskin , Vitaly Lubart , intel-xe@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 2/4] drm/xe/gsc: add has_heci_gscfi indication to device Date: Wed, 20 Sep 2023 12:19:21 +0300 Message-Id: <20230920091923.1573873-3-alexander.usyskin@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230920091923.1573873-1-alexander.usyskin@intel.com> References: <20230920091923.1573873-1-alexander.usyskin@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Wed, 20 Sep 2023 02:25:18 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777552594901639129 X-GMAIL-MSGID: 1777552594901639129 From: Vitaly Lubart Mark support of MEI-GSC interaction per device. Add has_heci_gscfi indication to xe_device and xe_pci structures. Mark DG1 and DG2 devices as supported. Reviewed-by: Rodrigo Vivi Signed-off-by: Vitaly Lubart Signed-off-by: Alexander Usyskin --- drivers/gpu/drm/xe/xe_device_types.h | 3 +++ drivers/gpu/drm/xe/xe_pci.c | 9 +++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h index 750e1f0d3339..1d1fe53fc30d 100644 --- a/drivers/gpu/drm/xe/xe_device_types.h +++ b/drivers/gpu/drm/xe/xe_device_types.h @@ -32,6 +32,7 @@ struct xe_ggtt; #define GRAPHICS_VERx100(xe) ((xe)->info.graphics_verx100) #define MEDIA_VERx100(xe) ((xe)->info.media_verx100) #define IS_DGFX(xe) ((xe)->info.is_dgfx) +#define HAS_HECI_GSCFI(xe) ((xe)->info.has_heci_gscfi) #define XE_VRAM_FLAGS_NEED64K BIT(0) @@ -237,6 +238,8 @@ struct xe_device { u8 has_link_copy_engine:1; /** @enable_display: display enabled */ u8 enable_display:1; + /** @has_heci_gscfi: device has heci gscfi */ + u8 has_heci_gscfi:1; #if IS_ENABLED(CONFIG_DRM_XE_DISPLAY) const struct intel_display_device_info *display; diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c index dc233a1226bd..145eaa430d74 100644 --- a/drivers/gpu/drm/xe/xe_pci.c +++ b/drivers/gpu/drm/xe/xe_pci.c @@ -57,6 +57,7 @@ struct xe_device_desc { u8 require_force_probe:1; u8 is_dgfx:1; u8 has_display:1; + u8 has_heci_gscfi:1; u8 has_llc:1; }; @@ -265,6 +266,7 @@ static const struct xe_device_desc dg1_desc = { PLATFORM(XE_DG1), .has_display = true, .require_force_probe = true, + .has_heci_gscfi = 1, }; static const u16 dg2_g10_ids[] = { XE_DG2_G10_IDS(NOP), XE_ATS_M150_IDS(NOP), 0 }; @@ -274,6 +276,7 @@ static const u16 dg2_g12_ids[] = { XE_DG2_G12_IDS(NOP), 0 }; #define DG2_FEATURES \ DGFX_FEATURES, \ PLATFORM(XE_DG2), \ + .has_heci_gscfi = 1, \ .subplatforms = (const struct xe_subplatform_desc[]) { \ { XE_SUBPLATFORM_DG2_G10, "G10", dg2_g10_ids }, \ { XE_SUBPLATFORM_DG2_G11, "G11", dg2_g11_ids }, \ @@ -562,6 +565,7 @@ static int xe_info_init(struct xe_device *xe, return -ENODEV; xe->info.is_dgfx = desc->is_dgfx; + xe->info.has_heci_gscfi = desc->has_heci_gscfi; xe->info.graphics_name = graphics_desc->name; xe->info.media_name = media_desc ? media_desc->name : "none"; xe->info.has_llc = desc->has_llc; @@ -703,7 +707,7 @@ static int xe_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) xe_display_info_init(xe); - drm_dbg(&xe->drm, "%s %s %04x:%04x dgfx:%d gfx:%s (%d.%02d) media:%s (%d.%02d) display:%s dma_m_s:%d tc:%d", + drm_dbg(&xe->drm, "%s %s %04x:%04x dgfx:%d gfx:%s (%d.%02d) media:%s (%d.%02d) display:%s dma_m_s:%d tc:%d gscfi:%d", desc->platform_name, subplatform_desc ? subplatform_desc->name : "", xe->info.devid, xe->info.revid, @@ -715,7 +719,8 @@ static int xe_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) xe->info.media_verx100 / 100, xe->info.media_verx100 % 100, str_yes_no(xe->info.enable_display), - xe->info.dma_mask_size, xe->info.tile_count); + xe->info.dma_mask_size, xe->info.tile_count, + xe->info.has_heci_gscfi); drm_dbg(&xe->drm, "Stepping = (G:%s, M:%s, D:%s, B:%s)\n", xe_step_name(xe->info.step.graphics),