shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 02:50:49 +09:00
Code Issues Packages Projects Releases Wiki Activity
1,086,574 Commits 55 Branches 2,486 Tags
a1653e50d1f4bf5aa116a8335e49f398fe85f87f
Commit Graph

1086574 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lin Jinhan
a1653e50d1 crypto: rockchip: Fixed a warning found by static code scanner 
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
Change-Id: I95055ed3d767719b9b2088330f3e5646491b6894
 2023-11-14 12:17:50 +08:00
Damon Ding
7b2a1c8a6b drm/rockchip: vop: init mcu_frame_st as 0 in vop_mcu_mode() 
If mcu_hold_mode is 1, set 1 to mcu_frame_st will
refresh one frame from ddr. So mcu_frame_st is needed
to be initialized as 0.

Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I75d755826dbbdd229da3c3db15d4682dc2bd13a0
 2023-11-14 12:16:13 +08:00
Elaine Zhang
6e890ef6f6 rtc: rk630: add rtc for rk630 
Change-Id: I36bfe7ba7c4876d9030b065f26b1e99fefc738b9
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
 2023-11-14 12:10:52 +08:00
Elaine Zhang
84f3edadb7 mfd: rk630: add rtc regmap and irq 
Change-Id: Ia21198d9806e697c6383ed7211959a3a3c6e38d9
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
 2023-11-14 12:10:47 +08:00
David Wu
7c99cc64ec mfd: rk630: Set phy clock from ref clock 
The phy clock is the same as the input clock of rk630, so
use this clock for configuration.

Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: Ie5c0e58958a1fdd9e264d861295d64e4ccb483cb
 2023-11-14 11:26:12 +08:00
Algea Cao
9cab28b37f mfd: rk630: Add rk630 ref clk 
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Ie3ad8834ab5d0f25eeb8bdf52445f726192c0161
 2023-11-14 11:26:12 +08:00
Elaine Zhang
df698fe006 clk: rockchip: avoid division by zero 
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: Ie28c61d3907d80c3d12087dea59a9567e183012d
 2023-11-14 11:14:24 +08:00
Su Yuefu
bc3739735d media: i2c: add sc4336p driver 
Signed-off-by: Su Yuefu <yuefu.su@rock-chips.com>
Change-Id: Ib7d7b41a79dba49ea73137149590527e3347d1a6
 2023-11-14 11:06:39 +08:00
Yifeng Zhao
c95ecab515 mmc: add timeout for write data and reset while recovery 
Some problematic TF cards may stop at busy state during
the data writing process, and the mmc controller needs
to add a timeout processing.

Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: I11b75910f99eb040fa364990049f5cfe74fccfbf
 2023-11-14 11:03:25 +08:00
Zefa Chen
c252d35d35 media: rockchip: vicap restore sequence of sof after resume 
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I58723bd60429a5fa77982602514689c32e08d25f
 2023-11-14 11:01:53 +08:00
Jianwei Fan
9e5b5dff61 media: i2c: imx577: fix exp_def because exp must less than (vts - 22) 
fix commit "9625dd4e2af2"
(media: i2c: imx577: fix exposure control range according to datasheet)

Change-Id: Ie0e02b553599ed969dee496767c57ebac244bce1
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
 2023-11-14 11:00:54 +08:00
Tao Huang
4997ee78fe arm64: rockchip_linux_defconfig: Enable CONFIG_ARM64_USE_LSE_ATOMICS 
CONFIG_ARM64_USE_LSE_ATOMICS is depends on CONFIG_JUMP_LABEL and
default y. So we should enable CONFIG_JUMP_LABEL.

Now we can use LSE to replace LL/SC on Cortex-A55/A76 for better performance.

Before:
    text	    data	    bss	     dec	    hex	filename
24693888	10091965	 541616	35327469	21b0ded	vmlinux

After:
    text	    data	    bss	     dec	    hex	filename
25114676	10943949	 542776	36601401	22e7e39	vmlinux

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I2900ff6f2fd8dae9f8afb0fc2da72c83de8ff63e
 2023-11-13 19:27:55 +08:00
Liang Chen
1d795ddee4 soc: rockchip: cpuinfo: optimize error log 
Do not output error when return -EPROBE_DEFER.

