Snap for 12253581 from 2429fa3e to android13-gs-pixel-5.10-24Q4-release

Change-Id: Ie89dc99d3a1069d26a3d477e0c11bfdb492e30eb
Signed-off-by: Coastguard Worker <android-build-coastguard-worker@google.com>

Add hsi2c_7 for gs101
Add hsi2c_8 for gs201
Request is from NFC

Bug: 360739836
Test: build pass

Change-Id: I8068ca5a2fe00cf93347080df14c0a66a37399a9
Signed-off-by: Zheng Pan <zhengpan@google.com>

Merge android13-5.10-2024-07 ab/12225542 into android13-gs-pixel-5.10-24Q4 [ DO NOT MERGE ANYWHERE ]

Merge SHA:
eda2373a UPSTREAM: eeprom: at24: fix memory corruption race condition

Bug: 355176020
Bug: 357011632 (ACK)
Bug: 358529695 (ACK)
Bug: 359558663 (ACK)
Change-Id: I6a57db114cf0444702bb404e2aac1d8f8da31659
Signed-off-by: Pindar Yang <pindaryang@google.com>

Snap for 12238717 from 4ecbeb0e to android13-gs-pixel-5.10-24Q4-release

Change-Id: I155c5f2c30c271ad7288f3c3cb8147806aa86edb
Signed-off-by: Coastguard Worker <android-build-coastguard-worker@google.com>

When the value of first_usage_date is 0, framework will treats
this feature as unsupported.

Bug: 354342303
Test: build
Change-Id: I62c4d23709874175c4d557af27da28cd253837f7
Signed-off-by: Jack Wu <wjack@google.com>

[ Upstream commit f42c9702 ]

If the eeprom is not accessible, an nvmem device will be registered, the
read will fail, and the device will be torn down. If another driver
accesses the nvmem device after the teardown, it will reference
invalid memory.

Move the failure point before registering the nvmem device.

Bug: 359558663

Change-Id: If6368cf79172ca2d3e953e63e68ee4e7b3830512
Signed-off-by: Daniel Okazaki <dtokazaki@google.com>
Fixes: b20eb4c1 ("eeprom: at24: drop unnecessary label")
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20240422174337.2487142-1-dtokazaki@google.com


Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
(cherry picked from commit c850f71fca09ea41800ed55905980063d17e01da)

[ Upstream commit caba40ec ]

The DDR3 SPD data structure advertises the presence of a thermal
sensor on a DDR3 module in byte 32, bit 7. Let's use this information
to explicitly instantiate the thermal sensor I2C client instead of
having to rely on class-based I2C probing.

The temp sensor i2c address can be derived from the SPD i2c address,
so we can directly instantiate the device and don't have to probe
for it. If the temp sensor has been instantiated already by other
means (e.g. class-based auto-detection), then the busy-check in
i2c_new_client_device will detect this.

Note: Thermal sensors on DDR4 DIMM's are instantiated from the
      ee1004 driver.

Bug: 359558663

Change-Id: I4dfb4969f7a5ae6c31bd96436c2773d16c9dcf81
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Link: https://lore.kernel.org/r/68113672-3724-44d5-9ff8-313dd6628f8c@gmail.com


Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Stable-dep-of: f42c9702 ("eeprom: at24: fix memory corruption race condition")
Signed-off-by: Sasha Levin <sashal@kernel.org>
(cherry picked from commit ec9dbddea26b38bd6b2827ddb763831564282295)

[ Upstream commit a3c10035 ]

When using nvmem layouts it is possible devm_nvmem_register returns
-EPROBE_DEFER, resulting in an 'empty' in
/sys/kernel/debug/devices_deferred. Use dev_err_probe for providing
additional information.

Bug: 359558663

Change-Id: I75c5d2437dbe4ee1dfe4f5eb88c8f892cb49ab4f
Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Stable-dep-of: f42c9702 ("eeprom: at24: fix memory corruption race condition")
Signed-off-by: Sasha Levin <sashal@kernel.org>
(cherry picked from commit b2643d2532eee507d83e0a0055da8aac1bd1660a)

