Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

(kernel-rolling) i3c: Add Phytium i3c controller support #226

Closed
wants to merge 8 commits into from
Closed

(kernel-rolling) i3c: Add Phytium i3c controller support #226

wants to merge 8 commits into from

Conversation

MingcongBai
Copy link
Contributor

Picked and rebased from #144.

From original pull request:

These patches have added support for Phytium i3c controller and its related functions.

@deepin-ci-robot deepin-ci-robot requested review from BLumia and myml May 28, 2024 03:05
@deepin-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign zeno-sole for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@yuanxia0927 @MingcongBai
dt-bindings: i3c: cdns: Add compatible string for Phytium SoCs
e4ed142 
Add "phytium,cdns-i3c-master" to be used for Phytium SoC Family.

Signed-off-by: yuanxia <[email protected]>
Signed-off-by: Chen Baozi <[email protected]>
Signed-off-by: Wang Yinfeng <[email protected]>
@yuanxia0927 @MingcongBai
arm64: i3c: cdns: add support for Phytium workaround
e4cac7f 
When reading the slave registers, two consecutive slave returns bytes
larger than the set PL len will trigger halt on the host, so
halt_en is disabled by default for phytium Soc.

Signed-off-by: yuanxia <[email protected]>
Signed-off-by: Song Wenting <[email protected]>
Signed-off-by: Wu Jinyong <[email protected]>
Signed-off-by: Chen Baozi <[email protected]>
Signed-off-by: Wang Yinfeng <[email protected]>
@yuanxia0927 @MingcongBai
arm64: i3c: cdns: phytium: Add GETMXDS format 1 retransmission
26c29c2 
This patch adds GETMXDS format 1 retransmission to fix
GETMXDS format 2 command failure.

Signed-off-by: yuanxia <[email protected]>
Signed-off-by: Song Wenting <[email protected]>
Signed-off-by: Wu Jinyong <[email protected]>
Signed-off-by: Chen Baozi <[email protected]>
Signed-off-by: Wang Yinfeng <[email protected]>
@yuanxia0927 @MingcongBai
arm64: i3c: cdns: phytium: Fix DAA fail at high frequency
2255a2e 
This patch keeps the CTRL.hj_ack bit disabled until i3c_master_register()
is completed in order to prevent slaves from indirect DAA, which causes
the driver to fail DAA.

Signed-off-by: yuanxia <[email protected]>
Signed-off-by: Song Wenting <[email protected]>
Signed-off-by: Wu Jinyong <[email protected]>
Signed-off-by: Chen Baozi <[email protected]>
Signed-off-by: Wang Yinfeng <[email protected]>
@yuanxia0927 @MingcongBai
dt-bindings: Add bindings for Phytium I3C controller
6b59414 
This patch documents the DT binding for the Phytium I3C controller.

Signed-off-by: yuanxia <[email protected]>
Signed-off-by: Wu Jinyong <[email protected]>
Signed-off-by: Wang Yinfeng <[email protected]>
@yuanxia0927 @MingcongBai
arm64:i3c: phytium: Add support for Phytium i3c controller
17e296a 
This patch provides support for Phytium i3c master controller.

Signed-off-by: yuanxia <[email protected]>
Signed-off-by: Wu Jinyong <[email protected]>
Signed-off-by: Wang Yinfeng <[email protected]>
@yuanxia0927 @MingcongBai
arm64: i3c: phytium: Add ACPI support for i3c driver
af6019f 
This patch used to support i3c driver in ACPI mode,
this modification is in accordance with standard
specifications of MIPI and add special keys to
support for PHYTIUM platform.

Signed-off-by: yuanxia <[email protected]>
Signed-off-by: Wu Jinyong <[email protected]>
Signed-off-by: Wang yinfeng <[email protected]>
@yuanxia0927 @MingcongBai
arm64: i3c: phytium: Add support for S3/S4 mode
6707fb8 
This patch adds support for S3/S4 mode.When resume
from S4 state,the reg value will be overwrite to
solve read problems.

Signed-off-by: yuanxia <[email protected]>
Signed-off-by: Wu Jinyong <[email protected]>
Signed-off-by: Wang Yinfeng <[email protected]>
@MingcongBai MingcongBai force-pushed the bai/kernel-rolling/phytium-i3c branch from 5384cf7 to 6707fb8 Compare May 29, 2024 00:39
@deepin-ci-robot
Copy link

deepin pr auto review

Add support for Phytium I3C master

@MingcongBai
Copy link
Contributor Author

Builds tested:

  • amd64
  • arm64
  • loong64

@MingcongBai
Copy link
Contributor Author

Fails to build on amd64, loong64:

