Commit Graph

1255936 Commits

Author SHA1 Message Date
Tao Huang
597cca1209 Merge commit 'c2ce04151037c490cfddd1819d17c536cc429277'
* commit 'c2ce04151037c490cfddd1819d17c536cc429277':
  soc: rockchip: pm_config: do pm_wakeup_clear when virtual poweroff
  pinctrl: rockchip: rk3328: Add I2Sx-SCLK as iomux-route switch
  pinctrl: rockchip: rk3568: Add I2Sx-SCLK as iomux-route switch
  pinctrl: rockchip: rv1126: Add I2Sx-SCLK as iomux-route switch
  drm/bridge: synopsys: Recover sound for XRUN routine
  ASoC: rockchip: pdm: Add support for PATHx controls
  ASoC: rockchip: pdm: Use add_component_controls

Change-Id: I122c07be085442b056ba064f9b2e1c293a0f60be

Conflicts:
	sound/soc/rockchip/rockchip_pdm.c
2023-09-28 15:19:00 +08:00
Tao Huang
585a98c2f3 Merge commit 'caf846fe5d583d9b508d15ff3a1f339b48d16660'
* commit 'caf846fe5d583d9b508d15ff3a1f339b48d16660':
  ASoC: rockchip: i2s: Add property 'bclk-fs'
  ASoC: rockchip: i2s: Add "BCLK_Ratio" kcontrol
  ASoC: rockchip: i2s: Add support for PCM R/W Wait Time
  ASoC: rockchip: i2s: Add support for CLK-ALWAYS-ON quirks

Merge using ours merge strategy.

Change-Id: If126581f736012ba36cc633c26b5eab3821124ad
2023-09-28 09:44:49 +08:00
Sugar Zhang
8b9e0e2d95 ASoC: rockchip: i2s: Add property 'bclk-fs'
This patch bring back property 'rockchip,bclk-fs' to allow
user to set it from DT, though we can set it from machine
driver or by 'BCLK_Ratio' control.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Id50833a8899782ac4aac34e146a424b9f6da590d
2023-09-28 09:43:34 +08:00
Sugar Zhang
afb680be91 ASoC: rockchip: i2s: Add "BCLK_Ratio" kcontrol
This patch allow user to set bclk-ratio by kcontrols.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I6ddf153bc5fd7558e3ba5d4138739a477d9facc6
2023-09-28 09:41:00 +08:00
Sugar Zhang
cf48926d8e ASoC: rockchip: i2s: Add support for PCM R/W Wait Time
ALSA core blocks userspace for 10 seconds for PCM R/W default.

Consider the situation BT-slave which acts as SLAVE mode, when
BT-master offline sometime, the CLK lost, user have to wait the
core timeout(10s), it's quite bad experience.

This patch allows userspace to override the WAIT_TIME to recover
more quickly from terminal audio stream. especially for stream
which have no mechanism to detect the LINK offline.

Usage:

/# amixer -c 0 contents | grep Wait
numid=43,iface=PCM,name='PCM Read Wait Time MS'
numid=44,iface=PCM,name='PCM Write Wait Time MS'

/# amixer -c 0 cset numid=43 500
numid=43,iface=PCM,name='PCM Read Wait Time MS'
  ; type=INTEGER,access=rw------,values=1,min=0,max=10000,step=1
  : values=500

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I36c03859d3d91552dc4247864fe6697624245b6c
2023-09-28 09:40:20 +08:00
Sugar Zhang
c9745283a2 ASoC: rockchip: i2s: Add support for CLK-ALWAYS-ON quirks
This patch add support for keeping BCLK / FSYNC always on.
it's required by some devices, such as HDMI, PA, etc.

For example: on HDMI situation

There are some TVs require maintaining N/CTS packets or AUDS
packets to keep audio logic active, otherwise, the first tone
may be lost.

In order to optimize the user experience, we need to ensure
continuous transmission of N/CTS and AUDS packets from the
HDMI-TX, so that the SINK TV devices can maintain audio logic
activation, promptly process audio data, and achieve the
completeness of the first tone.

