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 58D10EE4993 for ; Tue, 22 Aug 2023 15:55:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0D70710E3A2; Tue, 22 Aug 2023 15:55:53 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5A3F210E3A2 for ; Tue, 22 Aug 2023 15:55:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1692719751; x=1724255751; h=date:from:to:cc:subject:message-id:references: in-reply-to:mime-version; bh=WXO6poqf/N1DpqgP/FCtUX7jrPsjsdOjjkUx8Quq2Yg=; b=ITnFI/D93fJUGyCw3CbjYnHS7posjbVEU8Vor3tIGwsaBuCkDFDZDPWm 6BSNqe6cnK6RvGwmNQ21ErVNdgVLYlJZFV3ZPPfi2F+3Yp8Y24rCK/u3U ehUif9wGhbVkgZXFpArdcpzRGHQaDZc3BmERxtf9ccwDRYmeoBzKv3Rci eiwPFEZT+EToW7KJRuf9+5S7qxowKPeRpz/ISXFF6WFmZRXH7pIyI1Vfu IlMtaflSzlpDvl0LWqkz7zelFJOpiBmZVivxEGUc9fdWM/vzhPnPSb+cF cVqQHsEqg61dkqg9cB8KkFy800UxyB1EI2P7ekFNajPfiz9TKdXVtbpuQ w==; X-IronPort-AV: E=McAfee;i="6600,9927,10809"; a="372807627" X-IronPort-AV: E=Sophos;i="6.01,193,1684825200"; d="scan'208";a="372807627" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Aug 2023 08:55:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10809"; a="801730802" X-IronPort-AV: E=Sophos;i="6.01,193,1684825200"; d="scan'208";a="801730802" Received: from orsmsx601.amr.corp.intel.com ([10.22.229.14]) by fmsmga008.fm.intel.com with ESMTP; 22 Aug 2023 08:55:50 -0700 Received: from orsmsx612.amr.corp.intel.com (10.22.229.25) by ORSMSX601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Tue, 22 Aug 2023 08:55:50 -0700 Received: from orsmsx602.amr.corp.intel.com (10.22.229.15) by ORSMSX612.amr.corp.intel.com (10.22.229.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Tue, 22 Aug 2023 08:55:49 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27 via Frontend Transport; Tue, 22 Aug 2023 08:55:49 -0700 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.173) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.27; Tue, 22 Aug 2023 08:55:49 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XOr55Qkh3c1LV9BMaAlb7U6DZYgN7xTVfK3Mwq7JJJ+MJViVNcIaw4amcvF94DHrXe12wI5Ipux6Z5bh8OR3pJt+hNR+Ad47UnYxhASSW+/L2OWvZoDu20eLrkaQsM8Q/Gaoh/XcKhSxFee5m/dtcdTdDtH3ed2lw7WKmHPfGiGuWm3HwVz6afEIaIDDmWYSJtjZBEgNtA3SOTBzNIlKJVs0sIgroeCRymgho8nhMI4dP5VFeJnl4xU1b7D8GI+8Vr+2OYoKe4IwMKmprb2hD+p4ztCUlBU0oFG99YVRz4t16fCAvDzYnWiXdZON06kzCg3oXKP7T+nwVrAsfGG2mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=OCn89L4k1bc3ELLA3edrpNokn2xhmMDNAhEKXaTVS04=; b=iNHaG18mUqFcN9Es95mNwux3dK5veObpBfsxoTFv2dkSsYVTSGQUEdYV/+APzE+i7e50nn8RZe6iox6BQG3j2wdhyQA0Ri8Cq5pi3dGvNsrI+CSSImd+hg3UMGUjABtrE4rzyexhhKg6+SeRGCcdsjcDd4UQleM2FszmyvGjQJ13GFgPpDjQsvr1eWHcEs0m4o2AkxkwA1H76W7FukqeQPuI46dolRSf4EqJEDfhfssFtdBFKBJ0dFqwoXv3I5433qvbg4OWA1NTpzS+vx07aXwCSih2QlEaHbNPTAk+ng1ipTeYU+FGH55WViz8RNGeka2kGt38OubuNDmrF8tcGw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from DM6PR11MB2987.namprd11.prod.outlook.com (2603:10b6:5:65::14) by SJ1PR11MB6131.namprd11.prod.outlook.com (2603:10b6:a03:45e::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.20; Tue, 22 Aug 2023 15:55:47 +0000 Received: from DM6PR11MB2987.namprd11.prod.outlook.com ([fe80::55d8:709a:ac58:ae0e]) by DM6PR11MB2987.namprd11.prod.outlook.com ([fe80::55d8:709a:ac58:ae0e%3]) with mapi id 15.20.6699.022; Tue, 22 Aug 2023 15:55:47 +0000 Date: Tue, 22 Aug 2023 08:55:44 -0700 From: Umesh Nerlige Ramappa To: Ashutosh Dixit Message-ID: References: <20230808013159.38811-1-ashutosh.dixit@intel.com> <20230808013159.38811-11-ashutosh.dixit@intel.com> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Disposition: inline In-Reply-To: <20230808013159.38811-11-ashutosh.dixit@intel.com> X-ClientProxiedBy: BYAPR02CA0020.namprd02.prod.outlook.com (2603:10b6:a02:ee::33) To DM6PR11MB2987.namprd11.prod.outlook.com (2603:10b6:5:65::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR11MB2987:EE_|SJ1PR11MB6131:EE_ X-MS-Office365-Filtering-Correlation-Id: 2ad26d38-5e56-4207-83af-08dba3283fe3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ScfflNjtnHp4i1kTu8nMhBMdnurfvW88S4AazGTuMgCpfCzi57S0mBbesJJO74jk7BbWZd08BcW5MNejehIFWc6V7Jb5MX72C/q+glbZctMlcGq25YKbikFE9YFr9Bf0ADS7eVi0OcrHd+6rdGVlwyf322f07elxSpY9iokVFLetSwI9iMm/BmyJ8OYzYVp0g0U1puwHF/xZiAZKrYioKef08A8zWuNUGg9yZMhrxgzITq64h+hx5pLya/zVVEOCFGuo56/M9R4BZ4VVC49SALgYRyDvPQhJyudtoX2Pp53ksIDlLem5AyRXuoIUa35KHVn6o86D2J42dJ4sKZ1p3z75WkdF/b0sLUYaSE8LEJckMY5+bOA582zcKILFl3FJqbsXU3rJQJG34HSGqygMlMo+HJ4GiCyhhgCpginnuGKFQJI+AhyY4Slsf7NRwDhMtrF2Qcze/s07mHOei3S6bhnUYOh+Mkaor/eYptWXyv6ypOW8yILGxopHFBlfS8hmRuHKhXCeLZlEFJgchkcRWwbDw8g5JmFVyEm0LJyl8omnq6lsP+OpjJdAOos14cWY X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM6PR11MB2987.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(7916004)(366004)(39860400002)(376002)(346002)(396003)(136003)(451199024)(186009)(1800799009)(86362001)(5660300002)(66556008)(66476007)(66946007)(2906002)(316002)(6636002)(6862004)(8676002)(478600001)(8936002)(4326008)(41300700001)(82960400001)(6486002)(6666004)(38100700002)(9686003)(6506007)(6512007)(26005)(33716001)(83380400001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TzN4VlBzblhpQmpVdUsycUxMSWRWUFZLUWFlUXJGQWpoVEdXK1J3YXU4Z0gr?= =?utf-8?B?aytELzVzc3FGR2hEM2RRZVl3LzhneUNxVGtURk1mZkMzamJQV29VZlZQbXB1?= =?utf-8?B?TUVad3NEcGp5b3R0eTZLME5YMWZDUTJBbWovMUNhT1owdjFyaXNEanhvRU5E?= =?utf-8?B?dDg0WndvYWdrTkVFekIxTFJReGxibXZkV2RYdllTMi9TbHpKQlpta3VUUHll?= =?utf-8?B?TmdNTzVueFlBRk0vK3pjUXhudmVOUGNzdWR6NUFSYXp3L2xneWlZb015MzZt?= =?utf-8?B?dXJRSFRlOFNWS2pVUVpVbFl3OXhpYjQyRjFDZHZiUk9rc3NNbzIvSzJ5RjBN?= =?utf-8?B?TmZnS2txcjFIcFI0dThFUXp3dUp6MVFwbldBZWFkSE1XaEZDN2EvWDhFc29o?= =?utf-8?B?c2F2OG40cWlYUGhNRkZyclcwc1V0bFI5S3RXR00vcGhDUWxTd0lDWC9RVUdM?= =?utf-8?B?MUxseUxYL1RuUzU2cWgvNXJqTDUrZExkNEs1V2xCTVB5L3BpZm1DZUJaU3BX?= =?utf-8?B?UHZCRzVyTFNPbkhPcXpoWHQxdG8vVnE3T0hLblErMWEwRUlyTlVUdTkzTDF5?= =?utf-8?B?SUVvY3RCMld3eW1lcnJEb3N5YmRvd0ZCR0RMaC9jZ3RKNUdhbEI4NkhhenNq?= =?utf-8?B?UHA4Q1Zxc0hxdllIQzd0UmJ4VWtEUUZxZ1FtQjhXQ1FXUEdjN3N1aHlxYVBs?= =?utf-8?B?Zkk3YkZkSkhxUnZ5WHJMc0tmV21aK2xCOER4eHQySTNhdFNxSVR3VitSNm9p?= =?utf-8?B?SVB2MzV1YzN2bEFlVHRaMnVETVhJSkNrUGgxcUwweEMwSk1taWE3MEFuSHpo?= =?utf-8?B?anRUcGd4a2RoeStnbXF3L3NiVGliNkVsTEVxanRna1d6cGxsVEFmRXR6T1VR?= =?utf-8?B?dTVFdlNOYjZ6WTZFalBiYUYxdXo0U0tyNnZXVjFhTGhXcG0vTFVXUG1idm5V?= =?utf-8?B?ZDJwSnAybFZkbzhzeHpuSjZDUERIelMzVXY5RDhSNUV1Z2FZWEZERUhJRUIw?= =?utf-8?B?QXJSb0N2c1hmb3JQS2dBcmdJUXJaa0F6cUxhNUxWVDNJZHFVUERiS3BCSVNh?= =?utf-8?B?M1BCT05FRDFtcFpCTHBRZEFpK3lkVkN5d1hxQ0FXZE0rU3prWCtGaVh6Znoy?= =?utf-8?B?WGcrd0g3MllFdStERWt4ZjJUcFJwNUJZMEFlWDhOVXdNZk9lUjVRdXlUam8x?= =?utf-8?B?VWhsUHV1ZEtnZVk1ZzUxcGhBdi9FTnU0T1FhaHV3NURUS1ovQTZQWDE2WWdR?= =?utf-8?B?LzdlKzRmVXB2R3h1N0E5RENEQzVRQTVqZE00RXhrRmM3UFZiQUw1ZDJmZlJV?= =?utf-8?B?eG1YaE1rUVgxQ29FTmMrMjlNUVU1QmxGTUZtaWpBcVhDenV1UFhvUTVDM1lB?= =?utf-8?B?S2Y5cG1DT2NBTlpGK1ZKTXBUeTl3clBsQlNXcS9hdHdUNmc3M1lZYmdkYjRC?= =?utf-8?B?QWpqa3JaOE5lTEI3NmFpTm1QOTFEZEdaNlVsb2l6MnVOS1NFQktRallIWGtt?= =?utf-8?B?OVlITWZnM2pxWStLcG5VdDQrSkJJczE0dFB6MEhjcGlyYlAxVlVacEthbTNW?= =?utf-8?B?YlJjYzJtSzFrL1IzRHZEWU5YS2dzdFJFbzhHcU95b0QvNTV6ZjJRMUoyQzNt?= =?utf-8?B?UllaU0lRVmgwalBKUmNsN1NZZHg3ZXNGaUNmQ0FPaHlaRHVUeUxYcTZpbkI1?= =?utf-8?B?ekJuWkJCdmZlbG5uZVNpbEdTbmJWUnhMMVRHQ25nQmMyNWl5OGttWUx5UnV1?= =?utf-8?B?ZzQ1WG0xcmxzTDBhMEtDam1NQ0dFSnpPTXFkQ3VlUkZ5ZWFBQm5aamhqdkRS?= =?utf-8?B?OHV4RisvbjZ6T2NpUFpiT2xVR2RQVzBrcHh1L0FsM2ZiMXhVM0dCMkZVSWU4?= =?utf-8?B?blplL2hoWlNOQjRZYUMrbG5vLzR3YjRJQTBXZGZFTG0rUGNBZlF4UFR6dTVF?= =?utf-8?B?MFpGMDNwSzNtUkdmWFJoSXRmUUx6MU1ObTlBWFFVZEI5VGVJWi9JL2w3OGRt?= =?utf-8?B?eE9Oak5ZeVQ3UmVHa3dzWXBsM2JRNllvU04wU3NPY3Rrc1hsRkd3YURoRjBH?= =?utf-8?B?QVFSYlh0OVQzN3lMcmtvNEJhQXFSTUw0QmdiQmphZE10Y25SYWQzN0ZWYWto?= =?utf-8?B?Ti8xYnN4UEFrWGFVUFVQbEsxVFY4YlRZUGUyeWNjdGNUeE82TUJsc2pBdXBz?= =?utf-8?Q?AFipcXQlBuV3kUDZdlmFFh0=3D?= X-MS-Exchange-CrossTenant-Network-Message-Id: 2ad26d38-5e56-4207-83af-08dba3283fe3 X-MS-Exchange-CrossTenant-AuthSource: DM6PR11MB2987.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2023 15:55:47.0686 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: efljpVaxzfqifwlIVHCIEpWkaN0rFya2NEALy8r38scJAED1Ygjm/STQHiRrv6h55/J2+SjUkKNC2nssc5C7fKRlmIYu59pEopAllhLKo3k= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ1PR11MB6131 X-OriginatorOrg: intel.com Subject: Re: [Intel-xe] [PATCH 10/10] drm/xe/oa: Implement queries 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: , Cc: intel-xe@lists.freedesktop.org Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" On Mon, Aug 07, 2023 at 06:31:59PM -0700, Ashutosh Dixit wrote: >Implement queries to query OA unit ID's for HW engines, OA timestamp freq >and OA ioctl version. > >Signed-off-by: Ashutosh Dixit >--- > drivers/gpu/drm/xe/xe_oa.c | 11 +++++++++++ > drivers/gpu/drm/xe/xe_oa.h | 3 +++ > drivers/gpu/drm/xe/xe_query.c | 5 ++++- > 3 files changed, 18 insertions(+), 1 deletion(-) > >diff --git a/drivers/gpu/drm/xe/xe_oa.c b/drivers/gpu/drm/xe/xe_oa.c >index fcbb352f36a48..f320e5cd76a13 100644 >--- a/drivers/gpu/drm/xe/xe_oa.c >+++ b/drivers/gpu/drm/xe/xe_oa.c >@@ -2219,6 +2219,12 @@ static int xe_oa_init_engine_groups(struct xe_oa *oa) > return 0; > } > >+u32 xe_oa_unit_id(struct xe_hw_engine *hwe) >+{ >+ return hwe->oa_group && hwe->oa_group->num_engines ? >+ hwe->oa_group->oa_unit_id : U32_MAX; >+} >+ > static void oa_format_add(struct xe_oa *oa, enum drm_xe_oa_format format) > { > __set_bit(format, oa->format_mask); >@@ -2333,6 +2339,11 @@ static struct ctl_table oa_ctl_table[] = { > {} > }; > >+int xe_oa_ioctl_version(struct xe_device *xe) >+{ >+ return 1; >+} >+ > int xe_oa_sysctl_register(void) > { > sysctl_header = register_sysctl("dev/xe", oa_ctl_table); >diff --git a/drivers/gpu/drm/xe/xe_oa.h b/drivers/gpu/drm/xe/xe_oa.h >index fd6caf652047a..41a7d8b0f10e1 100644 >--- a/drivers/gpu/drm/xe/xe_oa.h >+++ b/drivers/gpu/drm/xe/xe_oa.h >@@ -22,4 +22,7 @@ int xe_oa_add_config_ioctl(struct drm_device *dev, void *data, > struct drm_file *file); > int xe_oa_remove_config_ioctl(struct drm_device *dev, void *data, > struct drm_file *file); >+u32 xe_oa_timestamp_frequency(struct xe_device *xe); >+u32 xe_oa_unit_id(struct xe_hw_engine *hwe); >+ > #endif >diff --git a/drivers/gpu/drm/xe/xe_query.c b/drivers/gpu/drm/xe/xe_query.c >index 7ea235c71385f..3dbc4bbae4d02 100644 >--- a/drivers/gpu/drm/xe/xe_query.c >+++ b/drivers/gpu/drm/xe/xe_query.c >@@ -78,7 +78,8 @@ static int query_engines(struct xe_device *xe, > xe_to_user_engine_class[hwe->class]; > hw_engine_info[i].engine_instance = > hwe->logical_instance; >- hw_engine_info[i++].gt_id = gt->info.id; >+ hw_engine_info[i].gt_id = gt->info.id; >+ hw_engine_info[i++].oa_unit_id = xe_oa_unit_id(hwe); I would keep the i++ on a separate line for readability (even if the original code had it so). Umesh > } > > if (copy_to_user(query_ptr, hw_engine_info, size)) { >@@ -204,6 +205,7 @@ static int query_config(struct xe_device *xe, struct drm_xe_device_query *query) > hweight_long(xe->info.mem_region_mask); > config->info[XE_QUERY_CONFIG_MAX_ENGINE_PRIORITY] = > xe_exec_queue_device_get_max_priority(xe); >+ config->info[XE_QUERY_OA_IOCTL_VERSION] = xe_oa_ioctl_version(xe); > > if (copy_to_user(query_ptr, config, size)) { > kfree(config); >@@ -245,6 +247,7 @@ static int query_gts(struct xe_device *xe, struct drm_xe_device_query *query) > gts->gts[id].type = XE_QUERY_GT_TYPE_MAIN; > gts->gts[id].instance = id; > gts->gts[id].clock_freq = gt->info.clock_freq; >+ gts->gts[id].oa_timestamp_freq = xe_oa_timestamp_frequency(xe); > if (!IS_DGFX(xe)) > gts->gts[id].native_mem_regions = 0x1; > else >-- >2.41.0 >