Change-Id: I94a9e0349a69ce76ee939bc29d2862cd4f20c1e9
Signed-off-by: Liang Chen <cl@rock-chips.com>
 2023-11-13 18:12:11 +08:00
Elaine Zhang
1aef70a303 rtc: rockchip: fix the rtc suspend crash 
In some special products, after rtc probe, The system quickly goes to
sleep before the calibration function of delay_work is executed. In rtc
suspend will clamp rtc. In the off process, if delay_work is executed,
the system will crash.
Added calibration judgments to turn off delay_work when rtc suspend.

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: Ib212eabd18c27ddeff5c50e5b8ac0444a2cafc23
 2023-11-13 18:07:42 +08:00
XiaoDong Huang
8cfed66d7f soc: rockchip: fiq debugger: check "target_cpu" before switch cpu 
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
Change-Id: I2ed0fb4c5aa60b735a7570e13dffd2ee8e646f3b
 2023-11-13 17:59:56 +08:00
Guochun Huang
614d7a8339 clk/rockchip/regmap: rate should not be zero 
Change-Id: I4cf808ae4948b203be18772ce20ec2e0f892b0b7
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
 2023-11-13 09:17:55 +00:00
Yifeng Zhao
45a89eb8fa mmc: dw_mmc: Fix DM 4GB TF card write data errors in RV1106 
Before resetting the controller, it is necessary to increase
the delay by 1 us or wait for a slight decrease in FIFO, so
that no errors will occur during the DM 4GB TF card testing
process.

Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: Ic03a4d88367e3fea00f648f4a21df1669f4f0832
 2023-11-13 11:54:14 +08:00
Hongming Zou
ef29dab574 arm64: rk3308_linux_defconfig: enable Rockchip RPMsg 
+CONFIG_RPMSG_ROCKCHIP_SOFTIRQ=y
+CONFIG_RPMSG_VIRTIO=y

Change-Id: Ib677ca3d11c0489a99fe75aa9252e5c31a8b1584
Signed-off-by: Hongming Zou <hongming.zou@rock-chips.com>
 2023-11-10 16:28:12 +08:00
Jianwei Fan
9625dd4e2a media: i2c: imx577: fix exposure control range according to datasheet 
Change-Id: Idcb10103015279e1a5e532f490b7b28685d0c0a5
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
 2023-11-10 14:08:02 +08:00
Steven Liu
1c08964430 arm64: configs: rockchip_linux: change RPMSG config to RPMSG_MBOX 
Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: I98f03d79d53ff2c2a32a6c00e3d579cabf18e000
 2023-11-10 11:07:17 +08:00
Finley Xiao
bcbcebd833 soc: rockchip: opp_select: implement rockchip_uninit_opp_table() 
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I5c3a8248af267609e363046baeb7014cb8471166
 2023-11-09 19:27:15 +08:00
Huibin Hong
6de3d51dcd soc: rockchip: debug: don't enable Serror when panic 
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
Change-Id: I5cf12effecefe9cf31113f0453e1f9672f1d868c
 2023-11-09 19:07:05 +08:00
Huibin Hong
010f6eb3a4 pstore/ram: don't register boot_log to minidump when it is off 
Fixes: 08e5018b7c ("fs: pstore: register buffers to minidump")
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
Change-Id: I7af139c4915504650acf0c5858f96be54f76639a
 2023-11-09 19:00:17 +08:00
shengfei Xu
1ff00f4eb5 power: supply: rk816/rk817/rk818 battery: avoid division by zero 
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Change-Id: I510263adc079f23ad52ebdf68971f7a28ce20a0d
 2023-11-09 18:49:33 +08:00
Yu Qiaowei
af706ad8bf video: rockchip: rga3: fix iommu device sync cache causing crash 
When the iommu device calls the dma_sync_single_xx API, it will be
regarded as being called through iova by default, so the physical
address obtained will be invalid.

Update driver version to 1.3.1

Change-Id: I0a2c8fcecd556eccee499e06f41d790043f1fa0d
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
 2023-11-09 18:29:36 +08:00
Yu Qiaowei
4ddda80541 video: rockchip: rga3: fix the error report of Coverity 
1. Fix the issue of scheduler and hardware maximum count mismatch.
2. Fix the issue of potential GCD returning 0.