We init a 48k I2S-STANDARD clock timing as default.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Icdf2101c4117bc0ec4c05343e7317477cc02d6c0
2023-09-28 09:34:39 +08:00
Tao Huang
dfd3eeaf2b Merge commit 'a2d0c7f12f46c81b82f2453a39ea65013d553275'
* commit 'a2d0c7f12f46c81b82f2453a39ea65013d553275': (49 commits)
  ASoC: rockchip: i2s: Use add_component_controls
  ASoC: rockchip: i2s-tdm: Add support for PCM R/W Wait Time
  ASoC: rockchip: i2s-tdm: Add support for PATHx controls
  ASoC: rockchip: i2s-tdm: Use add_component_controls
  ASoC: rockchip: multi-dais: Fix component's name_prefix
  ASoC: rockchip: sai: Fix Transmit SDOx Select
  ASoC: rockchip: sai: Reduce FIFO XRUN warning prompt
  media: rockchip: hdmirx: avoid PKTDEC_AVIIF_CHG_IRQ mistrigger.
  video: rockchip: mpp: rkvenc2: fix slice mode poll failed
  arm64: dts: rockchip: px30: Add reboot_mode label for Android
  ARM: dts: rockchip: add rv1106g-evb1-v11-nofastae-spi-nand
  PCI: rockchip: dw: Use handle_level_irq for legacy irq
  arm64: dts: rockchip: rk3562-amp: Move the rpmsg node backwards.
  arm64: dts: rockchip: rk3568-amp: Move the rpmsg node backwards.
  arm64: dts: rockchip: rk3588-amp: support ap rpmsg
  rpmsg: rockchip: use rockchip,rpmsg for all rockchip platform
  arm64: dts: rockchip: rk3588-vehicle-evb: add v22 dts files and use serdes-mfd-display default
  mailbox: rockchip: Add Rockchip MBOX Demo
  arm64: dts: rockchip: add rk3588 evb1 lp4 v10 linux amp dts
  arm64: dts: rockchip: rk3588-amp: support ap core for amp
  ...

Change-Id: I13bb9ab1c3def29f25b18c67ee73d915b17ec817

Conflicts:
	drivers/gpio/Kconfig
	drivers/media/i2c/maxim4c/Kconfig
2023-09-28 09:23:21 +08:00
Tao Huang
a420b993b2 Merge commit 'e2fee1b43179d3deb394214408e50219d95f8e61'
* commit 'e2fee1b43179d3deb394214408e50219d95f8e61':
  arm64: dts: rockchip: add dual lvds support for rk3567/rk3568

Ignore:
commit e2fee1b431 ("arm64: dts: rockchip: add dual lvds support for rk3567/rk3568")

Change-Id: Ica4e6577cf8d0357693e2a966e4d9efdd1979c80
2023-09-27 18:36:26 +08:00
Chaoyi Chen
b93bbb93bc arm64: dts: rockchip: add dual lvds support for rk3567/rk3568
Signed-off-by: Chaoyi Chen <chaoyi.chen@rock-chips.com>
Change-Id: Iec5a26477bcc482969e25908c5667a5ee80a37dc
2023-09-27 18:30:52 +08:00
Tao Huang
b1befcd4bb Merge commit 'e86a496684236d1747856eada1af8c2045df2b62'
* commit 'e86a496684236d1747856eada1af8c2045df2b62':
  drm/rockchip: lvds: add dual lvds left right mode support
  drm/rockchip: lvds: add support lvds1 for rk3567
  drm/rockchip: vop2: update for dual lvds

Change-Id: I66e2a940be36976be7e44b73b213ef76f8bd3c74
2023-09-27 10:46:07 +08:00
Tao Huang
12ed579b7f Merge commit '2e409456c1f4925e354c9dbaae2f66883c93b60e'
* commit '2e409456c1f4925e354c9dbaae2f66883c93b60e':
  drm/rockchip: add dynamic debug for vop

Ignore:
commit 2e409456c1 ("drm/rockchip: add dynamic debug for vop")

