6.4.4-rc1 review
Subsystems (13)
Greg Kroah-Hartman
maintainerPATCH 218/800 netfilter: nf_tables: fix underflow in chain reference counter
In reply to Greg Kroah-HartmanFrom: Pablo Neira Ayuso <[email protected]>
[ Upstream commit b389139f12f287b8ed2e2628b72df89a081f0b59 ]
Set element addition error path decrements reference counter on chains
twice: once on element release and again via nft_data_release().
Then, d6b478666ffa ("netfilter: nf_tables: fix underflow in object reference counter") incorrectly fixed this by removing the stateful object reference count decrement.
Restore the stateful object decrement as in b91d90368837 ("netfilter:nf_tables: fix leaking object reference count") and let nft_data_release() decrement the chain reference counter, so this is done only once.
--- net/netfilter/nf_tables_api.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/netfilter/nf_tables_api.c +3 -1
@@ -6771,7 +6771,9 @@ static int nft_add_set_elem(struct nft_ctx *ctx, struct nft_set *set, err_element_clash:kfree (trans); err_elem_free: -nft_set_elem_destroy (set, elem.priv, true); +nf_tables_set_elem_destroy (ctx, set, elem.priv); +if (obj) + obj->use--; err_parse_data:if (nla[NFTA_SET_ELEM_DATA ] !=NULL )nft_data_release (&elem.data.val, desc.type);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 219/800 ipvlan: Fix return value of ipvlan_queue_xmit()
In reply to Greg Kroah-HartmanFrom: Cambda Zhu <[email protected]>
[ Upstream commit 8a9922e7be6d042fa00f894c376473b17a162b66 ]
ipvlan_queue_xmit() should return NET_XMIT_XXX, but ipvlan_xmit_mode_l2/l3() returns rx_handler_result_t or NET_RX_XXX in some cases. ipvlan_rcv_frame() will only return RX_HANDLER_CONSUMED in ipvlan_xmit_mode_l2/l3() because 'local' is true. It's equal to NET_XMIT_SUCCESS. But dev_forward_skb() can return NET_RX_SUCCESS or NET_RX_DROP, and returning NET_RX_DROP(NET_XMIT_DROP) will increase both ipvlan and ipvlan->phy_dev drops counter.
The skb to forward can be treated as xmitted successfully. This patch makes ipvlan_queue_xmit() return NET_XMIT_SUCCESS for forward skb.
--- drivers/net/ipvlan/ipvlan_core.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/net/ipvlan/ipvlan_core.c +6 -3
@@ -585,7 +585,8 @@ static int ipvlan_xmit_mode_l3(struct sk_buff *skb, struct net_device *dev)consume_skb (skb);return NET_XMIT_DROP ; } -return ipvlan_rcv_frame (addr, &skb, true); +ipvlan_rcv_frame (addr, &skb, true); +return NET_XMIT_SUCCESS ; } } out:
@@ -611,7 +612,8 @@ static int ipvlan_xmit_mode_l2(struct sk_buff *skb, struct net_device *dev)consume_skb (skb);return NET_XMIT_DROP ; } -return ipvlan_rcv_frame (addr, &skb, true); +ipvlan_rcv_frame (addr, &skb, true); +return NET_XMIT_SUCCESS ; } } skb =skb_share_check (skb,GFP_ATOMIC );
@@ -623,7 +625,8 @@ static int ipvlan_xmit_mode_l2(struct sk_buff *skb, struct net_device *dev)* the skb for the main-dev. At the RX side we just return * RX_PASS for it to be processed further on the stack. */ -return dev_forward_skb (ipvlan->phy_dev, skb); +dev_forward_skb (ipvlan->phy_dev, skb); +return NET_XMIT_SUCCESS ; }else if (is_multicast_ether_addr (eth->h_dest)) {skb_reset_mac_header (skb);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 220/800 net: dsa: avoid suspicious RCU usage for synced VLAN-aware MAC addresses
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
[ Upstream commit d06f925f13976ab82167c93467c70a337a0a3cda ]
When using the felix driver (the only one which supports UC filtering and MC filtering) as a DSA master for a random other DSA switch, one can see the following stack trace when the downstream switch ports join a VLAN-aware bridge:
=============================
WARNING: suspicious RCU usage
-----------------------------net/8021q/vlan_core.c:238 suspicious rcu_dereference_protected() usage!
stack backtrace: Workqueue: dsa_ordered dsa_slave_switchdev_event_work Call trace: lockdep_rcu_suspicious+0x170/0x210 vlan_for_each+0x8c/0x188 dsa_slave_sync_uc+0x128/0x178 __hw_addr_sync_dev+0x138/0x158 dsa_slave_set_rx_mode+0x58/0x70 __dev_set_rx_mode+0x88/0xa8 dev_uc_add+0x74/0xa0 dsa_port_bridge_host_fdb_add+0xec/0x180 dsa_slave_switchdev_event_work+0x7c/0x1c8 process_one_work+0x290/0x568
What it's saying is that vlan_for_each() expects rtnl_lock() context and it's not getting it, when it's called from the DSA master's ndo_set_rx_mode().
The caller of that - dsa_slave_set_rx_mode() - is the slave DSA interface's dsa_port_bridge_host_fdb_add() which comes from the deferred dsa_slave_switchdev_event_work().
We went to great lengths to avoid the rtnl_lock() context in that call path in commit 0faf890fc519 ("net: dsa: drop rtnl_lock from dsa_slave_switchdev_event_work"), and calling rtnl_lock() is simply not an option due to the possibility of deadlocking when calling dsa_flush_workqueue() from the call paths that do hold rtnl_lock() - basically all of them.
So, when the DSA master calls vlan_for_each() from its ndo_set_rx_mode(), the state of the 8021q driver on this device is really not protected from concurrent access by anything.
Looking at net/8021q/, I don't think that vlan_info->vid_list was particularly designed with RCU traversal in mind, so introducing an RCU read-side form of vlan_for_each() - vlan_for_each_rcu() - won't be so easy, and it also wouldn't be exactly what we need anyway.
In general I believe that the solution isn't in net/8021q/ anyway; vlan_for_each() is not cut out for this task. DSA doesn't need rtnl_lock() to be held per se - since it's not a netdev state change that we're blocking, but rather, just concurrent additions/removals to a VLAN list. We don't even need sleepable context - the callback of vlan_for_each() just schedules deferred work.
The proposed escape is to remove the dependency on vlan_for_each() and to open-code a non-sleepable, rtnl-free alternative to that, based on copies of the VLAN list modified from .ndo_vlan_rx_add_vid() and .ndo_vlan_rx_kill_vid().
--- include/net/dsa.h | 12 +++++-- net/dsa/dsa.c | 2 +- net/dsa/slave.c | 84 ++++++++++++++++++++++++++++++++--------------- net/dsa/switch.c | 4 +-- net/dsa/switch.h | 3 ++ 5 files changed, 74 insertions(+), 31 deletions(-)
include/net/dsa.h +10 -2
@@ -314,9 +314,17 @@ struct dsa_port {struct list_head fdbs;struct list_head mdbs; -/* List of VLANs that CPU and DSA ports are members of. */ struct mutex vlans_lock; -struct list_head vlans; +union { +/* List of VLANs that CPU and DSA ports are members of. +* Access to this is serialized by the sleepable @vlans_lock. +*/ +struct list_head vlans; +/* List of VLANs that user ports are members of. +* Access to this is serialized by netif_addr_lock_bh(). +*/ +struct list_head user_vlans; + }; };/* TODO: ideally DSA ports would have a single dp->link_dp member,
net/dsa/dsa.c +1 -1
@@ -1106,7 +1106,7 @@ static struct dsa_port *dsa_port_touch(struct dsa_switch *ds, int index)mutex_init (&dp->vlans_lock);INIT_LIST_HEAD (&dp->fdbs);INIT_LIST_HEAD (&dp->mdbs); -INIT_LIST_HEAD (&dp->vlans); +INIT_LIST_HEAD (&dp->vlans);/* also initializes &dp->user_vlans */ INIT_LIST_HEAD (&dp->list);list_add_tail (&dp->list, &dst->ports);
net/dsa/slave.c +58 -26
182 lines not on this page · raw message
net/dsa/switch.c +2 -2
@@ -673,8 +673,8 @@ static bool dsa_port_host_vlan_match(struct dsa_port *dp,return false; } -static struct dsa_vlan *dsa_vlan_find (struct list_head *vlan_list, -const struct switchdev_obj_port_vlan *vlan) +struct dsa_vlan *dsa_vlan_find (struct list_head *vlan_list, +const struct switchdev_obj_port_vlan *vlan) {struct dsa_vlan *v;
net/dsa/switch.h +3 -0
@@ -111,6 +111,9 @@ struct dsa_notifier_master_state_info {bool operational; }; +struct dsa_vlan *dsa_vlan_find (struct list_head *vlan_list, +const struct switchdev_obj_port_vlan *vlan); +int dsa_tree_notify (struct dsa_switch_tree *dst,unsigned long e,void *v);int dsa_broadcast (unsigned long e,void *v);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 221/800 netlink: Add __sock_i_ino() for __netlink_diag_dump().
In reply to Greg Kroah-HartmanFrom: Kuniyuki Iwashima <[email protected]>
[ Upstream commit 25a9c8a4431c364f97f75558cb346d2ad3f53fbb ]
syzbot reported a warning in __local_bh_enable_ip(). [0]
Commit 8d61f926d420 ("netlink: fix potential deadlock in netlink_set_err()") converted read_lock(&nl_table_lock) to read_lock_irqsave() in __netlink_diag_dump() to prevent a deadlock.
However, __netlink_diag_dump() calls sock_i_ino() that uses read_lock_bh() and read_unlock_bh(). If CONFIG_TRACE_IRQFLAGS=y, read_unlock_bh() finally enables IRQ even though it should stay disabled until the following read_unlock_irqrestore().
Using read_lock() in sock_i_ino() would trigger a lockdep splat in another place that was fixed in commit f064af1e500a ("net: fix a lockdep splat"), so let's add __sock_i_ino() that would be safe to use under BH disabled.
[0]:
WARNING: CPU: 0 PID: 5012 at kernel/softirq.c:376 __local_bh_enable_ip+0xbe/0x130 kernel/softirq.c:376 Modules linked in: CPU: 0 PID: 5012 Comm: syz-executor487 Not tainted 6.4.0-rc7-syzkaller-00202-g6f68fc395f49 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 05/27/2023 RIP: 0010:__local_bh_enable_ip+0xbe/0x130 kernel/softirq.c:376 Code: 45 bf 01 00 00 00 e8 91 5b 0a 00 e8 3c 15 3d 00 fb 65 8b 05 ec e9 b5 7e 85 c0 74 58 5b 5d c3 65 8b 05 b2 b6 b4 7e 85 c0 75 a2 <0f> 0b eb 9e e8 89 15 3d 00 eb 9f 48 89 ef e8 6f 49 18 00 eb a8 0f RSP: 0018:ffffc90003a1f3d0 EFLAGS: 00010046 RAX: 0000000000000000 RBX: 0000000000000201 RCX: 1ffffffff1cf5996 RDX: 0000000000000000 RSI: 0000000000000201 RDI: ffffffff8805c6f3 RBP: ffffffff8805c6f3 R08: 0000000000000001 R09: ffff8880152b03a3 R10: ffffed1002a56074 R11: 0000000000000005 R12: 00000000000073e4 R13: dffffc0000000000 R14: 0000000000000002 R15: 0000000000000000 FS: 0000555556726300(0000) GS:ffff8880b9800000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000000000045ad50 CR3: 000000007c646000 CR4: 00000000003506f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> sock_i_ino+0x83/0xa0 net/core/sock.c:2559 __netlink_diag_dump+0x45c/0x790 net/netlink/diag.c:171 netlink_diag_dump+0xd6/0x230 net/netlink/diag.c:207 netlink_dump+0x570/0xc50 net/netlink/af_netlink.c:2269 __netlink_dump_start+0x64b/0x910 net/netlink/af_netlink.c:2374 netlink_dump_start include/linux/netlink.h:329 [inline] netlink_diag_handler_dump+0x1ae/0x250 net/netlink/diag.c:238 __sock_diag_cmd net/core/sock_diag.c:238 [inline] sock_diag_rcv_msg+0x31e/0x440 net/core/sock_diag.c:269 netlink_rcv_skb+0x165/0x440 net/netlink/af_netlink.c:2547 sock_diag_rcv+0x2a/0x40 net/core/sock_diag.c:280 netlink_unicast_kernel net/netlink/af_netlink.c:1339 [inline] netlink_unicast+0x547/0x7f0 net/netlink/af_netlink.c:1365 netlink_sendmsg+0x925/0xe30 net/netlink/af_netlink.c:1914 sock_sendmsg_nosec net/socket.c:724 [inline] sock_sendmsg+0xde/0x190 net/socket.c:747 ____sys_sendmsg+0x71c/0x900 net/socket.c:2503 ___sys_sendmsg+0x110/0x1b0 net/socket.c:2557 __sys_sendmsg+0xf7/0x1c0 net/socket.c:2586 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x39/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd RIP: 0033:0x7f5303aaabb9 Code: 28 c3 e8 2a 14 00 00 66 2e 0f 1f 84 00 00 00 00 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 c0 ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007ffc7506e548 EFLAGS: 00000246 ORIG_RAX: 000000000000002e RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007f5303aaabb9 RDX: 0000000000000000 RSI: 0000000020000180 RDI: 0000000000000003 RBP: 00007f5303a6ed60 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 00007f5303a6edf0 R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000 </TASK>
--- include/net/sock.h | 1 + net/core/sock.c | 17 ++++++++++++++--- net/netlink/diag.c | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-)
include/net/sock.h +1 -0
@@ -2100,6 +2100,7 @@ static inline void sock_graft(struct sock *sk, struct socket *parent) }kuid_t sock_i_uid (struct sock *sk); +unsigned long __sock_i_ino (struct sock *sk);unsigned long sock_i_ino (struct sock *sk);static inline kuid_t sock_net_uid (const struct net *net,const struct sock *sk)
net/core/sock.c +14 -3
@@ -2550,13 +2550,24 @@ kuid_t sock_i_uid(struct sock *sk) }EXPORT_SYMBOL (sock_i_uid); -unsigned long sock_i_ino (struct sock *sk) +unsigned long __sock_i_ino (struct sock *sk) {unsigned long ino; -read_lock_bh (&sk->sk_callback_lock); +read_lock (&sk->sk_callback_lock); ino = sk->sk_socket ?SOCK_INODE (sk->sk_socket)->i_ino :0 ; -read_unlock_bh (&sk->sk_callback_lock); +read_unlock (&sk->sk_callback_lock); +return ino; +} +EXPORT_SYMBOL (__sock_i_ino); + +unsigned long sock_i_ino (struct sock *sk) +{ +unsigned long ino; + +local_bh_disable (); + ino =__sock_i_ino (sk); +local_bh_enable ();return ino; }EXPORT_SYMBOL (sock_i_ino);
net/netlink/diag.c +1 -1
@@ -168,7 +168,7 @@ static int __netlink_diag_dump(struct sk_buff *skb, struct netlink_callback *cb, NETLINK_CB(cb->skb).portid, cb->nlh->nlmsg_seq, NLM_F_MULTI, - sock_i_ino(sk)) < 0) { + __sock_i_ino(sk)) < 0) { ret =1 ;break ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 222/800 drm/imx/lcdc: fix a NULL vs IS_ERR() bug in probe
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit dae2f7b89a8436351a2982d0d96a8a56accca576 ]
The devm_drm_dev_alloc() function returns error pointers. It never returns NULL. Fix the check.
--- drivers/gpu/drm/imx/lcdc/imx-lcdc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/imx/lcdc/imx-lcdc.c +2 -2
@@ -400,8 +400,8 @@ static int imx_lcdc_probe(struct platform_device *pdev) lcdc =devm_drm_dev_alloc (dev, &imx_lcdc_drm_driver, struct imx_lcdc, drm); -if (!lcdc) -return -ENOMEM ; +if (IS_ERR (lcdc)) +return PTR_ERR (lcdc); drm = &lcdc->drm;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 223/800 drm/amd/display: Unconditionally print when DP sink power state fails
In reply to Greg Kroah-HartmanFrom: Srinivasan Shanmugam <[email protected]>
[ Upstream commit e4dfd94d5e3851df607b26ab5b20ad8d94f5ccff ]
The previous 'commit ca9beb8aac68 ("drm/amd/display: Add logging when setting DP sink power state fails")', it is better to unconditionally print "failed to power up sink", because we are returning DC_ERROR_UNEXPECTED.
--- .../drm/amd/display/dc/link/protocols/link_dp_capability.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_capability.c +1 -3
@@ -1043,9 +1043,7 @@ static enum dc_status wake_up_aux_channel(struct dc_link *link)DP_SET_POWER , &dpcd_power_state, sizeof(dpcd_power_state)); -if (status <0 ) -DC_LOG_DC ("%s: Failed to power up sink: %s\n" , __func__, - dpcd_power_state ==DP_SET_POWER_D0 ?"D0" :"D3" ); +DC_LOG_DC ("%s: Failed to power up sink\n" , __func__);return DC_ERROR_UNEXPECTED ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 224/800 drm/amd/display: Add logging for display MALL refresh setting
In reply to Greg Kroah-HartmanFrom: Wesley Chalmers <[email protected]>
[ Upstream commit cd8f067a46d34dee3188da184912ae3d64d98444 ]
[WHY]
Add log entry for when display refresh from MALL
settings are sent to SMU.
--- .../drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.c +3 -0
@@ -312,6 +312,9 @@ void dcn30_smu_set_display_refresh_from_mall(struct clk_mgr_internal *clk_mgr, b/* bits 8:7 for cache timer scale, bits 6:1 for cache timer delay, bit 0 = 1 for enable, = 0 for disable */ uint32_t param = (cache_timer_scale <<7 ) | (cache_timer_delay <<1 ) | (enable ?1 :0 ); +smu_print ("SMU Set display refresh from mall: enable = %d, cache_timer_delay = %d, cache_timer_scale = %d\n" , + enable, cache_timer_delay, cache_timer_scale); +dcn30_smu_send_msg_with_param (clk_mgr, DALSMC_MSG_SetDisplayRefreshFromMall, param,NULL ); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 225/800 drm/amd/display: fix is_timing_changed() prototype
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 3306ba4b60b2f3d9ac6bddc587a4d702e1ba2224 ]
Three functions in the amdgpu display driver cause -Wmissing-prototype warnings:
drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_resource.c:1858:6: error: no previous prototype for 'is_timing_changed' [-Werror=missing-prototypes]
is_timing_changed() is actually meant to be a global symbol, but needs a proper name and prototype.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 5 ++--- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 6 +++--- drivers/gpu/drm/amd/display/dc/dc.h | 3 +++ 3 files changed, 8 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +2 -3
@@ -45,8 +45,7 @@#endif #include "dc/dcn20/dcn20_resource.h" -bool is_timing_changed (struct dc_stream_state *cur_stream, -struct dc_stream_state *new_stream); +#define PEAK_FACTOR_X1000 1006 static ssize_t dm_dp_aux_transfer(struct drm_dp_aux *aux,
@@ -1422,7 +1421,7 @@ int pre_validate_dsc(struct drm_atomic_state *state,struct dc_stream_state *stream = dm_state->context->streams[i];if (local_dc_state->streams[i] && -is_timing_changed (stream, local_dc_state->streams[i])) { +dc_is_timing_changed (stream, local_dc_state->streams[i])) {DRM_INFO_ONCE ("crtc[%d] needs mode_changed\n" , i); }else {int ind =find_crtc_index_in_state_by_stream (state, stream);
drivers/gpu/drm/amd/display/dc/core/dc_resource.c +3 -3
@@ -1878,7 +1878,7 @@ bool dc_add_all_planes_for_stream(return add_all_planes_for_stream (dc, stream, &set,1 , context); } -bool is_timing_changed (struct dc_stream_state *cur_stream, +bool dc_is_timing_changed (struct dc_stream_state *cur_stream,struct dc_stream_state *new_stream) {if (cur_stream ==NULL )
@@ -1903,7 +1903,7 @@ static bool are_stream_backends_same(if (stream_a ==NULL || stream_b ==NULL )return false; -if (is_timing_changed (stream_a, stream_b)) +if (dc_is_timing_changed (stream_a, stream_b))return false;if (stream_a->signal != stream_b->signal)
@@ -3528,7 +3528,7 @@ bool pipe_need_reprogram(if (pipe_ctx_old->stream_res.stream_enc != pipe_ctx->stream_res.stream_enc)return true; -if (is_timing_changed (pipe_ctx_old->stream, pipe_ctx->stream)) +if (dc_is_timing_changed (pipe_ctx_old->stream, pipe_ctx->stream))return true;if (pipe_ctx_old->stream->dpms_off != pipe_ctx->stream->dpms_off)
drivers/gpu/drm/amd/display/dc/dc.h +3 -0
@@ -2226,4 +2226,7 @@ void dc_process_dmub_dpia_hpd_int_enable(const struct dc *dc,/* Disable acc mode Interfaces */ void dc_disable_accelerated_mode (struct dc *dc); +bool dc_is_timing_changed (struct dc_stream_state *cur_stream, +struct dc_stream_state *new_stream); +#endif /* DC_INTERFACE_H_ */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 226/800 radeon: avoid double free in ci_dpm_init()
In reply to Greg Kroah-HartmanFrom: Nikita Zhandarovich <[email protected]>
[ Upstream commit 20c3dffdccbd494e0dd631d1660aeecbff6775f2 ]
Several calls to ci_dpm_fini() will attempt to free resources that either have been freed before or haven't been allocated yet. This may lead to undefined or dangerous behaviour.
For instance, if r600_parse_extended_power_table() fails, it might call r600_free_extended_power_table() as will ci_dpm_fini() later during error handling.
Fix this by only freeing pointers to objects previously allocated.
Found by Linux Verification Center (linuxtesting.org) with static analysis tool SVACE.
--- drivers/gpu/drm/radeon/ci_dpm.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-)
drivers/gpu/drm/radeon/ci_dpm.c +20 -8
@@ -5517,6 +5517,7 @@ static int ci_parse_power_table(struct radeon_device *rdev)u8 frev, crev;u8 *power_state_offset;struct ci_ps *ps; +int ret;if (!atom_parse_data_header (mode_info->atom_context, index,NULL , &frev, &crev, &data_offset))
@@ -5546,11 +5547,15 @@ static int ci_parse_power_table(struct radeon_device *rdev) non_clock_array_index = power_state->v2.nonClockInfoIndex; non_clock_info = (struct _ATOM_PPLIB_NONCLOCK_INFO *) &non_clock_info_array->nonClockInfo[non_clock_array_index]; -if (!rdev->pm.power_state[i].clock_info) -return -EINVAL ; +if (!rdev->pm.power_state[i].clock_info) { + ret = -EINVAL ; + goto err_free_ps; + } ps =kzalloc (sizeof (struct ci_ps ),GFP_KERNEL ); -if (ps ==NULL ) -return -ENOMEM ; +if (ps ==NULL ) { + ret = -ENOMEM ; + goto err_free_ps; + } rdev->pm.dpm.ps[i].ps_priv = ps; ci_parse_pplib_non_clock_info(rdev, &rdev->pm.dpm.ps[i], non_clock_info,
@@ -5590,6 +5595,12 @@ static int ci_parse_power_table(struct radeon_device *rdev) }return 0 ; + +err_free_ps: +for (i =0 ; i < rdev->pm.dpm.num_ps; i++) +kfree (rdev->pm.dpm.ps[i].ps_priv); +kfree (rdev->pm.dpm.ps); +return ret; } static int ci_get_vbios_boot_values(struct radeon_device *rdev,
@@ -5678,25 +5689,26 @@ int ci_dpm_init(struct radeon_device *rdev) ret =ci_get_vbios_boot_values (rdev, &pi->vbios_boot_state);if (ret) { -ci_dpm_fini (rdev); +kfree (rdev->pm.dpm.priv);return ret; } ret =r600_get_platform_caps (rdev);if (ret) { -ci_dpm_fini (rdev); +kfree (rdev->pm.dpm.priv);return ret; } ret =r600_parse_extended_power_table (rdev);if (ret) { -ci_dpm_fini (rdev); +kfree (rdev->pm.dpm.priv);return ret; } ret =ci_parse_power_table (rdev);if (ret) { -ci_dpm_fini (rdev); +kfree (rdev->pm.dpm.priv); +r600_free_extended_power_table (rdev);return ret; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 227/800 drm/amd/display: Explicitly specify update type per plane info change
In reply to Greg Kroah-HartmanFrom: Nicholas Kazlauskas <[email protected]>
[ Upstream commit 710cc1e7cd461446a9325c9bd1e9a54daa462952 ]
[Why]
The bit for flip addr is being set causing the determination for FAST vs MEDIUM to always return MEDIUM when plane info is provided as a surface update. This causes extreme stuttering for the typical atomic update path on Linux.
[How]
Don't use update_flags->raw for determining FAST vs MEDIUM. It's too fragile to changes like this.
Explicitly specify the update type per update flag instead. It's not as clever as checking the bits itself but at least it's correct.
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 3 --- 1 file changed, 3 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc.c +0 -3
@@ -2504,9 +2504,6 @@ static enum surface_update_type det_surface_update(const struct dc *dc,enum surface_update_type overall_type =UPDATE_TYPE_FAST ;union surface_update_flags *update_flags = &u->surface->update_flags; -if (u->flip_addr) - update_flags->bits.addr_update =1 ; -if (!is_surface_in_context (context, u->surface) || u->surface->force_full_update) { update_flags->raw =0xFFFFFFFF ;return UPDATE_TYPE_FULL ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 228/800 drm/i915/guc/slpc: Provide sysfs for efficient freq
In reply to Greg Kroah-HartmanFrom: Vinay Belgaumkar <[email protected]>
[ Upstream commit 55f9720dbf23ed640a51ea5564c22305efa8a467 ]
SLPC enables use of efficient freq at init by default. It is possible for GuC to request frequencies that are higher than the 'software' max if user has set it lower than the efficient level.
Scenarios/tests that require strict fixing of freq below the efficient level will need to disable it through this interface.
v2: Keep just one interface to toggle sysfs. With this, user will be completely responsible for toggling efficient frequency if need be. There will be no implicit disabling when user sets min < RP1 (Ashutosh)
v3: Remove unused label, review comments (Ashutosh)
v4: Toggle efficient freq usage in SLPC selftest and checkpatch fixes
v5: Review comments (Andi) and add a separate patch for selftest updates
--- drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 35 +++++++++++++++++ drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 38 +++++++++++++------ drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h | 1 + .../gpu/drm/i915/gt/uc/intel_guc_slpc_types.h | 1 + 4 files changed, 64 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c +35 -0
@@ -451,6 +451,33 @@ static ssize_t punit_req_freq_mhz_show(struct kobject *kobj,return sysfs_emit (buff,"%u\n" , preq); } +static ssize_t slpc_ignore_eff_freq_show (struct kobject *kobj, +struct kobj_attribute *attr, +char *buff) +{ +struct intel_gt *gt =intel_gt_sysfs_get_drvdata (kobj, attr->attr.name); +struct intel_guc_slpc *slpc = >->uc.guc.slpc; + +return sysfs_emit (buff,"%u\n" , slpc->ignore_eff_freq); +} + +static ssize_t slpc_ignore_eff_freq_store (struct kobject *kobj, +struct kobj_attribute *attr, +const char *buff,size_t count) +{ +struct intel_gt *gt =intel_gt_sysfs_get_drvdata (kobj, attr->attr.name); +struct intel_guc_slpc *slpc = >->uc.guc.slpc; +int err; +u32 val; + + err =kstrtou32 (buff,0 , &val); +if (err) +return err; + + err =intel_guc_slpc_set_ignore_eff_freq (slpc, val); +return err ?: count; +} +struct intel_gt_bool_throttle_attr {struct attribute attr; ssize_t (*show)(struct kobject *kobj, struct kobj_attribute *attr,
@@ -663,6 +690,8 @@ static struct kobj_attribute attr_media_freq_factor_scale =INTEL_GT_ATTR_RO (media_RP0_freq_mhz);INTEL_GT_ATTR_RO (media_RPn_freq_mhz); +INTEL_GT_ATTR_RW (slpc_ignore_eff_freq); +static const struct attribute *media_perf_power_attrs[] = { &attr_media_freq_factor.attr, &attr_media_freq_factor_scale.attr,
@@ -744,6 +773,12 @@ void intel_gt_sysfs_pm_init(struct intel_gt *gt, struct kobject *kobj)if (ret)gt_warn (gt,"failed to create punit_req_freq_mhz sysfs (%pe)" ,ERR_PTR (ret)); +if (intel_uc_uses_guc_slpc (>->uc)) { + ret =sysfs_create_file (kobj, &attr_slpc_ignore_eff_freq.attr); +if (ret) +gt_warn (gt,"failed to create ignore_eff_freq sysfs (%pe)" ,ERR_PTR (ret)); + } +if (i915_mmio_reg_valid (intel_gt_perf_limit_reasons_reg (gt))) { ret =sysfs_create_files (kobj, throttle_reason_attrs);if (ret)
drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c +27 -11
@@ -277,6 +277,7 @@ int intel_guc_slpc_init(struct intel_guc_slpc *slpc) slpc->max_freq_softlimit =0 ; slpc->min_freq_softlimit =0 ; + slpc->ignore_eff_freq = false; slpc->min_is_rpmax = false; slpc->boost_freq =0 ;
@@ -457,6 +458,29 @@ int intel_guc_slpc_get_max_freq(struct intel_guc_slpc *slpc, u32 *val)return ret; } +int intel_guc_slpc_set_ignore_eff_freq (struct intel_guc_slpc *slpc,bool val) +{ +struct drm_i915_private *i915 =slpc_to_i915 (slpc); +intel_wakeref_t wakeref; +int ret; + +mutex_lock (&slpc->lock); + wakeref =intel_runtime_pm_get (&i915->runtime_pm); + + ret =slpc_set_param (slpc, +SLPC_PARAM_IGNORE_EFFICIENT_FREQUENCY , + val); +if (ret) +guc_probe_error (slpc_to_guc (slpc),"Failed to set efficient freq(%d): %pe\n" , + val,ERR_PTR (ret)); +else + slpc->ignore_eff_freq = val; + +intel_runtime_pm_put (&i915->runtime_pm, wakeref); +mutex_unlock (&slpc->lock); +return ret; +} +/** * intel_guc_slpc_set_min_freq() - Set min frequency limit for SLPC. * @slpc: pointer to intel_guc_slpc.
@@ -482,16 +506,6 @@ int intel_guc_slpc_set_min_freq(struct intel_guc_slpc *slpc, u32 val)mutex_lock (&slpc->lock); wakeref =intel_runtime_pm_get (&i915->runtime_pm); -/* Ignore efficient freq if lower min freq is requested */ - ret =slpc_set_param (slpc, -SLPC_PARAM_IGNORE_EFFICIENT_FREQUENCY , - val < slpc->rp1_freq); -if (ret) { -guc_probe_error (slpc_to_guc (slpc),"Failed to toggle efficient freq: %pe\n" , -ERR_PTR (ret)); - goto out; - } - ret =slpc_set_param (slpc,SLPC_PARAM_GLOBAL_MIN_GT_UNSLICE_FREQ_MHZ , val);
@@ -499,7 +513,6 @@ int intel_guc_slpc_set_min_freq(struct intel_guc_slpc *slpc, u32 val)if (!ret) slpc->min_freq_softlimit = val; -out:intel_runtime_pm_put (&i915->runtime_pm, wakeref);mutex_unlock (&slpc->lock);
@@ -752,6 +765,9 @@ int intel_guc_slpc_enable(struct intel_guc_slpc *slpc)/* Set cached media freq ratio mode */ intel_guc_slpc_set_media_ratio_mode (slpc, slpc->media_ratio_mode); +/* Set cached value of ignore efficient freq */ +intel_guc_slpc_set_ignore_eff_freq (slpc, slpc->ignore_eff_freq); +return 0 ; }
drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h +1 -0
@@ -46,5 +46,6 @@ void intel_guc_slpc_boost(struct intel_guc_slpc *slpc);void intel_guc_slpc_dec_waiters (struct intel_guc_slpc *slpc);int intel_guc_slpc_unset_gucrc_mode (struct intel_guc_slpc *slpc);int intel_guc_slpc_override_gucrc_mode (struct intel_guc_slpc *slpc,u32 mode); +int intel_guc_slpc_set_ignore_eff_freq (struct intel_guc_slpc *slpc,bool val);#endif
drivers/gpu/drm/i915/gt/uc/intel_guc_slpc_types.h +1 -0
@@ -31,6 +31,7 @@ struct intel_guc_slpc {/* frequency softlimits */ u32 min_freq_softlimit;u32 max_freq_softlimit; +bool ignore_eff_freq;/* cached media ratio mode */ u32 media_ratio_mode;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 229/800 drm/bridge: it6505: Move a variable assignment behind a null pointer check in receive_timing_debugfs_show()
In reply to Greg Kroah-HartmanFrom: Markus Elfring <[email protected]>
[ Upstream commit 0be05a75de2916421e88e0d64b001984f54df0bd ]
The address of a data structure member was determined before a corresponding null pointer check in the implementation of the function “receive_timing_debugfs_show”.
Thus avoid the risk for undefined behaviour by moving the assignment for the variable “vid” behind the null pointer check.
This issue was detected by using the Coccinelle software.
--- drivers/gpu/drm/bridge/ite-it6505.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/bridge/ite-it6505.c +2 -1
@@ -3207,7 +3207,7 @@ static ssize_t receive_timing_debugfs_show(struct file *file, char __user *buf, size_t len, loff_t *ppos) { struct it6505 *it6505 = file->private_data; -struct drm_display_mode *vid = &it6505->video_info; +struct drm_display_mode *vid;u8 read_buf[READ_BUFFER_SIZE ];u8 *str = read_buf, *end = read_buf +READ_BUFFER_SIZE ;ssize_t ret, count;
@@ -3216,6 +3216,7 @@ static ssize_t receive_timing_debugfs_show(struct file *file, char __user *buf,return -ENODEV ;it6505_calc_video_info (it6505); + vid = &it6505->video_info; str +=scnprintf (str, end - str,"---video timing---\n" ); str +=scnprintf (str, end - str,"PCLK:%d.%03dMHz\n" , vid->clock /1000 , vid->clock %1000 );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 230/800 Input: drv260x - sleep between polling GO bit
In reply to Greg Kroah-HartmanFrom: Luca Weiss <[email protected]>
[ Upstream commit efef661dfa6bf8cbafe4cd6a97433fcef0118967 ]
When doing the initial startup there's no need to poll without any delay and spam the I2C bus.
Let's sleep 15ms between each attempt, which is the same time as used in the vendor driver.
--- drivers/input/misc/drv260x.c | 1 + 1 file changed, 1 insertion(+)
drivers/input/misc/drv260x.c +1 -0
@@ -435,6 +435,7 @@ static int drv260x_init(struct drv260x_data *haptics) } do { + usleep_range(15000, 15500); error = regmap_read(haptics->regmap, DRV260X_GO, &cal_buf); if (error) { dev_err(&haptics->client->dev,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 231/800 Input: cyttsp4_core - change del_timer_sync() to timer_shutdown_sync()
In reply to Greg Kroah-HartmanFrom: Duoming Zhou <[email protected]>
[ Upstream commit dbe836576f12743a7d2d170ad4ad4fd324c4d47a ]
The watchdog_timer can schedule tx_timeout_task and watchdog_work can also arm watchdog_timer. The process is shown below:
----------- timer schedules work ------------cyttsp4_watchdog_timer() //timer handler
schedule_work(&cd->watchdog_work)
----------- work arms timer ------------ cyttsp4_watchdog_work() //workqueue callback function
cyttsp4_start_wd_timer()
mod_timer(&cd->watchdog_timer, ...)
Although del_timer_sync() and cancel_work_sync() are called in cyttsp4_remove(), the timer and workqueue could still be rearmed. As a result, the possible use after free bugs could happen. The process is shown below:
(cleanup routine) | (timer and workqueue routine)
cyttsp4_remove() | cyttsp4_watchdog_timer() //timer
cyttsp4_stop_wd_timer() | schedule_work()
del_timer_sync() |
| cyttsp4_watchdog_work() //worker
| cyttsp4_start_wd_timer()
| mod_timer()
cancel_work_sync() |
| cyttsp4_watchdog_timer() //timer
| schedule_work()
del_timer_sync() |
kfree(cd) //FREE |
| cyttsp4_watchdog_work() // reschedule!
| cd-> //USEThis patch changes del_timer_sync() to timer_shutdown_sync(), which could prevent rearming of the timer from the workqueue.
--- drivers/input/touchscreen/cyttsp4_core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/input/touchscreen/cyttsp4_core.c +1 -2
@@ -1263,9 +1263,8 @@ static void cyttsp4_stop_wd_timer(struct cyttsp4 *cd)* Ensure we wait until the watchdog timer * running on a different CPU finishes */ -del_timer_sync (&cd->watchdog_timer); +timer_shutdown_sync (&cd->watchdog_timer);cancel_work_sync (&cd->watchdog_work); -del_timer_sync (&cd->watchdog_timer); }static void cyttsp4_watchdog_timer (struct timer_list *t)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 232/800 Input: tests - fix use-after-free and refcount underflow in input_test_exit()
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit fd75f3694b1dd5070408ea4a58ca7f8e0a3fcbcd ]
With CONFIG_DEBUG_SLAB=y:
# Subtest: input_core
1..3
input: Test input device as /devices/virtual/input/input1
8<--- cut here ---
Unable to handle kernel paging request at virtual address 6b6b6dd7 when read
...
__lock_acquire from lock_acquire+0x26c/0x300
lock_acquire from _raw_spin_lock_irqsave+0x50/0x64
_raw_spin_lock_irqsave from devres_remove+0x20/0x7c
devres_remove from devres_destroy+0x8/0x24
devres_destroy from input_free_device+0x2c/0x60
input_free_device from kunit_try_run_case+0x70/0x94 [kunit]Without CONFIG_DEBUG_SLAB=y:
KTAP version 1
# Subtest: input_core
1..3
input: Test input device as /devices/virtual/input/input1
------------[ cut here ]------------
WARNING: CPU: 0 PID: 694 at lib/refcount.c:28 refcount_warn_saturate+0x54/0x100
refcount_t: underflow; use-after-free.
...
Call Trace: [<0037cad4>] dump_stack+0xc/0x10
[<00377614>] __warn+0x7e/0xb4
[<0037768c>] warn_slowpath_fmt+0x42/0x62
[<001eee1c>] refcount_warn_saturate+0x54/0x100
[<000b1d34>] kfree_const+0x0/0x20
[<0036290a>] __kobject_del+0x0/0x6e
[<001eee1c>] refcount_warn_saturate+0x54/0x100
[<00362a1a>] kobject_put+0xa2/0xb6
[<11965770>] kunit_generic_run_threadfn_adapter+0x0/0x1c [kunit]As per the comments for input_allocate_device() and input_register_device(), input_free_device() must be called only to free devices that have not been registered. input_unregister_device() already calls input_put_device(), thus leading to a use-after-free.
Moreover, the kunit_suite.exit() method is called after every test case, even on failures. As the test itself already does cleanups in its failure paths, this may lead to a second use-after-free.
Fix the first issue by dropping the call to input_allocate_device() from input_test_exit().
Fix the second issue by making the cleanup code conditional on a successful test.
--- drivers/input/tests/input_test.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/input/tests/input_test.c +2 -2
@@ -43,8 +43,8 @@ static void input_test_exit(struct kunit *test) {struct input_dev *input_dev = test->priv; -input_unregister_device (input_dev); -input_free_device (input_dev); +if (input_dev) +input_unregister_device (input_dev); }static void input_test_poll (struct input_dev *input) { }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 233/800 Input: tests - modular KUnit tests should not depend on KUNIT=y
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit e0f41f836f5e861bdcaf4719f160b62dbb8e9485 ]
While KUnit tests that cannot be built as a loadable module must depend on "KUNIT=y", this is not true for modular tests, where it adds an unnecessary limitation.
Fix this by relaxing the dependency to "KUNIT".
--- drivers/input/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/input/Kconfig +1 -1
@@ -168,7 +168,7 @@ config INPUT_EVBUG config INPUT_KUNIT_TEST tristate "KUnit tests for Input" if !KUNIT_ALL_TESTS - depends on INPUT && KUNIT=y + depends on INPUT && KUNIT default KUNIT_ALL_TESTS help Say Y here if you want to build the KUnit tests for the input
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 234/800 drm/bridge: ti-sn65dsi83: Fix enable error path
In reply to Greg Kroah-HartmanFrom: Alexander Stein <[email protected]>
[ Upstream commit 8a91b29f1f50ce7742cdbe5cf11d17f128511f3f ]
If PLL locking failed, the regulator needs to be disabled again.
--- drivers/gpu/drm/bridge/ti-sn65dsi83.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/bridge/ti-sn65dsi83.c +1 -0
@@ -478,6 +478,7 @@ static void sn65dsi83_atomic_enable(struct drm_bridge *bridge,dev_err (ctx->dev,"failed to lock PLL, ret=%i\n" , ret);/* On failure, disable PLL again and exit. */ regmap_write (ctx->regmap,REG_RC_PLL_EN ,0x00 ); +regulator_disable (ctx->vcc);return ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 235/800 drm/bridge: tc358768: always enable HS video mode
In reply to Greg Kroah-HartmanFrom: Francesco Dolcini <[email protected]>
[ Upstream commit 75a8aeac2573ab258c53676eba9b3796ea691988 ]
Always enable HS video mode setting the TXMD bit, without this change no video output is present with DSI sinks that are setting MIPI_DSI_MODE_LPM flag (tested with LT8912B DSI-HDMI bridge).
Previously the driver was enabling HS mode only when the DSI sink was not explicitly setting the MIPI_DSI_MODE_LPM, however this is not correct.
The MIPI_DSI_MODE_LPM is supposed to indicate that the sink is willing to receive data in low power mode, however clearing the TC358768_DSI_CONTROL_TXMD bit will make the TC358768 send video in LP mode that is not the intended behavior.
--- drivers/gpu/drm/bridge/tc358768.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/bridge/tc358768.c +1 -2
@@ -866,8 +866,7 @@ static void tc358768_bridge_pre_enable(struct drm_bridge *bridge) val =TC358768_DSI_CONFW_MODE_SET |TC358768_DSI_CONFW_ADDR_DSI_CONTROL ; val |= (dsi_dev->lanes -1 ) <<1 ; -if (!(dsi_dev->mode_flags &MIPI_DSI_MODE_LPM )) - val |=TC358768_DSI_CONTROL_TXMD ; + val |=TC358768_DSI_CONTROL_TXMD ;if (!(mode_flags &MIPI_DSI_CLOCK_NON_CONTINUOUS )) val |=TC358768_DSI_CONTROL_HSCKMD ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 236/800 drm/bridge: tc358768: fix PLL parameters computation
In reply to Greg Kroah-HartmanFrom: Francesco Dolcini <[email protected]>
[ Upstream commit 6a4020b4c63911977aaf8047f904a300d15de739 ]
According to Toshiba documentation the PLL input clock after the divider should be not less than 4MHz, fix the PLL parameters computation accordingly.
--- drivers/gpu/drm/bridge/tc358768.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/bridge/tc358768.c +5 -1
@@ -334,13 +334,17 @@ static int tc358768_calc_pll(struct tc358768_priv *priv,u32 fbd;for (fbd =0 ; fbd <512 ; ++fbd) { -u32 pll, diff; +u32 pll, diff, pll_in; pll = (u32 )div_u64 ((u64 )refclk * (fbd +1 ), divisor);if (pll >= max_pll || pll < min_pll)continue ; + pll_in = (u32 )div_u64 ((u64 )refclk, prd +1 ); +if (pll_in <4000000 ) +continue ; + diff =max (pll, target_pll) -min (pll, target_pll);if (diff < best_diff) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 237/800 drm/bridge: tc358768: fix PLL target frequency
In reply to Greg Kroah-HartmanFrom: Francesco Dolcini <[email protected]>
[ Upstream commit ffd2e4bbea626d565b9817312b0fcfb382fecb88 ]
Correctly compute the PLL target frequency, the current formula works correctly only when the input bus width is 24bit, actually to properly compute the PLL target frequency what is relevant is the bits-per-pixel on the DSI link.
No regression expected since the DSI format is currently hard-coded as MIPI_DSI_FMT_RGB888.
--- drivers/gpu/drm/bridge/tc358768.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/gpu/drm/bridge/tc358768.c +5 -3
@@ -146,6 +146,7 @@ struct tc358768_priv {u32 pd_lines;/* number of Parallel Port Input Data Lines */ u32 dsi_lanes;/* number of DSI Lanes */ +u32 dsi_bpp;/* number of Bits Per Pixel over DSI */ /* Parameters for PLL programming */ u32 fbd;/* PLL feedback divider */
@@ -284,12 +285,12 @@ static void tc358768_hw_disable(struct tc358768_priv *priv)static u32 tc358768_pll_to_pclk (struct tc358768_priv *priv,u32 pll_clk) { -return (u32 )div_u64 ((u64 )pll_clk * priv->dsi_lanes, priv->pd_lines); +return (u32 )div_u64 ((u64 )pll_clk * priv->dsi_lanes, priv->dsi_bpp); }static u32 tc358768_pclk_to_pll (struct tc358768_priv *priv,u32 pclk) { -return (u32 )div_u64 ((u64 )pclk * priv->pd_lines, priv->dsi_lanes); +return (u32 )div_u64 ((u64 )pclk * priv->dsi_bpp, priv->dsi_lanes); } static int tc358768_calc_pll(struct tc358768_priv *priv,
@@ -426,6 +427,7 @@ static int tc358768_dsi_host_attach(struct mipi_dsi_host *host, priv->output.panel = panel; priv->dsi_lanes = dev->lanes; + priv->dsi_bpp =mipi_dsi_pixel_format_to_bpp (dev->format);/* get input ep (port0/endpoint0) */ ret = -EINVAL ;
@@ -437,7 +439,7 @@ static int tc358768_dsi_host_attach(struct mipi_dsi_host *host, }if (ret) - priv->pd_lines =mipi_dsi_pixel_format_to_bpp (dev->format); + priv->pd_lines = priv->dsi_bpp;drm_bridge_add (&priv->bridge);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 238/800 drm/bridge: tc358768: fix TCLK_ZEROCNT computation
In reply to Greg Kroah-HartmanFrom: Francesco Dolcini <[email protected]>
[ Upstream commit f9cf811374f42fca31ac34aaf59ee2ae72b89879 ]
Correct computation of TCLK_ZEROCNT register.
This register must be set to a value that ensure that (TCLK-PREPARECNT + TCLK-ZERO) > 300ns
with the actual value of (TCLK-PREPARECNT + TCLK-ZERO) being
(1 to 2) + (TCLK_ZEROCNT + 1)) x HSByteClkCycle + (PHY output delay)
with PHY output delay being about
(2 to 3) x MIPIBitClk cycle in the BitClk conversion.
--- drivers/gpu/drm/bridge/tc358768.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/bridge/tc358768.c +4 -4
@@ -742,10 +742,10 @@ static void tc358768_bridge_pre_enable(struct drm_bridge *bridge)/* 38ns < TCLK_PREPARE < 95ns */ val =tc358768_ns_to_cnt (65 , dsibclk_nsk) -1 ; -/* TCLK_PREPARE > 300ns */ - val2 =tc358768_ns_to_cnt (300 +tc358768_to_ns (3 * ui_nsk), - dsibclk_nsk); - val |= (val2 -tc358768_to_ns (phy_delay_nsk - dsibclk_nsk)) <<8 ; +/* TCLK_PREPARE + TCLK_ZERO > 300ns */ + val2 =tc358768_ns_to_cnt (300 -tc358768_to_ns (2 * ui_nsk), + dsibclk_nsk) -2 ; + val |= val2 <<8 ;dev_dbg (priv->dev,"TCLK_HEADERCNT: 0x%x\n" , val);tc358768_write (priv,TC358768_TCLK_HEADERCNT , val);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 239/800 drm/bridge: tc358768: Add atomic_get_input_bus_fmts() implementation
In reply to Greg Kroah-HartmanFrom: Francesco Dolcini <[email protected]>
[ Upstream commit cec5ccef85bd0128cf895612de54a9d21d2015d0 ]
Add atomic_get_input_bus_fmts() implementation, tc358768 has a parallel RGB input interface with the actual bus format depending on the amount of parallel input data lines.
Without this change when the tc358768 is used with less than 24bit the color mapping is completely wrong.
Stable-dep-of: ee18698e212b ("drm/bridge: tc358768: fix TCLK_TRAILCNT computation")
--- drivers/gpu/drm/bridge/tc358768.c | 44 +++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+)
drivers/gpu/drm/bridge/tc358768.c +44 -0
@@ -9,6 +9,7 @@#include <linux/gpio/consumer.h> #include <linux/i2c.h> #include <linux/kernel.h> +#include <linux/media-bus-format.h> #include <linux/module.h> #include <linux/regmap.h> #include <linux/regulator/consumer.h>
@@ -918,6 +919,44 @@ static void tc358768_bridge_enable(struct drm_bridge *bridge) } } +#define MAX_INPUT_SEL_FORMATS 1 + +static u32 * +tc358768_atomic_get_input_bus_fmts (struct drm_bridge *bridge, +struct drm_bridge_state *bridge_state, +struct drm_crtc_state *crtc_state, +struct drm_connector_state *conn_state, +u32 output_fmt, +unsigned int *num_input_fmts) +{ +struct tc358768_priv *priv =bridge_to_tc358768 (bridge); +u32 *input_fmts; + + *num_input_fmts =0 ; + + input_fmts =kcalloc (MAX_INPUT_SEL_FORMATS ,sizeof (*input_fmts), +GFP_KERNEL ); +if (!input_fmts) +return NULL ; + +switch (priv->pd_lines) { +case 16 : + input_fmts[0 ] =MEDIA_BUS_FMT_RGB565_1X16 ; +break ; +case 18 : + input_fmts[0 ] =MEDIA_BUS_FMT_RGB666_1X18 ; +break ; +default : +case 24 : + input_fmts[0 ] =MEDIA_BUS_FMT_RGB888_1X24 ; +break ; + }; + + *num_input_fmts =MAX_INPUT_SEL_FORMATS ; + +return input_fmts; +} +static const struct drm_bridge_funcs tc358768_bridge_funcs = { .attach = tc358768_bridge_attach, .mode_valid = tc358768_bridge_mode_valid,
@@ -925,6 +964,11 @@ static const struct drm_bridge_funcs tc358768_bridge_funcs = { .enable = tc358768_bridge_enable, .disable = tc358768_bridge_disable, .post_disable = tc358768_bridge_post_disable, + + .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state, + .atomic_reset = drm_atomic_helper_bridge_reset, + .atomic_get_input_bus_fmts = tc358768_atomic_get_input_bus_fmts, };static const struct drm_bridge_timings default_tc358768_timings = {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 240/800 drm/bridge: tc358768: fix TCLK_TRAILCNT computation
In reply to Greg Kroah-HartmanFrom: Francesco Dolcini <[email protected]>
[ Upstream commit ee18698e212b1659dd0850d7e2ae0f22e16ed3d3 ]
Correct computation of TCLK_TRAILCNT register.
The driver does not implement non-continuous clock mode, so the actual value doesn't make a practical difference yet. However this change also ensures that the value does not write to reserved registers bits in case of under/overflow.
This register must be set to a value that ensures that
TCLK-TRAIL > 60ns
and
TEOT <= (105 ns + 12 x UI)
with the actual value of TCLK-TRAIL being
(TCLK_TRAILCNT + (1 to 2)) xHSByteClkCycle +
(2 + (1 to 2)) * HSBYTECLKCycle - (PHY output delay)
with PHY output delay being about
(2 to 3) x MIPIBitClk cycle in the BitClk conversion.
--- drivers/gpu/drm/bridge/tc358768.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/gpu/drm/bridge/tc358768.c +5 -3
@@ -10,6 +10,7 @@#include <linux/i2c.h> #include <linux/kernel.h> #include <linux/media-bus-format.h> +#include <linux/minmax.h> #include <linux/module.h> #include <linux/regmap.h> #include <linux/regulator/consumer.h>
@@ -639,6 +640,7 @@ static void tc358768_bridge_pre_enable(struct drm_bridge *bridge)struct mipi_dsi_device *dsi_dev = priv->output.dev;unsigned long mode_flags = dsi_dev->mode_flags;u32 val, val2, lptxcnt, hact, data_type; +s32 raw_val;const struct drm_display_mode *mode;u32 dsibclk_nsk, dsiclk_nsk, ui_nsk, phy_delay_nsk;u32 dsiclk, dsibclk, video_start;
@@ -750,9 +752,9 @@ static void tc358768_bridge_pre_enable(struct drm_bridge *bridge)dev_dbg (priv->dev,"TCLK_HEADERCNT: 0x%x\n" , val);tc358768_write (priv,TC358768_TCLK_HEADERCNT , val); -/* TCLK_TRAIL > 60ns + 3*UI */ - val =60 +tc358768_to_ns (3 * ui_nsk); - val =tc358768_ns_to_cnt (val, dsibclk_nsk) -5 ; +/* TCLK_TRAIL > 60ns AND TEOT <= 105 ns + 12*UI */ + raw_val =tc358768_ns_to_cnt (60 +tc358768_to_ns (2 * ui_nsk), dsibclk_nsk) -5 ; + val =clamp (raw_val,0 ,127 );dev_dbg (priv->dev,"TCLK_TRAILCNT: 0x%x\n" , val);tc358768_write (priv,TC358768_TCLK_TRAILCNT , val);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 241/800 drm/bridge: tc358768: fix THS_ZEROCNT computation
In reply to Greg Kroah-HartmanFrom: Francesco Dolcini <[email protected]>
[ Upstream commit 77a089328da791118af9692543a5eedc79eb5fd4 ]
Correct computation of THS_ZEROCNT register.
This register must be set to a value that ensure that THS_PREPARE + THS_ZERO > 145ns + 10*UI
with the actual value of (THS_PREPARE + THS_ZERO) being
((1 to 2) + 1 + (TCLK_ZEROCNT + 1) + (3 to 4)) x ByteClk cycle +
+ HSByteClk x (2 + (1 to 2)) + (PHY delay)
with PHY delay being about
(8 + (5 to 6)) x MIPIBitClk cycle in the BitClk conversion.
--- drivers/gpu/drm/bridge/tc358768.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/bridge/tc358768.c +4 -3
@@ -761,9 +761,10 @@ static void tc358768_bridge_pre_enable(struct drm_bridge *bridge)/* 40ns + 4*UI < THS_PREPARE < 85ns + 6*UI */ val =50 +tc358768_to_ns (4 * ui_nsk); val =tc358768_ns_to_cnt (val, dsibclk_nsk) -1 ; -/* THS_ZERO > 145ns + 10*UI */ - val2 =tc358768_ns_to_cnt (145 -tc358768_to_ns (ui_nsk), dsibclk_nsk); - val |= (val2 -tc358768_to_ns (phy_delay_nsk)) <<8 ; +/* THS_PREPARE + THS_ZERO > 145ns + 10*UI */ + raw_val =tc358768_ns_to_cnt (145 -tc358768_to_ns (3 * ui_nsk), dsibclk_nsk) -10 ; + val2 =clamp (raw_val,0 ,127 ); + val |= val2 <<8 ;dev_dbg (priv->dev,"THS_HEADERCNT: 0x%x\n" , val);tc358768_write (priv,TC358768_THS_HEADERCNT , val);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 242/800 drm/bridge: tc358768: fix TXTAGOCNT computation
In reply to Greg Kroah-HartmanFrom: Francesco Dolcini <[email protected]>
[ Upstream commit 3666aad8185af8d0ce164fd3c4974235417d6d0b ]
Correct computation of TXTAGOCNT register.
This register must be set to a value that ensure that the TTA-GO period = (4 x TLPX)
with the actual value of TTA-GO being
4 x (TXTAGOCNT + 1) x (HSByteClk cycle)
--- drivers/gpu/drm/bridge/tc358768.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/bridge/tc358768.c +1 -1
@@ -796,7 +796,7 @@ static void tc358768_bridge_pre_enable(struct drm_bridge *bridge)/* TXTAGOCNT[26:16] RXTASURECNT[10:0] */ val =tc358768_to_ns ((lptxcnt +1 ) * dsibclk_nsk *4 ); - val =tc358768_ns_to_cnt (val, dsibclk_nsk) -1 ; + val =tc358768_ns_to_cnt (val, dsibclk_nsk) /4 -1 ; val2 =tc358768_ns_to_cnt (tc358768_to_ns ((lptxcnt +1 ) * dsibclk_nsk), dsibclk_nsk) -2 ; val = val <<16 | val2;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 243/800 drm/bridge: tc358768: fix THS_TRAILCNT computation
In reply to Greg Kroah-HartmanFrom: Francesco Dolcini <[email protected]>
[ Upstream commit bac7842cd179572e8e0fc2d7b5254e40c6e9e057 ]
Correct computation of THS_TRAILCNT register.
This register must be set to a value that ensure that THS_TRAIL > 60 ns + 4 x UI
andTHS_TRAIL > 8 x UI
andTHS_TRAIL < TEOT
with
TEOT = 105 ns + (12 x UI)
with the actual value of THS_TRAIL being
(1 + THS_TRAILCNT) x ByteClk cycle + ((1 to 2) + 2) xHSBYTECLK cycle +
- (PHY output delay)
with PHY output delay being about
(8 + (5 to 6)) x MIPIBitClk cycle in the BitClk conversion.
--- drivers/gpu/drm/bridge/tc358768.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/bridge/tc358768.c +4 -3
@@ -780,9 +780,10 @@ static void tc358768_bridge_pre_enable(struct drm_bridge *bridge)dev_dbg (priv->dev,"TCLK_POSTCNT: 0x%x\n" , val);tc358768_write (priv,TC358768_TCLK_POSTCNT , val); -/* 60ns + 4*UI < THS_PREPARE < 105ns + 12*UI */ - val =tc358768_ns_to_cnt (60 +tc358768_to_ns (15 * ui_nsk), - dsibclk_nsk) -5 ; +/* max(60ns + 4*UI, 8*UI) < THS_TRAILCNT < 105ns + 12*UI */ + raw_val =tc358768_ns_to_cnt (60 +tc358768_to_ns (18 * ui_nsk), + dsibclk_nsk) -4 ; + val =clamp (raw_val,0 ,15 );dev_dbg (priv->dev,"THS_TRAILCNT: 0x%x\n" , val);tc358768_write (priv,TC358768_THS_TRAILCNT , val);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 244/800 Input: tests - fix input_test_match_device_id test
In reply to Greg Kroah-HartmanFrom: Dmitry Torokhov <[email protected]>
[ Upstream commit c73b4db076faf827d0656665ef5e97b76926b60f ]
Properly initialize input_device_id structure in input_test_match_device_id test to make sure it contains no garbage causing the test to randomly fail.
--- drivers/input/tests/input_test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/input/tests/input_test.c +1 -1
@@ -87,7 +87,7 @@ static void input_test_timestamp(struct kunit *test)static void input_test_match_device_id (struct kunit *test) {struct input_dev *input_dev = test->priv; -struct input_device_id id; +struct input_device_id id = {0 };/* * Must match when the input device bus, vendor, product, version
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 245/800 drm/vram-helper: fix function names in vram helper doc
In reply to Greg Kroah-HartmanFrom: Luc Ma <[email protected]>
[ Upstream commit b8e392245105b50706f18418054821e71e637288 ]
Refer to drmm_vram_helper_init() instead of the non-existent drmm_vram_helper_alloc_mm().
--- drivers/gpu/drm/drm_gem_vram_helper.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/drm_gem_vram_helper.c +3 -3
@@ -45,7 +45,7 @@ static const struct drm_gem_object_funcs drm_gem_vram_object_funcs;* the frame's scanout buffer or the cursor image. If there's no more space * left in VRAM, inactive GEM objects can be moved to system memory. * -* To initialize the VRAM helper library call drmm_vram_helper_alloc_mm(). +* To initialize the VRAM helper library call drmm_vram_helper_init(). * The function allocates and initializes an instance of &struct drm_vram_mm * in &struct drm_device.vram_mm . Use &DRM_GEM_VRAM_DRIVER to initialize * &struct drm_driver and &DRM_VRAM_MM_FILE_OPERATIONS to initialize
@@ -73,7 +73,7 @@ static const struct drm_gem_object_funcs drm_gem_vram_object_funcs;* // setup device, vram base and size * // ... * -* ret = drmm_vram_helper_alloc_mm(dev, vram_base, vram_size); +* ret = drmm_vram_helper_init(dev, vram_base, vram_size); * if (ret) * return ret; * return 0;
@@ -86,7 +86,7 @@ static const struct drm_gem_object_funcs drm_gem_vram_object_funcs;* to userspace. * * You don't have to clean up the instance of VRAM MM. -* drmm_vram_helper_alloc_mm() is a managed interface that installs a +* drmm_vram_helper_init() is a managed interface that installs a * clean-up handler to run during the DRM device's release. * * For drawing or scanout operations, rsp. buffer objects have to be pinned
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 246/800 ARM: dts: BCM5301X: Drop "clock-names" from the SPI node
In reply to Greg Kroah-HartmanFrom: Rafał Miłecki <[email protected]>
[ Upstream commit d3c8e2c5757153bbfad70019ec1decbca86f3def ]
There is no such property in the SPI controller binding documentation. Also Linux driver doesn't look for it.
This fixes:arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dtb: spi@18029200: Unevaluated properties are not allowed ('clock-names' was unexpected)
From schema: Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.yaml
--- arch/arm/boot/dts/bcm5301x.dtsi | 1 - 1 file changed, 1 deletion(-)
arch/arm/boot/dts/bcm5301x.dtsi +0 -1
@@ -542,7 +542,6 @@ spi@18029200 { "spi_lr_session_done", "spi_lr_overread"; clocks = <&iprocmed>; - clock-names = "iprocmed"; num-cs = <2>; #address-cells = <1>; #size-cells = <0>;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 247/800 ARM: dts: meson8b: correct uart_B and uart_C clock references
In reply to Greg Kroah-HartmanFrom: [email protected] <[email protected]>
[ Upstream commit d542ce8d4769cdef6a7bc3437e59cfed9c68f0e4 ]
With the current device tree for meson8b, uarts B (e.g. available on pins 8/10 on Odroid-C1) and C (pins 3/5 on Odroid-C1) do not work, because they are relying on incorrect clocks. Change the references of pclk to the correct CLKID, to allow use of the two uarts.
--- arch/arm/boot/dts/meson8b.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/meson8b.dtsi +2 -2
@@ -740,13 +740,13 @@ &uart_A { &uart_B { compatible = "amlogic,meson8b-uart"; - clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>; + clocks = <&xtal>, <&clkc CLKID_UART1>, <&clkc CLKID_CLK81>; clock-names = "xtal", "pclk", "baud"; }; &uart_C { compatible = "amlogic,meson8b-uart"; - clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>; + clocks = <&xtal>, <&clkc CLKID_UART2>, <&clkc CLKID_CLK81>; clock-names = "xtal", "pclk", "baud"; };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 248/800 clk: vc5: Fix .driver_data content in i2c_device_id
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit be3471c5bd9b921c9adfab7948e8021611639164 ]
The .driver_data content in i2c_device_id table must match the .data content in of_device_id table, else device_get_match_data() would return bogus value on i2c_device_id match. Align the two tables.
The i2c_device_id table is now converted from of_device_id using '[email protected] = "idt,\([^"]\+"\), .data = \(.*\)@"\1, .driver_data = (kernel_ulong_t)\2@'
--- drivers/clk/clk-versaclock5.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/clk/clk-versaclock5.c +8 -8
@@ -1271,14 +1271,14 @@ static const struct vc5_chip_info idt_5p49v6975_info = { };static const struct i2c_device_id vc5_id[] = { - {"5p49v5923" , .driver_data =IDT_VC5_5P49V5923 }, - {"5p49v5925" , .driver_data =IDT_VC5_5P49V5925 }, - {"5p49v5933" , .driver_data =IDT_VC5_5P49V5933 }, - {"5p49v5935" , .driver_data =IDT_VC5_5P49V5935 }, - {"5p49v60" , .driver_data =IDT_VC6_5P49V60 }, - {"5p49v6901" , .driver_data =IDT_VC6_5P49V6901 }, - {"5p49v6965" , .driver_data =IDT_VC6_5P49V6965 }, - {"5p49v6975" , .driver_data =IDT_VC6_5P49V6975 }, + {"5p49v5923" , .driver_data = (kernel_ulong_t)&idt_5p49v5923_info }, + {"5p49v5925" , .driver_data = (kernel_ulong_t)&idt_5p49v5925_info }, + {"5p49v5933" , .driver_data = (kernel_ulong_t)&idt_5p49v5933_info }, + {"5p49v5935" , .driver_data = (kernel_ulong_t)&idt_5p49v5935_info }, + {"5p49v60" , .driver_data = (kernel_ulong_t)&idt_5p49v60_info }, + {"5p49v6901" , .driver_data = (kernel_ulong_t)&idt_5p49v6901_info }, + {"5p49v6965" , .driver_data = (kernel_ulong_t)&idt_5p49v6965_info }, + {"5p49v6975" , .driver_data = (kernel_ulong_t)&idt_5p49v6975_info }, { } };MODULE_DEVICE_TABLE (i2c, vc5_id);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 249/800 clk: vc7: Fix .driver_data content in i2c_device_id
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit b5e10beeafaa3266559c582dde7534ae3fe8cefb ]
The .driver_data content in i2c_device_id table must match the .data content in of_device_id table, else device_get_match_data() would return bogus value on i2c_device_id match. Align the two tables.
The i2c_device_id table is now converted from of_device_id using
'[email protected] = "renesas,\([^"]\+"\), .data = \(.*\)@"\1, .driver_data = (kernel_ulong_t)\2@'
--- drivers/clk/clk-versaclock7.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/clk-versaclock7.c +1 -1
@@ -1282,7 +1282,7 @@ static const struct regmap_config vc7_regmap_config = { };static const struct i2c_device_id vc7_i2c_id[] = { - {"rc21008a" ,VC7_RC21008A }, + {"rc21008a" , .driver_data = (kernel_ulong_t)&vc7_rc21008a_info }, {} };MODULE_DEVICE_TABLE (i2c, vc7_i2c_id);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 250/800 clk: rs9: Fix .driver_data content in i2c_device_id
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit ad527ca87e4ea42d7baad2ce710b44069287931b ]
The .driver_data content in i2c_device_id table must match the .data content in of_device_id table, else device_get_match_data() would return bogus value on i2c_device_id match. Align the two tables.
The i2c_device_id table is now converted from of_device_id using
'[email protected] = "renesas,\([^"]\+"\), .data = \(.*\)@"\1, .driver_data = (kernel_ulong_t)\2@'
--- drivers/clk/clk-renesas-pcie.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/clk-renesas-pcie.c +2 -2
@@ -392,8 +392,8 @@ static const struct rs9_chip_info renesas_9fgv0441_info = { };static const struct i2c_device_id rs9_id[] = { - {"9fgv0241" , .driver_data =RENESAS_9FGV0241 }, - {"9fgv0441" , .driver_data =RENESAS_9FGV0441 }, + {"9fgv0241" , .driver_data = (kernel_ulong_t)&renesas_9fgv0241_info }, + {"9fgv0441" , .driver_data = (kernel_ulong_t)&renesas_9fgv0441_info }, { } };MODULE_DEVICE_TABLE (i2c, rs9_id);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 251/800 Input: adxl34x - do not hardcode interrupt trigger type
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit e96220bce5176ed2309f77f061dcc0430b82b25e ]
Instead of hardcoding IRQ trigger type to IRQF_TRIGGER_HIGH, let's respect the settings specified in the firmware description.
--- drivers/input/misc/adxl34x.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/input/misc/adxl34x.c +1 -2
@@ -817,8 +817,7 @@ struct adxl34x *adxl34x_probe(struct device *dev, int irq,AC_WRITE (ac,POWER_CTL ,0 ); err =request_threaded_irq (ac->irq,NULL , adxl34x_irq, -IRQF_TRIGGER_HIGH |IRQF_ONESHOT , -dev_name (dev), ac); +IRQF_ONESHOT ,dev_name (dev), ac);if (err) {dev_err (dev,"irq %d busy?\n" , ac->irq); goto err_free_mem;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 252/800 drm: sun4i_tcon: use devm_clk_get_enabled in `sun4i_tcon_init_clocks`
In reply to Greg Kroah-HartmanFrom: XuDong Liu <[email protected]>
[ Upstream commit 123ee07ba5b7123e0ce0e0f9d64938026c16a2ce ]
Smatch reports:drivers/gpu/drm/sun4i/sun4i_tcon.c:805 sun4i_tcon_init_clocks() warn:
'tcon->clk' from clk_prepare_enable() not released on lines: 792,801.
In the function sun4i_tcon_init_clocks(), tcon->clk and tcon->sclk0 are not disabled in the error handling, which affects the release of these variable. Although sun4i_tcon_bind(), which calls sun4i_tcon_init_clocks(), use sun4i_tcon_free_clocks to disable the variables mentioned, but the error handling branch of sun4i_tcon_init_clocks() ignores the required disable process.
To fix this issue, use the devm_clk_get_enabled to automatically balance enable and disabled calls. As original implementation use sun4i_tcon_free_clocks() to disable clk explicitly, we delete the related calls and error handling that are no longer needed.
--- drivers/gpu/drm/sun4i/sun4i_tcon.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-)
drivers/gpu/drm/sun4i/sun4i_tcon.c +4 -15
@@ -778,21 +778,19 @@ static irqreturn_t sun4i_tcon_handler(int irq, void *private)static int sun4i_tcon_init_clocks (struct device *dev,struct sun4i_tcon *tcon) { - tcon->clk =devm_clk_get (dev,"ahb" ); + tcon->clk =devm_clk_get_enabled (dev,"ahb" );if (IS_ERR (tcon->clk)) {dev_err (dev,"Couldn't get the TCON bus clock\n" );return PTR_ERR (tcon->clk); } -clk_prepare_enable (tcon->clk);if (tcon->quirks->has_channel_0) { - tcon->sclk0 =devm_clk_get (dev,"tcon-ch0" ); + tcon->sclk0 =devm_clk_get_enabled (dev,"tcon-ch0" );if (IS_ERR (tcon->sclk0)) {dev_err (dev,"Couldn't get the TCON channel 0 clock\n" );return PTR_ERR (tcon->sclk0); } } -clk_prepare_enable (tcon->sclk0);if (tcon->quirks->has_channel_1) { tcon->sclk1 =devm_clk_get (dev,"tcon-ch1" );
@@ -805,12 +803,6 @@ static int sun4i_tcon_init_clocks(struct device *dev,return 0 ; } -static void sun4i_tcon_free_clocks (struct sun4i_tcon *tcon) -{ -clk_disable_unprepare (tcon->sclk0); -clk_disable_unprepare (tcon->clk); -} -static int sun4i_tcon_init_irq (struct device *dev,struct sun4i_tcon *tcon) {
@@ -1223,14 +1215,14 @@ static int sun4i_tcon_bind(struct device *dev, struct device *master, ret =sun4i_tcon_init_regmap (dev, tcon);if (ret) {dev_err (dev,"Couldn't init our TCON regmap\n" ); - goto err_free_clocks; + goto err_assert_reset; }if (tcon->quirks->has_channel_0) { ret =sun4i_dclk_create (dev, tcon);if (ret) {dev_err (dev,"Couldn't create our TCON dot clock\n" ); - goto err_free_clocks; + goto err_assert_reset; } }
@@ -1293,8 +1285,6 @@ static int sun4i_tcon_bind(struct device *dev, struct device *master, err_free_dotclock:if (tcon->quirks->has_channel_0)sun4i_dclk_free (tcon); -err_free_clocks: -sun4i_tcon_free_clocks (tcon); err_assert_reset:reset_control_assert (tcon->lcd_rst);return ret;
@@ -1308,7 +1298,6 @@ static void sun4i_tcon_unbind(struct device *dev, struct device *master,list_del (&tcon->list);if (tcon->quirks->has_channel_0)sun4i_dclk_free (tcon); -sun4i_tcon_free_clocks (tcon); }static const struct component_ops sun4i_tcon_ops = {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 253/800 drm/panel: sharp-ls043t1le01: adjust mode settings
In reply to Greg Kroah-HartmanFrom: Dmitry Baryshkov <[email protected]>
[ Upstream commit dee23b2c9e3ff46d59c5d45e1436eceb878e7c9a ]
Using current settings causes panel flickering on APQ8074 dragonboard. Adjust panel settings to follow the vendor-provided mode. This also enables MIPI_DSI_MODE_VIDEO_SYNC_PULSE, which is also specified by the vendor dtsi for the mentioned dragonboard.
--- drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c +6 -5
@@ -192,15 +192,15 @@ static int sharp_nt_panel_enable(struct drm_panel *panel) }static const struct drm_display_mode default_mode = { - .clock =41118 , + .clock = (540 +48 +32 +80 ) * (960 +3 +10 +15 ) *60 /1000 , .hdisplay =540 , .hsync_start =540 +48 , - .hsync_end =540 +48 +80 , - .htotal =540 +48 +80 +32 , + .hsync_end =540 +48 +32 , + .htotal =540 +48 +32 +80 , .vdisplay =960 , .vsync_start =960 +3 , - .vsync_end =960 +3 +15 , - .vtotal =960 +3 +15 +1 , + .vsync_end =960 +3 +10 , + .vtotal =960 +3 +10 +15 , }; static int sharp_nt_panel_get_modes(struct drm_panel *panel,
@@ -280,6 +280,7 @@ static int sharp_nt_panel_probe(struct mipi_dsi_device *dsi) dsi->lanes =2 ; dsi->format =MIPI_DSI_FMT_RGB888 ; dsi->mode_flags =MIPI_DSI_MODE_VIDEO | +MIPI_DSI_MODE_VIDEO_SYNC_PULSE |MIPI_DSI_MODE_VIDEO_HSE |MIPI_DSI_CLOCK_NON_CONTINUOUS |MIPI_DSI_MODE_NO_EOT_PACKET ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 254/800 driver: soc: xilinx: use _safe loop iterator to avoid a use after free
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit c58da0ba3e5c86e51e2c1557afaf6f71e00c4533 ]
The hash_for_each_possible() loop dereferences "eve_data" to get the next item on the list. However the loop frees eve_data so it leads to a use after free. Use hash_for_each_possible_safe() instead.
--- drivers/soc/xilinx/xlnx_event_manager.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/soc/xilinx/xlnx_event_manager.c +4 -2
@@ -192,11 +192,12 @@ static int xlnx_remove_cb_for_suspend(event_cb_func_t cb_fun)struct registered_event_data *eve_data;struct agent_cb *cb_pos;struct agent_cb *cb_next; +struct hlist_node *tmp; is_need_to_unregister = false;/* Check for existing entry in hash table for given cb_type */ -hash_for_each_possible (reg_driver_map, eve_data, hentry,PM_INIT_SUSPEND_CB ) { +hash_for_each_possible_safe (reg_driver_map, eve_data, tmp, hentry,PM_INIT_SUSPEND_CB ) {if (eve_data->cb_type ==PM_INIT_SUSPEND_CB ) {/* Delete the list of callback */ list_for_each_entry_safe (cb_pos, cb_next, &eve_data->cb_list_head, list) {
@@ -228,11 +229,12 @@ static int xlnx_remove_cb_for_notify_event(const u32 node_id, const u32 event,u64 key = ((u64 )node_id <<32U ) | (u64 )event;struct agent_cb *cb_pos;struct agent_cb *cb_next; +struct hlist_node *tmp; is_need_to_unregister = false;/* Check for existing entry in hash table for given key id */ -hash_for_each_possible (reg_driver_map, eve_data, hentry, key) { +hash_for_each_possible_safe (reg_driver_map, eve_data, tmp, hentry, key) {if (eve_data->key == key) {/* Delete the list of callback */ list_for_each_entry_safe (cb_pos, cb_next, &eve_data->cb_list_head, list) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 255/800 ASoC: dt-bindings: mediatek,mt8188-afe: correct clock name
In reply to Greg Kroah-HartmanFrom: Trevor Wu <[email protected]>
[ Upstream commit 1e4fe75e9746be8e40c57132bb3fba1ce3dd24af ]
The original clock names are different from the list in driver code. Correct the mismatched binding names in the patch.
Because no mt8188 upstream dts exists, it doesn't affect the existing dts file.
--- .../bindings/sound/mediatek,mt8188-afe.yaml | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-)
Documentation/devicetree/bindings/sound/mediatek,mt8188-afe.yaml +18 -18
@@ -63,15 +63,15 @@ properties: - const: apll12_div2 - const: apll12_div3 - const: apll12_div9 - - const: a1sys_hp_sel - - const: aud_intbus_sel - - const: audio_h_sel - - const: audio_local_bus_sel - - const: dptx_m_sel - - const: i2so1_m_sel - - const: i2so2_m_sel - - const: i2si1_m_sel - - const: i2si2_m_sel + - const: top_a1sys_hp + - const: top_aud_intbus + - const: top_audio_h + - const: top_audio_local_bus + - const: top_dptx + - const: top_i2so1 + - const: top_i2so2 + - const: top_i2si1 + - const: top_i2si2 - const: adsp_audio_26m mediatek,etdm-in1-cowork-source:
@@ -193,15 +193,15 @@ examples: "apll12_div2", "apll12_div3", "apll12_div9", - "a1sys_hp_sel", - "aud_intbus_sel", - "audio_h_sel", - "audio_local_bus_sel", - "dptx_m_sel", - "i2so1_m_sel", - "i2so2_m_sel", - "i2si1_m_sel", - "i2si2_m_sel", + "top_a1sys_hp", + "top_aud_intbus", + "top_audio_h", + "top_audio_local_bus", + "top_dptx", + "top_i2so1", + "top_i2so2", + "top_i2si1", + "top_i2si2", "adsp_audio_26m"; };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 256/800 ASoC: Intel: sof_sdw: remove SOF_SDW_TGL_HDMI for MeteorLake devices
In reply to Greg Kroah-HartmanFrom: Bard Liao <[email protected]>
[ Upstream commit 0db94947c9d3da16aa31d152b7d26fab78b02cb9 ]
Topologies support three HDMI links on MeteorLake devices only.
--- sound/soc/intel/boards/sof_sdw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/intel/boards/sof_sdw.c +1 -1
@@ -413,7 +413,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { .matches = { DMI_MATCH(DMI_PRODUCT_FAMILY, "Intel_mtlrvp"), }, - .driver_data = (void *)(RT711_JD1 | SOF_SDW_TGL_HDMI), + .driver_data = (void *)(RT711_JD1), }, {} };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 257/800 ASoC: Intel: sof_sdw: start set codec init function with an adr index
In reply to Greg Kroah-HartmanFrom: Bard Liao <[email protected]>
[ Upstream commit f0c8d83ab1a3532ebeb1a89acb649be01657aed8 ]
Currently, set_codec_init_func always start with link->adr_d[0] because we assumed all adr_d on the same link are the same devices. The assumption is no longer valid when different devices on the same sdw link are supported.
--- sound/soc/intel/boards/sof_sdw.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
sound/soc/intel/boards/sof_sdw.c +11 -5
@@ -902,17 +902,20 @@ static int create_codec_dai_name(struct device *dev,static int set_codec_init_func (struct snd_soc_card *card,const struct snd_soc_acpi_link_adr *link,struct snd_soc_dai_link *dai_links, -bool playback,int group_id) +bool playback,int group_id,int adr_index) { -int i; +int i = adr_index; do { /* * Initialize the codec. If codec is part of an aggregated * group (group_id>0), initialize all codecs belonging to * same group. + * The first link should start with link->adr_d[adr_index] + * because that is the device that we want to initialize and + * we should end immediately if it is not aggregated (group_id=0) */ - for (i = 0; i < link->num_adr; i++) { + for ( ; i < link->num_adr; i++) { int codec_index; codec_index = find_codec_info_part(link->adr_d[i].adr);
@@ -928,9 +931,12 @@ static int set_codec_init_func(struct snd_soc_card *card, dai_links, &codec_info_list[codec_index], playback); +if (!group_id) +return 0 ; } + i =0 ; link++; - }while (link->mask && group_id); + }while (link->mask);return 0 ; }
@@ -1180,7 +1186,7 @@ static int create_sdw_dailink(struct snd_soc_card *card, dai_links[*link_index].nonatomic = true; ret =set_codec_init_func (card, link, dai_links + (*link_index)++, - playback, group_id); + playback, group_id, adr_index);if (ret <0 ) {dev_err (dev,"failed to init codec %d" , codec_index);return ret;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 258/800 drm/vkms: isolate pixel conversion functionality
In reply to Greg Kroah-HartmanFrom: Maíra Canal <[email protected]>
[ Upstream commit 322d716a3e8a74fb75cd0f657647be4df253fd2f ]
Currently, the pixel conversion functions repeat the same loop to iterate the rows. Instead of repeating the same code for each pixel format, create a function to wrap the loop and isolate the pixel conversion functionality.
Stable-dep-of: ab87f558dcfb ("drm/vkms: Fix RGB565 pixel conversion")
--- drivers/gpu/drm/vkms/vkms_composer.c | 4 +- drivers/gpu/drm/vkms/vkms_drv.h | 4 +- drivers/gpu/drm/vkms/vkms_formats.c | 125 +++++++++++---------------- drivers/gpu/drm/vkms/vkms_formats.h | 2 +- drivers/gpu/drm/vkms/vkms_plane.c | 2 +- 5 files changed, 56 insertions(+), 81 deletions(-)
drivers/gpu/drm/vkms/vkms_composer.c +2 -2
@@ -99,7 +99,7 @@ static void blend(struct vkms_writeback_job *wb,if (!check_y_limit (plane[i]->frame_info, y))continue ; - plane[i]->plane_read (stage_buffer, plane[i]->frame_info, y); +vkms_compose_row (stage_buffer, plane[i], y);pre_mul_alpha_blend (plane[i]->frame_info, stage_buffer, output_buffer); }
@@ -118,7 +118,7 @@ static int check_format_funcs(struct vkms_crtc_state *crtc_state,u32 n_active_planes = crtc_state->num_active_planes;for (size_t i =0 ; i < n_active_planes; i++) -if (!planes[i]->plane_read) +if (!planes[i]->pixel_read)return -1 ;if (active_wb && !active_wb->wb_write)
drivers/gpu/drm/vkms/vkms_drv.h +2 -2
@@ -56,8 +56,7 @@ struct vkms_writeback_job {struct vkms_plane_state {struct drm_shadow_plane_state base;struct vkms_frame_info *frame_info; -void (*plane_read)(struct line_buffer *buffer, -const struct vkms_frame_info *frame_info,int y); +void (*pixel_read)(u8 *src_buffer,struct pixel_argb_u16 *out_pixel); };struct vkms_plane {
@@ -155,6 +154,7 @@ int vkms_verify_crc_source(struct drm_crtc *crtc, const char *source_name,/* Composer Support */ void vkms_composer_worker (struct work_struct *work);void vkms_set_composer (struct vkms_output *out,bool enabled); +void vkms_compose_row (struct line_buffer *stage_buffer,struct vkms_plane_state *plane,int y);/* Writeback */ int vkms_enable_writeback_connector (struct vkms_device *vkmsdev);
drivers/gpu/drm/vkms/vkms_formats.c +50 -75
157 lines not on this page · raw message
drivers/gpu/drm/vkms/vkms_formats.h +1 -1
@@ -5,7 +5,7 @@#include "vkms_drv.h" -void *get_frame_to_line_function (u32 format); +void *get_pixel_conversion_function (u32 format);void *get_line_to_frame_function (u32 format);
drivers/gpu/drm/vkms/vkms_plane.c +1 -1
@@ -123,7 +123,7 @@ static void vkms_plane_atomic_update(struct drm_plane *plane, frame_info->offset = fb->offsets[0 ]; frame_info->pitch = fb->pitches[0 ]; frame_info->cpp = fb->format->cpp[0 ]; - vkms_plane_state->plane_read =get_frame_to_line_function (fmt); + vkms_plane_state->pixel_read =get_pixel_conversion_function (fmt); } static int vkms_plane_atomic_check(struct drm_plane *plane,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 259/800 drm: Add fixed-point helper to get rounded integer values
In reply to Greg Kroah-HartmanFrom: Maíra Canal <[email protected]>
[ Upstream commit 8b25320887d7feac98875546ea0f521628b745bb ]
Create a new fixed-point helper to allow us to return the rounded value of our fixed point value.
[v2]:
* Create the function drm_fixp2int_round() (Melissa Wen).
[v3]:
* Use drm_fixp2int() instead of shifting manually (Arthur Grillo).
Stable-dep-of: ab87f558dcfb ("drm/vkms: Fix RGB565 pixel conversion")
--- include/drm/drm_fixed.h | 6 ++++++ 1 file changed, 6 insertions(+)
include/drm/drm_fixed.h +6 -0
@@ -71,6 +71,7 @@ static inline u32 dfixed_div(fixed20_12 A, fixed20_12 B) }#define DRM_FIXED_POINT 32 +#define DRM_FIXED_POINT_HALF 16#define DRM_FIXED_ONE (1ULL << DRM_FIXED_POINT)#define DRM_FIXED_DECIMAL_MASK (DRM_FIXED_ONE - 1)#define DRM_FIXED_DIGITS_MASK (~DRM_FIXED_DECIMAL_MASK)
@@ -87,6 +88,11 @@ static inline int drm_fixp2int(s64 a)return ((s64 )a) >>DRM_FIXED_POINT ; } +static inline int drm_fixp2int_round (s64 a) +{ +return drm_fixp2int (a + (1 << (DRM_FIXED_POINT_HALF -1 ))); +} +static inline int drm_fixp2int_ceil (s64 a) {if (a >0 )
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 260/800 drm/vkms: Fix RGB565 pixel conversion
In reply to Greg Kroah-HartmanFrom: Maíra Canal <[email protected]>
[ Upstream commit ab87f558dcfb2562c3497e89600dec798a446665 ]
Currently, the pixel conversion isn't rounding the fixed-point values before assigning it to the RGB coefficients, which is causing the IGT pixel-format tests to fail. So, use the drm_fixp2int_round() fixed-point helper to round the values when assigning it to the RGB coefficients.
Tested with igt@kms_plane@pixel-format and igt@kms_plane@pixel-format-source-clamping.
[v2]:
* Use drm_fixp2int_round() to fix the pixel conversion instead of casting the values to s32 (Melissa Wen).
--- drivers/gpu/drm/vkms/vkms_formats.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/vkms/vkms_formats.c +6 -6
@@ -97,9 +97,9 @@ static void RGB565_to_argb_u16(u8 *src_pixels, struct pixel_argb_u16 *out_pixel)s64 fp_b =drm_int2fixp (rgb_565 &0x1f ); out_pixel->a = (u16 )0xffff ; - out_pixel->r =drm_fixp2int (drm_fixp_mul (fp_r, fp_rb_ratio)); - out_pixel->g =drm_fixp2int (drm_fixp_mul (fp_g, fp_g_ratio)); - out_pixel->b =drm_fixp2int (drm_fixp_mul (fp_b, fp_rb_ratio)); + out_pixel->r =drm_fixp2int_round (drm_fixp_mul (fp_r, fp_rb_ratio)); + out_pixel->g =drm_fixp2int_round (drm_fixp_mul (fp_g, fp_g_ratio)); + out_pixel->b =drm_fixp2int_round (drm_fixp_mul (fp_b, fp_rb_ratio)); }void vkms_compose_row (struct line_buffer *stage_buffer,struct vkms_plane_state *plane,int y)
@@ -216,9 +216,9 @@ static void argb_u16_to_RGB565(struct vkms_frame_info *frame_info,s64 fp_g =drm_int2fixp (in_pixels[x].g);s64 fp_b =drm_int2fixp (in_pixels[x].b); -u16 r =drm_fixp2int (drm_fixp_div (fp_r, fp_rb_ratio)); -u16 g =drm_fixp2int (drm_fixp_div (fp_g, fp_g_ratio)); -u16 b =drm_fixp2int (drm_fixp_div (fp_b, fp_rb_ratio)); +u16 r =drm_fixp2int_round (drm_fixp_div (fp_r, fp_rb_ratio)); +u16 g =drm_fixp2int_round (drm_fixp_div (fp_g, fp_g_ratio)); +u16 b =drm_fixp2int_round (drm_fixp_div (fp_b, fp_rb_ratio)); *dst_pixels =cpu_to_le16 (r <<11 | g <<5 | b); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 261/800 ARM: dts: stm32: Move ethernet MAC EEPROM from SoM to carrier boards
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit 9660efc2af37f3c12dc6e6a5511ad99e0addc297 ]
The ethernet MAC EEPROM is not populated on the SoM itself, it has to be populated on each carrier board. Move the EEPROM into the correct place in DTs, i.e. the carrier board DTs. Add label to the EEPROM too.
--- arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi | 6 ++++++ arch/arm/boot/dts/stm32mp15xx-dhcor-drc-compact.dtsi | 6 ++++++ arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi | 6 ------ arch/arm/boot/dts/stm32mp15xx-dhcor-testbench.dtsi | 8 ++++++++ 4 files changed, 20 insertions(+), 6 deletions(-)
arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi +6 -0
@@ -321,6 +321,12 @@ adv7513_i2s0: endpoint { }; }; }; + + dh_mac_eeprom: eeprom@53 { + compatible = "atmel,24c02"; + reg = <0x53>; + pagesize = <16>; + }; }; <dc {
arch/arm/boot/dts/stm32mp15xx-dhcor-drc-compact.dtsi +6 -0
@@ -192,6 +192,12 @@ eeprom@50 { reg = <0x50>; pagesize = <16>; }; + + dh_mac_eeprom: eeprom@53 { + compatible = "atmel,24c02"; + reg = <0x53>; + pagesize = <16>; + }; }; &sdmmc1 { /* MicroSD */
arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi +0 -6
@@ -213,12 +213,6 @@ watchdog { status = "disabled"; }; }; - - eeprom@53 { - compatible = "atmel,24c02"; - reg = <0x53>; - pagesize = <16>; - }; }; &ipcc {
arch/arm/boot/dts/stm32mp15xx-dhcor-testbench.dtsi +8 -0
@@ -90,6 +90,14 @@ phy0: ethernet-phy@7 { }; }; +&i2c4 { + dh_mac_eeprom: eeprom@53 { + compatible = "atmel,24c02"; + reg = <0x53>; + pagesize = <16>; + }; +}; + &sdmmc1 { pinctrl-names = "default", "opendrain", "sleep"; pinctrl-0 = <&sdmmc1_b4_pins_a &sdmmc1_dir_pins_b>;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 262/800 bus: ti-sysc: Fix dispc quirk masking bool variables
In reply to Greg Kroah-HartmanFrom: Tony Lindgren <[email protected]>
[ Upstream commit f620596fa347170852da499e778a5736d79a4b79 ]
Fix warning drivers/bus/ti-sysc.c:1806 sysc_quirk_dispc()
warn: masking a bool.
While at it let's add a comment for what were doing to make the code a bit easier to follow.
--- drivers/bus/ti-sysc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/bus/ti-sysc.c +2 -2
@@ -1791,7 +1791,7 @@ static u32 sysc_quirk_dispc(struct sysc *ddata, int dispc_offset,if (!ddata->module_va)return -EIO ; -/* DISP_CONTROL */ +/* DISP_CONTROL, shut down lcd and digit on disable if enabled */ val =sysc_read (ddata, dispc_offset +0x40 ); lcd_en = val & lcd_en_mask; digit_en = val & digit_en_mask;
@@ -1803,7 +1803,7 @@ static u32 sysc_quirk_dispc(struct sysc *ddata, int dispc_offset,else irq_mask |=BIT (2 ) |BIT (3 );/* EVSYNC bits */ } -if (disable & (lcd_en | digit_en)) +if (disable && (lcd_en || digit_en))sysc_write (ddata, dispc_offset +0x40 , val & ~(lcd_en_mask | digit_en_mask));
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 263/800 arm64: dts: microchip: sparx5: do not use PSCI on reference boards
In reply to Greg Kroah-HartmanFrom: Robert Marko <[email protected]>
[ Upstream commit 70be83708c925b3f72c508e4756e48ad2330c830 ]
PSCI is not implemented on SparX-5 at all, there is no ATF and U-boot that is shipped does not implement it as well.
I have tried flashing the latest BSP 2022.12 U-boot which did not work. After contacting Microchip, they confirmed that there is no ATF for the SoC nor PSCI implementation which is unfortunate in 2023.
So, disable PSCI as otherwise kernel crashes as soon as it tries probing PSCI with, and the crash is only visible if earlycon is used.
Since PSCI is not implemented, switch core bringup to use spin-tables which are implemented in the vendor U-boot and actually work.
Tested on PCB134 with eMMC (VSC5640EV).
--- arch/arm64/boot/dts/microchip/sparx5.dtsi | 2 +- arch/arm64/boot/dts/microchip/sparx5_pcb_common.dtsi | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/microchip/sparx5.dtsi +1 -1
@@ -61,7 +61,7 @@ arm-pmu { interrupt-affinity = <&cpu0>, <&cpu1>; }; - psci { + psci: psci { compatible = "arm,psci-0.2"; method = "smc"; };
arch/arm64/boot/dts/microchip/sparx5_pcb_common.dtsi +12 -0
@@ -6,6 +6,18 @@ /dts-v1/; #include "sparx5.dtsi" +&psci { + status = "disabled"; +}; + +&cpu0 { + enable-method = "spin-table"; +}; + +&cpu1 { + enable-method = "spin-table"; +}; + &uart0 { status = "okay"; };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 264/800 drm/bridge: tc358767: Switch to devm MIPI-DSI helpers
In reply to Greg Kroah-HartmanFrom: Alexander Stein <[email protected]>
[ Upstream commit f47d6140b7a4c858d82d263e7577ff6fb5279a9c ]
DSI device registering and attaching needs to be undone upon deregistration. This fixes module unload/load.
--- drivers/gpu/drm/bridge/tc358767.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/bridge/tc358767.c +2 -2
@@ -1890,7 +1890,7 @@ static int tc_mipi_dsi_host_attach(struct tc_data *tc)if (dsi_lanes <0 )return dsi_lanes; - dsi =mipi_dsi_device_register_full (host, &info); + dsi =devm_mipi_dsi_device_register_full (dev, host, &info);if (IS_ERR (dsi))return dev_err_probe (dev,PTR_ERR (dsi),"failed to create dsi device\n" );
@@ -1901,7 +1901,7 @@ static int tc_mipi_dsi_host_attach(struct tc_data *tc) dsi->mode_flags =MIPI_DSI_MODE_VIDEO |MIPI_DSI_MODE_VIDEO_BURST |MIPI_DSI_MODE_LPM |MIPI_DSI_CLOCK_NON_CONTINUOUS ; - ret =mipi_dsi_attach (dsi); + ret =devm_mipi_dsi_attach (dev, dsi);if (ret <0 ) {dev_err (dev,"failed to attach dsi to host: %d\n" , ret);return ret;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 265/800 arm64: dts: qcom: ipq9574: Update the size of GICC & GICV regions
In reply to Greg Kroah-HartmanFrom: Devi Priya <[email protected]>
[ Upstream commit 6fb45762691d12d9812c41d20b2f5db1412047ae ]
Update the size of GICC and GICV regions to 8kB as the GICC_DIR & GICV_DIR registers lie in the second 4kB region. Also, add target CPU encoding.
--- arch/arm64/boot/dts/qcom/ipq9574.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/qcom/ipq9574.dtsi +3 -3
@@ -173,14 +173,14 @@ blsp1_uart2: serial@78b1000 { intc: interrupt-controller@b000000 { compatible = "qcom,msm-qgic2"; reg = <0x0b000000 0x1000>, /* GICD */ - <0x0b002000 0x1000>, /* GICC */ + <0x0b002000 0x2000>, /* GICC */ <0x0b001000 0x1000>, /* GICH */ - <0x0b004000 0x1000>; /* GICV */ + <0x0b004000 0x2000>; /* GICV */ #address-cells = <1>; #size-cells = <1>; interrupt-controller; #interrupt-cells = <3>; - interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>; ranges = <0 0x0b00c000 0x3000>; v2m0: v2m@0 {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 266/800 clk: imx: scu: use _safe list iterator to avoid a use after free
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 632c60ecd25dbacee54d5581fe3aeb834b57010a ]
This loop is freeing "clk" so it needs to use list_for_each_entry_safe(). Otherwise it dereferences a freed variable to get the next item on the loop.
--- drivers/clk/imx/clk-scu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/imx/clk-scu.c +2 -2
@@ -707,11 +707,11 @@ struct clk_hw *imx_clk_scu_alloc_dev(const char *name,void imx_clk_scu_unregister (void ) { -struct imx_scu_clk_node *clk; +struct imx_scu_clk_node *clk, *n;int i;for (i =0 ; i <IMX_SC_R_LAST ; i++) { -list_for_each_entry (clk, &imx_scu_clks[i], node) { +list_for_each_entry_safe (clk, n, &imx_scu_clks[i], node) {clk_hw_unregister (clk->hw);kfree (clk); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 267/800 hwmon: (f71882fg) prevent possible division by zero
In reply to Greg Kroah-HartmanFrom: Nikita Zhandarovich <[email protected]>
[ Upstream commit 0babf89c9cca7e074d6e59893e462e4886f481cc ]
In the unlikely event that something goes wrong with the device and its registers, the fan_from_reg() function may return 0. This value will cause a division-by-zero error in the show_pwm() function.
To prevent this, test the value of fan_from_reg(data->fan_full_speed[nr]) against 0 before performing the division. If the division-by-zero error is avoided, assign 0 to the val variable.
Found by Linux Verification Center (linuxtesting.org) with static analysis tool SVACE.
--- drivers/hwmon/f71882fg.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/hwmon/f71882fg.c +5 -2
@@ -1096,8 +1096,11 @@ static ssize_t show_pwm(struct device *dev, val = data->pwm[nr]; else {/* RPM mode */ - val =255 *fan_from_reg (data->fan_target[nr]) - /fan_from_reg (data->fan_full_speed[nr]); +if (fan_from_reg (data->fan_full_speed[nr])) + val =255 *fan_from_reg (data->fan_target[nr]) + /fan_from_reg (data->fan_full_speed[nr]); +else + val =0 ; }mutex_unlock (&data->update_lock);return sprintf (buf,"%d\n" , val);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 268/800 RDMA/bnxt_re: Disable/kill tasklet only if it is enabled
In reply to Greg Kroah-HartmanFrom: Selvin Xavier <[email protected]>
[ Upstream commit ab112ee7899d6171da5acd77a7ed7ae103f488de ]
When the ulp hook to start the IRQ fails because the rings are not available, tasklets are not enabled. In this case when the driver is unloaded, driver calls CREQ tasklet_kill. This causes an indefinite hang as the tasklet is not enabled.
Driver shouldn't call tasklet_kill if it is not enabled. So using the creq->requested and nq->requested flags to identify if both tasklets/irqs are registered. Checking this flag while scheduling the tasklet from ISR. Also, added a cleanup for disabling tasklet, in case request_irq fails during start_irq.
Check for return value for bnxt_qplib_rcfw_start_irq and in case the bnxt_qplib_rcfw_start_irq fails, return bnxt_re_start_irq without attempting to start NQ IRQs.
--- drivers/infiniband/hw/bnxt_re/main.c | 12 +++++++++--- drivers/infiniband/hw/bnxt_re/qplib_fp.c | 16 ++++++++++------ drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 14 +++++++++----- 3 files changed, 28 insertions(+), 14 deletions(-)
drivers/infiniband/hw/bnxt_re/main.c +9 -3
@@ -283,15 +283,21 @@ static void bnxt_re_start_irq(void *handle, struct bnxt_msix_entry *ent)for (indx =0 ; indx < rdev->num_msix; indx++) rdev->en_dev->msix_entries[indx].vector = ent[indx].vector; -bnxt_qplib_rcfw_start_irq (rcfw, msix_ent[BNXT_RE_AEQ_IDX ].vector, - false); + rc =bnxt_qplib_rcfw_start_irq (rcfw, msix_ent[BNXT_RE_AEQ_IDX ].vector, + false); +if (rc) { +ibdev_warn (&rdev->ibdev,"Failed to reinit CREQ\n" ); +return ; + }for (indx =BNXT_RE_NQ_IDX ; indx < rdev->num_msix; indx++) { nq = &rdev->nq[indx -1 ]; rc =bnxt_qplib_nq_start_irq (nq, indx -1 , msix_ent[indx].vector, false); -if (rc) +if (rc) {ibdev_warn (&rdev->ibdev,"Failed to reinit NQ index %d\n" , indx -1 ); +return ; + } } }
drivers/infiniband/hw/bnxt_re/qplib_fp.c +10 -6
@@ -399,6 +399,9 @@ static irqreturn_t bnxt_qplib_nq_irq(int irq, void *dev_instance)void bnxt_qplib_nq_stop_irq (struct bnxt_qplib_nq *nq,bool kill) { +if (!nq->requested) +return ; +tasklet_disable (&nq->nq_tasklet);/* Mask h/w interrupt */ bnxt_qplib_ring_nq_db (&nq->nq_db.dbinfo, nq->res->cctx, false);
@@ -406,11 +409,10 @@ void bnxt_qplib_nq_stop_irq(struct bnxt_qplib_nq *nq, bool kill)synchronize_irq (nq->msix_vec);if (kill)tasklet_kill (&nq->nq_tasklet); -if (nq->requested) { -irq_set_affinity_hint (nq->msix_vec,NULL ); -free_irq (nq->msix_vec, nq); - nq->requested = false; - } + +irq_set_affinity_hint (nq->msix_vec,NULL ); +free_irq (nq->msix_vec, nq); + nq->requested = false; }void bnxt_qplib_disable_nq (struct bnxt_qplib_nq *nq)
@@ -449,8 +451,10 @@ int bnxt_qplib_nq_start_irq(struct bnxt_qplib_nq *nq, int nq_indx,snprintf (nq->name,sizeof (nq->name),"bnxt_qplib_nq-%d" , nq_indx); rc =request_irq (nq->msix_vec, bnxt_qplib_nq_irq,0 , nq->name, nq); -if (rc) +if (rc) { +tasklet_disable (&nq->nq_tasklet);return rc; + }cpumask_clear (&nq->mask);cpumask_set_cpu (nq_indx, &nq->mask);
drivers/infiniband/hw/bnxt_re/qplib_rcfw.c +9 -5
@@ -636,6 +636,10 @@ void bnxt_qplib_rcfw_stop_irq(struct bnxt_qplib_rcfw *rcfw, bool kill)struct bnxt_qplib_creq_ctx *creq; creq = &rcfw->creq; + +if (!creq->requested) +return ; +tasklet_disable (&creq->creq_tasklet);/* Mask h/w interrupts */ bnxt_qplib_ring_nq_db (&creq->creq_db.dbinfo, rcfw->res->cctx, false);
@@ -644,10 +648,8 @@ void bnxt_qplib_rcfw_stop_irq(struct bnxt_qplib_rcfw *rcfw, bool kill)if (kill)tasklet_kill (&creq->creq_tasklet); -if (creq->requested) { -free_irq (creq->msix_vec, rcfw); - creq->requested = false; - } +free_irq (creq->msix_vec, rcfw); + creq->requested = false; }void bnxt_qplib_disable_rcfw_channel (struct bnxt_qplib_rcfw *rcfw)
@@ -693,8 +695,10 @@ int bnxt_qplib_rcfw_start_irq(struct bnxt_qplib_rcfw *rcfw, int msix_vector,tasklet_enable (&creq->creq_tasklet); rc =request_irq (creq->msix_vec, bnxt_qplib_creq_irq,0 ,"bnxt_qplib_creq" , rcfw); -if (rc) +if (rc) { +tasklet_disable (&creq->creq_tasklet);return rc; + } creq->requested = true;bnxt_qplib_ring_nq_db (&creq->creq_db.dbinfo, rcfw->res->cctx, true);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 269/800 RDMA/bnxt_re: Fix to remove unnecessary return labels
In reply to Greg Kroah-HartmanFrom: Kalesh AP <[email protected]>
[ Upstream commit 9b3ee47796f529e5bc31a355d6cb756d68a7079a ]
If there is no cleanup needed then just return directly. This cleans up the code and improve readability.
--- drivers/infiniband/hw/bnxt_re/qplib_fp.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/infiniband/hw/bnxt_re/qplib_fp.c +2 -5
@@ -1618,7 +1618,7 @@ static int bnxt_qplib_put_inline(struct bnxt_qplib_qp *qp, il_src = (void *)wqe->sg_list[indx].addr; t_len += len;if (t_len > qp->max_inline_data) - goto bad; +return -ENOMEM ;while (len) {if (pull_dst) { pull_dst = false;
@@ -1642,8 +1642,6 @@ static int bnxt_qplib_put_inline(struct bnxt_qplib_qp *qp, }return t_len; -bad: -return -ENOMEM ; } static u32 bnxt_qplib_put_sges(struct bnxt_qplib_hwq *hwq,
@@ -2073,7 +2071,7 @@ int bnxt_qplib_create_cq(struct bnxt_qplib_res *res, struct bnxt_qplib_cq *cq) hwq_attr.sginfo = &cq->sg_info; rc =bnxt_qplib_alloc_init_hwq (&cq->hwq, &hwq_attr);if (rc) - goto exit; +return rc; bnxt_qplib_rcfw_cmd_prep((struct cmdq_base *)&req, CMDQ_BASE_OPCODE_CREATE_CQ,
@@ -2116,7 +2114,6 @@ int bnxt_qplib_create_cq(struct bnxt_qplib_res *res, struct bnxt_qplib_cq *cq) fail:bnxt_qplib_free_hwq (res, &cq->hwq); -exit:return rc; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 270/800 RDMA/bnxt_re: Use unique names while registering interrupts
In reply to Greg Kroah-HartmanFrom: Kalesh AP <[email protected]>
[ Upstream commit ff2e4bfd162cf66a112a81509e419805add44d64 ]
bnxt_re currently uses the names "bnxt_qplib_creq" and "bnxt_qplib_nq-0" while registering IRQs. There is no way to distinguish the IRQs of different device ports when there are multiple IB devices registered. This could make the scenarios worse where one want to pin IRQs of a device port to certain CPUs.
Fixed the code to use unique names which has PCI BDF information while registering interrupts like: "bnxt_re-nq-0@pci:0000:65:00.0" and "bnxt_re-creq@pci:0000:65:00.1".
--- drivers/infiniband/hw/bnxt_re/qplib_fp.c | 12 ++++++++++-- drivers/infiniband/hw/bnxt_re/qplib_fp.h | 2 +- drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 15 +++++++++++++-- drivers/infiniband/hw/bnxt_re/qplib_rcfw.h | 1 + 4 files changed, 25 insertions(+), 5 deletions(-)
drivers/infiniband/hw/bnxt_re/qplib_fp.c +10 -2
@@ -412,6 +412,8 @@ void bnxt_qplib_nq_stop_irq(struct bnxt_qplib_nq *nq, bool kill)irq_set_affinity_hint (nq->msix_vec,NULL );free_irq (nq->msix_vec, nq); +kfree (nq->name); + nq->name =NULL ; nq->requested = false; }
@@ -438,6 +440,7 @@ void bnxt_qplib_disable_nq(struct bnxt_qplib_nq *nq)int bnxt_qplib_nq_start_irq (struct bnxt_qplib_nq *nq,int nq_indx,int msix_vector,bool need_init) { +struct bnxt_qplib_res *res = nq->res;int rc;if (nq->requested)
@@ -449,9 +452,14 @@ int bnxt_qplib_nq_start_irq(struct bnxt_qplib_nq *nq, int nq_indx,else tasklet_enable (&nq->nq_tasklet); -snprintf (nq->name,sizeof (nq->name),"bnxt_qplib_nq-%d" , nq_indx); + nq->name =kasprintf (GFP_KERNEL ,"bnxt_re-nq-%d@pci:%s" , + nq_indx,pci_name (res->pdev)); +if (!nq->name) +return -ENOMEM ; rc =request_irq (nq->msix_vec, bnxt_qplib_nq_irq,0 , nq->name, nq);if (rc) { +kfree (nq->name); + nq->name =NULL ;tasklet_disable (&nq->nq_tasklet);return rc; }
@@ -465,7 +473,7 @@ int bnxt_qplib_nq_start_irq(struct bnxt_qplib_nq *nq, int nq_indx, nq->msix_vec, nq_indx); } nq->requested = true; -bnxt_qplib_ring_nq_db (&nq->nq_db.dbinfo, nq->res->cctx, true); +bnxt_qplib_ring_nq_db (&nq->nq_db.dbinfo, res->cctx, true);return rc; }
drivers/infiniband/hw/bnxt_re/qplib_fp.h +1 -1
@@ -472,7 +472,7 @@ typedef int (*srqn_handler_t)(struct bnxt_qplib_nq *nq,struct bnxt_qplib_nq {struct pci_dev *pdev;struct bnxt_qplib_res *res; -char name[32 ]; +char *name;struct bnxt_qplib_hwq hwq;struct bnxt_qplib_nq_db nq_db;u16 ring_id;
drivers/infiniband/hw/bnxt_re/qplib_rcfw.c +13 -2
@@ -649,6 +649,8 @@ void bnxt_qplib_rcfw_stop_irq(struct bnxt_qplib_rcfw *rcfw, bool kill)tasklet_kill (&creq->creq_tasklet);free_irq (creq->msix_vec, rcfw); +kfree (creq->irq_name); + creq->irq_name =NULL ; creq->requested = false; }
@@ -681,9 +683,11 @@ int bnxt_qplib_rcfw_start_irq(struct bnxt_qplib_rcfw *rcfw, int msix_vector, bool need_init) {struct bnxt_qplib_creq_ctx *creq; +struct bnxt_qplib_res *res;int rc; creq = &rcfw->creq; + res = rcfw->res;if (creq->requested)return -EFAULT ;
@@ -693,15 +697,22 @@ int bnxt_qplib_rcfw_start_irq(struct bnxt_qplib_rcfw *rcfw, int msix_vector,tasklet_setup (&creq->creq_tasklet, bnxt_qplib_service_creq); else tasklet_enable(&creq->creq_tasklet); + + creq->irq_name =kasprintf (GFP_KERNEL ,"bnxt_re-creq@pci:%s" , +pci_name (res->pdev)); +if (!creq->irq_name) +return -ENOMEM ; rc =request_irq (creq->msix_vec, bnxt_qplib_creq_irq,0 , -"bnxt_qplib_creq" , rcfw); + creq->irq_name, rcfw);if (rc) { +kfree (creq->irq_name); + creq->irq_name =NULL ;tasklet_disable (&creq->creq_tasklet);return rc; } creq->requested = true; -bnxt_qplib_ring_nq_db (&creq->creq_db.dbinfo, rcfw->res->cctx, true); +bnxt_qplib_ring_nq_db (&creq->creq_db.dbinfo, res->cctx, true);return 0 ; }
drivers/infiniband/hw/bnxt_re/qplib_rcfw.h +1 -0
@@ -186,6 +186,7 @@ struct bnxt_qplib_creq_ctx {u16 ring_id;int msix_vec;bool requested;/*irq handler installed */ +char *irq_name; };/* RCFW Communication Channels */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 271/800 RDMA/bnxt_re: Remove a redundant check inside bnxt_re_update_gid
In reply to Greg Kroah-HartmanFrom: Kalesh AP <[email protected]>
[ Upstream commit b989f90cef0af48aa5679b6a75476371705ec53c ]
The NULL check inside bnxt_re_update_gid() always return false. If sgid_tbl->tbl is not allocated, then dev_init would have failed.
--- drivers/infiniband/hw/bnxt_re/main.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/infiniband/hw/bnxt_re/main.c +1 -7
@@ -969,12 +969,6 @@ static int bnxt_re_update_gid(struct bnxt_re_dev *rdev)if (!ib_device_try_get (&rdev->ibdev))return 0 ; -if (!sgid_tbl) { -ibdev_err (&rdev->ibdev,"QPLIB: SGID table not allocated" ); - rc = -EINVAL ; - goto out; - } -for (index =0 ; index < sgid_tbl->active; index++) { gid_idx = sgid_tbl->hw_id[index];
@@ -992,7 +986,7 @@ static int bnxt_re_update_gid(struct bnxt_re_dev *rdev) rc =bnxt_qplib_update_sgid (sgid_tbl, &gid, gid_idx, rdev->qplib_res.netdev->dev_addr); } -out: +ib_device_put (&rdev->ibdev);return rc; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 272/800 RDMA/bnxt_re: Fix to remove an unnecessary log
In reply to Greg Kroah-HartmanFrom: Kalesh AP <[email protected]>
[ Upstream commit 43774bc156614346fe5dacabc8e8c229167f2536 ]
During destroy_qp, driver sets the qp handle in the existing CQEs belonging to the QP being destroyed to NULL. As a result, a poll_cq after destroy_qp can report unnecessary messages. Remove this noise from system logs.
--- drivers/infiniband/hw/bnxt_re/qplib_fp.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/infiniband/hw/bnxt_re/qplib_fp.c +1 -4
@@ -2799,11 +2799,8 @@ static int bnxt_qplib_cq_process_terminal(struct bnxt_qplib_cq *cq, qp = (struct bnxt_qplib_qp *)((unsigned long )le64_to_cpu (hwcqe->qp_handle)); -if (!qp) { -dev_err (&cq->hwq.pdev->dev, -"FP: CQ Process terminal qp is NULL\n" ); +if (!qp)return -EINVAL ; - }/* Must block new posting of SQ and RQ */ qp->state =CMDQ_MODIFY_QP_NEW_STATE_ERR ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 273/800 drm/msm/dpu: enable DSPP_2/3 for LM_2/3 on sm8450
In reply to Greg Kroah-HartmanFrom: Dmitry Baryshkov <[email protected]>
[ Upstream commit 800d28a4988d842d11e95d3dea491520ebf4991d ]
Mark DSPP_2 and DSPP_3 as used for LM_2 and LM_3
Patchwork: https://patchwork.freedesktop.org/patch/531491/
--- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h +2 -2
@@ -107,9 +107,9 @@ static const struct dpu_lm_cfg sm8450_lm[] = {LM_BLK ("lm_1" ,LM_1 ,0x45000 ,MIXER_SDM845_MASK , &sdm845_lm_sblk,PINGPONG_1 ,LM_0 ,DSPP_1 ),LM_BLK ("lm_2" ,LM_2 ,0x46000 ,MIXER_SDM845_MASK , - &sdm845_lm_sblk,PINGPONG_2 ,LM_3 ,0 ), + &sdm845_lm_sblk,PINGPONG_2 ,LM_3 ,DSPP_2 ),LM_BLK ("lm_3" ,LM_3 ,0x47000 ,MIXER_SDM845_MASK , - &sdm845_lm_sblk,PINGPONG_3 ,LM_2 ,0 ), + &sdm845_lm_sblk,PINGPONG_3 ,LM_2 ,DSPP_3 ),LM_BLK ("lm_4" ,LM_4 ,0x48000 ,MIXER_SDM845_MASK , &sdm845_lm_sblk,PINGPONG_4 ,LM_5 ,0 ), LM_BLK("lm_5", LM_5, 0x49000, MIXER_SDM845_MASK,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 274/800 drm/msm/dsi: dont allow enabling 14nm VCO with unprogrammed rate
In reply to Greg Kroah-HartmanFrom: Dmitry Baryshkov <[email protected]>
[ Upstream commit 1e0a97f84d73ea1182740f62069690c7f3271abb ]
If the dispcc uses CLK_OPS_PARENT_ENABLE (e.g. on QCM2290), CCF can try enabling VCO before the rate has been programmed. This can cause clock lockups and/or other boot issues. Program the VCO to the minimal PLL rate if the read rate is 0 Hz.
Patchwork: https://patchwork.freedesktop.org/patch/534813/
--- drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c +3 -0
@@ -539,6 +539,9 @@ static int dsi_pll_14nm_vco_prepare(struct clk_hw *hw)if (unlikely (pll_14nm->phy->pll_on))return 0 ; +if (dsi_pll_14nm_vco_recalc_rate (hw,VCO_REF_CLK_RATE ) ==0 ) +dsi_pll_14nm_vco_set_rate (hw, pll_14nm->phy->cfg->min_pll_rate,VCO_REF_CLK_RATE ); +dsi_phy_write (base + REG_DSI_14nm_PHY_PLL_VREF_CFG1,0x10 );dsi_phy_write (cmn_base + REG_DSI_14nm_PHY_CMN_PLL_CNTRL,1 );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 275/800 drm/msm/dpu: fix cursor block register bit offset in msm8998 hw catalog
In reply to Greg Kroah-HartmanFrom: Arnaud Vrac <[email protected]>
[ Upstream commit c95771905c494aa5c2abbb56b3e2f7d4aa3b34f9 ]
This matches the value for both fbdev and sde implementations in the downstream msm-4.4 repository.
Patchwork: https://patchwork.freedesktop.org/patch/532899/
--- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h +2 -2
@@ -39,8 +39,8 @@ static const struct dpu_mdp_cfg msm8998_mdp[] = { .clk_ctrls[DPU_CLK_CTRL_DMA1] = { .reg_off = 0x2b4, .bit_off = 8 }, .clk_ctrls[DPU_CLK_CTRL_DMA2] = { .reg_off = 0x2c4, .bit_off = 8 }, .clk_ctrls[DPU_CLK_CTRL_DMA3] = { .reg_off = 0x2c4, .bit_off = 12 }, - .clk_ctrls[DPU_CLK_CTRL_CURSOR0] = { .reg_off = 0x3a8, .bit_off = 15 }, - .clk_ctrls[DPU_CLK_CTRL_CURSOR1] = { .reg_off = 0x3b0, .bit_off = 15 }, + .clk_ctrls[DPU_CLK_CTRL_CURSOR0] = { .reg_off = 0x3a8, .bit_off = 16 }, + .clk_ctrls[DPU_CLK_CTRL_CURSOR1] = { .reg_off = 0x3b0, .bit_off = 16 }, }, };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 276/800 drm/msm/dpu: Use V4.0 PCC DSPP sub-block in SC7[12]80
In reply to Greg Kroah-HartmanFrom: Marijn Suijten <[email protected]>
[ Upstream commit 853b292b92d50d1b30628c92229e93d670304e51 ]
According to various downstream sources the PCC sub-block inside DSPP is version 4.0 since DPU 4.0 and higher, including SC7[12]80 at DPU version 6.2 and 7.2 respectively. After correcting the version this struct becomes identical to sm8150_dspp_sblk which is used all across the
catalog: replace uses of sc7180_dspp_sblk with that and remove the struct definition for sc7180_dspp_sblk entirely.
Patchwork: https://patchwork.freedesktop.org/patch/537899/
--- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h | 2 +- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 2 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 5 ----- 3 files changed, 2 insertions(+), 7 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h +1 -1
@@ -76,7 +76,7 @@ static const struct dpu_lm_cfg sc7180_lm[] = {static const struct dpu_dspp_cfg sc7180_dspp[] = {DSPP_BLK ("dspp_0" ,DSPP_0 ,0x54000 ,DSPP_SC7180_MASK , - &sc7180_dspp_sblk), + &sm8150_dspp_sblk), };static const struct dpu_pingpong_cfg sc7180_pp[] = {
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h +1 -1
@@ -83,7 +83,7 @@ static const struct dpu_lm_cfg sc7280_lm[] = {static const struct dpu_dspp_cfg sc7280_dspp[] = {DSPP_BLK ("dspp_0" ,DSPP_0 ,0x54000 ,DSPP_SC7180_MASK , - &sc7180_dspp_sblk), + &sm8150_dspp_sblk), };static const struct dpu_pingpong_cfg sc7280_pp[] = {
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +0 -5
@@ -453,11 +453,6 @@ static const struct dpu_dspp_sub_blks msm8998_dspp_sblk = { .len = 0x90, .version = 0x10007}, }; -static const struct dpu_dspp_sub_blks sc7180_dspp_sblk = { - .pcc = {.id =DPU_DSPP_PCC , .base =0x1700 , - .len =0x90 , .version =0x10000 }, -}; -static const struct dpu_dspp_sub_blks sm8150_dspp_sblk = { .pcc = {.id =DPU_DSPP_PCC , .base =0x1700 , .len = 0x90, .version = 0x40000},
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 277/800 drm/msm/dpu: Set DPU_DATA_HCTL_EN for in INTF_SC7180_MASK
In reply to Greg Kroah-HartmanFrom: Konrad Dybcio <[email protected]>
[ Upstream commit a7129231edf329a00e92dbd2d741f6da728a4a06 ]
DPU5 and newer targets enable this unconditionally. Move it from the SC7280 mask to the SC7180 one.
Patchwork: https://patchwork.freedesktop.org/patch/538159/
--- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +5 -2
@@ -98,9 +98,12 @@#define INTF_SDM845_MASK (0)#define INTF_SC7180_MASK \ - (BIT(DPU_INTF_INPUT_CTRL) | BIT(DPU_INTF_TE) | BIT(DPU_INTF_STATUS_SUPPORTED)) + (BIT(DPU_INTF_INPUT_CTRL) | \ + BIT(DPU_INTF_TE) | \ + BIT(DPU_INTF_STATUS_SUPPORTED) | \ + BIT(DPU_DATA_HCTL_EN)) -#define INTF_SC7280_MASK INTF_SC7180_MASK | BIT(DPU_DATA_HCTL_EN) +#define INTF_SC7280_MASK (INTF_SC7180_MASK)#define WB_SM8250_MASK (BIT(DPU_WB_LINE_MODE) | \ BIT(DPU_WB_UBWC) | \
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 278/800 drm/nouveau: dispnv50: fix missing-prototypes warning
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 504e72ed3a1b1c0d4450712a42ae6070d3a05a8e ]
nv50_display_create() is declared in another header, along with a couple of declarations that are now outdated:
drivers/gpu/drm/nouveau/dispnv50/disp.c:2517:1: error: no previous prototype for 'nv50_display_create'
--- drivers/gpu/drm/nouveau/dispnv50/disp.c | 1 + drivers/gpu/drm/nouveau/nv50_display.h | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-)
drivers/gpu/drm/nouveau/dispnv50/disp.c +1 -0
@@ -64,6 +64,7 @@#include "nouveau_connector.h" #include "nouveau_encoder.h" #include "nouveau_fence.h" +#include "nv50_display.h" #include <subdev/bios/dp.h>
drivers/gpu/drm/nouveau/nv50_display.h +1 -3
@@ -31,7 +31,5 @@#include "nouveau_reg.h" int nv50_display_create (struct drm_device *); -void nv50_display_destroy (struct drm_device *); -int nv50_display_init (struct drm_device *); -void nv50_display_fini (struct drm_device *); +#endif /* __NV50_DISPLAY_H__ */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 279/800 iommu/virtio: Detach domain on endpoint release
In reply to Greg Kroah-HartmanFrom: Jean-Philippe Brucker <[email protected]>
[ Upstream commit 809d0810e3520da669d231303608cdf5fe5c1a70 ]
When an endpoint is released, for example a PCIe VF being destroyed or a function hot-unplugged, it should be detached from its domain. Send a DETACH request.
--- drivers/iommu/virtio-iommu.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)
drivers/iommu/virtio-iommu.c +24 -0
@@ -788,6 +788,29 @@ static int viommu_attach_dev(struct iommu_domain *domain, struct device *dev)return 0 ; } +static void viommu_detach_dev (struct viommu_endpoint *vdev) +{ +int i; +struct virtio_iommu_req_detach req; +struct viommu_domain *vdomain = vdev->vdomain; +struct iommu_fwspec *fwspec =dev_iommu_fwspec_get (vdev->dev); + +if (!vdomain) +return ; + + req = (struct virtio_iommu_req_detach ) { + .head.type =VIRTIO_IOMMU_T_DETACH , + .domain =cpu_to_le32 (vdomain->id), + }; + +for (i =0 ; i < fwspec->num_ids; i++) { + req.endpoint =cpu_to_le32 (fwspec->ids[i]); +WARN_ON (viommu_send_req_sync (vdev->viommu, &req,sizeof (req))); + } + vdomain->nr_endpoints--; + vdev->vdomain =NULL ; +} +static int viommu_map_pages (struct iommu_domain *domain,unsigned long iova,phys_addr_t paddr,size_t pgsize,size_t pgcount,int prot,gfp_t gfp,size_t *mapped)
@@ -990,6 +1013,7 @@ static void viommu_release_device(struct device *dev) {struct viommu_endpoint *vdev =dev_iommu_priv_get (dev); +viommu_detach_dev (vdev);iommu_put_resv_regions (dev, &vdev->resv_regions);kfree (vdev); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 280/800 iommu/virtio: Return size mapped for a detached domain
In reply to Greg Kroah-HartmanFrom: Jean-Philippe Brucker <[email protected]>
[ Upstream commit 7061b6af34686e7e2364b7240cfb061293218f2d ]
When map() is called on a detached domain, the domain does not exist in the device so we do not send a MAP request, but we do update the internal mapping tree, to be replayed on the next attach. Since this constitutes a successful iommu_map() call, return *mapped in this case too.
--- drivers/iommu/virtio-iommu.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-)
drivers/iommu/virtio-iommu.c +17 -16
@@ -833,25 +833,26 @@ static int viommu_map_pages(struct iommu_domain *domain, unsigned long iova,if (ret)return ret; - map = (struct virtio_iommu_req_map ) { - .head.type =VIRTIO_IOMMU_T_MAP , - .domain =cpu_to_le32 (vdomain->id), - .virt_start =cpu_to_le64 (iova), - .phys_start =cpu_to_le64 (paddr), - .virt_end =cpu_to_le64 (end), - .flags =cpu_to_le32 (flags), - }; - -if (!vdomain->nr_endpoints) -return 0 ; +if (vdomain->nr_endpoints) { + map = (struct virtio_iommu_req_map ) { + .head.type =VIRTIO_IOMMU_T_MAP , + .domain =cpu_to_le32 (vdomain->id), + .virt_start =cpu_to_le64 (iova), + .phys_start =cpu_to_le64 (paddr), + .virt_end =cpu_to_le64 (end), + .flags =cpu_to_le32 (flags), + }; - ret =viommu_send_req_sync (vdomain->viommu, &map,sizeof (map)); -if (ret) -viommu_del_mappings (vdomain, iova, end); -else if (mapped) + ret =viommu_send_req_sync (vdomain->viommu, &map,sizeof (map)); +if (ret) { +viommu_del_mappings (vdomain, iova, end); +return ret; + } + } +if (mapped) *mapped = size; -return ret; +return 0 ; } static size_t viommu_unmap_pages(struct iommu_domain *domain, unsigned long iova,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 281/800 clk: renesas: rzg2l: Fix CPG_SIPLL5_CLK1 register write
In reply to Greg Kroah-HartmanFrom: Biju Das <[email protected]>
[ Upstream commit d1c20885d3b01e6a62e920af4b227abd294d22f3 ]
As per the RZ/G2L HW(Rev.1.30 May2023) manual, there are no "write enable" bits in the CPG_SIPLL5_CLK1 register. So fix the CPG_SIPLL5_CLK register write by removing the "write enable" bits.
--- drivers/clk/renesas/rzg2l-cpg.c | 6 ++---- drivers/clk/renesas/rzg2l-cpg.h | 3 --- 2 files changed, 2 insertions(+), 7 deletions(-)
drivers/clk/renesas/rzg2l-cpg.c +2 -4
@@ -603,10 +603,8 @@ static int rzg2l_cpg_sipll5_set_rate(struct clk_hw *hw, }/* Output clock setting 1 */ -writel (CPG_SIPLL5_CLK1_POSTDIV1_WEN |CPG_SIPLL5_CLK1_POSTDIV2_WEN | -CPG_SIPLL5_CLK1_REFDIV_WEN | (params.pl5_postdiv1 <<0 ) | - (params.pl5_postdiv2 <<4 ) | (params.pl5_refdiv <<8 ), - priv->base +CPG_SIPLL5_CLK1 ); +writel ((params.pl5_postdiv1 <<0 ) | (params.pl5_postdiv2 <<4 ) | + (params.pl5_refdiv <<8 ), priv->base +CPG_SIPLL5_CLK1 );/* Output clock setting, SSCG modulation value setting 3 */ writel ((params.pl5_fracin <<8 ), priv->base +CPG_SIPLL5_CLK3 );
drivers/clk/renesas/rzg2l-cpg.h +0 -3
@@ -32,9 +32,6 @@#define CPG_SIPLL5_STBY_RESETB_WEN BIT(16)#define CPG_SIPLL5_STBY_SSCG_EN_WEN BIT(18)#define CPG_SIPLL5_STBY_DOWNSPREAD_WEN BIT(20) -#define CPG_SIPLL5_CLK1_POSTDIV1_WEN BIT(16) -#define CPG_SIPLL5_CLK1_POSTDIV2_WEN BIT(20) -#define CPG_SIPLL5_CLK1_REFDIV_WEN BIT(24)#define CPG_SIPLL5_CLK4_RESV_LSB (0xFF)#define CPG_SIPLL5_MON_PLL5_LOCK BIT(4)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 282/800 ARM: dts: gta04: Move model property out of pinctrl node
In reply to Greg Kroah-HartmanFrom: Tony Lindgren <[email protected]>
[ Upstream commit 4ffec92e70ac5097b9f67ec154065305b16a3b46 ]
The model property should be at the top level, let's move it out of the pinctrl node.
--- arch/arm/boot/dts/omap3-gta04a5one.dts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/arm/boot/dts/omap3-gta04a5one.dts +3 -1
@@ -5,9 +5,11 @@ #include "omap3-gta04a5.dts" -&omap3_pmx_core { +/ { model = "Goldelico GTA04A5/Letux 2804 with OneNAND"; +}; +&omap3_pmx_core { gpmc_pins: pinmux_gpmc_pins { pinctrl-single,pins = <
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 283/800 arm64: dts: qcom: qrb4210-rb2: Fix CD gpio for SDHC2
In reply to Greg Kroah-HartmanFrom: Bhupesh Sharma <[email protected]>
[ Upstream commit 14e6c47b628788a8c8634bc59b2dd50d68a74de3 ]
Card-Detect (CD) gpio for SDHC2 is an active GPIO line. Fix the same. This allows the uSD card to be properly detected on the board.
--- arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/qrb4210-rb2.dts +2 -1
@@ -199,7 +199,8 @@ &sdhc_1 { }; &sdhc_2 { - cd-gpios = <&tlmm 88 GPIO_ACTIVE_HIGH>; /* card detect gpio */ + cd-gpios = <&tlmm 88 GPIO_ACTIVE_LOW>; /* card detect gpio */ + vmmc-supply = <&vreg_l22a_2p96>; vqmmc-supply = <&vreg_l5a_2p96>; no-sdio;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 284/800 drm/bridge: anx7625: Prevent endless probe loop
In reply to Greg Kroah-HartmanFrom: Nícolas F. R. A. Prado <[email protected]>
[ Upstream commit 1464e48d69ab7a50a377c9d39f5e5eb3cee2722e ]
During probe, the driver registers i2c dummy devices and populates the aux bus, which registers a device for the panel. After doing that, the driver can still defer probe if needed. This ordering of operations is troublesome however, because the deferred probe work will retry probing all pending devices every time a new device is registered. Therefore, if modules need to be loaded in order to satisfy the dependencies for this driver to complete probe, the kernel will stall, since it'll keep trying to probe the anx7625 driver, but never succeed, given that modules would only be loaded after the deferred probe work completes.
Two changes are required to avoid this issue:
* Move of_find_mipi_dsi_host_by_node(), which can defer probe, to before anx7625_register_i2c_dummy_clients() and devm_of_dp_aux_populate_ep_devices(), which register devices.
* Make use of the done_probing callback when populating the aux bus, so that the bridge registration is only done after the panel is probed. This is required because the panel might need to defer probe, but the aux bus population needs the i2c dummy devices working, so this call couldn't just be moved to an earlier point in probe. One caveat is that if the panel is described outside the aux bus, the probe loop issue can still happen, but we don't have a way to avoid it in that case since there's no callback available.
With this patch applied, it's possible to boot on
mt8192-asurada-spherion with
CONFIG_DRM_ANALOGIX_ANX7625=yCONFIG_MTK_MMSYS=mCONFIG_BACKLIGHT_PWM=y
and also with
CONFIG_DRM_ANALOGIX_ANX7625=yCONFIG_MTK_MMSYS=yCONFIG_BACKLIGHT_PWM=m
--- drivers/gpu/drm/bridge/analogix/anx7625.c | 128 +++++++++++++++------- 1 file changed, 88 insertions(+), 40 deletions(-)
drivers/gpu/drm/bridge/analogix/anx7625.c +88 -40
@@ -1687,6 +1687,14 @@ static int anx7625_parse_dt(struct device *dev,if (of_property_read_bool (np,"analogix,audio-enable" )) pdata->audio_en =1 ; +return 0 ; +} + +static int anx7625_parse_dt_panel (struct device *dev, +struct anx7625_platform_data *pdata) +{ +struct device_node *np = dev->of_node; + pdata->panel_bridge =devm_drm_of_get_bridge (dev, np,1 ,0 );if (IS_ERR (pdata->panel_bridge)) {if (PTR_ERR (pdata->panel_bridge) == -ENODEV ) {
@@ -2032,7 +2040,7 @@ static int anx7625_register_audio(struct device *dev, struct anx7625_data *ctx)return 0 ; } -static int anx7625_attach_dsi (struct anx7625_data *ctx) +static int anx7625_setup_dsi_device (struct anx7625_data *ctx) {struct mipi_dsi_device *dsi;struct device *dev = &ctx->client->dev;
@@ -2042,9 +2050,6 @@ static int anx7625_attach_dsi(struct anx7625_data *ctx) .channel = 0, .node = NULL, }; -int ret; - -DRM_DEV_DEBUG_DRIVER (dev,"attach dsi\n" ); host =of_find_mipi_dsi_host_by_node (ctx->pdata.mipi_host_node);if (!host) {
@@ -2065,14 +2070,24 @@ static int anx7625_attach_dsi(struct anx7625_data *ctx)MIPI_DSI_MODE_VIDEO_HSE |MIPI_DSI_HS_PKT_END_ALIGNED ; - ret =devm_mipi_dsi_attach (dev, dsi); + ctx->dsi = dsi; + +return 0 ; +} + +static int anx7625_attach_dsi (struct anx7625_data *ctx) +{ +struct device *dev = &ctx->client->dev; +int ret; + +DRM_DEV_DEBUG_DRIVER (dev,"attach dsi\n" ); + + ret =devm_mipi_dsi_attach (dev, ctx->dsi);if (ret) {DRM_DEV_ERROR (dev,"fail to attach dsi to host.\n" );return ret; } - ctx->dsi = dsi; -DRM_DEV_DEBUG_DRIVER (dev,"attach dsi succeeded.\n" );return 0 ;
@@ -2560,6 +2575,40 @@ static void anx7625_runtime_disable(void *data)pm_runtime_disable (data); } +static int anx7625_link_bridge (struct drm_dp_aux *aux) +{ + struct anx7625_data *platform = container_of(aux, struct anx7625_data, aux); +struct device *dev = aux->dev; +int ret; + + ret =anx7625_parse_dt_panel (dev, &platform->pdata); +if (ret) { +DRM_DEV_ERROR (dev,"fail to parse DT for panel : %d\n" , ret); +return ret; + } + + platform->bridge.funcs = &anx7625_bridge_funcs; + platform->bridge.of_node = dev->of_node; +if (!anx7625_of_panel_on_aux_bus (dev)) + platform->bridge.ops |=DRM_BRIDGE_OP_EDID ; +if (!platform->pdata.panel_bridge) + platform->bridge.ops |=DRM_BRIDGE_OP_HPD | +DRM_BRIDGE_OP_DETECT ; + platform->bridge.type = platform->pdata.panel_bridge ? + DRM_MODE_CONNECTOR_eDP : + DRM_MODE_CONNECTOR_DisplayPort; + +drm_bridge_add (&platform->bridge); + +if (!platform->pdata.is_dpi) { + ret =anx7625_attach_dsi (platform); +if (ret) +drm_bridge_remove (&platform->bridge); + } + +return ret; +} +static int anx7625_i2c_probe (struct i2c_client *client) {struct anx7625_data *platform;
@@ -2634,6 +2683,24 @@ static int anx7625_i2c_probe(struct i2c_client *client) platform->aux.wait_hpd_asserted = anx7625_wait_hpd_asserted;drm_dp_aux_init (&platform->aux); + ret =anx7625_parse_dt (dev, pdata); +if (ret) { +if (ret != -EPROBE_DEFER ) +DRM_DEV_ERROR (dev,"fail to parse DT : %d\n" , ret); + goto free_wq; + } + +if (!platform->pdata.is_dpi) { + ret =anx7625_setup_dsi_device (platform); +if (ret <0 ) + goto free_wq; + } + +/* +* Registering the i2c devices will retrigger deferred probe, so it +* needs to be done after calls that might return EPROBE_DEFER, +* otherwise we can get an infinite loop. +*/ if (anx7625_register_i2c_dummy_clients (platform, client) !=0 ) { ret = -ENOMEM ;DRM_DEV_ERROR (dev,"fail to reserve I2C bus.\n" );
@@ -2648,13 +2715,21 @@ static int anx7625_i2c_probe(struct i2c_client *client)if (ret) goto free_wq; -devm_of_dp_aux_populate_ep_devices (&platform->aux); - - ret =anx7625_parse_dt (dev, pdata); +/* +* Populating the aux bus will retrigger deferred probe, so it needs to +* be done after calls that might return EPROBE_DEFER, otherwise we can +* get an infinite loop. +*/ + ret =devm_of_dp_aux_populate_bus (&platform->aux, anx7625_link_bridge);if (ret) { -if (ret != -EPROBE_DEFER ) -DRM_DEV_ERROR (dev,"fail to parse DT : %d\n" , ret); - goto free_wq; +if (ret != -ENODEV ) { +DRM_DEV_ERROR (dev,"failed to populate aux bus : %d\n" , ret); + goto free_wq; + } + + ret =anx7625_link_bridge (&platform->aux); +if (ret) + goto free_wq; }if (!platform->pdata.low_power_mode) {
@@ -2667,27 +2742,6 @@ static int anx7625_i2c_probe(struct i2c_client *client)if (platform->pdata.intp_irq)queue_work (platform->workqueue, &platform->work); - platform->bridge.funcs = &anx7625_bridge_funcs; - platform->bridge.of_node = client->dev.of_node; -if (!anx7625_of_panel_on_aux_bus (&client->dev)) - platform->bridge.ops |=DRM_BRIDGE_OP_EDID ; -if (!platform->pdata.panel_bridge) - platform->bridge.ops |=DRM_BRIDGE_OP_HPD | -DRM_BRIDGE_OP_DETECT ; - platform->bridge.type = platform->pdata.panel_bridge ? - DRM_MODE_CONNECTOR_eDP : - DRM_MODE_CONNECTOR_DisplayPort; - -drm_bridge_add (&platform->bridge); - -if (!platform->pdata.is_dpi) { - ret =anx7625_attach_dsi (platform); -if (ret) { -DRM_DEV_ERROR (dev,"Fail to attach to dsi : %d\n" , ret); - goto unregister_bridge; - } - } -if (platform->pdata.audio_en)anx7625_register_audio (dev, platform);
@@ -2695,12 +2749,6 @@ static int anx7625_i2c_probe(struct i2c_client *client)return 0 ; -unregister_bridge: -drm_bridge_remove (&platform->bridge); - -if (!platform->pdata.low_power_mode) -pm_runtime_put_sync_suspend (&client->dev); - free_wq:if (platform->workqueue)destroy_workqueue (platform->workqueue);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 285/800 ARM/mfd/gpio: Fixup TPS65010 regression on OMAP1 OSK1
In reply to Greg Kroah-HartmanFrom: Linus Walleij <[email protected]>
[ Upstream commit c32c81f3dbdfd68f6ab20a29ad86f811aed36e4e ]
Aaro reports problems on the OSK1 board after we altered the dynamic base for GPIO allocations.
It appears this happens because the OMAP driver now allocates GPIO numbers dynamically, so all that is references by number is a bit up in the air.
Let's bite the bullet and try to just move the gpio_chip in the tps65010 MFD driver over to using dynamic allocations. Alter everything in the OSK1 board file to use a GPIO descriptor table and lookups.
Utilize the NULL device to define some board-specific GPIO lookups and use these to immediately look up the same GPIOs, convert to IRQ numbers and pass as resources to the devices. This is ugly but should work.
The .setup() callback for tps65010 was used for some GPIO hogging, but since the OSK1 is the only user in the entire kernel we can alter the signatures to something that is helpful and make a clean transition.
--- arch/arm/mach-omap1/board-osk.c | 139 ++++++++++++++++++++++---------- drivers/mfd/tps65010.c | 14 ++-- include/linux/mfd/tps65010.h | 11 +-- 3 files changed, 104 insertions(+), 60 deletions(-)
arch/arm/mach-omap1/board-osk.c +95 -44
@@ -25,7 +25,8 @@* with this program; if not, write to the Free Software Foundation, Inc., * 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> +#include <linux/gpio/driver.h> #include <linux/gpio/machine.h> #include <linux/kernel.h> #include <linux/init.h>
@@ -64,13 +65,12 @@/* TPS65010 has four GPIOs. nPG and LED2 can be treated like GPIOs with * alternate pin configurations for hardware-controlled blinking. */ -#define OSK_TPS_GPIO_BASE (OMAP_MAX_GPIO_LINES + 16 /* MPUIO */) -# define OSK_TPS_GPIO_USB_PWR_EN (OSK_TPS_GPIO_BASE + 0) -# define OSK_TPS_GPIO_LED_D3 (OSK_TPS_GPIO_BASE + 1) -# define OSK_TPS_GPIO_LAN_RESET (OSK_TPS_GPIO_BASE + 2) -# define OSK_TPS_GPIO_DSP_PWR_EN (OSK_TPS_GPIO_BASE + 3) -# define OSK_TPS_GPIO_LED_D9 (OSK_TPS_GPIO_BASE + 4) -# define OSK_TPS_GPIO_LED_D2 (OSK_TPS_GPIO_BASE + 5) +#define OSK_TPS_GPIO_USB_PWR_EN 0 +#define OSK_TPS_GPIO_LED_D3 1 +#define OSK_TPS_GPIO_LAN_RESET 2 +#define OSK_TPS_GPIO_DSP_PWR_EN 3 +#define OSK_TPS_GPIO_LED_D9 4 +#define OSK_TPS_GPIO_LED_D2 5static struct mtd_partition osk_partitions[] = {/* bootloader (U-Boot, etc) in first sector */
@@ -174,11 +174,20 @@ static const struct gpio_led tps_leds[] = {/* NOTE: D9 and D2 have hardware blink support. * Also, D9 requires non-battery power. */ - { .gpio = OSK_TPS_GPIO_LED_D9, .name = "d9", - .default_trigger = "disk-activity", }, - { .gpio = OSK_TPS_GPIO_LED_D2, .name = "d2", }, - { .gpio = OSK_TPS_GPIO_LED_D3, .name = "d3", .active_low = 1, - .default_trigger = "heartbeat", }, + { .name = "d9", .default_trigger = "disk-activity", }, + { .name = "d2", }, + { .name = "d3", .default_trigger = "heartbeat", }, +}; + +static struct gpiod_lookup_table tps_leds_gpio_table = { + .dev_id = "leds-gpio", + .table = { + /* Use local offsets on TPS65010 */ + GPIO_LOOKUP_IDX("tps65010", OSK_TPS_GPIO_LED_D9, NULL, 0, GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("tps65010", OSK_TPS_GPIO_LED_D2, NULL, 1, GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("tps65010", OSK_TPS_GPIO_LED_D3, NULL, 2, GPIO_ACTIVE_LOW), + { } + }, }; static struct gpio_led_platform_data tps_leds_data = {
@@ -192,29 +201,34 @@ static struct platform_device osk5912_tps_leds = { .dev.platform_data = &tps_leds_data, }; -static int osk_tps_setup (struct i2c_client *client,void *context) +/* The board just hold these GPIOs hogged from setup to teardown */ +static struct gpio_desc *eth_reset; +static struct gpio_desc *vdd_dsp; + +static int osk_tps_setup (struct i2c_client *client,struct gpio_chip *gc) { +struct gpio_desc *d;if (!IS_BUILTIN (CONFIG_TPS65010 ))return -ENOSYS ;/* Set GPIO 1 HIGH to disable VBUS power supply; * OHCI driver powers it up/down as needed. */ -gpio_request (OSK_TPS_GPIO_USB_PWR_EN ,"n_vbus_en" ); -gpio_direction_output (OSK_TPS_GPIO_USB_PWR_EN ,1 ); + d =gpiochip_request_own_desc (gc,OSK_TPS_GPIO_USB_PWR_EN ,"n_vbus_en" , +GPIO_ACTIVE_HIGH ,GPIOD_OUT_HIGH );/* Free the GPIO again as the driver will request it */ -gpio_free (OSK_TPS_GPIO_USB_PWR_EN ); +gpiochip_free_own_desc (d);/* Set GPIO 2 high so LED D3 is off by default */ tps65010_set_gpio_out_value (GPIO2 ,HIGH );/* Set GPIO 3 low to take ethernet out of reset */ -gpio_request (OSK_TPS_GPIO_LAN_RESET ,"smc_reset" ); -gpio_direction_output (OSK_TPS_GPIO_LAN_RESET ,0 ); + eth_reset =gpiochip_request_own_desc (gc,OSK_TPS_GPIO_LAN_RESET ,"smc_reset" , +GPIO_ACTIVE_HIGH ,GPIOD_OUT_LOW );/* GPIO4 is VDD_DSP */ -gpio_request (OSK_TPS_GPIO_DSP_PWR_EN ,"dsp_power" ); -gpio_direction_output (OSK_TPS_GPIO_DSP_PWR_EN ,1 ); + vdd_dsp =gpiochip_request_own_desc (gc,OSK_TPS_GPIO_DSP_PWR_EN ,"dsp_power" , +GPIO_ACTIVE_HIGH ,GPIOD_OUT_HIGH );/* REVISIT if DSP support isn't configured, power it off ... */ /* Let LED1 (D9) blink; leds-gpio may override it */
@@ -232,15 +246,22 @@ static int osk_tps_setup(struct i2c_client *client, void *context)/* register these three LEDs */ osk5912_tps_leds.dev.parent = &client->dev; +gpiod_add_lookup_table (&tps_leds_gpio_table);platform_device_register (&osk5912_tps_leds);return 0 ; } +static void osk_tps_teardown (struct i2c_client *client,struct gpio_chip *gc) +{ +gpiochip_free_own_desc (eth_reset); +gpiochip_free_own_desc (vdd_dsp); +} +static struct tps65010_board tps_board = { - .base =OSK_TPS_GPIO_BASE , .outmask =0x0f , .setup = osk_tps_setup, + .teardown = osk_tps_teardown, };static struct i2c_board_info __initdata osk_i2c_board_info[] = {
@@ -263,11 +284,6 @@ static void __init osk_init_smc91x(void) {u32 l; -if ((gpio_request (0 ,"smc_irq" )) <0 ) { -printk ("Error requesting gpio 0 for smc91x irq\n" ); -return ; - } -/* Check EMIFS wait states to fix errors with SMC_GET_PKT_HDR */ l =omap_readl (EMIFS_CCS (1 )); l |=0x3 ;
@@ -279,10 +295,6 @@ static void __init osk_init_cf(int seg)struct resource *res = &osk5912_cf_resources[1 ];omap_cfg_reg (M7_1610_GPIO62 ); -if ((gpio_request (62 ,"cf_irq" )) <0 ) { -printk ("Error requesting gpio 62 for CF irq\n" ); -return ; - }switch (seg) {/* NOTE: CS0 could be configured too ... */
@@ -308,18 +320,17 @@ static void __init osk_init_cf(int seg) seg, omap_readl(EMIFS_CCS(seg)), omap_readl(EMIFS_ACS(seg)));omap_writel (0x0004a1b3 ,EMIFS_CCS (seg));/* synch mode 4 etc */ omap_writel (0x00000000 ,EMIFS_ACS (seg));/* OE hold/setup */ - -/* the CF I/O IRQ is really active-low */ -irq_set_irq_type (gpio_to_irq (62 ),IRQ_TYPE_EDGE_FALLING ); }static struct gpiod_lookup_table osk_usb_gpio_table = { .dev_id ="ohci" , .table = {/* Power GPIO on the I2C-attached TPS65010 */ -GPIO_LOOKUP ("tps65010" ,0 ,"power" ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP ("tps65010" ,OSK_TPS_GPIO_USB_PWR_EN ,"power" , +GPIO_ACTIVE_HIGH ),GPIO_LOOKUP (OMAP_GPIO_LABEL ,9 ,"overcurrent" ,GPIO_ACTIVE_HIGH ), + { } }, };
@@ -341,8 +352,25 @@ static struct omap_usb_config osk_usb_config __initdata = {#define EMIFS_CS3_VAL (0x88013141) +static struct gpiod_lookup_table osk_irq_gpio_table = { + .dev_id =NULL , + .table = { +/* GPIO used for SMC91x IRQ */ +GPIO_LOOKUP (OMAP_GPIO_LABEL ,0 ,"smc_irq" , +GPIO_ACTIVE_HIGH ), +/* GPIO used for CF IRQ */ +GPIO_LOOKUP ("gpio-48-63" ,14 ,"cf_irq" , +GPIO_ACTIVE_HIGH ), +/* GPIO used by the TPS65010 chip */ +GPIO_LOOKUP ("mpuio" ,1 ,"tps65010" , +GPIO_ACTIVE_HIGH ), + { } + }, +}; +static void __init osk_init (void ) { +struct gpio_desc *d;u32 l;osk_init_smc91x ();
@@ -359,10 +387,31 @@ static void __init osk_init(void) osk_flash_resource.end = osk_flash_resource.start =omap_cs3_phys (); osk_flash_resource.end +=SZ_32M -1 ; - osk5912_smc91x_resources[1 ].start =gpio_to_irq (0 ); - osk5912_smc91x_resources[1 ].end =gpio_to_irq (0 ); - osk5912_cf_resources[0 ].start =gpio_to_irq (62 ); - osk5912_cf_resources[0 ].end =gpio_to_irq (62 ); + +/* +* Add the GPIOs to be used as IRQs and immediately look them up +* to be passed as an IRQ resource. This is ugly but should work +* until the day we convert to device tree. +*/ +gpiod_add_lookup_table (&osk_irq_gpio_table); + + d =gpiod_get (NULL ,"smc_irq" ,GPIOD_IN ); +if (IS_ERR (d)) { +pr_err ("Unable to get SMC IRQ GPIO descriptor\n" ); + }else { +irq_set_irq_type (gpiod_to_irq (d),IRQ_TYPE_EDGE_RISING ); + osk5912_smc91x_resources[1 ] =DEFINE_RES_IRQ (gpiod_to_irq (d)); + } + + d =gpiod_get (NULL ,"cf_irq" ,GPIOD_IN ); +if (IS_ERR (d)) { +pr_err ("Unable to get CF IRQ GPIO descriptor\n" ); + }else { +/* the CF I/O IRQ is really active-low */ +irq_set_irq_type (gpiod_to_irq (d),IRQ_TYPE_EDGE_FALLING ); + osk5912_cf_resources[0 ] =DEFINE_RES_IRQ (gpiod_to_irq (d)); + } +platform_add_devices (osk5912_devices,ARRAY_SIZE (osk5912_devices)); l =omap_readl (USB_TRANSCEIVER_CTRL );
@@ -372,13 +421,15 @@ static void __init osk_init(void)gpiod_add_lookup_table (&osk_usb_gpio_table);omap1_usb_init (&osk_usb_config); +omap_serial_init (); +/* irq for tps65010 chip */ /* bootloader effectively does: omap_cfg_reg(U19_1610_MPUIO1); */ -if (gpio_request (OMAP_MPUIO (1 ),"tps65010" ) ==0 ) -gpio_direction_input (OMAP_MPUIO (1 )); - -omap_serial_init (); - osk_i2c_board_info[0 ].irq =gpio_to_irq (OMAP_MPUIO (1 )); + d =gpiod_get (NULL ,"tps65010" ,GPIOD_IN ); +if (IS_ERR (d)) +pr_err ("Unable to get TPS65010 IRQ GPIO descriptor\n" ); +else + osk_i2c_board_info[0 ].irq =gpiod_to_irq (d);omap_register_i2c_bus (1 ,400 , osk_i2c_board_info,ARRAY_SIZE (osk_i2c_board_info)); }
drivers/mfd/tps65010.c +5 -9
@@ -506,12 +506,8 @@ static void tps65010_remove(struct i2c_client *client)struct tps65010 *tps =i2c_get_clientdata (client);struct tps65010_board *board =dev_get_platdata (&client->dev); -if (board && board->teardown) { -int status = board->teardown (client, board->context); -if (status <0 ) -dev_dbg (&client->dev,"board %s %s err %d\n" , -"teardown" , client->name, status); - } +if (board && board->teardown) + board->teardown (client, &tps->chip);if (client->irq >0 )free_irq (client->irq, tps);cancel_delayed_work_sync (&tps->work);
@@ -619,7 +615,7 @@ static int tps65010_probe(struct i2c_client *client) tps, DEBUG_FOPS);/* optionally register GPIOs */ -if (board && board->base !=0 ) { +if (board) { tps->outmask = board->outmask; tps->chip.label = client->name;
@@ -632,7 +628,7 @@ static int tps65010_probe(struct i2c_client *client)/* NOTE: only partial support for inputs; nyet IRQs */ tps->chip.get = tps65010_gpio_get; - tps->chip.base = board->base; + tps->chip.base =-1 ; tps->chip.ngpio =7 ; tps->chip.can_sleep =1 ;
@@ -641,7 +637,7 @@ static int tps65010_probe(struct i2c_client *client)dev_err (&client->dev,"can't add gpiochip, err %d\n" , status); else if (board->setup) { - status = board->setup (client, board->context); + status = board->setup (client, &tps->chip);if (status <0 ) { dev_dbg(&client->dev, "board %s %s err %d\n",
include/linux/mfd/tps65010.h +4 -7
@@ -28,6 +28,8 @@#ifndef __LINUX_I2C_TPS65010_H#define __LINUX_I2C_TPS65010_H +struct gpio_chip ; +/* * ---------------------------------------------------------------------------- * Registers, all 8 bits
@@ -176,12 +178,10 @@ struct i2c_client;/** * struct tps65010_board - packages GPIO and LED lines -* @base: the GPIO number to assign to GPIO-1 * @outmask: bit (N-1) is set to allow GPIO-N to be used as an * (open drain) output * @setup: optional callback issued once the GPIOs are valid * @teardown: optional callback issued before the GPIOs are invalidated -* @context: optional parameter passed to setup() and teardown() * * Board data may be used to package the GPIO (and LED) lines for use * in by the generic GPIO and LED frameworks. The first four GPIOs
@@ -193,12 +193,9 @@ struct i2c_client;* devices in their initial states using these GPIOs. */ struct tps65010_board { -int base;unsigned outmask; - -int (*setup)(struct i2c_client *client,void *context); -int (*teardown)(struct i2c_client *client,void *context); -void *context; +int (*setup)(struct i2c_client *client,struct gpio_chip *gc); +void (*teardown)(struct i2c_client *client,struct gpio_chip *gc); };#endif /* __LINUX_I2C_TPS65010_H */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 286/800 ARM: omap1: Drop header on AMS Delta
In reply to Greg Kroah-HartmanFrom: Linus Walleij <[email protected]>
[ Upstream commit fa1ae0cd897b089b5cc05ab471518ad13db2d567 ]
The AMS Delta board uses GPIO descriptors exclusively and does not have any dependencies on the legacy <linux/gpio.h> header, so just drop it.
--- arch/arm/mach-omap1/board-ams-delta.c | 1 - 1 file changed, 1 deletion(-)
arch/arm/mach-omap1/board-ams-delta.c +0 -1
@@ -11,7 +11,6 @@#include <linux/gpio/driver.h> #include <linux/gpio/machine.h> #include <linux/gpio/consumer.h> -#include <linux/gpio.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/input.h>
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 287/800 ARM: omap1: Remove reliance on GPIO numbers from PalmTE
In reply to Greg Kroah-HartmanFrom: Linus Walleij <[email protected]>
[ Upstream commit 4c40db6249ff1da335b276bdd6c3c3462efbc2ab ]
It appears this happens because the OMAP driver now allocates GPIO numbers dynamically, so all that is references by number is a bit up in the air.
Utilize the NULL device to define some board-specific GPIO lookups and use these to immediately look up the same GPIOs, convert to IRQ numbers and pass as resources to the devices. This is ugly but should work.
--- arch/arm/mach-omap1/board-palmte.c | 51 ++++++++++++++++++------------ 1 file changed, 31 insertions(+), 20 deletions(-)
arch/arm/mach-omap1/board-palmte.c +31 -20
@@ -13,7 +13,8 @@* * Copyright (c) 2006 Andrzej Zaborowski <[email protected]> */ -#include <linux/gpio.h> +#include <linux/gpio/machine.h> +#include <linux/gpio/consumer.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/input.h>
@@ -187,23 +188,6 @@ static struct spi_board_info palmte_spi_info[] __initdata = { }, }; -static void __init palmte_misc_gpio_setup (void ) -{ -/* Set TSC2102 PINTDAV pin as input (used by TSC2102 driver) */ -if (gpio_request (PALMTE_PINTDAV_GPIO ,"TSC2102 PINTDAV" ) <0 ) { -printk (KERN_ERR "Could not reserve PINTDAV GPIO!\n" ); -return ; - } -gpio_direction_input (PALMTE_PINTDAV_GPIO ); - -/* Set USB-or-DC-IN pin as input (unused) */ -if (gpio_request (PALMTE_USB_OR_DC_GPIO ,"USB/DC-IN" ) <0 ) { -printk (KERN_ERR "Could not reserve cable signal GPIO!\n" ); -return ; - } -gpio_direction_input (PALMTE_USB_OR_DC_GPIO ); -} -#if IS_ENABLED (CONFIG_MMC_OMAP ) static struct omap_mmc_platform_data _palmte_mmc_config = {
@@ -231,8 +215,23 @@ static void palmte_mmc_init(void)#endif /* CONFIG_MMC_OMAP */ +static struct gpiod_lookup_table palmte_irq_gpio_table = { + .dev_id =NULL , + .table = { +/* GPIO used for TSC2102 PINTDAV IRQ */ +GPIO_LOOKUP ("gpio-0-15" ,PALMTE_PINTDAV_GPIO ,"tsc2102_irq" , +GPIO_ACTIVE_HIGH ), +/* GPIO used for USB or DC input detection */ +GPIO_LOOKUP ("gpio-0-15" ,PALMTE_USB_OR_DC_GPIO ,"usb_dc_irq" , +GPIO_ACTIVE_HIGH ), + { } + }, +}; +static void __init omap_palmte_init (void ) { +struct gpio_desc *d; +/* mux pins for uarts */ omap_cfg_reg (UART1_TX );omap_cfg_reg (UART1_RTS );
@@ -243,9 +242,21 @@ static void __init omap_palmte_init(void)platform_add_devices (palmte_devices,ARRAY_SIZE (palmte_devices)); - palmte_spi_info[0 ].irq =gpio_to_irq (PALMTE_PINTDAV_GPIO ); +gpiod_add_lookup_table (&palmte_irq_gpio_table); + d =gpiod_get (NULL ,"tsc2102_irq" ,GPIOD_IN ); +if (IS_ERR (d)) +pr_err ("Unable to get TSC2102 IRQ GPIO descriptor\n" ); +else + palmte_spi_info[0 ].irq =gpiod_to_irq (d);spi_register_board_info (palmte_spi_info,ARRAY_SIZE (palmte_spi_info)); -palmte_misc_gpio_setup (); + +/* We are getting this just to set it up as input */ + d =gpiod_get (NULL ,"usb_dc_irq" ,GPIOD_IN ); +if (IS_ERR (d)) +pr_err ("Unable to get USB/DC IRQ GPIO descriptor\n" ); +else +gpiod_put (d); +omap_serial_init ();omap1_usb_init (&palmte_usb_config);omap_register_i2c_bus (1 ,100 ,NULL ,0 );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 288/800 ARM: omap1: Remove reliance on GPIO numbers from SX1
In reply to Greg Kroah-HartmanFrom: Linus Walleij <[email protected]>
[ Upstream commit 480c82daa3e41873421dc2c9e2918ad7e21d7a0b ]
It appears this happens because the OMAP driver now allocates GPIO numbers dynamically, so all that is references by number is a bit up in the air.
Utilize the NULL device to define some board-specific GPIO lookups and use these to immediately look up the same GPIOs, convert to IRQ numbers and pass as resources to the devices. This is ugly but should work.
--- arch/arm/mach-omap1/board-sx1.c | 40 +++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 7 deletions(-)
arch/arm/mach-omap1/board-sx1.c +33 -7
@@ -11,7 +11,8 @@* Maintainters : Vladimir Ananiev (aka Vovan888), Sergge * oslik.ru */ -#include <linux/gpio.h> +#include <linux/gpio/machine.h> +#include <linux/gpio/consumer.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/input.h>
@@ -304,8 +305,23 @@ static struct platform_device *sx1_devices[] __initdata = {/*-----------------------------------------*/ +static struct gpiod_lookup_table sx1_gpio_table = { + .dev_id =NULL , + .table = { +GPIO_LOOKUP ("gpio-0-15" ,1 ,"irda_off" , +GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP ("gpio-0-15" ,11 ,"switch" , +GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP ("gpio-0-15" ,15 ,"usb_on" , +GPIO_ACTIVE_HIGH ), + { } + }, +}; +static void __init omap_sx1_init (void ) { +struct gpio_desc *d; +/* mux pins for uarts */ omap_cfg_reg (UART1_TX );omap_cfg_reg (UART1_RTS );
@@ -320,15 +336,25 @@ static void __init omap_sx1_init(void)omap_register_i2c_bus (1 ,100 ,NULL ,0 );omap1_usb_init (&sx1_usb_config);sx1_mmc_init (); +gpiod_add_lookup_table (&sx1_gpio_table);/* turn on USB power */ /* sx1_setusbpower(1); can't do it here because i2c is not ready */ -gpio_request (1 ,"A_IRDA_OFF" ); -gpio_request (11 ,"A_SWITCH" ); -gpio_request (15 ,"A_USB_ON" ); -gpio_direction_output (1 ,1 );/*A_IRDA_OFF = 1 */ -gpio_direction_output (11 ,0 );/*A_SWITCH = 0 */ -gpio_direction_output (15 ,0 );/*A_USB_ON = 0 */ + d =gpiod_get (NULL ,"irda_off" ,GPIOD_OUT_HIGH ); +if (IS_ERR (d)) +pr_err ("Unable to get IRDA OFF GPIO descriptor\n" ); +else +gpiod_put (d); + d =gpiod_get (NULL ,"switch" ,GPIOD_OUT_LOW ); +if (IS_ERR (d)) +pr_err ("Unable to get SWITCH GPIO descriptor\n" ); +else +gpiod_put (d); + d =gpiod_get (NULL ,"usb_on" ,GPIOD_OUT_LOW ); +if (IS_ERR (d)) +pr_err ("Unable to get USB ON GPIO descriptor\n" ); +else +gpiod_put (d);omapfb_set_lcd_config (&sx1_lcd_config); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 289/800 Input: ads7846 - Convert to use software nodes
In reply to Greg Kroah-HartmanFrom: Linus Walleij <[email protected]>
[ Upstream commit 767d83361aaa6a1ecb4d5b89eeb38a267239917a ]
The Nokia 770 is using GPIOs from the global numberspace on the CBUS node to pass down to the LCD controller. This regresses when we let the OMAP GPIO driver use dynamic GPIO base.
The Nokia 770 now has dynamic allocation of IRQ numbers, so this needs to be fixed for it to work.
As this is the only user of LCD MIPID we can easily augment the driver to use a GPIO descriptor instead and resolve the issue.
The platform data .shutdown() callback wasn't even used in the code, but we encode a shutdown asserting RESET in the remove() callback for completeness sake.
The CBUS also has the ADS7846 touchscreen attached.
Populate the devices on the Nokia 770 CBUS I2C using software nodes instead of platform data quirks. This includes the LCD and the ADS7846 touchscreen so the conversion just brings the LCD along with it as software nodes is an all-or-nothing design pattern.
The ADS7846 has some limited support for using GPIO descriptors, let's convert it over completely to using device properties and then fix all remaining boardfile users to provide all platform data using software nodes.
Dump the of includes and of_match_ptr() in the ADS7846 driver as part of the job.
Since we have to move ADS7846 over to obtaining the GPIOs it is using exclusively from descriptors, we provide descriptor tables for the two remaining in-kernel boardfiles using ADS7846:
- PXA Spitz
- MIPS Alchemy DB1000 development board
It was too hard for me to include software node conversion of these two remaining users at this time: the spitz is using a hscync callback in the platform data that would require further GPIO descriptor conversion of the Spitz, and moving the hsync callback down into the driver: it will just become too big of a job, but it can be done separately.
The MIPS Alchemy DB1000 is simply something I cannot test, so take the easier approach of just providing some GPIO descriptors in this case as I don't want the patch to grow too intrusive.
As we see that several device trees have incorrect polarity flags and just expect to bypass the gpiolib polarity handling, fix up all device trees too, in a separate patch.
--- arch/arm/mach-omap1/board-nokia770.c | 99 ++++++++++++++------- arch/arm/mach-pxa/spitz.c | 11 ++- arch/mips/alchemy/devboards/db1000.c | 11 ++- drivers/input/touchscreen/ads7846.c | 113 +++++++++--------------- drivers/video/fbdev/omap/lcd_mipid.c | 10 +++ include/linux/platform_data/lcd-mipid.h | 2 - include/linux/spi/ads7846.h | 2 - 7 files changed, 136 insertions(+), 112 deletions(-)
arch/arm/mach-omap1/board-nokia770.c +65 -34
@@ -8,15 +8,16 @@#include <linux/irq.h> #include <linux/gpio.h> #include <linux/gpio/machine.h> +#include <linux/gpio/property.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/mutex.h> #include <linux/platform_device.h> +#include <linux/property.h> #include <linux/input.h> #include <linux/omapfb.h> #include <linux/spi/spi.h> -#include <linux/spi/ads7846.h> #include <linux/workqueue.h> #include <linux/delay.h>
@@ -35,6 +36,25 @@#include "clock.h" #include "mmc.h" +static const struct software_node nokia770_mpuio_gpiochip_node = { + .name ="mpuio" , +}; + +static const struct software_node nokia770_gpiochip1_node = { + .name ="gpio-0-15" , +}; + +static const struct software_node nokia770_gpiochip2_node = { + .name ="gpio-16-31" , +}; + +static const struct software_node *nokia770_gpiochip_nodes[] = { + &nokia770_mpuio_gpiochip_node, + &nokia770_gpiochip1_node, + &nokia770_gpiochip2_node, +NULL +}; +#define ADS7846_PENDOWN_GPIO 15static const unsigned int nokia770_keymap[] = {
@@ -85,40 +105,47 @@ static struct platform_device *nokia770_devices[] __initdata = { &nokia770_kp_device, }; -static void mipid_shutdown (struct mipid_platform_data *pdata) -{ -if (pdata->nreset_gpio !=-1 ) { -printk (KERN_INFO "shutdown LCD\n" ); -gpio_set_value (pdata->nreset_gpio,0 ); -msleep (120 ); - } -} - -static struct mipid_platform_data nokia770_mipid_platform_data = { - .shutdown = mipid_shutdown, -}; +static struct mipid_platform_data nokia770_mipid_platform_data = { };static const struct omap_lcd_config nokia770_lcd_config__initconst = { .ctrl_name ="hwa742" , }; +static const struct property_entry nokia770_mipid_props[] = { +PROPERTY_ENTRY_GPIO ("reset-gpios" , &nokia770_gpiochip1_node, +13 ,GPIO_ACTIVE_LOW ), + { } +}; + +static const struct software_node nokia770_mipid_swnode = { + .name ="lcd_mipid" , + .properties = nokia770_mipid_props, +}; +static void __init mipid_dev_init (void ) { - nokia770_mipid_platform_data.nreset_gpio =13 ; nokia770_mipid_platform_data.data_lines =16 ;omapfb_set_lcd_config (&nokia770_lcd_config); } -static struct ads7846_platform_data nokia770_ads7846_platform_data__initdata = { - .x_max =0x0fff , - .y_max =0x0fff , - .x_plate_ohms =180 , - .pressure_max =255 , - .debounce_max =10 , - .debounce_tol =3 , - .debounce_rep =1 , - .gpio_pendown =ADS7846_PENDOWN_GPIO , +static const struct property_entry nokia770_ads7846_props[] = { +PROPERTY_ENTRY_STRING ("compatible" ,"ti,ads7846" ), +PROPERTY_ENTRY_U32 ("touchscreen-size-x" ,4096 ), +PROPERTY_ENTRY_U32 ("touchscreen-size-y" ,4096 ), +PROPERTY_ENTRY_U32 ("touchscreen-max-pressure" ,256 ), +PROPERTY_ENTRY_U32 ("touchscreen-average-samples" ,10 ), +PROPERTY_ENTRY_U16 ("ti,x-plate-ohms" ,180 ), +PROPERTY_ENTRY_U16 ("ti,debounce-tol" ,3 ), +PROPERTY_ENTRY_U16 ("ti,debounce-rep" ,1 ), +PROPERTY_ENTRY_GPIO ("pendown-gpios" , &nokia770_gpiochip1_node, +ADS7846_PENDOWN_GPIO ,GPIO_ACTIVE_LOW ), + { } +}; + +static const struct software_node nokia770_ads7846_swnode = { + .name ="ads7846" , + .properties = nokia770_ads7846_props, };static struct spi_board_info nokia770_spi_board_info[]__initdata = {
@@ -128,13 +155,14 @@ static struct spi_board_info nokia770_spi_board_info[] __initdata = { .chip_select = 3, .max_speed_hz = 12000000, .platform_data = &nokia770_mipid_platform_data, + .swnode = &nokia770_mipid_swnode, }, [1] = { .modalias = "ads7846", .bus_num = 2, .chip_select = 0, .max_speed_hz = 2500000, - .platform_data = &nokia770_ads7846_platform_data, + .swnode = &nokia770_ads7846_swnode, }, };
@@ -212,14 +240,16 @@ static inline void nokia770_mmc_init(void)#endif #if IS_ENABLED (CONFIG_I2C_CBUS_GPIO ) -static struct gpiod_lookup_table nokia770_cbus_gpio_table = { - .dev_id ="i2c-cbus-gpio.2" , - .table = { -GPIO_LOOKUP_IDX ("mpuio" ,9 ,NULL ,0 ,0 ),/* clk */ -GPIO_LOOKUP_IDX ("mpuio" ,10 ,NULL ,1 ,0 ),/* dat */ -GPIO_LOOKUP_IDX ("mpuio" ,11 ,NULL ,2 ,0 ),/* sel */ - { }, - }, + +static const struct software_node_ref_args nokia770_cbus_gpio_refs[] = { +SOFTWARE_NODE_REFERENCE (&nokia770_mpuio_gpiochip_node,9 ,0 ), +SOFTWARE_NODE_REFERENCE (&nokia770_mpuio_gpiochip_node,10 ,0 ), +SOFTWARE_NODE_REFERENCE (&nokia770_mpuio_gpiochip_node,11 ,0 ), +}; + +static const struct property_entry nokia770_cbus_props[] = { +PROPERTY_ENTRY_REF_ARRAY ("gpios" , nokia770_cbus_gpio_refs), + { } }; static struct platform_device nokia770_cbus_device = {
@@ -253,7 +283,8 @@ static void __init nokia770_cbus_init(void) nokia770_i2c_board_info_2[1 ].irq =gpio_to_irq (tahvo_irq_gpio);i2c_register_board_info (2 , nokia770_i2c_board_info_2,ARRAY_SIZE (nokia770_i2c_board_info_2)); -gpiod_add_lookup_table (&nokia770_cbus_gpio_table); +device_create_managed_software_node (&nokia770_cbus_device.dev, + nokia770_cbus_props,NULL ); platform_device_register(&nokia770_cbus_device); }#else /* CONFIG_I2C_CBUS_GPIO */
@@ -273,8 +304,8 @@ static void __init omap_nokia770_init(void)/* Unmask SleepX signal */ omap_writew ((omap_readw (0xfffb5004 ) & ~2 ),0xfffb5004 ); +software_node_register_node_group (nokia770_gpiochip_nodes);platform_add_devices (nokia770_devices,ARRAY_SIZE (nokia770_devices)); - nokia770_spi_board_info[1 ].irq =gpio_to_irq (15 );spi_register_board_info (nokia770_spi_board_info,ARRAY_SIZE (nokia770_spi_board_info));omap_serial_init ();
arch/arm/mach-pxa/spitz.c +10 -1
@@ -506,10 +506,18 @@ static struct ads7846_platform_data spitz_ads7846_info = { .x_plate_ohms = 419, .y_plate_ohms = 486, .pressure_max = 1024, - .gpio_pendown = SPITZ_GPIO_TP_INT, .wait_for_sync = spitz_ads7846_wait_for_hsync, }; +static struct gpiod_lookup_table spitz_ads7846_gpio_table = { + .dev_id ="spi2.0" , + .table = { +GPIO_LOOKUP ("gpio-pxa" ,SPITZ_GPIO_TP_INT , +"pendown" ,GPIO_ACTIVE_LOW ), + { } + }, +}; +static void spitz_bl_kick_battery (void ) {void (*kick_batt)(void );
@@ -594,6 +602,7 @@ static void __init spitz_spi_init(void)else gpiod_add_lookup_table (&spitz_lcdcon_gpio_table); +gpiod_add_lookup_table (&spitz_ads7846_gpio_table);gpiod_add_lookup_table (&spitz_spi_gpio_table);pxa2xx_set_spi_info (2 , &spitz_spi_info);spi_register_board_info (ARRAY_AND_SIZE (spitz_spi_devices));
arch/mips/alchemy/devboards/db1000.c +10 -1
@@ -381,13 +381,21 @@ static struct platform_device db1100_mmc1_dev = {static struct ads7846_platform_data db1100_touch_pd = { .model =7846 , .vref_mv =3300 , - .gpio_pendown =21 , };static struct spi_gpio_platform_data db1100_spictl_pd = { .num_chipselect =1 , }; +static struct gpiod_lookup_table db1100_touch_gpio_table = { + .dev_id ="spi0.0" , + .table = { +GPIO_LOOKUP ("alchemy-gpio2" ,21 , +"pendown" ,GPIO_ACTIVE_LOW ), + { } + }, +}; +static struct spi_board_info db1100_spi_info[]__initdata = { [0 ] = { .modalias ="ads7846" ,
@@ -474,6 +482,7 @@ int __init db1000_dev_setup(void) pfc |= (1 <<0 );/* SSI0 pins as GPIOs */ alchemy_wrsys (pfc,AU1000_SYS_PINFUNC ); +gpiod_add_lookup_table (&db1100_touch_gpio_table);spi_register_board_info (db1100_spi_info,ARRAY_SIZE (db1100_spi_info));
drivers/input/touchscreen/ads7846.c +41 -72
200 lines not on this page · raw message
drivers/video/fbdev/omap/lcd_mipid.c +10 -0
@@ -7,6 +7,7 @@*/ #include <linux/device.h> #include <linux/delay.h> +#include <linux/gpio/consumer.h> #include <linux/slab.h> #include <linux/workqueue.h> #include <linux/spi/spi.h>
@@ -41,6 +42,7 @@ struct mipid_device {when we can issue the next sleep in/out command */ unsigned long hw_guard_wait;/* max guard time in jiffies */ +struct gpio_desc *reset;struct omapfb_device *fbdev;struct spi_device *spi;
@@ -556,6 +558,12 @@ static int mipid_spi_probe(struct spi_device *spi)return -ENOMEM ; } +/* This will de-assert RESET if active */ + md->reset =gpiod_get (&spi->dev,"reset" ,GPIOD_OUT_LOW ); +if (IS_ERR (md->reset)) +return dev_err_probe (&spi->dev,PTR_ERR (md->reset), +"no reset GPIO line\n" ); + spi->mode =SPI_MODE_0 ; md->spi = spi;dev_set_drvdata (&spi->dev, md);
@@ -574,6 +582,8 @@ static void mipid_spi_remove(struct spi_device *spi) {struct mipid_device *md =dev_get_drvdata (&spi->dev); +/* Asserts RESET */ +gpiod_set_value (md->reset,1 );mipid_disable (&md->panel);kfree (md); }
include/linux/platform_data/lcd-mipid.h +0 -2
@@ -15,10 +15,8 @@ enum mipid_test_result { #ifdef __KERNEL__ struct mipid_platform_data { - int nreset_gpio; int data_lines; - void (*shutdown)(struct mipid_platform_data *pdata); void (*set_bklight_level)(struct mipid_platform_data *pdata, int level); int (*get_bklight_level)(struct mipid_platform_data *pdata);
include/linux/spi/ads7846.h +0 -2
@@ -35,8 +35,6 @@ struct ads7846_platform_data {u16 debounce_tol;/* tolerance used for filtering */ u16 debounce_rep;/* additional consecutive good readings * required after the first two */ -int gpio_pendown;/* the GPIO used to decide the pendown -* state if get_pendown_state == NULL */ int gpio_pendown_debounce;/* platform specific debounce time for * the gpio_pendown */ int (*get_pendown_state)(void );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 290/800 ARM/mmc: Convert old mmci-omap to GPIO descriptors
In reply to Greg Kroah-HartmanFrom: Linus Walleij <[email protected]>
[ Upstream commit e519f0bb64efc2c9c8b67bb2d114dda458bdc34d ]
A recent change to the OMAP driver making it use a dynamic GPIO base created problems with some old OMAP1 board files, among them Nokia 770, SX1 and also the OMAP2 Nokia n8x0.
Fix up all instances of GPIOs being used for the MMC driver by pushing the handling of power, slot selection and MMC "cover" into the driver as optional GPIOs.
This is maybe not the most perfect solution as the MMC framework have some central handlers for some of the stuff, but it at least makes the situtation better and solves the immediate issue.
--- arch/arm/mach-omap1/board-nokia770.c | 43 ++++--------- arch/arm/mach-omap1/board-sx1-mmc.c | 1 - arch/arm/mach-omap2/board-n8x0.c | 85 ++++++++------------------ drivers/mmc/host/omap.c | 46 +++++++++++++- include/linux/platform_data/mmc-omap.h | 2 - 5 files changed, 83 insertions(+), 94 deletions(-)
arch/arm/mach-omap1/board-nokia770.c +13 -30
@@ -184,27 +184,23 @@ static struct omap_usb_config nokia770_usb_config __initdata = {#if IS_ENABLED (CONFIG_MMC_OMAP ) -#define NOKIA770_GPIO_MMC_POWER 41 -#define NOKIA770_GPIO_MMC_SWITCH 23 - -static int nokia770_mmc_set_power (struct device *dev,int slot,int power_on, -int vdd) -{ -gpio_set_value (NOKIA770_GPIO_MMC_POWER , power_on); -return 0 ; -} - -static int nokia770_mmc_get_cover_state (struct device *dev,int slot) -{ -return gpio_get_value (NOKIA770_GPIO_MMC_SWITCH ); -} +static struct gpiod_lookup_table nokia770_mmc_gpio_table = { + .dev_id ="mmci-omap.1" , + .table = { +/* Slot index 0, VSD power, GPIO 41 */ +GPIO_LOOKUP_IDX ("gpio-32-47" ,9 , +"vsd" ,0 ,GPIO_ACTIVE_HIGH ), +/* Slot index 0, switch, GPIO 23 */ +GPIO_LOOKUP_IDX ("gpio-16-31" ,7 , +"cover" ,0 ,GPIO_ACTIVE_HIGH ), + { } + }, +};static struct omap_mmc_platform_data nokia770_mmc2_data = { .nr_slots =1 , .max_freq =12000000 , .slots[0 ] = { - .set_power = nokia770_mmc_set_power, - .get_cover_state = nokia770_mmc_get_cover_state, .ocr_mask =MMC_VDD_32_33 |MMC_VDD_33_34 , .name ="mmcblk" , },
@@ -214,20 +210,7 @@ static struct omap_mmc_platform_data *nokia770_mmc_data[OMAP16XX_NR_MMC];static void __init nokia770_mmc_init (void ) { -int ret; - - ret =gpio_request (NOKIA770_GPIO_MMC_POWER ,"MMC power" ); -if (ret <0 ) -return ; -gpio_direction_output (NOKIA770_GPIO_MMC_POWER ,0 ); - - ret =gpio_request (NOKIA770_GPIO_MMC_SWITCH ,"MMC cover" ); -if (ret <0 ) { -gpio_free (NOKIA770_GPIO_MMC_POWER ); -return ; - } -gpio_direction_input (NOKIA770_GPIO_MMC_SWITCH ); - +gpiod_add_lookup_table (&nokia770_mmc_gpio_table);/* Only the second MMC controller is used */ nokia770_mmc_data[1 ] = &nokia770_mmc2_data;omap1_init_mmc (nokia770_mmc_data,OMAP16XX_NR_MMC );
arch/arm/mach-omap1/board-sx1-mmc.c +0 -1
@@ -9,7 +9,6 @@* Copyright (C) 2007 Instituto Nokia de Tecnologia - INdT */ -#include <linux/gpio.h> #include <linux/platform_device.h> #include "hardware.h"
arch/arm/mach-omap2/board-n8x0.c +26 -59
139 lines not on this page · raw message
drivers/mmc/host/omap.c +44 -2
94 lines not on this page · raw message
include/linux/platform_data/mmc-omap.h +0 -2
@@ -20,8 +20,6 @@ struct omap_mmc_platform_data {* maximum frequency on the MMC bus */ unsigned int max_freq; -/* switch the bus to a new slot */ -int (*switch_slot)(struct device *dev,int slot);/* initialize board-specific MMC functionality, can be NULL if * not supported */ int (*init)(struct device *dev);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 291/800 ARM: omap1: Fix up the Nokia 770 board device IRQs
In reply to Greg Kroah-HartmanFrom: Linus Walleij <[email protected]>
[ Upstream commit 084b6f216778b4109123b396b531f12ff6c354e9 ]
The platform devices on the Nokia 770 is using some board-specific IRQs that get statically assigned to platform devices in the boardfile.
This does not work with dynamic IRQ chip bases.
Utilize the NULL device to define some board-specific GPIO lookups and use these to immediately look up the same GPIOs, convert to IRQ numbers and pass as resources to the devices. This is ugly but should work.
--- arch/arm/mach-omap1/board-nokia770.c | 58 +++++++++++++++++++++------- 1 file changed, 45 insertions(+), 13 deletions(-)
arch/arm/mach-omap1/board-nokia770.c +45 -13
@@ -6,7 +6,7 @@*/ #include <linux/clkdev.h> #include <linux/irq.h> -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/gpio/machine.h> #include <linux/gpio/property.h> #include <linux/kernel.h>
@@ -251,19 +251,25 @@ static struct i2c_board_info nokia770_i2c_board_info_2[] __initdata = {static void __init nokia770_cbus_init (void ) { -const int retu_irq_gpio =62 ; -const int tahvo_irq_gpio =40 ; - -if (gpio_request_one (retu_irq_gpio,GPIOF_IN ,"Retu IRQ" )) -return ; -if (gpio_request_one (tahvo_irq_gpio,GPIOF_IN ,"Tahvo IRQ" )) { -gpio_free (retu_irq_gpio); -return ; +struct gpio_desc *d; +int irq; + + d =gpiod_get (NULL ,"retu_irq" ,GPIOD_IN ); +if (IS_ERR (d)) { +pr_err ("Unable to get CBUS Retu IRQ GPIO descriptor\n" ); + }else { + irq =gpiod_to_irq (d); +irq_set_irq_type (irq,IRQ_TYPE_EDGE_RISING ); + nokia770_i2c_board_info_2[0 ].irq = irq; + } + d =gpiod_get (NULL ,"tahvo_irq" ,GPIOD_IN ); +if (IS_ERR (d)) { +pr_err ("Unable to get CBUS Tahvo IRQ GPIO descriptor\n" ); + }else { + irq =gpiod_to_irq (d); +irq_set_irq_type (irq,IRQ_TYPE_EDGE_RISING ); + nokia770_i2c_board_info_2[1 ].irq = irq; } -irq_set_irq_type (gpio_to_irq (retu_irq_gpio),IRQ_TYPE_EDGE_RISING ); -irq_set_irq_type (gpio_to_irq (tahvo_irq_gpio),IRQ_TYPE_EDGE_RISING ); - nokia770_i2c_board_info_2[0 ].irq =gpio_to_irq (retu_irq_gpio); - nokia770_i2c_board_info_2[1 ].irq =gpio_to_irq (tahvo_irq_gpio);i2c_register_board_info (2 , nokia770_i2c_board_info_2,ARRAY_SIZE (nokia770_i2c_board_info_2)); device_create_managed_software_node(&nokia770_cbus_device.dev,
@@ -276,8 +282,26 @@ static void __init nokia770_cbus_init(void) }#endif /* CONFIG_I2C_CBUS_GPIO */ +static struct gpiod_lookup_table nokia770_irq_gpio_table = { + .dev_id =NULL , + .table = { +/* GPIO used by SPI device 1 */ +GPIO_LOOKUP ("gpio-0-15" ,15 ,"ads7846_irq" , +GPIO_ACTIVE_HIGH ), +/* GPIO used for retu IRQ */ +GPIO_LOOKUP ("gpio-48-63" ,15 ,"retu_irq" , +GPIO_ACTIVE_HIGH ), +/* GPIO used for tahvo IRQ */ +GPIO_LOOKUP ("gpio-32-47" ,8 ,"tahvo_irq" , +GPIO_ACTIVE_HIGH ), + { } + }, +}; +static void __init omap_nokia770_init (void ) { +struct gpio_desc *d; +/* On Nokia 770, the SleepX signal is masked with an * MPUIO line by default. It has to be unmasked for it * to become functional */
@@ -289,6 +313,14 @@ static void __init omap_nokia770_init(void)software_node_register_node_group (nokia770_gpiochip_nodes);platform_add_devices (nokia770_devices,ARRAY_SIZE (nokia770_devices)); + +gpiod_add_lookup_table (&nokia770_irq_gpio_table); + d =gpiod_get (NULL ,"ads7846_irq" ,GPIOD_IN ); +if (IS_ERR (d)) +pr_err ("Unable to get ADS7846 IRQ GPIO descriptor\n" ); +else + nokia770_spi_board_info[1 ].irq =gpiod_to_irq (d); +spi_register_board_info (nokia770_spi_board_info,ARRAY_SIZE (nokia770_spi_board_info));omap_serial_init ();
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 292/800 ARM: omap1: Make serial wakeup GPIOs use descriptors
In reply to Greg Kroah-HartmanFrom: Linus Walleij <[email protected]>
[ Upstream commit df89de979f0e09e1896d59312362ce1657b848eb ]
The code in serial.c looks up GPIOs corresponding to a line on the UART when muxed in as GPIO to use this as a wakeup on serial activity for OMAP1.
Utilize the NULL device to define some board-specific GPIO lookups and use these to immediately look up the same GPIOs, set as input and convert to IRQ numbers, then set these to wakeup IRQs. This is ugly but should work.
This is only needed on the OSK1 and Nokia 770 devices that use the OMAP16xx.
--- arch/arm/mach-omap1/board-nokia770.c | 7 +++++++ arch/arm/mach-omap1/board-osk.c | 7 +++++++ arch/arm/mach-omap1/serial.c | 30 ++++++++++++++-------------- 3 files changed, 29 insertions(+), 15 deletions(-)
arch/arm/mach-omap1/board-nokia770.c +7 -0
@@ -294,6 +294,13 @@ static struct gpiod_lookup_table nokia770_irq_gpio_table = {/* GPIO used for tahvo IRQ */ GPIO_LOOKUP("gpio-32-47", 8, "tahvo_irq", GPIO_ACTIVE_HIGH), +/* GPIOs used by serial wakeup IRQs */ + GPIO_LOOKUP_IDX("gpio-32-47", 5, "wakeup", 0, + GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("gpio-16-31", 2, "wakeup", 1, + GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("gpio-48-63", 1, "wakeup", 2, + GPIO_ACTIVE_HIGH), { } }, };
arch/arm/mach-omap1/board-osk.c +7 -0
@@ -364,6 +364,13 @@ static struct gpiod_lookup_table osk_irq_gpio_table = {/* GPIO used by the TPS65010 chip */ GPIO_LOOKUP("mpuio", 1, "tps65010", GPIO_ACTIVE_HIGH), +/* GPIOs used for serial wakeup IRQs */ + GPIO_LOOKUP_IDX("gpio-32-47", 5, "wakeup", 0, + GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("gpio-16-31", 2, "wakeup", 1, + GPIO_ACTIVE_HIGH), + GPIO_LOOKUP_IDX("gpio-48-63", 1, "wakeup", 2, + GPIO_ACTIVE_HIGH), { } }, };
arch/arm/mach-omap1/serial.c +15 -15
@@ -4,7 +4,8 @@* * OMAP1 serial support. */ -#include <linux/gpio.h> +#include <linux/gpio/machine.h> +#include <linux/gpio/consumer.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h>
@@ -196,39 +197,38 @@ void omap_serial_wake_trigger(int enable) } } -static void __init omap_serial_set_port_wakeup (int gpio_nr) +static void __init omap_serial_set_port_wakeup (int idx) { +struct gpio_desc *d;int ret; - ret =gpio_request (gpio_nr,"UART wake" ); -if (ret <0 ) { -printk (KERN_ERR "Could not request UART wake GPIO: %i\n" , - gpio_nr); + d =gpiod_get_index (NULL ,"wakeup" , idx,GPIOD_IN ); +if (IS_ERR (d)) { +pr_err ("Unable to get UART wakeup GPIO descriptor\n" );return ; } -gpio_direction_input (gpio_nr); - ret =request_irq (gpio_to_irq (gpio_nr), &omap_serial_wake_interrupt, + ret =request_irq (gpiod_to_irq (d), &omap_serial_wake_interrupt,IRQF_TRIGGER_RISING ,"serial wakeup" ,NULL );if (ret) { -gpio_free (gpio_nr); -printk (KERN_ERR "No interrupt for UART wake GPIO: %i\n" , - gpio_nr); +gpiod_put (d); +pr_err ("No interrupt for UART%d wake GPIO\n" , idx +1 );return ; } -enable_irq_wake (gpio_to_irq (gpio_nr)); +enable_irq_wake (gpiod_to_irq (d)); } +int __init omap_serial_wakeup_init (void ) {if (!cpu_is_omap16xx ())return 0 ;if (uart1_ck !=NULL ) -omap_serial_set_port_wakeup (37 ); +omap_serial_set_port_wakeup (0 );if (uart2_ck !=NULL ) -omap_serial_set_port_wakeup (18 ); +omap_serial_set_port_wakeup (1 );if (uart3_ck !=NULL ) -omap_serial_set_port_wakeup (49 ); +omap_serial_set_port_wakeup (2 );return 0 ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 293/800 ARM: omap1: Exorcise the legacy GPIO header
In reply to Greg Kroah-HartmanFrom: Linus Walleij <[email protected]>
[ Upstream commit c729baa8604226a8f878296bd145ab4046c80b12 ]
After fixing all the offending users referencing the global GPIO numberspace in OMAP1, a few sites still remain including the legacy <linus/gpio.h> header for no reason.
Delete the last remaining users, and OMAP1 is free from legacy GPIO dependencies.
--- arch/arm/mach-omap1/devices.c | 1 - arch/arm/mach-omap1/gpio15xx.c | 1 - arch/arm/mach-omap1/gpio16xx.c | 1 - arch/arm/mach-omap1/irq.c | 1 - 4 files changed, 4 deletions(-)
arch/arm/mach-omap1/devices.c +0 -1
@@ -6,7 +6,6 @@*/ #include <linux/dma-mapping.h> -#include <linux/gpio.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h>
arch/arm/mach-omap1/gpio15xx.c +0 -1
@@ -8,7 +8,6 @@* Charulatha V <[email protected]> */ -#include <linux/gpio.h> #include <linux/platform_data/gpio-omap.h> #include <linux/soc/ti/omap1-soc.h> #include <asm/irq.h>
arch/arm/mach-omap1/gpio16xx.c +0 -1
@@ -8,7 +8,6 @@* Charulatha V <[email protected]> */ -#include <linux/gpio.h> #include <linux/platform_data/gpio-omap.h> #include <linux/soc/ti/omap1-io.h>
arch/arm/mach-omap1/irq.c +0 -1
@@ -35,7 +35,6 @@* with this program; if not, write to the Free Software Foundation, Inc., * 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <linux/gpio.h> #include <linux/init.h> #include <linux/module.h> #include <linux/sched.h>
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 294/800 ARM/gpio: Push OMAP2 quirk down into TWL4030 driver
In reply to Greg Kroah-HartmanFrom: Linus Walleij <[email protected]>
[ Upstream commit d5f4fa60d63aa54ae33339895b88d8932b6037ed ]
The TWL4030 GPIO driver has a custom platform data .set_up() callback to call back into the platform and do misc stuff such as hog and export a GPIO for WLAN PWR on a specific OMAP3 board.
Avoid all the kludgery in the platform data and the boardfile and just put the quirks right into the driver. Make it conditional on OMAP3.
I think the exported GPIO is used by some kind of userspace so ordinary DTS hogs will probably not work.
--- arch/arm/mach-omap2/omap_device.c | 1 - arch/arm/mach-omap2/pdata-quirks.c | 41 +---------------------- drivers/gpio/gpio-twl4030.c | 52 +++++++++++++++++++++--------- include/linux/mfd/twl.h | 3 -- 4 files changed, 37 insertions(+), 60 deletions(-)
arch/arm/mach-omap2/omap_device.c +0 -1
@@ -244,7 +244,6 @@ static int _omap_device_notifier_call(struct notifier_block *nb,case BUS_NOTIFY_ADD_DEVICE :if (pdev->dev.of_node)omap_device_build_from_dt (pdev); -omap_auxdata_legacy_init (dev); fallthrough;default : od =to_omap_device (pdev);
arch/arm/mach-omap2/pdata-quirks.c +1 -40
77 lines not on this page · raw message
drivers/gpio/gpio-twl4030.c +36 -16
95 lines not on this page · raw message
include/linux/mfd/twl.h +0 -3
@@ -593,9 +593,6 @@ struct twl4030_gpio_platform_data {*/ u32 pullups;u32 pulldowns; - -int (*setup)(struct device *dev, -unsigned gpio,unsigned ngpio); };struct twl4030_madc_platform_data {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 295/800 ARM: omap2: Get USB hub reset GPIO from descriptor
In reply to Greg Kroah-HartmanFrom: Linus Walleij <[email protected]>
[ Upstream commit 94075d16beefc2304e756e3b23d8ecf0f36eecd7 ]
This switches the USB hub GPIO reset line handling in the OMAP2 pdata quirks over to using GPIO descriptors to avoid using the global GPIO numberspace.
Since the GPIOs are exported and assumedly used by some kind of userspace we cannot simply use hogs in the device tree.
--- arch/arm/mach-omap2/pdata-quirks.c | 50 ++++++++++++++++++++++-------- 1 file changed, 37 insertions(+), 13 deletions(-)
arch/arm/mach-omap2/pdata-quirks.c +37 -13
@@ -98,31 +98,43 @@ static struct iommu_platform_data omap3_iommu_isp_pdata = { };#endif -static void __init omap3_sbc_t3x_usb_hub_init (int gpio,char *hub_name) +static void __init omap3_sbc_t3x_usb_hub_init (char *hub_name,int idx) { -int err =gpio_request_one (gpio,GPIOF_OUT_INIT_LOW , hub_name); +struct gpio_desc *d; -if (err) { -pr_err ("SBC-T3x: %s reset gpio request failed: %d\n" , - hub_name, err); +/* This asserts the RESET line (reverse polarity) */ + d =gpiod_get_index (NULL ,"reset" , idx,GPIOD_OUT_HIGH ); +if (IS_ERR (d)) { +pr_err ("Unable to get T3x USB reset GPIO descriptor\n" );return ; } - -gpiod_export (gpio_to_desc (gpio),0 ); - +gpiod_set_consumer_name (d, hub_name); +gpiod_export (d,0 );udelay (10 ); -gpio_set_value (gpio,1 ); +/* De-assert RESET */ +gpiod_set_value (d,0 );msleep (1 ); } +static struct gpiod_lookup_table omap3_sbc_t3x_usb_gpio_table = { + .dev_id =NULL , + .table = { +GPIO_LOOKUP_IDX ("gpio-160-175" ,7 ,"reset" ,0 , +GPIO_ACTIVE_LOW ), + { } + }, +}; +static void __init omap3_sbc_t3730_legacy_init (void ) { -omap3_sbc_t3x_usb_hub_init (167 ,"sb-t35 usb hub" ); +gpiod_add_lookup_table (&omap3_sbc_t3x_usb_gpio_table); +omap3_sbc_t3x_usb_hub_init ("sb-t35 usb hub" ,0 ); }static void __init omap3_sbc_t3530_legacy_init (void ) { -omap3_sbc_t3x_usb_hub_init (167 ,"sb-t35 usb hub" ); +gpiod_add_lookup_table (&omap3_sbc_t3x_usb_gpio_table); +omap3_sbc_t3x_usb_hub_init ("sb-t35 usb hub" ,0 ); }static void __init omap3_evm_legacy_init (void )
@@ -187,10 +199,22 @@ static void __init omap3_sbc_t3517_wifi_init(void)gpio_set_value (cm_t3517_wlan_gpios[1 ].gpio,0 ); } +static struct gpiod_lookup_table omap3_sbc_t3517_usb_gpio_table = { + .dev_id =NULL , + .table = { +GPIO_LOOKUP_IDX ("gpio-144-159" ,8 ,"reset" ,0 , +GPIO_ACTIVE_LOW ), +GPIO_LOOKUP_IDX ("gpio-96-111" ,2 ,"reset" ,1 , +GPIO_ACTIVE_LOW ), + { } + }, +}; +static void __init omap3_sbc_t3517_legacy_init (void ) { -omap3_sbc_t3x_usb_hub_init (152 ,"cm-t3517 usb hub" ); -omap3_sbc_t3x_usb_hub_init (98 ,"sb-t35 usb hub" ); +gpiod_add_lookup_table (&omap3_sbc_t3517_usb_gpio_table); +omap3_sbc_t3x_usb_hub_init ("cm-t3517 usb hub" ,0 ); +omap3_sbc_t3x_usb_hub_init ("sb-t35 usb hub" ,1 );am35xx_emac_reset ();hsmmc2_internal_input_clk ();omap3_sbc_t3517_wifi_init ();
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 296/800 ARM: omap2: Rewrite WLAN quirk to use GPIO descriptors
In reply to Greg Kroah-HartmanFrom: Linus Walleij <[email protected]>
[ Upstream commit 078dc5194c0ac1b8e2fc088be2168a1104e16f72 ]
The OMAP2 platform data quirk is using the global GPIO numberspace to obtain two WLAN GPIOs to drive power and xcvr reset GPIO lines during start-up.
Rewrite the quirk to use a GPIO descriptor table so we avoid using global GPIO numbers.
This gets rid of the final dependency on the legacy <linux/gpio.h> header from the OMAP2/3 platforms.
--- arch/arm/mach-omap2/pdata-quirks.c | 41 ++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 13 deletions(-)
arch/arm/mach-omap2/pdata-quirks.c +28 -13
@@ -8,7 +8,6 @@#include <linux/davinci_emac.h> #include <linux/gpio/machine.h> #include <linux/gpio/consumer.h> -#include <linux/gpio.h> #include <linux/init.h> #include <linux/kernel.h> #include <linux/of_platform.h>
@@ -178,25 +177,41 @@ static void __init am35xx_emac_reset(void)omap_ctrl_readl (AM35XX_CONTROL_IP_SW_RESET );/* OCP barrier */ } -static struct gpio cm_t3517_wlan_gpios[]__initdata = { - {56 ,GPIOF_OUT_INIT_HIGH ,"wlan pwr" }, - {4 ,GPIOF_OUT_INIT_HIGH ,"xcvr noe" }, +static struct gpiod_lookup_table cm_t3517_wlan_gpio_table = { + .dev_id =NULL , + .table = { +GPIO_LOOKUP ("gpio-48-53" ,8 ,"power" , +GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP ("gpio-0-15" ,4 ,"noe" , +GPIO_ACTIVE_HIGH ), + { } + }, };static void __init omap3_sbc_t3517_wifi_init (void ) { -int err =gpio_request_array (cm_t3517_wlan_gpios, -ARRAY_SIZE (cm_t3517_wlan_gpios)); -if (err) { -pr_err ("SBC-T3517: wl12xx gpios request failed: %d\n" , err); -return ; - } +struct gpio_desc *d; -gpiod_export (gpio_to_desc (cm_t3517_wlan_gpios[0 ].gpio),0 ); -gpiod_export (gpio_to_desc (cm_t3517_wlan_gpios[1 ].gpio),0 ); +gpiod_add_lookup_table (&cm_t3517_wlan_gpio_table); +/* This asserts the RESET line (reverse polarity) */ + d =gpiod_get (NULL ,"power" ,GPIOD_OUT_HIGH ); +if (IS_ERR (d)) { +pr_err ("Unable to get CM T3517 WLAN power GPIO descriptor\n" ); + }else { +gpiod_set_consumer_name (d,"wlan pwr" ); +gpiod_export (d,0 ); + } + + d =gpiod_get (NULL ,"noe" ,GPIOD_OUT_HIGH ); +if (IS_ERR (d)) { +pr_err ("Unable to get CM T3517 WLAN XCVR NOE GPIO descriptor\n" ); + }else { +gpiod_set_consumer_name (d,"xcvr noe" ); +gpiod_export (d,0 ); + }msleep (100 ); -gpio_set_value (cm_t3517_wlan_gpios[1 ].gpio,0 ); +gpiod_set_value (d,0 ); }static struct gpiod_lookup_table omap3_sbc_t3517_usb_gpio_table = {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 297/800 ARM/musb: omap2: Remove global GPIO numbers from TUSB6010
In reply to Greg Kroah-HartmanFrom: Linus Walleij <[email protected]>
[ Upstream commit 8e0285ab95a9baf374f2c13eb152221c8ecb3f28 ]
The TUSB6010 (MUSB) device is picking up some GPIO lines hardcoded by number and passing on to the TUSB6010 device when registering it.
Instead of nasty workarounds, provide a GPIO descriptor table and then make the TUSB6010 MUSB glue driver pick up the GPIO lines directly, convert it to an IRQ and pass down to the MUSB driver. OMAP2 is the only system using the TUSB6010.
Stash the GPIO descriptors in the glue layer and use then to power up and down the TUSB6010 on-demand, instead of using boardfile callbacks.
Since the OMAP2 boards are the only boards using the .set_power() and .board_set_power() callbacks, we can just delete them as the power is now handled directly in the TUSB6010 glue code.
--- arch/arm/mach-omap2/board-n8x0.c | 71 ++++++++---------------------- arch/arm/mach-omap2/usb-tusb6010.c | 20 ++------- arch/arm/mach-omap2/usb-tusb6010.h | 12 +++++ drivers/usb/musb/musb_core.c | 1 - drivers/usb/musb/musb_core.h | 2 - drivers/usb/musb/tusb6010.c | 53 ++++++++++++++++------ include/linux/usb/musb.h | 13 ------ 7 files changed, 73 insertions(+), 99 deletions(-) create mode 100644 arch/arm/mach-omap2/usb-tusb6010.h
arch/arm/mach-omap2/board-n8x0.c +18 -53
@@ -10,8 +10,8 @@#include <linux/clk.h> #include <linux/delay.h> -#include <linux/gpio.h> #include <linux/gpio/machine.h> +#include <linux/gpio/consumer.h> #include <linux/init.h> #include <linux/io.h> #include <linux/irq.h>
@@ -29,13 +29,12 @@#include "common.h" #include "mmc.h" +#include "usb-tusb6010.h" #include "soc.h" #include "common-board-devices.h" #define TUSB6010_ASYNC_CS 1#define TUSB6010_SYNC_CS 4 -#define TUSB6010_GPIO_INT 58 -#define TUSB6010_GPIO_ENABLE 0#define TUSB6010_DMACHAN 0x3f#define NOKIA_N810_WIMAX (1 << 2)
@@ -62,37 +61,6 @@ static void board_check_revision(void) }#if IS_ENABLED (CONFIG_USB_MUSB_TUSB6010 ) -/* -* Enable or disable power to TUSB6010. When enabling, turn on 3.3 V and -* 1.5 V voltage regulators of PM companion chip. Companion chip will then -* provide then PGOOD signal to TUSB6010 which will release it from reset. -*/ -static int tusb_set_power (int state) -{ -int i, retval =0 ; - -if (state) { -gpio_set_value (TUSB6010_GPIO_ENABLE ,1 ); -msleep (1 ); - -/* Wait until TUSB6010 pulls INT pin down */ - i =100 ; -while (i &&gpio_get_value (TUSB6010_GPIO_INT )) { -msleep (1 ); - i--; - } - -if (!i) { -printk (KERN_ERR "tusb: powerup failed\n" ); - retval = -ENODEV ; - } - }else { -gpio_set_value (TUSB6010_GPIO_ENABLE ,0 ); -msleep (10 ); - } - -return retval; -}static struct musb_hdrc_config musb_config = { .multipoint = 1,
@@ -103,39 +71,36 @@ static struct musb_hdrc_config musb_config = {static struct musb_hdrc_platform_data tusb_data = { .mode =MUSB_OTG , - .set_power = tusb_set_power, .min_power =25 ,/* x2 = 50 mA drawn from VBUS as peripheral */ .power =100 ,/* Max 100 mA VBUS for host mode */ .config = &musb_config, }; +static struct gpiod_lookup_table tusb_gpio_table = { + .dev_id ="musb-tusb" , + .table = { +GPIO_LOOKUP ("gpio-0-15" ,0 ,"enable" , +GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP ("gpio-48-63" ,10 ,"int" , +GPIO_ACTIVE_HIGH ), + { } + }, +}; +static void __init n8x0_usb_init (void ) {int ret =0 ; -static const char announce[]__initconst =KERN_INFO "TUSB 6010\n" ; - -/* PM companion chip power control pin */ - ret =gpio_request_one (TUSB6010_GPIO_ENABLE ,GPIOF_OUT_INIT_LOW , -"TUSB6010 enable" ); -if (ret !=0 ) { -printk (KERN_ERR "Could not get TUSB power GPIO%i\n" , -TUSB6010_GPIO_ENABLE ); -return ; - } -tusb_set_power (0 ); +gpiod_add_lookup_table (&tusb_gpio_table); ret =tusb6010_setup_interface (&tusb_data,TUSB6010_REFCLK_19 ,2 , -TUSB6010_ASYNC_CS ,TUSB6010_SYNC_CS , -TUSB6010_GPIO_INT ,TUSB6010_DMACHAN ); +TUSB6010_ASYNC_CS ,TUSB6010_SYNC_CS , +TUSB6010_DMACHAN );if (ret !=0 ) - goto err; +return ; -printk (announce); +pr_info ("TUSB 6010\n" );return ; - -err: -gpio_free (TUSB6010_GPIO_ENABLE ); }#else
arch/arm/mach-omap2/usb-tusb6010.c +4 -16
@@ -11,12 +11,12 @@#include <linux/errno.h> #include <linux/delay.h> #include <linux/platform_device.h> -#include <linux/gpio.h> #include <linux/export.h> #include <linux/platform_data/usb-omap.h> #include <linux/usb/musb.h> +#include "usb-tusb6010.h" #include "gpmc.h" static u8 async_cs, sync_cs;
@@ -132,10 +132,6 @@ static struct resource tusb_resources[] = { {/* Synchronous access */ .flags = IORESOURCE_MEM, }, - {/* IRQ */ - .name = "mc", - .flags = IORESOURCE_IRQ, - }, };static u64 tusb_dmamask = ~(u32 )0 ;
@@ -154,9 +150,9 @@ static struct platform_device tusb_device = {/* this may be called only from board-*.c setup code */ int __init tusb6010_setup_interface (struct musb_hdrc_platform_data *data, -unsigned ps_refclk,unsigned waitpin, -unsigned async,unsigned sync, -unsigned irq,unsigned dmachan) +unsigned int ps_refclk,unsigned int waitpin, +unsigned int async,unsigned int sync, +unsigned int dmachan) {int status; static char error[] __initdata =
@@ -192,14 +188,6 @@ int __init tusb6010_setup_interface(struct musb_hdrc_platform_data *data,if (status <0 )return status; -/* IRQ */ - status =gpio_request_one (irq,GPIOF_IN ,"TUSB6010 irq" ); -if (status <0 ) { -printk (error,3 , status); -return status; - } - tusb_resources[2 ].start =gpio_to_irq (irq); -/* set up memory timings ... can speed them up later */ if (!ps_refclk) {printk (error,4 , status);
arch/arm/mach-omap2/usb-tusb6010.h new file +12 -0
@@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef __USB_TUSB6010_H +#define __USB_TUSB6010_H + +extern int __init tusb6010_setup_interface ( +struct musb_hdrc_platform_data *data, +unsigned int ps_refclk,unsigned int waitpin, +unsigned int async_cs,unsigned int sync_cs, +unsigned int dmachan); + +#endif /* __USB_TUSB6010_H */
drivers/usb/musb/musb_core.c +0 -1
@@ -2330,7 +2330,6 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)spin_lock_init (&musb->lock);spin_lock_init (&musb->list_lock); - musb->board_set_power = plat->set_power; musb->min_power = plat->min_power; musb->ops = plat->platform_ops; musb->port_mode = plat->mode;
drivers/usb/musb/musb_core.h +0 -2
@@ -352,8 +352,6 @@ struct musb {u16 epmask;u8 nr_endpoints; -int (*board_set_power)(int state); -u8 min_power;/* vbus for periph, in mA/2 */ enum musb_mode port_mode;
drivers/usb/musb/tusb6010.c +39 -14
102 lines not on this page · raw message
include/linux/usb/musb.h +0 -13
@@ -99,9 +99,6 @@ struct musb_hdrc_platform_data {/* (HOST or OTG) program PHY for external Vbus */ unsigned extvbus:1; -/* Power the device on or off */ -int (*set_power)(int state); -/* MUSB configuration-specific details */ const struct musb_hdrc_config *config;
@@ -135,14 +132,4 @@ static inline int musb_mailbox(enum musb_vbus_id_status status)#define TUSB6010_REFCLK_24 41667/* psec/clk @ 24.0 MHz XI */ #define TUSB6010_REFCLK_19 52083/* psec/clk @ 19.2 MHz CLKIN */ -#ifdef CONFIG_ARCH_OMAP2 - -extern int __init tusb6010_setup_interface ( -struct musb_hdrc_platform_data *data, -unsigned ps_refclk,unsigned waitpin, -unsigned async_cs,unsigned sync_cs, -unsigned irq,unsigned dmachan); - -#endif /* OMAP2 */ -#endif /* __LINUX_USB_MUSB_H */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 298/800 ARM: dts: qcom: msm8974: do not use underscore in node name (again)
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 311bbc884b2edcf584b67d331be85ce43b27586f ]
Align RPM requests node with DT schema by using hyphen instead of underscore.
--- arch/arm/boot/dts/qcom-msm8974.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/qcom-msm8974.dtsi +1 -1
@@ -301,7 +301,7 @@ rpm { qcom,ipc = <&apcs 8 0>; qcom,smd-edge = <15>; - rpm_requests: rpm_requests { + rpm_requests: rpm-requests { compatible = "qcom,rpm-msm8974"; qcom,smd-channels = "rpm_requests";
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 299/800 arm64: dts: qcom: pm8998: dont use GIC_SPI for SPMI interrupts
In reply to Greg Kroah-HartmanFrom: Dmitry Baryshkov <[email protected]>
[ Upstream commit d9ef7a805a709a0b07341857d97a25598a7f92da ]
Unlike typical GIC interrupts, first cell for SPMI interrupts is the USID rather than GIC_SPI/GIC_PPI/GIC_LPI qualifier. Fix the resin interrupt to use USID value 0x0 rather than GIC_SPI define.
--- arch/arm64/boot/dts/qcom/pm8998.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/pm8998.dtsi +1 -1
@@ -55,7 +55,7 @@ pm8998_pwrkey: pwrkey { pm8998_resin: resin { compatible = "qcom,pm8941-resin"; - interrupts = <GIC_SPI 0x8 1 IRQ_TYPE_EDGE_BOTH>; + interrupts = <0x0 0x8 1 IRQ_TYPE_EDGE_BOTH>; debounce = <15625>; bias-pull-up; status = "disabled";
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 300/800 arm64: dts: qcom: ipq6018: correct qrng unit address
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 085058786a7890dd44ec623fe5ac74db870f6b93 ]
Match unit-address to reg entry to fix dtbs W=1 warnings:
Warning (simple_bus_reg): /soc/qrng@e1000: simple-bus unit address format error, expected "e3000"
--- arch/arm64/boot/dts/qcom/ipq6018.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/ipq6018.dtsi +1 -1
@@ -302,7 +302,7 @@ mdio: mdio@90000 { status = "disabled"; }; - prng: qrng@e1000 { + prng: qrng@e3000 { compatible = "qcom,prng-ee"; reg = <0x0 0x000e3000 0x0 0x1000>; clocks = <&gcc GCC_PRNG_AHB_CLK>;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 301/800 arm64: dts: qcom: msm8916: correct camss unit address
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 48798d992ce276cf0d57bf75318daf8eabd02aa4 ]
Match unit-address to reg entry to fix dtbs W=1 warnings:
Warning (simple_bus_reg): /soc@0/camss@1b00000: simple-bus unit address format error, expected "1b0ac00"
--- arch/arm64/boot/dts/qcom/msm8916.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/msm8916.dtsi +1 -1
@@ -1162,7 +1162,7 @@ dsi_phy0: phy@1a98300 { }; }; - camss: camss@1b00000 { + camss: camss@1b0ac00 { compatible = "qcom,msm8916-camss"; reg = <0x01b0ac00 0x200>, <0x01b00030 0x4>,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 302/800 arm64: dts: qcom: msm8916: correct MMC unit address
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 72644bc76d5145c098c268829554a0b98fab1de1 ]
Match unit-address to reg entry to fix dtbs W=1 warnings:
Warning (simple_bus_reg): /soc@0/mmc@7824000: simple-bus unit address format error, expected "7824900" Warning (simple_bus_reg): /soc@0/mmc@7864000: simple-bus unit address format error, expected "7864900"
--- arch/arm64/boot/dts/qcom/msm8916.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/msm8916.dtsi +2 -2
@@ -1554,7 +1554,7 @@ lpass_codec: audio-codec@771c000 { #sound-dai-cells = <1>; }; - sdhc_1: mmc@7824000 { + sdhc_1: mmc@7824900 { compatible = "qcom,msm8916-sdhci", "qcom,sdhci-msm-v4"; reg = <0x07824900 0x11c>, <0x07824000 0x800>; reg-names = "hc", "core";
@@ -1572,7 +1572,7 @@ sdhc_1: mmc@7824000 { status = "disabled"; }; - sdhc_2: mmc@7864000 { + sdhc_2: mmc@7864900 { compatible = "qcom,msm8916-sdhci", "qcom,sdhci-msm-v4"; reg = <0x07864900 0x11c>, <0x07864000 0x800>; reg-names = "hc", "core";
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 303/800 arm64: dts: qcom: msm8916: correct WCNSS unit address
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 1f9a41bb0bba7b373c26a6f2cc8d35cc3159c861 ]
Match unit-address to reg entry to fix dtbs W=1 warnings:
Warning (simple_bus_reg): /soc@0/remoteproc@a21b000: simple-bus unit address format error, expected "a204000"
--- arch/arm64/boot/dts/qcom/msm8916.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/msm8916.dtsi +1 -1
@@ -1871,7 +1871,7 @@ usb_hs_phy: phy { }; }; - wcnss: remoteproc@a21b000 { + wcnss: remoteproc@a204000 { compatible = "qcom,pronto-v2-pil", "qcom,pronto"; reg = <0x0a204000 0x2000>, <0x0a202000 0x1000>, <0x0a21b000 0x3000>; reg-names = "ccu", "dxe", "pmu";
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 304/800 arm64: dts: qcom: msm8953: correct IOMMU unit address
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 1c06b93461ec9df8a5878947db4a9d2d1cb72855 ]
Match unit-address to reg entry to fix dtbs W=1 warnings:
Warning (simple_bus_reg): /soc@0/iommu@1e00000: simple-bus unit address format error, expected "1e20000"
--- arch/arm64/boot/dts/qcom/msm8953.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/msm8953.dtsi +1 -1
@@ -1002,7 +1002,7 @@ dsi1_phy: phy@1a96400 { }; }; - apps_iommu: iommu@1e00000 { + apps_iommu: iommu@1e20000 { compatible = "qcom,msm8953-iommu", "qcom,msm-iommu-v1"; ranges = <0 0x01e20000 0x20000>;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 305/800 arm64: dts: qcom: msm8953: correct WCNSS unit address
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 751038676e3075a5cb816034f7d5ba6e95f4486d ]
Match unit-address to reg entry to fix dtbs W=1 warnings:
Warning (simple_bus_reg): /soc@0/remoteproc@a21b000: simple-bus unit address format error, expected "a204000"
--- arch/arm64/boot/dts/qcom/msm8953.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/msm8953.dtsi +1 -1
@@ -1425,7 +1425,7 @@ i2c_8: i2c@7af8000 { status = "disabled"; }; - wcnss: remoteproc@a21b000 { + wcnss: remoteproc@a204000 { compatible = "qcom,pronto-v3-pil", "qcom,pronto"; reg = <0x0a204000 0x2000>, <0x0a202000 0x1000>, <0x0a21b000 0x3000>; reg-names = "ccu", "dxe", "pmu";
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 306/800 arm64: dts: qcom: msm8976: correct MMC unit address
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 80284797a4cb8ceae71e3c403bafc6648263a060 ]
Match unit-address to reg entry to fix dtbs W=1 warnings:
Warning (simple_bus_reg): /soc@0/mmc@7824000: simple-bus unit address format error, expected "7824900" Warning (simple_bus_reg): /soc@0/mmc@7864000: simple-bus unit address format error, expected "7864900" Warning (simple_bus_reg): /soc@0/mmc@7a24000: simple-bus unit address format error, expected "7a24900"
--- arch/arm64/boot/dts/qcom/msm8976.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/qcom/msm8976.dtsi +3 -3
@@ -822,7 +822,7 @@ spmi_bus: spmi@200f000 { #interrupt-cells = <4>; }; - sdhc_1: mmc@7824000 { + sdhc_1: mmc@7824900 { compatible = "qcom,msm8976-sdhci", "qcom,sdhci-msm-v4"; reg = <0x07824900 0x500>, <0x07824000 0x800>; reg-names = "hc", "core";
@@ -838,7 +838,7 @@ sdhc_1: mmc@7824000 { status = "disabled"; }; - sdhc_2: mmc@7864000 { + sdhc_2: mmc@7864900 { compatible = "qcom,msm8976-sdhci", "qcom,sdhci-msm-v4"; reg = <0x07864900 0x11c>, <0x07864000 0x800>; reg-names = "hc", "core";
@@ -957,7 +957,7 @@ otg: usb@78db000 { #reset-cells = <1>; }; - sdhc_3: mmc@7a24000 { + sdhc_3: mmc@7a24900 { compatible = "qcom,msm8976-sdhci", "qcom,sdhci-msm-v4"; reg = <0x07a24900 0x11c>, <0x07a24000 0x800>; reg-names = "hc", "core";
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 307/800 arm64: dts: qcom: msm8994: correct SPMI unit address
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 24f0f6a8059c7108d4ee3476c95db1e7ff4feb79 ]
Match unit-address to reg entry to fix dtbs W=1 warnings:
Warning (simple_bus_reg): /soc/spmi@fc4c0000: simple-bus unit address format error, expected "fc4cf000"
--- arch/arm64/boot/dts/qcom/msm8994.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/msm8994.dtsi +1 -1
@@ -747,7 +747,7 @@ restart@fc4ab000 { reg = <0xfc4ab000 0x4>; }; - spmi_bus: spmi@fc4c0000 { + spmi_bus: spmi@fc4cf000 { compatible = "qcom,spmi-pmic-arb"; reg = <0xfc4cf000 0x1000>, <0xfc4cb000 0x1000>,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 308/800 arm64: dts: qcom: msm8996: correct camss unit address
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit e959ced1d0e5ef0b1f66a0c2d0e1ae80790e5ca5 ]
Match unit-address to reg entry to fix dtbs W=1 warnings:
Warning (simple_bus_reg): /soc/camss@a00000: simple-bus unit address format error, expected "a34000"
--- arch/arm64/boot/dts/qcom/msm8996.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/msm8996.dtsi +1 -1
@@ -2069,7 +2069,7 @@ ufsphy_lane: phy@627400 { }; }; - camss: camss@a00000 { + camss: camss@a34000 { compatible = "qcom,msm8996-camss"; reg = <0x00a34000 0x1000>, <0x00a00030 0x4>,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 309/800 arm64: dts: qcom: sdm630: correct camss unit address
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit c8b7faa7e9913a94444b3f00b6480e53a174fcfd ]
Match unit-address to reg entry to fix dtbs W=1 warnings:
Warning (simple_bus_reg): /soc/camss@ca00000: simple-bus unit address format error, expected "ca00020"
--- arch/arm64/boot/dts/qcom/sdm630.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sdm630.dtsi +1 -1
@@ -1894,7 +1894,7 @@ pil-reloc@94c { }; }; - camss: camss@ca00000 { + camss: camss@ca00020 { compatible = "qcom,sdm660-camss"; reg = <0x0ca00020 0x10>, <0x0ca30000 0x100>,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 310/800 arm64: dts: qcom: sdm845: correct camss unit address
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit a05b913a27e46926ba60ba2bcacc7ec7a8403e4c ]
Match unit-address to reg entry to fix dtbs W=1 warnings:
Warning (simple_bus_reg): /soc@0/camss@a00000: simple-bus unit address format error, expected "acb3000"
--- arch/arm64/boot/dts/qcom/sdm845.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sdm845.dtsi +1 -1
@@ -4238,7 +4238,7 @@ videocc: clock-controller@ab00000 { #reset-cells = <1>; }; - camss: camss@a00000 { + camss: camss@acb3000 { compatible = "qcom,sdm845-camss"; reg = <0 0x0acb3000 0 0x1000>,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 311/800 arm64: dts: qcom: sm6115: correct thermal-sensor unit address
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 2358b43256080459fcc5642265ed4fec75558f8c ]
Match unit-address to reg entry to fix dtbs W=1 warnings:
Warning (simple_bus_reg): /soc@0/thermal-sensor@4410000: simple-bus unit address format error, expected "4411000"
--- arch/arm64/boot/dts/qcom/sm6115.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sm6115.dtsi +1 -1
@@ -700,7 +700,7 @@ spmi_bus: spmi@1c40000 { #interrupt-cells = <4>; }; - tsens0: thermal-sensor@4410000 { + tsens0: thermal-sensor@4411000 { compatible = "qcom,sm6115-tsens", "qcom,tsens-v2"; reg = <0x0 0x04411000 0x0 0x1ff>, /* TM */ <0x0 0x04410000 0x0 0x8>; /* SROT */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 312/800 arm64: dts: qcom: sm8350: correct DMA controller unit address
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 41d6bca799b3f40d4d3c22dd4545aeac7c210e33 ]
Match unit-address to reg entry to fix dtbs W=1 warnings:
Warning (simple_bus_reg): /soc@0/dma-controller@900000: simple-bus unit address format error, expected "9800000"
--- arch/arm64/boot/dts/qcom/sm8350.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sm8350.dtsi +1 -1
@@ -907,7 +907,7 @@ spi19: spi@894000 { }; }; - gpi_dma0: dma-controller@900000 { + gpi_dma0: dma-controller@9800000 { compatible = "qcom,sm8350-gpi-dma", "qcom,sm6350-gpi-dma"; reg = <0 0x09800000 0 0x60000>; interrupts = <GIC_SPI 244 IRQ_TYPE_LEVEL_HIGH>,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 313/800 arm64: dts: qcom: sm8350: correct PCI phy unit address
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit ab98c21bc9246f421a6ae70e69f1b73cea6f85e3 ]
Match unit-address to reg entry to fix dtbs W=1 warnings:
Warning (simple_bus_reg): /soc@0/phy@1c0f000: simple-bus unit address format error, expected "1c0e000"
--- arch/arm64/boot/dts/qcom/sm8350.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sm8350.dtsi +1 -1
@@ -1638,7 +1638,7 @@ pcie1: pci@1c08000 { status = "disabled"; }; - pcie1_phy: phy@1c0f000 { + pcie1_phy: phy@1c0e000 { compatible = "qcom,sm8350-qmp-gen3x2-pcie-phy"; reg = <0 0x01c0e000 0 0x2000>; clocks = <&gcc GCC_PCIE_1_AUX_CLK>,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 314/800 arm64: dts: qcom: sm8350: correct USB phy unit address
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit a560ab70c6e28ba784a824611d3f58969d8fadba ]
Match unit-address to reg entry to fix dtbs W=1 warnings:
Warning (simple_bus_reg): /soc@0/phy@88e9000: simple-bus unit address format error, expected "88e8000"
--- arch/arm64/boot/dts/qcom/sm8350.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sm8350.dtsi +1 -1
@@ -2140,7 +2140,7 @@ usb_2_hsphy: phy@88e4000 { resets = <&gcc GCC_QUSB2PHY_SEC_BCR>; }; - usb_1_qmpphy: phy@88e9000 { + usb_1_qmpphy: phy@88e8000 { compatible = "qcom,sm8350-qmp-usb3-dp-phy"; reg = <0 0x088e8000 0 0x3000>;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 315/800 arm64: dts: qcom: sm8550: correct crypto unit address
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 3cbf49ef16962ab6d99a3659cb34a33c5f147b50 ]
Match unit-address to reg entry to fix dtbs W=1 warnings:
Warning (simple_bus_reg): /soc@0/crypto@1de0000: simple-bus unit address format error, expected "1dfa000"
--- arch/arm64/boot/dts/qcom/sm8550.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sm8550.dtsi +1 -1
@@ -1858,7 +1858,7 @@ cryptobam: dma-controller@1dc4000 { <&apps_smmu 0x481 0x0>; }; - crypto: crypto@1de0000 { + crypto: crypto@1dfa000 { compatible = "qcom,sm8550-qce", "qcom,sm8150-qce", "qcom,qce"; reg = <0x0 0x01dfa000 0x0 0x6000>; dmas = <&cryptobam 4>, <&cryptobam 5>;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 316/800 arm64: dts: qcom: sm8550: correct pinctrl unit address
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 950a4fe6ec8498799d1c7bd31a489a718f94a87e ]
Match unit-address to reg entry to fix dtbs W=1 warnings:
Warning (simple_bus_reg): /soc@0/pinctrl@f000000: simple-bus unit address format error, expected "f100000"
--- arch/arm64/boot/dts/qcom/sm8550.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sm8550.dtsi +1 -1
@@ -2883,7 +2883,7 @@ spmi_bus: spmi@c400000 { #interrupt-cells = <4>; }; - tlmm: pinctrl@f000000 { + tlmm: pinctrl@f100000 { compatible = "qcom,sm8550-tlmm"; reg = <0 0x0f100000 0 0x300000>; interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 317/800 arm64: dts: qcom: sdm845-polaris: add missing touchscreen child node reg
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 4a0156b8862665a3e31c8280607388e3001ace3d ]
Add missing reg property to touchscreen child node to fix dtbs W=1 warnings:
Warning (unit_address_vs_reg): /soc@0/geniqup@ac0000/i2c@a98000/touchscreen@20/rmi4-f12@12: node has a unit name, but no reg or ranges property
--- arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts +1 -0
@@ -483,6 +483,7 @@ rmi4-f01@1 { }; rmi4-f12@12 { + reg = <0x12>; syna,rezero-wait-ms = <0xc8>; syna,clip-x-high = <0x438>; syna,clip-y-high = <0x870>;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 318/800 arm64: dts: qcom: apq8016-sbc: Fix regulator constraints
In reply to Greg Kroah-HartmanFrom: Stephan Gerhold <[email protected]>
[ Upstream commit e27654df20d77ad7549a3cf6739ebaa3aa59a088 ]
For some reason DB410c has completely bogus regulator constraints that actually just correspond to the programmable voltages which are already provided by the regulator driver. Some of them are not just outside the recommended operating conditions of the APQ8016E SoC but even exceed the absolute maximum ratings, potentially risking permanent device damage.
In practice it's not quite as dangerous thanks to the RPM firmware:
It turns out that it has its own voltage constraints and silently clamps all regulator requests. For example, requesting 3.3V for L5 (allowed by the current regulator constraints!) still results in 1.8V being programmed in the actual regulator hardware.
Experimentation with various voltages shows that the internal RPM voltage constraints roughly correspond to the safe "specified range" in the PM8916 Device Specification (rather than the "programmable range" used inside apq8016-sbc.dtsi right now).
Combine those together with some fixed voltages used in the old msm-3.10 device tree from Qualcomm to give DB410c some actually valid voltage constraints.
--- arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 64 ++++++++++++------------ 1 file changed, 32 insertions(+), 32 deletions(-)
arch/arm64/boot/dts/qcom/apq8016-sbc.dts +32 -32
@@ -447,21 +447,21 @@ &smd_rpm_regulators { vdd_l7-supply = <&pm8916_s4>; s3 { - regulator-min-microvolt = <375000>; - regulator-max-microvolt = <1562000>; + regulator-min-microvolt = <1250000>; + regulator-max-microvolt = <1350000>; }; s4 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; + regulator-min-microvolt = <1850000>; + regulator-max-microvolt = <2150000>; regulator-always-on; regulator-boot-on; }; l1 { - regulator-min-microvolt = <375000>; - regulator-max-microvolt = <1525000>; + regulator-min-microvolt = <1225000>; + regulator-max-microvolt = <1225000>; }; l2 {
@@ -470,13 +470,13 @@ l2 { }; l4 { - regulator-min-microvolt = <1750000>; - regulator-max-microvolt = <3337000>; + regulator-min-microvolt = <2050000>; + regulator-max-microvolt = <2050000>; }; l5 { - regulator-min-microvolt = <1750000>; - regulator-max-microvolt = <3337000>; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; }; l6 {
@@ -485,45 +485,45 @@ l6 { }; l7 { - regulator-min-microvolt = <1750000>; - regulator-max-microvolt = <3337000>; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; }; l8 { - regulator-min-microvolt = <1750000>; - regulator-max-microvolt = <3337000>; + regulator-min-microvolt = <2900000>; + regulator-max-microvolt = <2900000>; }; l9 { - regulator-min-microvolt = <1750000>; - regulator-max-microvolt = <3337000>; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; }; l10 { - regulator-min-microvolt = <1750000>; - regulator-max-microvolt = <3337000>; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; }; l11 { - regulator-min-microvolt = <1750000>; - regulator-max-microvolt = <3337000>; + regulator-min-microvolt = <2950000>; + regulator-max-microvolt = <2950000>; regulator-allow-set-load; regulator-system-load = <200000>; }; l12 { - regulator-min-microvolt = <1750000>; - regulator-max-microvolt = <3337000>; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <2950000>; }; l13 { - regulator-min-microvolt = <1750000>; - regulator-max-microvolt = <3337000>; + regulator-min-microvolt = <3075000>; + regulator-max-microvolt = <3075000>; }; l14 { - regulator-min-microvolt = <1750000>; - regulator-max-microvolt = <3337000>; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; }; /**
@@ -531,14 +531,14 @@ l14 { * for mezzanine boards */ l15 { - regulator-min-microvolt = <1750000>; - regulator-max-microvolt = <3337000>; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; regulator-always-on; }; l16 { - regulator-min-microvolt = <1750000>; - regulator-max-microvolt = <3337000>; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; }; l17 {
@@ -547,8 +547,8 @@ l17 { }; l18 { - regulator-min-microvolt = <1750000>; - regulator-max-microvolt = <3337000>; + regulator-min-microvolt = <2700000>; + regulator-max-microvolt = <2700000>; }; };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 319/800 arm64: dts: qcom: apq8016-sbc: Fix 1.8V power rail on LS expansion
In reply to Greg Kroah-HartmanFrom: Stephan Gerhold <[email protected]>
[ Upstream commit 5500f823db38db073d30557af159b77fb1f2bf26 ]
The 96Boards specification expects a 1.8V power rail on the low-speed expansion connector that is able to provide at least 0.18W / 100 mA. According to the DB410c hardware user manual this is done by connecting both L15 and L16 in parallel with up to 55mA each (for 110 mA total) [1].
Unfortunately the current regulator setup in the DB410c device tree does not implement the specification correctly and only provides 5 mA:
- Only L15 is marked always-on, so L16 is never enabled.
- Without specifying a load the regulator is put into LPM where it can only provide 5 mA.
Fix this by:
- Adding proper voltage constraints for L16.
- Making L16 always-on.
- Adding regulator-system-load for both L15 and L16. 100 mA should be available in total, so specify 50 mA for each. (The regulator hardware can only be in normal (55 mA) or low-power mode (5 mA) so this will actually result in the expected 110 mA total...)
--- arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/qcom/apq8016-sbc.dts +12 -4
@@ -526,19 +526,27 @@ l14 { regulator-max-microvolt = <3300000>; }; - /** - * 1.8v required on LS expansion - * for mezzanine boards + /* + * The 96Boards specification expects a 1.8V power rail on the low-speed + * expansion connector that is able to provide at least 0.18W / 100 mA. + * L15/L16 are connected in parallel to provide 55 mA each. A minimum load + * must be specified to ensure the regulators are not put in LPM where they + * would only provide 5 mA. */ l15 { regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; + regulator-system-load = <50000>; + regulator-allow-set-load; regulator-always-on; }; l16 { regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <3300000>; + regulator-max-microvolt = <1800000>; + regulator-system-load = <50000>; + regulator-allow-set-load; + regulator-always-on; }; l17 {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 320/800 drm/bridge: ti-sn65dsi83: Fix enable/disable flow to meet spec
In reply to Greg Kroah-HartmanFrom: Frieder Schrempf <[email protected]>
[ Upstream commit dd9e329af7236e34c566d3705ea32a63069b9b13 ]
The datasheet describes the following initialization flow including minimum delay times between each step:
1. DSI data lanes need to be in LP-11 and the clock lane in HS mode
2. toggle EN signal
3. initialize registers
4. enable PLL
5. soft reset
6. enable DSI stream
7. check error status register
To meet this requirement we need to make sure the host bridge's pre_enable() is called first by using the pre_enable_prev_first flag.
Furthermore we need to split enable() into pre_enable() which covers steps 2-5 from above and enable() which covers step 7 and is called after the host bridge's enable().
--- drivers/gpu/drm/bridge/ti-sn65dsi83.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)
drivers/gpu/drm/bridge/ti-sn65dsi83.c +16 -3
@@ -321,8 +321,8 @@ static u8 sn65dsi83_get_dsi_div(struct sn65dsi83 *ctx)return dsi_div -1 ; } -static void sn65dsi83_atomic_enable (struct drm_bridge *bridge, -struct drm_bridge_state *old_bridge_state) +static void sn65dsi83_atomic_pre_enable (struct drm_bridge *bridge, +struct drm_bridge_state *old_bridge_state) {struct sn65dsi83 *ctx =bridge_to_sn65dsi83 (bridge);struct drm_atomic_state *state = old_bridge_state->base.state;
@@ -485,11 +485,22 @@ static void sn65dsi83_atomic_enable(struct drm_bridge *bridge,/* Trigger reset after CSR register update. */ regmap_write (ctx->regmap,REG_RC_RESET ,REG_RC_RESET_SOFT_RESET ); +/* Wait for 10ms after soft reset as specified in datasheet */ +usleep_range (10000 ,12000 ); +} + +static void sn65dsi83_atomic_enable (struct drm_bridge *bridge, +struct drm_bridge_state *old_bridge_state) +{ +struct sn65dsi83 *ctx =bridge_to_sn65dsi83 (bridge); +unsigned int pval; +/* Clear all errors that got asserted during initialization. */ regmap_read (ctx->regmap,REG_IRQ_STAT , &pval);regmap_write (ctx->regmap,REG_IRQ_STAT , pval); -usleep_range (10000 ,12000 ); +/* Wait for 1ms and check for errors in status register */ +usleep_range (1000 ,1100 );regmap_read (ctx->regmap,REG_IRQ_STAT , &pval);if (pval)dev_err (ctx->dev,"Unexpected link status 0x%02x\n" , pval);
@@ -556,6 +567,7 @@ static const struct drm_bridge_funcs sn65dsi83_funcs = { .attach = sn65dsi83_attach, .detach = sn65dsi83_detach, .atomic_enable = sn65dsi83_atomic_enable, + .atomic_pre_enable = sn65dsi83_atomic_pre_enable, .atomic_disable = sn65dsi83_atomic_disable, .mode_valid = sn65dsi83_mode_valid,
@@ -698,6 +710,7 @@ static int sn65dsi83_probe(struct i2c_client *client) ctx->bridge.funcs = &sn65dsi83_funcs; ctx->bridge.of_node = dev->of_node; + ctx->bridge.pre_enable_prev_first = true;drm_bridge_add (&ctx->bridge); ret =sn65dsi83_host_attach (ctx);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 321/800 drm: bridge: samsung-dsim: Fix PMS Calculator on imx8m[mnp]
In reply to Greg Kroah-HartmanFrom: Adam Ford <[email protected]>
[ Upstream commit 54f1a83c72250b182fa7722b0c5f6eb5e769598d ]
According to Table 13-45 of the i.MX8M Mini Reference Manual, the min and max values for M and the frequency range for the VCO_out calculator were incorrect. This information was contradicted in other parts of the mini, nano and plus manuals. After reaching out to my NXP Rep, when confronting him about discrepencies in the Nano manual, he responded with:
"Yes it is definitely wrong, the one that is part
of the NOTE in MIPI_DPHY_M_PLLPMS register table against PMS_P, PMS_M and PMS_S is not correct. I will report this to Doc team, the one customer should be take into account is the Table 13-40 DPHY PLL Parameters and the Note above."
These updated values also match what is used in the NXP downstream kernel.
To fix this, make new variables to hold the min and max values of m and the minimum value of VCO_out, and update the PMS calculator to use these new variables instead of using hard-coded values to keep the backwards compatibility with other parts using this driver.
--- drivers/gpu/drm/bridge/samsung-dsim.c | 22 ++++++++++++++++++++-- include/drm/bridge/samsung-dsim.h | 3 +++ 2 files changed, 23 insertions(+), 2 deletions(-)
drivers/gpu/drm/bridge/samsung-dsim.c +20 -2
@@ -405,6 +405,9 @@ static const struct samsung_dsim_driver_data exynos3_dsi_driver_data = { .num_bits_resol = 11, .pll_p_offset = 13, .reg_values = reg_values, + .m_min = 41, + .m_max = 125, + .min_freq = 500, };static const struct samsung_dsim_driver_data exynos4_dsi_driver_data = {
@@ -418,6 +421,9 @@ static const struct samsung_dsim_driver_data exynos4_dsi_driver_data = { .num_bits_resol = 11, .pll_p_offset = 13, .reg_values = reg_values, + .m_min = 41, + .m_max = 125, + .min_freq = 500, };static const struct samsung_dsim_driver_data exynos5_dsi_driver_data = {
@@ -429,6 +435,9 @@ static const struct samsung_dsim_driver_data exynos5_dsi_driver_data = { .num_bits_resol = 11, .pll_p_offset = 13, .reg_values = reg_values, + .m_min = 41, + .m_max = 125, + .min_freq = 500, };static const struct samsung_dsim_driver_data exynos5433_dsi_driver_data = {
@@ -441,6 +450,9 @@ static const struct samsung_dsim_driver_data exynos5433_dsi_driver_data = { .num_bits_resol = 12, .pll_p_offset = 13, .reg_values = exynos5433_reg_values, + .m_min = 41, + .m_max = 125, + .min_freq = 500, };static const struct samsung_dsim_driver_data exynos5422_dsi_driver_data = {
@@ -453,6 +465,9 @@ static const struct samsung_dsim_driver_data exynos5422_dsi_driver_data = { .num_bits_resol = 12, .pll_p_offset = 13, .reg_values = exynos5422_reg_values, + .m_min = 41, + .m_max = 125, + .min_freq = 500, };static const struct samsung_dsim_driver_data imx8mm_dsi_driver_data = {
@@ -469,6 +484,9 @@ static const struct samsung_dsim_driver_data imx8mm_dsi_driver_data = {*/ .pll_p_offset = 14, .reg_values = imx8mm_dsim_reg_values, + .m_min = 64, + .m_max = 1023, + .min_freq = 1050, }; static const struct samsung_dsim_driver_data *
@@ -547,12 +565,12 @@ static unsigned long samsung_dsim_pll_find_pms(struct samsung_dsim *dsi, tmp = (u64 )fout * (_p << _s);do_div (tmp, fin); _m = tmp; -if (_m <41 || _m >125 ) +if (_m < driver_data->m_min || _m > driver_data->m_max)continue ; tmp = (u64 )_m * fin;do_div (tmp, _p); -if (tmp <500 *MHZ || +if (tmp < driver_data->min_freq *MHZ || tmp > driver_data->max_freq *MHZ )continue ;
include/drm/bridge/samsung-dsim.h +3 -0
@@ -54,11 +54,14 @@ struct samsung_dsim_driver_data { unsigned int has_freqband:1; unsigned int has_clklane_stop:1;unsigned int num_clks; +unsigned int min_freq;unsigned int max_freq;unsigned int wait_for_reset;unsigned int num_bits_resol;unsigned int pll_p_offset;const unsigned int *reg_values; +u16 m_min; +u16 m_max; };struct samsung_dsim_host_ops {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 322/800 drm/panel: simple: fix active size for Ampire AM-480272H3TMQW-T01H
In reply to Greg Kroah-HartmanFrom: Dario Binacchi <[email protected]>
[ Upstream commit f24b49550814fdee4a98b9552e35e243ccafd4a8 ]
The previous setting was related to the overall dimension and not to the active display area.
In the "PHYSICAL SPECIFICATIONS" section, the datasheet shows the following parameters:
----------------------------------------------------------
| Item | Specifications | unit |
----------------------------------------------------------
| Display area | 98.7 (W) x 57.5 (H) | mm |
----------------------------------------------------------
| Overall dimension | 105.5(W) x 67.2(H) x 4.96(D) | mm |
----------------------------------------------------------
--- drivers/gpu/drm/panel/panel-simple.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/panel/panel-simple.c +2 -2
@@ -759,8 +759,8 @@ static const struct panel_desc ampire_am_480272h3tmqw_t01h = { .num_modes = 1, .bpc = 8, .size = { - .width = 105, - .height = 67, + .width = 99, + .height = 58, }, .bus_format = MEDIA_BUS_FMT_RGB888_1X24, };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 323/800 ARM: ep93xx: fix missing-prototype warnings
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 419013740ea1e4343d8ade535d999f59fa28e460 ]
ep93xx_clocksource_read() is only called from the file it is declared in, while ep93xx_timer_init() is declared in a header that is not included here.
arch/arm/mach-ep93xx/timer-ep93xx.c:120:13: error: no previous prototype for 'ep93xx_timer_init' arch/arm/mach-ep93xx/timer-ep93xx.c:63:5: error: no previous prototype for 'ep93xx_clocksource_read'
--- arch/arm/mach-ep93xx/timer-ep93xx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/mach-ep93xx/timer-ep93xx.c +2 -1
@@ -9,6 +9,7 @@#include <linux/io.h> #include <asm/mach/time.h> #include "soc.h" +#include "platform.h" /************************************************************************* * Timer handling for EP93xx
@@ -60,7 +61,7 @@ static u64 notrace ep93xx_read_sched_clock(void)return ret; } -u64 ep93xx_clocksource_read (struct clocksource *c) +static u64 ep93xx_clocksource_read (struct clocksource *c) {u64 ret;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 324/800 ARM: omap2: fix missing tick_broadcast() prototype
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 861bc1d2886d47bd57a2cbf2cda87fdbe3eb9d08 ]
omap2 contains a hack to define tick_broadcast() on non-SMP configurations in place of the normal SMP definition. This one causes a warning because of a missing prototype:
arch/arm/mach-omap2/board-generic.c:44:6: error: no previous prototype for 'tick_broadcast'
Make sure to always include the header with the declaration.
--- arch/arm/mach-omap2/board-generic.c | 1 + 1 file changed, 1 insertion(+)
arch/arm/mach-omap2/board-generic.c +1 -0
@@ -13,6 +13,7 @@#include <linux/of_platform.h> #include <linux/irqdomain.h> #include <linux/clocksource.h> +#include <linux/clockchips.h> #include <asm/setup.h> #include <asm/mach/arch.h>
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 325/800 arm64: dts: qcom: pm7250b: add missing spmi-vadc include
In reply to Greg Kroah-HartmanFrom: Luca Weiss <[email protected]>
[ Upstream commit 83022f6484b11a60dbf9a95a88c7ef8e59c4b19c ]
This file is using definitions from the spmi-vadc header, so we need to include it.
--- arch/arm64/boot/dts/qcom/pm7250b.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/qcom/pm7250b.dtsi +1 -0
@@ -3,6 +3,7 @@ * Copyright (C) 2022 Luca Weiss <[email protected]> */ +#include <dt-bindings/iio/qcom,spmi-vadc.h> #include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/spmi/spmi.h>
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 326/800 arm64: dts: qcom: apq8096: fix fixed regulator name property
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit c77612a07d18d4425fd8ddd532a8a9b8e1970c53 ]
Correct the typo in 'regulator-name' property.
apq8096-ifc6640.dtb: v1p05-regulator: 'regulator-name' is a required property apq8096-ifc6640.dtb: v1p05-regulator: Unevaluated properties are not allowed ('reglator-name' was unexpected)
--- arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts +2 -2
@@ -26,7 +26,7 @@ chosen { v1p05: v1p05-regulator { compatible = "regulator-fixed"; - reglator-name = "v1p05"; + regulator-name = "v1p05"; regulator-always-on; regulator-boot-on;
@@ -38,7 +38,7 @@ v1p05: v1p05-regulator { v12_poe: v12-poe-regulator { compatible = "regulator-fixed"; - reglator-name = "v12_poe"; + regulator-name = "v12_poe"; regulator-always-on; regulator-boot-on;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 327/800 arm64: dts: mediatek: mt8183: Add mediatek,broken-save-restore-fw to kukui
In reply to Greg Kroah-HartmanFrom: Douglas Anderson <[email protected]>
[ Upstream commit 42127f578ebde652d1373e0233356fbd351675c4 ]
Firmware shipped on mt8183 Chromebooks is affected by the GICR save/restore issue as described by the patch ("dt-bindings:
interrupt-controller: arm,gic-v3: Add quirk for Mediatek SoCs w/ broken FW"). Add the quirk property.
--- arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi +4 -0
@@ -292,6 +292,10 @@ dsi_out: endpoint { }; }; +&gic { + mediatek,broken-save-restore-fw; +}; + &gpu { mali-supply = <&mt6358_vgpu_reg>; };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 328/800 arm64: dts: mediatek: mt8192: Add mediatek,broken-save-restore-fw to asurada
In reply to Greg Kroah-HartmanFrom: Douglas Anderson <[email protected]>
[ Upstream commit d72cfbd6fcf7cd02084991eee47ecc9f4b4c1e69 ]
Firmware shipped on mt8192 Chromebooks is affected by the GICR save/restore issue as described by the patch ("dt-bindings:
interrupt-controller: arm,gic-v3: Add quirk for Mediatek SoCs w/ broken FW"). Add the quirk property.
--- arch/arm64/boot/dts/mediatek/mt8192-asurada.dtsi | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm64/boot/dts/mediatek/mt8192-asurada.dtsi +4 -0
@@ -275,6 +275,10 @@ &dsi_out { remote-endpoint = <&anx7625_in>; }; +&gic { + mediatek,broken-save-restore-fw; +}; + &gpu { mali-supply = <&mt6315_7_vbuck1>; status = "okay";
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 329/800 arm64: dts: mediatek: mt8195: Add mediatek,broken-save-restore-fw to cherry
In reply to Greg Kroah-HartmanFrom: Douglas Anderson <[email protected]>
[ Upstream commit ea6c5f21efecbaa3a14cb21c5bc0e23c84473a11 ]
Firmware shipped on mt8195 Chromebooks is affected by the GICR save/restore issue as described by the patch ("dt-bindings:
interrupt-controller: arm,gic-v3: Add quirk for Mediatek SoCs w/ broken FW"). Add the quirk property.
--- arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi +4 -0
@@ -255,6 +255,10 @@ dptx_out: endpoint { }; }; +&gic { + mediatek,broken-save-restore-fw; +}; + &gpu { status = "okay"; mali-supply = <&mt6315_7_vbuck1>;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 330/800 ARM: dts: stm32: Shorten the AV96 HDMI sound card name
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit 0cf765e598712addec34d0208cc1418c151fefb2 ]
Fix the following error in kernel log due to too long sound card name:
"
asoc-audio-graph-card sound: ASoC: driver name too long 'STM32MP1-AV96-HDMI' -> 'STM32MP1-AV96-H' "
--- arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi +1 -1
@@ -87,7 +87,7 @@ sd_switch: regulator-sd_switch { sound { compatible = "audio-graph-card"; - label = "STM32MP1-AV96-HDMI"; + label = "STM32-AV96-HDMI"; dais = <&sai2a_port>; status = "okay"; };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 331/800 memory: brcmstb_dpfe: fix testing array offset after use
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 1d9e93fad549bc38f593147479ee063f2872c170 ]
Code should first check for valid value of array offset, then use it as the index. Fixes smatch warning:
drivers/memory/brcmstb_dpfe.c:443 __send_command() error: testing array offset 'cmd' after use.
--- drivers/memory/brcmstb_dpfe.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/memory/brcmstb_dpfe.c +3 -1
@@ -434,15 +434,17 @@ static void __finalize_command(struct brcmstb_dpfe_priv *priv)static int __send_command (struct brcmstb_dpfe_priv *priv,unsigned int cmd,u32 result[]) { -const u32 *msg = priv->dpfe_api->command[cmd];void __iomem *regs = priv->regs;unsigned int i, chksum, chksum_idx; +const u32 *msg;int ret =0 ;u32 resp;if (cmd >=DPFE_CMD_MAX )return -1 ; + msg = priv->dpfe_api->command[cmd]; +mutex_lock (&priv->lock);/* Wait for DCPU to become ready */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 332/800 ARM: dts: qcom: apq8074-dragonboard: Set DMA as remotely controlled
In reply to Greg Kroah-HartmanFrom: Dmitry Baryshkov <[email protected]>
[ Upstream commit e60c230588d88036f974cec7e93361e2c4f62226 ]
Add the qcom,controlled-remotely property for the blsp2_bam controller node. This board requires this, otherwise the board stalls during the boot for some reason (most probably because TZ mishandles the protection error and keeps on looping somewhere inside).
--- arch/arm/boot/dts/qcom-apq8074-dragonboard.dts | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm/boot/dts/qcom-apq8074-dragonboard.dts +4 -0
@@ -23,6 +23,10 @@ &blsp1_uart2 { status = "okay"; }; +&blsp2_dma { + qcom,controlled-remotely; +}; + &blsp2_i2c5 { status = "okay"; clock-frequency = <200000>;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 333/800 ASoC: es8316: Increment max value for ALC Capture Target Volume control
In reply to Greg Kroah-HartmanFrom: Cristian Ciocaltea <[email protected]>
[ Upstream commit 6f073429037cd79d7311cd8236311c53f5ea8f01 ]
The following error occurs when trying to restore a previously saved ALSA mixer state (tested on a Rock 5B board):
$ alsactl --no-ucm -f /tmp/asound.state store hw:Analog $ alsactl --no-ucm -I -f /tmp/asound.state restore hw:Analog alsactl: set_control:1475: Cannot write control '2:0:0:ALC Capture Target Volume:0' : Invalid argument
According to ES8316 datasheet, the register at address 0x2B, which is related to the above mixer control, contains by default the value 0xB0. Considering the corresponding ALC target bits (ALCLVL) are 7:4, the control is initialized with 11, which is one step above the maximum value allowed by the driver:
ALCLVL | dB gain
-------+--------
0000 | -16.5 0001 | -15.0 0010 | -13.5 .... | ..... 0111 | -6.0 1000 | -4.5 1001 | -3.0 1010 | -1.5 .... | ..... 1111 | -1.5
The tests performed using the VU meter feature (--vumeter=TYPE) of arecord/aplay confirm the specs are correct and there is no measured gain if the 1011-1111 range would have been mapped to 0 dB:
dB gain | VU meter %
--------+-----------
-6.0 | 30-31
-4.5 | 35-36
-3.0 | 42-43
-1.5 | 50-51
0.0 | 50-51Increment the max value allowed for ALC Capture Target Volume control, so that it matches the hardware default. Additionally, update the related TLV to prevent an artificial extension of the dB gain range.
--- sound/soc/codecs/es8316.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
sound/soc/codecs/es8316.c +7 -2
@@ -52,7 +52,12 @@ static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(dac_vol_tlv, -9600, 50, 1); static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(adc_vol_tlv, -9600, 50, 1); static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(alc_max_gain_tlv, -650, 150, 0); static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(alc_min_gain_tlv, -1200, 150, 0); -static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(alc_target_tlv, -1650, 150, 0); + +static const SNDRV_CTL_TLVD_DECLARE_DB_RANGE(alc_target_tlv, +0 ,10 ,TLV_DB_SCALE_ITEM (-1650 ,150 ,0 ), + 11, 11, TLV_DB_SCALE_ITEM(-150, 0, 0), +); + static const SNDRV_CTL_TLVD_DECLARE_DB_RANGE(hpmixer_gain_tlv,0 ,4 ,TLV_DB_SCALE_ITEM (-1200 ,150 ,0 ), 8, 11, TLV_DB_SCALE_ITEM(-450, 150, 0),
@@ -115,7 +120,7 @@ static const struct snd_kcontrol_new es8316_snd_controls[] = { alc_max_gain_tlv),SOC_SINGLE_TLV ("ALC Capture Min Volume" ,ES8316_ADC_ALC2 ,0 ,28 ,0 , alc_min_gain_tlv), -SOC_SINGLE_TLV ("ALC Capture Target Volume" ,ES8316_ADC_ALC3 ,4 ,10 ,0 , +SOC_SINGLE_TLV ("ALC Capture Target Volume" ,ES8316_ADC_ALC3 ,4 ,11 ,0 , alc_target_tlv),SOC_SINGLE ("ALC Capture Hold Time" ,ES8316_ADC_ALC3 ,0 ,10 ,0 ), SOC_SINGLE("ALC Capture Decay Time", ES8316_ADC_ALC4, 4, 10, 0),
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 334/800 ASoC: es8316: Do not set rate constraints for unsupported MCLKs
In reply to Greg Kroah-HartmanFrom: Cristian Ciocaltea <[email protected]>
[ Upstream commit 60413129ee2b38a80347489270af7f6e1c1de4d0 ]
When using the codec through the generic audio graph card, there are at least two calls of es8316_set_dai_sysclk(), with the effect of limiting the allowed sample rates according to the MCLK/LRCK ratios supported by the codec:
1. During audio card setup, to set the initial MCLK - see asoc_simple_init_dai().
2. Before opening a stream, to update MCLK, according to the stream sample rate and the multiplication factor - see asoc_simple_hw_params().
In some cases the initial MCLK might be set to a frequency that doesn't match any of the supported ratios, e.g. 12287999 instead of 12288000, which is only 1 Hz below the supported clock, as that is what the hardware reports. This creates an empty list of rate constraints, which is further passed to snd_pcm_hw_constraint_list() via es8316_pcm_startup(), and causes the following error on the very first access of the sound card:
$ speaker-test -D hw:Analog,0 -F S16_LE -c 2 -t wav Broken configuration for playback: no configurations available: Invalid argument Setting of hwparams failed: Invalid argument
Note that all subsequent retries succeed thanks to the updated MCLK set at point 2 above, which uses a computed frequency value instead of a reading from the hardware registers. Normally this would have mitigated the issue, but es8316_pcm_startup() executes before the 2nd call to es8316_set_dai_sysclk(), hence it cannot make use of the updated constraints.
Since es8316_pcm_hw_params() performs anyway a final validation of MCLK against the stream sample rate and the supported MCLK/LRCK ratios, fix the issue by ensuring that sysclk_constraints list is only set when at least one supported sample rate is autodetected by the codec.
--- sound/soc/codecs/es8316.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
sound/soc/codecs/es8316.c +7 -7
@@ -369,13 +369,11 @@ static int es8316_set_dai_sysclk(struct snd_soc_dai *codec_dai,int count =0 ; es8316->sysclk = freq; + es8316->sysclk_constraints.list =NULL ; + es8316->sysclk_constraints.count =0 ; -if (freq ==0 ) { - es8316->sysclk_constraints.list =NULL ; - es8316->sysclk_constraints.count =0 ; - +if (freq ==0 )return 0 ; - } ret =clk_set_rate (es8316->mclk, freq);if (ret)
@@ -391,8 +389,10 @@ static int es8316_set_dai_sysclk(struct snd_soc_dai *codec_dai, es8316->allowed_rates[count++] = freq / ratio; } - es8316->sysclk_constraints.list = es8316->allowed_rates; - es8316->sysclk_constraints.count = count; +if (count) { + es8316->sysclk_constraints.list = es8316->allowed_rates; + es8316->sysclk_constraints.count = count; + }return 0 ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 335/800 ARM: dts: meson8: correct uart_B and uart_C clock references
In reply to Greg Kroah-HartmanFrom: Martin Blumenstingl <[email protected]>
[ Upstream commit 98b503c7fb13a17a47d8ebf15fa8f7c10118e75c ]
On Meson8 uart_B and uart_C do not work, because they are relying on incorrect clocks. Change the references of pclk to the correct CLKID (UART1 for uart_B and UART2 for uart_C), to allow use of the two uarts.
This was originally reported by Hans-Frieder Vogt for Meson8b [0], but the same bug is also present in meson8.dtsi
--- arch/arm/boot/dts/meson8.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/meson8.dtsi +2 -2
@@ -769,13 +769,13 @@ &uart_A { &uart_B { compatible = "amlogic,meson8-uart"; - clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>; + clocks = <&xtal>, <&clkc CLKID_UART1>, <&clkc CLKID_CLK81>; clock-names = "xtal", "pclk", "baud"; }; &uart_C { compatible = "amlogic,meson8-uart"; - clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>; + clocks = <&xtal>, <&clkc CLKID_UART2>, <&clkc CLKID_CLK81>; clock-names = "xtal", "pclk", "baud"; };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 336/800 soc/fsl/qe: fix usb.c build errors
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 7b1a78babd0d2cd27aa07255dee0c2d7ac0f31e3 ]
Fix build errors in soc/fsl/qe/usb.c when QUICC_ENGINE is not set. This happens when PPC_EP88XC is set, which selects CPM1 & CPM. When CPM is set, USB_FSL_QE can be set without QUICC_ENGINE being set. When USB_FSL_QE is set, QE_USB deafults to y, which causes build errors when QUICC_ENGINE is not set. Making QE_USB depend on QUICC_ENGINE prevents QE_USB from defaulting to y.
Fixes these build errors:
drivers/soc/fsl/qe/usb.o: in function `qe_usb_clock_set':
usb.c:(.text+0x1e): undefined reference to `qe_immr'
powerpc-linux-ld: usb.c:(.text+0x2a): undefined reference to `qe_immr'
powerpc-linux-ld: usb.c:(.text+0xbc): undefined reference to `qe_setbrg'
powerpc-linux-ld: usb.c:(.text+0xca): undefined reference to `cmxgcr_lock'
powerpc-linux-ld: usb.c:(.text+0xce): undefined reference to `cmxgcr_lock'
--- drivers/soc/fsl/qe/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/soc/fsl/qe/Kconfig +1 -0
@@ -62,6 +62,7 @@ config QE_TDM config QE_USB bool + depends on QUICC_ENGINE default y if USB_FSL_QE help QE USB Controller support
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 337/800 RDMA/irdma: avoid fortify-string warning in irdma_clr_wqes
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit b002760f877c0d91ecd3c78565b52f4bbac379dd ]
Commit df8fc4e934c1 ("kbuild: Enable -fstrict-flex-arrays=3") triggers a warning for fortified memset():
In function 'fortify_memset_chk',
inlined from 'irdma_clr_wqes' at drivers/infiniband/hw/irdma/uk.c:103:4:include/linux/fortify-string.h:493:25: error: call to '__write_overflow_field' declared with attribute warning: detected write beyond size of field (1st parameter); maybe use struct_group()? [-Werror=attribute-warning]
493 | __write_overflow_field(p_size_field, size);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~The problem here isthat the inner array only has four 8-byte elements, so clearing 4096 bytes overflows that. As this structure is part of an outer array, change the code to pass a pointer to the irdma_qp_quanta instead, and change the size argument for readability, matching the comment above it.
--- drivers/infiniband/hw/irdma/uk.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/infiniband/hw/irdma/uk.c +6 -4
@@ -93,16 +93,18 @@ static int irdma_nop_1(struct irdma_qp_uk *qp)*/ void irdma_clr_wqes (struct irdma_qp_uk *qp,u32 qp_wqe_idx) { -__le64 *wqe; +struct irdma_qp_quanta *sq;u32 wqe_idx;if (!(qp_wqe_idx &0x7F )) { wqe_idx = (qp_wqe_idx +128 ) % qp->sq_ring.size; - wqe = qp->sq_base[wqe_idx].elem; + sq = qp->sq_base + wqe_idx;if (wqe_idx) -memset (wqe, qp->swqe_polarity ?0 :0xFF ,0x1000 ); +memset (sq, qp->swqe_polarity ?0 :0xFF , +128 *sizeof (*sq));else -memset (wqe, qp->swqe_polarity ?0xFF :0 ,0x1000 ); +memset (sq, qp->swqe_polarity ?0xFF :0 , +128 *sizeof (*sq)); } }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 338/800 IB/hfi1: Fix wrong mmu_node used for user SDMA packet after invalidate
In reply to Greg Kroah-HartmanFrom: Brendan Cunningham <[email protected]>
[ Upstream commit c9358de193ecfb360c3ce75f27ce839ca0b0bc8c ]
The hfi1 user SDMA pinned-page cache will leave a stale cache entry when the cache-entry's virtual address range is invalidated but that cache entry is in-use by an outstanding SDMA request.
Subsequent user SDMA requests with buffers in or spanning the virtual address range of the stale cache entry will result in packets constructed from the wrong memory, the physical pages pointed to by the stale cache entry.
To fix this, remove mmu_rb_node cache entries from the mmu_rb_handler cache independent of the cache entry's refcount. Add 'struct kref refcount' to struct mmu_rb_node and manage mmu_rb_node lifetime with kref_get() and kref_put().
mmu_rb_node.refcount makes sdma_mmu_node.refcount redundant. Remove 'atomic_t refcount' from struct sdma_mmu_node and change sdma_mmu_node code to use mmu_rb_node.refcount.
Move the mmu_rb_handler destructor call after a wait-for-SDMA-request-completion call so mmu_rb_nodes that need mmu_rb_handler's workqueue to queue themselves up for destruction from an interrupt context may do so.
--- drivers/infiniband/hw/hfi1/ipoib_tx.c | 4 +- drivers/infiniband/hw/hfi1/mmu_rb.c | 101 ++++++++++------- drivers/infiniband/hw/hfi1/mmu_rb.h | 3 + drivers/infiniband/hw/hfi1/sdma.c | 23 +++- drivers/infiniband/hw/hfi1/sdma.h | 47 +++++--- drivers/infiniband/hw/hfi1/sdma_txreq.h | 2 + drivers/infiniband/hw/hfi1/user_sdma.c | 137 ++++++++++-------------- drivers/infiniband/hw/hfi1/user_sdma.h | 1 - drivers/infiniband/hw/hfi1/vnic_sdma.c | 4 +- 9 files changed, 177 insertions(+), 145 deletions(-)
drivers/infiniband/hw/hfi1/ipoib_tx.c +2 -2
@@ -215,11 +215,11 @@ static int hfi1_ipoib_build_ulp_payload(struct ipoib_txreq *tx,const skb_frag_t *frag = &skb_shinfo (skb)->frags[i]; ret =sdma_txadd_page (dd, -NULL , txreq,skb_frag_page (frag), frag->bv_offset, -skb_frag_size (frag)); +skb_frag_size (frag), +NULL ,NULL ,NULL );if (unlikely (ret))break ; }
drivers/infiniband/hw/hfi1/mmu_rb.c +63 -38
165 lines not on this page · raw message
drivers/infiniband/hw/hfi1/mmu_rb.h +3 -0
@@ -16,6 +16,7 @@ struct mmu_rb_node {struct rb_node node;struct mmu_rb_handler *handler;struct list_head list; +struct kref refcount; };/*
@@ -61,6 +62,8 @@ int hfi1_mmu_rb_register(void *ops_arg,void hfi1_mmu_rb_unregister (struct mmu_rb_handler *handler);int hfi1_mmu_rb_insert (struct mmu_rb_handler *handler,struct mmu_rb_node *mnode); +void hfi1_mmu_rb_release (struct kref *refcount); +void hfi1_mmu_rb_evict (struct mmu_rb_handler *handler,void *evict_arg); struct mmu_rb_node *hfi1_mmu_rb_get_first(struct mmu_rb_handler *handler, unsigned long addr,
drivers/infiniband/hw/hfi1/sdma.c +18 -5
@@ -1593,7 +1593,20 @@ static inline void sdma_unmap_desc(struct hfi1_devdata *dd, struct sdma_desc *descp) { -system_descriptor_complete (dd ,descp ); + switch (sdma_mapping_type(descp)) { + case SDMA_MAP_SINGLE: + dma_unmap_single(&dd->pcidev->dev, sdma_mapping_addr(descp), +sdma_mapping_len (descp ),DMA_TO_DEVICE ); +break ; +case SDMA_MAP_PAGE : +dma_unmap_page (&dd->pcidev->dev,sdma_mapping_addr (descp), +sdma_mapping_len (descp),DMA_TO_DEVICE ); +break ; + } + +if (descp->pinning_ctx && descp->ctx_put) + descp->ctx_put (descp->pinning_ctx); + descp->pinning_ctx =NULL ; }/*
@@ -3113,8 +3126,8 @@ int ext_coal_sdma_tx_descs(struct hfi1_devdata *dd, struct sdma_txreq *tx,/* Add descriptor for coalesce buffer */ tx->desc_limit =MAX_DESC ; -return _sdma_txadd_daddr (dd,SDMA_MAP_SINGLE ,NULL , tx, - addr, tx->tlen); +return _sdma_txadd_daddr (dd,SDMA_MAP_SINGLE , tx, + addr, tx->tlen,NULL ,NULL ,NULL ); }return 1 ;
@@ -3157,9 +3170,9 @@ int _pad_sdma_tx_descs(struct hfi1_devdata *dd, struct sdma_txreq *tx)make_tx_sdma_desc ( tx,SDMA_MAP_NONE , -NULL , dd->sdma_pad_phys, -sizeof (u32) - (tx->packet_len & (sizeof (u32) -1 ))); +sizeof (u32) - (tx->packet_len & (sizeof (u32) -1 )), +NULL ,NULL ,NULL ); tx->num_desc++;_sdma_close_tx (dd, tx);return rval;
drivers/infiniband/hw/hfi1/sdma.h +32 -15
116 lines not on this page · raw message
drivers/infiniband/hw/hfi1/sdma_txreq.h +2 -0
@@ -20,6 +20,8 @@ struct sdma_desc {/* private: don't use directly */ u64 qw[2 ];void *pinning_ctx; +/* Release reference to @pinning_ctx. May be called in interrupt context. Must not sleep. */ +void (*ctx_put)(void *ctx); };/**
drivers/infiniband/hw/hfi1/user_sdma.c +55 -82
253 lines not on this page · raw message
drivers/infiniband/hw/hfi1/user_sdma.h +0 -1
@@ -104,7 +104,6 @@ struct hfi1_user_sdma_comp_q {struct sdma_mmu_node {struct mmu_rb_node rb;struct hfi1_user_sdma_pkt_q *pq; -atomic_t refcount;struct page **pages;unsigned int npages; };
drivers/infiniband/hw/hfi1/vnic_sdma.c +2 -2
@@ -64,11 +64,11 @@ static noinline int build_vnic_ulp_payload(struct sdma_engine *sde,/* combine physically continuous fragments later? */ ret =sdma_txadd_page (sde->dd, -NULL , &tx->txreq,skb_frag_page (frag),skb_frag_off (frag), -skb_frag_size (frag)); +skb_frag_size (frag), +NULL ,NULL ,NULL );if (unlikely (ret)) goto bail_txadd; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 339/800 RDMA/hns: Fix hns_roce_table_get return value
In reply to Greg Kroah-HartmanFrom: Chengchang Tang <[email protected]>
[ Upstream commit cf5b608fb0e369c473a8303cad6ddb386505e5b8 ]
The return value of set_hem has been fixed to ENODEV, which will lead a diagnostic information missing.
--- drivers/infiniband/hw/hns/hns_roce_hem.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/infiniband/hw/hns/hns_roce_hem.c +4 -3
@@ -595,11 +595,12 @@ int hns_roce_table_get(struct hns_roce_dev *hr_dev, }/* Set HEM base address(128K/page, pa) to Hardware */ -if (hr_dev->hw->set_hem (hr_dev, table, obj,HEM_HOP_STEP_DIRECT )) { + ret = hr_dev->hw->set_hem (hr_dev, table, obj,HEM_HOP_STEP_DIRECT ); +if (ret) {hns_roce_free_hem (hr_dev, table->hem[i]); table->hem[i] =NULL ; - ret = -ENODEV ; -dev_err (dev,"set HEM base address to HW failed.\n" ); +dev_err (dev,"set HEM base address to HW failed, ret = %d.\n" , + ret); goto out; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 340/800 ARM: dts: iwg20d-q7-common: Fix backlight pwm specifier
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 0501fdec106a291c43b3c1b525cf22ab4c24b2d8 ]
make dtbs_check:
arch/arm/boot/dts/renesas/r8a7743-iwg20d-q7.dtb: backlight: pwms: [[58, 0, 5000000], [0]] is too long
From schema: Documentation/devicetree/bindings/leds/backlight/pwm-backlight.yaml
arch/arm/boot/dts/renesas/r8a7743-iwg20d-q7-dbcm-ca.dtb: backlight: pwms: [[67, 0, 5000000], [0]] is too long
From schema: Documentation/devicetree/bindings/leds/backlight/pwm-backlight.yaml
arch/arm/boot/dts/renesas/r8a7744-iwg20d-q7-dbcm-ca.dtb: backlight: pwms: [[67, 0, 5000000], [0]] is too long
From schema: Documentation/devicetree/bindings/leds/backlight/pwm-backlight.yaml
arch/arm/boot/dts/renesas/r8a7744-iwg20d-q7.dtb: backlight: pwms: [[58, 0, 5000000], [0]] is too long
From schema: Documentation/devicetree/bindings/leds/backlight/pwm-backlight.yaml
PWM specifiers referring to R-Car PWM Timer Controllers should contain only two cells.
Fix this by dropping the bogus third cell.
--- arch/arm/boot/dts/iwg20d-q7-common.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/iwg20d-q7-common.dtsi +1 -1
@@ -49,7 +49,7 @@ audio_clock: audio_clock { lcd_backlight: backlight { compatible = "pwm-backlight"; - pwms = <&pwm3 0 5000000 0>; + pwms = <&pwm3 0 5000000>; brightness-levels = <0 4 8 16 32 64 128 255>; default-brightness-level = <7>; enable-gpios = <&gpio5 14 GPIO_ACTIVE_HIGH>;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 341/800 arm64: dts: renesas: ulcb-kf: Remove flow control for SCIF1
In reply to Greg Kroah-HartmanFrom: Wolfram Sang <[email protected]>
[ Upstream commit 1a2c4e5635177939a088d22fa35c6a7032725663 ]
The schematics are misleading, the flow control is for HSCIF1. We need SCIF1 for GNSS/GPS which does not use flow control.
--- arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/arm64/boot/dts/renesas/ulcb-kf.dtsi +1 -2
@@ -367,7 +367,7 @@ hscif0_pins: hscif0 { }; scif1_pins: scif1 { - groups = "scif1_data_b", "scif1_ctrl"; + groups = "scif1_data_b"; function = "scif1"; };
@@ -397,7 +397,6 @@ &sound_clk_pins &scif1 { pinctrl-0 = <&scif1_pins>; pinctrl-names = "default"; - uart-has-rtscts; status = "okay"; };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 342/800 drm/msm/dpu: set DSC flush bit correctly at MDP CTL flush register
In reply to Greg Kroah-HartmanFrom: Kuogee Hsieh <[email protected]>
[ Upstream commit 12cef323c903bd8b13d1f6ff24a9695c2cdc360b ]
The CTL_FLUSH register should be programmed with the 22th bit (DSC_IDX) to flush the DSC hardware blocks, not the literal value of 22 (which corresponds to flushing VIG1, VIG2 and RGB1 instead).
Changes in V12:
-- split this patch out of "separate DSC flush update out of interface"
Changes in V13:
-- rewording the commit text
Changes in V14:
-- drop 'DSC" from "The DSC CTL_FLUSH register" at commit text
Patchwork: https://patchwork.freedesktop.org/patch/539496/
--- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +1 -1
@@ -542,7 +542,7 @@ static void dpu_hw_ctl_intf_cfg_v1(struct dpu_hw_ctl *ctx,DPU_REG_WRITE (c,CTL_MERGE_3D_ACTIVE ,BIT (cfg->merge_3d -MERGE_3D_0 ));if (cfg->dsc) { -DPU_REG_WRITE (&ctx->hw,CTL_FLUSH ,DSC_IDX ); +DPU_REG_WRITE (&ctx->hw,CTL_FLUSH ,BIT (DSC_IDX ));DPU_REG_WRITE (c,CTL_DSC_ACTIVE , cfg->dsc); } }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 343/800 drm/msm/dpu: always clear every individual pending flush mask
In reply to Greg Kroah-HartmanFrom: Kuogee Hsieh <[email protected]>
[ Upstream commit 625cbb077007698060b12d0ae5657a4d8411b153 ]
There are two tiers of pending flush control, top level and individual hardware block. Currently only the top level of flush mask is reset to 0 but the individual pending flush masks of particular hardware blocks are left at their previous values, eventually accumulating all possible bit values and typically flushing more than necessary.
Reset all individual hardware block flush masks to 0 to avoid accidentally flushing them.
Changes in V13:
-- rewording commit text
-- add an empty space line as suggested
Changes in V14:
-- add Fixes tag
Patchwork: https://patchwork.freedesktop.org/patch/539508/
--- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +3 -0
@@ -117,6 +117,9 @@ static inline void dpu_hw_ctl_clear_pending_flush(struct dpu_hw_ctl *ctx)trace_dpu_hw_ctl_clear_pending_flush (ctx->pending_flush_mask,dpu_hw_ctl_get_flush_register (ctx)); ctx->pending_flush_mask =0x0 ; + ctx->pending_intf_flush_mask =0 ; + ctx->pending_wb_flush_mask =0 ; + ctx->pending_merge_3d_flush_mask =0 ;memset (ctx->pending_dspp_flush_mask,0 ,sizeof (ctx->pending_dspp_flush_mask));
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 344/800 fbdev: omapfb: lcd_mipid: Fix an error handling path in mipid_spi_probe()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 79a3908d1ea6c35157a6d907b1a9d8ec06015e7a ]
If 'mipid_detect()' fails, we must free 'md' to avoid a memory leak.
--- drivers/video/fbdev/omap/lcd_mipid.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/video/fbdev/omap/lcd_mipid.c +5 -1
@@ -571,11 +571,15 @@ static int mipid_spi_probe(struct spi_device *spi) r =mipid_detect (md);if (r <0 ) -return r; + goto free_md;omapfb_register_panel (&md->panel);return 0 ; + +free_md: +kfree (md); +return r; }static void mipid_spi_remove (struct spi_device *spi)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 345/800 dt-bindings: arm-smmu: Fix SC8280XP Adreno binding
In reply to Greg Kroah-HartmanFrom: Bjorn Andersson <[email protected]>
[ Upstream commit 84b8a7fe29205016cffd4eff91b45830d318b53d ]
The qcom,sc8280xp-smmu-500 Adreno SMMU binding has clocks, so fix up the binding to allow this.
--- Documentation/devicetree/bindings/iommu/arm,smmu.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/iommu/arm,smmu.yaml +4 -2
@@ -80,6 +80,7 @@ properties: items: - enum: - qcom,sc7280-smmu-500 + - qcom,sc8280xp-smmu-500 - qcom,sm6115-smmu-500 - qcom,sm6125-smmu-500 - qcom,sm8150-smmu-500
@@ -331,7 +332,9 @@ allOf: properties: compatible: contains: - const: qcom,sc7280-smmu-500 + enum: + - qcom,sc7280-smmu-500 + - qcom,sc8280xp-smmu-500 then: properties: clock-names:
@@ -416,7 +419,6 @@ allOf: - qcom,sa8775p-smmu-500 - qcom,sc7180-smmu-500 - qcom,sc8180x-smmu-500 - - qcom,sc8280xp-smmu-500 - qcom,sdm670-smmu-500 - qcom,sdm845-smmu-500 - qcom,sdx55-smmu-500
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 346/800 drm/i915: Fix limited range csc matrix
In reply to Greg Kroah-HartmanFrom: Ville Syrjälä <[email protected]>
[ Upstream commit 404c3acda4b65924c05bc63242e94f954f84c165 ]
Our current limited range matrix is a bit off. I think it was originally calculated with rounding, as if we wanted the normal pixel replication type of behaviour. That is, since the 8bpc max value is 0xeb we assumed the 16bpc max value should be 0xebeb, but what the HDMI spec actually says it should be is 0xeb00.
So to get what we want we make the formula
out = in * (235-16) << (12-8) / in_max + 16 << (12-8),
with 12 being precision of the csc, 8 being the precision of the constants we used.
The hardware takes its coefficients as floating point values, but the (235−16)/255 = ~.86, so exponent 0 is what we want anyway, so it works out perfectly without having to hardcode it in hex or start playing with floats.
In terms of raw numbers we are feeding the hardware the post offset changes from 0x101 to 0x100, and the coefficient changes from 0xdc0 to 0xdb0 (~.860->~.855). So this should make everything come out just a tad darker.
I already used better constants in lut_limited_range() earlier so the output of the two paths should be closer now.
Stable-dep-of: 19db2062094c ("drm/i915: No 10bit gamma on desktop gen3 parts")
--- drivers/gpu/drm/i915/display/intel_color.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/display/intel_color.c +2 -3
@@ -116,10 +116,9 @@ struct intel_color_funcs {#define ILK_CSC_COEFF_FP (coeff, fbits) \ (clamp_val(((coeff) >> (32 - (fbits) - 3)) + 4, 0, 0xfff) & 0xff8) -#define ILK_CSC_COEFF_LIMITED_RANGE 0x0dc0#define ILK_CSC_COEFF_1_0 0x7800 - -#define ILK_CSC_POSTOFF_LIMITED_RANGE (16 * (1 << 12) / 255) +#define ILK_CSC_COEFF_LIMITED_RANGE ((235 - 16) << (12 - 8))/* exponent 0 */ +#define ILK_CSC_POSTOFF_LIMITED_RANGE (16 << (12 - 8))/* Nop pre/post offsets */ static const u16 ilk_csc_off_zero[3 ] = {};
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 347/800 drm/i915: hide mkwrite_device_info() better
In reply to Greg Kroah-HartmanFrom: Jani Nikula <[email protected]>
[ Upstream commit 446a20c9ba622bb531f1705eab88b64d478ee434 ]
The goal has been to just make device info a pointer to static const data, i.e. the static const structs in i915_pci.c. See [1]. However, there were issues with intel_device_info_runtime_init() clearing the display sub-struct of device info on the !HAS_DISPLAY() path, which consequently disables a lot of display functionality, like it should. Looks like we'd have to cover all those paths, and maybe sprinkle HAS_DISPLAY() checks in them, which we haven't gotten around to.
In the mean time, hide mkwrite_device_info() better within intel_device_info.c by adding a intel_device_info_driver_create() for the very early initialization of the device info and initial runtime info. This also lets us declutter i915_drv.h a bit, and stops promoting mkwrite_device_info() as something that could be used.
Stable-dep-of: 19db2062094c ("drm/i915: No 10bit gamma on desktop gen3 parts")
--- drivers/gpu/drm/i915/i915_driver.c | 12 ++-------- drivers/gpu/drm/i915/i915_drv.h | 7 ------ drivers/gpu/drm/i915/intel_device_info.c | 29 ++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_device_info.h | 2 ++ 4 files changed, 33 insertions(+), 17 deletions(-)
drivers/gpu/drm/i915/i915_driver.c +2 -10
@@ -720,8 +720,6 @@ i915_driver_create(struct pci_dev *pdev, const struct pci_device_id *ent) {const struct intel_device_info *match_info = (struct intel_device_info *)ent->driver_data; -struct intel_device_info *device_info; -struct intel_runtime_info *runtime;struct drm_i915_private *i915; i915 = devm_drm_dev_alloc(&pdev->dev, &i915_drm_driver,
@@ -734,14 +732,8 @@ i915_driver_create(struct pci_dev *pdev, const struct pci_device_id *ent)/* Device parameters start as a copy of module parameters. */ i915_params_copy (&i915->params, &i915_modparams); -/* Setup the write-once "constant" device info */ - device_info =mkwrite_device_info (i915); -memcpy (device_info, match_info,sizeof (*device_info)); - -/* Initialize initial runtime info from static const data and pdev. */ - runtime =RUNTIME_INFO (i915); -memcpy (runtime, &INTEL_INFO (i915)->__runtime,sizeof (*runtime)); - runtime->device_id = pdev->device; +/* Set up device info and initial runtime info. */ +intel_device_info_driver_create (i915, pdev->device, match_info);return i915; }
drivers/gpu/drm/i915/i915_drv.h +0 -7
@@ -931,11 +931,4 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define HAS_LMEMBAR_SMEM_STOLEN (i915) (!HAS_LMEM(i915) && \ GRAPHICS_VER_FULL(i915) >= IP_VER(12, 70)) -/* intel_device_info.c */ -static inline struct intel_device_info * -mkwrite_device_info (struct drm_i915_private *dev_priv) -{ -return (struct intel_device_info *)INTEL_INFO (dev_priv); -} -#endif
drivers/gpu/drm/i915/intel_device_info.c +29 -0
@@ -381,6 +381,13 @@ void intel_device_info_runtime_init_early(struct drm_i915_private *i915)intel_device_info_subplatform_init (i915); } +/* FIXME: Remove this, and make device info a const pointer to rodata. */ +static struct intel_device_info * +mkwrite_device_info (struct drm_i915_private *i915) +{ +return (struct intel_device_info *)INTEL_INFO (i915); +} +/** * intel_device_info_runtime_init - initialize runtime info * @dev_priv: the i915 device
@@ -548,6 +555,28 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv) dev_priv->drm.driver_features &= ~DRIVER_ATOMIC ; } +/* +* Set up device info and initial runtime info at driver create. +* +* Note: i915 is only an allocated blob of memory at this point. +*/ +void intel_device_info_driver_create (struct drm_i915_private *i915, +u16 device_id, +const struct intel_device_info *match_info) +{ +struct intel_device_info *info; +struct intel_runtime_info *runtime; + +/* Setup the write-once "constant" device info */ + info =mkwrite_device_info (i915); +memcpy (info, match_info,sizeof (*info)); + +/* Initialize initial runtime info from static const data and pdev. */ + runtime =RUNTIME_INFO (i915); +memcpy (runtime, &INTEL_INFO (i915)->__runtime,sizeof (*runtime)); + runtime->device_id = device_id; +} +void intel_driver_caps_print (const struct intel_driver_caps *caps,struct drm_printer *p) {
drivers/gpu/drm/i915/intel_device_info.h +2 -0
@@ -317,6 +317,8 @@ struct intel_driver_caps {const char *intel_platform_name (enum intel_platform platform); +void intel_device_info_driver_create (struct drm_i915_private *i915,u16 device_id, +const struct intel_device_info *match_info);void intel_device_info_runtime_init_early (struct drm_i915_private *dev_priv);void intel_device_info_runtime_init (struct drm_i915_private *dev_priv);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 348/800 drm/i915/display: Move display device info to header under display/
In reply to Greg Kroah-HartmanFrom: Matt Roper <[email protected]>
[ Upstream commit 05aa8e0135094ae3d1e6837b5457a740266d7cfc ]
Moving display-specific substructure definitions will help keep display more self-contained and make it easier to re-use in other drivers (i.e., Xe) in the future.
Stable-dep-of: 19db2062094c ("drm/i915: No 10bit gamma on desktop gen3 parts")
--- .../drm/i915/display/intel_display_device.h | 60 +++++++++++++++++++ drivers/gpu/drm/i915/intel_device_info.h | 49 +-------------- 2 files changed, 62 insertions(+), 47 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/intel_display_device.h
drivers/gpu/drm/i915/display/intel_display_device.h new file +60 -0
@@ -0,0 +1,60 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright © 2023 Intel Corporation +*/ + +#ifndef __INTEL_DISPLAY_DEVICE_H__ +#define __INTEL_DISPLAY_DEVICE_H__ + +#include <linux/types.h> + +#include "display/intel_display_limits.h" + +#define DEV_INFO_DISPLAY_FOR_EACH_FLAG (func) \ +/* Keep in alphabetical order */ \ + func(cursor_needs_physical); \ + func(has_cdclk_crawl); \ + func(has_cdclk_squash); \ + func(has_ddi); \ + func(has_dp_mst); \ + func(has_dsb); \ + func(has_fpga_dbg); \ + func(has_gmch); \ + func(has_hotplug); \ + func(has_hti); \ + func(has_ipc); \ + func(has_overlay); \ + func(has_psr); \ + func(has_psr_hw_tracking); \ + func(overlay_needs_physical); \ + func(supports_tv); + +struct intel_display_device_info { +u8 abox_mask; + +struct { +u16 size;/* in blocks */ +u8 slice_mask; + } dbuf; + +#define DEFINE_FLAG (name) u8 name:1 +DEV_INFO_DISPLAY_FOR_EACH_FLAG (DEFINE_FLAG); +#undef DEFINE_FLAG + +/* Global register offset for the display engine */ +u32 mmio_offset; + +/* Register offsets for the various display pipes and transcoders */ +u32 pipe_offsets[I915_MAX_TRANSCODERS ]; +u32 trans_offsets[I915_MAX_TRANSCODERS ]; +u32 cursor_offsets[I915_MAX_PIPES ]; + +struct { +u32 degamma_lut_size; +u32 gamma_lut_size; +u32 degamma_lut_tests; +u32 gamma_lut_tests; + } color; +}; + +#endif
drivers/gpu/drm/i915/intel_device_info.h +2 -47
67 lines not on this page · raw message
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 349/800 drm/i915: Convert INTEL_INFO()->display to a pointer
In reply to Greg Kroah-HartmanFrom: Matt Roper <[email protected]>
[ Upstream commit 5af5169d758275490ab00e209a09dc1d6b85e535 ]
Rather than embeddeding the display's device info within the main device info structure, just provide a pointer to the display-specific structure. This is in preparation for moving the display device info definitions into the display code itself and for eventually allowing the pointer to be assigned at runtime on platforms that use GMD_ID for device identification.
In the future, this will also eventually allow the same display device info structures to be used outside the current i915 code (e.g., from the Xe driver).
v2:
- Move introduction of DISPLAY_INFO() to this patch. (Andrzej)
v3:
- Also use DISPLAY_INFO() in intel_display_reg_defs.h. (Andrzej)
- Use "{}" instead of "{ 0 }" for empty struct init. (Jani)
Stable-dep-of: 19db2062094c ("drm/i915: No 10bit gamma on desktop gen3 parts")
--- drivers/gpu/drm/i915/display/intel_color.c | 31 +- drivers/gpu/drm/i915/display/intel_cursor.c | 2 +- drivers/gpu/drm/i915/display/intel_display.h | 2 +- .../drm/i915/display/intel_display_power.c | 6 +- .../drm/i915/display/intel_display_reg_defs.h | 14 +- drivers/gpu/drm/i915/display/intel_fb_pin.c | 2 +- drivers/gpu/drm/i915/display/intel_hti.c | 2 +- drivers/gpu/drm/i915/display/skl_watermark.c | 8 +- drivers/gpu/drm/i915/i915_drv.h | 29 +- drivers/gpu/drm/i915/i915_pci.c | 575 ++++++++++++------ drivers/gpu/drm/i915/intel_device_info.c | 6 +- drivers/gpu/drm/i915/intel_device_info.h | 2 +- 12 files changed, 450 insertions(+), 229 deletions(-)
drivers/gpu/drm/i915/display/intel_color.c +16 -15
@@ -1605,14 +1605,14 @@ static u32 intel_gamma_lut_tests(const struct intel_crtc_state *crtc_state)if (lut_is_legacy (gamma_lut))return 0 ; -return INTEL_INFO (i915)->display.color.gamma_lut_tests; +return DISPLAY_INFO (i915)->color.gamma_lut_tests; }static u32 intel_degamma_lut_tests (const struct intel_crtc_state *crtc_state) {struct drm_i915_private *i915 =to_i915 (crtc_state->uapi.crtc->dev); -return INTEL_INFO (i915)->display.color.degamma_lut_tests; +return DISPLAY_INFO (i915)->color.degamma_lut_tests; }static int intel_gamma_lut_size (const struct intel_crtc_state *crtc_state)
@@ -1623,14 +1623,14 @@ static int intel_gamma_lut_size(const struct intel_crtc_state *crtc_state)if (lut_is_legacy (gamma_lut))return LEGACY_LUT_LENGTH ; -return INTEL_INFO (i915)->display.color.gamma_lut_size; +return DISPLAY_INFO (i915)->color.gamma_lut_size; }static u32 intel_degamma_lut_size (const struct intel_crtc_state *crtc_state) {struct drm_i915_private *i915 =to_i915 (crtc_state->uapi.crtc->dev); -return INTEL_INFO (i915)->display.color.degamma_lut_size; +return DISPLAY_INFO (i915)->color.degamma_lut_size; }static int check_lut_size (const struct drm_property_blob *lut,int expected)
@@ -2096,7 +2096,7 @@ static int glk_assign_luts(struct intel_crtc_state *crtc_state)struct drm_property_blob *gamma_lut; gamma_lut =create_resized_lut (i915, crtc_state->hw.gamma_lut, -INTEL_INFO (i915)->display.color.degamma_lut_size, +DISPLAY_INFO (i915)->color.degamma_lut_size, false);if (IS_ERR (gamma_lut))return PTR_ERR (gamma_lut);
@@ -2626,7 +2626,7 @@ static struct drm_property_blob *i9xx_read_lut_8(struct intel_crtc *crtc)static struct drm_property_blob *i9xx_read_lut_10 (struct intel_crtc *crtc) {struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -u32 lut_size =INTEL_INFO (dev_priv)->display.color.gamma_lut_size; +u32 lut_size =DISPLAY_INFO (dev_priv)->color.gamma_lut_size;enum pipe pipe = crtc->pipe;struct drm_property_blob *blob;struct drm_color_lut *lut;
@@ -2675,7 +2675,7 @@ static void i9xx_read_luts(struct intel_crtc_state *crtc_state)static struct drm_property_blob *i965_read_lut_10p6 (struct intel_crtc *crtc) {struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -int i, lut_size =INTEL_INFO (dev_priv)->display.color.gamma_lut_size; +int i, lut_size =DISPLAY_INFO (dev_priv)->color.gamma_lut_size;enum pipe pipe = crtc->pipe;struct drm_property_blob *blob;struct drm_color_lut *lut;
@@ -2725,7 +2725,7 @@ static void i965_read_luts(struct intel_crtc_state *crtc_state)static struct drm_property_blob *chv_read_cgm_degamma (struct intel_crtc *crtc) {struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -int i, lut_size =INTEL_INFO (dev_priv)->display.color.degamma_lut_size; +int i, lut_size =DISPLAY_INFO (dev_priv)->color.degamma_lut_size;enum pipe pipe = crtc->pipe;struct drm_property_blob *blob;struct drm_color_lut *lut;
@@ -2751,7 +2751,7 @@ static struct drm_property_blob *chv_read_cgm_degamma(struct intel_crtc *crtc)static struct drm_property_blob *chv_read_cgm_gamma (struct intel_crtc *crtc) {struct drm_i915_private *i915 =to_i915 (crtc->base.dev); -int i, lut_size =INTEL_INFO (i915)->display.color.gamma_lut_size; +int i, lut_size =DISPLAY_INFO (i915)->color.gamma_lut_size;enum pipe pipe = crtc->pipe;struct drm_property_blob *blob;struct drm_color_lut *lut;
@@ -2815,7 +2815,7 @@ static struct drm_property_blob *ilk_read_lut_8(struct intel_crtc *crtc)static struct drm_property_blob *ilk_read_lut_10 (struct intel_crtc *crtc) {struct drm_i915_private *i915 =to_i915 (crtc->base.dev); -int i, lut_size =INTEL_INFO (i915)->display.color.gamma_lut_size; +int i, lut_size =DISPLAY_INFO (i915)->color.gamma_lut_size;enum pipe pipe = crtc->pipe;struct drm_property_blob *blob;struct drm_color_lut *lut;
@@ -2999,7 +2999,7 @@ static void bdw_read_luts(struct intel_crtc_state *crtc_state)static struct drm_property_blob *glk_read_degamma_lut (struct intel_crtc *crtc) {struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -int i, lut_size =INTEL_INFO (dev_priv)->display.color.degamma_lut_size; +int i, lut_size =DISPLAY_INFO (dev_priv)->color.degamma_lut_size;enum pipe pipe = crtc->pipe;struct drm_property_blob *blob;struct drm_color_lut *lut;
@@ -3064,7 +3064,7 @@ static struct drm_property_blob * icl_read_lut_multi_segment(struct intel_crtc *crtc) {struct drm_i915_private *i915 =to_i915 (crtc->base.dev); -int i, lut_size =INTEL_INFO (i915)->display.color.gamma_lut_size; +int i, lut_size =DISPLAY_INFO (i915)->color.gamma_lut_size;enum pipe pipe = crtc->pipe;struct drm_property_blob *blob;struct drm_color_lut *lut;
@@ -3233,8 +3233,8 @@ void intel_color_crtc_init(struct intel_crtc *crtc)drm_mode_crtc_set_gamma_size (&crtc->base,256 ); - gamma_lut_size =INTEL_INFO (i915)->display.color.gamma_lut_size; - degamma_lut_size =INTEL_INFO (i915)->display.color.degamma_lut_size; + gamma_lut_size =DISPLAY_INFO (i915)->color.gamma_lut_size; + degamma_lut_size =DISPLAY_INFO (i915)->color.degamma_lut_size; has_ctm = degamma_lut_size !=0 ;/*
@@ -3259,7 +3259,8 @@ int intel_color_init(struct drm_i915_private *i915)if (DISPLAY_VER (i915) !=10 )return 0 ; - blob =create_linear_lut (i915,INTEL_INFO (i915)->display.color.degamma_lut_size); + blob =create_linear_lut (i915, +DISPLAY_INFO (i915)->color.degamma_lut_size);if (IS_ERR (blob))return PTR_ERR (blob);
drivers/gpu/drm/i915/display/intel_cursor.c +1 -1
@@ -36,7 +36,7 @@ static u32 intel_cursor_base(const struct intel_plane_state *plane_state)const struct drm_i915_gem_object *obj =intel_fb_obj (fb);u32 base; -if (INTEL_INFO (dev_priv)->display.cursor_needs_physical) +if (DISPLAY_INFO (dev_priv)->cursor_needs_physical) base =sg_dma_address (obj->mm.pages->sgl);else base =intel_plane_ggtt_offset (plane_state);
drivers/gpu/drm/i915/display/intel_display.h +1 -1
@@ -113,7 +113,7 @@ enum i9xx_plane_id {#define for_each_dbuf_slice (__dev_priv, __slice) \ for ((__slice) = DBUF_S1; (__slice) < I915_MAX_DBUF_SLICES; (__slice)++) \ - for_each_if(INTEL_INFO(__dev_priv)->display.dbuf.slice_mask & BIT(__slice)) + for_each_if(INTEL_INFO(__dev_priv)->display->dbuf.slice_mask & BIT(__slice))#define for_each_dbuf_slice_in_mask (__dev_priv, __slice, __mask) \ for_each_dbuf_slice((__dev_priv), (__slice)) \
drivers/gpu/drm/i915/display/intel_display_power.c +3 -3
@@ -1052,7 +1052,7 @@ void gen9_dbuf_slices_update(struct drm_i915_private *dev_priv, u8 req_slices) {struct i915_power_domains *power_domains = &dev_priv->display.power.domains; -u8 slice_mask =INTEL_INFO (dev_priv)->display.dbuf.slice_mask; +u8 slice_mask =DISPLAY_INFO (dev_priv)->dbuf.slice_mask;enum dbuf_slice slice; drm_WARN(&dev_priv->drm, req_slices & ~slice_mask,
@@ -1112,7 +1112,7 @@ static void gen12_dbuf_slices_config(struct drm_i915_private *dev_priv)static void icl_mbus_init (struct drm_i915_private *dev_priv) { -unsigned long abox_regs =INTEL_INFO (dev_priv)->display.abox_mask; +unsigned long abox_regs =DISPLAY_INFO (dev_priv)->abox_mask;u32 mask, val, i;if (IS_ALDERLAKE_P (dev_priv) ||DISPLAY_VER (dev_priv) >=14 )
@@ -1558,7 +1558,7 @@ static void tgl_bw_buddy_init(struct drm_i915_private *dev_priv)enum intel_dram_type type = dev_priv->dram_info.type;u8 num_channels = dev_priv->dram_info.num_channels;const struct buddy_page_mask *table; -unsigned long abox_mask =INTEL_INFO (dev_priv)->display.abox_mask; +unsigned long abox_mask =DISPLAY_INFO (dev_priv)->abox_mask;int config, i;/* BW_BUDDY registers are not used on dgpu's beyond DG1 */
drivers/gpu/drm/i915/display/intel_display_reg_defs.h +7 -7
@@ -8,7 +8,7 @@#include "i915_reg_defs.h" -#define DISPLAY_MMIO_BASE (dev_priv) (INTEL_INFO(dev_priv)->display.mmio_offset) +#define DISPLAY_MMIO_BASE (dev_priv) (DISPLAY_INFO(dev_priv)->mmio_offset)#define VLV_DISPLAY_BASE 0x180000
@@ -36,14 +36,14 @@* Device info offset array based helpers for groups of registers with unevenly * spaced base offsets. */ -#define _MMIO_PIPE2 (pipe, reg) _MMIO(INTEL_INFO(dev_priv)->display.pipe_offsets[(pipe)] - \ - INTEL_INFO(dev_priv)->display.pipe_offsets[PIPE_A] + \ +#define _MMIO_PIPE2 (pipe, reg) _MMIO(DISPLAY_INFO(dev_priv)->pipe_offsets[(pipe)] - \ + DISPLAY_INFO(dev_priv)->pipe_offsets[PIPE_A] + \ DISPLAY_MMIO_BASE(dev_priv) + (reg)) -#define _MMIO_TRANS2 (tran, reg) _MMIO(INTEL_INFO(dev_priv)->display.trans_offsets[(tran)] - \ - INTEL_INFO(dev_priv)->display.trans_offsets[TRANSCODER_A] + \ +#define _MMIO_TRANS2 (tran, reg) _MMIO(DISPLAY_INFO(dev_priv)->trans_offsets[(tran)] - \ + DISPLAY_INFO(dev_priv)->trans_offsets[TRANSCODER_A] + \ DISPLAY_MMIO_BASE(dev_priv) + (reg)) -#define _MMIO_CURSOR2 (pipe, reg) _MMIO(INTEL_INFO(dev_priv)->display.cursor_offsets[(pipe)] - \ - INTEL_INFO(dev_priv)->display.cursor_offsets[PIPE_A] + \ +#define _MMIO_CURSOR2 (pipe, reg) _MMIO(DISPLAY_INFO(dev_priv)->cursor_offsets[(pipe)] - \ + DISPLAY_INFO(dev_priv)->cursor_offsets[PIPE_A] + \ DISPLAY_MMIO_BASE(dev_priv) + (reg))#endif /* __INTEL_DISPLAY_REG_DEFS_H__ */
drivers/gpu/drm/i915/display/intel_fb_pin.c +1 -1
@@ -243,7 +243,7 @@ int intel_plane_pin_fb(struct intel_plane_state *plane_state)struct i915_vma *vma;bool phys_cursor = plane->id ==PLANE_CURSOR && -INTEL_INFO (dev_priv)->display.cursor_needs_physical; +DISPLAY_INFO (dev_priv)->cursor_needs_physical;if (!intel_fb_uses_dpt (fb)) { vma = intel_pin_and_fence_fb_obj(fb, phys_cursor,
drivers/gpu/drm/i915/display/intel_hti.c +1 -1
@@ -15,7 +15,7 @@ void intel_hti_init(struct drm_i915_private *i915)* If the platform has HTI, we need to find out whether it has reserved * any display resources before we create our display outputs. */ -if (INTEL_INFO (i915)->display.has_hti) +if (DISPLAY_INFO (i915)->has_hti) i915->display.hti.state =intel_de_read (i915,HDPORT_STATE ); }
drivers/gpu/drm/i915/display/skl_watermark.c +4 -4
@@ -507,8 +507,8 @@ static u16 skl_ddb_entry_init(struct skl_ddb_entry *entry,static int intel_dbuf_slice_size (struct drm_i915_private *i915) { -return INTEL_INFO (i915)->display.dbuf.size / -hweight8 (INTEL_INFO (i915)->display.dbuf.slice_mask); +return DISPLAY_INFO (i915)->dbuf.size / +hweight8 (DISPLAY_INFO (i915)->dbuf.slice_mask); } static void
@@ -527,7 +527,7 @@ skl_ddb_entry_for_slices(struct drm_i915_private *i915, u8 slice_mask, ddb->end =fls (slice_mask) * slice_size;WARN_ON (ddb->start >= ddb->end); -WARN_ON (ddb->end >INTEL_INFO (i915)->display.dbuf.size); +WARN_ON (ddb->end >DISPLAY_INFO (i915)->dbuf.size); }static unsigned int mbus_ddb_offset (struct drm_i915_private *i915,u8 slice_mask)
@@ -2625,7 +2625,7 @@ skl_compute_ddb(struct intel_atomic_state *state)"Enabled dbuf slices 0x%x -> 0x%x (total dbuf slices 0x%x), mbus joined? %s->%s\n" , old_dbuf_state->enabled_slices, new_dbuf_state->enabled_slices, -INTEL_INFO (i915)->display.dbuf.slice_mask, +DISPLAY_INFO (i915)->dbuf.slice_mask,str_yes_no (old_dbuf_state->joined_mbus), str_yes_no(new_dbuf_state->joined_mbus)); }
drivers/gpu/drm/i915/i915_drv.h +15 -14
@@ -408,6 +408,7 @@ static inline struct intel_gt *to_gt(struct drm_i915_private *i915) (engine__) = rb_to_uabi_engine(rb_next(&(engine__)->uabi_node)))#define INTEL_INFO (dev_priv) (&(dev_priv)->__info) +#define DISPLAY_INFO (i915) (INTEL_INFO(i915)->display)#define RUNTIME_INFO (dev_priv) (&(dev_priv)->__runtime)#define DRIVER_CAPS (dev_priv) (&(dev_priv)->caps)
@@ -782,9 +783,9 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, ((sizes) & ~RUNTIME_INFO (dev_priv)->page_sizes) ==0 ; \ }) -#define HAS_OVERLAY (dev_priv) (INTEL_INFO(dev_priv)->display.has_overlay) +#define HAS_OVERLAY (dev_priv) (DISPLAY_INFO(dev_priv)->has_overlay)#define OVERLAY_NEEDS_PHYSICAL (dev_priv) \ - (INTEL_INFO(dev_priv)->display.overlay_needs_physical) + (DISPLAY_INFO(dev_priv)->overlay_needs_physical)/* Early gen2 have a totally busted CS tlb and require pinned batches. */ #define HAS_BROKEN_CS_TLB (dev_priv) (IS_I830(dev_priv) || IS_I845G(dev_priv))
@@ -806,8 +807,8 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,*/ #define HAS_128_BYTE_Y_TILING (dev_priv) (GRAPHICS_VER(dev_priv) != 2 && \ !(IS_I915G(dev_priv) || IS_I915GM(dev_priv))) -#define SUPPORTS_TV (dev_priv) (INTEL_INFO(dev_priv)->display.supports_tv) -#define I915_HAS_HOTPLUG (dev_priv) (INTEL_INFO(dev_priv)->display.has_hotplug) +#define SUPPORTS_TV (dev_priv) (DISPLAY_INFO(dev_priv)->supports_tv) +#define I915_HAS_HOTPLUG (dev_priv) (DISPLAY_INFO(dev_priv)->has_hotplug)#define HAS_FW_BLC (dev_priv) (DISPLAY_VER(dev_priv) > 2)#define HAS_FBC (dev_priv) (RUNTIME_INFO(dev_priv)->fbc_mask != 0)
@@ -817,18 +818,18 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define HAS_IPS (dev_priv) (IS_HSW_ULT(dev_priv) || IS_BROADWELL(dev_priv)) -#define HAS_DP_MST (dev_priv) (INTEL_INFO(dev_priv)->display.has_dp_mst) +#define HAS_DP_MST (dev_priv) (DISPLAY_INFO(dev_priv)->has_dp_mst)#define HAS_DP20 (dev_priv) (IS_DG2(dev_priv) || DISPLAY_VER(dev_priv) >= 14)#define HAS_DOUBLE_BUFFERED_M_N (dev_priv) (DISPLAY_VER(dev_priv) >= 9 || IS_BROADWELL(dev_priv)) -#define HAS_CDCLK_CRAWL (dev_priv) (INTEL_INFO(dev_priv)->display.has_cdclk_crawl) -#define HAS_CDCLK_SQUASH (dev_priv) (INTEL_INFO(dev_priv)->display.has_cdclk_squash) -#define HAS_DDI (dev_priv) (INTEL_INFO(dev_priv)->display.has_ddi) -#define HAS_FPGA_DBG_UNCLAIMED (dev_priv) (INTEL_INFO(dev_priv)->display.has_fpga_dbg) -#define HAS_PSR (dev_priv) (INTEL_INFO(dev_priv)->display.has_psr) +#define HAS_CDCLK_CRAWL (dev_priv) (DISPLAY_INFO(dev_priv)->has_cdclk_crawl) +#define HAS_CDCLK_SQUASH (dev_priv) (DISPLAY_INFO(dev_priv)->has_cdclk_squash) +#define HAS_DDI (dev_priv) (DISPLAY_INFO(dev_priv)->has_ddi) +#define HAS_FPGA_DBG_UNCLAIMED (dev_priv) (DISPLAY_INFO(dev_priv)->has_fpga_dbg) +#define HAS_PSR (dev_priv) (DISPLAY_INFO(dev_priv)->has_psr)#define HAS_PSR_HW_TRACKING (dev_priv) \ - (INTEL_INFO(dev_priv)->display.has_psr_hw_tracking) + (DISPLAY_INFO(dev_priv)->has_psr_hw_tracking)#define HAS_PSR2_SEL_FETCH (dev_priv) (DISPLAY_VER(dev_priv) >= 12)#define HAS_TRANSCODER (dev_priv, trans) ((RUNTIME_INFO(dev_priv)->cpu_transcoder_mask & BIT(trans)) != 0)
@@ -839,7 +840,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define HAS_RPS (dev_priv) (INTEL_INFO(dev_priv)->has_rps)#define HAS_DMC (dev_priv) (RUNTIME_INFO(dev_priv)->has_dmc) -#define HAS_DSB (dev_priv) (INTEL_INFO(dev_priv)->display.has_dsb) +#define HAS_DSB (dev_priv) (DISPLAY_INFO(dev_priv)->has_dsb)#define HAS_DSC (__i915) (RUNTIME_INFO(__i915)->has_dsc)#define HAS_HW_SAGV_WM (i915) (DISPLAY_VER(i915) >= 13 && !IS_DGFX(i915))
@@ -869,7 +870,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,*/ #define HAS_64K_PAGES (dev_priv) (INTEL_INFO(dev_priv)->has_64k_pages) -#define HAS_IPC (dev_priv) (INTEL_INFO(dev_priv)->display.has_ipc) +#define HAS_IPC (dev_priv) (DISPLAY_INFO(dev_priv)->has_ipc)#define HAS_SAGV (dev_priv) (DISPLAY_VER(dev_priv) >= 9 && !IS_LP(dev_priv))#define HAS_REGION (i915, i) (RUNTIME_INFO(i915)->memory_regions & (i))
@@ -889,7 +890,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define HAS_GLOBAL_MOCS_REGISTERS (dev_priv) (INTEL_INFO(dev_priv)->has_global_mocs) -#define HAS_GMCH (dev_priv) (INTEL_INFO(dev_priv)->display.has_gmch) +#define HAS_GMCH (dev_priv) (DISPLAY_INFO(dev_priv)->has_gmch)#define HAS_GMD_ID (i915) (INTEL_INFO(i915)->has_gmd_id)
drivers/gpu/drm/i915/i915_pci.c +396 -179
1,267 lines not on this page · raw message
drivers/gpu/drm/i915/intel_device_info.c +4 -2
@@ -138,7 +138,7 @@ void intel_device_info_print(const struct intel_device_info *info,drm_printf (p,"has_pooled_eu: %s\n" ,str_yes_no (runtime->has_pooled_eu)); -#define PRINT_FLAG (name) drm_printf(p, "%s: %s\n", #name, str_yes_no(info->display.name)) +#define PRINT_FLAG (name) drm_printf(p, "%s: %s\n", #name, str_yes_no(info->display->name))DEV_INFO_DISPLAY_FOR_EACH_FLAG (PRINT_FLAG );#undef PRINT_FLAG
@@ -388,6 +388,8 @@ mkwrite_device_info(struct drm_i915_private *i915)return (struct intel_device_info *)INTEL_INFO (i915); } +static const struct intel_display_device_info no_display = {}; +/** * intel_device_info_runtime_init - initialize runtime info * @dev_priv: the i915 device
@@ -538,7 +540,7 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv)if (!HAS_DISPLAY (dev_priv)) { dev_priv->drm.driver_features &= ~(DRIVER_MODESET |DRIVER_ATOMIC ); -memset (&info->display,0 ,sizeof (info->display)); + info->display = &no_display; runtime->cpu_transcoder_mask =0 ;memset (runtime->num_sprites,0 ,sizeof (runtime->num_sprites));
drivers/gpu/drm/i915/intel_device_info.h +1 -1
@@ -257,7 +257,7 @@ struct intel_device_info {DEV_INFO_FOR_EACH_FLAG (DEFINE_FLAG );#undef DEFINE_FLAG -struct intel_display_device_info display; +const struct intel_display_device_info *display;/* * Initial runtime info. Do not access outside of i915_driver_create().
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 350/800 drm/i915/display: Move display runtime info to display structure
In reply to Greg Kroah-HartmanFrom: Matt Roper <[email protected]>
[ Upstream commit 18e0deeed8c80d8ec0adfff3312252028739ce52 ]
Move the runtime info specific to display into display-specific structures as has already been done with the constant display info.
v2:
- Rename __runtime to __runtime_defaults for more clarity on the purpose. (Andrzej)
- Move introduction of DISPLAY_INFO() to previous patch. (Andrzej)
- Drop NO_DISPLAY macro. (Andrzej)
v3:
- Use "{}" instead of "{ 0 }" for empty struct init. (Jani)
Stable-dep-of: 19db2062094c ("drm/i915: No 10bit gamma on desktop gen3 parts")
--- drivers/gpu/drm/i915/display/intel_crtc.c | 2 +- drivers/gpu/drm/i915/display/intel_cursor.c | 2 +- drivers/gpu/drm/i915/display/intel_display.c | 2 +- drivers/gpu/drm/i915/display/intel_display.h | 8 +- .../drm/i915/display/intel_display_device.h | 23 ++ drivers/gpu/drm/i915/display/intel_fbc.c | 6 +- drivers/gpu/drm/i915/display/intel_hdcp.c | 2 +- .../drm/i915/display/skl_universal_plane.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 16 +- drivers/gpu/drm/i915/i915_pci.c | 252 +++++++++++------- drivers/gpu/drm/i915/intel_device_info.c | 101 +++---- drivers/gpu/drm/i915/intel_device_info.h | 18 -- drivers/gpu/drm/i915/intel_step.c | 8 +- 13 files changed, 267 insertions(+), 175 deletions(-)
drivers/gpu/drm/i915/display/intel_crtc.c +1 -1
@@ -302,7 +302,7 @@ int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe)return PTR_ERR (crtc); crtc->pipe = pipe; - crtc->num_scalers =RUNTIME_INFO (dev_priv)->num_scalers[pipe]; + crtc->num_scalers =DISPLAY_RUNTIME_INFO (dev_priv)->num_scalers[pipe];if (DISPLAY_VER (dev_priv) >=9 ) primary = skl_universal_plane_create(dev_priv, pipe,
drivers/gpu/drm/i915/display/intel_cursor.c +1 -1
@@ -814,7 +814,7 @@ intel_cursor_plane_create(struct drm_i915_private *dev_priv,DRM_MODE_ROTATE_0 | DRM_MODE_ROTATE_180); - zpos =RUNTIME_INFO (dev_priv)->num_sprites[pipe] +1 ; + zpos =DISPLAY_RUNTIME_INFO (dev_priv)->num_sprites[pipe] +1 ;drm_plane_create_zpos_immutable_property (&cursor->base, zpos);if (DISPLAY_VER (dev_priv) >=12 )
drivers/gpu/drm/i915/display/intel_display.c +1 -1
@@ -3568,7 +3568,7 @@ static u8 bigjoiner_pipes(struct drm_i915_private *i915)else pipes =0 ; -return pipes &RUNTIME_INFO (i915)->pipe_mask; +return pipes &DISPLAY_RUNTIME_INFO (i915)->pipe_mask; } static bool transcoder_ddi_func_is_enabled(struct drm_i915_private *dev_priv,
drivers/gpu/drm/i915/display/intel_display.h +4 -4
@@ -105,7 +105,7 @@ enum i9xx_plane_id { };#define plane_name (p) ((p) + 'A') -#define sprite_name (p, s) ((p) * RUNTIME_INFO(dev_priv)->num_sprites[(p)] + (s) + 'A') +#define sprite_name (p, s) ((p) * DISPLAY_RUNTIME_INFO(dev_priv)->num_sprites[(p)] + (s) + 'A')#define for_each_plane_id_on_crtc (__crtc, __p) \ for ((__p) = PLANE_PRIMARY; (__p) < I915_MAX_PLANES; (__p)++) \
@@ -221,7 +221,7 @@ enum phy_fia {#define for_each_pipe (__dev_priv, __p) \ for ((__p) = 0; (__p) < I915_MAX_PIPES; (__p)++) \ - for_each_if(RUNTIME_INFO(__dev_priv)->pipe_mask & BIT(__p)) + for_each_if(DISPLAY_RUNTIME_INFO(__dev_priv)->pipe_mask & BIT(__p))#define for_each_pipe_masked (__dev_priv, __p, __mask) \ for_each_pipe(__dev_priv, __p) \
@@ -229,7 +229,7 @@ enum phy_fia {#define for_each_cpu_transcoder (__dev_priv, __t) \ for ((__t) = 0; (__t) < I915_MAX_TRANSCODERS; (__t)++) \ - for_each_if (RUNTIME_INFO(__dev_priv)->cpu_transcoder_mask & BIT(__t)) + for_each_if (DISPLAY_RUNTIME_INFO(__dev_priv)->cpu_transcoder_mask & BIT(__t))#define for_each_cpu_transcoder_masked (__dev_priv, __t, __mask) \ for_each_cpu_transcoder(__dev_priv, __t) \
@@ -237,7 +237,7 @@ enum phy_fia {#define for_each_sprite (__dev_priv, __p, __s) \ for ((__s) = 0; \ - (__s) < RUNTIME_INFO(__dev_priv)->num_sprites[(__p)]; \ + (__s) < DISPLAY_RUNTIME_INFO(__dev_priv)->num_sprites[(__p)]; \ (__s)++)#define for_each_port (__port) \
drivers/gpu/drm/i915/display/intel_display_device.h +23 -0
@@ -29,7 +29,30 @@func (overlay_needs_physical); \func (supports_tv); +struct intel_display_runtime_info { +struct { +u16 ver; +u16 rel; +u16 step; + } ip; + +u8 pipe_mask; +u8 cpu_transcoder_mask; + +u8 num_sprites[I915_MAX_PIPES ]; +u8 num_scalers[I915_MAX_PIPES ]; + +u8 fbc_mask; + +bool has_hdcp; +bool has_dmc; +bool has_dsc; +}; +struct intel_display_device_info { +/* Initial runtime info. */ +const struct intel_display_runtime_info __runtime_defaults; +u8 abox_mask;struct {
drivers/gpu/drm/i915/display/intel_fbc.c +3 -3
@@ -55,7 +55,7 @@#define for_each_fbc_id (__dev_priv, __fbc_id) \ for ((__fbc_id) = INTEL_FBC_A; (__fbc_id) < I915_MAX_FBCS; (__fbc_id)++) \ - for_each_if(RUNTIME_INFO(__dev_priv)->fbc_mask & BIT(__fbc_id)) + for_each_if(DISPLAY_RUNTIME_INFO(__dev_priv)->fbc_mask & BIT(__fbc_id))#define for_each_intel_fbc (__dev_priv, __fbc, __fbc_id) \ for_each_fbc_id((__dev_priv), (__fbc_id)) \
@@ -1707,10 +1707,10 @@ void intel_fbc_init(struct drm_i915_private *i915)enum intel_fbc_id fbc_id;if (!drm_mm_initialized (&i915->mm.stolen)) -RUNTIME_INFO (i915)->fbc_mask =0 ; +DISPLAY_RUNTIME_INFO (i915)->fbc_mask =0 ;if (need_fbc_vtd_wa (i915)) -RUNTIME_INFO (i915)->fbc_mask =0 ; +DISPLAY_RUNTIME_INFO (i915)->fbc_mask =0 ; i915->params.enable_fbc =intel_sanitize_fbc_option (i915); drm_dbg_kms(&i915->drm, "Sanitized enable_fbc value: %d\n",
drivers/gpu/drm/i915/display/intel_hdcp.c +1 -1
@@ -1141,7 +1141,7 @@ static void intel_hdcp_prop_work(struct work_struct *work)bool is_hdcp_supported (struct drm_i915_private *dev_priv,enum port port) { -return RUNTIME_INFO (dev_priv)->has_hdcp && +return DISPLAY_RUNTIME_INFO (dev_priv)->has_hdcp && (DISPLAY_VER (dev_priv) >=12 || port <PORT_E ); }
drivers/gpu/drm/i915/display/skl_universal_plane.c +1 -1
@@ -1936,7 +1936,7 @@ static enum intel_fbc_id skl_fbc_id_for_pipe(enum pipe pipe)static bool skl_plane_has_fbc (struct drm_i915_private *dev_priv,enum intel_fbc_id fbc_id,enum plane_id plane_id) { -if ((RUNTIME_INFO (dev_priv)->fbc_mask &BIT (fbc_id)) ==0 ) +if ((DISPLAY_RUNTIME_INFO (dev_priv)->fbc_mask &BIT (fbc_id)) ==0 )return false;return plane_id ==PLANE_PRIMARY ;
drivers/gpu/drm/i915/i915_drv.h +9 -7
@@ -205,6 +205,7 @@ struct drm_i915_private {const struct intel_device_info __info;/* Use INTEL_INFO() to access. */ struct intel_runtime_info __runtime;/* Use RUNTIME_INFO() to access. */ +struct intel_display_runtime_info __display_runtime;/* Access with DISPLAY_RUNTIME_INFO() */ struct intel_driver_caps caps;struct i915_dsm dsm;
@@ -410,6 +411,7 @@ static inline struct intel_gt *to_gt(struct drm_i915_private *i915)#define INTEL_INFO (dev_priv) (&(dev_priv)->__info)#define DISPLAY_INFO (i915) (INTEL_INFO(i915)->display)#define RUNTIME_INFO (dev_priv) (&(dev_priv)->__runtime) +#define DISPLAY_RUNTIME_INFO (i915) (&(i915)->__display_runtime)#define DRIVER_CAPS (dev_priv) (&(dev_priv)->caps)#define INTEL_DEVID (dev_priv) (RUNTIME_INFO(dev_priv)->device_id)
@@ -428,7 +430,7 @@ static inline struct intel_gt *to_gt(struct drm_i915_private *i915)#define IS_MEDIA_VER (i915, from, until) \ (MEDIA_VER(i915) >= (from) && MEDIA_VER(i915) <= (until)) -#define DISPLAY_VER (i915) (RUNTIME_INFO(i915)->display.ip.ver) +#define DISPLAY_VER (i915) (DISPLAY_RUNTIME_INFO(i915)->ip.ver)#define IS_DISPLAY_VER (i915, from, until) \ (DISPLAY_VER(i915) >= (from) && DISPLAY_VER(i915) <= (until))
@@ -811,7 +813,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define I915_HAS_HOTPLUG (dev_priv) (DISPLAY_INFO(dev_priv)->has_hotplug)#define HAS_FW_BLC (dev_priv) (DISPLAY_VER(dev_priv) > 2) -#define HAS_FBC (dev_priv) (RUNTIME_INFO(dev_priv)->fbc_mask != 0) +#define HAS_FBC (dev_priv) (DISPLAY_RUNTIME_INFO(dev_priv)->fbc_mask != 0)#define HAS_CUR_FBC (dev_priv) (!HAS_GMCH(dev_priv) && DISPLAY_VER(dev_priv) >= 7)#define HAS_DPT (dev_priv) (DISPLAY_VER(dev_priv) >= 13)
@@ -831,7 +833,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define HAS_PSR_HW_TRACKING (dev_priv) \ (DISPLAY_INFO(dev_priv)->has_psr_hw_tracking)#define HAS_PSR2_SEL_FETCH (dev_priv) (DISPLAY_VER(dev_priv) >= 12) -#define HAS_TRANSCODER (dev_priv, trans) ((RUNTIME_INFO(dev_priv)->cpu_transcoder_mask & BIT(trans)) != 0) +#define HAS_TRANSCODER (dev_priv, trans) ((DISPLAY_RUNTIME_INFO(dev_priv)->cpu_transcoder_mask & BIT(trans)) != 0)#define HAS_RC6 (dev_priv) (INTEL_INFO(dev_priv)->has_rc6)#define HAS_RC6p (dev_priv) (INTEL_INFO(dev_priv)->has_rc6p)
@@ -839,9 +841,9 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define HAS_RPS (dev_priv) (INTEL_INFO(dev_priv)->has_rps) -#define HAS_DMC (dev_priv) (RUNTIME_INFO(dev_priv)->has_dmc) +#define HAS_DMC (dev_priv) (DISPLAY_RUNTIME_INFO(dev_priv)->has_dmc)#define HAS_DSB (dev_priv) (DISPLAY_INFO(dev_priv)->has_dsb) -#define HAS_DSC (__i915) (RUNTIME_INFO(__i915)->has_dsc) +#define HAS_DSC (__i915) (DISPLAY_RUNTIME_INFO(__i915)->has_dsc)#define HAS_HW_SAGV_WM (i915) (DISPLAY_VER(i915) >= 13 && !IS_DGFX(i915))#define HAS_HECI_PXP (dev_priv) \
@@ -903,9 +905,9 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define NUM_L3_SLICES (dev_priv) (IS_HSW_GT3(dev_priv) ? \ 2 : HAS_L3_DPF(dev_priv)) -#define INTEL_NUM_PIPES (dev_priv) (hweight8(RUNTIME_INFO(dev_priv)->pipe_mask)) +#define INTEL_NUM_PIPES (dev_priv) (hweight8(DISPLAY_RUNTIME_INFO(dev_priv)->pipe_mask)) -#define HAS_DISPLAY (dev_priv) (RUNTIME_INFO(dev_priv)->pipe_mask != 0) +#define HAS_DISPLAY (dev_priv) (DISPLAY_RUNTIME_INFO(dev_priv)->pipe_mask != 0)#define HAS_VRR (i915) (DISPLAY_VER(i915) >= 11)
drivers/gpu/drm/i915/i915_pci.c +161 -91
617 lines not on this page · raw message
drivers/gpu/drm/i915/intel_device_info.c +56 -45
223 lines not on this page · raw message
drivers/gpu/drm/i915/intel_device_info.h +0 -18
@@ -197,9 +197,6 @@ struct intel_runtime_info {struct {struct intel_ip_version ip; } media; -struct { -struct intel_ip_version ip; - } display;/* * Platform mask is used for optimizing or-ed IS_PLATFORM calls into
@@ -227,21 +224,6 @@ struct intel_runtime_info {u32 memory_regions;/* regions supported by the HW */ bool has_pooled_eu; - -/* display */ -struct { -u8 pipe_mask; -u8 cpu_transcoder_mask; - -u8 num_sprites[I915_MAX_PIPES ]; -u8 num_scalers[I915_MAX_PIPES ]; - -u8 fbc_mask; - -bool has_hdcp; -bool has_dmc; -bool has_dsc; - }; };struct intel_device_info {
drivers/gpu/drm/i915/intel_step.c +6 -2
@@ -166,8 +166,12 @@ void intel_step_init(struct drm_i915_private *i915) &RUNTIME_INFO(i915)->graphics.ip); step.media_step =gmd_to_intel_step (i915, &RUNTIME_INFO (i915)->media.ip); - step.display_step =gmd_to_intel_step (i915, - &RUNTIME_INFO (i915)->display.ip); + step.display_step =STEP_A0 +DISPLAY_RUNTIME_INFO (i915)->ip.step; +if (step.display_step >=STEP_FUTURE ) { +drm_dbg (&i915->drm,"Using future display steppings\n" ); + step.display_step =STEP_FUTURE ; + } +RUNTIME_INFO (i915)->step = step;return ;
Signature · 1 line
2.39.2