Skip to contentSkip to conversation

net: wwan: t7xx: Add AP CLDMA and GNSS port

PATCH Superseded Moises Veleta 5 participants 8 messages Jun 28, 2022 – Jun 29, 2022

Subsystems (4)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 net: wwan: t7xx: Add AP CLDMA and GNSS port

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 and the GNSS port which requires such channel.

GNSS AT control port allows Modem Manager to control GPS for:
- Start/Stop GNSS sessions,
- Configuration commands to support Assisted GNSS positioning
- Crash & reboot (notifications when resetting device (AP) & host)
- Settings to Enable/Disable GNSS solution
- Geofencing

Rename small Application Processor (sAP) to AP.

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          | 10 ++-
 drivers/net/wwan/t7xx/t7xx_port_ctrl_msg.c |  8 +-
 drivers/net/wwan/t7xx/t7xx_port_proxy.c    | 24 ++++++
 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, 139 insertions(+), 28 deletions(-)
drivers/net/wwan/t7xx/t7xx_hif_cldma.c +11 -6
index 6ff30cb8eb16..37cd63d20b45 100644
@@ -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
index 47a35e552da7..4410bac6993a 100644
@@ -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
index 209b386bc088..20c50dce9fc3 100644
@@ -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
index 7469ed636ae8..c93e870ce696 100644
@@ -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 +9 -1
index dc4133eb433a..b065e93d6ab2 100644
@@ -36,9 +36,17 @@
 /* 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_GNSS_RX = 0x1004,
+	PORT_CH_AP_GNSS_TX = 0x1005,
+	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
index 68430b130a67..ae632ef96698 100644
@@ -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 +24 -0
index d4de047ff0d4..67a2e6fa9b0c 100644
@@ -48,8 +48,20 @@
 	     i < (proxy)->port_count;		\
 	     i++, (p) = &(proxy)->ports[i])
 
+/* GNSS AT port allows Modem Manager to send/receive MTK GNSS AT commands.
+ * This is not a simple NMEA port, but an AT control port.
+ */
 static const struct t7xx_port_conf t7xx_md_port_conf[] = {
 	{
+		.tx_ch = PORT_CH_AP_GNSS_TX,
+		.rx_ch = PORT_CH_AP_GNSS_RX,
+		.txq_index = Q_IDX_CTRL,
+		.rxq_index = Q_IDX_CTRL,
+		.path_id = CLDMA_ID_AP,
+		.ops = &wwan_sub_port_ops,
+		.name = "t7xx_ap_gnss",
+		.port_type = WWAN_PORT_AT,
+	}, {
 		.tx_ch = PORT_CH_UART2_TX,
 		.rx_ch = PORT_CH_UART2_RX,
 		.txq_index = Q_IDX_AT_CMD,
@@ -77,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",
 	},
 };
 
@@ -416,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);
@@ -469,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
index 7c1b81091a0f..c41d7d094c08 100644
@@ -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
index 0bcca08ff2bd..80edb8e75a6a 100644
@@ -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_command
 		return;
 	}
 
+	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
index b1af0259d4c5..b6e76f3903c8 100644
@@ -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
#1 lore raw
Quoted 14 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 and the GNSS port which requires such channel.

GNSS AT control port allows Modem Manager to control GPS for:
- Start/Stop GNSS sessions,
- Configuration commands to support Assisted GNSS positioning
- Crash & reboot (notifications when resetting device (AP) & host)
- Settings to Enable/Disable GNSS solution
- Geofencing

Quoted 6 lines

Rename small Application Processor (sAP) to AP.

Missed cutter '---' line here. Effectively invalidates your tag block and may not be applied (as no SoB present _as a tag_).

Quoted 17 lines

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          | 10 ++-
 drivers/net/wwan/t7xx/t7xx_port_ctrl_msg.c |  8 +-
 drivers/net/wwan/t7xx/t7xx_port_proxy.c    | 24 ++++++
 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 +
Signature · 2 lines
With Best Regards,
Andy Shevchenko
#2 lore raw
Quoted 15 lines · Andy Shevchenko
Quoted 14 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 and the GNSS port which requires such channel.

GNSS AT control port allows Modem Manager to control GPS for:
- Start/Stop GNSS sessions,
- Configuration commands to support Assisted GNSS positioning
- Crash & reboot (notifications when resetting device (AP) & host)
- Settings to Enable/Disable GNSS solution
- Geofencing

Quoted 8 lines
Quoted 6 lines

Rename small Application Processor (sAP) to AP.

Missed cutter '---' line here. Effectively invalidates your tag block and may not be applied (as no SoB present _as a tag_).

