mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-11-25 06:26:15 +00:00
8c405cdccc
The patches were generated from the RPi repo with the following command: git format-patch v6.6.34..rpi-6.1.y Some patches needed rebasing and, as usual, the applied and reverted, wireless drivers, Github workflows, READMEs and defconfigs patches were removed. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
29 lines
1.1 KiB
Diff
29 lines
1.1 KiB
Diff
From ccc383fa6ac2a34f40d98eff63432480962e5552 Mon Sep 17 00:00:00 2001
|
|
From: Scovotto Davide <scovottodavide@gmail.com>
|
|
Date: Wed, 20 Apr 2022 17:22:17 +0200
|
|
Subject: [PATCH 0364/1085] tpm_tis_spi_main: Force probe routine to run
|
|
synchronously with driver and device registration when IMA is enabled
|
|
|
|
Co-authored-by: Alberto Solavagione <albertosolavagione30@gmail.com>
|
|
Co-developed-by: Alberto Solavagione <albertosolavagione30@gmail.com>
|
|
Signed-off-by: Alberto Solavagione <albertosolavagione30@gmail.com>
|
|
Signed-off-by: Davide Scovotto <scovottodavide@gmail.com>
|
|
---
|
|
drivers/char/tpm/tpm_tis_spi_main.c | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
--- a/drivers/char/tpm/tpm_tis_spi_main.c
|
|
+++ b/drivers/char/tpm/tpm_tis_spi_main.c
|
|
@@ -348,7 +348,11 @@ static struct spi_driver tpm_tis_spi_dri
|
|
.pm = &tpm_tis_pm,
|
|
.of_match_table = of_match_ptr(of_tis_spi_match),
|
|
.acpi_match_table = ACPI_PTR(acpi_tis_spi_match),
|
|
+#ifdef CONFIG_IMA
|
|
+ .probe_type = PROBE_FORCE_SYNCHRONOUS,
|
|
+#else
|
|
.probe_type = PROBE_PREFER_ASYNCHRONOUS,
|
|
+#endif
|
|
},
|
|
.probe = tpm_tis_spi_driver_probe,
|
|
.remove = tpm_tis_spi_remove,
|