Tao Huang
8c43b7ff27
soc: rockchip_system_monitor: Fix TPYE -> TYPE typo
...
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I815c6e01039c0ba6469b575cf86349e6b87148c5
2023-06-13 15:28:39 +08:00
Wesley Yao
a822375383
PM / devfreq: rockchip_dmc: Add support for rk3528
...
Signed-off-by: Wesley Yao <wesley.yao@rock-chips.com>
Change-Id: I90b09d044769747e8858c23f3087c00b2fcb2f12
2023-06-09 10:48:28 +08:00
Wesley Yao
daf1596e95
PM / devfreq: rockchip-dfi: Add support for rk3528 dfi
...
Signed-off-by: Wesley Yao <wesley.yao@rock-chips.com>
Change-Id: Iaf29eebe4ccf3e9a25f5a76cd727af2410d514b3
2023-06-09 10:48:28 +08:00
YouMin Chen
c92deced0b
PM / devfreq: rockchip_dmc: Add lock for rockchip_dmcfreq_get_dev_status
...
RK3588 platform may crash if the CPU and MCU access the DFI/DMC
registers at same time.
Signed-off-by: YouMin Chen <cym@rock-chips.com>
Change-Id: I6912f72aff09f7db6d696f4a5b15ccc06f68ba04
2023-05-17 17:12:39 +08:00
Finley Xiao
7fbdfc8ae5
PM / devfreq: rockchip_bus: add support for rk3528
...
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I7f2c65f87e2500357b896e39b477faae97451a3c
2023-04-14 18:14:56 +08:00
Finley Xiao
102afd597a
PM / devfreq: rockchip_dmc: Add support for rk3528
...
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I1c8a32f620238ffa0271cb11bf3ca94718596b91
2023-04-14 18:14:56 +08:00
Finley Xiao
affd6e891b
PM / devfreq: rockchip_dmc: Don't do suspend and resume when devfreq is null
...
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I2d1c87024507ae1670f1e5eae8c4c3872e1a3f91
2023-04-14 18:14:56 +08:00
Finley Xiao
58d460fe45
PM / devfreq: rockchip_dmc: Add system monitor support when no devfreq
...
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Ib7cba347c705ea5159bc29a2268da9d63116f1e0
2023-04-14 18:14:56 +08:00
Tao Huang
cc17504307
Merge tag 'android12-5.10-2023-02_r1' of https://android.googlesource.com/kernel/common
...
android12-5.10 February 2023 release 1
Artifacts:
https://ci.android.com/builds/submitted/9611440/kernel_aarch64/latest
* tag 'android12-5.10-2023-02_r1': (5560 commits)
ANDROID: GKI: Enable ARM64_ERRATUM_2454944
ANDROID: dma-ops: Add restricted vendor hook
ANDROID: arm64: Work around Cortex-A510 erratum 2454944
ANDROID: mm/vmalloc: Add override for lazy vunmap
ANDROID: cpuidle-psci: Fix suspicious RCU usage
ANDROID: ABI: update allowed list for galaxy
FROMGIT: f2fs: add sysfs nodes to set last_age_weight
FROMGIT: f2fs: fix wrong calculation of block age
ANDROID: struct io_uring ABI preservation hack for 5.10.162 changes
ANDROID: fix up struct task_struct ABI change in 5.10.162
ANDROID: add flags variable back to struct proto_ops
UPSTREAM: io_uring: pass in EPOLL_URING_WAKE for eventfd signaling and wakeups
UPSTREAM: eventfd: provide a eventfd_signal_mask() helper
UPSTREAM: eventpoll: add EPOLL_URING_WAKE poll wakeup flag
UPSTREAM: Revert "proc: don't allow async path resolution of /proc/self components"
UPSTREAM: Revert "proc: don't allow async path resolution of /proc/thread-self components"
UPSTREAM: net: remove cmsg restriction from io_uring based send/recvmsg calls
UPSTREAM: task_work: unconditionally run task_work from get_signal()
UPSTREAM: signal: kill JOBCTL_TASK_WORK
UPSTREAM: io_uring: import 5.15-stable io_uring
...
Change-Id: I2b16474d6e3a91f1d702486ec6d1565a7bc310e3
Conflicts:
Documentation/ABI/testing/configfs-usb-gadget-uac2
Documentation/usb/gadget-testing.rst
Makefile
arch/arm/boot/dts/rk3288-evb-act8846.dts
arch/arm64/mm/Makefile
drivers/dma-buf/dma-buf.c
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
drivers/gpu/drm/rockchip/rockchip_drm_vop.c
drivers/mmc/core/mmc.c
drivers/pci/controller/dwc/pcie-designware-host.c
drivers/pinctrl/pinctrl-rockchip.c
drivers/regulator/core.c
drivers/usb/dwc3/ep0.c
drivers/usb/dwc3/gadget.c
drivers/usb/gadget/function/f_hid.c
drivers/usb/gadget/function/f_uac1.c
drivers/usb/gadget/function/f_uac2.c
drivers/usb/gadget/function/u_audio.c
drivers/usb/gadget/function/u_audio.h
drivers/usb/gadget/function/u_uac2.h
drivers/usb/host/xhci.h
drivers/usb/storage/unusual_uas.h
drivers/usb/typec/altmodes/displayport.c
include/linux/page_ext.h
mm/cma.c
mm/page_ext.c
sound/core/pcm_dmaengine.c
sound/soc/codecs/hdmi-codec.c
include/linux/stmmac.h
sound/drivers/aloop.c
drivers/pci/controller/dwc/pcie-designware.h
2023-03-14 09:44:51 +08:00
Finley Xiao
a6e1e5a832
PM / devfreq: rockchip_bus: add support for rk3562
...
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I3250131f321ea9d8a6c798de457ae65d6e93a7ed
2023-03-08 11:32:12 +08:00
Tao Huang
ccf392b755
Revert "PM / devfreq: rockchip_dmc: add support for rk3368"
...
This reverts commit 3aacbd51b7 .
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I2b72f87b15dab04a34ad796bd16dbba70833c16e
2023-02-24 21:06:10 +08:00
YouMin Chen
c7cb4c1ef8
PM / devfreq: rockchip_dmc: Add support for rk3562
...
Signed-off-by: YouMin Chen <cym@rock-chips.com>
Change-Id: I839d731812df29a05f339a0ff5d63bf2056a88f2
2023-02-10 14:28:01 +08:00
YouMin Chen
1af50cdeaf
PM / devfreq: rockchip-dfi: Add support for rk3562 dfi
...
Signed-off-by: YouMin Chen <cym@rock-chips.com>
Change-Id: Idf016a7ad082771277e6de6a7412d9a7a8e226eb
2023-02-10 14:26:16 +08:00
Tao Huang
48df20e1d4
Partially revert "PM / devfreq: rk3399_dmc: rename driver to 'rockchip_dmc'"
...
This partially reverts commit 990b7b2229 .
Restore
Documentation/devicetree/bindings/devfreq/rk3399_dmc.txt
drivers/devfreq/rk3399_dmc.c
to avoid merge conflict.
Change-Id: I608b36423b2d21108f4d86b3f8e29db46a497165
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2023-01-04 19:06:12 +08:00
YouMin Chen
97c00cc207
PM / devfreq: rockchip_dmc: support configure wait_mode for rk3588
...
Signed-off-by: YouMin Chen <cym@rock-chips.com>
Change-Id: I2a5a4c24133e9018450ce0810556b3c30ef4f74a
2022-12-29 15:11:50 +08:00
Liang Chen
e0d6e449eb
PM / devfreq: rockchip_dmc: dump current opp state when panic for ddr
...
panic log:
rockchip-dmc dmc: cur_freq: 528000000 Hz, volt_vdd: 675000 uV, volt_mem: 700000 uV
Signed-off-by: Liang Chen <cl@rock-chips.com>
Change-Id: Iad0ef4c72f9761e23f68098d1e9ad03dec4d84a1
2022-12-22 10:58:08 +08:00
Liang Chen
0140962993
Revert "soc: rockchip: opp_select: dump current opp state when panic for cpu/ddr"
...
clk_get_rate()/regulator_get_voltage() maybe not useable when panic.
This reverts commit bc2d913a39 .
Change-Id: I127a24cb596e459f9f608a5e2847b41530062758
2022-12-22 10:55:04 +08:00
Liang Chen
545e8565ef
PM / devfreq: rockchip_dmc: Add SYS_STATUS_VIDEO_4K_60P
...
Signed-off-by: Liang Chen <cl@rock-chips.com>
Change-Id: I091f395dfcf8f6b11f77d03b860f4ea8450678b2
2022-12-01 16:48:32 +08:00
Zhihuan He
e50ad473db
PM / devfreq: rockchip-dfi: rk3588: fix total counter get err for lp5
...
Signed-off-by: Zhihuan He <huan.he@rock-chips.com>
Change-Id: I5e267a3ed4eb5d501d5634111f67ec4cc6d690d6
2022-12-01 16:08:49 +08:00
XiaoDong Huang
9cc95efeb5
PM / devfreq: rockchip_bus: add support for rk3588
...
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
Change-Id: If03fa9331168187dabf6f97cc38354f0b560fc1c
2022-11-19 15:26:03 +08:00
XiaoDong Huang
8fedbbb946
PM / devfreq: rockchip_bus: support parse soc-bus-table
...
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
Change-Id: I76ff30103cfa93289b9ecde0d95f42f960284e9b
2022-11-19 15:26:03 +08:00
YouMin Chen
65cdd3aa7a
PM / devfreq: rockchip_dmc: rk3588: opp_table automatch supported frequencies
...
Signed-off-by: YouMin Chen <cym@rock-chips.com>
Change-Id: Ie0643ec5ff864136b44e357348cce5c595a15052
2022-10-28 16:25:51 +08:00
Liang Chen
bc2d913a39
soc: rockchip: opp_select: dump current opp state when panic for cpu/ddr
...
panic log:
cpu cpu6: cur_freq: 1008000000 Hz, volt_vdd: 675000 uV, volt_mem: 675000 uV
cpu cpu4: cur_freq: 408000000 Hz, volt_vdd: 675000 uV, volt_mem: 675000 uV
cpu cpu0: cur_freq: 816000000 Hz, volt_vdd: 675000 uV, volt_mem: 675000 uV
rockchip-dmc dmc: cur_freq: 528000000 Hz, volt_vdd: 675000 uV, volt_mem: 700000 uV
Change-Id: I29ea94cc9deaba0e1d285390312256567708d6ef
Signed-off-by: Liang Chen <cl@rock-chips.com>
2022-10-09 19:53:52 +08:00
Finley Xiao
fd5a3be7ea
PM / devfreq: rockchip_dmc: Add SYS_STATUS_VIDEO_SVEP
...
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Ic6f3b7b2b87df8ac727748a7ca24cd511c3570f4
2022-08-31 10:08:59 +08:00
Miaoqian Lin
e65027fdeb
PM / devfreq: exynos-ppmu: Fix refcount leak in of_get_devfreq_events
...
commit f44b799603a9b5d2e375b0b2d54dd0b791eddfc2 upstream.
of_get_child_by_name() returns a node pointer with refcount
incremented, we should use of_node_put() on it when done.
This function only calls of_node_put() in normal path,
missing it in error paths.
Add missing of_node_put() to avoid refcount leak.
Fixes: f262f28c14 ("PM / devfreq: event: Add devfreq_event class")
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2022-07-07 17:52:18 +02:00
Finley Xiao
a6098a99a7
PM / devfreq: rockchip_dmc: Add SYS_STATUS_HDMIRX
...
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I133589dd2a1f8b88f08a20e7caaf10a3e84c04e3
2022-07-04 14:55:08 +08:00
YouMin Chen
9f8075b8ae
PM / devfreq: rockchip_dmc: clear the irq if waiting complt_irq timeout
...
If waiting for wait_ctrl.complt_irq times out, clear the IRQ and stop the MCU by
sip_smc_dram(DRAM_POST_SET_RATE). Prevent the complt_irq which blocked from responding
in the next DDR frequency conversion flow.
Signed-off-by: YouMin Chen <cym@rock-chips.com>
Change-Id: I771ac2471dd1ef388f249c367d4f875ea0502e6c
2022-06-24 15:44:03 +08:00
Brian Norris
86b091b689
PM / devfreq: rk3399_dmc: Disable edev on remove()
...
[ Upstream commit 2fccf9e6050e0e3b8b4cd275d41daf7f7fa22804 ]
Otherwise we hit an unablanced enable-count when unbinding the DFI
device:
[ 1279.659119] ------------[ cut here ]------------
[ 1279.659179] WARNING: CPU: 2 PID: 5638 at drivers/devfreq/devfreq-event.c:360 devfreq_event_remove_edev+0x84/0x8c
...
[ 1279.659352] Hardware name: Google Kevin (DT)
[ 1279.659363] pstate: 80400005 (Nzcv daif +PAN -UAO -TCO BTYPE=--)
[ 1279.659371] pc : devfreq_event_remove_edev+0x84/0x8c
[ 1279.659380] lr : devm_devfreq_event_release+0x1c/0x28
...
[ 1279.659571] Call trace:
[ 1279.659582] devfreq_event_remove_edev+0x84/0x8c
[ 1279.659590] devm_devfreq_event_release+0x1c/0x28
[ 1279.659602] release_nodes+0x1cc/0x244
[ 1279.659611] devres_release_all+0x44/0x60
[ 1279.659621] device_release_driver_internal+0x11c/0x1ac
[ 1279.659629] device_driver_detach+0x20/0x2c
[ 1279.659641] unbind_store+0x7c/0xb0
[ 1279.659650] drv_attr_store+0x2c/0x40
[ 1279.659663] sysfs_kf_write+0x44/0x58
[ 1279.659672] kernfs_fop_write_iter+0xf4/0x190
[ 1279.659684] vfs_write+0x2b0/0x2e4
[ 1279.659693] ksys_write+0x80/0xec
[ 1279.659701] __arm64_sys_write+0x24/0x30
[ 1279.659714] el0_svc_common+0xf0/0x1d8
[ 1279.659724] do_el0_svc_compat+0x28/0x3c
[ 1279.659738] el0_svc_compat+0x10/0x1c
[ 1279.659746] el0_sync_compat_handler+0xa8/0xcc
[ 1279.659758] el0_sync_compat+0x188/0x1c0
[ 1279.659768] ---[ end trace cec200e5094155b4 ]---
Signed-off-by: Brian Norris <briannorris@chromium.org>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2022-06-09 10:20:57 +02:00
Finley Xiao
6a1d3bccc8
PM / devfreq: rockchip_dmc: Implement rockchip_dmcfreq_adjust_opp_table()
...
The dev_pm_opp_add() can't be used to add opp with multiple voltage
ranges, and there's no need to add new opp, just need adjust opp rate
according to the rate support by DDR.
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Ic9dd29bedd22d0b7928110c6d0c6483414b48415
2022-06-02 10:25:47 +08:00
Finley Xiao
d388ec1af3
PM / devfreq: rockchip_dmc: Add multiple regulators support
...
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I46f38c4b40031d09bd3881ff65fb11c64fa63d13
2022-06-02 09:49:21 +08:00
Finley Xiao
f7995f721a
PM / devfreq: rockchip_dmc: Fix cpufreq_cpu_acquire/release undefined
...
Fix build error when build as module.
Fixes: a2328c4f99 ("PM / devfreq: rockchip_dmc: Get policy when need to increase cpu frequency")
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I61ce3457355c10f91ce43ae6d1fb5b6dab0d424d
2022-05-27 18:55:03 +08:00
Finley Xiao
a2328c4f99
PM / devfreq: rockchip_dmc: Get policy when need to increase cpu frequency
...
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I60d1e7b129b56502d054f041a29438bd37e917ae
2022-05-18 20:50:47 +08:00
YouMin Chen
b5599a8a61
PM / devfreq: rockchip_dmc: rk3588 set vdd_center to sleep_volt in suspend
...
Signed-off-by: YouMin Chen <cym@rock-chips.com>
Change-Id: Ia72a4877cd1b3d2bbd7de612bdb9cc92245a6088
2022-04-01 16:29:01 +08:00
Finley Xiao
3e0f904b83
PM / devfreq: rockchip-dfi: build depends on CPU config
...
This optimizes the size of rockchip-otp.o, details as follows.
./scripts/bloat-o-meter rockchip-dfi-old.o rockchip-dfi.o
add/remove: 0/20 grow/shrink: 0/1 up/down: 0/-3564 (-3564)
Function old new delta
rk3368_dfi_set_event 8 - -8
rk3288_dfi_set_event 8 - -8
rk3128_dfi_set_event 8 - -8
rk3368_dfi_ops 20 - -20
rk3288_dfi_ops 20 - -20
rk3128_dfi_ops 20 - -20
rk3368_dfi_disable 36 - -36
rk3288_dfi_disable 36 - -36
rk3128_dfi_disable 36 - -36
rk3368_dfi_enable 40 - -40
rk3288_dfi_enable 40 - -40
rk3128_dfi_enable 40 - -40
rk3368_dfi_init 76 - -76
rk3128_dfi_init 76 - -76
rk3328_dfi_init 212 - -212
rk3128_dfi_get_event 212 - -212
rk3288_dfi_init 240 - -240
rockchip_dfi_init 256 - -256
rk3368_dfi_get_event 260 - -260
rk3288_dfi_get_event 352 - -352
rockchip_dfi_id_match 1960 392 -1568
Total: Before=5144, After=1580, chg -69.28%
Change-Id: Ibb2b001fb9afdcb6fec5db9d075c71b3abb6fbf3
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2022-03-10 11:42:20 +08:00
Finley Xiao
3b2f4c277f
PM / devfreq: rockchip_dmc: Fix WARNING when remove static OPP
...
Only dynamic OPPs can be removed by dev_pm_opp_remove.
[ 2.484575][ T9] ------------[ cut here ]------------
[ 2.485095][ T9] WARNING: CPU: 1 PID: 9 at drivers/opp/core.c:1205 dev_pm_opp_put_opp_table+0x130/0x138
[ 2.487307][ T9] Modules linked in:
[ 2.488411][ T9] CPU: 1 PID: 9 Comm: kworker/u16:1 Not tainted 5.10.66 #1871
[ 2.489755][ T9] Hardware name: Rockchip RK3588 EVB1 LP4 V10 Board (DT)
[ 2.491020][ T9] Workqueue: events_unbound deferred_probe_work_func
[ 2.492845][ T9] pstate: 20800009 (nzCv daif -PAN +UAO -TCO BTYPE=--)
[ 2.494247][ T9] pc : dev_pm_opp_put_opp_table+0x130/0x138
[ 2.494759][ T9] lr : dev_pm_opp_put_opp_table+0x88/0x138
[ 2.494767][ T9] sp : ffffffc01220b990
[ 2.496151][ T9] x29: ffffffc01220b990
[ 2.497399][ T9] x28: ffffff8102cc1488
[ 2.498665][ T9]
[ 2.498668][ T9] x27: 0000000000000000 x26: 00000000ffffffea
[ 2.498675][ T9] x25: ffffffc0118d3536 x24: ffffff8103da5810
[ 2.502111][ T9] x23: ffffff8103febf00 x22: dead000000000100
[ 2.502680][ T9] x21: ffffff8101058010 x20: ffffff8102cc1800
[ 2.503211][ T9] x19: ffffff8102cc1878 x18: ffffffc0120b5088
[ 2.503742][ T9] x17: 0000000000000000 x16: 00000000000000d8
[ 2.504273][ T9] x15: 0000000000000004 x14: 0000000000003fff
[ 2.504812][ T9] x13: ffffffc011bec968 x12: 0000000000000003
[ 2.506346][ T9] x11: 0000000000000000 x10: ffffffc1ed335000
[ 2.507322][ T9] x9 : ffffff8103febe00 x8 : ffffff8102cc1868
[ 2.507853][ T9] x7 : 342e32202020205b x6 : ffffffc011fc9db8
[ 2.508385][ T9] x5 : ffffffffffffffff x4 : ffffff81fee890a0
[ 2.508918][ T9] x3 : 0000000000000c59 x2 : ffffff8103da5500
[ 2.509454][ T9] x1 : 0000000000000000 x0 : 0000000000000000
[ 2.509988][ T9] Call trace:
[ 2.510269][ T9] dev_pm_opp_put_opp_table+0x130/0x138
[ 2.510746][ T9] dev_pm_opp_remove+0xe0/0xe4
[ 2.511161][ T9] rockchip_get_freq_info+0xd4/0x294
[ 2.511614][ T9] rk3588_dmc_init+0x148/0x234
[ 2.512024][ T9] rockchip_dmcfreq_probe+0x2f0/0x1498
[ 2.512489][ T9] platform_drv_probe+0x9c/0xc4
[ 2.512910][ T9] really_probe+0x204/0x510
[ 2.513331][ T9] driver_probe_device+0x80/0xc0
[ 2.513788][ T9] __device_attach_driver+0x118/0x140
[ 2.514249][ T9] bus_for_each_drv+0x84/0xd4
[ 2.514654][ T9] __device_attach+0xc0/0x158
[ 2.515059][ T9] device_initial_probe+0x18/0x28
[ 2.515486][ T9] bus_probe_device+0x38/0xa0
[ 2.515891][ T9] deferred_probe_work_func+0x80/0xe0
[ 2.516352][ T9] process_one_work+0x1f4/0x490
[ 2.516768][ T9] worker_thread+0x324/0x4dc
[ 2.517164][ T9] kthread+0x13c/0x344
[ 2.517516][ T9] ret_from_fork+0x10/0x30
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I5638b51e1e1f651c0a6755cebf9529fe64be4419
2022-02-09 20:22:34 +08:00
YouMin Chen
5c4f1d6e3d
PM / devfreq: rockchip_dmc: add support for rk3588
...
Signed-off-by: YouMin Chen <cym@rock-chips.com>
Change-Id: I2869e9a9afa3531d8300ef04393f0e6ea61626d2
2021-12-24 20:23:13 +08:00
Zhihuan He
d932640623
PM / devfreq: rockchip-dfi: add rk3588 dfi support
...
Signed-off-by: Zhihuan He <huan.he@rock-chips.com>
Change-Id: I0bebfd16aa4897f770f70aca70b0e9a88808446f
2021-12-24 20:16:47 +08:00
Tao Huang
f6909c028f
Merge tag 'ASB-2021-12-05_12-5.10' of https://android.googlesource.com/kernel/common
...
https://source.android.com/security/bulletin/2021-12-01
CVE-2021-33909
CVE-2021-38204
CVE-2021-0961
* tag 'ASB-2021-12-05_12-5.10': (3010 commits)
ANDROID: workqueue: export symbol of the function wq_worker_comm()
ANDROID: GKI: Update symbols to symbol list
ANDROID: vendor_hooks: Add hooks for binder proc transaction
ANDROID: GKI: Add symbols abi for USB IP kernel modules.
ANDROID: GKI: Fix file mode on mtk abi file
UPSTREAM: erofs: fix deadlock when shrink erofs slab
ANDROID: init_task: Init android vendor and oem data
UPSTREAM: sched/core: Mitigate race cpus_share_cache()/update_top_cache_domain()
ANDROID: Update symbol list for mtk
UPSTREAM: erofs: fix unsafe pagevec reuse of hooked pclusters
UPSTREAM: erofs: remove the occupied parameter from z_erofs_pagevec_enqueue()
UPSTREAM: usb: dwc3: gadget: Fix null pointer exception
ANDROID: fips140: support "evaluation testing" builds via build.sh
FROMGIT: sched/scs: Reset task stack state in bringup_cpu()
ANDROID: dma-buf: heaps: fix dma-buf heap pool pages stat
ANDROID: ABI: Add several spi_mem related symbols
UPSTREAM: spi: spi-mem: add spi_mem_dtr_supports_op()
ANDROID: gki_defconfig: enable CONFIG_SPI_MEM
ANDROID: ABI: Add several iio related symbols
ANDROID: ABI: Update symbol list for IMX
...
Change-Id: I09cddc92fa34553b944e62cc5cbbba94a84e5437
Conflicts:
arch/arm/boot/dts/rk322x.dtsi
arch/arm64/boot/dts/rockchip/rk3399.dtsi
drivers/dma-buf/heaps/system_heap.c
drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
drivers/gpu/drm/rockchip/rockchip_drm_vop.c
drivers/gpu/drm/rockchip/rockchip_lvds.c
drivers/gpu/drm/rockchip/rockchip_vop_reg.c
drivers/mtd/nand/spi/core.c
drivers/pci/controller/pcie-rockchip-host.c
drivers/soc/rockchip/Kconfig
drivers/usb/dwc3/core.c
drivers/usb/dwc3/core.h
2021-12-14 17:09:02 +08:00
Finley Xiao
f1123f2aab
PM / devfreq: rockchip_dmc: Change frequency according to vop frame bandwidth
...
Sometimes the vop line bandwidth is not high, the vop also report
buf empty err, and the frame bandwidth is high at this time, so change
ddr frequency according to frame bandwidth can fix the error.
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Ia893a07def99aaaa4da421b6d619a8fd3eec9745
2021-10-29 19:00:34 +08:00
Sandy Huang
a3d4f6e0df
drm/rockchip: vop: add calculate current frame data size
...
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Ie9c92c651b8c379c77aac941d03bf3f772ed7eea
2021-10-29 19:00:34 +08:00
Finley Xiao
1400843a24
PM / devfreq: rockchip_dmc: Change frequency according to cpu bandwidth
...
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I69376a2e620292642b1118f770c50f9002c450b4
2021-10-27 15:28:30 +08:00
Finley Xiao
4ad4f153e4
PM / devfreq: rockchip-nocp: Add support for rk3568
...
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I2d311d48a54a1f254eda749aa6d9d157d106e02b
2021-10-27 15:28:30 +08:00
Finley Xiao
c2636d3312
PM / devfreq: rockchip_dmc: Add sysfs interface for ondemand_data
...
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I399a78aa2f63b266824a5cd302328a0d3e2aadcd
2021-10-27 15:28:30 +08:00
Finley Xiao
23333b7bbf
PM / devfreq: Remove DEVFREQ_GOV_SIMPLE_ONDEMAND dependency for dmc
...
Change-Id: Ie08689996ee4f3554c2d0e6bef61d23029bc5d07
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2021-10-27 15:28:30 +08:00
Finley Xiao
4def68e21f
PM / devfreq: rockchip_dmc: Add rockchip_simple_ondemand_data
...
Add a new struct rockchip_simple_ondemand_data so that rockchip_dmc.c
does not need to depend on CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND.
Change-Id: Iafe7ec8bbc9a36aaf3dffbe669a8ee927f45d3a1
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2021-10-27 15:28:30 +08:00
YouMin Chen
7252791b6d
PM / devfreq: rockchip_dmc: remove of_get_rk3568_timings
...
For rk3568, ddr timings adjustment is no longer supported in dmc drive.
Signed-off-by: YouMin Chen <cym@rock-chips.com>
Change-Id: I63f0c5fea8c5acf8e6ef8f44b62968deb7bd823e
2021-10-26 10:45:45 +08:00
Finley Xiao
369abda7d1
PM / devfreq: rockchip_dmc: Split out some functions into separate file
...
Fix the depmod error as follows.
depmod: ERROR: Cycle detected: rockchip_dmc -> rockchipdrm -> rockchip_dmc
Change-Id: I99c2a959e9220836b78ef48a2d43f37b56ecedf1
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2021-08-06 20:11:06 +08:00
Finley Xiao
990b7b2229
PM / devfreq: rk3399_dmc: rename driver to 'rockchip_dmc'
...
In future it will be modified to support more rockchip platforms.
Change-Id: I5cd7ce555eefe08b12fbfcda8ef445c4b169e8c6
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2021-07-28 14:38:18 +08:00
YouMin Chen
c50f99f2f3
PM / devfreq: rockchip_dmc: use rockchip_drm_get_sub_dev_type to get lcdc_type
...
Change-Id: Ic1eb21c6b6b45a2c8c36d3666a987a32f3b50f05
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2021-07-28 14:20:43 +08:00
YouMin Chen
a02f4a7f2e
PM / devfreq: rockchip_dmc: rk3568: add rockchip_ddr_set_rate
...
Add rockchip_ddr_set_rate to support ddr frequency switching.
This function wraps the SMC call and frequency switching is
implemented in ATF. Afterwards it will call clk_get_rate to
update the rate in clock framework.
Set dmcfreq->is_set_rate_in_dmc=true to enable this process.
Change-Id: I9349a2e8413751360bf105a70e46d1453791194c
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2021-07-27 18:48:07 +08:00