drivers/i3c/master.c: In function ‘i3c_master_check_cpu_workaround’:
drivers/i3c/master.c:2494:27: error: implicit declaration of function ‘read_cpuid_implementor’ [-Werror=implicit-function-declaration]
 2494 |         cpu_implementor = read_cpuid_implementor();
      |                           ^~~~~~~~~~~~~~~~~~~~~~
drivers/i3c/master.c:2496:32: error: ‘ARM_CPU_IMP_PHYTIUM’ undeclared (first use in this function)
 2496 |         if (cpu_implementor == ARM_CPU_IMP_PHYTIUM)
      |                                ^~~~~~~~~~~~~~~~~~~
drivers/i3c/master.c:2496:32: note: each undeclared identifier is reported only once for each function it appears in
cc1: all warnings being treated as errors

@Avenger-285714 @opsiff

@MingcongBai
Copy link
Contributor Author

Reverted on linux-6.6.y for re-submission, closing.

opsiff pushed a commit that referenced this pull request Dec 7, 2024
@shcgit @opsiff
media: i2c: tc358743: Fix crash in the probe error path when using po…
8b66d9d 
…lling

commit 869f38ae07f7df829da4951c3d1f7a2be09c2e9a upstream.

If an error occurs in the probe() function, we should remove the polling
timer that was alarmed earlier, otherwise the timer is called with
arguments that are already freed, which results in a crash.

------------[ cut here ]------------
WARNING: CPU: 3 PID: 0 at kernel/time/timer.c:1830 __run_timers+0x244/0x268
Modules linked in:
CPU: 3 UID: 0 PID: 0 Comm: swapper/3 Not tainted 6.11.0 #226
Hardware name: Diasom DS-RK3568-SOM-EVB (DT)
pstate: 804000c9 (Nzcv daIF +PAN -UAO -TCO -DIT -SSBS BTYPE=--)
pc : __run_timers+0x244/0x268
lr : __run_timers+0x1d4/0x268
sp : ffffff80eff2baf0
x29: ffffff80eff2bb50 x28: 7fffffffffffffff x27: ffffff80eff2bb00
x26: ffffffc080f669c0 x25: ffffff80efef6bf0 x24: ffffff80eff2bb00
x23: 0000000000000000 x22: dead000000000122 x21: 0000000000000000
x20: ffffff80efef6b80 x19: ffffff80041c8bf8 x18: ffffffffffffffff
x17: ffffffc06f146000 x16: ffffff80eff27dc0 x15: 000000000000003e
x14: 0000000000000000 x13: 00000000000054da x12: 0000000000000000
x11: 00000000000639c0 x10: 000000000000000c x9 : 0000000000000009
x8 : ffffff80eff2cb40 x7 : ffffff80eff2cb40 x6 : ffffff8002bee480
x5 : ffffffc080cb2220 x4 : ffffffc080cb2150 x3 : 00000000000f4240
x2 : 0000000000000102 x1 : ffffff80eff2bb00 x0 : ffffff80041c8bf0
Call trace:
 __run_timers+0x244/0x268
 timer_expire_remote+0x50/0x68
 tmigr_handle_remote+0x388/0x39c
 run_timer_softirq+0x38/0x44
 handle_softirqs+0x138/0x298
 __do_softirq+0x14/0x20
 ____do_softirq+0x10/0x1c
 call_on_irq_stack+0x24/0x4c
 do_softirq_own_stack+0x1c/0x2c
 irq_exit_rcu+0x9c/0xcc
 el1_interrupt+0x48/0xc0
 el1h_64_irq_handler+0x18/0x24
 el1h_64_irq+0x7c/0x80
 default_idle_call+0x34/0x68
 do_idle+0x23c/0x294
 cpu_startup_entry+0x38/0x3c
 secondary_start_kernel+0x128/0x160
 __secondary_switched+0xb8/0xbc
---[ end trace 0000000000000000 ]---

Fixes: 4e66a52 ("[media] tc358743: Add support for platforms without IRQ line")
Signed-off-by: Alexander Shiyan <[email protected]>
Cc: [email protected]
Signed-off-by: Hans Verkuil <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
(cherry picked from commit 40d75607083eab3e3b5f95b32b2a5bf93456ec0b)
opsiff pushed a commit that referenced this pull request Dec 7, 2024
@shcgit @opsiff
media: i2c: tc358743: Fix crash in the probe error path when using po…
c1ef35e 
…lling

commit 869f38ae07f7df829da4951c3d1f7a2be09c2e9a upstream.

If an error occurs in the probe() function, we should remove the polling
timer that was alarmed earlier, otherwise the timer is called with
arguments that are already freed, which results in a crash.

