ramips: remove hack and use safexcel-eip93ies

Remove legacy hack patch, switch mt7621 crypto node to the intended
Safexcel insecure EIP93 compatible string and simplify crypto module
packaging to use the inside-secure eip93 driver.

Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
Link: https://github.com/openwrt/openwrt/pull/22871
Signed-off-by: Nick Hainke <vincent@systemli.org>

diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk
index aa8a52ec5f2d4ec5348457e7c0faf3640ecdc4ea..1076760903063c0764533e023ac6157a2edd8814 100644 (file)
--- a/package/kernel/linux/modules/crypto.mk
+++ b/package/kernel/linux/modules/crypto.mk
@@ -532,13 +532,9 @@ define KernelPackage/crypto-hw-eip93
   KCONFIG:= \
        CONFIG_CRYPTO_HW=y \
        CONFIG_CRYPTO_DEV_EIP93 \
-       CONFIG_CRYPTO_DEV_EIP93_AES=y@lt6.18 \
-       CONFIG_CRYPTO_DEV_EIP93_DES=y@lt6.18 \
-       CONFIG_CRYPTO_DEV_EIP93_AEAD=y@lt6.18 \
        CONFIG_CRYPTO_DEV_EIP93_GENERIC_SW_MAX_LEN=256 \
        CONFIG_CRYPTO_DEV_EIP93_AES_128_SW_MAX_LEN=512
-  FILES:=$(LINUX_DIR)/drivers/crypto/mtk-eip93/crypto-hw-eip93.ko@lt6.18 \
-    $(LINUX_DIR)/drivers/crypto/inside-secure/eip93/crypto-hw-eip93.ko@ge6.18
+  FILES:=$(LINUX_DIR)/drivers/crypto/inside-secure/eip93/crypto-hw-eip93.ko
   AUTOLOAD:=$(call AutoLoad,09,crypto-hw-eip93)
   $(call AddDepends/crypto)
 endef
@@ -550,10 +546,6 @@ It enables DES/3DES/AES ECB/CBC/CTR and
 IPSEC offload with authenc(hmac(sha1/sha256), aes/cbc/rfc3686)
 endef
 
-define KernelPackage/crypto-hw-eip93/airoha
-  FILES:=$(LINUX_DIR)/drivers/crypto/inside-secure/eip93/crypto-hw-eip93.ko
-endef
-
 $(eval $(call KernelPackage,crypto-hw-eip93))
 
 define KernelPackage/crypto-kpp

diff --git a/target/linux/generic/hack-6.18/927-crypto-eip93-add-mediatek-mtk-eip93-compatible-string.patch b/target/linux/generic/hack-6.18/927-crypto-eip93-add-mediatek-mtk-eip93-compatible-string.patch
deleted file mode 100644 (file)
index b356e81..0000000
--- a/target/linux/generic/hack-6.18/927-crypto-eip93-add-mediatek-mtk-eip93-compatible-string.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Mieczyslaw Nalewaj <namiltd@yahoo.com>
-Date: Tue, 13 Jan 2026 10:31:12 +0100
-Subject: [PATCH] crypto: eip93: add mediatek,mtk-eip93 compatible string
-
-Add mediatek,mtk-eip93 compatible string for compatibility
-with kernel 6.12 dts files.
-
-Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
----
-
---- a/drivers/crypto/inside-secure/eip93/eip93-main.c
-+++ b/drivers/crypto/inside-secure/eip93/eip93-main.c
-@@ -489,6 +489,7 @@ static void eip93_crypto_remove(struct p
- }
- 
- static const struct of_device_id eip93_crypto_of_match[] = {
-+      { .compatible = "mediatek,mtk-eip93", },
-       { .compatible = "inside-secure,safexcel-eip93i", },
-       { .compatible = "inside-secure,safexcel-eip93ie", },
-       { .compatible = "inside-secure,safexcel-eip93is", },

diff --git a/target/linux/ramips/dts/mt7621.dtsi b/target/linux/ramips/dts/mt7621.dtsi
index 0fa5426dfd809dedfc7e49a6ca63e1a095255dcb..e53623b1986313e8d926376df953dcd96df46d71 100644 (file)
--- a/target/linux/ramips/dts/mt7621.dtsi
+++ b/target/linux/ramips/dts/mt7621.dtsi
@@ -493,7 +493,7 @@
        };
 
        crypto: crypto@1e004000 {
-               compatible = "mediatek,mtk-eip93";
+               compatible = "inside-secure,safexcel-eip93ies";
                reg = <0x1e004000 0x1000>;
 
                interrupt-parent = <&gic>;