mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2025-03-25 20:04:29 +07:00
ucc_geth: Implement Transmit on Demand support
Transmit on Demand: Fix spelling in config option, and make it actually enable TOD. Signed-off-by: Michael Reiss <michael.f.reiss@freescale.com> Signed-off-by: Michael Barkowski <michael.barkowski@freescale.com> Signed-off-by: Kim Phillips <kim.phillips@freescale.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
parent
7563907eb8
commit
d5b9049df2
@ -210,6 +210,9 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc
|
|||||||
uf_regs = uccf->uf_regs;
|
uf_regs = uccf->uf_regs;
|
||||||
uccf->p_ucce = (u32 *) & (uf_regs->ucce);
|
uccf->p_ucce = (u32 *) & (uf_regs->ucce);
|
||||||
uccf->p_uccm = (u32 *) & (uf_regs->uccm);
|
uccf->p_uccm = (u32 *) & (uf_regs->uccm);
|
||||||
|
#ifdef CONFIG_UGETH_TX_ON_DEMAND
|
||||||
|
uccf->p_utodr = (u16 *) & (uf_regs->utodr);
|
||||||
|
#endif
|
||||||
#ifdef STATISTICS
|
#ifdef STATISTICS
|
||||||
uccf->tx_frames = 0;
|
uccf->tx_frames = 0;
|
||||||
uccf->rx_frames = 0;
|
uccf->rx_frames = 0;
|
||||||
|
@ -2292,8 +2292,8 @@ config UGETH_FILTERING
|
|||||||
bool "Mac address filtering support"
|
bool "Mac address filtering support"
|
||||||
depends on UCC_GETH
|
depends on UCC_GETH
|
||||||
|
|
||||||
config UGETH_TX_ON_DEMOND
|
config UGETH_TX_ON_DEMAND
|
||||||
bool "Transmit on Demond support"
|
bool "Transmit on Demand support"
|
||||||
depends on UCC_GETH
|
depends on UCC_GETH
|
||||||
|
|
||||||
config MV643XX_ETH
|
config MV643XX_ETH
|
||||||
|
@ -1626,14 +1626,6 @@ static int init_phy(struct net_device *dev)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#ifdef CONFIG_UGETH_TX_ON_DEMOND
|
|
||||||
static int ugeth_transmit_on_demand(struct ucc_geth_private *ugeth)
|
|
||||||
{
|
|
||||||
struct ucc_fastransmit_on_demand(ugeth->uccf);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static int ugeth_graceful_stop_tx(struct ucc_geth_private *ugeth)
|
static int ugeth_graceful_stop_tx(struct ucc_geth_private *ugeth)
|
||||||
{
|
{
|
||||||
@ -3343,6 +3335,9 @@ static void ucc_geth_timeout(struct net_device *dev)
|
|||||||
static int ucc_geth_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
static int ucc_geth_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||||
{
|
{
|
||||||
struct ucc_geth_private *ugeth = netdev_priv(dev);
|
struct ucc_geth_private *ugeth = netdev_priv(dev);
|
||||||
|
#ifdef CONFIG_UGETH_TX_ON_DEMAND
|
||||||
|
struct ucc_fast_private *uccf;
|
||||||
|
#endif
|
||||||
u8 *bd; /* BD pointer */
|
u8 *bd; /* BD pointer */
|
||||||
u32 bd_status;
|
u32 bd_status;
|
||||||
u8 txQ = 0;
|
u8 txQ = 0;
|
||||||
@ -3401,6 +3396,10 @@ static int ucc_geth_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
|||||||
out_be16(ugeth->p_cpucount[txQ], ugeth->cpucount[txQ]);
|
out_be16(ugeth->p_cpucount[txQ], ugeth->cpucount[txQ]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef CONFIG_UGETH_TX_ON_DEMAND
|
||||||
|
uccf = ugeth->uccf;
|
||||||
|
out_be16(uccf->p_utodr, UCC_FAST_TOD);
|
||||||
|
#endif
|
||||||
spin_unlock_irq(&ugeth->lock);
|
spin_unlock_irq(&ugeth->lock);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -159,6 +159,9 @@ struct ucc_fast_private {
|
|||||||
struct ucc_fast *uf_regs; /* a pointer to memory map of UCC regs. */
|
struct ucc_fast *uf_regs; /* a pointer to memory map of UCC regs. */
|
||||||
u32 *p_ucce; /* a pointer to the event register in memory. */
|
u32 *p_ucce; /* a pointer to the event register in memory. */
|
||||||
u32 *p_uccm; /* a pointer to the mask register in memory. */
|
u32 *p_uccm; /* a pointer to the mask register in memory. */
|
||||||
|
#ifdef CONFIG_UGETH_TX_ON_DEMAND
|
||||||
|
u16 *p_utodr; /* pointer to the transmit on demand register */
|
||||||
|
#endif
|
||||||
int enabled_tx; /* Whether channel is enabled for Tx (ENT) */
|
int enabled_tx; /* Whether channel is enabled for Tx (ENT) */
|
||||||
int enabled_rx; /* Whether channel is enabled for Rx (ENR) */
|
int enabled_rx; /* Whether channel is enabled for Rx (ENR) */
|
||||||
int stopped_tx; /* Whether channel has been stopped for Tx
|
int stopped_tx; /* Whether channel has been stopped for Tx
|
||||||
|
Loading…
Reference in New Issue
Block a user