Change-Id: I083553e69ab60549b26465b5d1437e817575856f
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
 2023-11-09 18:29:36 +08:00
Tao Huang
9a4ab40b64 soc: rockchip: rockchip_system_monitor: simplify include 
Move include dt-bindings/soc/rockchip-system-status.h
to soc/rockchip/rockchip-system-status.h.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ie6046f762e38458a3505a6098d5211bdc4fd60e2
 2023-11-08 18:40:29 +08:00
William Wu
ab0546fdd0 media: uvcvideo: set system status to performance when stream on 
For rockchip platforms, set performance frequency for the
memory controller when uvc stream on, and clear it after
uvc stream off. It can improve uvc streaming stability.

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: I1dc0cf10c552bba2c3a0f8a1bb37d90f546eb4a3
 2023-11-08 18:28:40 +08:00
Jkand Huang
87f2ffb98e ARM: configs: rv1106-wakeup.config: fix some sleep to slow down the process 
Change-Id: Ie8283ca6d1c8939f9ee6f4881c619e9d979d0a39
Signed-off-by: Jkand Huang <jkand.huang@rock-chips.com>
 2023-11-08 18:17:55 +08:00
Finley Xiao
776e251569 clk: rockchip: rk3562: Fix clk_uart3_frac parent clk 
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Ief524953ddb3875ca1e99e63b99eca6193b7f3cc
 2023-11-08 18:17:08 +08:00
Cai Wenzhong
04a82bed12 media: i2c: maxim4c: driver version v2.05.00 
1. local device power on add some delay for i2c normal access.
2. enable hot plug detect for partial links are locked.
3. remote device hot plug init disable lock irq.

Signed-off-by: Cai Wenzhong <cwz@rock-chips.com>
Change-Id: I3424421395601266c0c2a787bedbd5028a786aab
 2023-11-08 18:15:59 +08:00
Lan Honglin
006f6868f6 media: i2c: sc230ai support master&slaver mode 
Change-Id: If019de218771c7f5a87d8dcc4439d7b464480b6d
Signed-off-by: Lan Honglin <helin.lan@rock-chips.com>
 2023-11-08 18:15:40 +08:00
Cai YiWei
d0d7380104 media: rockchip: isp: add isp dgain for tb mem head 
Change-Id: I35e717445e798b0d7bee9e173cb39e67299676cb
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2023-11-08 18:14:46 +08:00
Cai YiWei
03d235b318 media: rockchip: isp: support for param run double 
Change-Id: I4b7d32b98762b66a322a831a2c20b23958714a07
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2023-11-08 18:14:19 +08:00
Tao Huang
e201a6c59d regulator: core: Ensure debugfs is fully initialized 
regulator->debugfs is NULL when sysfs_create_link_nowarn() return -EEXIST,
and triggering the following warning:

[    2.426974] debugfs: File 'uA_load' in directory '/' already present!
[    2.426983] debugfs: File 'min_uV' in directory '/' already present!
[    2.426991] debugfs: File 'max_uV' in directory '/' already present!
[    2.426999] debugfs: File 'constraint_flags' in directory '/' already present!

Fixes: 08880713ce ("regulator: core: Streamline debugfs operations")
Fixes: 2715bb11cf ("regulator: core: Fix more error checking for debugfs_create_dir()")
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Iab0b91cacba410705a643d7198eee4f70e1108d5
 2023-11-08 17:39:47 +08:00
Tao Huang
383aefeeab Merge tag 'ASB-2023-11-05_12-5.10' of https://android.googlesource.com/kernel/common 
https://source.android.com/docs/security/bulletin/2023-11-01

* tag 'ASB-2023-11-05_12-5.10':
  BACKPORT: firmware_loader: Abort all upcoming firmware load request once reboot triggered
  UPSTREAM: firmware_loader: Refactor kill_pending_fw_fallback_reqs()

Change-Id: I63f764e519e8791928832881b292a20e0b28c986
 2023-11-08 09:47:16 +08:00