------------[ cut here ]------------
WARNING: CPU: 3 PID: 0 at kernel/time/timer.c:1830 __run_timers+0x244/0x268
Modules linked in:
CPU: 3 UID: 0 PID: 0 Comm: swapper/3 Not tainted 6.11.0 #226
Hardware name: Diasom DS-RK3568-SOM-EVB (DT)
pstate: 804000c9 (Nzcv daIF +PAN -UAO -TCO -DIT -SSBS BTYPE=--)
pc : __run_timers+0x244/0x268
lr : __run_timers+0x1d4/0x268
sp : ffffff80eff2baf0
x29: ffffff80eff2bb50 x28: 7fffffffffffffff x27: ffffff80eff2bb00
x26: ffffffc080f669c0 x25: ffffff80efef6bf0 x24: ffffff80eff2bb00
x23: 0000000000000000 x22: dead000000000122 x21: 0000000000000000
x20: ffffff80efef6b80 x19: ffffff80041c8bf8 x18: ffffffffffffffff
x17: ffffffc06f146000 x16: ffffff80eff27dc0 x15: 000000000000003e
x14: 0000000000000000 x13: 00000000000054da x12: 0000000000000000
x11: 00000000000639c0 x10: 000000000000000c x9 : 0000000000000009
x8 : ffffff80eff2cb40 x7 : ffffff80eff2cb40 x6 : ffffff8002bee480
x5 : ffffffc080cb2220 x4 : ffffffc080cb2150 x3 : 00000000000f4240
x2 : 0000000000000102 x1 : ffffff80eff2bb00 x0 : ffffff80041c8bf0
Call trace:
 __run_timers+0x244/0x268
 timer_expire_remote+0x50/0x68
 tmigr_handle_remote+0x388/0x39c
 run_timer_softirq+0x38/0x44
 handle_softirqs+0x138/0x298
 __do_softirq+0x14/0x20
 ____do_softirq+0x10/0x1c
 call_on_irq_stack+0x24/0x4c
 do_softirq_own_stack+0x1c/0x2c
 irq_exit_rcu+0x9c/0xcc
 el1_interrupt+0x48/0xc0
 el1h_64_irq_handler+0x18/0x24
 el1h_64_irq+0x7c/0x80
 default_idle_call+0x34/0x68
 do_idle+0x23c/0x294
 cpu_startup_entry+0x38/0x3c
 secondary_start_kernel+0x128/0x160
 __secondary_switched+0xb8/0xbc
---[ end trace 0000000000000000 ]---

Fixes: 4e66a52 ("[media] tc358743: Add support for platforms without IRQ line")
Signed-off-by: Alexander Shiyan <[email protected]>
Cc: [email protected]
Signed-off-by: Hans Verkuil <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
(cherry picked from commit 40d75607083eab3e3b5f95b32b2a5bf93456ec0b)
opsiff pushed a commit that referenced this pull request Dec 9, 2024
@shcgit @opsiff
media: i2c: tc358743: Fix crash in the probe error path when using po…
6ed902f 
…lling

commit 869f38ae07f7df829da4951c3d1f7a2be09c2e9a upstream.

If an error occurs in the probe() function, we should remove the polling
timer that was alarmed earlier, otherwise the timer is called with
arguments that are already freed, which results in a crash.

------------[ cut here ]------------
WARNING: CPU: 3 PID: 0 at kernel/time/timer.c:1830 __run_timers+0x244/0x268
Modules linked in:
CPU: 3 UID: 0 PID: 0 Comm: swapper/3 Not tainted 6.11.0 #226
Hardware name: Diasom DS-RK3568-SOM-EVB (DT)
pstate: 804000c9 (Nzcv daIF +PAN -UAO -TCO -DIT -SSBS BTYPE=--)
pc : __run_timers+0x244/0x268
lr : __run_timers+0x1d4/0x268
sp : ffffff80eff2baf0
x29: ffffff80eff2bb50 x28: 7fffffffffffffff x27: ffffff80eff2bb00
x26: ffffffc080f669c0 x25: ffffff80efef6bf0 x24: ffffff80eff2bb00
x23: 0000000000000000 x22: dead000000000122 x21: 0000000000000000
x20: ffffff80efef6b80 x19: ffffff80041c8bf8 x18: ffffffffffffffff
x17: ffffffc06f146000 x16: ffffff80eff27dc0 x15: 000000000000003e
x14: 0000000000000000 x13: 00000000000054da x12: 0000000000000000
x11: 00000000000639c0 x10: 000000000000000c x9 : 0000000000000009
x8 : ffffff80eff2cb40 x7 : ffffff80eff2cb40 x6 : ffffff8002bee480
x5 : ffffffc080cb2220 x4 : ffffffc080cb2150 x3 : 00000000000f4240
x2 : 0000000000000102 x1 : ffffff80eff2bb00 x0 : ffffff80041c8bf0
Call trace:
 __run_timers+0x244/0x268
 timer_expire_remote+0x50/0x68
 tmigr_handle_remote+0x388/0x39c
 run_timer_softirq+0x38/0x44
 handle_softirqs+0x138/0x298
 __do_softirq+0x14/0x20
 ____do_softirq+0x10/0x1c
 call_on_irq_stack+0x24/0x4c
 do_softirq_own_stack+0x1c/0x2c
 irq_exit_rcu+0x9c/0xcc
 el1_interrupt+0x48/0xc0
 el1h_64_irq_handler+0x18/0x24
 el1h_64_irq+0x7c/0x80
 default_idle_call+0x34/0x68
 do_idle+0x23c/0x294
 cpu_startup_entry+0x38/0x3c
 secondary_start_kernel+0x128/0x160
 __secondary_switched+0xb8/0xbc
