From nobody Wed Oct 8 16:06:07 2025 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14]) (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 D68BF2E764D; Thu, 26 Jun 2025 13:56:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.14 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750946181; cv=none; b=K0n02gK18ZqFp2iP6rWkvAtWHdy2546pTgNMGHQDMeHtLnQJn5uywCLJFdG6pdvbUsvzpIVS9x4tPxT4sKA1rcbCTtQBbec1X8uyLvTVXgOQMDqUnUsJF0SZ6xQB6w/FkKwQ5m/GTveJmC/fRe7dS7nF/uBUdggdmP+SdnxGYwo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750946181; c=relaxed/simple; bh=UYi8yaa4IpCW+5RfkUS3FLlv0ptEwqridhTpzFcNsSI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pn2kYyZOAIR/vPg7Pg0kBlcAZv7v2GrOIMT/Vc13aubya0NKyxCvEiuUX/fp7No5Kpio9LYL+4bSCBJT73vGKHOLWmz5+eBf4kO+paZ3N/ZiS1OKrze06i4KZJa2qT9z6mc6jhVyERe14kuNbmZbwUbe/gT+IG+dI09Xx8E1LFk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=Q1Xm5Pbu; arc=none smtp.client-ip=192.198.163.14 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="Q1Xm5Pbu" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1750946180; x=1782482180; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=UYi8yaa4IpCW+5RfkUS3FLlv0ptEwqridhTpzFcNsSI=; b=Q1Xm5Pbuv+S03wnNvvTAYuVcBLmHY0L2D0M9AYjyZt6ikYL1M1XzzfVe A9yqXXJ1ajl5X94T9KM6bqQ8e1GPO+d3zcIarPp5X3G1X7xiBm7DyhdK4 m7R5o3qk5OjYezSXc8F8BpNoeM0xY6v13CkdBl7tnJBmIOkzlPsrCV8xO V1i9EjxNtfcUp37puFBy1rqZfxIuoxKQlYo3kvuipQi6gRVuMuaWx+myc NFV0F2dUG5wadqOyMGEnTKTDgaZZR6FzFY4CirubcSBCapfH1dDP1sucn DX+WEVYkSagF4PtQdYcCrfL+qM92N1FvhZmVnApCPDd8C4cVhzwApWo32 Q==; X-CSE-ConnectionGUID: 2UYAblpaQ5CBFH1tQTrhBA== X-CSE-MsgGUID: zMkWQR1PTL64uL+mATmizg== X-IronPort-AV: E=McAfee;i="6800,10657,11475"; a="53316391" X-IronPort-AV: E=Sophos;i="6.16,267,1744095600"; d="scan'208";a="53316391" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Jun 2025 06:56:19 -0700 X-CSE-ConnectionGUID: OWNO0YDFR0ejwPVcLn7T0w== X-CSE-MsgGUID: MCVhLExzQGSMFObujuG2Xg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.16,267,1744095600"; d="scan'208";a="152146956" Received: from black.fi.intel.com (HELO black.fi.intel.com.) ([10.237.72.28]) by fmviesa007.fm.intel.com with ESMTP; 26 Jun 2025 06:56:15 -0700 From: Heikki Krogerus To: Lucas De Marchi , =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= , Rodrigo Vivi Cc: Jarkko Nikula , David Airlie , Simona Vetter , Andy Shevchenko , Mika Westerberg , Jan Dabros , Andi Shyti , Raag Jadav , "Tauro, Riana" , "Adatrao, Srinivasa" , "Michael J. Ruhl" , intel-xe@lists.freedesktop.org, linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 1/4] i2c: designware: Add quirk for Intel Xe Date: Thu, 26 Jun 2025 16:56:06 +0300 Message-ID: <20250626135610.299943-2-heikki.krogerus@linux.intel.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250626135610.299943-1-heikki.krogerus@linux.intel.com> References: <20250626135610.299943-1-heikki.krogerus@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The regmap is coming from the parent also in case of Xe GPUs. Reusing the Wangxun quirk for that. Originally-by: Michael J. Ruhl Signed-off-by: Heikki Krogerus Acked-by: Jarkko Nikula --- drivers/i2c/busses/i2c-designware-platdrv.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/buss= es/i2c-designware-platdrv.c index 879719e91df2..a35e4c64a1d4 100644 --- a/drivers/i2c/busses/i2c-designware-platdrv.c +++ b/drivers/i2c/busses/i2c-designware-platdrv.c @@ -101,7 +101,7 @@ static int bt1_i2c_request_regs(struct dw_i2c_dev *dev) } #endif =20 -static int txgbe_i2c_request_regs(struct dw_i2c_dev *dev) +static int dw_i2c_get_parent_regmap(struct dw_i2c_dev *dev) { dev->map =3D dev_get_regmap(dev->dev->parent, NULL); if (!dev->map) @@ -123,12 +123,15 @@ static int dw_i2c_plat_request_regs(struct dw_i2c_dev= *dev) struct platform_device *pdev =3D to_platform_device(dev->dev); int ret; =20 + if (device_is_compatible(dev->dev, "intel,xe-i2c")) + return dw_i2c_get_parent_regmap(dev); + switch (dev->flags & MODEL_MASK) { case MODEL_BAIKAL_BT1: ret =3D bt1_i2c_request_regs(dev); break; case MODEL_WANGXUN_SP: - ret =3D txgbe_i2c_request_regs(dev); + ret =3D dw_i2c_get_parent_regmap(dev); break; default: dev->base =3D devm_platform_ioremap_resource(pdev, 0); @@ -205,25 +208,28 @@ static void i2c_dw_remove_lock_support(struct dw_i2c_= dev *dev) =20 static int dw_i2c_plat_probe(struct platform_device *pdev) { + u32 flags =3D (uintptr_t)device_get_match_data(&pdev->dev); struct device *device =3D &pdev->dev; struct i2c_adapter *adap; struct dw_i2c_dev *dev; int irq, ret; =20 - irq =3D platform_get_irq(pdev, 0); - if (irq < 0) + irq =3D platform_get_irq_optional(pdev, 0); + if (irq =3D=3D -ENXIO) + flags |=3D ACCESS_POLLING; + else if (irq < 0) return irq; =20 dev =3D devm_kzalloc(device, sizeof(*dev), GFP_KERNEL); if (!dev) return -ENOMEM; =20 - dev->flags =3D (uintptr_t)device_get_match_data(device); if (device_property_present(device, "wx,i2c-snps-model")) - dev->flags =3D MODEL_WANGXUN_SP | ACCESS_POLLING; + flags =3D MODEL_WANGXUN_SP | ACCESS_POLLING; =20 dev->dev =3D device; dev->irq =3D irq; + dev->flags =3D flags; platform_set_drvdata(pdev, dev); =20 ret =3D dw_i2c_plat_request_regs(dev); --=20 2.47.2 From nobody Wed Oct 8 16:06:07 2025 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14]) (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 7AD6C2E8882; Thu, 26 Jun 2025 13:56:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.14 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750946186; cv=none; b=W8tena1TTfLp9TBmCj2V/4Nvvd+8WqK6LNAnR+e3laz8Ad554pcRyH7q4xKT2Lz3g3Di9R9WMSMX7Q73gE88Nkgl7gyijp1503fXjcbt4wzoqPWpfbf/iA/DoRGY1tAms5WdqMatEd5bVgGuoikK/vyjc/9FADJmzgVZ4NjXhA8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750946186; c=relaxed/simple; bh=x4ltEshZqHNbrSP51wTw/NpNO58E2vOa1Qr/e5I0DYU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=O3CMqnqfs9OkC4bVas6KXko83cbT8F0lQZ/8geJkSpGfzZByI1kjuVMiE8cmE+X406jitfDvOFFzkr115qln1u/34//F1EBcUHfC2zh2cp8CstXBv9RmBejGAtYEGqzAOT4qOz6HgIyw6c4EoBhk/mnVtpzfBeOPDTIOvDbme2o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=Rx4Q/pLr; arc=none smtp.client-ip=192.198.163.14 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="Rx4Q/pLr" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1750946184; x=1782482184; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=x4ltEshZqHNbrSP51wTw/NpNO58E2vOa1Qr/e5I0DYU=; b=Rx4Q/pLr+brE/BxukhViWAOhrBBfcuXqsj2GV02ySZbtPTuDj4tKsXO8 kqB8pXA8O0LDGJB9W991KzBIgfzyd2dNbPGBB+95zfgqH++oxjRQVLThi bu9lcHgT2pZ0Csql2fEZ7UDdCflh3D/by5DX4WJGWVPQomcwudKm3uPYF fvGXMEXmv4eku+joF2wewAUfEEq3D90k7gmTQInGRZSMIJxPfTjibsZv6 slMJtb8s9e0WJmvkGa7mtNX5oPqZdOdoLLLoY68ifo80RvQpDNwQ97hT0 3bHkXRe/fN2y5hr8y581vvIguFYA2RSxFyaw6AXYOgtMUYdJLQlZTVk7e Q==; X-CSE-ConnectionGUID: /WxQbx9cQyWvp9c+RdsQAg== X-CSE-MsgGUID: TqRjDLiHROS3FEnmz8pIZQ== X-IronPort-AV: E=McAfee;i="6800,10657,11475"; a="53316398" X-IronPort-AV: E=Sophos;i="6.16,267,1744095600"; d="scan'208";a="53316398" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Jun 2025 06:56:24 -0700 X-CSE-ConnectionGUID: I6WrD2HbTFuos68MR9loSQ== X-CSE-MsgGUID: rPa/dbIyQOOuDWVcE2AkZA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.16,267,1744095600"; d="scan'208";a="152146960" Received: from black.fi.intel.com (HELO black.fi.intel.com.) ([10.237.72.28]) by fmviesa007.fm.intel.com with ESMTP; 26 Jun 2025 06:56:20 -0700 From: Heikki Krogerus To: Lucas De Marchi , =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= , Rodrigo Vivi Cc: Jarkko Nikula , David Airlie , Simona Vetter , Andy Shevchenko , Mika Westerberg , Jan Dabros , Andi Shyti , Raag Jadav , "Tauro, Riana" , "Adatrao, Srinivasa" , "Michael J. Ruhl" , intel-xe@lists.freedesktop.org, linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 2/4] drm/xe: Support for I2C attached MCUs Date: Thu, 26 Jun 2025 16:56:07 +0300 Message-ID: <20250626135610.299943-3-heikki.krogerus@linux.intel.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250626135610.299943-1-heikki.krogerus@linux.intel.com> References: <20250626135610.299943-1-heikki.krogerus@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Adding adaption/glue layer where the I2C host adapter (Synopsys DesignWare I2C adapter) and the I2C clients (the microcontroller units) are enumerated. The microcontroller units (MCU) that are attached to the GPU depend on the OEM. The initially supported MCU will be the Add-In Management Controller (AMC). Originally-by: Michael J. Ruhl Signed-off-by: Heikki Krogerus --- drivers/gpu/drm/xe/Kconfig | 1 + drivers/gpu/drm/xe/Makefile | 1 + drivers/gpu/drm/xe/regs/xe_i2c_regs.h | 15 ++ drivers/gpu/drm/xe/regs/xe_irq_regs.h | 1 + drivers/gpu/drm/xe/regs/xe_pmt.h | 2 +- drivers/gpu/drm/xe/regs/xe_regs.h | 2 + drivers/gpu/drm/xe/xe_device.c | 5 + drivers/gpu/drm/xe/xe_device_types.h | 4 + drivers/gpu/drm/xe/xe_i2c.c | 297 ++++++++++++++++++++++++++ drivers/gpu/drm/xe/xe_i2c.h | 58 +++++ drivers/gpu/drm/xe/xe_irq.c | 2 + 11 files changed, 387 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/xe/regs/xe_i2c_regs.h create mode 100644 drivers/gpu/drm/xe/xe_i2c.c create mode 100644 drivers/gpu/drm/xe/xe_i2c.h diff --git a/drivers/gpu/drm/xe/Kconfig b/drivers/gpu/drm/xe/Kconfig index 30ed74ad29ab..257bbb69d6ca 100644 --- a/drivers/gpu/drm/xe/Kconfig +++ b/drivers/gpu/drm/xe/Kconfig @@ -44,6 +44,7 @@ config DRM_XE select WANT_DEV_COREDUMP select AUXILIARY_BUS select HMM_MIRROR + select REGMAP if I2C help Driver for Intel Xe2 series GPUs and later. Experimental support for Xe series is also available. diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile index eee6bac01a00..4b8a8fcd3959 100644 --- a/drivers/gpu/drm/xe/Makefile +++ b/drivers/gpu/drm/xe/Makefile @@ -125,6 +125,7 @@ xe-y +=3D xe_bb.o \ xe_wait_user_fence.o \ xe_wopcm.o =20 +xe-$(CONFIG_I2C) +=3D xe_i2c.o xe-$(CONFIG_HMM_MIRROR) +=3D xe_hmm.o xe-$(CONFIG_DRM_XE_GPUSVM) +=3D xe_svm.o =20 diff --git a/drivers/gpu/drm/xe/regs/xe_i2c_regs.h b/drivers/gpu/drm/xe/reg= s/xe_i2c_regs.h new file mode 100644 index 000000000000..92dae4487614 --- /dev/null +++ b/drivers/gpu/drm/xe/regs/xe_i2c_regs.h @@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: MIT */ +#ifndef _XE_I2C_REGS_H_ +#define _XE_I2C_REGS_H_ + +#include "xe_reg_defs.h" +#include "xe_regs.h" + +#define I2C_BRIDGE_OFFSET (SOC_BASE + 0xd9000) +#define I2C_CONFIG_SPACE_OFFSET (SOC_BASE + 0xf6000) +#define I2C_MEM_SPACE_OFFSET (SOC_BASE + 0xf7400) + +#define REG_SG_REMAP_ADDR_PREFIX XE_REG(SOC_BASE + 0x0164) +#define REG_SG_REMAP_ADDR_POSTFIX XE_REG(SOC_BASE + 0x0168) + +#endif /* _XE_I2C_REGS_H_ */ diff --git a/drivers/gpu/drm/xe/regs/xe_irq_regs.h b/drivers/gpu/drm/xe/reg= s/xe_irq_regs.h index f0ecfcac4003..13635e4331d4 100644 --- a/drivers/gpu/drm/xe/regs/xe_irq_regs.h +++ b/drivers/gpu/drm/xe/regs/xe_irq_regs.h @@ -19,6 +19,7 @@ #define MASTER_IRQ REG_BIT(31) #define GU_MISC_IRQ REG_BIT(29) #define DISPLAY_IRQ REG_BIT(16) +#define I2C_IRQ REG_BIT(12) #define GT_DW_IRQ(x) REG_BIT(x) =20 /* diff --git a/drivers/gpu/drm/xe/regs/xe_pmt.h b/drivers/gpu/drm/xe/regs/xe_= pmt.h index b0efd9b48d1e..2995d72c3f78 100644 --- a/drivers/gpu/drm/xe/regs/xe_pmt.h +++ b/drivers/gpu/drm/xe/regs/xe_pmt.h @@ -5,7 +5,7 @@ #ifndef _XE_PMT_H_ #define _XE_PMT_H_ =20 -#define SOC_BASE 0x280000 +#include "xe_regs.h" =20 #define BMG_PMT_BASE_OFFSET 0xDB000 #define BMG_DISCOVERY_OFFSET (SOC_BASE + BMG_PMT_BASE_OFFSET) diff --git a/drivers/gpu/drm/xe/regs/xe_regs.h b/drivers/gpu/drm/xe/regs/xe= _regs.h index 3abb17d2ca33..1926b4044314 100644 --- a/drivers/gpu/drm/xe/regs/xe_regs.h +++ b/drivers/gpu/drm/xe/regs/xe_regs.h @@ -7,6 +7,8 @@ =20 #include "regs/xe_reg_defs.h" =20 +#define SOC_BASE 0x280000 + #define GU_CNTL_PROTECTED XE_REG(0x10100C) #define DRIVERINT_FLR_DIS REG_BIT(31) =20 diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c index cd17c1354ab3..71356ee31e9d 100644 --- a/drivers/gpu/drm/xe/xe_device.c +++ b/drivers/gpu/drm/xe/xe_device.c @@ -43,6 +43,7 @@ #include "xe_guc_pc.h" #include "xe_hw_engine_group.h" #include "xe_hwmon.h" +#include "xe_i2c.h" #include "xe_irq.h" #include "xe_memirq.h" #include "xe_mmio.h" @@ -925,6 +926,10 @@ int xe_device_probe(struct xe_device *xe) if (err) goto err_unregister_display; =20 + err =3D xe_i2c_probe(xe); + if (err) + goto err_unregister_display; + for_each_gt(gt, xe, id) xe_gt_sanitize_freq(gt); =20 diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_d= evice_types.h index 6aca4b1a2824..dffff2d80f18 100644 --- a/drivers/gpu/drm/xe/xe_device_types.h +++ b/drivers/gpu/drm/xe/xe_device_types.h @@ -34,6 +34,7 @@ struct dram_info; struct intel_display; struct intel_dg_nvm_dev; struct xe_ggtt; +struct xe_i2c; struct xe_pat_ops; struct xe_pxp; =20 @@ -583,6 +584,9 @@ struct xe_device { /** @pmu: performance monitoring unit */ struct xe_pmu pmu; =20 + /** @i2c: I2C host controller */ + struct xe_i2c *i2c; + /** @atomic_svm_timeslice_ms: Atomic SVM fault timeslice MS */ u32 atomic_svm_timeslice_ms; =20 diff --git a/drivers/gpu/drm/xe/xe_i2c.c b/drivers/gpu/drm/xe/xe_i2c.c new file mode 100644 index 000000000000..bfbfe1de7f77 --- /dev/null +++ b/drivers/gpu/drm/xe/xe_i2c.c @@ -0,0 +1,297 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ +/* + * Intel Xe I2C attached Microcontroller Units (MCU) + * + * Copyright (C) 2025 Intel Corporation. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "regs/xe_i2c_regs.h" +#include "regs/xe_irq_regs.h" + +#include "xe_device.h" +#include "xe_device_types.h" +#include "xe_i2c.h" +#include "xe_mmio.h" +#include "xe_platform_types.h" + +/** + * DOC: Xe I2C devices + * + * Register platform device for the I2C host controller (Synpsys DesignWar= e I2C) + * if the registers of that controller are mapped to the MMIO, and also th= e I2C + * client device for the Add-In Management Controller (the MCU) attached t= o the + * host controller. + * + * See drivers/i2c/busses/i2c-designware-* for more information on the I2C= host + * controller. + */ + +static const char adapter_name[] =3D "i2c_designware"; + +static const struct property_entry xe_i2c_adapter_properties[] =3D { + PROPERTY_ENTRY_STRING("compatible", "intel,xe-i2c"), + PROPERTY_ENTRY_U32("clock-frequency", I2C_MAX_FAST_MODE_PLUS_FREQ), + { } +}; + +static inline void xe_i2c_read_endpoint(struct xe_mmio *mmio, void *ep) +{ + u32 *val =3D ep; + + val[0] =3D xe_mmio_read32(mmio, REG_SG_REMAP_ADDR_PREFIX); + val[1] =3D xe_mmio_read32(mmio, REG_SG_REMAP_ADDR_POSTFIX); +} + +static void xe_i2c_client_work(struct work_struct *work) +{ + struct xe_i2c *i2c =3D container_of(work, struct xe_i2c, work); + struct i2c_board_info info =3D { + .type =3D "amc", + .flags =3D I2C_CLIENT_HOST_NOTIFY, + .addr =3D i2c->ep.addr[1], + }; + + i2c->client[0] =3D i2c_new_client_device(i2c->adapter, &info); +} + +static int xe_i2c_notifier(struct notifier_block *nb, unsigned long action= , void *data) +{ + struct xe_i2c *i2c =3D container_of(nb, struct xe_i2c, bus_notifier); + struct i2c_adapter *adapter =3D i2c_verify_adapter(data); + struct device *dev =3D data; + + if (action =3D=3D BUS_NOTIFY_ADD_DEVICE && + adapter && dev->parent =3D=3D &i2c->pdev->dev) { + i2c->adapter =3D adapter; + schedule_work(&i2c->work); + return NOTIFY_OK; + } + + return NOTIFY_DONE; +} + +static int xe_i2c_register_adapter(struct xe_i2c *i2c) +{ + struct pci_dev *pci =3D to_pci_dev(i2c->drm_dev); + struct platform_device *pdev; + struct fwnode_handle *fwnode; + int ret; + + fwnode =3D fwnode_create_software_node(xe_i2c_adapter_properties, NULL); + if (!fwnode) + return -ENOMEM; + + /* + * Not using platform_device_register_full() here because we don't have + * a handle to the platform_device before it returns. xe_i2c_notifier() + * uses that handle, but it may be called before + * platform_device_register_full() is done. + */ + pdev =3D platform_device_alloc(adapter_name, pci_dev_id(pci)); + if (!pdev) { + ret =3D -ENOMEM; + goto err_fwnode_remove; + } + + if (i2c->adapter_irq) { + struct resource res =3D { }; + + res.start =3D i2c->adapter_irq; + res.name =3D "xe_i2c"; + res.flags =3D IORESOURCE_IRQ; + + ret =3D platform_device_add_resources(pdev, &res, 1); + if (ret) + goto err_pdev_put; + } + + pdev->dev.parent =3D i2c->drm_dev; + pdev->dev.fwnode =3D fwnode; + i2c->adapter_node =3D fwnode; + i2c->pdev =3D pdev; + + ret =3D platform_device_add(pdev); + if (ret) + goto err_pdev_put; + + return 0; + +err_pdev_put: + platform_device_put(pdev); +err_fwnode_remove: + fwnode_remove_software_node(fwnode); + + return ret; +} + +static void xe_i2c_unregister_adapter(struct xe_i2c *i2c) +{ + platform_device_unregister(i2c->pdev); + fwnode_remove_software_node(i2c->adapter_node); +} + +/** + * xe_i2c_irq_handler: Handler for I2C interrupts + * @xe: xe device instance + * @master_ctl: interrupt register + * + * Forward interrupts generated by the I2C host adapter to the I2C host ad= apter + * driver. + */ +void xe_i2c_irq_handler(struct xe_device *xe, u32 master_ctl) +{ + if (!xe->i2c || !xe->i2c->adapter_irq) + return; + + if (master_ctl & I2C_IRQ) + generic_handle_irq_safe(xe->i2c->adapter_irq); +} + +static int xe_i2c_irq_map(struct irq_domain *h, unsigned int virq, + irq_hw_number_t hw_irq_num) +{ + irq_set_chip_and_handler(virq, &dummy_irq_chip, handle_simple_irq); + return 0; +} + +static const struct irq_domain_ops xe_i2c_irq_ops =3D { + .map =3D xe_i2c_irq_map, +}; + +static int xe_i2c_create_irq(struct xe_i2c *i2c) +{ + struct irq_domain *domain; + + if (!(i2c->ep.capabilities & XE_I2C_EP_CAP_IRQ)) + return 0; + + domain =3D irq_domain_create_linear(dev_fwnode(i2c->drm_dev), 1, &xe_i2c_= irq_ops, NULL); + if (!domain) + return -ENOMEM; + + i2c->adapter_irq =3D irq_create_mapping(domain, 0); + i2c->irqdomain =3D domain; + + return 0; +} + +static void xe_i2c_remove_irq(struct xe_i2c *i2c) +{ + if (i2c->irqdomain) { + irq_dispose_mapping(i2c->adapter_irq); + irq_domain_remove(i2c->irqdomain); + } +} + +static int xe_i2c_read(void *context, unsigned int reg, unsigned int *val) +{ + struct xe_i2c *i2c =3D context; + + *val =3D xe_mmio_read32(i2c->mmio, XE_REG(reg + I2C_MEM_SPACE_OFFSET)); + + return 0; +} + +static int xe_i2c_write(void *context, unsigned int reg, unsigned int val) +{ + struct xe_i2c *i2c =3D context; + + xe_mmio_write32(i2c->mmio, XE_REG(reg + I2C_MEM_SPACE_OFFSET), val); + + return 0; +} + +static const struct regmap_config i2c_regmap_config =3D { + .reg_bits =3D 32, + .val_bits =3D 32, + .reg_read =3D xe_i2c_read, + .reg_write =3D xe_i2c_write, + .fast_io =3D true, +}; + +static void xe_i2c_remove(void *data) +{ + struct xe_i2c *i2c =3D data; + int i; + + for (i =3D 0; i < XE_I2C_MAX_CLIENTS; i++) + i2c_unregister_device(i2c->client[i]); + + bus_unregister_notifier(&i2c_bus_type, &i2c->bus_notifier); + xe_i2c_unregister_adapter(i2c); + xe_i2c_remove_irq(i2c); +} + +/** + * xe_i2c_probe: Probe the I2C host adapter and the I2C clients attached t= o it + * @xe: xe device instance + * + * Register all the I2C devices described in the I2C Endpoint data structu= re. + * + * Return: 0 on success, error code on failure + */ +int xe_i2c_probe(struct xe_device *xe) +{ + struct xe_i2c_endpoint ep; + struct regmap *regmap; + struct xe_i2c *i2c; + int ret; + + xe_i2c_read_endpoint(xe_root_tile_mmio(xe), &ep); + if (ep.cookie !=3D XE_I2C_EP_COOKIE_DEVICE) + return 0; + + i2c =3D devm_kzalloc(xe->drm.dev, sizeof(*i2c), GFP_KERNEL); + if (!i2c) + return -ENOMEM; + + INIT_WORK(&i2c->work, xe_i2c_client_work); + i2c->mmio =3D xe_root_tile_mmio(xe); + i2c->drm_dev =3D xe->drm.dev; + i2c->ep =3D ep; + + regmap =3D devm_regmap_init(i2c->drm_dev, NULL, i2c, &i2c_regmap_config); + if (IS_ERR(regmap)) + return PTR_ERR(regmap); + + i2c->bus_notifier.notifier_call =3D xe_i2c_notifier; + ret =3D bus_register_notifier(&i2c_bus_type, &i2c->bus_notifier); + if (ret) + return ret; + + ret =3D xe_i2c_create_irq(i2c); + if (ret) + goto err_unregister_notifier; + + ret =3D xe_i2c_register_adapter(i2c); + if (ret) + goto err_remove_irq; + + return devm_add_action_or_reset(i2c->drm_dev, xe_i2c_remove, i2c); + +err_remove_irq: + xe_i2c_remove_irq(i2c); + +err_unregister_notifier: + bus_unregister_notifier(&i2c_bus_type, &i2c->bus_notifier); + + return ret; +} diff --git a/drivers/gpu/drm/xe/xe_i2c.h b/drivers/gpu/drm/xe/xe_i2c.h new file mode 100644 index 000000000000..7ea40f4e4aa4 --- /dev/null +++ b/drivers/gpu/drm/xe/xe_i2c.h @@ -0,0 +1,58 @@ +/* SPDX-License-Identifier: MIT */ +#ifndef _XE_I2C_H_ +#define _XE_I2C_H_ + +#include +#include +#include +#include + +struct device; +struct fwnode_handle; +struct i2c_adapter; +struct i2c_client; +struct irq_domain; +struct platform_device; +struct xe_device; +struct xe_mmio; + +#define XE_I2C_MAX_CLIENTS 3 + +#define XE_I2C_EP_COOKIE_DEVICE 0xde + +/* Endpoint Capabilities */ +#define XE_I2C_EP_CAP_IRQ BIT(0) + +struct xe_i2c_endpoint { + u8 cookie; + u8 capabilities; + u16 addr[XE_I2C_MAX_CLIENTS]; +}; + +struct xe_i2c { + struct fwnode_handle *adapter_node; + struct platform_device *pdev; + struct i2c_adapter *adapter; + struct i2c_client *client[XE_I2C_MAX_CLIENTS]; + + struct notifier_block bus_notifier; + struct work_struct work; + + struct irq_domain *irqdomain; + int adapter_irq; + + struct xe_i2c_endpoint ep; + struct device *drm_dev; + + struct xe_mmio *mmio; +}; + +#if IS_ENABLED(CONFIG_I2C) +int xe_i2c_probe(struct xe_device *xe); +void xe_i2c_irq_handler(struct xe_device *xe, u32 master_ctl); +#else +static inline int xe_i2c_probe(struct xe_device *xe) { return 0; } +static inline void xe_i2c_irq_handler(struct xe_device *xe, u32 master_ctl= ) { } +#endif + +#endif diff --git a/drivers/gpu/drm/xe/xe_irq.c b/drivers/gpu/drm/xe/xe_irq.c index 5362d3174b06..c43e62dc692e 100644 --- a/drivers/gpu/drm/xe/xe_irq.c +++ b/drivers/gpu/drm/xe/xe_irq.c @@ -18,6 +18,7 @@ #include "xe_gt.h" #include "xe_guc.h" #include "xe_hw_engine.h" +#include "xe_i2c.h" #include "xe_memirq.h" #include "xe_mmio.h" #include "xe_pxp.h" @@ -476,6 +477,7 @@ static irqreturn_t dg1_irq_handler(int irq, void *arg) if (xe->info.has_heci_cscfi) xe_heci_csc_irq_handler(xe, master_ctl); xe_display_irq_handler(xe, master_ctl); + xe_i2c_irq_handler(xe, master_ctl); gu_misc_iir =3D gu_misc_irq_ack(xe, master_ctl); } } --=20 2.47.2 From nobody Wed Oct 8 16:06:07 2025 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14]) (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 2C8012E88A5; Thu, 26 Jun 2025 13:56:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.14 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750946190; cv=none; b=mkWSSCNwm3Vdb9+qByw4NMRuNrJJj+QhUNNrElK7Ih/AYwWKcBRVVISpINOkI2B8bRf1E7Y/uTG1Gye7LOkAedkw1ArJBKlHfI9+elCnjKUA7aL1VrNxDeLt40KkHL7uAvbcIhFELH/x+IohR+IDhYWS5w426YBk8DTFskPiX0o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750946190; c=relaxed/simple; bh=aF3uTK1iO8x8oyAb433tOUT+wof8ZOyY6mEwIXBqq/w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nAD3oqWrOPW1Cb0MZW4z1dDLPo4DnN15Flen2IBls1TIvLx2fk/kSPiAjtAZ7YE2rVo+Zpq+MdJR6lnvQVfSKVc/SB/n6RZUyAoePhFt6izJJA1HUC5cXufMoh7+JPCVJF5p8xAiGT41vDsGTKa3iXVJLw42K64OhBn47KHH+Xo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=RkUKt6c+; arc=none smtp.client-ip=192.198.163.14 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="RkUKt6c+" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1750946189; x=1782482189; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=aF3uTK1iO8x8oyAb433tOUT+wof8ZOyY6mEwIXBqq/w=; b=RkUKt6c+AZ9dYWYIzIXpNj5srmHT8AE7AYDnbgkT2LK86R3PKOr54mag K9C9iZmujgbS6e0rEgopbwJMpHgrsB5FJjefhMokgtdCtxz2ZKba35pcZ G3x7Shi7At7gwotKmbkMI0wqwuPgjk51llTxWOOO1r0XAwli93NRPhxzP zmd7QZzxE6t03gIsp7e2l2Jpdt47w32m+CV1ShHnlK1jSeMqB3acWSuXI Ucm11fbI9kXFivbbN9kEHNRsn9KRJULcn522EQh+3SXglwRwqGQzjdcGt Jrj60PPUbPDwjMPYrjNpac52Q/bdOtpl6wtmSJ3WC4gc9/46kN2aKY6Do A==; X-CSE-ConnectionGUID: JCPUOzqOS1OfacVTr8GyrA== X-CSE-MsgGUID: ZBETEthpTdOtrJ5ZEuXJaw== X-IronPort-AV: E=McAfee;i="6800,10657,11475"; a="53316417" X-IronPort-AV: E=Sophos;i="6.16,267,1744095600"; d="scan'208";a="53316417" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Jun 2025 06:56:29 -0700 X-CSE-ConnectionGUID: Bsjc+l4sQBCI2jBr/szA9w== X-CSE-MsgGUID: beV7cXG8TJW9NGApDNokAA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.16,267,1744095600"; d="scan'208";a="152146969" Received: from black.fi.intel.com (HELO black.fi.intel.com.) ([10.237.72.28]) by fmviesa007.fm.intel.com with ESMTP; 26 Jun 2025 06:56:24 -0700 From: Heikki Krogerus To: Lucas De Marchi , =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= , Rodrigo Vivi Cc: Jarkko Nikula , David Airlie , Simona Vetter , Andy Shevchenko , Mika Westerberg , Jan Dabros , Andi Shyti , Raag Jadav , "Tauro, Riana" , "Adatrao, Srinivasa" , "Michael J. Ruhl" , intel-xe@lists.freedesktop.org, linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Karthik Poosa Subject: [PATCH v4 3/4] drm/xe/pm: Wire up suspend/resume for I2C controller Date: Thu, 26 Jun 2025 16:56:08 +0300 Message-ID: <20250626135610.299943-4-heikki.krogerus@linux.intel.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250626135610.299943-1-heikki.krogerus@linux.intel.com> References: <20250626135610.299943-1-heikki.krogerus@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Raag Jadav Wire up suspend/resume handles for I2C controller to match its power state with SGUnit. Signed-off-by: Raag Jadav Reviewed-by: Karthik Poosa Signed-off-by: Heikki Krogerus --- drivers/gpu/drm/xe/regs/xe_i2c_regs.h | 5 +++++ drivers/gpu/drm/xe/xe_i2c.c | 29 +++++++++++++++++++++++++++ drivers/gpu/drm/xe/xe_i2c.h | 4 ++++ drivers/gpu/drm/xe/xe_pm.c | 9 +++++++++ 4 files changed, 47 insertions(+) diff --git a/drivers/gpu/drm/xe/regs/xe_i2c_regs.h b/drivers/gpu/drm/xe/reg= s/xe_i2c_regs.h index 92dae4487614..af781c8e4a80 100644 --- a/drivers/gpu/drm/xe/regs/xe_i2c_regs.h +++ b/drivers/gpu/drm/xe/regs/xe_i2c_regs.h @@ -2,6 +2,8 @@ #ifndef _XE_I2C_REGS_H_ #define _XE_I2C_REGS_H_ =20 +#include + #include "xe_reg_defs.h" #include "xe_regs.h" =20 @@ -12,4 +14,7 @@ #define REG_SG_REMAP_ADDR_PREFIX XE_REG(SOC_BASE + 0x0164) #define REG_SG_REMAP_ADDR_POSTFIX XE_REG(SOC_BASE + 0x0168) =20 +#define I2C_CONFIG_CMD XE_REG(I2C_CONFIG_SPACE_OFFSET + PCI_COMMAND) +#define I2C_CONFIG_PMCSR XE_REG(I2C_CONFIG_SPACE_OFFSET + 0x84) + #endif /* _XE_I2C_REGS_H_ */ diff --git a/drivers/gpu/drm/xe/xe_i2c.c b/drivers/gpu/drm/xe/xe_i2c.c index bfbfe1de7f77..0227fcba2168 100644 --- a/drivers/gpu/drm/xe/xe_i2c.c +++ b/drivers/gpu/drm/xe/xe_i2c.c @@ -227,6 +227,31 @@ static const struct regmap_config i2c_regmap_config = =3D { .fast_io =3D true, }; =20 +void xe_i2c_pm_suspend(struct xe_device *xe) +{ + struct xe_mmio *mmio =3D xe_root_tile_mmio(xe); + + if (!xe->i2c || xe->i2c->ep.cookie !=3D XE_I2C_EP_COOKIE_DEVICE) + return; + + xe_mmio_rmw32(mmio, I2C_CONFIG_PMCSR, PCI_PM_CTRL_STATE_MASK, PCI_D3hot); + drm_dbg(&xe->drm, "pmcsr: 0x%08x\n", xe_mmio_read32(mmio, I2C_CONFIG_PMCS= R)); +} + +void xe_i2c_pm_resume(struct xe_device *xe, bool d3cold) +{ + struct xe_mmio *mmio =3D xe_root_tile_mmio(xe); + + if (!xe->i2c || xe->i2c->ep.cookie !=3D XE_I2C_EP_COOKIE_DEVICE) + return; + + if (d3cold) + xe_mmio_rmw32(mmio, I2C_CONFIG_CMD, 0, PCI_COMMAND_MEMORY); + + xe_mmio_rmw32(mmio, I2C_CONFIG_PMCSR, PCI_PM_CTRL_STATE_MASK, PCI_D0); + drm_dbg(&xe->drm, "pmcsr: 0x%08x\n", xe_mmio_read32(mmio, I2C_CONFIG_PMCS= R)); +} + static void xe_i2c_remove(void *data) { struct xe_i2c *i2c =3D data; @@ -267,6 +292,10 @@ int xe_i2c_probe(struct xe_device *xe) i2c->mmio =3D xe_root_tile_mmio(xe); i2c->drm_dev =3D xe->drm.dev; i2c->ep =3D ep; + xe->i2c =3D i2c; + + /* PCI PM isn't aware of this device, bring it up and match it with SGUni= t state. */ + xe_i2c_pm_resume(xe, true); =20 regmap =3D devm_regmap_init(i2c->drm_dev, NULL, i2c, &i2c_regmap_config); if (IS_ERR(regmap)) diff --git a/drivers/gpu/drm/xe/xe_i2c.h b/drivers/gpu/drm/xe/xe_i2c.h index 7ea40f4e4aa4..b767ed8ce52b 100644 --- a/drivers/gpu/drm/xe/xe_i2c.h +++ b/drivers/gpu/drm/xe/xe_i2c.h @@ -50,9 +50,13 @@ struct xe_i2c { #if IS_ENABLED(CONFIG_I2C) int xe_i2c_probe(struct xe_device *xe); void xe_i2c_irq_handler(struct xe_device *xe, u32 master_ctl); +void xe_i2c_pm_suspend(struct xe_device *xe); +void xe_i2c_pm_resume(struct xe_device *xe, bool d3cold); #else static inline int xe_i2c_probe(struct xe_device *xe) { return 0; } static inline void xe_i2c_irq_handler(struct xe_device *xe, u32 master_ctl= ) { } +static inline void xe_i2c_pm_suspend(struct xe_device *xe) { } +static inline void xe_i2c_pm_resume(struct xe_device *xe, bool d3cold) { } #endif =20 #endif diff --git a/drivers/gpu/drm/xe/xe_pm.c b/drivers/gpu/drm/xe/xe_pm.c index 26e95460af87..46471e166b96 100644 --- a/drivers/gpu/drm/xe/xe_pm.c +++ b/drivers/gpu/drm/xe/xe_pm.c @@ -19,6 +19,7 @@ #include "xe_ggtt.h" #include "xe_gt.h" #include "xe_guc.h" +#include "xe_i2c.h" #include "xe_irq.h" #include "xe_pcode.h" #include "xe_pxp.h" @@ -146,6 +147,8 @@ int xe_pm_suspend(struct xe_device *xe) =20 xe_display_pm_suspend_late(xe); =20 + xe_i2c_pm_suspend(xe); + drm_dbg(&xe->drm, "Device suspended\n"); return 0; =20 @@ -191,6 +194,8 @@ int xe_pm_resume(struct xe_device *xe) if (err) goto err; =20 + xe_i2c_pm_resume(xe, xe->d3cold.allowed); + xe_irq_resume(xe); =20 for_each_gt(gt, xe, id) @@ -484,6 +489,8 @@ int xe_pm_runtime_suspend(struct xe_device *xe) =20 xe_display_pm_runtime_suspend_late(xe); =20 + xe_i2c_pm_suspend(xe); + xe_rpm_lockmap_release(xe); xe_pm_write_callback_task(xe, NULL); return 0; @@ -531,6 +538,8 @@ int xe_pm_runtime_resume(struct xe_device *xe) goto out; } =20 + xe_i2c_pm_resume(xe, xe->d3cold.allowed); + xe_irq_resume(xe); =20 for_each_gt(gt, xe, id) --=20 2.47.2 From nobody Wed Oct 8 16:06:07 2025 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14]) (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 D2C8A219317; Thu, 26 Jun 2025 13:56:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.14 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750946207; cv=none; b=Vc/15n1XW5bsS9Bves+AG1Dxrq3pJKMA5uJcsq+6UAFpaiv0yUMc2N17+7GHt///lyW1tzrRJAZVZrapBAbSsMdPOIAvGwpbJArZg0DsVA5yms0YntFWhlSfnkTBnC166KdWdLnGpEhq6xfxKITZE3wr6CDHbZLgmryqPbdeu20= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750946207; c=relaxed/simple; bh=FSCdKuBZu83ZlNuhWTKve1fHQ1SiZ+gddU/oetdw40o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GRuJRHDY7vc/9IXwU213g9KCw/Ksa7Ln5hoorpMCCULegzg8lp5sAMIeqji81L0nUeBqZ7T6rUGhgKW8ZTi4GqdLT3/fXgkkusqXFVj9KlA/wh0tML8D2hvTlTZSJTMP3fEqFjPqVjZRRmcuN+MfVPPmlv3vugzCzxGvDuM27Tc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=Gu9wGki3; arc=none smtp.client-ip=192.198.163.14 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="Gu9wGki3" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1750946206; x=1782482206; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=FSCdKuBZu83ZlNuhWTKve1fHQ1SiZ+gddU/oetdw40o=; b=Gu9wGki36/FQ9vlpgReEXEHXZlF3N5bSJmXhweqPF5Zomh/KIh/aDIyP PhlpGsytsaD5/MAZLzBtnhDUrH59LJb9OFly6QbnYUNhniL+rFj0E2GWJ zZJbnGnaoJn3w1U7qtlsBKHaR11ysXBD9dIILX7JI6YUaSF0yLU6M4NcM +V7bBw4zCAK1rxOmj0ThMvLRVdyCLtfeh2DrbGHezwYA0h2PT6gt+oond K8I75uw3XKT6nxqSf2QCICxb04ZDaSdCloMYczg6vuZa9hkpM2CmKlntq 38SrwinSdhH11YtwfXVJyc9jiDtpIFJ4HsVl10xxYDWZ7c2xh6E1CcqD8 A==; X-CSE-ConnectionGUID: WyJBmFUyQ5uV4+Dtl0+mXw== X-CSE-MsgGUID: vbdxUcRWTmavgD5Bu2NpYA== X-IronPort-AV: E=McAfee;i="6800,10657,11475"; a="53316432" X-IronPort-AV: E=Sophos;i="6.16,267,1744095600"; d="scan'208";a="53316432" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Jun 2025 06:56:34 -0700 X-CSE-ConnectionGUID: 09+Pw5CDQx2o0FEHa7ZAsg== X-CSE-MsgGUID: aQiaTLYjRf2OjVS5zgbIZQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.16,267,1744095600"; d="scan'208";a="152146975" Received: from black.fi.intel.com (HELO black.fi.intel.com.) ([10.237.72.28]) by fmviesa007.fm.intel.com with ESMTP; 26 Jun 2025 06:56:29 -0700 From: Heikki Krogerus To: Lucas De Marchi , =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= , Rodrigo Vivi Cc: Jarkko Nikula , David Airlie , Simona Vetter , Andy Shevchenko , Mika Westerberg , Jan Dabros , Andi Shyti , Raag Jadav , "Tauro, Riana" , "Adatrao, Srinivasa" , "Michael J. Ruhl" , intel-xe@lists.freedesktop.org, linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 4/4] drm/xe/xe_i2c: Add support for i2c in survivability mode Date: Thu, 26 Jun 2025 16:56:09 +0300 Message-ID: <20250626135610.299943-5-heikki.krogerus@linux.intel.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250626135610.299943-1-heikki.krogerus@linux.intel.com> References: <20250626135610.299943-1-heikki.krogerus@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Riana Tauro Initialize i2c in survivability mode to allow firmware update of Add-In Management Controller (AMC) in survivability mode Signed-off-by: Riana Tauro Reviewed-by: Raag Jadav Signed-off-by: Heikki Krogerus --- drivers/gpu/drm/xe/xe_survivability_mode.c | 23 ++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_survivability_mode.c b/drivers/gpu/drm/x= e/xe_survivability_mode.c index 1f710b3fc599..3800cc855c22 100644 --- a/drivers/gpu/drm/xe/xe_survivability_mode.c +++ b/drivers/gpu/drm/xe/xe_survivability_mode.c @@ -14,6 +14,7 @@ #include "xe_device.h" #include "xe_gt.h" #include "xe_heci_gsc.h" +#include "xe_i2c.h" #include "xe_mmio.h" #include "xe_pcode_api.h" #include "xe_vsec.h" @@ -173,20 +174,26 @@ static int enable_survivability_mode(struct pci_dev *= pdev) survivability->mode =3D true; =20 ret =3D xe_heci_gsc_init(xe); - if (ret) { - /* - * But if it fails, device can't enter survivability - * so move it back for correct error handling - */ - survivability->mode =3D false; - return ret; - } + if (ret) + goto err; =20 xe_vsec_init(xe); =20 + ret =3D xe_i2c_probe(xe); + if (ret) + goto err; + dev_err(dev, "In Survivability Mode\n"); =20 return 0; + +err: + /* + * But if it fails, device can't enter survivability + * so move it back for correct error handling + */ + survivability->mode =3D false; + return ret; } =20 /** --=20 2.47.2