Tao Huang
0a9e86dc1f Merge commit 'f40707abde2eb5cd21cf8848f33aefb7e394ad1a' of https://android.googlesource.com/kernel/common 
* commit 'f40707abde2eb5cd21cf8848f33aefb7e394ad1a': (1250 commits)
  ANDROID: GKI: Update symbols to symbol list
  ANDROID: Add Interrupt Hook for madvise Compression
  UPSTREAM: netfilter: ipset: add the missing IP_SET_HASH_WITH_NET0 macro for ip_set_hash_netportnet.c
  BACKPORT: ravb: Fix use-after-free issue in ravb_tx_timeout_work()
  UPSTREAM: ravb: Fix up dma_free_coherent() call in ravb_remove()
  Revert "netfilter: handle the connecting collision properly in nf_conntrack_proto_sctp"
  Revert "net: bridge: use DEV_STATS_INC()"
  Revert "configfs: fix a race in configfs_lookup()"
  UPSTREAM: netfilter: ipset: Fix race between IPSET_CMD_CREATE and IPSET_CMD_SWAP
  UPSTREAM: net: xfrm: Fix xfrm_address_filter OOB read
  UPSTREAM: igb: set max size RX buffer when store bad packet is enabled
  UPSTREAM: netfilter: nfnetlink_osf: avoid OOB read
  ANDROID: abi_gki_aarch64_qcom: Add wait_for_device_probe symbol
  UPSTREAM: netfilter: xt_sctp: validate the flag_info count
  UPSTREAM: netfilter: xt_u32: validate user space input
  UPSTREAM: net/sched: Retire rsvp classifier
  UPSTREAM: ipv4: fix null-deref in ipv4_link_failure
  UPSTREAM: netfilter: nf_tables: disallow rule removal from chain binding
  UPSTREAM: netfilter: nf_tables: report use refcount overflow
  FROMLIST: lib/test_meminit: fix off-by-one error in test_pages()
  ...

Change-Id: I78c7dc68c56008361ff7365d2ef2e59359f2e3fe
 2023-11-07 19:03:05 +08:00
Tao Huang
1253eedfbf Merge tag 'ASB-2023-10-06_12-5.10' of https://android.googlesource.com/kernel/common 
https://source.android.com/docs/security/bulletin/2023-10-01

* tag 'ASB-2023-10-06_12-5.10': (4345 commits)
  ANDROID: ABI: Update oplus symbol list
  ANDROID: vendor_hooks: Add hooks for oem percpu-rwsem optimaton
  UPSTREAM: net: sched: sch_qfq: Fix UAF in qfq_dequeue()
  UPSTREAM: net/sched: sch_hfsc: Ensure inner classes have fsc curve
  FROMGIT: f2fs: split initial and dynamic conditions for extent_cache
  ANDROID: GKI:  Update moto symbols list
  ANDROID: vendor_hook: Add hook to skip swapcache
  ANDROID: GKI: Update symbols to symbol list
  ANDROID: add vendor hook of add/delete/iterate node for swap_avail_heads
  UPSTREAM: tty: n_gsm: fix the UAF caused by race condition in gsm_cleanup_mux
  UPSTREAM: netfilter: nf_tables: prevent OOB access in nft_byteorder_eval
  UPSTREAM: net/sched: sch_qfq: account for stab overhead in qfq_enqueue
  ANDROID: GKI update xiaomi symbols list
  UPSTREAM: af_unix: Fix null-ptr-deref in unix_stream_sendpage().
  UPSTREAM: USB: dwc3: fix use-after-free on core driver unbind
  UPSTREAM: xhci: Fix incorrect tracking of free space on transfer rings
  UPSTREAM: kfence: avoid passing -g for test
  UPSTREAM: coresight: etm4x: Do not access TRCIDR1 for identification
  UPSTREAM: usb: typec: tcpm: fix warning when handle discover_identity message
  UPSTREAM: f2fs: fix to update age extent in f2fs_do_zero_range()
  ...

Change-Id: I629b30e89c59280f9fd1073d160b74de1d8b04b1

