Merge tag 'android15-6.6-2024-11_r3' into ti-android-linux-6.6.y

android15-6.6 November 2024 release 3

Artifacts: https://ci.android.com/builds/submitted/12698953/kernel_aarch64/latest

 Conflicts:
	android/abi_gki_aarch64.stg
	drivers/pci/controller/dwc/pci-keystone.c
	drivers/remoteproc/ti_k3_r5_remoteproc.c

Boot tested on AM62X to launcher:

Linux localhost 6.6.56-android14-8-ge6cfc0686968-4k #1 SMP PREEMPT Tue Nov 26 15:42:22 UTC 2024 aarch64 Toybox

/cc @glaroque @mfournier @nkbelin

For the conflict resolution, I've used the following patches to help me resolve them:

commit e85ab507882db165c10a858d7f685a0a38f0312e
Author: Dan Carpenter <dan.carpenter@linaro.org>
Date:   Fri Jul 19 18:53:26 2024 -0500

    PCI: keystone: Fix if-statement expression in ks_pcie_quirk()

    [ Upstream commit 6188a1c762eb9bbd444f47696eda77a5eae6207a ]

    This code accidentally uses && where || was intended.  It potentially
    results in a NULL dereference.

    Thus, fix the if-statement expression to use the correct condition.

    Fixes: 86f271f22bbb ("PCI: keystone: Add workaround for Errata #i2037 (AM65x SR 1.0)")
    Link: https://lore.kernel.org/linux-pci/1b762a93-e1b2-4af3-8c04-c8843905c279@stanley.mountain
    Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
    [kwilczynski: commit log]
    Signed-off-by: Krzysztof Wilczyński <kwilczynski@kernel.org>
    Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
    Reviewed-by: Siddharth Vadapalli <s-vadapalli@ti.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>

commit 7bd6135577ba5c59665baa67126fc51f691e9c97
Author: Udit Kumar <u-kumar1@ti.com>
Date:   Tue Jul 16 22:54:18 2024 +0530

    TI: remoteproc: k3-r5: Delay notification of wakeup event

    Few times, core 1 was scheduled to boot first before core0.
    Which leads to error
    'k3_r5_rproc_start: can not start core 1 before core 0'.

    This was happening due to some scheduling between prepare
    and start callback. The probe function waits for event,
    which is getting triggered by prepare callback.

    To avoid above condition move even trigger to start instead
    of prepare callback.

    Fixes: 7dcf3e00aa95 ("remoteproc: k3-r5: Wait for core0 power-up before powering up core1")
    Cc: Rahul Ravikumar <r-ravikumar@ti.com>
    Cc: Hari Nagalla <hnagalla@ti.com>
    Change-Id: I6789cc752497c18f59f0421f24af521eb02247df
    Signed-off-by: Udit Kumar <u-kumar1@ti.com>
    Reviewed-by: Beleswar Padhi <b-padhi@ti.com>
    (cherry picked from commit 0adfbf6ba7de2e2c9c653ce8997ced3df0de7fa7)
    Signed-off-by: Guillaume La Roque <glaroque@baylibre.com>