Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'soc-fixes-6.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull SoC fixes from Arnd Bergmann:
"Two more small fixes, correcting the cacheline size on Raspberry Pi 5
and fixing a logic mistake in the microchip mpfs firmware driver"
* tag 'soc-fixes-6.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
arm64: dts: broadcom: Fix L2 linesize for Raspberry Pi 5
firmware: microchip: fix UL_IAP lock check in mpfs_auto_update_state()
+6
-6
+4
-4
arch/arm64/boot/dts/broadcom/bcm2712.dtsi
+4
-4
arch/arm64/boot/dts/broadcom/bcm2712.dtsi
···
67
67
l2_cache_l0: l2-cache-l0 {
68
68
compatible = "cache";
69
69
cache-size = <0x80000>;
70
-
cache-line-size = <128>;
70
+
cache-line-size = <64>;
71
71
cache-sets = <1024>; //512KiB(size)/64(line-size)=8192ways/8-way set
72
72
cache-level = <2>;
73
73
cache-unified;
···
91
91
l2_cache_l1: l2-cache-l1 {
92
92
compatible = "cache";
93
93
cache-size = <0x80000>;
94
-
cache-line-size = <128>;
94
+
cache-line-size = <64>;
95
95
cache-sets = <1024>; //512KiB(size)/64(line-size)=8192ways/8-way set
96
96
cache-level = <2>;
97
97
cache-unified;
···
115
115
l2_cache_l2: l2-cache-l2 {
116
116
compatible = "cache";
117
117
cache-size = <0x80000>;
118
-
cache-line-size = <128>;
118
+
cache-line-size = <64>;
119
119
cache-sets = <1024>; //512KiB(size)/64(line-size)=8192ways/8-way set
120
120
cache-level = <2>;
121
121
cache-unified;
···
139
139
l2_cache_l3: l2-cache-l3 {
140
140
compatible = "cache";
141
141
cache-size = <0x80000>;
142
-
cache-line-size = <128>;
142
+
cache-line-size = <64>;
143
143
cache-sets = <1024>; //512KiB(size)/64(line-size)=8192ways/8-way set
144
144
cache-level = <2>;
145
145
cache-unified;
+2
-2
drivers/firmware/microchip/mpfs-auto-update.c
+2
-2
drivers/firmware/microchip/mpfs-auto-update.c
···
402
402
return -EIO;
403
403
404
404
/*
405
-
* Bit 5 of byte 1 is "UL_Auto Update" & if it is set, Auto Update is
405
+
* Bit 5 of byte 1 is "UL_IAP" & if it is set, Auto Update is
406
406
* not possible.
407
407
*/
408
-
if (response_msg[1] & AUTO_UPDATE_FEATURE_ENABLED)
408
+
if ((((u8 *)response_msg)[1] & AUTO_UPDATE_FEATURE_ENABLED))
409
409
return -EPERM;
410
410
411
411
return 0;