[PATCH] drm/xe/xe_i2c: Add support for i2c in survivability mode

[PATCH] drm/xe/xe_i2c: Add support for i2c in survivability mode

[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 <riana.tauro@intel.com>
---

This depends on I2C series by Heikki on [1].
[1] https://lore.kernel.org/intel-xe/20250530141744.3605983-1-heikki.krogerus@linux.intel.com/

 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/xe/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 = true;
 
 	ret = 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 = false;
-		return ret;
-	}
+	if (ret)
+		goto err;
 
 	xe_vsec_init(xe);
 
+	ret = xe_i2c_probe(xe);
+	if (ret)
+		goto err;
+
 	dev_err(dev, "In Survivability Mode\n");
 
 	return 0;
+
+err:
+	/*
+	 * But if it fails, device can't enter survivability
+	 * so move it back for correct error handling
+	 */
+	survivability->mode = false;
+	return ret;
 }
 
 /**
-- 
2.47.1

✓ CI.Patch_applied: success for drm/xe/xe_i2c: Add support for i2c in survivability mode

[Patchwork]

== Series Details ==

Series: drm/xe/xe_i2c: Add support for i2c in survivability mode
URL   : https://patchwork.freedesktop.org/series/149787/
State : success

== Summary ==

=== Applying kernel patches on branch 'drm-tip' with base: ===
Base commit: ba486e3b10ce drm-tip: 2025y-06m-03d-16h-48m-17s UTC integration manifest
=== git am output follows ===
Applying: drm/xe/xe_i2c: Add support for i2c in survivability mode

✓ CI.checkpatch: success for drm/xe/xe_i2c: Add support for i2c in survivability mode

[Patchwork]

== Series Details ==

Series: drm/xe/xe_i2c: Add support for i2c in survivability mode
URL   : https://patchwork.freedesktop.org/series/149787/
State : success

== Summary ==

+ KERNEL=/kernel
+ git clone https://gitlab.freedesktop.org/drm/maintainer-tools mt
Cloning into 'mt'...
warning: redirecting to https://gitlab.freedesktop.org/drm/maintainer-tools.git/
+ git -C mt rev-list -n1 origin/master
202708c00696422fd217223bb679a353a5936e23
+ cd /kernel
+ git config --global --add safe.directory /kernel
+ git log -n1
commit cb50c0e61839551a17b6a9217d673917123cf543
Author: Riana Tauro <riana.tauro@intel.com>
Date:   Tue Jun 3 22:39:58 2025 +0530

    drm/xe/xe_i2c: Add support for i2c in survivability mode
    
    Initialize i2c in survivability mode to allow firmware
    update of Add-In Management Controller (AMC) in survivability mode
    
    Signed-off-by: Riana Tauro <riana.tauro@intel.com>
+ /mt/dim checkpatch ba486e3b10ce5b4ee4d1ffc58aa4cc3b669c02a3 drm-intel
cb50c0e61839 drm/xe/xe_i2c: Add support for i2c in survivability mode

✗ CI.KUnit: failure for drm/xe/xe_i2c: Add support for i2c in survivability mode

[Patchwork]

== Series Details ==

Series: drm/xe/xe_i2c: Add support for i2c in survivability mode
URL   : https://patchwork.freedesktop.org/series/149787/
State : failure

== Summary ==

+ trap cleanup EXIT
+ /kernel/tools/testing/kunit/kunit.py run --kunitconfig /kernel/drivers/gpu/drm/xe/.kunitconfig
ERROR:root:../drivers/gpu/drm/xe/xe_survivability_mode.c:17:10: fatal error: xe_i2c.h: No such file or directory
   17 | #include "xe_i2c.h"
      |          ^~~~~~~~~~
compilation terminated.
make[7]: *** [../scripts/Makefile.build:203: drivers/gpu/drm/xe/xe_survivability_mode.o] Error 1
make[7]: *** Waiting for unfinished jobs....
make[6]: *** [../scripts/Makefile.build:461: drivers/gpu/drm/xe] Error 2
make[5]: *** [../scripts/Makefile.build:461: drivers/gpu/drm] Error 2
make[4]: *** [../scripts/Makefile.build:461: drivers/gpu] Error 2
make[3]: *** [../scripts/Makefile.build:461: drivers] Error 2
make[2]: *** [/kernel/Makefile:2003: .] Error 2
make[1]: *** [/kernel/Makefile:248: __sub-make] Error 2
make: *** [Makefile:248: __sub-make] Error 2

[16:51:41] Configuring KUnit Kernel ...
Generating .config ...
Populating config with:
$ make ARCH=um O=.kunit olddefconfig
[16:51:46] Building KUnit Kernel ...
Populating config with:
$ make ARCH=um O=.kunit olddefconfig
Building with:
$ make all compile_commands.json scripts_gdb ARCH=um O=.kunit --jobs=48
+ cleanup
++ stat -c %u:%g /kernel
+ chown -R 1003:1003 /kernel

Re: [PATCH] drm/xe/xe_i2c: Add support for i2c in survivability mode

[Raag Jadav]

On Tue, Jun 03, 2025 at 10:39:58PM +0530, Riana Tauro wrote:
> Initialize i2c in survivability mode to allow firmware
> update of Add-In Management Controller (AMC) in survivability mode

Nit: Missing fullstop ;)

> Signed-off-by: Riana Tauro <riana.tauro@intel.com>

Reviewed-by: Raag Jadav <raag.jadav@intel.com>

Re: [PATCH] drm/xe/xe_i2c: Add support for i2c in survivability mode

[Heikki Krogerus]

On Tue, Jun 03, 2025 at 10:39:58PM +0530, Riana Tauro wrote:
> Initialize i2c in survivability mode to allow firmware
> update of Add-In Management Controller (AMC) in survivability mode
> 
> Signed-off-by: Riana Tauro <riana.tauro@intel.com>
> ---
> 
> This depends on I2C series by Heikki on [1].
> [1] https://lore.kernel.org/intel-xe/20250530141744.3605983-1-heikki.krogerus@linux.intel.com/

Thanks Riana. I'll include this to my series in v2. This is now
avilable in my internal amc branch:

https://github.com/intel-sandbox/hkrogeru-linux/commit/83ead82b0adf307b28cc794e9567c3e622ab7daf

cheers,

>
>  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/xe/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 = true;
>  
>  	ret = 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 = false;
> -		return ret;
> -	}
> +	if (ret)
> +		goto err;
>  
>  	xe_vsec_init(xe);
>  
> +	ret = xe_i2c_probe(xe);
> +	if (ret)
> +		goto err;
> +
>  	dev_err(dev, "In Survivability Mode\n");
>  
>  	return 0;
> +
> +err:
> +	/*
> +	 * But if it fails, device can't enter survivability
> +	 * so move it back for correct error handling
> +	 */
> +	survivability->mode = false;
> +	return ret;
>  }
>  
>  /**
> -- 
> 2.47.1

-- 
heikki