The "scmi_info->irq" get -22 (-EINVAL) when no "a2p" interrupt, keep to
use (scmi_info->irq > 0) as if condition to avoid BUG happen like this:

For cherry picked patch 18126b26 (UPSTREAM: firmware: arm_scmi: Fix chan_free cleanup on SMC),
it depends on below two patches from mainline to avoid the BUG we met.
f716cbd3 firmware: arm_scmi: Make smc transport use common completions
a690b7e6 firmware: arm_scmi: Add configurable polling mode for transports

These two patch can't apply directly now, quiet a lot of changes need to merge,
which is much higher risk than just apply this simple fix.

[ 0.199652][ T1] arm-scmi firmware:scmi: SCMI Notifications - Core Enabled.
[ 0.200296][ T1] list_add corruption. prev is NULL.
[ 0.200773][ T1] ------------[ cut here ]------------
[ 0.201242][ T1] kernel BUG at lib/list_debug.c:24!
[ 0.201696][ T1] Internal error: Oops - BUG: 0 [#1] PREEMPT SMP
[ 0.202246][ T1] Modules linked in:
[ 0.202581][ T1] CPU: 4 PID: 1 Comm: swapper/0 Not tainted 5.10.214-android13-4-00002-g4c868a6e89f5-ab12097184 #1
[ 0.203511][ T1] Hardware name: Rockchip RK3588S EVB8 LP4X V10 Board (DT)
[ 0.204137][ T1] pstate: 60800085 (nZCv daIf -PAN +UAO -TCO BTYPE=--)
[ 0.204735][ T1] pc : list_add_valid+0x80/0xc0
[ 0.205168][ T1] lr : __list_add_valid+0x80/0xc0
[ 0.205599][ T1] sp : ffffffc00b24b700
[ 0.205958][ T1] x29: ffffffc00b24b700 x28: 0000000000000002
[ 0.206494][ T1] x27: 00000000000000e0 x26: ffffff810019ca00
[ 0.207027][ T1] x25: 0000000000000000 x24: ffffff810122c1e0
[ 0.207560][ T1] x23: ffffff810122c1d8 x22: ffffffc00b24b728
[ 0.208097][ T1] x21: ffffff810122c1d0 x20: 0000000000000000
[ 0.208631][ T1] x19: 7fffffffffffffff x18: ffffffc00b2350b8
[ 0.209165][ T1] x17: ffffffffffffffff x16: 0000000000000000
[ 0.209697][ T1] x15: 0000000000000004 x14: ffffffc00af6d130
[ 0.210231][ T1] x13: 0000000000000fff x12: 0000000000000003
[ 0.210769][ T1] x11: 00000000ffffffff x10: c0000000ffffefff
[ 0.211300][ T1] x9 : 91b264ed20239600 x8 : 91b264ed20239600
[ 0.211834][ T1] x7 : 322e30202020205b x6 : ffffffc00b1873d8
[ 0.212365][ T1] x5 : ffffffc00b184fee x4 : 0000000000000000
[ 0.212896][ T1] x3 : 0000000000000000 x2 : 0000000000000000
[ 0.213426][ T1] x1 : ffffffc00b24b4d0 x0 : 0000000000000022
[ 0.213959][ T1] Call trace:
[ 0.214239][ T1] __list_add_valid+0x80/0xc0
[ 0.214645][ T1] wait_for_common+0x104/0x308
[ 0.215059][ T1] smc_send_message+0x100/0x2a8
[ 0.215477][ T1] do_xfer+0x128/0x858
[ 0.215826][ T1] version_get+0x88/0x20c
[ 0.216198][ T1] scmi_base_protocol_init+0x6c/0x720
[ 0.216663][ T1] scmi_get_protocol_instance+0x1f4/0x49c
[ 0.217156][ T1] scmi_probe+0x244/0x724
[ 0.217531][ T1] platform_drv_probe+0x60/0x17c
[ 0.217956][ T1] really_probe+0x310/0x974
[ 0.218342][ T1] driver_probe_device+0x74/0x298
[ 0.218776][ T1] device_driver_attach+0x158/0x208
[ 0.219224][ T1] __driver_attach+0x248/0x420
[ 0.219634][ T1] bus_add_driver+0x1d4/0x498
[ 0.220036][ T1] driver_register+0x84/0x17c
[ 0.220442][ T1] scmi_driver_init+0xb0/0xc0
[ 0.220846][ T1] __initstubkmod_scmi_module__425_1626_scmi_driver_init4.cfi+0x14/0x24
[ 0.221589][ T1] do_one_initcall+0x114/0x3b0
[ 0.221998][ T1] do_initcall_level+0xdc/0x1bc
[ 0.222415][ T1] do_initcalls+0x58/0x9c
[ 0.222785][ T1] do_basic_setup+0x28/0x38
[ 0.223172][ T1] kernel_init_freeable+0xfc/0x1bc
[ 0.223616][ T1] kernel_init+0x2c/0x304
[ 0.223988][ T1] ret_from_fork+0x10/0x30
[ 0.224369][ T1] Code: d4210000 d000c600 9118a800 97e0729d (d4210000)
[ 0.224974][ T1] ---[ end trace 6c77dafcd8f3982d ]---
[ 0.225881][ T1] Kernel panic - not syncing: Oops - BUG: Fatal exception

Bug: 357011632
Bug: 358529695
Fixes: 18126b26 ("UPSTREAM: firmware: arm_scmi: Fix chan_free cleanup on SMC")
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Change-Id: I9d9edb48a313b1e4277749082e41ea02ca5ec2a5
(cherry picked from commit fcc95b0adc7f1387fc638592ab284d69d96ef91b)

Snap for 12155744 from 76288fa5 to android13-gs-pixel-5.10-24Q4-release

Change-Id: Id5e804b4f45681d441242578a864148dc819c540
Signed-off-by: Coastguard Worker <android-build-coastguard-worker@google.com>

Merge android13-5.10-2024-07 ab/12097184 into android13-gs-pixel-5.10-24Q4 [ DO NOT MERGE ANYWHERE ]

Merge SHA:
4c868a6e ANDROID: Initialize android13-5.10-2024-07

Bug: 300854197
Bug: 161946584 (ACK)
Bug: 336226035 (ACK)
Bug: 347878754 (ACK)
Change-Id: I6ed460870653ea5f86b52e1dfb926b3e0db85e46
Signed-off-by: Pindar Yang <pindaryang@google.com>

Snap for 12138574 from 360a71e2 to android13-gs-pixel-5.10-24Q4-release

Change-Id: I23e7fc040c9ed72ff7ecee4fd63f97abd8b63f4b
Signed-off-by: Coastguard Worker <android-build-coastguard-worker@google.com>

suspending flag for ourport is introduced,
to prevent rts toggling due to sicd power mode during suspend.

suspending flag is set to 1 at the start of suspend sequence
and set to 0 at the end of suspend sequence.

BUG: 322129034
Test: build test build and run BCST
Change-Id: I15940a5dc64735c8e56471eff9d5cdb14a6575b3
Signed-off-by: Sophie Hu <sophiehu@google.com>

Original change: https://partner-android-review.googlesource.com/c/kernel/private/gs-google/+/2885705



Change-Id: I239599f1bbea350bae275656bd92b7ccb74f06a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://partner-android-review.googlesource.com/c/kernel/private/gs-google/+/2884544



Change-Id: I2adc5cac20cdf9038ccbf4ac60e08799ca6b346b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://partner-android-review.googlesource.com/c/kernel/private/gs-google/+/2884543



Change-Id: I25753a31c4f991832e2379e713ab43b4d299c420
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://partner-android-review.googlesource.com/c/kernel/private/gs-google/+/2884542



Change-Id: I9689c80ddcad3540c4ef441b3676822de4bbbebe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://partner-android-review.googlesource.com/c/kernel/private/gs-google/+/2873197



Change-Id: Idde345a590821155ecadf609d0ac616f0f49830e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] arm64/dts: gs201: Add Alive S2MPU am: b4d74ef4 -s ours am: 3e07d89c -s ours

