net: wwan: t7xx: Add AP CLDMA
PATCH v3 1/1 net: wwan: t7xx: Add AP CLDMA
From: Haijun Liu <[email protected]>
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.
---
Change log in v3:
- Removed GNSS component, pending arch analysis
- Add missed 'Reviewed-by' tag
- Add missed '---' separator
Change log in v2:
- Add to commit message renaming sAP to AP
- Add to commit message GNSS AT port info
- Lowercase X in constant prefix
- Add GNSS AT comment in static port file
--- 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 | 85 ++++++++++++++++++---- drivers/net/wwan/t7xx/t7xx_modem_ops.h | 3 + drivers/net/wwan/t7xx/t7xx_port.h | 8 +- drivers/net/wwan/t7xx/t7xx_port_ctrl_msg.c | 8 +- drivers/net/wwan/t7xx/t7xx_port_proxy.c | 12 +++ 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, 125 insertions(+), 28 deletions(-)
drivers/net/wwan/t7xx/t7xx_hif_cldma.c +11 -6
@@ -1064,13 +1064,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 +70 -15
192 lines not on this page · raw message
drivers/net/wwan/t7xx/t7xx_modem_ops.h +3 -0
@@ -66,10 +66,13 @@ 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 workqueue_struct *ap_handshake_wq; +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 +7 -1
@@ -36,9 +36,15 @@/* 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 , +PORT_CH_AP_LOG_RX =0x1008 , +PORT_CH_AP_LOG_TX =0x1009 , +/* 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 +12 -0
@@ -77,6 +77,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", }, };
@@ -416,6 +424,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);
@@ -469,6 +480,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.17.1
Sergey Ryazanov
maintainerHello Moises,
Quoted 5 lines · Moises Veleta
From: Haijun Liu <[email protected]>
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.
What is the purpose of adding the driver interface to the hardware function without a user counterpart?
Signature · 1 line
Sergey
Hi Sergey
Quoted 4 lines · Sergey Ryazanov
Hello Moises,
On Wed, Jul 13, 2022 at 8:07 PM Moises Veleta
<[email protected]> wrote:
Quoted 8 lines
Quoted 5 lines
From: Haijun Liu <[email protected]>
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.
What is the purpose of adding the driver interface to the hardware function without a user counterpart?
We have follow-on features/submissiona that are dependent on this AP control port: PCIe rescan, FW flashing via devlink, & Coredump log collection. They will be submitted for review upon completion by different individuals. This foreruns their efforts.
Sergey Ryazanov
maintainerQuoted 13 lines · moises.veleta
Hi Sergey
Quoted 9 lines · Sergey Ryazanov
Hello Moises,
Quoted 5 lines · Moises Veleta
From: Haijun Liu <[email protected]>
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.
Quoted 7 lines
Quoted 3 lines
What is the purpose of adding the driver interface to the hardware function without a user counterpart?
We have follow-on features/submissiona that are dependent on this AP control port: PCIe rescan, FW flashing via devlink, & Coredump log collection. They will be submitted for review upon completion by different individuals. This foreruns their efforts.
Thanks for the explanation. Is it possible to send these parts as a single series? If not all at once, then at least AP-CLDMA + FW flashing or AP-CLDMA + logs collection or some other provider + user composition. What do you think?
Signature · 1 line
Sergey
Quoted 17 lines · Sergey Ryazanov
Quoted 15 lines · moises.veleta
Hi Sergey
Quoted 12 lines · Sergey Ryazanov
Hello Moises,
Quoted 5 lines · Moises Veleta
From: Haijun Liu <[email protected]>
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.
What is the purpose of adding the driver interface to the hardware function without a user counterpart?
Quoted 9 lines
Quoted 4 lines
We have follow-on features/submissiona that are dependent on this AP control port: PCIe rescan, FW flashing via devlink, & Coredump log collection. They will be submitted for review upon completion by different individuals. This foreruns their efforts.
Thanks for the explanation. Is it possible to send these parts as a single series? If not all at once, then at least AP-CLDMA + FW flashing or AP-CLDMA + logs collection or some other provider + user composition. What do you think?
I believe this is possible. I will share this information with them and see how we can package them into a series. Since, it appears this patch has been reviewed well by the community, it should not be hindrance for their later submissions. Thanks for guidance and feedback.
Regards,
Moises
Sergey Ryazanov
maintainerQuoted 27 lines · moises.veleta
Quoted 17 lines · Sergey Ryazanov
Quoted 15 lines · moises.veleta
Hi Sergey
Quoted 12 lines · Sergey Ryazanov
Hello Moises,
Quoted 5 lines · Moises Veleta
From: Haijun Liu <[email protected]>
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.
What is the purpose of adding the driver interface to the hardware function without a user counterpart?
Quoted 9 lines
Quoted 4 lines
We have follow-on features/submissiona that are dependent on this AP control port: PCIe rescan, FW flashing via devlink, & Coredump log collection. They will be submitted for review upon completion by different individuals. This foreruns their efforts.
Thanks for the explanation. Is it possible to send these parts as a single series? If not all at once, then at least AP-CLDMA + FW flashing or AP-CLDMA + logs collection or some other provider + user composition. What do you think?
Quoted 4 lines
I believe this is possible. I will share this information with them and see how we can package them into a series. Since, it appears this patch has been reviewed well by the community, it should not be hindrance for their later submissions. Thanks for guidance and feedback.
Sounds like a good plan. I will wait for the series with new functionality. Thank you for continuing to develop the driver!
Signature · 1 line
Sergey