---[ end trace 0000000000000000 ]---

Fixes: 4e66a52 ("[media] tc358743: Add support for platforms without IRQ line")
Signed-off-by: Alexander Shiyan <[email protected]>
Cc: [email protected]
Signed-off-by: Hans Verkuil <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
(cherry picked from commit b59ab89bc83f7bff67f78c6caf484a84a6dd30f7)
opsiff pushed a commit that referenced this pull request Dec 9, 2024
@shcgit @opsiff
media: i2c: tc358743: Fix crash in the probe error path when using po…
51d9748 
…lling

commit 869f38ae07f7df829da4951c3d1f7a2be09c2e9a upstream.

If an error occurs in the probe() function, we should remove the polling
timer that was alarmed earlier, otherwise the timer is called with
arguments that are already freed, which results in a crash.

------------[ cut here ]------------
WARNING: CPU: 3 PID: 0 at kernel/time/timer.c:1830 __run_timers+0x244/0x268
Modules linked in:
CPU: 3 UID: 0 PID: 0 Comm: swapper/3 Not tainted 6.11.0 #226
Hardware name: Diasom DS-RK3568-SOM-EVB (DT)
pstate: 804000c9 (Nzcv daIF +PAN -UAO -TCO -DIT -SSBS BTYPE=--)
pc : __run_timers+0x244/0x268
lr : __run_timers+0x1d4/0x268
sp : ffffff80eff2baf0
x29: ffffff80eff2bb50 x28: 7fffffffffffffff x27: ffffff80eff2bb00
x26: ffffffc080f669c0 x25: ffffff80efef6bf0 x24: ffffff80eff2bb00
x23: 0000000000000000 x22: dead000000000122 x21: 0000000000000000
x20: ffffff80efef6b80 x19: ffffff80041c8bf8 x18: ffffffffffffffff
x17: ffffffc06f146000 x16: ffffff80eff27dc0 x15: 000000000000003e
x14: 0000000000000000 x13: 00000000000054da x12: 0000000000000000
x11: 00000000000639c0 x10: 000000000000000c x9 : 0000000000000009
x8 : ffffff80eff2cb40 x7 : ffffff80eff2cb40 x6 : ffffff8002bee480
x5 : ffffffc080cb2220 x4 : ffffffc080cb2150 x3 : 00000000000f4240
x2 : 0000000000000102 x1 : ffffff80eff2bb00 x0 : ffffff80041c8bf0
Call trace:
 __run_timers+0x244/0x268
 timer_expire_remote+0x50/0x68
 tmigr_handle_remote+0x388/0x39c
 run_timer_softirq+0x38/0x44
 handle_softirqs+0x138/0x298
 __do_softirq+0x14/0x20
 ____do_softirq+0x10/0x1c
 call_on_irq_stack+0x24/0x4c
 do_softirq_own_stack+0x1c/0x2c
 irq_exit_rcu+0x9c/0xcc
 el1_interrupt+0x48/0xc0
 el1h_64_irq_handler+0x18/0x24
 el1h_64_irq+0x7c/0x80
 default_idle_call+0x34/0x68
 do_idle+0x23c/0x294
 cpu_startup_entry+0x38/0x3c
 secondary_start_kernel+0x128/0x160
 __secondary_switched+0xb8/0xbc
---[ end trace 0000000000000000 ]---

Fixes: 4e66a52 ("[media] tc358743: Add support for platforms without IRQ line")
Signed-off-by: Alexander Shiyan <[email protected]>
Cc: [email protected]
Signed-off-by: Hans Verkuil <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
(cherry picked from commit b59ab89bc83f7bff67f78c6caf484a84a6dd30f7)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@BLumia BLumia Awaiting requested review from BLumia

@myml myml Awaiting requested review from myml

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@MingcongBai @deepin-ci-robot @yuanxia0927