am skip reason: Merged-In I844cdd4e2485fbae416c618b0b8a83e30b847065 with SHA-1 7b40bac4 is already in history

Original change: https://partner-android-review.googlesource.com/c/kernel/private/gs-google/+/2877409



Change-Id: I6854543c88e55dfbad722b2064d168d2fb25bab4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

am skip reason: Merged-In I38a1a2af556eaca83be3bd93db1b5dd400034255 with SHA-1 d913e04f is already in history

Original change: https://partner-android-review.googlesource.com/c/kernel/private/gs-google/+/2877864



Change-Id: Ic253cae204672d26767dedf70031cff4483eb27e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] arm64/s2mpu: Add deny-all support am: 3a4aa019 -s ours am: 2ab6052c -s ours

am skip reason: Merged-In Id8a38b38310ec950841074b288797041355a3ec7 with SHA-1 0f1c59c0 is already in history

Original change: https://partner-android-review.googlesource.com/c/kernel/private/gs-google/+/2877863



Change-Id: I907d4232884506201eebc62275c018c642d596da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://partner-android-review.googlesource.com/c/kernel/private/gs-google/+/2870608



Change-Id: I1b97d1973702faf287747a8263e87e6689e0b220
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://partner-android-review.googlesource.com/c/kernel/private/gs-google/+/2870607



