From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 754473C2BA8 for ; Tue, 26 May 2026 21:44:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.16 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779831898; cv=none; b=Y/OmohKX4HP8why626ixJ6NcjgoWbLUyNLqCdDtUqgRnyialeBmGTu+VBnwub7Za4TUcQ4Y+GHfOE1Ipng4bGaFUGtuAHYYcMBaKuWkkVcJvpd2jnucWQjVHEITmZw3BQNKumj5j+H3xF9acZiSVEzrw45pNRZDSVUkmxGz96Ow= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779831898; c=relaxed/simple; bh=7Okvw+fsV9Qg1R8JgSR+HzZFPxVLT2qPwpZWC2AiPSo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=mE0sEBvzv077Qa5YjgucJtX9qEdcWtPymRA/s9JSg/PAAoYh49lHt8vNYStm606Y1ZGoElRrdFFFV3T5IK3UO7D5m6ESJiWoRBolP8BaFSuXwWtm7Uz0q8iYmYvNTq4Esu+XEw7LA/nnlZuo6yFhLxtyVQzAnw8Zhnn0pcXQQXk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=LZt6l3TV; arc=none smtp.client-ip=198.175.65.16 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="LZt6l3TV" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1779831897; x=1811367897; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=7Okvw+fsV9Qg1R8JgSR+HzZFPxVLT2qPwpZWC2AiPSo=; b=LZt6l3TVEksamkWeXISo4W0xLt5H8PYz+LmgfAVXpwFD7Jrm5S38Fozh 7IABb0t08lIjASrFP3BfF1+cGwqcHMajBdEaJ6KxzFH5QfNcnel3IUCMo 2cicf0ab8UuZmYpLULAvk2w/qMkjmHka4TQ/ONLSw2OTAWBaYljfH9I3D ZF4Xd/X/N0WVs+OwbyxgtALY5M4tHzVhL8EE6O9yufxTz5f8tKPTFoJPd qoDotHaN9Ihqm2FvseaAVTsKPNiatJYvPxXzV6XyIae6+kKWEGNdRTgRL zVFjX1Tz4G/JQoEJSgeWrlc7sDHz+oaG7wQQHJ1fooDoW2HN8yfVjQ9sY g==; X-CSE-ConnectionGUID: cb1MF6H4S5CCv9AvvjxtFA== X-CSE-MsgGUID: DKLQ8K9fRbCCQ9Grv0cATg== X-IronPort-AV: E=McAfee;i="6800,10657,11798"; a="80843893" X-IronPort-AV: E=Sophos;i="6.24,170,1774335600"; d="scan'208";a="80843893" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2026 14:44:56 -0700 X-CSE-ConnectionGUID: xkkUlb4IQuqIl3fWImk06g== X-CSE-MsgGUID: 6awH5U5HR7uF/fd1HTDk5Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.24,170,1774335600"; d="scan'208";a="242110103" Received: from osgc-sh-dragon.sh.intel.com ([10.239.81.44]) by orviesa009-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2026 14:44:53 -0700 From: Jonathan Cavitt To: dri-devel@lists.freedesktop.org Cc: saurabhg.gupta@intel.com, alex.zuo@intel.com, jonathan.cavitt@intel.com, mripard@kernel.org, airlied@gmail.com, simona@ffwll.ch, linux-kernel@vger.kernel.org, intel-xe@lists.freedesktop.org, Rodrigo.vivi@intel.com, matthew.brost@intel.com, maarten.lankhorst@linux.intel.com, thomas.hellstrom@linux.intel.com, tzimmermann@suse.de Subject: [PATCH 1/2] drm/xe/pagefault: Add SRCID to pagefault struct Date: Wed, 27 May 2026 05:44:45 +0800 Message-ID: <20260526214446.3638616-2-jonathan.cavitt@intel.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260526214446.3638616-1-jonathan.cavitt@intel.com> References: <20260526214446.3638616-1-jonathan.cavitt@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add SRCID information to pagefault struct for the purpose of reporting the hardware unit that resulted in the pagefault. Signed-off-by: Jonathan Cavitt Cc: Matthew Brost Cc: Thomas Hellström Cc: Rodrigo Vivi Cc: David Airlie Cc: Simona Vetter --- drivers/gpu/drm/xe/xe_guc_pagefault.c | 1 + drivers/gpu/drm/xe/xe_pagefault.c | 6 ++++-- drivers/gpu/drm/xe/xe_pagefault_types.h | 4 +++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_guc_pagefault.c b/drivers/gpu/drm/xe/xe_guc_pagefault.c index 607e32392f46..17cb7f359261 100644 --- a/drivers/gpu/drm/xe/xe_guc_pagefault.c +++ b/drivers/gpu/drm/xe/xe_guc_pagefault.c @@ -91,6 +91,7 @@ int xe_guc_pagefault_handler(struct xe_guc *guc, u32 *msg, u32 len) FIELD_GET(PFD_FAULT_TYPE, msg[2])); pf.consumer.engine_class = FIELD_GET(PFD_ENG_CLASS, msg[0]); pf.consumer.engine_instance = FIELD_GET(PFD_ENG_INSTANCE, msg[0]); + pf.consumer.srcid = FIELD_GET(PFD_SRC_ID, msg[0]); pf.producer.private = guc; pf.producer.ops = &guc_pagefault_ops; diff --git a/drivers/gpu/drm/xe/xe_pagefault.c b/drivers/gpu/drm/xe/xe_pagefault.c index dd3c068e1a39..42b682ba5f9b 100644 --- a/drivers/gpu/drm/xe/xe_pagefault.c +++ b/drivers/gpu/drm/xe/xe_pagefault.c @@ -248,7 +248,8 @@ static void xe_pagefault_print(struct xe_pagefault *pf) "\tAccessType: %lu\n" "\tFaultLevel: %lu\n" "\tEngineClass: %d %s\n" - "\tEngineInstance: %d\n", + "\tEngineInstance: %d\n" + "\tSRCID: 0x%02x\n", pf->consumer.asid, upper_32_bits(pf->consumer.page_addr), lower_32_bits(pf->consumer.page_addr), @@ -260,7 +261,8 @@ static void xe_pagefault_print(struct xe_pagefault *pf) pf->consumer.fault_type_level), pf->consumer.engine_class, xe_hw_engine_class_to_str(pf->consumer.engine_class), - pf->consumer.engine_instance); + pf->consumer.engine_instance, + pf->consumer.srcid); } static void xe_pagefault_save_to_vm(struct xe_device *xe, struct xe_pagefault *pf) diff --git a/drivers/gpu/drm/xe/xe_pagefault_types.h b/drivers/gpu/drm/xe/xe_pagefault_types.h index c4ee625b93dd..60cc269aeea3 100644 --- a/drivers/gpu/drm/xe/xe_pagefault_types.h +++ b/drivers/gpu/drm/xe/xe_pagefault_types.h @@ -86,8 +86,10 @@ struct xe_pagefault { u8 engine_class; /** @consumer.engine_instance: engine instance */ u8 engine_instance; + /** @consumer.srcid: ID of hardware unit producing fault */ + u8 srcid; /** @consumer.reserved: reserved bits for future expansion */ - u64 reserved; + u8 reserved[7]; } consumer; /** * @producer: State for the producer (i.e., HW/FW interface). Populated -- 2.53.0