Change-Id: I1bbb4b0c82b385757b6e0697e198fca8d1f8ef46
2023-09-27 10:43:16 +08:00
Sandy Huang
f36dafec75 drm/rockchip: add dynamic debug for vop
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I50858d1c6d1e344ab2e7fbc85e5474a130f6fc6f
2023-09-27 10:38:31 +08:00
Tao Huang
e71825db2b Merge commit 'adf004e7c8f9c2e75799b47da1e59c45d27bc302'
* commit 'adf004e7c8f9c2e75799b47da1e59c45d27bc302':
  media: rockchip: vicap fixes issue of hdr raw capture
  media: i2c: sc1346: fix fps error
  ARM: configs: add rk3308-aarch32-ia.config for intelligent home appliances in RK3308 soc
  arm64: dts: rockchip: add RK3567 evaluation board devicetree
  Revert "arm64: dts: rockchip: rk3568-evb: add can nodes"

Change-Id: Id580877c8d4cf492652e261a08918fb339d410c5
2023-09-27 10:36:13 +08:00
Tao Huang
ef8deca09b Merge commit '59adf53367524661f065953c8501b330b24de968'
* commit '59adf53367524661f065953c8501b330b24de968':
  arm64: dts: rockchip: add core dtsi for RK3567 Soc

Ignore:
commit 59adf53367 ("arm64: dts: rockchip: add core dtsi for RK3567 Soc")

Change-Id: I4a16699d45f8b5b0c01d23c39d43c7801df7c6ac
2023-09-27 10:35:34 +08:00
Liang Chen
31977c5988 arm64: dts: rockchip: add core dtsi for RK3567 Soc
Change-Id: I8af6a967f6c38abdeb6ae26280423fc594d08b3b
Signed-off-by: Liang Chen <cl@rock-chips.com>
2023-09-27 10:35:03 +08:00
Tao Huang
78a6283593 Merge commit 'cdb78165b4d008e04049cae65f0c3bfd759aa694'
* commit 'cdb78165b4d008e04049cae65f0c3bfd759aa694':
  cpufreq: dt-platdev: Add rk3567 project into blacklist
  soc: rockchip: cpuinfo: Add support for rk3567
  video: rockchip: rga3: changing to close acquire_fence_fd in user-space
  video: rockchip: rga3: add check_csc
  video: rockchip: rga3: add full_csc clip config
  video: rockchip: rga3: add full_csc enable
  video: rockchip: rga3: compatible with legacy global alpha config
  video: rockchip: rga3: replace magic numbers with enum
  video: rockchip: rga3: support fg/bg global alpha
  mfd: display-serdes: add serdes display driver support base on mfd arch
  phy: rockchip-inno-usb2: fix USB OTG not working in HOST mode for RK3328
  arm64: dts: rockchip: rk3528: Remove ddc gpio control during hotplug

Change-Id: I5d6fc00274914a330f673cee5cbcbdbeb3ddd325
2023-09-27 10:31:03 +08:00
Tao Huang
ea88b8d701 Merge commit '75810f87c94e69228a11be1ad6822c6436999890'
* commit '75810f87c94e69228a11be1ad6822c6436999890':
  media: i2c: it6616: create hdmirx_class devices

Ignore:
commit 75810f87c9 ("media: i2c: it6616: create hdmirx_class devices")

Change-Id: I296ae6c981a4f75eec334d667a4fd818ff542832
2023-09-26 20:01:54 +08:00
Shunhua Lan
3a064449e5 media: i2c: it6616: create hdmirx_class devices
Signed-off-by: Shunhua Lan <lsh@rock-chips.com>
Change-Id: I9e2cf3c8330504124931f79d111bfa3fb54462db
2023-09-26 20:01:26 +08:00
Tao Huang
2fce35efc1 Merge commit '6e85806bc9b570448a51a4bb11ad0338c7ad2765'
* commit '6e85806bc9b570448a51a4bb11ad0338c7ad2765':
  media: i2c: lt6911uxc: create hdmirx_class devices
  media: i2c: rk628: add hdmirx device attribute
  media: rockchip: hdmirx: do not create hdmirx_class

Change-Id: I6f08bb23e8ed527d1fbedf89256e1aaad1d2c8c0
2023-09-26 19:58:53 +08:00
Tao Huang
c9ace23b9f Merge commit '3b5e5eae9751f934e0a9733fc4244da9a933380a'
* commit '3b5e5eae9751f934e0a9733fc4244da9a933380a':
  media: rockchip: hdmirx: create hdmirx class

Ignore:
commit 3b5e5eae97 ("media: rockchip: hdmirx: create hdmirx class")

