net: wwan: t7xx: Add AP CLDMA
Subsystems (5)
PATCH 1/1 net: wwan: t7xx: Add AP CLDMA
At this moment with the current status, t7xx is not functional due to problems like this after connection, if there is no activity:
[ 57.370534] mtk_t7xx 0000:72:00.0: [PM] SAP suspend error: -110
[ 57.370581] mtk_t7xx 0000:72:00.0: can't suspend
(t7xx_pci_pm_runtime_suspend [mtk_t7xx] returned -110)because after this, the traffic no longer works.
The complete series 'net: wwan: t7xx: fw flashing & coredump support' was reverted because of issues with the pci implementation. In order to have at least the modem working, it would be enough if just the first commit of the series is re-applied:d20ef656f994 net: wwan: t7xx: Add AP CLDMA
With that, the Application Processor would be controlled, correctly suspended and the commented problems would be fixed (I am testing here like this with no related issue).
This commit is independent of the others and not related to the commented pci implementation for the new features: fw flashing and coredump collection.
Use v2 patch version of d20ef656f994 as JinJian Song suggests
(https://patchwork.kernel.org/project/netdevbpf/patch/[email protected]/).
Original text from the commit that would be re-applied:
d20ef656f994 net: wwan: t7xx: Add AP CLDMA
Author: Haijun Liu <[email protected]>
Date: Tue Aug 16 09:53:28 2022 +0530
The t7xx device contains two Cross Layer DMA (CLDMA) interfaces to communicate with AP and Modem processors respectively. So far only MD-CLDMA was being used, this patch enables AP-CLDMA.
Rename small Application Processor (sAP) to AP.
--- drivers/net/wwan/t7xx/t7xx_hif_cldma.c | 17 +++-- drivers/net/wwan/t7xx/t7xx_hif_cldma.h | 2 +- drivers/net/wwan/t7xx/t7xx_mhccif.h | 1 + drivers/net/wwan/t7xx/t7xx_modem_ops.c | 76 +++++++++++++++++----- drivers/net/wwan/t7xx/t7xx_modem_ops.h | 2 + drivers/net/wwan/t7xx/t7xx_port.h | 6 +- drivers/net/wwan/t7xx/t7xx_port_ctrl_msg.c | 8 ++- drivers/net/wwan/t7xx/t7xx_port_proxy.c | 18 ++++- drivers/net/wwan/t7xx/t7xx_reg.h | 2 +- drivers/net/wwan/t7xx/t7xx_state_monitor.c | 13 +++- drivers/net/wwan/t7xx/t7xx_state_monitor.h | 2 + 11 files changed, 116 insertions(+), 31 deletions(-)
drivers/net/wwan/t7xx/t7xx_hif_cldma.c +11 -6
@@ -1066,13 +1066,18 @@ static void t7xx_hw_info_init(struct cldma_ctrl *md_ctrl)struct t7xx_cldma_hw *hw_info = &md_ctrl->hw_info;u32 phy_ao_base, phy_pd_base; -if (md_ctrl->hif_id !=CLDMA_ID_MD ) -return ; - - phy_ao_base =CLDMA1_AO_BASE ; - phy_pd_base =CLDMA1_PD_BASE ; - hw_info->phy_interrupt_id =CLDMA1_INT ; hw_info->hw_mode =MODE_BIT_64 ; + +if (md_ctrl->hif_id ==CLDMA_ID_MD ) { + phy_ao_base =CLDMA1_AO_BASE ; + phy_pd_base =CLDMA1_PD_BASE ; + hw_info->phy_interrupt_id =CLDMA1_INT ; + }else { + phy_ao_base =CLDMA0_AO_BASE ; + phy_pd_base =CLDMA0_PD_BASE ; + hw_info->phy_interrupt_id =CLDMA0_INT ; + } + hw_info->ap_ao_base =t7xx_pcie_addr_transfer (pbase->pcie_ext_reg_base, pbase->pcie_dev_reg_trsl_addr, phy_ao_base); hw_info->ap_pdn_base = t7xx_pcie_addr_transfer(pbase->pcie_ext_reg_base,
drivers/net/wwan/t7xx/t7xx_hif_cldma.h +1 -1
@@ -34,7 +34,7 @@/** * enum cldma_id - Identifiers for CLDMA HW units. * @CLDMA_ID_MD: Modem control channel. -* @CLDMA_ID_AP: Application Processor control channel (not used at the moment). +* @CLDMA_ID_AP: Application Processor control channel. * @CLDMA_NUM: Number of CLDMA HW units available. */ enum cldma_id {
drivers/net/wwan/t7xx/t7xx_mhccif.h +1 -0
@@ -25,6 +25,7 @@ D2H_INT_EXCEPTION_CLEARQ_DONE | \ D2H_INT_EXCEPTION_ALLQ_RESET | \ D2H_INT_PORT_ENUM | \ + D2H_INT_ASYNC_AP_HK | \ D2H_INT_ASYNC_MD_HK)void t7xx_mhccif_mask_set (struct t7xx_pci_dev *t7xx_dev,u32 val);
drivers/net/wwan/t7xx/t7xx_modem_ops.c +61 -15
175 lines not on this page · raw message
drivers/net/wwan/t7xx/t7xx_modem_ops.h +2 -0
@@ -66,10 +66,12 @@ struct t7xx_modem {struct cldma_ctrl *md_ctrl[CLDMA_NUM ];struct t7xx_pci_dev *t7xx_dev;struct t7xx_sys_info core_md; +struct t7xx_sys_info core_ap;bool md_init_finish;bool rgu_irq_asserted;struct workqueue_struct *handshake_wq;struct work_struct handshake_work; +struct work_struct ap_handshake_work;struct t7xx_fsm_ctl *fsm_ctl;struct port_proxy *port_prox;unsigned int exp_id;
drivers/net/wwan/t7xx/t7xx_port.h +5 -1
@@ -36,9 +36,13 @@/* Channel ID and Message ID definitions. * The channel number consists of peer_id(15:12) , channel_id(11:0) * peer_id: -* 0:reserved, 1: to sAP, 2: to MD +* 0:reserved, 1: to AP, 2: to MD */ enum port_ch { +/* to AP */ +PORT_CH_AP_CONTROL_RX =0x1000 , +PORT_CH_AP_CONTROL_TX =0x1001 , +/* to MD */ PORT_CH_CONTROL_RX =0x2000 ,PORT_CH_CONTROL_TX =0x2001 ,
drivers/net/wwan/t7xx/t7xx_port_ctrl_msg.c +6 -2
@@ -167,8 +167,12 @@ static int control_msg_handler(struct t7xx_port *port, struct sk_buff *skb)case CTL_ID_HS2_MSG :skb_pull (skb,sizeof (*ctrl_msg_h)); -if (port_conf->rx_ch ==PORT_CH_CONTROL_RX ) { - ret =t7xx_fsm_append_event (ctl,FSM_EVENT_MD_HS2 , skb->data, +if (port_conf->rx_ch ==PORT_CH_CONTROL_RX || + port_conf->rx_ch ==PORT_CH_AP_CONTROL_RX ) { +int event = port_conf->rx_ch ==PORT_CH_CONTROL_RX ? +FSM_EVENT_MD_HS2 :FSM_EVENT_AP_HS2 ; + + ret =t7xx_fsm_append_event (ctl, event, skb->data,le32_to_cpu (ctrl_msg_h->data_length));if (ret)dev_err (port->dev,"Failed to append Handshake 2 event" );
drivers/net/wwan/t7xx/t7xx_port_proxy.c +15 -3
@@ -48,7 +48,7 @@ i < (proxy)->port_count; \ i++, (p) = &(proxy)->ports[i]) -static const struct t7xx_port_conf t7xx_md_port_conf[] = { +static const struct t7xx_port_conf t7xx_port_conf[] = { { .tx_ch =PORT_CH_UART2_TX , .rx_ch =PORT_CH_UART2_RX ,
@@ -89,6 +89,14 @@ static const struct t7xx_port_conf t7xx_md_port_conf[] = { .path_id = CLDMA_ID_MD, .ops = &ctl_port_ops, .name = "t7xx_ctrl", + }, { + .tx_ch = PORT_CH_AP_CONTROL_TX, + .rx_ch = PORT_CH_AP_CONTROL_RX, + .txq_index = Q_IDX_CTRL, + .rxq_index = Q_IDX_CTRL, + .path_id = CLDMA_ID_AP, + .ops = &ctl_port_ops, + .name = "t7xx_ap_ctrl", }, };
@@ -428,6 +436,9 @@ static void t7xx_proxy_init_all_ports(struct t7xx_modem *md)if (port_conf->tx_ch ==PORT_CH_CONTROL_TX ) md->core_md.ctl_port = port; +if (port_conf->tx_ch ==PORT_CH_AP_CONTROL_TX ) + md->core_ap.ctl_port = port; + port->t7xx_dev = md->t7xx_dev; port->dev = &md->t7xx_dev->pdev->dev;spin_lock_init (&port->port_update_lock);
@@ -442,7 +453,7 @@ static void t7xx_proxy_init_all_ports(struct t7xx_modem *md)static int t7xx_proxy_alloc (struct t7xx_modem *md) { -unsigned int port_count =ARRAY_SIZE (t7xx_md_port_conf); +unsigned int port_count =ARRAY_SIZE (t7xx_port_conf);struct device *dev = &md->t7xx_dev->pdev->dev;struct port_proxy *port_prox;int i;
@@ -456,7 +467,7 @@ static int t7xx_proxy_alloc(struct t7xx_modem *md) port_prox->dev = dev;for (i =0 ; i < port_count; i++) - port_prox->ports[i].port_conf = &t7xx_md_port_conf[i]; + port_prox->ports[i].port_conf = &t7xx_port_conf[i]; port_prox->port_count = port_count;t7xx_proxy_init_all_ports (md);
@@ -481,6 +492,7 @@ int t7xx_port_proxy_init(struct t7xx_modem *md)if (ret)return ret; +t7xx_cldma_set_recv_skb (md->md_ctrl[CLDMA_ID_AP ], t7xx_port_proxy_recv_skb);t7xx_cldma_set_recv_skb (md->md_ctrl[CLDMA_ID_MD ], t7xx_port_proxy_recv_skb);return 0 ; }
drivers/net/wwan/t7xx/t7xx_reg.h +1 -1
@@ -56,7 +56,7 @@#define D2H_INT_RESUME_ACK BIT(12)#define D2H_INT_SUSPEND_ACK_AP BIT(13)#define D2H_INT_RESUME_ACK_AP BIT(14) -#define D2H_INT_ASYNC_SAP_HK BIT(15) +#define D2H_INT_ASYNC_AP_HK BIT(15)#define D2H_INT_ASYNC_MD_HK BIT(16)/* Register base */
drivers/net/wwan/t7xx/t7xx_state_monitor.c +11 -2
@@ -285,8 +285,9 @@ static int fsm_routine_starting(struct t7xx_fsm_ctl *ctl)t7xx_fsm_broadcast_state (ctl,MD_STATE_WAITING_FOR_HS1 );t7xx_md_event_notify (md,FSM_START ); -wait_event_interruptible_timeout (ctl->async_hk_wq, md->core_md.ready || ctl->exp_flg, -HZ *60 ); +wait_event_interruptible_timeout (ctl->async_hk_wq, + (md->core_md.ready && md->core_ap.ready) || + ctl->exp_flg,HZ *60 ); dev = &md->t7xx_dev->pdev->dev;if (ctl->exp_flg)
@@ -297,6 +298,13 @@ static int fsm_routine_starting(struct t7xx_fsm_ctl *ctl)if (md->core_md.handshake_ongoing)t7xx_fsm_append_event (ctl,FSM_EVENT_MD_HS2_EXIT ,NULL ,0 ); +fsm_routine_exception (ctl,NULL ,EXCEPTION_HS_TIMEOUT ); +return -ETIMEDOUT ; + }else if (!md->core_ap.ready) { +dev_err (dev,"AP handshake timeout\n" ); +if (md->core_ap.handshake_ongoing) +t7xx_fsm_append_event (ctl,FSM_EVENT_AP_HS2_EXIT ,NULL ,0 ); +fsm_routine_exception (ctl,NULL ,EXCEPTION_HS_TIMEOUT );return -ETIMEDOUT ; }
@@ -335,6 +343,7 @@ static void fsm_routine_start(struct t7xx_fsm_ctl *ctl, struct t7xx_fsm_commandreturn ; } +t7xx_cldma_hif_hw_init (md->md_ctrl[CLDMA_ID_AP ]);t7xx_cldma_hif_hw_init (md->md_ctrl[CLDMA_ID_MD ]);fsm_finish_command (ctl, cmd,fsm_routine_starting (ctl)); }
drivers/net/wwan/t7xx/t7xx_state_monitor.h +2 -0
@@ -38,10 +38,12 @@ enum t7xx_fsm_state {enum t7xx_fsm_event_state {FSM_EVENT_INVALID ,FSM_EVENT_MD_HS2 , +FSM_EVENT_AP_HS2 ,FSM_EVENT_MD_EX ,FSM_EVENT_MD_EX_REC_OK ,FSM_EVENT_MD_EX_PASS ,FSM_EVENT_MD_HS2_EXIT , +FSM_EVENT_AP_HS2_EXIT ,FSM_EVENT_MAX };
Signature · 1 line
2.41.0
+ maintainers and MLs as advised by get_maintainers.pl
Quoted 45 lines · Jose Ignacio Tornos Martinez
At this moment with the current status, t7xx is not functional due to problems like this after connection, if there is no activity:
[ 57.370534] mtk_t7xx 0000:72:00.0: [PM] SAP suspend error: -110 [ 57.370581] mtk_t7xx 0000:72:00.0: can't suspend (t7xx_pci_pm_runtime_suspend [mtk_t7xx] returned -110)because after this, the traffic no longer works.
The complete series 'net: wwan: t7xx: fw flashing & coredump support' was reverted because of issues with the pci implementation. In order to have at least the modem working, it would be enough if just the first commit of the series is re-applied:
d20ef656f994net: wwan: t7xx: Add AP CLDMA
With that, the Application Processor would be controlled, correctly suspended and the commented problems would be fixed (I am testing here like this with no related issue).This commit is independent of the others and not related to the commented pci implementation for the new features: fw flashing and coredump collection.
Use v2 patch version of
d20ef656f994as JinJian Song suggests
(https://patchwork.kernel.org/project/netdevbpf/patch/[email protected]/).Original text from the commit that would be re-applied:
d20ef656f994net: wwan: t7xx: Add AP CLDMA
Author: Haijun Liu <[email protected]>
Date: Tue Aug 16 09:53:28 2022 +0530The t7xx device contains two Cross Layer DMA (CLDMA) interfaces to communicate with AP and Modem processors respectively. So far only MD-CLDMA was being used, this patch enables AP-CLDMA.
Rename small Application Processor (sAP) to AP.
Signed-off-by Haijun Liu <[email protected]>Co-developed-by Madhusmita Sahu <[email protected]>Signed-off-by Madhusmita Sahu <[email protected]>Signed-off-by Moises Veleta <[email protected]>Signed-off-by Devegowda Chandrashekar <[email protected]>Signed-off-by M Chetan Kumar <[email protected]>Reviewed-by Ilpo Järvinen <[email protected]>Reviewed-by Sergey Ryazanov <[email protected]>Reviewed-by Jesse Brandeburg <[email protected]>
Quoted 1 line
Signed-off-by Jose Ignacio Tornos Martinez <[email protected]>
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 8 lines · On Tue, 11 Jul 2023 08:28:13 +0200 you wrote:
At this moment with the current status, t7xx is not functional due to problems like this after connection, if there is no activity:
[ 57.370534] mtk_t7xx 0000:72:00.0: [PM] SAP suspend error: -110 [ 57.370581] mtk_t7xx 0000:72:00.0: can't suspend (t7xx_pci_pm_runtime_suspend [mtk_t7xx] returned -110)because after this, the traffic no longer works.
[...]
Here is the summary with links:
- net: wwan: t7xx: Add AP CLDMA
https://git.kernel.org/netdev/net-next/c/ba2274dcfda8
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html