Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05af4110 authored by Sunil Paidimarri's avatar Sunil Paidimarri
Browse files

net: stmmac: Support multiple IPA channels 



Support mutliple channels in IPA offload.

Change-Id: I9ee6b95dc859e95bef2c32138083a8befc46b71e
Acked-by: default avatarRahul Kawadgave <rahulak@qti.qualcomm.com>
Signed-off-by: default avatarSunil Paidimarri <hisunil@codeaurora.org>
parent bdd6da44

drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c

+60 −15
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/ipv6.h>

#include <linux/rtnetlink.h>

#include <linux/if_vlan.h>

#include <linux/msm_eth.h>



#include "stmmac.h"

#include "stmmac_platform.h"
@@ -158,6 +159,13 @@ u16 dwmac_qcom_select_queue( 
			txqueue_select = ALL_OTHER_TX_TRAFFIC_IPA_DISABLED;

	}



	/* use better macro, cannot afford function call here */

	if (ipa_enabled && (txqueue_select == IPA_DMA_TX_CH_BE ||

			    txqueue_select == IPA_DMA_TX_CH_CV2X)) {

		ETHQOSERR("TX Channel [%d] is not a valid for SW path\n",

			  txqueue_select);

		WARN_ON(1);

	}

	ETHQOSDBG("tx_queue %d\n", txqueue_select);

	return txqueue_select;

}
@@ -1538,15 +1546,11 @@ static void setup_config_registers(struct qcom_ethqos *ethqos, 
	if (mode > DISABLE_LOOPBACK && !qcom_ethqos_is_phy_link_up(ethqos)) {

		/*If Link is Down & need to enable Loopback*/

		ETHQOSDBG("Link is down . manual ipa setting up\n");

		if (priv->tx_queue[IPA_DMA_TX_CH].skip_sw)

			ethqos_ipa_offload_event_handler(priv,

							 EV_PHY_LINK_UP);

		ethqos_ipa_offload_event_handler(priv, EV_PHY_LINK_UP);

	} else if (mode == DISABLE_LOOPBACK &&

			  !qcom_ethqos_is_phy_link_up(ethqos)) {

		ETHQOSDBG("Disable request since link was down disable ipa\n");

		if (priv->tx_queue[IPA_DMA_TX_CH].skip_sw)

			ethqos_ipa_offload_event_handler(priv,

							 EV_PHY_LINK_DOWN);

		ethqos_ipa_offload_event_handler(priv, EV_PHY_LINK_DOWN);

	}



	if (priv->dev->phydev->speed != SPEED_UNKNOWN)
@@ -2357,12 +2361,23 @@ bool qcom_ethqos_ipa_enabled(void) 
static ssize_t ethqos_read_dev_emac(struct file *filp, char __user *buf,

				    size_t count, loff_t *f_pos)

{

	unsigned int len = 0;

	char *temp_buf;

	ssize_t ret_cnt = 0;

	struct eth_msg_meta msg;

	u8 status = 0;



	ret_cnt = simple_read_from_buffer(buf, count, f_pos, temp_buf, len);

	return ret_cnt;

	memset(&msg, 0,  sizeof(struct eth_msg_meta));



	if (pethqos && pethqos->ipa_enabled)

		ethqos_ipa_offload_event_handler(

			&status, EV_QTI_GET_CONN_STATUS);



	msg.msg_type = status;



	ETHQOSDBG("status %02x\n", status);

	ETHQOSDBG("msg.msg_type %02x\n", msg.msg_type);

	ETHQOSDBG("msg.rsvd %02x\n", msg.rsvd);

	ETHQOSDBG("msg.msg_len %d\n", msg.msg_len);



	return copy_to_user(buf, &msg, sizeof(struct eth_msg_meta));

}



static ssize_t ethqos_write_dev_emac(struct file *file,
@@ -2384,6 +2399,7 @@ static ssize_t ethqos_write_dev_emac(struct file *file, 
		ETHQOSERR("emac string is too long - count=%u\n", count);

		return -EFAULT;

	}



	memset(in_buf, 0,  sizeof(in_buf));

	ret = copy_from_user(in_buf, user_buf, count);
@@ -2484,10 +2500,42 @@ static void ethqos_get_qoe_dt(struct qcom_ethqos *ethqos, 
	}

}



static DECLARE_WAIT_QUEUE_HEAD(dev_emac_wait);

#ifdef CONFIG_ETH_IPA_OFFLOAD

void ethqos_wakeup_dev_emac_queue(void)

{

	ETHQOSDBG("\n");

	wake_up_interruptible(&dev_emac_wait);

}

#endif



static unsigned int ethqos_poll_dev_emac(struct file *file, poll_table *wait)

{

	int mask = 0;

	int update = 0;



	ETHQOSDBG("\n");



	poll_wait(file, &dev_emac_wait, wait);



	if (pethqos && pethqos->ipa_enabled && pethqos->cv2x_mode)

		ethqos_ipa_offload_event_handler(

			&update, EV_QTI_CHECK_CONN_UPDATE);



	if (update)

		mask = POLLIN | POLLRDNORM;



	ETHQOSDBG("mask %d\n", mask);



	return mask;

}



static const struct file_operations emac_fops = {

	.owner = THIS_MODULE,

	.open = simple_open,

	.read = ethqos_read_dev_emac,

	.write = ethqos_write_dev_emac,

	.poll = ethqos_poll_dev_emac,

};



static int ethqos_create_emac_device_node(dev_t *emac_dev_t,
@@ -2823,12 +2871,9 @@ static int qcom_ethqos_probe(struct platform_device *pdev) 
					       &ethqos->emac_class,

					       "emac");

	}