Change-Id: Ifc08a7ffb2984882399884efd512f9be95bb9eae
2023-09-26 19:56:02 +08:00
Shunhua Lan
ea74a55d2e media: rockchip: hdmirx: create hdmirx class
There will be many hdmirx devices in Rockchip SOCs
Here create a hdmirx class for those hdmirx devices

Signed-off-by: Shunhua Lan <lsh@rock-chips.com>
Change-Id: Id47af8a01b94c37e2bc40c5671f64cf9f3deebee
2023-09-26 19:52:20 +08:00
Tao Huang
b46bacad02 Merge commit '5f0df65cbb5e8ecc67f820398d8ec6783e0892d1'
* commit '5f0df65cbb5e8ecc67f820398d8ec6783e0892d1':
  arm64: dts: rockchip: rk3588-vehicle-evb enable uart7 for GNSS
  ARM: dts: rv1106g-trailcam: Add Tracking camera configuration
  media: rockchip: isp: version v2.3.0
  ARM: configs: rv1106-trailcam: Tracking camera configuration

Change-Id: Iadf68a8ec097f005e8da245864e35e93445c5b18
2023-09-26 19:49:17 +08:00
XiaoDong Huang
c2ce041510 soc: rockchip: pm_config: do pm_wakeup_clear when virtual poweroff
pm_wakeup_pending will return 1 after system wakeup, witch makes
the failure of disable_secondary_cpus when virtual poweroff.
So we need to do pm_wakeup_clear before disable_secondary_cpus.

Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
Change-Id: I96722898d22cd2c2ad8229e44b9ecbfa9024a2e4
2023-09-25 11:25:57 +08:00
Sugar Zhang
2e8f56f6a5 pinctrl: rockchip: rk3328: Add I2Sx-SCLK as iomux-route switch
Considering the MCLK is not a MUST for codec, but the SCLK is.
So, let's add SCLK as iomux-route switch.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I7010268ee4d2ee43670bb7fc118f4a39ab24a666
2023-09-23 09:05:47 +08:00
Sugar Zhang
11f85a1a0f pinctrl: rockchip: rk3568: Add I2Sx-SCLK as iomux-route switch
Considering the MCLK is not a MUST for codec, but the SCLK is.
So, let's add SCLK as iomux-route switch.

Still keep the MCLK as iomux-route switch to allow the pin can
be used individually.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Iab96f63ab93a5429c6b76dc1b0cb3c9d5e43d2e4
2023-09-23 09:05:46 +08:00
XiaoTan Luo
78f7fcfc45 pinctrl: rockchip: rv1126: Add I2Sx-SCLK as iomux-route switch
Considering the MCLK is not a MUST for codec, but the SCLK is.
So, let's add SCLK as iomux-route switch.

Still keep the MCLK as iomux-route switch to allow the pin can
be used individually.

Change-Id: I855cd399ada956434a820db06ca586de986caa11
Signed-off-by: XiaoTan Luo <lxt@rock-chips.com>
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2023-09-23 09:05:45 +08:00
Sugar Zhang
19820cc653 drm/bridge: synopsys: Recover sound for XRUN routine
This patch add audio reset in prepare stage to clean audio FIFO
to recover sound from XRUN state.

Change-Id: I3808be7973306cc6f8d377f5eb5a0bcec844ab16
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2023-09-23 09:05:44 +08:00
Sugar Zhang
352863bfa2 ASoC: rockchip: pdm: Add support for PATHx controls
This patch add support PATHx controls which allow user
can select PATHx dynamically.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ie7d286ed60363734bc25bf3127daab0d8fcc7144
2023-09-23 09:05:43 +08:00
Sugar Zhang
5c77c0737d ASoC: rockchip: pdm: Use add_component_controls
This patch use add_component_controls instead of dai's one
to support multiple instance with name_prefix.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I5e4872991eb1115ef0f56aba0635cde817fd31b8
2023-09-23 09:05:42 +08:00
Sugar Zhang
caf846fe5d ASoC: rockchip: i2s: Add property 'bclk-fs'
This patch bring back property 'rockchip,bclk-fs' to allow
user to set it from DT, though we can set it from machine
driver or by 'BCLK_Ratio' control.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Id50833a8899782ac4aac34e146a424b9f6da590d
2023-09-23 09:05:41 +08:00
Sugar Zhang
b0bc0c46c3 ASoC: rockchip: i2s: Add "BCLK_Ratio" kcontrol
This patch allow user to set bclk-ratio by kcontrols.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I6ddf153bc5fd7558e3ba5d4138739a477d9facc6
2023-09-22 16:47:51 +08:00
Sugar Zhang
1f85aed306 ASoC: rockchip: i2s: Add support for PCM R/W Wait Time
ALSA core blocks userspace for 10 seconds for PCM R/W default.

