UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Apple SoC RTKit updates for 6.4. 

Just one bugfix and one improvement to how forwarded syslogs are sent to
 dmesg.
 -----BEGIN PGP SIGNATURE-----
 
 iHUEABYIAB0WIQSByI3Ki0mXziclZJcd+FPLCI8zYgUCZC5yjgAKCRAd+FPLCI8z
 YnjIAPwLA3EmD7ZGkGN9HXeY1zQ777FSuOgnWCqr5YJtSYg/ogD/TlLSafLhjWIP
 jqiGJ/v0qfNqgb80T6n4eDJ4rtz4+AY=
 =ESHf
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmQ5QxYACgkQYKtH/8kJ
 UidQ1A/+LqfxkYdYXL7zYtRuVxtb6tEbnQrTofoOboI5KO88LNRlY22SGX49lcsD
 O0B+GdXcbtBAeCOxS63xM/qW4ubX2kg8jcZG6ujudYMvYZIsRkUtP8Xvb2tPorOa
 l9PHpLlA1sE1Qc2LG3nRRsRnZXFzS1X/XgtXCeDUhtjBCf0JU9JBiLxzfqQAgrBC
 b6Ggm1MMfAkQS9GJG/p3f/hBqvbaRqyHzRtpVytEqABcF2nqjcLfRRhMazHvtPfg
 wk0+JhpIIweII9Xaa+5iJ0Ea3rA1agQKCE/f9H32f4ElWNft5KBhMiYGNWD4mshu
 G74gabbvElX/X2GSqNQxMYLzSV4Xc7l1+Z52RL8Nt85EH4duGOBtHEv4mVFpBiQF
 cVY3eIeUY8l9TDSUPTTUCMx6XB4YqBztbNrm/35DXKVhNqvnwanqdAT8Up9nLiuH
 Ru9dzr8FnUCgozvFLbqLpyZrJuNqjHW2AwJ/vr9XAQO9qli36sPobwWM9enfct2d
 fIzH1J2hDAviSDDAb5ZI6v3qjgiCU1Jf6vWC3kEMESs//rNBMQaFvOBwd73WFjZA
 CudA2GMvVFx4P6j94JN5l5ZMNJXqoEe4UkCkEs/2NUIZ3GKsJxJBTiUKU8ZyR+hJ
 Ui9uBVwfQmaIIyrXMXll6kCY/4Ej5HuwmDtjf+DMnxrx4QbpI1o=
 =yLnT
 -----END PGP SIGNATURE-----

Merge tag 'asahi-soc-rtkit-6.4' of https://github.com/AsahiLinux/linux into soc/drivers

Apple SoC RTKit updates for 6.4.

Just one bugfix and one improvement to how forwarded syslogs are sent to
dmesg.

* tag 'asahi-soc-rtkit-6.4' of https://github.com/AsahiLinux/linux:
  soc: apple: rtkit: Crop syslog messages
  soc: apple: rtkit: Fix buffer address field width

Link: https://lore.kernel.org/r/0dbd2dc1-6a2c-5b21-354b-d8314937e8e7@marcan.st
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2023-04-14 14:12:05 +02:00
parent 283480f0ce bdfe6de269
commit 5d2e8343e4
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/soc/apple/rtkit.c
View File

@ -55,7 +55,7 @@ enum {
#define APPLE_RTKIT_BUFFER_REQUEST 1
#define APPLE_RTKIT_BUFFER_REQUEST_SIZE GENMASK_ULL(51, 44)
#define APPLE_RTKIT_BUFFER_REQUEST_IOVA GENMASK_ULL(41, 0)
#define APPLE_RTKIT_BUFFER_REQUEST_IOVA GENMASK_ULL(43, 0)
#define APPLE_RTKIT_SYSLOG_TYPE GENMASK_ULL(59, 52)
@ -409,11 +409,17 @@ static void apple_rtkit_syslog_rx_init(struct apple_rtkit *rtk, u64 msg)
rtk->syslog_n_entries, rtk->syslog_msg_size);
}
static bool should_crop_syslog_char(char c)
{
return c == '\n' || c == '\r' || c == ' ' || c == '\0';
}
static void apple_rtkit_syslog_rx_log(struct apple_rtkit *rtk, u64 msg)
{
u8 idx = msg & 0xff;
char log_context[24];
size_t entry_size = 0x20 + rtk->syslog_msg_size;
int msglen;
if (!rtk->syslog_msg_buffer) {
dev_warn(
@ -446,7 +452,13 @@ static void apple_rtkit_syslog_rx_log(struct apple_rtkit *rtk, u64 msg)
rtk->syslog_msg_size);
log_context[sizeof(log_context) - 1] = 0;
rtk->syslog_msg_buffer[rtk->syslog_msg_size - 1] = 0;
msglen = rtk->syslog_msg_size - 1;
while (msglen > 0 &&
should_crop_syslog_char(rtk->syslog_msg_buffer[msglen - 1]))
msglen--;
rtk->syslog_msg_buffer[msglen] = 0;
dev_info(rtk->dev, "RTKit: syslog message: %s: %s\n", log_context,
rtk->syslog_msg_buffer);