Change-Id: I401d792dd1076dc578f869a1ddef3e02dda3053d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://partner-android-review.googlesource.com/c/kernel/private/gs-google/+/2870606



Change-Id: I149556c8754655fa7cc8dd6af7f74ad9b6935599
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

In order to print less log to make room for other logs.
Skip print if the data not filled.

Bug: 332426051
Test: echo c > /proc/sysrq-trigger and check irq info

Change-Id: I6519455c02ff6905f33464bd8f220c194e152a65
Signed-off-by: Eric Lai <ericllai@google.com>

Remove dpm override, let the driver direct control the
support method without dpm change.

In order to print less log to make room for other logs.
Disable last info which is unsupported.

Bug: 332426051
Test: echo c > /proc/sysrq-trigger and check irq info

Change-Id: I9789da3b8c96ae7c0023a80560a86f5f912d0a89
Signed-off-by: Eric Lai <ericllai@google.com>

In order to print less log to make room for other logs.
Uses IRQ_THRESHOLD * boot time to filter normal IRQ. Since no IRQ
should reach 50 times per second beside system IRQ. Set IRQ_THRESHOLD
to 50.

Bug: 332426051
Test: echo c > /proc/sysrq-trigger and check irq info
Change-Id: I838aa119ae214f533c83ee64fffd1642bf6b64ce
Signed-off-by: Eric Lai <ericllai@google.com>

Reduce the amount of data being dumped into logs via the panic notifier if the Trusty kernel has not itself panicked.

Bug: 332426051
Test: sys-rq crash with force option
Test: sys-rq crash without force option
Test: Trusty panic without force option
Change-Id: I0d2622b905236f50388c2f5b00c17cbdbd0c2edb
Signed-off-by: Michael McTernan <mikemcternan@google.com>

Bug: 347878754
Signed-off-by: Todd Kjos <tkjos@google.com>
Change-Id: I655772a76591a402c934bb1d8189ee0d4dda3067

misfit_task_load will be set as 0 when task util is 1024

Bug: 346060683
Change-Id: Ib59d76264b9beba9471c6f301b3b2db7867945aa
Signed-off-by: Chungkai Mei <chungkai@google.com>

am skip reason: Merged-In I844cdd4e2485fbae416c618b0b8a83e30b847065 with SHA-1 7b40bac4 is already in history

Original change: https://partner-android-review.googlesource.com/c/kernel/private/gs-google/+/2877409



Change-Id: I7965f476dd52444d1ccd7a1e9965039723a03130
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