Consider the situation BT-slave which acts as SLAVE mode, when
BT-master offline sometime, the CLK lost, user have to wait the
core timeout(10s), it's quite bad experience.

This patch allows userspace to override the WAIT_TIME to recover
more quickly from terminal audio stream. especially for stream
which have no mechanism to detect the LINK offline.

Usage:

/# amixer -c 0 contents | grep Wait
numid=43,iface=PCM,name='PCM Read Wait Time MS'
numid=44,iface=PCM,name='PCM Write Wait Time MS'

/# amixer -c 0 cset numid=43 500
numid=43,iface=PCM,name='PCM Read Wait Time MS'
  ; type=INTEGER,access=rw------,values=1,min=0,max=10000,step=1
  : values=500

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I36c03859d3d91552dc4247864fe6697624245b6c
2023-09-22 16:47:50 +08:00
Sugar Zhang
54475d9b1a ASoC: rockchip: i2s: Add support for CLK-ALWAYS-ON quirks
This patch add support for keeping BCLK / FSYNC always on.
it's required by some devices, such as HDMI, PA, etc.

For example: on HDMI situation

There are some TVs require maintaining N/CTS packets or AUDS
packets to keep audio logic active, otherwise, the first tone
may be lost.

In order to optimize the user experience, we need to ensure
continuous transmission of N/CTS and AUDS packets from the
HDMI-TX, so that the SINK TV devices can maintain audio logic
activation, promptly process audio data, and achieve the
completeness of the first tone.

We init a 48k I2S-STANDARD clock timing as default.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Icdf2101c4117bc0ec4c05343e7317477cc02d6c0
2023-09-22 16:47:48 +08:00
Sugar Zhang
a2d0c7f12f ASoC: rockchip: i2s: Use add_component_controls
This patch use add_component_controls instead of dai's one
to support multiple instance with name_prefix.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ideb9af565f8b44dffaa32f88fed412c5781bcaed
2023-09-22 16:47:47 +08:00
Sugar Zhang
2e41a8e117 ASoC: rockchip: i2s-tdm: Add support for PCM R/W Wait Time
ALSA core blocks userspace for 10 seconds for PCM R/W default.

Consider the situation BT-slave which acts as SLAVE mode, when
BT-master offline sometime, the CLK lost, user have to wait the
core timeout(10s), it's quite bad experience.

This patch allows userspace to override the WAIT_TIME to recover
more quickly from terminal audio stream. especially for stream
which have no mechanism to detect the LINK offline.

Usage:

/# amixer -c 0 contents | grep Wait
numid=43,iface=PCM,name='PCM Read Wait Time MS'
numid=44,iface=PCM,name='PCM Write Wait Time MS'

/# amixer -c 0 cset numid=43 500
numid=43,iface=PCM,name='PCM Read Wait Time MS'
  ; type=INTEGER,access=rw------,values=1,min=0,max=10000,step=1
  : values=500

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I53a35344238557813ea3683dd19474819e987d19
2023-09-22 16:47:46 +08:00
Sugar Zhang
9f997ad95e ASoC: rockchip: i2s-tdm: Add support for PATHx controls
This patch add support PATHx controls which allow user
can select PATHx dynamically.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I9c3af821f9080ec2a07ed846ad059f68c82ec74f
2023-09-22 16:47:09 +08:00
Sugar Zhang
f7cdb2cfca ASoC: rockchip: i2s-tdm: Use add_component_controls
This patch use add_component_controls instead of dai's one
to support multiple instance with name_prefix.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I5aed3ba8e071544154f39b92c1180bbda0afe767
2023-09-22 16:44:07 +08:00
Sugar Zhang
562725ba70 ASoC: rockchip: multi-dais: Fix component's name_prefix
name_prefix should be assigned before dai probe to support
add_component_controls in probe routine.