Conflicts:
	arch/arm/boot/dts/rk3288.dtsi
	drivers/crypto/Kconfig
	drivers/dma/pl330.c
	drivers/gpu/drm/rockchip/rockchip_drm_vop.c
	drivers/gpu/drm/rockchip/rockchip_lvds.c
	drivers/pci/controller/pcie-rockchip.c
	drivers/phy/rockchip/phy-rockchip-inno-usb2.c
	drivers/phy/rockchip/phy-rockchip-typec.c
	drivers/pinctrl/pinctrl-rockchip.c
	drivers/tty/serial/8250/8250_dma.c
	drivers/tty/serial/8250/8250_port.c
	drivers/usb/dwc2/platform.c
	drivers/usb/dwc3/core.c
	drivers/usb/dwc3/gadget.c
	drivers/usb/gadget/udc/core.c
	drivers/usb/host/xhci.h
	drivers/usb/storage/unusual_uas.h
	drivers/usb/typec/altmodes/displayport.c
	drivers/usb/typec/tcpm/tcpm.c
	kernel/sched/fair.c
	sound/soc/rockchip/rockchip_pdm.c
 2023-11-07 19:01:23 +08:00
Tao Huang
c575feaee9 Revert "usb: typec: typec_port_register_altmodes() depends on CONFIG_NO_GKI" 
This reverts commit afaeb74a36.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2023-11-07 18:57:40 +08:00
Lan Honglin
be8938d206 media: i2c: os02k10: fix setting exposure error 
Change-Id: Id945ead34286b485eb38b860cc751158534b27d7
Signed-off-by: Lan Honglin <helin.lan@rock-chips.com>
 2023-11-07 18:43:38 +08:00
Hu Kejun
4a0a1b85cb media: i2c: dw9800w: add ioctl set max logical pos 
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: Ib0c1fb970aeeae3cbf85d1a4108ed58ef7101881
 2023-11-07 18:42:29 +08:00
Yu Qiaowei
0edaeafbfc video: rockchip: rga3: prevent calling mmget()/mmput() in spin_lock 
Change-Id: Iab49cf67340fa2a476bb5931a927b04f7c8edb01
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
 2023-11-07 18:33:16 +08:00
Yu Qiaowei
59b58f06c5 video: rockchip: rga3: refining time-consuming logs 
1. Add map/unmap time-consuming
2. Use more intuitive log printing

Change-Id: Id70bc4cce42bb33580ceaf18220fe2454481e78d
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
 2023-11-07 17:40:44 +08:00
Yu Qiaowei
0011fa588c video: rockchip: rga3: destroy internal_buffer when user exits 
When a user imports the same buffer from multiple threads, relying only
on put to reduce the reference count after the process exits will lead
to memory leaks.

Change-Id: I22e48eb89d23d0d1bc3066048235f1d58ba93511
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
 2023-11-07 17:39:57 +08:00
Yu Qiaowei
08092751f1 video: rockchip: rga3: signaled fecne after request commit failed 
Change-Id: I32b35bece1b20aa3228d6d4107b0dad1f4ce6c22
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
 2023-11-07 17:39:57 +08:00
Wen Zhiwei
d85f16835d UPSTREAM: mmc: dw_mmc: Fix potential null pointer risk 
we previously assumed 'host->slot' could be null,
null pointer judgment should be added

Signed-off-by: Wen Zhiwei <wenzhiwei@kylinos.cn>
Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>
Link: https://lore.kernel.org/r/20211229023814.53372-1-wenzhiwei@kylinos.cn
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Yifeng Zhao <zyf@rock-chips.com>
(cherry picked from commit 4a835afd80)
Change-Id: Iffade4e1d3ab6ad5bde7b6f05aaf3ce03ba28922
 2023-11-07 17:09:44 +08:00
Guochun Huang
16239e4037 drm/rockchip: rk628: vrefresh should not be zero 
Change-Id: Ia9bde450208f72aa8f9d5dd77b6086abc715bd5e
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
 2023-11-07 16:54:13 +08:00
Guochun Huang
c15b005b73 phy/rockchip: inno-dsidphy: fref and _prediv should not be zero 
Change-Id: I51bcc4ca83e176d2c3de82b7dadabd3a409d16b7
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
 2023-11-07 16:54:13 +08:00
Guochun Huang
ec130295af drm/rockchip: dsi2: sys_clk and pixel_clk should not be zero 
Change-Id: I8a92a1d12093b3562566349707c7ee0308e7d01c
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
 2023-11-07 16:54:13 +08:00
Guochun Huang
f16cdb0b9b drm/rockchip: dsi: the bpp should not be zero 
Change-Id: I41d4ec692475014951beb3295e912995a2b17d16
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
 2023-11-07 16:54:13 +08:00