From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.15]) (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 95BBA5C96; Tue, 17 Jun 2025 11:27:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.15 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750159673; cv=none; b=KbuIKv4oPVve8hQkaalMfvjGijbDzDnY5AEknE/FvUEBZLYLoQ124qhf0/+pQ5BVMHzzu+DhmS1riz/OflRdy64kYOw5sUa5SAUdQ76lqlk8qMkvlaZFDpVL0TF/EnPqtkDDeEzdsdcCYPLnfEWVJX1GU4MUIaWfwzFmBX0FQwg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750159673; c=relaxed/simple; bh=ruUqN6ft/arA1UJpeej5ZFmbmNVv7kSpek2zyp69t6I=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=Q+fTYOPBQmMdZDzmJIIIj15ZVYhePmvOUq1R3VQbLCbVFyibU0kzxu6VBLFTcf3a8x2R+NKMnG/z+9IbKftnz9gzuus81/2wZJ54Y0PoBsGHDDuFqZFKnPs9F8mSNOnUzp4T75r6ak8zZISaJWqoyqw39SDCrSOSl7LYkTL+IwI= 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=HUeYjC6I; arc=none smtp.client-ip=192.198.163.15 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="HUeYjC6I" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1750159672; x=1781695672; h=date:from:to:cc:subject:message-id:references: mime-version:in-reply-to; bh=ruUqN6ft/arA1UJpeej5ZFmbmNVv7kSpek2zyp69t6I=; b=HUeYjC6ImNYi8JToz1bjQnhpfENffykCHksmD3dpyHksaXMwoPMOpbLL XKDxc7wUOFz7HQYPYY0PMK05HyrDJDbZMOd/DboHqs5pPhJN066S4MmxI 3IHpeKinrOgpPZv7B4c1qupQgiFhaJVix6C95lC6uaeBoj9y85Cs/8msQ yhtNyqybue7ni1biCSd3RrlFlShpQdsiOeIf0EqyzkqFqMNfV85/5WXCu 3zvw4n/IeHNZfsI5ID1dA7kwvZkPgkqEoCodcc5s0DtFIqZpKQVC81mEn kq2xLPLpDPrVieHESMNYo31ZX2jHWbF/KxubnyjHdKTKavO5ewCuj4LVh Q==; X-CSE-ConnectionGUID: wUWNs3HxR4u/WNOjKl5tGQ== X-CSE-MsgGUID: ob1ToZdySSGfgfvRsrlH0w== X-IronPort-AV: E=McAfee;i="6800,10657,11465"; a="52467466" X-IronPort-AV: E=Sophos;i="6.16,243,1744095600"; d="scan'208";a="52467466" Received: from orviesa003.jf.intel.com ([10.64.159.143]) by fmvoesa109.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jun 2025 04:27:51 -0700 X-CSE-ConnectionGUID: 71PAEoGbTJaW0q6ROsnRyw== X-CSE-MsgGUID: pDuJ6fB4Sm6pi5AD2l8xmw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.16,243,1744095600"; d="scan'208";a="153518352" Received: from kuha.fi.intel.com ([10.237.72.152]) by orviesa003.jf.intel.com with SMTP; 17 Jun 2025 04:27:45 -0700 Received: by kuha.fi.intel.com (sSMTP sendmail emulation); Tue, 17 Jun 2025 14:27:44 +0300 Date: Tue, 17 Jun 2025 14:27:44 +0300 From: Heikki Krogerus To: Rodrigo Vivi , "Michael J. Ruhl" Cc: Lucas De Marchi , Thomas =?iso-8859-1?Q?Hellstr=F6m?= , 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: Re: [PATCH v3 2/4] drm/xe: Support for I2C attached MCUs Message-ID: References: <20250612132450.3293248-1-heikki.krogerus@linux.intel.com> <20250612132450.3293248-3-heikki.krogerus@linux.intel.com> Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Hi Rodrigo, Thank you for the review. On Mon, Jun 16, 2025 at 04:30:03PM -0400, Rodrigo Vivi wrote: > On Thu, Jun 12, 2025 at 04:24:48PM +0300, Heikki Krogerus wrote: > > 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 | 270 ++++++++++++++++++++++++++ > > drivers/gpu/drm/xe/xe_i2c.h | 58 ++++++ > > drivers/gpu/drm/xe/xe_irq.c | 2 + > > 11 files changed, 360 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 c57f1da0791d..5c162031fc3f 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 > > Experimental driver for Intel Xe series GPUs > > > > diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile > > index f5f5775acdc0..293552fc5aaf 100644 > > --- a/drivers/gpu/drm/xe/Makefile > > +++ b/drivers/gpu/drm/xe/Makefile > > @@ -124,6 +124,7 @@ xe-y += xe_bb.o \ > > xe_wait_user_fence.o \ > > xe_wopcm.o > > > > +xe-$(CONFIG_I2C) += xe_i2c.o > > xe-$(CONFIG_HMM_MIRROR) += xe_hmm.o > > xe-$(CONFIG_DRM_XE_GPUSVM) += xe_svm.o > > > > diff --git a/drivers/gpu/drm/xe/regs/xe_i2c_regs.h b/drivers/gpu/drm/xe/regs/xe_i2c_regs.h > > new file mode 100644 > > index 000000000000..fa7223e6ce9e > > --- /dev/null > > +++ b/drivers/gpu/drm/xe/regs/xe_i2c_regs.h > > @@ -0,0 +1,15 @@ > > +/* SPDX-License-Identifier: GPL-2.0 */ > > +#ifndef _XE_I2C_REGS_H_ > > +#define _XE_I2C_REGS_H_ > > + > > +#include "xe_reg_defs.h" > > +#include "xe_regs.h" > > + > > +#define I2C_CONFIG_SPACE_OFFSET (SOC_BASE + 0xf6000) > > +#define I2C_MEM_SPACE_OFFSET (SOC_BASE + 0xf7400) > > +#define I2C_BRIDGE_OFFSET (SOC_BASE + 0xd9000) > > + > > +#define CLIENT_DISC_COOKIE XE_REG(SOC_BASE + 0x0164) > > +#define CLIENT_DISC_ADDRESS XE_REG(SOC_BASE + 0x0168) > > Could you please send me some pointers of the spec for this registers > so I can help on the review here? Done. > > + > > +#endif /* _XE_I2C_REGS_H_ */ > > diff --git a/drivers/gpu/drm/xe/regs/xe_irq_regs.h b/drivers/gpu/drm/xe/regs/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) > > > > /* > > 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_ > > > > -#define SOC_BASE 0x280000 > > +#include "xe_regs.h" > > > > #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 @@ > > > > #include "regs/xe_reg_defs.h" > > > > +#define SOC_BASE 0x280000 > > + > > #define GU_CNTL_PROTECTED XE_REG(0x10100C) > > #define DRIVERINT_FLR_DIS REG_BIT(31) > > > > diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c > > index 7e87344943cd..ca098ed532b5 100644 > > --- a/drivers/gpu/drm/xe/xe_device.c > > +++ b/drivers/gpu/drm/xe/xe_device.c > > @@ -42,6 +42,7 @@ > > #include "xe_guc.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" > > @@ -921,6 +922,10 @@ int xe_device_probe(struct xe_device *xe) > > if (err) > > goto err_unregister_display; > > > > + err = xe_i2c_probe(xe); > > + if (err) > > + goto err_unregister_display; > > + > > for_each_gt(gt, xe, id) > > xe_gt_sanitize_freq(gt); > > > > diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h > > index ac27389ccb8b..8f3c5ea58034 100644 > > --- a/drivers/gpu/drm/xe/xe_device_types.h > > +++ b/drivers/gpu/drm/xe/xe_device_types.h > > @@ -33,6 +33,7 @@ > > struct dram_info; > > struct intel_display; > > struct xe_ggtt; > > +struct xe_i2c; > > struct xe_pat_ops; > > struct xe_pxp; > > > > @@ -573,6 +574,9 @@ struct xe_device { > > /** @pmu: performance monitoring unit */ > > struct xe_pmu pmu; > > > > + /** @i2c: I2C host controller */ > > + struct xe_i2c *i2c; > > + > > /** @atomic_svm_timeslice_ms: Atomic SVM fault timeslice MS */ > > u32 atomic_svm_timeslice_ms; > > > > diff --git a/drivers/gpu/drm/xe/xe_i2c.c b/drivers/gpu/drm/xe/xe_i2c.c > > new file mode 100644 > > index 000000000000..3d649602ede8 > > --- /dev/null > > +++ b/drivers/gpu/drm/xe/xe_i2c.c > > @@ -0,0 +1,270 @@ > > +// SPDX-License-Identifier: GPL-2.0 > > Does it really need to be GPL or could it be MIT? > > (If you copied code from other files that are GPL, then it needs > to be GPL) Michael, do we need to use GPL here, or is MIT okay? > > +/* > > + * 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" > > + > > +/* Synopsys DesignWare I2C Host Adapter */ > > +static const char adapter_name[] = "i2c_designware"; > > + > > +static const struct property_entry xe_i2c_adapter_properties[] = { > > + 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 = ep; > > + > > + val[0] = xe_mmio_read32(mmio, CLIENT_DISC_COOKIE); > > + val[1] = xe_mmio_read32(mmio, CLIENT_DISC_ADDRESS); > > +} > > + > > +static void xe_i2c_client_work(struct work_struct *work) > > +{ > > + struct xe_i2c *i2c = container_of(work, struct xe_i2c, work); > > + struct i2c_board_info info = { > > + .type = "amc", > > + .flags = I2C_CLIENT_HOST_NOTIFY, > > + .addr = i2c->ep.addr[1], > > + }; > > + > > + i2c->client[0] = 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 = container_of(nb, struct xe_i2c, bus_notifier); > > + struct i2c_adapter *adapter = i2c_verify_adapter(data); > > + struct device *dev = data; > > + > > + if (action == BUS_NOTIFY_ADD_DEVICE && > > + adapter && dev->parent == &i2c->pdev->dev) { > > + i2c->adapter = 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 = to_pci_dev(i2c->drm_dev); > > + struct platform_device *pdev; > > + struct fwnode_handle *fwnode; > > + int ret; > > + > > + fwnode = 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 = platform_device_alloc(adapter_name, pci_dev_id(pci)); > > + if (!pdev) { > > + ret = -ENOMEM; > > + goto err_fwnode_remove; > > + } > > + > > + if (i2c->adapter_irq) { > > + struct resource res = { }; > > + > > + res.start = i2c->adapter_irq; > > + res.name = "xe_i2c"; > > + res.flags = IORESOURCE_IRQ; > > + > > + ret = platform_device_add_resources(pdev, &res, 1); > > + if (ret) > > + goto err_pdev_put; > > + } > > + > > + pdev->dev.parent = i2c->drm_dev; > > + pdev->dev.fwnode = fwnode; > > + i2c->adapter_node = fwnode; > > + i2c->pdev = pdev; > > + > > + ret = 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); > > +} > > + > > +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 = { > > + .map = 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 = irq_domain_create_linear(dev_fwnode(i2c->drm_dev), 1, &xe_i2c_irq_ops, NULL); > > + if (!domain) > > + return -ENOMEM; > > + > > + i2c->adapter_irq = irq_create_mapping(domain, 0); > > + i2c->irqdomain = 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 = context; > > + > > + *val = 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 = context; > > + > > + xe_mmio_write32(i2c->mmio, XE_REG(reg + I2C_MEM_SPACE_OFFSET), val); > > + > > + return 0; > > +} > > + > > +static const struct regmap_config i2c_regmap_config = { > > + .reg_bits = 32, > > + .val_bits = 32, > > + .reg_read = xe_i2c_read, > > + .reg_write = xe_i2c_write, > > + .fast_io = true, > > +}; > > + > > +static void xe_i2c_remove(void *data) > > +{ > > + struct xe_i2c *i2c = data; > > + int i; > > + > > + for (i = 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); > > +} > > + > > +int xe_i2c_probe(struct xe_device *xe) > > could you please add some /** DOC: Xe i2c ... above > and then add some doc to the exported functions? Sure thing. But just to be clear to everyone, there no are exported functions here (global but not exported). > > +{ > > + 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 != XE_I2C_EP_COOKIE_DEVICE) > > + return 0; > > + > > + i2c = devm_kzalloc(xe->drm.dev, sizeof(*i2c), GFP_KERNEL); > > + if (!i2c) > > + return -ENOMEM; > > + > > + INIT_WORK(&i2c->work, xe_i2c_client_work); > > + i2c->mmio = xe_root_tile_mmio(xe); > > + i2c->drm_dev = xe->drm.dev; > > + i2c->ep = ep; > > + > > + regmap = devm_regmap_init(i2c->drm_dev, NULL, i2c, &i2c_regmap_config); > > + if (IS_ERR(regmap)) > > + return PTR_ERR(regmap); > > + > > + i2c->bus_notifier.notifier_call = xe_i2c_notifier; > > + ret = bus_register_notifier(&i2c_bus_type, &i2c->bus_notifier); > > + if (ret) > > + return ret; > > + > > + ret = xe_i2c_create_irq(i2c); > > + if (ret) > > + goto err_unregister_notifier; > > + > > + ret = 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..e88845be61b4 > > --- /dev/null > > +++ b/drivers/gpu/drm/xe/xe_i2c.h > > @@ -0,0 +1,58 @@ > > +/* SPDX-License-Identifier: GPL-2.0 */ > > same question here... > > > +#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 = gu_misc_irq_ack(xe, master_ctl); > > } > > } > > -- > > 2.47.2 > > thanks, -- heikki