Fixes: e92cb0063f ("ASoC: rockchip: multi-dais: Add support controls for sub dais")

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I056ad90c877be16467f25c7cbd90d682b223b58a
2023-09-22 16:44:06 +08:00
Sugar Zhang
7664a3c45f ASoC: rockchip: sai: Fix Transmit SDOx Select
To keep the same order with TRM.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Idadd729223381522b347997ffc3ab2d120087cc6
2023-09-22 16:44:05 +08:00
Sugar Zhang
7cbc3d9057 ASoC: rockchip: sai: Reduce FIFO XRUN warning prompt
Warning once each time FIFO XRUN occurs, and then disable
it, until the next time the stream resume.

Before:
  rockchip_sai_isr: 222 callbacks suppressed
  rockchip-sai ff800000.sai: TX FIFO Underrun
  rockchip-sai ff800000.sai: TX FIFO Underrun
  rockchip-sai ff800000.sai: TX FIFO Underrun
  rockchip-sai ff800000.sai: TX FIFO Underrun
  rockchip-sai ff800000.sai: TX FIFO Underrun
  rockchip-sai ff800000.sai: TX FIFO Underrun
  rockchip-sai ff800000.sai: TX FIFO Underrun
  rockchip-sai ff800000.sai: TX FIFO Underrun
  rockchip-sai ff800000.sai: TX FIFO Underrun
  rockchip-sai ff800000.sai: TX FIFO Underrun
  ...

  cat /proc/interrupts | grep sai
  30:      512 0 0 0 0 0 0 0 GICv2 110 Level  sai

After:

  rockchip-sai ff800000.sai: TX FIFO Underrun

  cat /proc/interrupts | grep sai
  30:        1 0 0 0 0 0 0 0 GICv2 110 Level  sai

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I0d3aa37a36ae8e44ccec97053076ef5d74dff9cc
2023-09-21 22:16:23 +08:00
Wangqiang Guo
b795e7c67f media: rockchip: hdmirx: avoid PKTDEC_AVIIF_CHG_IRQ mistrigger.
HDMIRX enable PKTDEC_AVIIF_CHG_IRQ to detect whether
color_range/color_space/color_fmt change or not,
but other aviif changes also cause the interrupt to trigger.

Change-Id: I7add2a6b519ad97e74ad3ba64dd8961e46a32584
Signed-off-by: Wangqiang Guo <kay.guo@rock-chips.com>
2023-09-21 19:19:16 +08:00
Yandong Lin
f421f8a977 video: rockchip: mpp: rkvenc2: fix slice mode poll failed
the return value 0 of the func wait_event_interruptible() means success.

Fixes: eecc48ce7b ("video: rockchip: mpp: disable usr poll timeout")
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: I849625aecb6713d0f4f8652f69ae9335d56d8b65
2023-09-21 18:08:39 +08:00
Wu Liangqing
44e562e446 arm64: dts: rockchip: px30: Add reboot_mode label for Android
Change-Id: I93d73ed9ee84eaa690b844deaa392241e42f094f
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2023-09-21 07:44:16 +00:00
Weiwen Chen
b61b2776d4 ARM: dts: rockchip: add rv1106g-evb1-v11-nofastae-spi-nand
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: Iacddf213a6415e927f4a70cbf761b706f45f1a05
2023-09-20 15:26:54 +08:00
Shawn Lin
da03114d74 PCI: rockchip: dw: Use handle_level_irq for legacy irq
We get a report that a wireless ethernet device which uses legacy interrupt, exposes a
buggy behaviour when patching RT support. It can be observed on RK3588 EVB1 with NVMe under
RT environment when adding pci=nomsi to cmdline. The backtrace looks like below:

echo 3 > /proc/sys/vm/drop_caches && dd if=/dev/nvme0n1 of=/dev/null bs=1M count=50000

