Skip to content

Commit 48f506a

Browse files
committed
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()
2 parents 4aa748d + a31ffd6 commit 48f506a

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

arch/arm64/boot/dts/broadcom/bcm2712.dtsi

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
l2_cache_l0: l2-cache-l0 {
6868
compatible = "cache";
6969
cache-size = <0x80000>;
70-
cache-line-size = <128>;
70+
cache-line-size = <64>;
7171
cache-sets = <1024>; //512KiB(size)/64(line-size)=8192ways/8-way set
7272
cache-level = <2>;
7373
cache-unified;
@@ -91,7 +91,7 @@
9191
l2_cache_l1: l2-cache-l1 {
9292
compatible = "cache";
9393
cache-size = <0x80000>;
94-
cache-line-size = <128>;
94+
cache-line-size = <64>;
9595
cache-sets = <1024>; //512KiB(size)/64(line-size)=8192ways/8-way set
9696
cache-level = <2>;
9797
cache-unified;
@@ -115,7 +115,7 @@
115115
l2_cache_l2: l2-cache-l2 {
116116
compatible = "cache";
117117
cache-size = <0x80000>;
118-
cache-line-size = <128>;
118+
cache-line-size = <64>;
119119
cache-sets = <1024>; //512KiB(size)/64(line-size)=8192ways/8-way set
120120
cache-level = <2>;
121121
cache-unified;
@@ -139,7 +139,7 @@
139139
l2_cache_l3: l2-cache-l3 {
140140
compatible = "cache";
141141
cache-size = <0x80000>;
142-
cache-line-size = <128>;
142+
cache-line-size = <64>;
143143
cache-sets = <1024>; //512KiB(size)/64(line-size)=8192ways/8-way set
144144
cache-level = <2>;
145145
cache-unified;

drivers/firmware/microchip/mpfs-auto-update.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -402,10 +402,10 @@ static int mpfs_auto_update_available(struct mpfs_auto_update_priv *priv)
402402
return -EIO;
403403

404404
/*
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
406406
* not possible.
407407
*/
408-
if (response_msg[1] & AUTO_UPDATE_FEATURE_ENABLED)
408+
if ((((u8 *)response_msg)[1] & AUTO_UPDATE_FEATURE_ENABLED))
409409
return -EPERM;
410410

411411
return 0;

0 commit comments

Comments
 (0)