From patchwork Thu Sep 14 08:01:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Usyskin, Alexander" X-Patchwork-Id: 139538 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp306346vqi; Thu, 14 Sep 2023 05:20:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHTX9pxdfjdGJg2Z2KJmKQ1aNm60uO2LjVK6QoVdO6S8MN3QfQ18NBo2A2q/06Alo4cTCz8 X-Received: by 2002:a05:6871:89e:b0:1bf:61d1:a4d4 with SMTP id r30-20020a056871089e00b001bf61d1a4d4mr6778120oaq.6.1694694043698; Thu, 14 Sep 2023 05:20:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694694043; cv=none; d=google.com; s=arc-20160816; b=jNN0gEzW2kFkHiXiWQWEnAzC2AZj9ftVVak9673EZ6b0TbiljIlzjy/xoImSO8qBFF lZcOTY7eSsHkRcCCOLISKPmcv8GozgZpccutPSZ9HIifmm5tKa6rr1x0IsB45BM5Z+CU noupExlzFhaDR+t1Pfe6nRyvP+An+37/cgqeCo/dR2WhVvhZ1lkxkwFoquBgbY5SnBbs EwVBLIskdqbFq3sCwC5hLWiExRoNadPhT+H6oulxTFJKAd/FnARKBHoXpKMIBAevl8TU nnXWPuGkWIeAgE+r4C1T+f+l+TSkL9XfrPMl6HLNB2/VuzrYhCB6wKtBbejGKLSXgW2u TSvw== 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=butueAIge6Ov8rwzgaD5r/52eeRZsCBsLLLn7+HfKtA=; fh=7xjKU1xkhmTazBlAQtMk+Chl7JSt/CUyagAgyiLWmTI=; b=b83reN9TeaATTONBtKNJ4nRWa28+qIhh8O/FScQJxRq92nrxMDNpC2NsHbcshBbTGr Pd9h0c7V7D5PRT2YskJz6leWgNC7GuxM3K8JOYjOip6Kea9LG0WJIjm2SzYsdYOE8iUs hZXzv3VseEzB8wdThBlFD+tdQ5VnuCdCQkueGeQHvpnUobYOm1MY8hT0y61LjQHMvoTV 3FN4ut9r0n4XEF6tcG2uKOkFwmd9bd/dfL6c8tCPW9kPeSBmmGVLbLRkdo/MKOnjsZ7E PlXgiVSMKVHpdUgxFSWlZQD2FvSVHXkXQqSoItm9nHiRCtkVJspOR3HolRhvZAIL7jQb XD+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=KNUk4K1W; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id z8-20020a633308000000b00574092cdfedsi1438563pgz.808.2023.09.14.05.20.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 05:20:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=KNUk4K1W; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (Postfix) with ESMTP id 40336802B05E; Thu, 14 Sep 2023 01:06:25 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236170AbjINIGM (ORCPT + 35 others); Thu, 14 Sep 2023 04:06:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34792 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232458AbjINIGK (ORCPT ); Thu, 14 Sep 2023 04:06:10 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C23959B for ; Thu, 14 Sep 2023 01:06:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1694678766; x=1726214766; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=OUuVgpvyi+bl7hSgliB32R/X66hb3hOtqm5qW0bf4Lw=; b=KNUk4K1WRynCO+4wCzKgR7OwghgSRAN4rMhrOSJpKMPLr2TYS3U6PjMr ma0Je+Q2mkYIE/DLzTOBeoHaGyHJ/zoRmwIUwGiyqCplseSlUTigN3f0S 0lWhzBdzFPkZJgL450LtaNW7IilXUZl++lPZCtdCXug2JGQRm2J3cCLoh 2F6ywbYQpaK5Si0BhKbRI8i+lXDEX4YrGjXMxafOBYTRveKjgACbWdrdC +GTACRwWp5tlz7Ox37FVcplak902aA5X8zhJAW+hCN6pi2ed0ZtwcIROz Xr93+jJLi+mv8Nf4i5gmtnnBv75qM0N61dugotHVWMgv7ghDdJUJA6k4k w==; X-IronPort-AV: E=McAfee;i="6600,9927,10832"; a="442917356" X-IronPort-AV: E=Sophos;i="6.02,145,1688454000"; d="scan'208";a="442917356" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Sep 2023 01:06:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10832"; a="887691603" X-IronPort-AV: E=Sophos;i="6.02,145,1688454000"; d="scan'208";a="887691603" Received: from sannilnx-dsk.jer.intel.com ([10.12.231.107]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Sep 2023 01:05:31 -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 v2 1/4] drm/xe/gsc: add HECI2 register offsets Date: Thu, 14 Sep 2023 11:01:35 +0300 Message-Id: <20230914080138.4178295-2-alexander.usyskin@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230914080138.4178295-1-alexander.usyskin@intel.com> References: <20230914080138.4178295-1-alexander.usyskin@intel.com> MIME-Version: 1.0 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 (snail.vger.email [0.0.0.0]); Thu, 14 Sep 2023 01:06:25 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777015501646938499 X-GMAIL-MSGID: 1777015501646938499 From: Vitaly Lubart Add HECI2 register offsets for DG1 and DG2 to regs/xe_regs.h Signed-off-by: Vitaly Lubart Signed-off-by: Alexander Usyskin Reviewed-by: Rodrigo Vivi --- drivers/gpu/drm/xe/regs/xe_regs.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/xe/regs/xe_regs.h b/drivers/gpu/drm/xe/regs/xe_regs.h index 39d7b0740bf0..4cbc3062cb9a 100644 --- a/drivers/gpu/drm/xe/regs/xe_regs.h +++ b/drivers/gpu/drm/xe/regs/xe_regs.h @@ -33,6 +33,10 @@ #define XEHPC_BCS6_RING_BASE 0x3ea000 #define XEHPC_BCS7_RING_BASE 0x3ec000 #define XEHPC_BCS8_RING_BASE 0x3ee000 + +#define DG1_GSC_HECI2_BASE 0x00259000 +#define DG2_GSC_HECI2_BASE 0x00374000 + #define GSCCS_RING_BASE 0x11a000 #define GT_WAIT_SEMAPHORE_INTERRUPT REG_BIT(11) #define GT_CONTEXT_SWITCH_INTERRUPT REG_BIT(8) From patchwork Thu Sep 14 08:01:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Usyskin, Alexander" X-Patchwork-Id: 139506 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp271360vqi; Thu, 14 Sep 2023 04:17:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFBd6UqQdMWjKhgcEQm0ckV6G/7tx7dikJVLy/QKsV0ky48RPZLmnHEH768BKLtS/6FNdLO X-Received: by 2002:a17:902:b40a:b0:1c3:90c7:b99d with SMTP id x10-20020a170902b40a00b001c390c7b99dmr4419792plr.41.1694690230107; Thu, 14 Sep 2023 04:17:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694690230; cv=none; d=google.com; s=arc-20160816; b=Dw5zLik391HjagZNR5O1W4tsVtfVU8+lUjEU2c3tFfaWHYcMxWm7kIby6ShPt/O3QV F2uiQhDJ7DtG5iFlt3QJjlWDVTaTlKRjK+03qmmAYuVtkNnvU40nmtIFwqqdvGVNTplA HxKt47irYMj0ouOIy2oF/upw3SCIR8H3hJT+skqlb0J01JUWr7M6pDgSfeTmHUYvetqh 005Cpjp84DppCMuulJrcCRaxxfJqlQlRAEWedMVoTpoj35J/hL4DPMnM9B0fERw5ZoTD wwg/pMl2oytnha1Gsg6+Y0IQZd0R7fT4le9SonIhOHL0v7H3ocl0tUtd6iSKW/OQG+BQ DrOQ== 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=itiU3ekJYfrXSaMRgP1YCjLH9FEZAVkonXvs17vosHU=; fh=7xjKU1xkhmTazBlAQtMk+Chl7JSt/CUyagAgyiLWmTI=; b=rBODGQVBvnUQ93/Ontqn3mOsncfJQ/M62aHCCCRLw08HrKThweHiJJ5N46JXuD3PKJ UBRiqw0efdX75b7aM568kQWFxSX1ugJzFlRIAGivx57X+W3Ra5kj3xgK2nG3vX4vDF97 vJ2cLcD9gf92OuxsBl9AWH/97sitXsOvosa3PNaXSp4S0nI5iWlys3JQ8Q/3d7ReTnDF RxMy4zlslPXp/gySrZuLG0w9IuUXRQ1eDCJUm5/76YGUcrsv8wotChjWICtH8svmhB4l HYndakomWkLtgFc/o3Y1Ou+AlicXcvWwFpl4AR14hkVhmFDhCWgIbrhaqJEO6H1TbKKg r/uA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ctaZmjNi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id e5-20020a17090301c500b001bbc7ed95efsi1581734plh.44.2023.09.14.04.17.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 04:17:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ctaZmjNi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (Postfix) with ESMTP id C3AAC8027334; Thu, 14 Sep 2023 01:06:27 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236194AbjINIGO (ORCPT + 35 others); Thu, 14 Sep 2023 04:06:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37036 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232458AbjINIGN (ORCPT ); Thu, 14 Sep 2023 04:06:13 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 360279B for ; Thu, 14 Sep 2023 01:06:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1694678769; x=1726214769; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=R3mUMh57IPCymCZSWHdrxZnFI+GFsQvz1Wt0tIiLQmQ=; b=ctaZmjNihcPmwvTwh41ReZfC8jpatPXsPFzWsfMJtjIC1F8fKR7fqCxA 20jtoTE3j/Zhx1mjzzKQ3O7c01r5F0azdkOCRJLzTcFt7l4Eao3hPqMRz 2Njjxb4Lod/6SJ544/Qc+QpOT4u6dFF7T1NNWP9nrDYJm+k6hOdBeKuEs fGPYg+CCK6FQQhKteYR2PIsK2vOFkRtiBwd+srvsU8soLD9DnJXaTRHP8 IY/3v7t/DHgap6B4UQow0m78S/V7yF8ucvxgejH4eJY8kGYYFeG3S3uUP +HPHpuQluDMHHIZkxCUkzuk7Xvix1zg/N7zRrTsRpYFfpp6T5WXZvIH7W w==; X-IronPort-AV: E=McAfee;i="6600,9927,10832"; a="442917372" X-IronPort-AV: E=Sophos;i="6.02,145,1688454000"; d="scan'208";a="442917372" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Sep 2023 01:06:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10832"; a="887691648" X-IronPort-AV: E=Sophos;i="6.02,145,1688454000"; d="scan'208";a="887691648" Received: from sannilnx-dsk.jer.intel.com ([10.12.231.107]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Sep 2023 01:05:34 -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 v2 2/4] drm/xe/gsc: add has_heci_gscfi indication to device Date: Thu, 14 Sep 2023 11:01:36 +0300 Message-Id: <20230914080138.4178295-3-alexander.usyskin@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230914080138.4178295-1-alexander.usyskin@intel.com> References: <20230914080138.4178295-1-alexander.usyskin@intel.com> MIME-Version: 1.0 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 (snail.vger.email [0.0.0.0]); Thu, 14 Sep 2023 01:06:27 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777011502454485819 X-GMAIL-MSGID: 1777011502454485819 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. Signed-off-by: Vitaly Lubart Signed-off-by: Alexander Usyskin Reviewed-by: Rodrigo Vivi --- 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), From patchwork Thu Sep 14 08:01:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Usyskin, Alexander" X-Patchwork-Id: 139470 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp229717vqi; Thu, 14 Sep 2023 02:51:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHZOF+XUeZo70nNateuQNgZSIagPzMR8FZOdES4KOE9E81y6ENKuPIkG8cr94St/iuT4pJM X-Received: by 2002:a17:902:7047:b0:1c0:9bef:4bbd with SMTP id h7-20020a170902704700b001c09bef4bbdmr4681160plt.14.1694685078464; Thu, 14 Sep 2023 02:51:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694685078; cv=none; d=google.com; s=arc-20160816; b=FaFqGxcp52MgT5bpELHMvT3gM8TD+1G4bNQ9vVhmme0Hvyf9bZQuthzC3PiARBT/pi m5gl7PfJvTzySnqBQViPN8O9Xh2mGF7oPD1LUVNHSzOSAc7jVuVoZK4aayzQOKqCEYHO FBr7I0cfrH+8cdVLkCkt72ZpZ+5/MxcG1bt5i8+a85Pr7VA3RB2PnUE7s8XGWYWj5XyF n6rDlosztTw9/4O2Q361wY3j/hn7D9uKqiciFxtiH6cQr9T7CxEIBH7vjLVbwdNajZUy 0x5mNshvhed4DMHcjzCDxXAWFokGnoUuK3s78n7QIs3+o93lBt4rT3ZfCD3tViDZRXsZ SNeQ== 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=R9CKz6dHAH66Yjees5YNwrM7fxFiByPQ8UfZgVFfu1c=; fh=7xjKU1xkhmTazBlAQtMk+Chl7JSt/CUyagAgyiLWmTI=; b=Q7R7hR1q4ZUmVa2pOikuvdqnDfrDV7a/6oP/KLSyKgySYnO+Zbnh6sg362fIiOdlGR eYqeNP3j9ByogxiE1gz7wqpaW51zVt3z2rlOV4v0TyAYIrU2d5VVd4W5rVQ2RMbwqWT4 IHTZY3p+pTXSIYxdcb2EipkGYKel+mua1t2rQvzBwVgU3UpIeECCEdRvie8dv5q/wLa0 P5yg3uUtzBWjOZWDKwfcCzsnhL/0setsAoQdlrVIwgNMFUCdH8GPU8ysbU2mFZssi+qV kw8oqBPPdacUxQHkaangbMYqB0Si89dBSLbKNu23l0Kbw69b/4wdc7iUwna2CfgJtKa7 3MvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=YifS1HLM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id w1-20020a170902e88100b001b973681493si1467624plg.16.2023.09.14.02.51.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 02:51:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=YifS1HLM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id 021C28028E67; Thu, 14 Sep 2023 01:06:28 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236216AbjINIG0 (ORCPT + 35 others); Thu, 14 Sep 2023 04:06:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37140 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236237AbjINIGQ (ORCPT ); Thu, 14 Sep 2023 04:06:16 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 19D571FC4 for ; Thu, 14 Sep 2023 01:06:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1694678772; x=1726214772; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=8ECxTmkTJrUKYowBzG4iCWRdaVRNBCun3uzgIB4rtu4=; b=YifS1HLMRoQVG3WbP9+1aw33MJRHrj0OMKEGnP8uYSIDQD12eydijIzh 3LfkG9QG2tuChOX7lIf1Y4FbB5a1ZI19bjRSFmKoELD3rCdEEVA4Bd6cb 1QrHn5gLHc4BfvGMTY9wniNoKR3RBSxwIN3n6uP+oCCHid3a260LPgukh ggbYbNJ+D/SkGxdAPkXxTuq863cqsF5cW57iWmS/vwZy8eaJ05wENSZUR FQOEzQwzZ/BOW4QW/UTHJjknW0La0AIrzBq+a1FcAhYJZej9CUaSENU7h Ol+2ClpYTOHYd98+JdQrQv+XetJncEocHczWPKGTBRqqiuCSzdsCwuRok w==; X-IronPort-AV: E=McAfee;i="6600,9927,10832"; a="442917383" X-IronPort-AV: E=Sophos;i="6.02,145,1688454000"; d="scan'208";a="442917383" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Sep 2023 01:06:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10832"; a="887691680" X-IronPort-AV: E=Sophos;i="6.02,145,1688454000"; d="scan'208";a="887691680" Received: from sannilnx-dsk.jer.intel.com ([10.12.231.107]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Sep 2023 01:05:37 -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 v2 3/4] drm/xe/gsc: add gsc device support Date: Thu, 14 Sep 2023 11:01:37 +0300 Message-Id: <20230914080138.4178295-4-alexander.usyskin@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230914080138.4178295-1-alexander.usyskin@intel.com> References: <20230914080138.4178295-1-alexander.usyskin@intel.com> MIME-Version: 1.0 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 (snail.vger.email [0.0.0.0]); Thu, 14 Sep 2023 01:06:29 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777006100616863226 X-GMAIL-MSGID: 1777006100616863226 From: Vitaly Lubart Create mei-gscfi auxiliary device and configure interrupts to be consumed by mei-gsc device driver. Signed-off-by: Vitaly Lubart Signed-off-by: Alexander Usyskin --- drivers/gpu/drm/xe/Kconfig | 1 + drivers/gpu/drm/xe/Makefile | 1 + drivers/gpu/drm/xe/xe_device.c | 4 + drivers/gpu/drm/xe/xe_device_types.h | 4 + drivers/gpu/drm/xe/xe_heci_gsc.c | 205 +++++++++++++++++++++++++++ drivers/gpu/drm/xe/xe_heci_gsc.h | 35 +++++ drivers/gpu/drm/xe/xe_irq.c | 14 +- 7 files changed, 262 insertions(+), 2 deletions(-) create mode 100644 drivers/gpu/drm/xe/xe_heci_gsc.c create mode 100644 drivers/gpu/drm/xe/xe_heci_gsc.h diff --git a/drivers/gpu/drm/xe/Kconfig b/drivers/gpu/drm/xe/Kconfig index 096bd066afa8..da82084fe236 100644 --- a/drivers/gpu/drm/xe/Kconfig +++ b/drivers/gpu/drm/xe/Kconfig @@ -37,6 +37,7 @@ config DRM_XE select DRM_SCHED select MMU_NOTIFIER select WANT_DEV_COREDUMP + select AUXILIARY_BUS help Experimental driver for Intel Xe series GPUs diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile index 9d2311f8141f..fbdb28fa5ace 100644 --- a/drivers/gpu/drm/xe/Makefile +++ b/drivers/gpu/drm/xe/Makefile @@ -73,6 +73,7 @@ xe-y += xe_bb.o \ xe_guc_log.o \ xe_guc_pc.o \ xe_guc_submit.o \ + xe_heci_gsc.o \ xe_hw_engine.o \ xe_hw_engine_class_sysfs.o \ xe_hw_fence.o \ diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c index d6fc06d4c9dc..4d6e2f2b281f 100644 --- a/drivers/gpu/drm/xe/xe_device.c +++ b/drivers/gpu/drm/xe/xe_device.c @@ -323,6 +323,8 @@ int xe_device_probe(struct xe_device *xe) goto err_irq_shutdown; } + xe_heci_gsc_init(xe); + err = xe_display_init(xe); if (err) goto err_irq_shutdown; @@ -365,6 +367,8 @@ void xe_device_remove(struct xe_device *xe) xe_display_fini(xe); + xe_heci_gsc_fini(xe); + xe_irq_shutdown(xe); } diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h index 1d1fe53fc30d..80233c2f0d81 100644 --- a/drivers/gpu/drm/xe/xe_device_types.h +++ b/drivers/gpu/drm/xe/xe_device_types.h @@ -13,6 +13,7 @@ #include #include "xe_devcoredump_types.h" +#include "xe_heci_gsc.h" #include "xe_gt_types.h" #include "xe_platform_types.h" #include "xe_step_types.h" @@ -364,6 +365,9 @@ struct xe_device { */ struct task_struct *pm_callback_task; + /** @gsc: graphics security controller */ + struct xe_heci_gsc heci_gsc; + /* private: */ #if IS_ENABLED(CONFIG_DRM_XE_DISPLAY) diff --git a/drivers/gpu/drm/xe/xe_heci_gsc.c b/drivers/gpu/drm/xe/xe_heci_gsc.c new file mode 100644 index 000000000000..1eca1c46f257 --- /dev/null +++ b/drivers/gpu/drm/xe/xe_heci_gsc.c @@ -0,0 +1,205 @@ +// SPDX-License-Identifier: MIT +/* + * Copyright(c) 2023, Intel Corporation. All rights reserved. + */ + +#include +#include +#include +#include + +#include "regs/xe_regs.h" +#include "xe_device_types.h" +#include "xe_drv.h" +#include "xe_heci_gsc.h" +#include "xe_platform_types.h" + +#define GSC_BAR_LENGTH 0x00000FFC + +static void heci_gsc_irq_mask(struct irq_data *d) +{ + /* generic irq handling */ +} + +static void heci_gsc_irq_unmask(struct irq_data *d) +{ + /* generic irq handling */ +} + +static struct irq_chip heci_gsc_irq_chip = { + .name = "gsc_irq_chip", + .irq_mask = heci_gsc_irq_mask, + .irq_unmask = heci_gsc_irq_unmask, +}; + +static int heci_gsc_irq_init(int irq) +{ + irq_set_chip_and_handler_name(irq, &heci_gsc_irq_chip, + handle_simple_irq, "heci_gsc_irq_handler"); + + return irq_set_chip_data(irq, NULL); +} + +/** + * struct heci_gsc_def - graphics security controller heci interface definitions + * + * @name: name of the heci device + * @bar: address of the mmio bar + * @bar_size: size of the mmio bar + * @use_polling: indication of using polling mode for the device + * @slow_firmware: indication of whether the device is slow (needs longer timeouts) + */ +struct heci_gsc_def { + const char *name; + unsigned long bar; + size_t bar_size; + bool use_polling; + bool slow_firmware; +}; + +/* gsc resources and definitions */ +static const struct heci_gsc_def heci_gsc_def_dg1 = { + .name = "mei-gscfi", + .bar = DG1_GSC_HECI2_BASE, + .bar_size = GSC_BAR_LENGTH, +}; + +static const struct heci_gsc_def heci_gsc_def_dg2 = { + .name = "mei-gscfi", + .bar = DG2_GSC_HECI2_BASE, + .bar_size = GSC_BAR_LENGTH, +}; + +static void heci_gsc_release_dev(struct device *dev) +{ + struct auxiliary_device *aux_dev = to_auxiliary_dev(dev); + struct mei_aux_device *adev = auxiliary_dev_to_mei_aux_dev(aux_dev); + + kfree(adev); +} + +void xe_heci_gsc_fini(struct xe_device *xe) +{ + struct xe_heci_gsc *heci_gsc = &xe->heci_gsc; + + if (!HAS_HECI_GSCFI(xe)) + return; + + if (heci_gsc->adev) { + struct auxiliary_device *aux_dev = &heci_gsc->adev->aux_dev; + + auxiliary_device_delete(aux_dev); + auxiliary_device_uninit(aux_dev); + heci_gsc->adev = NULL; + } + + if (heci_gsc->irq >= 0) + irq_free_desc(heci_gsc->irq); + heci_gsc->irq = -1; +} + +void xe_heci_gsc_init(struct xe_device *xe) +{ + struct xe_heci_gsc *heci_gsc = &xe->heci_gsc; + struct pci_dev *pdev = to_pci_dev(xe->drm.dev); + struct mei_aux_device *adev; + struct auxiliary_device *aux_dev; + const struct heci_gsc_def *def; + int ret; + + if (!HAS_HECI_GSCFI(xe)) + return; + + heci_gsc->irq = -1; + + if (xe->info.platform == XE_DG1) { + def = &heci_gsc_def_dg1; + } else if (xe->info.platform == XE_DG2) { + def = &heci_gsc_def_dg2; + } else { + drm_warn_once(&xe->drm, "Unknown platform\n"); + return; + } + + if (!def->name) { + drm_warn_once(&xe->drm, "HECI is not implemented!\n"); + return; + } + + /* skip irq initialization */ + if (def->use_polling) + goto add_device; + + heci_gsc->irq = irq_alloc_desc(0); + if (heci_gsc->irq < 0) { + drm_err(&xe->drm, "gsc irq error %d\n", heci_gsc->irq); + goto fail; + } + + ret = heci_gsc_irq_init(heci_gsc->irq); + if (ret < 0) { + drm_err(&xe->drm, "gsc irq init failed %d\n", ret); + goto fail; + } + +add_device: + adev = kzalloc(sizeof(*adev), GFP_KERNEL); + if (!adev) + goto fail; + adev->irq = heci_gsc->irq; + adev->bar.parent = &pdev->resource[0]; + adev->bar.start = def->bar + pdev->resource[0].start; + adev->bar.end = adev->bar.start + def->bar_size - 1; + adev->bar.flags = IORESOURCE_MEM; + adev->bar.desc = IORES_DESC_NONE; + adev->slow_firmware = def->slow_firmware; + + aux_dev = &adev->aux_dev; + aux_dev->name = def->name; + aux_dev->id = (pci_domain_nr(pdev->bus) << 16) | + PCI_DEVID(pdev->bus->number, pdev->devfn); + aux_dev->dev.parent = &pdev->dev; + aux_dev->dev.release = heci_gsc_release_dev; + + ret = auxiliary_device_init(aux_dev); + if (ret < 0) { + drm_err(&xe->drm, "gsc aux init failed %d\n", ret); + kfree(adev); + goto fail; + } + + heci_gsc->adev = adev; /* needed by the notifier */ + ret = auxiliary_device_add(aux_dev); + if (ret < 0) { + drm_err(&xe->drm, "gsc aux add failed %d\n", ret); + heci_gsc->adev = NULL; + + /* adev will be freed with the put_device() and .release sequence */ + auxiliary_device_uninit(aux_dev); + goto fail; + } + + return; +fail: + xe_heci_gsc_fini(xe); +} + +void xe_heci_gsc_irq_handler(struct xe_device *xe, u32 iir) +{ + int ret; + + if ((iir & GSC_IRQ_INTF(1)) == 0) + return; + + if (!HAS_HECI_GSCFI(xe)) { + drm_warn_once(&xe->drm, "GSC irq: not supported"); + return; + } + + if (xe->heci_gsc.irq < 0) + return; + + ret = generic_handle_irq(xe->heci_gsc.irq); + if (ret) + drm_err_ratelimited(&xe->drm, "error handling GSC irq: %d\n", ret); +} diff --git a/drivers/gpu/drm/xe/xe_heci_gsc.h b/drivers/gpu/drm/xe/xe_heci_gsc.h new file mode 100644 index 000000000000..9db454478fae --- /dev/null +++ b/drivers/gpu/drm/xe/xe_heci_gsc.h @@ -0,0 +1,35 @@ +/* SPDX-License-Identifier: MIT */ +/* + * Copyright(c) 2023, Intel Corporation. All rights reserved. + */ +#ifndef __XE_HECI_GSC_DEV_H__ +#define __XE_HECI_GSC_DEV_H__ + +#include + +struct xe_device; +struct mei_aux_device; + +/* + * The HECI1 bit corresponds to bit15 and HECI2 to bit14. + * The reason for this is to allow growth for more interfaces in the future. + */ +#define GSC_IRQ_INTF(_x) BIT(15 - (_x)) + +/** + * struct xe_heci_gsc - graphics security controller for xe, HECI interface + * + * @adev : pointer to mei auxiliary device structure + * @irq : irq number + * + */ +struct xe_heci_gsc { + struct mei_aux_device *adev; + int irq; +}; + +void xe_heci_gsc_init(struct xe_device *xe); +void xe_heci_gsc_fini(struct xe_device *xe); +void xe_heci_gsc_irq_handler(struct xe_device *xe, u32 iir); + +#endif /* __XE_HECI_GSC_DEV_H__ */ diff --git a/drivers/gpu/drm/xe/xe_irq.c b/drivers/gpu/drm/xe/xe_irq.c index 1dee3e832eb5..d297e9b8a3be 100644 --- a/drivers/gpu/drm/xe/xe_irq.c +++ b/drivers/gpu/drm/xe/xe_irq.c @@ -128,6 +128,7 @@ void xe_irq_enable_hwe(struct xe_gt *gt) struct xe_device *xe = gt_to_xe(gt); u32 ccs_mask, bcs_mask; u32 irqs, dmask, smask; + u32 gsc_mask = GSC_IRQ_INTF(1); if (xe_device_guc_submission_enabled(xe)) { irqs = GT_RENDER_USER_INTERRUPT | @@ -180,6 +181,9 @@ void xe_irq_enable_hwe(struct xe_gt *gt) if (xe_hw_engine_mask_per_class(gt, XE_ENGINE_CLASS_OTHER)) { xe_mmio_write32(gt, GUNIT_GSC_INTR_ENABLE, irqs); xe_mmio_write32(gt, GUNIT_GSC_INTR_MASK, ~irqs); + } else if (HAS_HECI_GSCFI(xe)) { + xe_mmio_write32(gt, GUNIT_GSC_INTR_ENABLE, gsc_mask); + xe_mmio_write32(gt, GUNIT_GSC_INTR_MASK, ~gsc_mask); } } } @@ -284,6 +288,11 @@ static void gt_irq_handler(struct xe_tile *tile, instance = INTR_ENGINE_INSTANCE(identity[bit]); intr_vec = INTR_ENGINE_INTR(identity[bit]); + if (class == XE_ENGINE_CLASS_OTHER && instance == OTHER_GSC_INSTANCE) { + xe_heci_gsc_irq_handler(xe, intr_vec); + continue; + } + engine_gt = pick_engine_gt(tile, class, instance); hwe = xe_gt_hw_engine(engine_gt, class, instance, false); @@ -470,8 +479,9 @@ static void gt_irq_reset(struct xe_tile *tile) if (ccs_mask & (BIT(2)|BIT(3))) xe_mmio_write32(mmio, CCS2_CCS3_INTR_MASK, ~0); - if (tile->media_gt && - xe_hw_engine_mask_per_class(tile->media_gt, XE_ENGINE_CLASS_OTHER)) { + if ((tile->media_gt && + xe_hw_engine_mask_per_class(tile->media_gt, XE_ENGINE_CLASS_OTHER)) || + HAS_HECI_GSCFI(tile_to_xe(tile))) { xe_mmio_write32(mmio, GUNIT_GSC_INTR_ENABLE, 0); xe_mmio_write32(mmio, GUNIT_GSC_INTR_MASK, ~0); } From patchwork Thu Sep 14 08:01:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Usyskin, Alexander" X-Patchwork-Id: 139531 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp300540vqi; Thu, 14 Sep 2023 05:11:42 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE7Y5HY8N3K0soF8W0DFXkzPreVANMM2tCKEwftd4A5cbehM3I+A5V0b/8CiN9A3CUfqrl4 X-Received: by 2002:a17:903:22cb:b0:1c1:fc5c:b34a with SMTP id y11-20020a17090322cb00b001c1fc5cb34amr5916307plg.3.1694693502532; Thu, 14 Sep 2023 05:11:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694693502; cv=none; d=google.com; s=arc-20160816; b=XJ9yx0zxwoXLBXKd7zzACEIyWd4PKEHfsEVjo5tEMIhTYVAjILl8hVWCQar/+6CRWb 62WL4XbGwrOtfJ5/U8bwFiYHZ7HySzQgzaaeqbfGMUyeJAldlnOElzELyOpPCXQjhsc7 siXZ36sMuIjgzlmbjhHHFDUFmj7UzMfe2sqWWWUAnAAQJOHntvkMVmTIu1utM4XzDXC9 hUgy5MtYMQ6by+ZyjLbwiCkAgfGlZH2FzpiZt9zl2AV/e8jHlK6XN9jmbd5bo6KNbssT aZj4Ny4Y9VY/4KaM4Cf2JbtCzcJrcbu4ovT4Hi1YEn3bZZRXiUNv2Is1kd/67Fh3kEQK xA7A== 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=53N/uXbKSRDhRSJF/Ch+ixi+TZ73NGyWnet7XByHDyk=; fh=7xjKU1xkhmTazBlAQtMk+Chl7JSt/CUyagAgyiLWmTI=; b=lx6uMYx76owuuYBylYv6iHUcCBqXGitK4U3urXaQXNaIcBVjYZBaEDC5qIHQ3gHEUQ 7zqji1VvB9kd/IET90m26fzVsQPOYLcR2rYykqmqaoXlovgPNSc7F8DG0h1UF083JGWJ fPmLxDYMoXigZr+M5XYXz2llzqWOBNnHMMdx5x1Bln+QxoDlcwDwDdXkrcwqS0z8em+3 MOLm/tt0p4459EOcyVF+onJH17Y8lP18p6wIL56OBkLaGu/WipAq+SXJ99ze6TD4KPiV 3XehMKf7ykAhme3W26RiUx37KjSZ6l9IQn0lbA01Prq6m1RFFGysVjODURISSK8TST4n OmhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ZSX7IcqG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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 howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id z1-20020a170903018100b001bb9c731a41si1600921plg.623.2023.09.14.05.11.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 05:11:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ZSX7IcqG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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 howler.vger.email (Postfix) with ESMTP id 0F5A382A41E4; Thu, 14 Sep 2023 01:47:51 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235913AbjINIrw (ORCPT + 35 others); Thu, 14 Sep 2023 04:47:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37194 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236308AbjINIGS (ORCPT ); Thu, 14 Sep 2023 04:06:18 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 94CDD1BF9 for ; Thu, 14 Sep 2023 01:06:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1694678774; x=1726214774; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=1p71K//XQ9zZQYmDOllPeza8+3H0XOHh0PahGZw2m84=; b=ZSX7IcqGGOQ9cmy6onOrZsMf5+P4Db6/cuny9Mi1qzEHbCTzCYD6TmSr tulC7N71SAEfO4rjoU0URWjUFxSGs6H6wewlj+POWlzJ7iBY91UGhaULG x10lhofkLFCaXNhAX9QHMOjgAdDZ+8WduifzkiQhO3M/ezWnPZgR784cD SUC+dI6EZnSoggyQt5EMLfMTH1mK6jUoYiEYoIF7FhwerclzPyu4331nF sL9F2g+T+pbQtVpR3QB4uSKxOnoaps6ZNNb3bLwBy0ZIzULYHhz1joyLo Knn6TIO0pRJcN8BDmLsezk2Ox/mujCimjQnw1VZiHSO68HcenmNx6CxGB A==; X-IronPort-AV: E=McAfee;i="6600,9927,10832"; a="442917396" X-IronPort-AV: E=Sophos;i="6.02,145,1688454000"; d="scan'208";a="442917396" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Sep 2023 01:06:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10832"; a="887691688" X-IronPort-AV: E=Sophos;i="6.02,145,1688454000"; d="scan'208";a="887691688" Received: from sannilnx-dsk.jer.intel.com ([10.12.231.107]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Sep 2023 01:05:40 -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 v2 4/4] mei: gsc: add support for auxiliary device created by Xe driver Date: Thu, 14 Sep 2023 11:01:38 +0300 Message-Id: <20230914080138.4178295-5-alexander.usyskin@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230914080138.4178295-1-alexander.usyskin@intel.com> References: <20230914080138.4178295-1-alexander.usyskin@intel.com> MIME-Version: 1.0 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 (howler.vger.email [0.0.0.0]); Thu, 14 Sep 2023 01:47:51 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777014934274565642 X-GMAIL-MSGID: 1777014934274565642 From: Vitaly Lubart Add support for gsc mei auxiliary device created by Xe driver Signed-off-by: Vitaly Lubart Signed-off-by: Alexander Usyskin Reviewed-by: Rodrigo Vivi --- drivers/misc/mei/gsc-me.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/misc/mei/gsc-me.c b/drivers/misc/mei/gsc-me.c index e63cabd0818d..63525778a4e0 100644 --- a/drivers/misc/mei/gsc-me.c +++ b/drivers/misc/mei/gsc-me.c @@ -292,6 +292,10 @@ static const struct auxiliary_device_id mei_gsc_id_table[] = { .name = "i915.mei-gscfi", .driver_data = MEI_ME_GSCFI_CFG, }, + { + .name = "xe.mei-gscfi", + .driver_data = MEI_ME_GSCFI_CFG, + }, { /* sentinel */ } @@ -312,4 +316,5 @@ module_auxiliary_driver(mei_gsc_driver); MODULE_AUTHOR("Intel Corporation"); MODULE_ALIAS("auxiliary:i915.mei-gsc"); MODULE_ALIAS("auxiliary:i915.mei-gscfi"); +MODULE_ALIAS("auxiliary:xe.mei-gscfi"); MODULE_LICENSE("GPL");