[   10.826850] irq 155: nobody cared (try booting with the "irqpoll" option)
[   10.826862] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 5.10.160-rt89 #505
[   10.826867] Hardware name: Rockchip RK3588 EVB1 LP4 V10 Board (DT)
[   10.826870] Call trace:
[   10.826871]  dump_backtrace+0x0/0x1e0
[   10.826881]  show_stack+0x18/0x24
[   10.826886]  dump_stack_lvl+0xcc/0xf8
[   10.826891]  dump_stack+0x18/0x54
[   10.826895]  __report_bad_irq+0x4c/0xdc
[   10.826899]  note_interrupt+0x2cc/0x380
[   10.826905]  handle_irq_event+0x10c/0x180
[   10.826909]  handle_simple_irq+0xac/0x120
[   10.826913]  generic_handle_irq+0x30/0x50
[   10.826917]  rk_pcie_legacy_int_handler+0xa8/0x160
[   10.826923]  __handle_domain_irq+0xb8/0x140
[   10.826927]  gic_handle_irq+0xd8/0x2e4
[   10.826932]  el1_irq+0xcc/0x180
[   10.826935]  arch_cpu_idle+0x18/0x3c
[   10.826940]  default_idle_call+0x2c/0x9c
[   10.826944]  do_idle+0x21c/0x2a0
[   10.826949]  cpu_startup_entry+0x24/0x70
[   10.826952]  rest_init+0xd0/0xe0
[   10.826956]  arch_call_rest_init+0x10/0x1c
[   10.826960]  start_kernel+0x50c/0x544
[   10.826963] handlers:
[   10.826965] [<0000000015317c1f>] irq_default_primary_handler threaded [<00000000edb1561e>] pcie_pme_irq
[   10.826977] [<0000000015317c1f>] irq_default_primary_handler threaded [<000000000065643b>] nvme_irq
[   10.826988] [<0000000015317c1f>] irq_default_primary_handler threaded [<000000000065643b>] nvme_irq
[   10.826996] Disabling IRQ #155

And NVMe can't work anymore due to the irq problem. The actual problem looks like:

nvme_irq                                    nvme_irq
 //process the previous request
   -> nvme_process_cq(nvmeq)		    // the previous one is still processing
                                            -> if(nvme_process_cq(nvmeq))
   -> return IRQ_HANDLED                    -> return IRQ_NONE

so a spurious irq was counted and if the irq ack time is short enough to increase the spurious
irq exceeding the limitation, report_bad_irq was triggered. This is why the bug was only observed
under RT environment since the irq was distributed more quickly than ever, but the bug was always there.

root@linaro-alip:/# cat /proc/irq/155/spurious
count 8990
unhandled 24339
last_unhandled 189829 ms

This can be fixed by the drivers as we could see many patches regarding "irq xxx: nobody cared",
and it's the case if we don't allow nvme_irq to nest itself or postpone the handler. However the
legacy interrupt support is also buggy. For legacy interrupt, it's a level irq rather than an edge
one. But it happened to work because Rockchip PCIe RC only generates oneshot irq instead of level,
preventing the irq storm from happening. So changing to use handle_level_irq is correct and should
help mask/unmask the irq when dealing with it in between. That's a decent solution for all.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: Ie9499b3dbd19ac053500b4c726294296be537ffd
2023-09-20 15:18:52 +08:00
Steven Liu
66f223674f arm64: dts: rockchip: rk3562-amp: Move the rpmsg node backwards.
Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: I7c3d7dd69301e506259d65a3d35250bdac8126d3
2023-09-20 15:16:49 +08:00
Steven Liu
c5fb98b26f arm64: dts: rockchip: rk3568-amp: Move the rpmsg node backwards.
Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: I4f613d4bfef823af8fb67ec30b82d687561ab96d
2023-09-20 15:16:49 +08:00
Steven Liu
427e603def arm64: dts: rockchip: rk3588-amp: support ap rpmsg
Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: I58bb79e5a35ef6d82b95e96afb0e127fb1b7be18
2023-09-20 15:16:49 +08:00
Steven Liu
6c967d4073 rpmsg: rockchip: use rockchip,rpmsg for all rockchip platform
Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: I341ab82acf1b879e66e1fa424e882e965288087f
2023-09-20 15:16:49 +08:00
Luo Wei
36d935ea8c arm64: dts: rockchip: rk3588-vehicle-evb: add v22 dts files and use serdes-mfd-display default
Signed-off-by: Luo Wei <lw@rock-chips.com>
Change-Id: I361617bdd84c8652a21289a68afbb6c3a5d40c2a
2023-09-20 15:06:42 +08:00