am skip reason: Merged-In I38a1a2af556eaca83be3bd93db1b5dd400034255 with SHA-1 d913e04f is already in history

Original change: https://partner-android-review.googlesource.com/c/kernel/private/gs-google/+/2877864



Change-Id: I4a5955495de690eaa4e423cb47fe95c9aad05140
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

am skip reason: Merged-In Id8a38b38310ec950841074b288797041355a3ec7 with SHA-1 0f1c59c0 is already in history

Original change: https://partner-android-review.googlesource.com/c/kernel/private/gs-google/+/2877863



Change-Id: I24f0e9ffce21318e06645aefbe7b5bf5cb4fae4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Alive S2MPU is fully trusted and is not managed by the kernel.
However, we need to make sure the kernel can’t map it to use
it in emulation mode of the S2MPU.

So we define it as:
- “deny-all”: So it never gets power managed or updated
- “off-at-boot”: Never configured at boot.

Which mainly means it remains unconfigured but it's MMIO is not
accessible to the kernel.

Bug: 342511931
Signed-off-by: Mostafa Saleh <smostafa@google.com>
(cherry picked from https://partner-android-review.googlesource.com/q/commit:7b40bac463a2ce4ea983b0c5963a8f65532f37fb)
Merged-In: I844cdd4e2485fbae416c618b0b8a83e30b847065
Change-Id: I844cdd4e2485fbae416c618b0b8a83e30b847065

AoC is only controlled by TZ.

However, SysMMU has an emulation feature that can be misused to read
from arbitrary memory locations, and with SysMMU under the control of
the kernel, we need to configure S2MPU to block such potentially
malicious transactions.

Add the AoC S2MPU with the new flag “deny-all” which would mainly
unmap the S2MPU interface and configure it to deny all traffic.

Bug: 342511931
Signed-off-by: Mostafa Saleh <smostafa@google.com>
(cherry picked from https://partner-android-review.googlesource.com/q/commit:d913e04f18a500d4b46e4e928fd4e69106b28ebd)
Merged-In: I38a1a2af556eaca83be3bd93db1b5dd400034255
Change-Id: I38a1a2af556eaca83be3bd93db1b5dd400034255

Add "deny-all" propery for S2MPUs, this has the same purpose as other
branches but implemented in a slightly different way.

Mainly, we want to ensure that this device is not accessible from
host and in deny-all state, at probe the device is set to deny state
and then all PM calls are blocked so the hypervisor would never touch
any of its MMIO
But they are registered with the hypervisor so they are not accessible
from host.

Bug: 342511931
Signed-off-by: Mostafa Saleh <smostafa@google.com>
(cherry picked from https://partner-android-review.googlesource.com/q/commit:0f1c59c0ddc06986260f0e99d58d543ab43cf4de)
Merged-In: Id8a38b38310ec950841074b288797041355a3ec7
Change-Id: Id8a38b38310ec950841074b288797041355a3ec7

Original change: https://partner-android-review.googlesource.com/c/kernel/private/gs-google/+/2870608



Change-Id: I147296965d14b7c4808b910507c2e17ea31bdf71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://partner-android-review.googlesource.com/c/kernel/private/gs-google/+/2870607



Change-Id: I828848816f2aefa2d7c23b9f1221a61e92e9717d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://partner-android-review.googlesource.com/c/kernel/private/gs-google/+/2870606



Change-Id: I2eab43bd1f13a11f11dbba81a7c9707ca3a2ed27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Alive S2MPU is fully trusted and is not managed by the kernel.
However, we need to make sure the kernel can’t map it to use
it in emulation mode of the S2MPU.

So we define it as:
- “deny-all”: So it never gets power managed or updated
- “off-at-boot”: Never configured at boot.

Which mainly means it remains unconfigured but it's MMIO is not
accessible to the kernel.

Bug: 342511931
Change-Id: I844cdd4e2485fbae416c618b0b8a83e30b847065
Signed-off-by: Mostafa Saleh <smostafa@google.com>