spacemit: remove old and unused patch set (#9497)
Signed-off-by: Sven-Ola Tuecke <sven-ola@gmx.de>
This commit is contained in:
Sven-Ola Tuecke
GitHub
parent
1b38e53689
commit
4805f62eb7
@ -1,45 +0,0 @@
|
||||
config: # This is file 'patch/kernel/spacemit-legacy-6.1/0000.patching_config.yaml'
|
||||
|
||||
# PATCH NUMBERING INFO
|
||||
#
|
||||
# Patches should be ordered in such a way that general kernel patches are applied first, then SoC-related patches and at last board-specific patches
|
||||
#
|
||||
# Patch numbers in this folder are sorted by category:
|
||||
#
|
||||
# 000* for general patches
|
||||
# 0** for Bianbu-Linux-related patches
|
||||
# 1** for other SoC-related patches
|
||||
# 5** for board specific patches
|
||||
|
||||
# Just some info stuff; not used by the patching scripts
|
||||
name: spacemit-6.1
|
||||
kind: kernel
|
||||
type: vendor # or: vendor
|
||||
branch: linux-6.1.y
|
||||
last-known-good-tag: v6.1.15
|
||||
maintainers:
|
||||
- { github: none, name: none, email: none, armbian-forum: none }
|
||||
|
||||
# .dts files in these directories will be copied as-is to the build tree; later ones overwrite earlier ones.
|
||||
# This is meant to provide a way to "add a board DTS" without having to null-patch them in.
|
||||
dts-directories:
|
||||
- { source: "dt", target: "arch/riscv/boot/dts/spacemit" }
|
||||
|
||||
# Every file in these directories will be copied as-is to the build tree; later ones overwrite earlier ones
|
||||
# This is meant as a way to have overlays, bare, in a directory, without having to null-patch them in.
|
||||
# @TODO need a solution to auto-Makefile the overlays as well
|
||||
overlay-directories:
|
||||
- { source: "overlay", target: "arch/riscv/boot/dts/spacemit/overlay" }
|
||||
|
||||
# The Makefile in each of these directories will be magically patched to include the dts files copied
|
||||
# or patched-in; overlay subdir will be included "-y" if it exists.
|
||||
# No more Makefile patching needed, yay!
|
||||
auto-patch-dt-makefile:
|
||||
- { directory: "arch/riscv/boot/dts/spacemit", config-var: "CONFIG_SOC_SPACEMIT_K1X" }
|
||||
|
||||
# Configuration for when applying patches to git / auto-rewriting patches (development cycle helpers)
|
||||
patches-to-git:
|
||||
do-not-commit-files:
|
||||
- "MAINTAINERS" # constant churn, drop them. sorry.
|
||||
do-not-commit-regexes: # Python-style regexes
|
||||
- "^arch/([a-zA-Z0-9]+)/boot/dts/([a-zA-Z0-9]+)/Makefile$" # ignore DT Makefile patches, we've an auto-patcher now
|
||||
@ -1,21 +0,0 @@
|
||||
// SPDX-License-Identifier: (GPL-2.0 OR MIT)
|
||||
/* Copyright (c) 2024 Spacemit, Inc */
|
||||
|
||||
/dts-v1/;
|
||||
|
||||
#include "k1-x_deb1.dts"
|
||||
|
||||
/ {
|
||||
model = "BananaPi BPI-F3";
|
||||
};
|
||||
|
||||
&uart2 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pinctrl_uart2>;
|
||||
status = "disabled";
|
||||
|
||||
bluetooth {
|
||||
compatible = "realtek,rtl8852bs-bt";
|
||||
device-wake-gpios = <&gpio 64 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
};
|
||||
@ -1,45 +0,0 @@
|
||||
From ba9768cf884ba4f030d9bc006ef4c067575821d0 Mon Sep 17 00:00:00 2001
|
||||
From: Victor Hassan <victor@allwinnertech.com>
|
||||
Date: Wed, 22 Feb 2023 17:47:20 +0800
|
||||
Subject: Bluetooth: btrtl: Add support for RTL8852BS
|
||||
|
||||
Add the support for RTL8852BS BT controller on UART interface.
|
||||
The necessary firmware file will be submitted to linux-firmware.
|
||||
|
||||
Signed-off-by: Victor Hassan <victor@allwinnertech.com>
|
||||
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
|
||||
---
|
||||
drivers/bluetooth/btrtl.c | 10 ++++++++++
|
||||
1 file changed, 10 insertions(+)
|
||||
|
||||
diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c
|
||||
index fb52313a1d45..a42dd93b2900 100644
|
||||
--- a/drivers/bluetooth/btrtl.c
|
||||
+++ b/drivers/bluetooth/btrtl.c
|
||||
@@ -190,6 +190,14 @@ static const struct id_table ic_id_table[] = {
|
||||
.fw_name = "rtl_bt/rtl8852au_fw.bin",
|
||||
.cfg_name = "rtl_bt/rtl8852au_config" },
|
||||
|
||||
+ /* 8852B with UART interface */
|
||||
+ { IC_INFO(RTL_ROM_LMP_8852A, 0xb, 0xb, HCI_UART),
|
||||
+ .config_needed = true,
|
||||
+ .has_rom_version = true,
|
||||
+ .has_msft_ext = true,
|
||||
+ .fw_name = "rtl_bt/rtl8852bs_fw.bin",
|
||||
+ .cfg_name = "rtl_bt/rtl8852bs_config" },
|
||||
+
|
||||
/* 8852B */
|
||||
{ IC_INFO(RTL_ROM_LMP_8852A, 0xb, 0xb, HCI_USB),
|
||||
.config_needed = false,
|
||||
@@ -956,6 +964,8 @@ MODULE_FIRMWARE("rtl_bt/rtl8822b_fw.bin");
|
||||
MODULE_FIRMWARE("rtl_bt/rtl8822b_config.bin");
|
||||
MODULE_FIRMWARE("rtl_bt/rtl8852au_fw.bin");
|
||||
MODULE_FIRMWARE("rtl_bt/rtl8852au_config.bin");
|
||||
+MODULE_FIRMWARE("rtl_bt/rtl8852bs_fw.bin");
|
||||
+MODULE_FIRMWARE("rtl_bt/rtl8852bs_config.bin");
|
||||
MODULE_FIRMWARE("rtl_bt/rtl8852bu_fw.bin");
|
||||
MODULE_FIRMWARE("rtl_bt/rtl8852bu_config.bin");
|
||||
MODULE_FIRMWARE("rtl_bt/rtl8852cu_fw.bin");
|
||||
--
|
||||
2.35.3
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
From 6f639d9aff5e528dd21e9425b2c781dcded6a4ae Mon Sep 17 00:00:00 2001
|
||||
From: Patrick Yavitz <pyavitz@armbian.com>
|
||||
Date: Wed, 26 Jun 2024 06:01:30 -0400
|
||||
Subject: Bluetooth: hci_h5: Add support for RTL8852BS
|
||||
|
||||
Signed-off-by: Patrick Yavitz <pyavitz@armbian.com>
|
||||
---
|
||||
drivers/bluetooth/hci_h5.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/drivers/bluetooth/hci_h5.c b/drivers/bluetooth/hci_h5.c
|
||||
index 6455bc4fb5bb..7415c7ff55c8 100644
|
||||
--- a/drivers/bluetooth/hci_h5.c
|
||||
+++ b/drivers/bluetooth/hci_h5.c
|
||||
@@ -1102,6 +1102,8 @@ static const struct of_device_id rtl_bluetooth_of_match[] = {
|
||||
.data = (const void *)&h5_data_rtl8723bs },
|
||||
{ .compatible = "realtek,rtl8723ds-bt",
|
||||
.data = (const void *)&h5_data_rtl8723bs },
|
||||
+ { .compatible = "realtek,rtl8852bs-bt",
|
||||
+ .data = (const void *)&h5_data_rtl8723bs },
|
||||
#endif
|
||||
{ },
|
||||
};
|
||||
--
|
||||
2.35.3
|
||||
|
||||
@ -1,308 +0,0 @@
|
||||
From 9f72c5c5e6aed7f80d788f37ad846b830ef54fba Mon Sep 17 00:00:00 2001
|
||||
From: UtsavBalar1231 <utsavbalar1231@gmail.com>
|
||||
Date: Wed, 17 Jul 2024 04:36:09 -0400
|
||||
Subject: Fix aes_encrypt() redefinition errors
|
||||
|
||||
This fixes function definition conflicts with aes kernel module as
|
||||
defined in include/crypto/aes.h
|
||||
|
||||
Signed-off-by: UtsavBalar1231 <utsavbalar1231@gmail.com>
|
||||
---
|
||||
.../realtek/rtl8852bs/core/crypto/aes-ccm.c | 26 +++++++++----------
|
||||
.../realtek/rtl8852bs/core/crypto/aes-ctr.c | 6 ++---
|
||||
.../realtek/rtl8852bs/core/crypto/aes-gcm.c | 12 ++++-----
|
||||
.../rtl8852bs/core/crypto/aes-internal-enc.c | 6 ++---
|
||||
.../realtek/rtl8852bs/core/crypto/aes-omac1.c | 10 +++----
|
||||
.../realtek/rtl8852bs/core/crypto/aes.h | 6 ++---
|
||||
6 files changed, 33 insertions(+), 33 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/wireless/realtek/rtl8852bs/core/crypto/aes-ccm.c b/drivers/net/wireless/realtek/rtl8852bs/core/crypto/aes-ccm.c
|
||||
index dceec778a6d7..3789229717ec 100644
|
||||
--- a/drivers/net/wireless/realtek/rtl8852bs/core/crypto/aes-ccm.c
|
||||
+++ b/drivers/net/wireless/realtek/rtl8852bs/core/crypto/aes-ccm.c
|
||||
@@ -40,7 +40,7 @@ static void aes_ccm_auth_start(void *aes, size_t M, size_t L, const u8 *nonce,
|
||||
WPA_PUT_BE16(&b[AES_BLOCK_SIZE - L], plain_len);
|
||||
|
||||
wpa_hexdump_key(_MSG_EXCESSIVE_, "CCM B_0", b, AES_BLOCK_SIZE);
|
||||
- aes_encrypt(aes, b, x); /* X_1 = E(K, B_0) */
|
||||
+ aes_rtl8852bs_encrypt(aes, b, x); /* X_1 = E(K, B_0) */
|
||||
|
||||
if (!aad_len)
|
||||
return;
|
||||
@@ -50,12 +50,12 @@ static void aes_ccm_auth_start(void *aes, size_t M, size_t L, const u8 *nonce,
|
||||
os_memset(aad_buf + 2 + aad_len, 0, sizeof(aad_buf) - 2 - aad_len);
|
||||
|
||||
xor_aes_block(aad_buf, x);
|
||||
- aes_encrypt(aes, aad_buf, x); /* X_2 = E(K, X_1 XOR B_1) */
|
||||
+ aes_rtl8852bs_encrypt(aes, aad_buf, x); /* X_2 = E(K, X_1 XOR B_1) */
|
||||
|
||||
if (aad_len > AES_BLOCK_SIZE - 2) {
|
||||
xor_aes_block(&aad_buf[AES_BLOCK_SIZE], x);
|
||||
/* X_3 = E(K, X_2 XOR B_2) */
|
||||
- aes_encrypt(aes, &aad_buf[AES_BLOCK_SIZE], x);
|
||||
+ aes_rtl8852bs_encrypt(aes, &aad_buf[AES_BLOCK_SIZE], x);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -69,13 +69,13 @@ static void aes_ccm_auth(void *aes, const u8 *data, size_t len, u8 *x)
|
||||
/* X_i+1 = E(K, X_i XOR B_i) */
|
||||
xor_aes_block(x, data);
|
||||
data += AES_BLOCK_SIZE;
|
||||
- aes_encrypt(aes, x, x);
|
||||
+ aes_rtl8852bs_encrypt(aes, x, x);
|
||||
}
|
||||
if (last) {
|
||||
/* XOR zero-padded last block */
|
||||
for (i = 0; i < last; i++)
|
||||
x[i] ^= *data++;
|
||||
- aes_encrypt(aes, x, x);
|
||||
+ aes_rtl8852bs_encrypt(aes, x, x);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -98,14 +98,14 @@ static void aes_ccm_encr(void *aes, size_t L, const u8 *in, size_t len, u8 *out,
|
||||
for (i = 1; i <= len / AES_BLOCK_SIZE; i++) {
|
||||
WPA_PUT_BE16(&a[AES_BLOCK_SIZE - 2], i);
|
||||
/* S_i = E(K, A_i) */
|
||||
- aes_encrypt(aes, a, out);
|
||||
+ aes_rtl8852bs_encrypt(aes, a, out);
|
||||
xor_aes_block(out, in);
|
||||
out += AES_BLOCK_SIZE;
|
||||
in += AES_BLOCK_SIZE;
|
||||
}
|
||||
if (last) {
|
||||
WPA_PUT_BE16(&a[AES_BLOCK_SIZE - 2], i);
|
||||
- aes_encrypt(aes, a, out);
|
||||
+ aes_rtl8852bs_encrypt(aes, a, out);
|
||||
/* XOR zero-padded last block */
|
||||
for (i = 0; i < last; i++)
|
||||
*out++ ^= *in++;
|
||||
@@ -121,7 +121,7 @@ static void aes_ccm_encr_auth(void *aes, size_t M, u8 *x, u8 *a, u8 *auth)
|
||||
wpa_hexdump_key(_MSG_EXCESSIVE_, "CCM T", x, M);
|
||||
/* U = T XOR S_0; S_0 = E(K, A_0) */
|
||||
WPA_PUT_BE16(&a[AES_BLOCK_SIZE - 2], 0);
|
||||
- aes_encrypt(aes, a, tmp);
|
||||
+ aes_rtl8852bs_encrypt(aes, a, tmp);
|
||||
for (i = 0; i < M; i++)
|
||||
auth[i] = x[i] ^ tmp[i];
|
||||
wpa_hexdump_key(_MSG_EXCESSIVE_, "CCM U", auth, M);
|
||||
@@ -136,7 +136,7 @@ static void aes_ccm_decr_auth(void *aes, size_t M, u8 *a, const u8 *auth, u8 *t)
|
||||
wpa_hexdump_key(_MSG_EXCESSIVE_, "CCM U", auth, M);
|
||||
/* U = T XOR S_0; S_0 = E(K, A_0) */
|
||||
WPA_PUT_BE16(&a[AES_BLOCK_SIZE - 2], 0);
|
||||
- aes_encrypt(aes, a, tmp);
|
||||
+ aes_rtl8852bs_encrypt(aes, a, tmp);
|
||||
for (i = 0; i < M; i++)
|
||||
t[i] = auth[i] ^ tmp[i];
|
||||
wpa_hexdump_key(_MSG_EXCESSIVE_, "CCM T", t, M);
|
||||
@@ -155,7 +155,7 @@ int aes_ccm_ae(const u8 *key, size_t key_len, const u8 *nonce,
|
||||
if (aad_len > 30 || M > AES_BLOCK_SIZE)
|
||||
return -1;
|
||||
|
||||
- aes = aes_encrypt_init(key, key_len);
|
||||
+ aes = aes_rtl8852bs_encrypt_init(key, key_len);
|
||||
if (aes == NULL)
|
||||
return -1;
|
||||
|
||||
@@ -167,7 +167,7 @@ int aes_ccm_ae(const u8 *key, size_t key_len, const u8 *nonce,
|
||||
aes_ccm_encr(aes, L, plain, plain_len, crypt, a);
|
||||
aes_ccm_encr_auth(aes, M, x, a, auth);
|
||||
|
||||
- aes_encrypt_deinit(aes);
|
||||
+ aes_rtl8852bs_encrypt_deinit(aes);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -186,7 +186,7 @@ int aes_ccm_ad(const u8 *key, size_t key_len, const u8 *nonce,
|
||||
if (aad_len > 30 || M > AES_BLOCK_SIZE)
|
||||
return -1;
|
||||
|
||||
- aes = aes_encrypt_init(key, key_len);
|
||||
+ aes = aes_rtl8852bs_encrypt_init(key, key_len);
|
||||
if (aes == NULL)
|
||||
return -1;
|
||||
|
||||
@@ -200,7 +200,7 @@ int aes_ccm_ad(const u8 *key, size_t key_len, const u8 *nonce,
|
||||
aes_ccm_auth_start(aes, M, L, nonce, aad, aad_len, crypt_len, x);
|
||||
aes_ccm_auth(aes, plain, crypt_len, x);
|
||||
|
||||
- aes_encrypt_deinit(aes);
|
||||
+ aes_rtl8852bs_encrypt_deinit(aes);
|
||||
|
||||
if (os_memcmp_const(x, t, M) != 0) {
|
||||
wpa_printf(_MSG_EXCESSIVE_, "CCM: Auth mismatch");
|
||||
diff --git a/drivers/net/wireless/realtek/rtl8852bs/core/crypto/aes-ctr.c b/drivers/net/wireless/realtek/rtl8852bs/core/crypto/aes-ctr.c
|
||||
index 6c06851ddc68..702f8ce492d6 100644
|
||||
--- a/drivers/net/wireless/realtek/rtl8852bs/core/crypto/aes-ctr.c
|
||||
+++ b/drivers/net/wireless/realtek/rtl8852bs/core/crypto/aes-ctr.c
|
||||
@@ -30,13 +30,13 @@ int aes_ctr_encrypt(const u8 *key, size_t key_len, const u8 *nonce,
|
||||
u8 *pos = data;
|
||||
u8 counter[AES_BLOCK_SIZE], buf[AES_BLOCK_SIZE];
|
||||
|
||||
- ctx = aes_encrypt_init(key, key_len);
|
||||
+ ctx = aes_rtl8852bs_encrypt_init(key, key_len);
|
||||
if (ctx == NULL)
|
||||
return -1;
|
||||
os_memcpy(counter, nonce, AES_BLOCK_SIZE);
|
||||
|
||||
while (left > 0) {
|
||||
- aes_encrypt(ctx, counter, buf);
|
||||
+ aes_rtl8852bs_encrypt(ctx, counter, buf);
|
||||
|
||||
len = (left < AES_BLOCK_SIZE) ? left : AES_BLOCK_SIZE;
|
||||
for (j = 0; j < len; j++)
|
||||
@@ -50,7 +50,7 @@ int aes_ctr_encrypt(const u8 *key, size_t key_len, const u8 *nonce,
|
||||
break;
|
||||
}
|
||||
}
|
||||
- aes_encrypt_deinit(ctx);
|
||||
+ aes_rtl8852bs_encrypt_deinit(ctx);
|
||||
return 0;
|
||||
}
|
||||
|
||||
diff --git a/drivers/net/wireless/realtek/rtl8852bs/core/crypto/aes-gcm.c b/drivers/net/wireless/realtek/rtl8852bs/core/crypto/aes-gcm.c
|
||||
index 47088102b9cc..21b71d43a041 100644
|
||||
--- a/drivers/net/wireless/realtek/rtl8852bs/core/crypto/aes-gcm.c
|
||||
+++ b/drivers/net/wireless/realtek/rtl8852bs/core/crypto/aes-gcm.c
|
||||
@@ -154,7 +154,7 @@ static void aes_gctr(void *aes, const u8 *icb, const u8 *x, size_t xlen, u8 *y)
|
||||
os_memcpy(cb, icb, AES_BLOCK_SIZE);
|
||||
/* Full blocks */
|
||||
for (i = 0; i < n; i++) {
|
||||
- aes_encrypt(aes, cb, ypos);
|
||||
+ aes_rtl8852bs_encrypt(aes, cb, ypos);
|
||||
xor_block(ypos, xpos);
|
||||
xpos += AES_BLOCK_SIZE;
|
||||
ypos += AES_BLOCK_SIZE;
|
||||
@@ -164,7 +164,7 @@ static void aes_gctr(void *aes, const u8 *icb, const u8 *x, size_t xlen, u8 *y)
|
||||
last = x + xlen - xpos;
|
||||
if (last) {
|
||||
/* Last, partial block */
|
||||
- aes_encrypt(aes, cb, tmp);
|
||||
+ aes_rtl8852bs_encrypt(aes, cb, tmp);
|
||||
for (i = 0; i < last; i++)
|
||||
*ypos++ = *xpos++ ^ tmp[i];
|
||||
}
|
||||
@@ -175,13 +175,13 @@ static void * aes_gcm_init_hash_subkey(const u8 *key, size_t key_len, u8 *H)
|
||||
{
|
||||
void *aes;
|
||||
|
||||
- aes = aes_encrypt_init(key, key_len);
|
||||
+ aes = aes_rtl8852bs_encrypt_init(key, key_len);
|
||||
if (aes == NULL)
|
||||
return NULL;
|
||||
|
||||
/* Generate hash subkey H = AES_K(0^128) */
|
||||
os_memset(H, 0, AES_BLOCK_SIZE);
|
||||
- aes_encrypt(aes, H, H);
|
||||
+ aes_rtl8852bs_encrypt(aes, H, H);
|
||||
wpa_hexdump_key(_MSG_EXCESSIVE_, "Hash subkey H for GHASH",
|
||||
H, AES_BLOCK_SIZE);
|
||||
return aes;
|
||||
@@ -275,7 +275,7 @@ int aes_gcm_ae(const u8 *key, size_t key_len, const u8 *iv, size_t iv_len,
|
||||
|
||||
/* Return (C, T) */
|
||||
|
||||
- aes_encrypt_deinit(aes);
|
||||
+ aes_rtl8852bs_encrypt_deinit(aes);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -307,7 +307,7 @@ int aes_gcm_ad(const u8 *key, size_t key_len, const u8 *iv, size_t iv_len,
|
||||
/* T' = MSB_t(GCTR_K(J_0, S)) */
|
||||
aes_gctr(aes, J0, S, sizeof(S), T);
|
||||
|
||||
- aes_encrypt_deinit(aes);
|
||||
+ aes_rtl8852bs_encrypt_deinit(aes);
|
||||
|
||||
if (os_memcmp_const(tag, T, 16) != 0) {
|
||||
wpa_printf(_MSG_EXCESSIVE_, "GCM: Tag mismatch");
|
||||
diff --git a/drivers/net/wireless/realtek/rtl8852bs/core/crypto/aes-internal-enc.c b/drivers/net/wireless/realtek/rtl8852bs/core/crypto/aes-internal-enc.c
|
||||
index 69e256be95ce..19410a2fc5b3 100644
|
||||
--- a/drivers/net/wireless/realtek/rtl8852bs/core/crypto/aes-internal-enc.c
|
||||
+++ b/drivers/net/wireless/realtek/rtl8852bs/core/crypto/aes-internal-enc.c
|
||||
@@ -93,7 +93,7 @@ d##3 = TE0(s##3) ^ TE1(s##0) ^ TE2(s##1) ^ TE3(s##2) ^ rk[4 * i + 3]
|
||||
}
|
||||
|
||||
|
||||
-void * aes_encrypt_init(const u8 *key, size_t len)
|
||||
+void * aes_rtl8852bs_encrypt_init(const u8 *key, size_t len)
|
||||
{
|
||||
u32 *rk;
|
||||
int res;
|
||||
@@ -114,7 +114,7 @@ void * aes_encrypt_init(const u8 *key, size_t len)
|
||||
}
|
||||
|
||||
|
||||
-int aes_encrypt(void *ctx, const u8 *plain, u8 *crypt)
|
||||
+int aes_rtl8852bs_encrypt(void *ctx, const u8 *plain, u8 *crypt)
|
||||
{
|
||||
u32 *rk = ctx;
|
||||
rijndaelEncrypt(ctx, rk[AES_PRIV_NR_POS], plain, crypt);
|
||||
@@ -122,7 +122,7 @@ int aes_encrypt(void *ctx, const u8 *plain, u8 *crypt)
|
||||
}
|
||||
|
||||
|
||||
-void aes_encrypt_deinit(void *ctx)
|
||||
+void aes_rtl8852bs_encrypt_deinit(void *ctx)
|
||||
{
|
||||
os_memset(ctx, 0, AES_PRIV_SIZE);
|
||||
rtw_mfree(ctx, AES_PRIV_SIZE);
|
||||
diff --git a/drivers/net/wireless/realtek/rtl8852bs/core/crypto/aes-omac1.c b/drivers/net/wireless/realtek/rtl8852bs/core/crypto/aes-omac1.c
|
||||
index 30b52629f4be..826c9043d09a 100644
|
||||
--- a/drivers/net/wireless/realtek/rtl8852bs/core/crypto/aes-omac1.c
|
||||
+++ b/drivers/net/wireless/realtek/rtl8852bs/core/crypto/aes-omac1.c
|
||||
@@ -50,7 +50,7 @@ int omac1_aes_vector(const u8 *key, size_t key_len, size_t num_elem,
|
||||
if (TEST_FAIL())
|
||||
return -1;
|
||||
|
||||
- ctx = aes_encrypt_init(key, key_len);
|
||||
+ ctx = aes_rtl8852bs_encrypt_init(key, key_len);
|
||||
if (ctx == NULL)
|
||||
return -1;
|
||||
os_memset(cbc, 0, AES_BLOCK_SIZE);
|
||||
@@ -81,12 +81,12 @@ int omac1_aes_vector(const u8 *key, size_t key_len, size_t num_elem,
|
||||
}
|
||||
}
|
||||
if (left > AES_BLOCK_SIZE)
|
||||
- aes_encrypt(ctx, cbc, cbc);
|
||||
+ aes_rtl8852bs_encrypt(ctx, cbc, cbc);
|
||||
left -= AES_BLOCK_SIZE;
|
||||
}
|
||||
|
||||
os_memset(pad, 0, AES_BLOCK_SIZE);
|
||||
- aes_encrypt(ctx, pad, pad);
|
||||
+ aes_rtl8852bs_encrypt(ctx, pad, pad);
|
||||
gf_mulx(pad);
|
||||
|
||||
if (left || total_len == 0) {
|
||||
@@ -110,8 +110,8 @@ int omac1_aes_vector(const u8 *key, size_t key_len, size_t num_elem,
|
||||
|
||||
for (i = 0; i < AES_BLOCK_SIZE; i++)
|
||||
pad[i] ^= cbc[i];
|
||||
- aes_encrypt(ctx, pad, mac);
|
||||
- aes_encrypt_deinit(ctx);
|
||||
+ aes_rtl8852bs_encrypt(ctx, pad, mac);
|
||||
+ aes_rtl8852bs_encrypt_deinit(ctx);
|
||||
return 0;
|
||||
}
|
||||
|
||||
diff --git a/drivers/net/wireless/realtek/rtl8852bs/core/crypto/aes.h b/drivers/net/wireless/realtek/rtl8852bs/core/crypto/aes.h
|
||||
index 8ab3de2ee83f..551dd19aab23 100644
|
||||
--- a/drivers/net/wireless/realtek/rtl8852bs/core/crypto/aes.h
|
||||
+++ b/drivers/net/wireless/realtek/rtl8852bs/core/crypto/aes.h
|
||||
@@ -11,9 +11,9 @@
|
||||
|
||||
#define AES_BLOCK_SIZE 16
|
||||
|
||||
-void * aes_encrypt_init(const u8 *key, size_t len);
|
||||
-int aes_encrypt(void *ctx, const u8 *plain, u8 *crypt);
|
||||
-void aes_encrypt_deinit(void *ctx);
|
||||
+void * aes_rtl8852bs_encrypt_init(const u8 *key, size_t len);
|
||||
+int aes_rtl8852bs_encrypt(void *ctx, const u8 *plain, u8 *crypt);
|
||||
+void aes_rtl8852bs_encrypt_deinit(void *ctx);
|
||||
void * aes_decrypt_init(const u8 *key, size_t len);
|
||||
int aes_decrypt(void *ctx, const u8 *crypt, u8 *plain);
|
||||
void aes_decrypt_deinit(void *ctx);
|
||||
--
|
||||
2.35.3
|
||||
|
||||
@ -1,57 +0,0 @@
|
||||
From 3e033a705ea7266609cd7b92cf9d144c2fc30860 Mon Sep 17 00:00:00 2001
|
||||
From: Luca Barbato <noone@nowhere.com>
|
||||
Date: Thu, 6 Jun 2024 03:49:34 -0400
|
||||
Subject: add minimal hwmon support
|
||||
|
||||
Signed-off-by: Luca Barbato
|
||||
---
|
||||
drivers/thermal/k1x-thermal.c | 23 ++++++++++++++++-------
|
||||
1 file changed, 16 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/drivers/thermal/k1x-thermal.c b/drivers/thermal/k1x-thermal.c
|
||||
index 9c66a0a23b1b..2267bcbce335 100644
|
||||
--- a/drivers/thermal/k1x-thermal.c
|
||||
+++ b/drivers/thermal/k1x-thermal.c
|
||||
@@ -71,7 +71,7 @@ static int init_sensors(struct platform_device *pdev)
|
||||
|
||||
if (s->sr[1] >= MAX_SENSOR_NUMBER) {
|
||||
dev_err(&pdev->dev, "un-fitable sensor range\n");
|
||||
- return -EINVAL;
|
||||
+ return -EINVAL;
|
||||
}
|
||||
|
||||
#if 0
|
||||
@@ -287,15 +287,24 @@ static int k1x_thermal_probe(struct platform_device *pdev)
|
||||
for (i = s->sr[0]; i <= s->sr[1]; ++i) {
|
||||
s->sdesc[i].base = s->base;
|
||||
|
||||
- s->sdesc[i].tzd = devm_thermal_of_zone_register(dev,
|
||||
- i, s->sdesc + i, &k1x_of_thermal_ops);
|
||||
- if (IS_ERR(s->sdesc[i].tzd)) {
|
||||
- ret = PTR_ERR(s->sdesc[i].tzd);
|
||||
- dev_err(dev, "faild to register sensor id %d: %d\n",
|
||||
- i, ret);
|
||||
+ struct thermal_zone_device *tzd =
|
||||
+ devm_thermal_of_zone_register(dev, i, s->sdesc + i, &k1x_of_thermal_ops);
|
||||
+ if (IS_ERR(tzd)) {
|
||||
+ ret = PTR_ERR(tzd);
|
||||
+ dev_err_probe(dev, ret, "faild to register sensor id %d", i);
|
||||
return ret;
|
||||
}
|
||||
|
||||
+ tzd->tzp->no_hwmon = false;
|
||||
+
|
||||
+ ret = devm_thermal_add_hwmon_sysfs(tzd);
|
||||
+ if (ret < 0) {
|
||||
+ dev_err_probe(dev, ret, "failed to register the hwmon entry");
|
||||
+ return ret;
|
||||
+ }
|
||||
+
|
||||
+ s->sdesc[i].tzd = tzd;
|
||||
+
|
||||
ret = devm_request_threaded_irq(dev, s->irq, k1x_thermal_irq,
|
||||
k1x_thermal_irq_thread, IRQF_SHARED,
|
||||
dev_name(&s->sdesc[i].tzd->device), s->sdesc + i);
|
||||
--
|
||||
2.35.3
|
||||
|
||||
@ -1,47 +0,0 @@
|
||||
From 042384a5333cba8021275fa27ebb0c4c0e21de19 Mon Sep 17 00:00:00 2001
|
||||
From: Andy Chiu <andy.chiu@sifive.com>
|
||||
Date: Tue, 22 Aug 2023 16:49:03 +0000
|
||||
Subject: riscv: signal: fix sigaltstack frame size checking
|
||||
|
||||
The alternative stack checking in get_sigframe introduced by the Vector
|
||||
support is not needed and has a problem. It is not needed as we have
|
||||
already validate it at the beginning of the function if we are already
|
||||
on an altstack. If not, the size of an altstack is always validated at
|
||||
its allocation stage with sigaltstack_size_valid().
|
||||
|
||||
Besides, we must only regard the size of an altstack if the handler of a
|
||||
signal is registered with SA_ONSTACK. So, blindly checking overflow of
|
||||
an altstack if sas_ss_size not equals to zero will check against wrong
|
||||
signal handlers if only a subset of signals are registered with
|
||||
SA_ONSTACK.
|
||||
|
||||
Fixes: 8ee0b41898fa ("riscv: signal: Add sigcontext save/restore for vector")
|
||||
Reported-by: Prashanth Swaminathan <prashanthsw@google.com>
|
||||
Signed-off-by: Andy Chiu <andy.chiu@sifive.com>
|
||||
Link: https://lore.kernel.org/r/20230822164904.21660-1-andy.chiu@sifive.com
|
||||
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
|
||||
---
|
||||
arch/riscv/kernel/signal.c | 7 -------
|
||||
1 file changed, 7 deletions(-)
|
||||
|
||||
diff --git a/arch/riscv/kernel/signal.c b/arch/riscv/kernel/signal.c
|
||||
index ffde81cfadb7..f5348292ae79 100644
|
||||
--- a/arch/riscv/kernel/signal.c
|
||||
+++ b/arch/riscv/kernel/signal.c
|
||||
@@ -309,13 +309,6 @@ static inline void __user *get_sigframe(struct ksignal *ksig,
|
||||
/* Align the stack frame. */
|
||||
sp &= ~0xfUL;
|
||||
|
||||
- /*
|
||||
- * Fail if the size of the altstack is not large enough for the
|
||||
- * sigframe construction.
|
||||
- */
|
||||
- if (current->sas_ss_size && sp < current->sas_ss_sp)
|
||||
- return (void __user __force *)-1UL;
|
||||
-
|
||||
return (void __user *)sp;
|
||||
}
|
||||
|
||||
--
|
||||
2.35.3
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
From 2dda0e6c2d5cba19e1e0445e908ea763a453514c Mon Sep 17 00:00:00 2001
|
||||
From: Patrick Yavitz <pyavitz@armbian.com>
|
||||
Date: Wed, 17 Jul 2024 04:30:56 -0400
|
||||
Subject: wireless: rtl8852bs: CONFIG_RTW_DEBUG = n
|
||||
|
||||
Signed-off-by: Patrick Yavitz <pyavitz@armbian.com>
|
||||
---
|
||||
drivers/net/wireless/realtek/rtl8852bs/Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/net/wireless/realtek/rtl8852bs/Makefile b/drivers/net/wireless/realtek/rtl8852bs/Makefile
|
||||
index 357f90d96246..23cf65c872cd 100644
|
||||
--- a/drivers/net/wireless/realtek/rtl8852bs/Makefile
|
||||
+++ b/drivers/net/wireless/realtek/rtl8852bs/Makefile
|
||||
@@ -137,7 +137,7 @@ EXTRA_CFLAGS += -DCONFIG_RTW_ANDROID=$(CONFIG_RTW_ANDROID)
|
||||
endif
|
||||
|
||||
########################## Debug ###########################
|
||||
-CONFIG_RTW_DEBUG = y
|
||||
+CONFIG_RTW_DEBUG = n
|
||||
# default log level is _DRV_INFO_ = 4,
|
||||
# please refer to "How_to_set_driver_debug_log_level.doc" to set the available level.
|
||||
CONFIG_RTW_LOG_LEVEL = 2
|
||||
--
|
||||
2.35.3
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
From 7e9cef3496607903a04fb908c84b24ba2b480907 Mon Sep 17 00:00:00 2001
|
||||
From: Patrick Yavitz <pyavitz@armbian.com>
|
||||
Date: Wed, 17 Jul 2024 04:33:01 -0400
|
||||
Subject: wireless: rtl8852bs: remove RTW_WARN_LMT
|
||||
|
||||
Signed-off-by: Patrick Yavitz <pyavitz@armbian.com>
|
||||
---
|
||||
drivers/net/wireless/realtek/rtl8852bs/core/rtw_xmit.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/net/wireless/realtek/rtl8852bs/core/rtw_xmit.c b/drivers/net/wireless/realtek/rtl8852bs/core/rtw_xmit.c
|
||||
index 5d41dc48f1eb..dab9ac8ce621 100644
|
||||
--- a/drivers/net/wireless/realtek/rtl8852bs/core/rtw_xmit.c
|
||||
+++ b/drivers/net/wireless/realtek/rtl8852bs/core/rtw_xmit.c
|
||||
@@ -6681,7 +6681,7 @@ static void fill_txreq_list_skb(_adapter *padapter,
|
||||
|
||||
if (skb_total_frag_nr(head_skb) > NUM_PKT_LIST_PER_TXREQ - 2) {
|
||||
rtw_skb_linearize(head_skb);
|
||||
- RTW_WARN_LMT("skb total frag nr over %d\n", NUM_PKT_LIST_PER_TXREQ - 2);
|
||||
+ //RTW_WARN_LMT("skb total frag nr over %d\n", NUM_PKT_LIST_PER_TXREQ - 2);
|
||||
}
|
||||
|
||||
_fill_txreq_list_skb(padapter, txreq, pkt_list, head_skb, &req_sz, &offset);
|
||||
--
|
||||
2.35.3
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
#
|
||||
# Automatically generated by the script mk_format_patch
|
||||
#
|
||||
# https://gitee.com/bianbu-linux/linux-6.1.git
|
||||
#
|
||||
patches.bianbu/riscv-signal-fix-sigaltstack-frame-size-checking.patch
|
||||
patches.bianbu/wireless-rtl8852bs-CONFIG_RTW_DEBUG-n.patch
|
||||
patches.bianbu/wireless-rtl8852bs-remove-RTW_WARN_LMT.patch
|
||||
patches.bianbu/Fix-aes_encrypt-redefinition-errors.patch
|
||||
patches.bianbu/add-minimal-hwmon-support.patch
|
||||
patches.bianbu/Bluetooth-hci_h5-Add-support-for-RTL8852BS.patch
|
||||
patches.bianbu/Bluetooth-btrtl-Add-support-for-RTL8852BS.patch
|
||||
@ -1,13 +0,0 @@
|
||||
#
|
||||
# This file is made manually by simply copying text
|
||||
# from the target series.* files.
|
||||
# Add (-) at the beginning of the line if the patch should not be applied.
|
||||
# At the same time, the patch does not need to be deleted.
|
||||
#
|
||||
patches.bianbu/riscv-signal-fix-sigaltstack-frame-size-checking.patch
|
||||
patches.bianbu/wireless-rtl8852bs-CONFIG_RTW_DEBUG-n.patch
|
||||
patches.bianbu/wireless-rtl8852bs-remove-RTW_WARN_LMT.patch
|
||||
patches.bianbu/Fix-aes_encrypt-redefinition-errors.patch
|
||||
patches.bianbu/add-minimal-hwmon-support.patch
|
||||
patches.bianbu/Bluetooth-hci_h5-Add-support-for-RTL8852BS.patch
|
||||
patches.bianbu/Bluetooth-btrtl-Add-support-for-RTL8852BS.patch
|
||||
Loading…
Reference in New Issue
Block a user