Thanks for catching that! Next time I will add '---' between the Signed-offs and the vX change log.

Quoted 9 lines
Quoted 9 lines

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 +
Quoted 8 lines
Quoted 8 lines
  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          | 10 ++-
  drivers/net/wwan/t7xx/t7xx_port_ctrl_msg.c |  8 +-
  drivers/net/wwan/t7xx/t7xx_port_proxy.c    | 24 ++++++
  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 +

Regards,

Moises

Reviewed-by on v2 1/1
#3 lore raw
In reply to Moises Veleta
Quoted 14 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 and the GNSS port which requires such channel.

GNSS AT control port allows Modem Manager to control GPS for:
- Start/Stop GNSS sessions,
- Configuration commands to support Assisted GNSS positioning
- Crash & reboot (notifications when resetting device (AP) & host)
- Settings to Enable/Disable GNSS solution
- Geofencing

Quoted 6 lines

Rename small Application Processor (sAP) to AP.

(I already gave that tag for v1, please carry rev-by over next time when sending new versions.)

Signature · 1 line
 i.
Reviewed-by on v2 1/1
#5 lore raw
In reply to Moises Veleta
Quoted 31 lines

-----Original Message-----
From: Moises Veleta <[email protected]>
Sent: Tuesday, June 28, 2022 10:20 PM
To: [email protected]
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Kumar, M Chetan <[email protected]>; Devegowda, Chandrashekar <[email protected]>; linuxwwan <[email protected]>; [email protected]; Liu, Haijun <[email protected]>; [email protected]; [email protected]; Sharma, Dinesh <[email protected]>; [email protected]; Veleta, Moises <[email protected]>; Moises Veleta <[email protected]>; Sahu, Madhusmita <[email protected]>
Subject: [PATCH net-next v2 1/1] net: wwan: t7xx: Add AP CLDMA and GNSS port

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 and the GNSS port which requires such channel.

GNSS AT control port allows Modem Manager to control GPS for:
- Start/Stop GNSS sessions,
- Configuration commands to support Assisted GNSS positioning
- Crash & reboot (notifications when resetting device (AP) & host)
- Settings to Enable/Disable GNSS solution
- Geofencing

Quoted 6 lines

Rename small Application Processor (sAP) to AP.

#4 lore raw
In reply to Ilpo Järvinen
Quoted 18 lines · Ilpo Järvinen
Quoted 16 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 and the GNSS port which requires such channel.

GNSS AT control port allows Modem Manager to control GPS for:
- Start/Stop GNSS sessions,
- Configuration commands to support Assisted GNSS positioning
- Crash & reboot (notifications when resetting device (AP) & host)
- Settings to Enable/Disable GNSS solution
- Geofencing

Rename small Application Processor (sAP) to AP.

Quoted 9 lines
Quoted 4 lines

(I already gave that tag for v1, please carry rev-by over next time when sending new versions.)

Will do, thanks for catching that.

Regards,
Moises

maintainer
#6 lore raw
In reply to Moises Veleta

Hello Moises,

Quoted 11 lines · Moises Veleta

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 and the GNSS port which requires such channel.

GNSS AT control port allows Modem Manager to control GPS for:
- Start/Stop GNSS sessions,
- Configuration commands to support Assisted GNSS positioning
- Crash & reboot (notifications when resetting device (AP) & host)
- Settings to Enable/Disable GNSS solution
- Geofencing

I am still in doubt, should we export the pure GNSS port via the wwan subsystem. Personally, I like Loic's suggestion to export this port via the gnss subsystem. This way, the modem interface will be consistent with the kernel device model. What drawbacks do you see in this approach?

--
Sergey

maintainer
#7 lore raw

CC GNSS subsystem maintainer.

Johan, you can find detailed port functionality description in the previous thread [1].

1. https://lore.kernel.org/netdev/[email protected]/

Quoted 17 lines · Sergey Ryazanov

Hello Moises,

Quoted 11 lines · Moises Veleta

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 and the GNSS port which requires such channel.

GNSS AT control port allows Modem Manager to control GPS for:
- Start/Stop GNSS sessions,
- Configuration commands to support Assisted GNSS positioning
- Crash & reboot (notifications when resetting device (AP) & host)
- Settings to Enable/Disable GNSS solution
- Geofencing

Quoted 5 lines

I am still in doubt, should we export the pure GNSS port via the wwan subsystem. Personally, I like Loic's suggestion to export this port via the gnss subsystem. This way, the modem interface will be consistent with the kernel device model. What drawbacks do you see in this approach?

--
Sergey