#ifdef CONFIG_ETH_IPA_OFFLOAD

	ethqos->ipa_enabled = true;

	priv->rx_queue[IPA_DMA_RX_CH].skip_sw = true;

	priv->tx_queue[IPA_DMA_TX_CH].skip_sw = true;

	ethqos_ipa_offload_event_handler(ethqos, EV_PROBE_INIT);

	priv->hw->mac->map_mtl_to_dma(priv->hw, 0, 1); //change

#endif



#ifdef CONFIG_MSM_BOOT_TIME_MARKER

drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.h

+4 −6
Original line number Diff line number Diff line
@@ -374,9 +374,9 @@ enum current_phy_state { 
#define RGMII_IO_MACRO_CONFIG_RGRD(data)\

	((data) = (readl_relaxed((RGMII_IO_MACRO_CONFIG_RGOFFADDR))))



#define RGMII_GPIO_CFG_TX_INT_MASK (unsigned long)(0x3)

#define RGMII_GPIO_CFG_TX_INT_MASK (unsigned long)(0x7)



#define RGMII_GPIO_CFG_TX_INT_WR_MASK (unsigned long)(0xfff9ffff)

#define RGMII_GPIO_CFG_TX_INT_WR_MASK (unsigned long)(0xfff1ffff)



#define RGMII_GPIO_CFG_TX_INT_UDFWR(data) do {\

	unsigned long v;\
@@ -388,13 +388,13 @@ enum current_phy_state { 


#define RGMII_GPIO_CFG_RX_INT_MASK (unsigned long)(0x3)



#define RGMII_GPIO_CFG_RX_INT_WR_MASK (unsigned long)(0xffe7ffff)

#define RGMII_GPIO_CFG_RX_INT_WR_MASK (unsigned long)(0xFFCFFFFF)



#define RGMII_GPIO_CFG_RX_INT_UDFWR(data) do {\

	unsigned long v;\

	RGMII_IO_MACRO_CONFIG_RGRD(v);\

	v = ((v & RGMII_GPIO_CFG_RX_INT_WR_MASK) | \

	((data & RGMII_GPIO_CFG_RX_INT_MASK) << 19));\

	((data & RGMII_GPIO_CFG_RX_INT_MASK) << 20));\

	RGMII_IO_MACRO_CONFIG_RGWR(v);\

} while (0)
@@ -598,8 +598,6 @@ u16 dwmac_qcom_select_queue( 
#define PTP_UDP_EV_PORT 0x013F

#define PTP_UDP_GEN_PORT 0x0140



#define IPA_DMA_TX_CH 0

#define IPA_DMA_RX_CH 0



#define CV2X_TAG_TX_CHANNEL 3

#define QMI_TAG_TX_CHANNEL 2

drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ipa-offload.h

+24 −4
Original line number Diff line number Diff line
@@ -13,11 +13,10 @@ 
#ifndef	_DWMAC_QCOM_ETH_IPA_OFFLOAD_H

#define	_DWMAC_QCOM_ETH_IPA_OFFLOAD_H



#define IPA_DMA_RX_CH 0

#define IPA_DMA_TX_CH 0



#define ALL_OTHER_TX_TRAFFIC_IPA_DISABLED 0

#define ALL_OTHER_TRAFFIC_TX_CHANNEL 1

#define ETH_DEV_NAME_LEN 16

#define ETH_DEV_ADDR_LEN 8



#define QTAG_VLAN_ETH_TYPE_OFFSET 16

#define QTAG_UCP_FIELD_OFFSET 14
@@ -35,9 +34,26 @@ 
		    buf1[QTAG_ETH_TYPE_OFFSET + 1]));\

} while (0)



enum ipa_queue_type {

	IPA_QUEUE_BE = 0x0,

	IPA_QUEUE_CV2X,

	IPA_QUEUE_MAX,

};



enum ipa_intr_route_type {

	IPA_INTR_ROUTE_HW = 0x0,

	IPA_INTR_ROUTE_DB,

	IPA_INTR_ROUTE_MAX,

};



#define IPA_DMA_RX_CH_BE 0

#define IPA_DMA_TX_CH_BE 0

#define IPA_DMA_RX_CH_CV2X 3

#define IPA_DMA_TX_CH_CV2X 3



#ifdef CONFIG_ETH_IPA_OFFLOAD

void ethqos_ipa_offload_event_handler(void *data, int ev);

void ethqos_wakeup_dev_emac_queue(void);

#else

static inline void ethqos_ipa_offload_event_handler(void *data, int ev)

{
@@ -58,6 +74,10 @@ static inline void ethqos_ipa_offload_event_handler(void *data, int ev) 
#define EV_USR_SUSPEND (EV_DPM_RESUME + 1)

#define EV_USR_RESUME (EV_USR_SUSPEND + 1)

#define EV_IPA_OFFLOAD_REMOVE (EV_USR_RESUME + 1)

#define EV_IPA_OFFLOAD_MAX (EV_IPA_OFFLOAD_REMOVE + 1)

#define EV_QTI_GET_CONN_STATUS (EV_IPA_OFFLOAD_REMOVE + 1)

#define EV_QTI_CHECK_CONN_UPDATE (EV_QTI_GET_CONN_STATUS + 1)

#define EV_IPA_HANDLE_RX_INTR (EV_QTI_CHECK_CONN_UPDATE + 1)

#define EV_IPA_HANDLE_TX_INTR (EV_IPA_HANDLE_RX_INTR + 1)

#define EV_IPA_OFFLOAD_MAX (EV_IPA_HANDLE_TX_INTR + 1)



#endif