Skip to content

L
linux
Commit 7a981431 authored by David S. Miller's avatar David S. Miller
Browse files
Options

Merge branch 'enetc-mac-merge-prep' 

Vladimir Oltean says:

====================
ENETC MAC Merge cleanup

This is a preparatory patch set for MAC Merge layer support in enetc via
ethtool. It does the following:

- consolidates a software lockstep register write procedure for the pMAC
- detects per-port frame preemption capability and only writes pMAC
  registers if a pMAC exists
- stops enabling the pMAC by default

Additionally, I noticed some build warnings in the driver which are new
in this kernel version, so patch 1/6 fixes those.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f3c6e128 086cc080
Hide whitespace changes
Inline Side-by-side
Showing with 158 additions and 117 deletions
drivers/net/ethernet/freescale/enetc/Kconfig
View file @ 7a981431
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
config FSL_ENETC_CORE
tristate
help
This module supports common functionality between the PF and VF
drivers for the NXP ENETC controller.
If compiled as module (M), the module name is fsl-enetc-core.
config FSL_ENETC config FSL_ENETC
tristate "ENETC PF driver" tristate "ENETC PF driver"
depends on PCI_MSI depends on PCI_MSI
select FSL_ENETC_CORE
select FSL_ENETC_IERB select FSL_ENETC_IERB
select FSL_ENETC_MDIO select FSL_ENETC_MDIO
select PHYLINK select PHYLINK
...@@ -17,6 +26,7 @@ config FSL_ENETC ...@@ -17,6 +26,7 @@ config FSL_ENETC
config FSL_ENETC_VF config FSL_ENETC_VF
tristate "ENETC VF driver" tristate "ENETC VF driver"
depends on PCI_MSI depends on PCI_MSI
select FSL_ENETC_CORE
select FSL_ENETC_MDIO select FSL_ENETC_MDIO
select PHYLINK select PHYLINK
select DIMLIB select DIMLIB
......
drivers/net/ethernet/freescale/enetc/Makefile
View file @ 7a981431
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
common-objs := enetc.o enetc_cbdr.o enetc_ethtool.o obj-$(CONFIG_FSL_ENETC_CORE) += fsl-enetc-core.o
fsl-enetc-core-y := enetc.o enetc_cbdr.o enetc_ethtool.o
obj-$(CONFIG_FSL_ENETC) += fsl-enetc.o obj-$(CONFIG_FSL_ENETC) += fsl-enetc.o
fsl-enetc-y := enetc_pf.o $(common-objs) fsl-enetc-y := enetc_pf.o
fsl-enetc-$(CONFIG_PCI_IOV) += enetc_msg.o fsl-enetc-$(CONFIG_PCI_IOV) += enetc_msg.o
fsl-enetc-$(CONFIG_FSL_ENETC_QOS) += enetc_qos.o fsl-enetc-$(CONFIG_FSL_ENETC_QOS) += enetc_qos.o
obj-$(CONFIG_FSL_ENETC_VF) += fsl-enetc-vf.o obj-$(CONFIG_FSL_ENETC_VF) += fsl-enetc-vf.o
fsl-enetc-vf-y := enetc_vf.o $(common-objs) fsl-enetc-vf-y := enetc_vf.o
obj-$(CONFIG_FSL_ENETC_IERB) += fsl-enetc-ierb.o obj-$(CONFIG_FSL_ENETC_IERB) += fsl-enetc-ierb.o
fsl-enetc-ierb-y := enetc_ierb.o fsl-enetc-ierb-y := enetc_ierb.o
......
drivers/net/ethernet/freescale/enetc/enetc.c
View file @ 7a981431
...@@ -11,6 +11,20 @@ ...@@ -11,6 +11,20 @@
#include <net/pkt_sched.h> #include <net/pkt_sched.h>
#include <net/tso.h> #include <net/tso.h>
u32 enetc_port_mac_rd(struct enetc_si *si, u32 reg)
{
return enetc_port_rd(&si->hw, reg);
}
EXPORT_SYMBOL_GPL(enetc_port_mac_rd);
void enetc_port_mac_wr(struct enetc_si *si, u32 reg, u32 val)
{
enetc_port_wr(&si->hw, reg, val);
if (si->hw_features & ENETC_SI_F_QBU)
enetc_port_wr(&si->hw, reg + ENETC_PMAC_OFFSET, val);
}
EXPORT_SYMBOL_GPL(enetc_port_mac_wr);
static int enetc_num_stack_tx_queues(struct enetc_ndev_priv *priv) static int enetc_num_stack_tx_queues(struct enetc_ndev_priv *priv)
{ {
int num_tx_rings = priv->num_tx_rings; int num_tx_rings = priv->num_tx_rings;
...@@ -243,8 +257,8 @@ static int enetc_map_tx_buffs(struct enetc_bdr *tx_ring, struct sk_buff *skb) ...@@ -243,8 +257,8 @@ static int enetc_map_tx_buffs(struct enetc_bdr *tx_ring, struct sk_buff *skb)
if (udp) if (udp)
val |= ENETC_PM0_SINGLE_STEP_CH; val |= ENETC_PM0_SINGLE_STEP_CH;
enetc_port_wr(hw, ENETC_PM0_SINGLE_STEP, val); enetc_port_mac_wr(priv->si, ENETC_PM0_SINGLE_STEP,
enetc_port_wr(hw, ENETC_PM1_SINGLE_STEP, val); val);
} else if (do_twostep_tstamp) { } else if (do_twostep_tstamp) {
skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS; skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS;
e_flags |= ENETC_TXBD_E_FLAGS_TWO_STEP_PTP; e_flags |= ENETC_TXBD_E_FLAGS_TWO_STEP_PTP;
...@@ -651,6 +665,7 @@ netdev_tx_t enetc_xmit(struct sk_buff *skb, struct net_device *ndev) ...@@ -651,6 +665,7 @@ netdev_tx_t enetc_xmit(struct sk_buff *skb, struct net_device *ndev)
return enetc_start_xmit(skb, ndev); return enetc_start_xmit(skb, ndev);
} }
EXPORT_SYMBOL_GPL(enetc_xmit);
static irqreturn_t enetc_msix(int irq, void *data) static irqreturn_t enetc_msix(int irq, void *data)
{ {
...@@ -1388,6 +1403,7 @@ int enetc_xdp_xmit(struct net_device *ndev, int num_frames, ...@@ -1388,6 +1403,7 @@ int enetc_xdp_xmit(struct net_device *ndev, int num_frames,
return xdp_tx_frm_cnt; return xdp_tx_frm_cnt;
} }
EXPORT_SYMBOL_GPL(enetc_xdp_xmit);
static void enetc_map_rx_buff_to_xdp(struct enetc_bdr *rx_ring, int i, static void enetc_map_rx_buff_to_xdp(struct enetc_bdr *rx_ring, int i,
struct xdp_buff *xdp_buff, u16 size) struct xdp_buff *xdp_buff, u16 size)
...@@ -1711,9 +1727,13 @@ void enetc_get_si_caps(struct enetc_si *si) ...@@ -1711,9 +1727,13 @@ void enetc_get_si_caps(struct enetc_si *si)
if (val & ENETC_SIPCAPR0_QBV) if (val & ENETC_SIPCAPR0_QBV)
si->hw_features |= ENETC_SI_F_QBV; si->hw_features |= ENETC_SI_F_QBV;
if (val & ENETC_SIPCAPR0_QBU)
si->hw_features |= ENETC_SI_F_QBU;
if (val & ENETC_SIPCAPR0_PSFP) if (val & ENETC_SIPCAPR0_PSFP)
si->hw_features |= ENETC_SI_F_PSFP; si->hw_features |= ENETC_SI_F_PSFP;
} }
EXPORT_SYMBOL_GPL(enetc_get_si_caps);
static int enetc_dma_alloc_bdr(struct enetc_bdr_resource *res) static int enetc_dma_alloc_bdr(struct enetc_bdr_resource *res)
{ {
...@@ -2029,6 +2049,7 @@ int enetc_configure_si(struct enetc_ndev_priv *priv) ...@@ -2029,6 +2049,7 @@ int enetc_configure_si(struct enetc_ndev_priv *priv)
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(enetc_configure_si);
void enetc_init_si_rings_params(struct enetc_ndev_priv *priv) void enetc_init_si_rings_params(struct enetc_ndev_priv *priv)
{ {
...@@ -2048,6 +2069,7 @@ void enetc_init_si_rings_params(struct enetc_ndev_priv *priv) ...@@ -2048,6 +2069,7 @@ void enetc_init_si_rings_params(struct enetc_ndev_priv *priv)
priv->ic_mode = ENETC_IC_RX_ADAPTIVE | ENETC_IC_TX_MANUAL; priv->ic_mode = ENETC_IC_RX_ADAPTIVE | ENETC_IC_TX_MANUAL;
priv->tx_ictt = ENETC_TXIC_TIMETHR; priv->tx_ictt = ENETC_TXIC_TIMETHR;
} }
EXPORT_SYMBOL_GPL(enetc_init_si_rings_params);
int enetc_alloc_si_resources(struct enetc_ndev_priv *priv) int enetc_alloc_si_resources(struct enetc_ndev_priv *priv)
{ {
...@@ -2060,11 +2082,13 @@ int enetc_alloc_si_resources(struct enetc_ndev_priv *priv) ...@@ -2060,11 +2082,13 @@ int enetc_alloc_si_resources(struct enetc_ndev_priv *priv)
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(enetc_alloc_si_resources);
void enetc_free_si_resources(struct enetc_ndev_priv *priv) void enetc_free_si_resources(struct enetc_ndev_priv *priv)
{ {
kfree(priv->cls_rules); kfree(priv->cls_rules);
} }
EXPORT_SYMBOL_GPL(enetc_free_si_resources);
static void enetc_setup_txbdr(struct enetc_hw *hw, struct enetc_bdr *tx_ring) static void enetc_setup_txbdr(struct enetc_hw *hw, struct enetc_bdr *tx_ring)
{ {
...@@ -2426,6 +2450,7 @@ void enetc_start(struct net_device *ndev) ...@@ -2426,6 +2450,7 @@ void enetc_start(struct net_device *ndev)
netif_tx_start_all_queues(ndev); netif_tx_start_all_queues(ndev);
} }
EXPORT_SYMBOL_GPL(enetc_start);
int enetc_open(struct net_device *ndev) int enetc_open(struct net_device *ndev)
{ {
...@@ -2487,6 +2512,7 @@ int enetc_open(struct net_device *ndev) ...@@ -2487,6 +2512,7 @@ int enetc_open(struct net_device *ndev)
return err; return err;
} }
EXPORT_SYMBOL_GPL(enetc_open);
void enetc_stop(struct net_device *ndev) void enetc_stop(struct net_device *ndev)
{ {
...@@ -2510,6 +2536,7 @@ void enetc_stop(struct net_device *ndev) ...@@ -2510,6 +2536,7 @@ void enetc_stop(struct net_device *ndev)
enetc_clear_interrupts(priv); enetc_clear_interrupts(priv);
} }
EXPORT_SYMBOL_GPL(enetc_stop);
int enetc_close(struct net_device *ndev) int enetc_close(struct net_device *ndev)
{ {
...@@ -2534,6 +2561,7 @@ int enetc_close(struct net_device *ndev) ...@@ -2534,6 +2561,7 @@ int enetc_close(struct net_device *ndev)
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(enetc_close);
static int enetc_reconfigure(struct enetc_ndev_priv *priv, bool extended, static int enetc_reconfigure(struct enetc_ndev_priv *priv, bool extended,
int (*cb)(struct enetc_ndev_priv *priv, void *ctx), int (*cb)(struct enetc_ndev_priv *priv, void *ctx),
...@@ -2642,6 +2670,7 @@ int enetc_setup_tc_mqprio(struct net_device *ndev, void *type_data) ...@@ -2642,6 +2670,7 @@ int enetc_setup_tc_mqprio(struct net_device *ndev, void *type_data)
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(enetc_setup_tc_mqprio);
static int enetc_reconfigure_xdp_cb(struct enetc_ndev_priv *priv, void *ctx) static int enetc_reconfigure_xdp_cb(struct enetc_ndev_priv *priv, void *ctx)
{ {
...@@ -2691,6 +2720,7 @@ int enetc_setup_bpf(struct net_device *ndev, struct netdev_bpf *bpf) ...@@ -2691,6 +2720,7 @@ int enetc_setup_bpf(struct net_device *ndev, struct netdev_bpf *bpf)
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(enetc_setup_bpf);
struct net_device_stats *enetc_get_stats(struct net_device *ndev) struct net_device_stats *enetc_get_stats(struct net_device *ndev)
{ {
...@@ -2722,6 +2752,7 @@ struct net_device_stats *enetc_get_stats(struct net_device *ndev) ...@@ -2722,6 +2752,7 @@ struct net_device_stats *enetc_get_stats(struct net_device *ndev)
return stats; return stats;
} }
EXPORT_SYMBOL_GPL(enetc_get_stats);
static int enetc_set_rss(struct net_device *ndev, int en) static int enetc_set_rss(struct net_device *ndev, int en)
{ {
...@@ -2774,6 +2805,7 @@ void enetc_set_features(struct net_device *ndev, netdev_features_t features) ...@@ -2774,6 +2805,7 @@ void enetc_set_features(struct net_device *ndev, netdev_features_t features)
enetc_enable_txvlan(ndev, enetc_enable_txvlan(ndev,
!!(features & NETIF_F_HW_VLAN_CTAG_TX)); !!(features & NETIF_F_HW_VLAN_CTAG_TX));
} }
EXPORT_SYMBOL_GPL(enetc_set_features);
#ifdef CONFIG_FSL_ENETC_PTP_CLOCK #ifdef CONFIG_FSL_ENETC_PTP_CLOCK
static int enetc_hwtstamp_set(struct net_device *ndev, struct ifreq *ifr) static int enetc_hwtstamp_set(struct net_device *ndev, struct ifreq *ifr)
...@@ -2861,6 +2893,7 @@ int enetc_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd) ...@@ -2861,6 +2893,7 @@ int enetc_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd)
return phylink_mii_ioctl(priv->phylink, rq, cmd); return phylink_mii_ioctl(priv->phylink, rq, cmd);
} }
EXPORT_SYMBOL_GPL(enetc_ioctl);
int enetc_alloc_msix(struct enetc_ndev_priv *priv) int enetc_alloc_msix(struct enetc_ndev_priv *priv)
{ {
...@@ -2962,6 +2995,7 @@ int enetc_alloc_msix(struct enetc_ndev_priv *priv) ...@@ -2962,6 +2995,7 @@ int enetc_alloc_msix(struct enetc_ndev_priv *priv)
return err; return err;
} }
EXPORT_SYMBOL_GPL(enetc_alloc_msix);
void enetc_free_msix(struct enetc_ndev_priv *priv) void enetc_free_msix(struct enetc_ndev_priv *priv)
{ {
...@@ -2991,6 +3025,7 @@ void enetc_free_msix(struct enetc_ndev_priv *priv) ...@@ -2991,6 +3025,7 @@ void enetc_free_msix(struct enetc_ndev_priv *priv)
/* disable all MSIX for this device */ /* disable all MSIX for this device */
pci_free_irq_vectors(priv->si->pdev); pci_free_irq_vectors(priv->si->pdev);
} }
EXPORT_SYMBOL_GPL(enetc_free_msix);
static void enetc_kfree_si(struct enetc_si *si) static void enetc_kfree_si(struct enetc_si *si)
{ {
...@@ -3080,6 +3115,7 @@ int enetc_pci_probe(struct pci_dev *pdev, const char *name, int sizeof_priv) ...@@ -3080,6 +3115,7 @@ int enetc_pci_probe(struct pci_dev *pdev, const char *name, int sizeof_priv)
return err; return err;
} }
EXPORT_SYMBOL_GPL(enetc_pci_probe);
void enetc_pci_remove(struct pci_dev *pdev) void enetc_pci_remove(struct pci_dev *pdev)
{ {
...@@ -3091,3 +3127,6 @@ void enetc_pci_remove(struct pci_dev *pdev) ...@@ -3091,3 +3127,6 @@ void enetc_pci_remove(struct pci_dev *pdev)
pci_release_mem_regions(pdev); pci_release_mem_regions(pdev);
pci_disable_device(pdev); pci_disable_device(pdev);
} }
EXPORT_SYMBOL_GPL(enetc_pci_remove);
MODULE_LICENSE("Dual BSD/GPL");
drivers/net/ethernet/freescale/enetc/enetc.h
View file @ 7a981431
...@@ -229,8 +229,9 @@ enum enetc_errata { ...@@ -229,8 +229,9 @@ enum enetc_errata {
ENETC_ERR_UCMCSWP = BIT(1), ENETC_ERR_UCMCSWP = BIT(1),
}; };
#define ENETC_SI_F_QBV BIT(0) #define ENETC_SI_F_PSFP BIT(0)
#define ENETC_SI_F_PSFP BIT(1) #define ENETC_SI_F_QBV BIT(1)
#define ENETC_SI_F_QBU BIT(2)
/* PCI IEP device data */ /* PCI IEP device data */
struct enetc_si { struct enetc_si {
...@@ -396,6 +397,8 @@ struct enetc_msg_cmd_set_primary_mac { ...@@ -396,6 +397,8 @@ struct enetc_msg_cmd_set_primary_mac {
extern int enetc_phc_index; extern int enetc_phc_index;
/* SI common */ /* SI common */
u32 enetc_port_mac_rd(struct enetc_si *si, u32 reg);
void enetc_port_mac_wr(struct enetc_si *si, u32 reg, u32 val);
int enetc_pci_probe(struct pci_dev *pdev, const char *name, int sizeof_priv); int enetc_pci_probe(struct pci_dev *pdev, const char *name, int sizeof_priv);
void enetc_pci_remove(struct pci_dev *pdev); void enetc_pci_remove(struct pci_dev *pdev);
int enetc_alloc_msix(struct enetc_ndev_priv *priv); int enetc_alloc_msix(struct enetc_ndev_priv *priv);
......
drivers/net/ethernet/freescale/enetc/enetc_cbdr.c
View file @ 7a981431
...@@ -44,6 +44,7 @@ int enetc_setup_cbdr(struct device *dev, struct enetc_hw *hw, int bd_count, ...@@ -44,6 +44,7 @@ int enetc_setup_cbdr(struct device *dev, struct enetc_hw *hw, int bd_count,
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(enetc_setup_cbdr);
void enetc_teardown_cbdr(struct enetc_cbdr *cbdr) void enetc_teardown_cbdr(struct enetc_cbdr *cbdr)
{ {
...@@ -57,6 +58,7 @@ void enetc_teardown_cbdr(struct enetc_cbdr *cbdr) ...@@ -57,6 +58,7 @@ void enetc_teardown_cbdr(struct enetc_cbdr *cbdr)
cbdr->bd_base = NULL; cbdr->bd_base = NULL;
cbdr->dma_dev = NULL; cbdr->dma_dev = NULL;
} }
EXPORT_SYMBOL_GPL(enetc_teardown_cbdr);
static void enetc_clean_cbdr(struct enetc_cbdr *ring) static void enetc_clean_cbdr(struct enetc_cbdr *ring)
{ {
...@@ -127,6 +129,7 @@ int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd) ...@@ -127,6 +129,7 @@ int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd)
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(enetc_send_cmd);
int enetc_clear_mac_flt_entry(struct enetc_si *si, int index) int enetc_clear_mac_flt_entry(struct enetc_si *si, int index)
{ {
...@@ -140,6 +143,7 @@ int enetc_clear_mac_flt_entry(struct enetc_si *si, int index) ...@@ -140,6 +143,7 @@ int enetc_clear_mac_flt_entry(struct enetc_si *si, int index)
return enetc_send_cmd(si, &cbd); return enetc_send_cmd(si, &cbd);
} }
EXPORT_SYMBOL_GPL(enetc_clear_mac_flt_entry);
int enetc_set_mac_flt_entry(struct enetc_si *si, int index, int enetc_set_mac_flt_entry(struct enetc_si *si, int index,
char *mac_addr, int si_map) char *mac_addr, int si_map)
...@@ -165,6 +169,7 @@ int enetc_set_mac_flt_entry(struct enetc_si *si, int index, ...@@ -165,6 +169,7 @@ int enetc_set_mac_flt_entry(struct enetc_si *si, int index,
return enetc_send_cmd(si, &cbd); return enetc_send_cmd(si, &cbd);
} }
EXPORT_SYMBOL_GPL(enetc_set_mac_flt_entry);
/* Set entry in RFS table */ /* Set entry in RFS table */
int enetc_set_fs_entry(struct enetc_si *si, struct enetc_cmd_rfse *rfse, int enetc_set_fs_entry(struct enetc_si *si, struct enetc_cmd_rfse *rfse,
...@@ -197,6 +202,7 @@ int enetc_set_fs_entry(struct enetc_si *si, struct enetc_cmd_rfse *rfse, ...@@ -197,6 +202,7 @@ int enetc_set_fs_entry(struct enetc_si *si, struct enetc_cmd_rfse *rfse,
return err; return err;
} }
EXPORT_SYMBOL_GPL(enetc_set_fs_entry);
static int enetc_cmd_rss_table(struct enetc_si *si, u32 *table, int count, static int enetc_cmd_rss_table(struct enetc_si *si, u32 *table, int count,
bool read) bool read)
...@@ -242,9 +248,11 @@ int enetc_get_rss_table(struct enetc_si *si, u32 *table, int count) ...@@ -242,9 +248,11 @@ int enetc_get_rss_table(struct enetc_si *si, u32 *table, int count)
{ {
return enetc_cmd_rss_table(si, table, count, true); return enetc_cmd_rss_table(si, table, count, true);
} }
EXPORT_SYMBOL_GPL(enetc_get_rss_table);
/* Set RSS table */ /* Set RSS table */
int enetc_set_rss_table(struct enetc_si *si, const u32 *table, int count) int enetc_set_rss_table(struct enetc_si *si, const u32 *table, int count)
{ {
return enetc_cmd_rss_table(si, (u32 *)table, count, false); return enetc_cmd_rss_table(si, (u32 *)table, count, false);
} }
EXPORT_SYMBOL_GPL(enetc_set_rss_table);
drivers/net/ethernet/freescale/enetc/enetc_ethtool.c
View file @ 7a981431
...@@ -649,6 +649,7 @@ void enetc_set_rss_key(struct enetc_hw *hw, const u8 *bytes) ...@@ -649,6 +649,7 @@ void enetc_set_rss_key(struct enetc_hw *hw, const u8 *bytes)
for (i = 0; i < ENETC_RSSHASH_KEY_SIZE / 4; i++) for (i = 0; i < ENETC_RSSHASH_KEY_SIZE / 4; i++)
enetc_port_wr(hw, ENETC_PRSSK(i), ((u32 *)bytes)[i]); enetc_port_wr(hw, ENETC_PRSSK(i), ((u32 *)bytes)[i]);
} }
EXPORT_SYMBOL_GPL(enetc_set_rss_key);
static int enetc_set_rxfh(struct net_device *ndev, const u32 *indir, static int enetc_set_rxfh(struct net_device *ndev, const u32 *indir,
const u8 *key, const u8 hfunc) const u8 *key, const u8 hfunc)
...@@ -924,3 +925,4 @@ void enetc_set_ethtool_ops(struct net_device *ndev) ...@@ -924,3 +925,4 @@ void enetc_set_ethtool_ops(struct net_device *ndev)
else else
ndev->ethtool_ops = &enetc_vf_ethtool_ops; ndev->ethtool_ops = &enetc_vf_ethtool_ops;
} }
EXPORT_SYMBOL_GPL(enetc_set_ethtool_ops);
drivers/net/ethernet/freescale/enetc/enetc_hw.h
View file @ 7a981431
...@@ -18,9 +18,10 @@ ...@@ -18,9 +18,10 @@
#define ENETC_SICTR0 0x18 #define ENETC_SICTR0 0x18
#define ENETC_SICTR1 0x1c #define ENETC_SICTR1 0x1c
#define ENETC_SIPCAPR0 0x20 #define ENETC_SIPCAPR0 0x20
#define ENETC_SIPCAPR0_QBV BIT(4)
#define ENETC_SIPCAPR0_PSFP BIT(9) #define ENETC_SIPCAPR0_PSFP BIT(9)
#define ENETC_SIPCAPR0_RSS BIT(8) #define ENETC_SIPCAPR0_RSS BIT(8)
#define ENETC_SIPCAPR0_QBV BIT(4)
#define ENETC_SIPCAPR0_QBU BIT(3)
#define ENETC_SIPCAPR1 0x24 #define ENETC_SIPCAPR1 0x24
#define ENETC_SITGTGR 0x30 #define ENETC_SITGTGR 0x30
#define ENETC_SIRBGCR 0x38 #define ENETC_SIRBGCR 0x38
...@@ -213,7 +214,6 @@ enum enetc_bdr_type {TX, RX}; ...@@ -213,7 +214,6 @@ enum enetc_bdr_type {TX, RX};
#define ENETC_PSIRFSCFGR(n) (0x1814 + (n) * 4) /* n = SI index */ #define ENETC_PSIRFSCFGR(n) (0x1814 + (n) * 4) /* n = SI index */
#define ENETC_PFPMR 0x1900 #define ENETC_PFPMR 0x1900
#define ENETC_PFPMR_PMACE BIT(1) #define ENETC_PFPMR_PMACE BIT(1)
#define ENETC_PFPMR_MWLM BIT(0)
#define ENETC_EMDIO_BASE 0x1c00 #define ENETC_EMDIO_BASE 0x1c00
#define ENETC_PSIUMHFR0(n, err) (((err) ? 0x1d08 : 0x1d00) + (n) * 0x10) #define ENETC_PSIUMHFR0(n, err) (((err) ? 0x1d08 : 0x1d00) + (n) * 0x10)
#define ENETC_PSIUMHFR1(n) (0x1d04 + (n) * 0x10) #define ENETC_PSIUMHFR1(n) (0x1d04 + (n) * 0x10)
...@@ -225,8 +225,9 @@ enum enetc_bdr_type {TX, RX}; ...@@ -225,8 +225,9 @@ enum enetc_bdr_type {TX, RX};
#define ENETC_MMCSR_ME BIT(16) #define ENETC_MMCSR_ME BIT(16)
#define ENETC_PTCMSDUR(n) (0x2020 + (n) * 4) /* n = TC index [0..7] */ #define ENETC_PTCMSDUR(n) (0x2020 + (n) * 4) /* n = TC index [0..7] */
#define ENETC_PMAC_OFFSET 0x1000
#define ENETC_PM0_CMD_CFG 0x8008 #define ENETC_PM0_CMD_CFG 0x8008
#define ENETC_PM1_CMD_CFG 0x9008
#define ENETC_PM0_TX_EN BIT(0) #define ENETC_PM0_TX_EN BIT(0)
#define ENETC_PM0_RX_EN BIT(1) #define ENETC_PM0_RX_EN BIT(1)
#define ENETC_PM0_PROMISC BIT(4) #define ENETC_PM0_PROMISC BIT(4)
...@@ -245,11 +246,8 @@ enum enetc_bdr_type {TX, RX}; ...@@ -245,11 +246,8 @@ enum enetc_bdr_type {TX, RX};
#define ENETC_PM0_PAUSE_QUANTA 0x8054 #define ENETC_PM0_PAUSE_QUANTA 0x8054
#define ENETC_PM0_PAUSE_THRESH 0x8064 #define ENETC_PM0_PAUSE_THRESH 0x8064
#define ENETC_PM1_PAUSE_QUANTA 0x9054
#define ENETC_PM1_PAUSE_THRESH 0x9064
#define ENETC_PM0_SINGLE_STEP 0x80c0 #define ENETC_PM0_SINGLE_STEP 0x80c0
#define ENETC_PM1_SINGLE_STEP 0x90c0
#define ENETC_PM0_SINGLE_STEP_CH BIT(7) #define ENETC_PM0_SINGLE_STEP_CH BIT(7)
#define ENETC_PM0_SINGLE_STEP_EN BIT(31) #define ENETC_PM0_SINGLE_STEP_EN BIT(31)
#define ENETC_SET_SINGLE_STEP_OFFSET(v) (((v) & 0xff) << 8) #define ENETC_SET_SINGLE_STEP_OFFSET(v) (((v) & 0xff) << 8)
...@@ -279,57 +277,57 @@ enum enetc_bdr_type {TX, RX}; ...@@ -279,57 +277,57 @@ enum enetc_bdr_type {TX, RX};
/* Port MAC counters: Port MAC 0 corresponds to the eMAC and /* Port MAC counters: Port MAC 0 corresponds to the eMAC and
* Port MAC 1 to the pMAC. * Port MAC 1 to the pMAC.
*/ */
#define ENETC_PM_REOCT(mac) (0x8100 + 0x1000 * (mac)) #define ENETC_PM_REOCT(mac) (0x8100 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_RALN(mac) (0x8110 + 0x1000 * (mac)) #define ENETC_PM_RALN(mac) (0x8110 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_RXPF(mac) (0x8118 + 0x1000 * (mac)) #define ENETC_PM_RXPF(mac) (0x8118 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_RFRM(mac) (0x8120 + 0x1000 * (mac)) #define ENETC_PM_RFRM(mac) (0x8120 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_RFCS(mac) (0x8128 + 0x1000 * (mac)) #define ENETC_PM_RFCS(mac) (0x8128 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_RVLAN(mac) (0x8130 + 0x1000 * (mac)) #define ENETC_PM_RVLAN(mac) (0x8130 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_RERR(mac) (0x8138 + 0x1000 * (mac)) #define ENETC_PM_RERR(mac) (0x8138 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_RUCA(mac) (0x8140 + 0x1000 * (mac)) #define ENETC_PM_RUCA(mac) (0x8140 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_RMCA(mac) (0x8148 + 0x1000 * (mac)) #define ENETC_PM_RMCA(mac) (0x8148 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_RBCA(mac) (0x8150 + 0x1000 * (mac)) #define ENETC_PM_RBCA(mac) (0x8150 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_RDRP(mac) (0x8158 + 0x1000 * (mac)) #define ENETC_PM_RDRP(mac) (0x8158 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_RPKT(mac) (0x8160 + 0x1000 * (mac)) #define ENETC_PM_RPKT(mac) (0x8160 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_RUND(mac) (0x8168 + 0x1000 * (mac)) #define ENETC_PM_RUND(mac) (0x8168 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_R64(mac) (0x8170 + 0x1000 * (mac)) #define ENETC_PM_R64(mac) (0x8170 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_R127(mac) (0x8178 + 0x1000 * (mac)) #define ENETC_PM_R127(mac) (0x8178 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_R255(mac) (0x8180 + 0x1000 * (mac)) #define ENETC_PM_R255(mac) (0x8180 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_R511(mac) (0x8188 + 0x1000 * (mac)) #define ENETC_PM_R511(mac) (0x8188 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_R1023(mac) (0x8190 + 0x1000 * (mac)) #define ENETC_PM_R1023(mac) (0x8190 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_R1522(mac) (0x8198 + 0x1000 * (mac)) #define ENETC_PM_R1522(mac) (0x8198 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_R1523X(mac) (0x81A0 + 0x1000 * (mac)) #define ENETC_PM_R1523X(mac) (0x81A0 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_ROVR(mac) (0x81A8 + 0x1000 * (mac)) #define ENETC_PM_ROVR(mac) (0x81A8 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_RJBR(mac) (0x81B0 + 0x1000 * (mac)) #define ENETC_PM_RJBR(mac) (0x81B0 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_RFRG(mac) (0x81B8 + 0x1000 * (mac)) #define ENETC_PM_RFRG(mac) (0x81B8 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_RCNP(mac) (0x81C0 + 0x1000 * (mac)) #define ENETC_PM_RCNP(mac) (0x81C0 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_RDRNTP(mac) (0x81C8 + 0x1000 * (mac)) #define ENETC_PM_RDRNTP(mac) (0x81C8 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_TEOCT(mac) (0x8200 + 0x1000 * (mac)) #define ENETC_PM_TEOCT(mac) (0x8200 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_TOCT(mac) (0x8208 + 0x1000 * (mac)) #define ENETC_PM_TOCT(mac) (0x8208 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_TCRSE(mac) (0x8210 + 0x1000 * (mac)) #define ENETC_PM_TCRSE(mac) (0x8210 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_TXPF(mac) (0x8218 + 0x1000 * (mac)) #define ENETC_PM_TXPF(mac) (0x8218 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_TFRM(mac) (0x8220 + 0x1000 * (mac)) #define ENETC_PM_TFRM(mac) (0x8220 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_TFCS(mac) (0x8228 + 0x1000 * (mac)) #define ENETC_PM_TFCS(mac) (0x8228 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_TVLAN(mac) (0x8230 + 0x1000 * (mac)) #define ENETC_PM_TVLAN(mac) (0x8230 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_TERR(mac) (0x8238 + 0x1000 * (mac)) #define ENETC_PM_TERR(mac) (0x8238 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_TUCA(mac) (0x8240 + 0x1000 * (mac)) #define ENETC_PM_TUCA(mac) (0x8240 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_TMCA(mac) (0x8248 + 0x1000 * (mac)) #define ENETC_PM_TMCA(mac) (0x8248 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_TBCA(mac) (0x8250 + 0x1000 * (mac)) #define ENETC_PM_TBCA(mac) (0x8250 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_TPKT(mac) (0x8260 + 0x1000 * (mac)) #define ENETC_PM_TPKT(mac) (0x8260 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_TUND(mac) (0x8268 + 0x1000 * (mac)) #define ENETC_PM_TUND(mac) (0x8268 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_T64(mac) (0x8270 + 0x1000 * (mac)) #define ENETC_PM_T64(mac) (0x8270 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_T127(mac) (0x8278 + 0x1000 * (mac)) #define ENETC_PM_T127(mac) (0x8278 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_T255(mac) (0x8280 + 0x1000 * (mac)) #define ENETC_PM_T255(mac) (0x8280 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_T511(mac) (0x8288 + 0x1000 * (mac)) #define ENETC_PM_T511(mac) (0x8288 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_T1023(mac) (0x8290 + 0x1000 * (mac)) #define ENETC_PM_T1023(mac) (0x8290 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_T1522(mac) (0x8298 + 0x1000 * (mac)) #define ENETC_PM_T1522(mac) (0x8298 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_T1523X(mac) (0x82A0 + 0x1000 * (mac)) #define ENETC_PM_T1523X(mac) (0x82A0 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_TCNP(mac) (0x82C0 + 0x1000 * (mac)) #define ENETC_PM_TCNP(mac) (0x82C0 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_TDFR(mac) (0x82D0 + 0x1000 * (mac)) #define ENETC_PM_TDFR(mac) (0x82D0 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_TMCOL(mac) (0x82D8 + 0x1000 * (mac)) #define ENETC_PM_TMCOL(mac) (0x82D8 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_TSCOL(mac) (0x82E0 + 0x1000 * (mac)) #define ENETC_PM_TSCOL(mac) (0x82E0 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_TLCOL(mac) (0x82E8 + 0x1000 * (mac)) #define ENETC_PM_TLCOL(mac) (0x82E8 + ENETC_PMAC_OFFSET * (mac))
#define ENETC_PM_TECOL(mac) (0x82F0 + 0x1000 * (mac)) #define ENETC_PM_TECOL(mac) (0x82F0 + ENETC_PMAC_OFFSET * (mac))
/* Port counters */ /* Port counters */
#define ENETC_PICDR(n) (0x0700 + (n) * 8) /* n = [0..3] */ #define ENETC_PICDR(n) (0x0700 + (n) * 8) /* n = [0..3] */
......
drivers/net/ethernet/freescale/enetc/enetc_pf.c
View file @ 7a981431
...@@ -319,24 +319,23 @@ static int enetc_vlan_rx_del_vid(struct net_device *ndev, __be16 prot, u16 vid) ...@@ -319,24 +319,23 @@ static int enetc_vlan_rx_del_vid(struct net_device *ndev, __be16 prot, u16 vid)
static void enetc_set_loopback(struct net_device *ndev, bool en) static void enetc_set_loopback(struct net_device *ndev, bool en)
{ {
struct enetc_ndev_priv *priv = netdev_priv(ndev); struct enetc_ndev_priv *priv = netdev_priv(ndev);
struct enetc_hw *hw = &priv->si->hw; struct enetc_si *si = priv->si;
u32 reg; u32 reg;
reg = enetc_port_rd(hw, ENETC_PM0_IF_MODE); reg = enetc_port_mac_rd(si, ENETC_PM0_IF_MODE);
if (reg & ENETC_PM0_IFM_RG) { if (reg & ENETC_PM0_IFM_RG) {
/* RGMII mode */ /* RGMII mode */
reg = (reg & ~ENETC_PM0_IFM_RLP) | reg = (reg & ~ENETC_PM0_IFM_RLP) |
(en ? ENETC_PM0_IFM_RLP : 0); (en ? ENETC_PM0_IFM_RLP : 0);
enetc_port_wr(hw, ENETC_PM0_IF_MODE, reg); enetc_port_mac_wr(si, ENETC_PM0_IF_MODE, reg);
} else { } else {
/* assume SGMII mode */ /* assume SGMII mode */
reg = enetc_port_rd(hw, ENETC_PM0_CMD_CFG); reg = enetc_port_mac_rd(si, ENETC_PM0_CMD_CFG);
reg = (reg & ~ENETC_PM0_CMD_XGLP) | reg = (reg & ~ENETC_PM0_CMD_XGLP) |
(en ? ENETC_PM0_CMD_XGLP : 0); (en ? ENETC_PM0_CMD_XGLP : 0);
reg = (reg & ~ENETC_PM0_CMD_PHY_TX_EN) | reg = (reg & ~ENETC_PM0_CMD_PHY_TX_EN) |
(en ? ENETC_PM0_CMD_PHY_TX_EN : 0); (en ? ENETC_PM0_CMD_PHY_TX_EN : 0);
enetc_port_wr(hw, ENETC_PM0_CMD_CFG, reg); enetc_port_mac_wr(si, ENETC_PM0_CMD_CFG, reg);
enetc_port_wr(hw, ENETC_PM1_CMD_CFG, reg);
} }
} }
...@@ -538,65 +537,50 @@ void enetc_reset_ptcmsdur(struct enetc_hw *hw) ...@@ -538,65 +537,50 @@ void enetc_reset_ptcmsdur(struct enetc_hw *hw)
enetc_port_wr(hw, ENETC_PTCMSDUR(tc), ENETC_MAC_MAXFRM_SIZE); enetc_port_wr(hw, ENETC_PTCMSDUR(tc), ENETC_MAC_MAXFRM_SIZE);
} }
static void enetc_configure_port_mac(struct enetc_hw *hw) static void enetc_configure_port_mac(struct enetc_si *si)
{ {
enetc_port_wr(hw, ENETC_PM0_MAXFRM, struct enetc_hw *hw = &si->hw;
ENETC_SET_MAXFRM(ENETC_RX_MAXFRM_SIZE));
enetc_reset_ptcmsdur(hw); enetc_port_mac_wr(si, ENETC_PM0_MAXFRM,
ENETC_SET_MAXFRM(ENETC_RX_MAXFRM_SIZE));
enetc_port_wr(hw, ENETC_PM0_CMD_CFG, ENETC_PM0_CMD_PHY_TX_EN | enetc_reset_ptcmsdur(hw);
ENETC_PM0_CMD_TXP | ENETC_PM0_PROMISC);
enetc_port_wr(hw, ENETC_PM1_CMD_CFG, ENETC_PM0_CMD_PHY_TX_EN | enetc_port_mac_wr(si, ENETC_PM0_CMD_CFG, ENETC_PM0_CMD_PHY_TX_EN |
ENETC_PM0_CMD_TXP | ENETC_PM0_PROMISC); ENETC_PM0_CMD_TXP | ENETC_PM0_PROMISC);
/* On LS1028A, the MAC RX FIFO defaults to 2, which is too high /* On LS1028A, the MAC RX FIFO defaults to 2, which is too high
* and may lead to RX lock-up under traffic. Set it to 1 instead, * and may lead to RX lock-up under traffic. Set it to 1 instead,
* as recommended by the hardware team. * as recommended by the hardware team.
*/ */
enetc_port_wr(hw, ENETC_PM0_RX_FIFO, ENETC_PM0_RX_FIFO_VAL); enetc_port_mac_wr(si, ENETC_PM0_RX_FIFO, ENETC_PM0_RX_FIFO_VAL);
} }
static void enetc_mac_config(struct enetc_hw *hw, phy_interface_t phy_mode) static void enetc_mac_config(struct enetc_si *si, phy_interface_t phy_mode)
{ {
u32 val; u32 val;
if (phy_interface_mode_is_rgmii(phy_mode)) { if (phy_interface_mode_is_rgmii(phy_mode)) {
val = enetc_port_rd(hw, ENETC_PM0_IF_MODE); val = enetc_port_mac_rd(si, ENETC_PM0_IF_MODE);
val &= ~(ENETC_PM0_IFM_EN_AUTO | ENETC_PM0_IFM_IFMODE_MASK); val &= ~(ENETC_PM0_IFM_EN_AUTO | ENETC_PM0_IFM_IFMODE_MASK);
val |= ENETC_PM0_IFM_IFMODE_GMII | ENETC_PM0_IFM_RG; val |= ENETC_PM0_IFM_IFMODE_GMII | ENETC_PM0_IFM_RG;
enetc_port_wr(hw, ENETC_PM0_IF_MODE, val); enetc_port_mac_wr(si, ENETC_PM0_IF_MODE, val);
} }
if (phy_mode == PHY_INTERFACE_MODE_USXGMII) { if (phy_mode == PHY_INTERFACE_MODE_USXGMII) {
val = ENETC_PM0_IFM_FULL_DPX | ENETC_PM0_IFM_IFMODE_XGMII; val = ENETC_PM0_IFM_FULL_DPX | ENETC_PM0_IFM_IFMODE_XGMII;
enetc_port_wr(hw, ENETC_PM0_IF_MODE, val); enetc_port_mac_wr(si, ENETC_PM0_IF_MODE, val);
} }
} }
static void enetc_mac_enable(struct enetc_hw *hw, bool en) static void enetc_mac_enable(struct enetc_si *si, bool en)
{ {
u32 val = enetc_port_rd(hw, ENETC_PM0_CMD_CFG); u32 val = enetc_port_mac_rd(si, ENETC_PM0_CMD_CFG);
val &= ~(ENETC_PM0_TX_EN | ENETC_PM0_RX_EN); val &= ~(ENETC_PM0_TX_EN | ENETC_PM0_RX_EN);
val |= en ? (ENETC_PM0_TX_EN | ENETC_PM0_RX_EN) : 0; val |= en ? (ENETC_PM0_TX_EN | ENETC_PM0_RX_EN) : 0;
enetc_port_wr(hw, ENETC_PM0_CMD_CFG, val); enetc_port_mac_wr(si, ENETC_PM0_CMD_CFG, val);
enetc_port_wr(hw, ENETC_PM1_CMD_CFG, val);
}
static void enetc_configure_port_pmac(struct enetc_hw *hw)
{
u32 temp;
/* Set pMAC step lock */
temp = enetc_port_rd(hw, ENETC_PFPMR);
enetc_port_wr(hw, ENETC_PFPMR,
temp | ENETC_PFPMR_PMACE | ENETC_PFPMR_MWLM);
temp = enetc_port_rd(hw, ENETC_MMCSR);
enetc_port_wr(hw, ENETC_MMCSR, temp | ENETC_MMCSR_ME);
} }
static void enetc_configure_port(struct enetc_pf *pf) static void enetc_configure_port(struct enetc_pf *pf)
...@@ -604,9 +588,7 @@ static void enetc_configure_port(struct enetc_pf *pf) ...@@ -604,9 +588,7 @@ static void enetc_configure_port(struct enetc_pf *pf)
u8 hash_key[ENETC_RSSHASH_KEY_SIZE]; u8 hash_key[ENETC_RSSHASH_KEY_SIZE];
struct enetc_hw *hw = &pf->si->hw; struct enetc_hw *hw = &pf->si->hw;
enetc_configure_port_pmac(hw); enetc_configure_port_mac(pf->si);
enetc_configure_port_mac(hw);
enetc_port_si_configure(pf->si); enetc_port_si_configure(pf->si);
...@@ -998,14 +980,14 @@ static void enetc_pl_mac_config(struct phylink_config *config, ...@@ -998,14 +980,14 @@ static void enetc_pl_mac_config(struct phylink_config *config,
{ {
struct enetc_pf *pf = phylink_to_enetc_pf(config); struct enetc_pf *pf = phylink_to_enetc_pf(config);
enetc_mac_config(&pf->si->hw, state->interface); enetc_mac_config(pf->si, state->interface);
} }
static void enetc_force_rgmii_mac(struct enetc_hw *hw, int speed, int duplex) static void enetc_force_rgmii_mac(struct enetc_si *si, int speed, int duplex)
{ {
u32 old_val, val; u32 old_val, val;
old_val = val = enetc_port_rd(hw, ENETC_PM0_IF_MODE); old_val = val = enetc_port_mac_rd(si, ENETC_PM0_IF_MODE);
if (speed == SPEED_1000) { if (speed == SPEED_1000) {
val &= ~ENETC_PM0_IFM_SSP_MASK; val &= ~ENETC_PM0_IFM_SSP_MASK;
...@@ -1026,7 +1008,7 @@ static void enetc_force_rgmii_mac(struct enetc_hw *hw, int speed, int duplex) ...@@ -1026,7 +1008,7 @@ static void enetc_force_rgmii_mac(struct enetc_hw *hw, int speed, int duplex)
if (val == old_val) if (val == old_val)
return; return;
enetc_port_wr(hw, ENETC_PM0_IF_MODE, val); enetc_port_mac_wr(si, ENETC_PM0_IF_MODE, val);
} }
static void enetc_pl_mac_link_up(struct phylink_config *config, static void enetc_pl_mac_link_up(struct phylink_config *config,
...@@ -1038,6 +1020,7 @@ static void enetc_pl_mac_link_up(struct phylink_config *config, ...@@ -1038,6 +1020,7 @@ static void enetc_pl_mac_link_up(struct phylink_config *config,
u32 pause_off_thresh = 0, pause_on_thresh = 0; u32 pause_off_thresh = 0, pause_on_thresh = 0;
u32 init_quanta = 0, refresh_quanta = 0; u32 init_quanta = 0, refresh_quanta = 0;
struct enetc_hw *hw = &pf->si->hw; struct enetc_hw *hw = &pf->si->hw;
struct enetc_si *si = pf->si;
struct enetc_ndev_priv *priv; struct enetc_ndev_priv *priv;
u32 rbmr, cmd_cfg; u32 rbmr, cmd_cfg;
int idx; int idx;
...@@ -1049,7 +1032,7 @@ static void enetc_pl_mac_link_up(struct phylink_config *config, ...@@ -1049,7 +1032,7 @@ static void enetc_pl_mac_link_up(struct phylink_config *config,
if (!phylink_autoneg_inband(mode) && if (!phylink_autoneg_inband(mode) &&
phy_interface_mode_is_rgmii(interface)) phy_interface_mode_is_rgmii(interface))
enetc_force_rgmii_mac(hw, speed, duplex); enetc_force_rgmii_mac(si, speed, duplex);
/* Flow control */ /* Flow control */
for (idx = 0; idx < priv->num_rx_rings; idx++) { for (idx = 0; idx < priv->num_rx_rings; idx++) {
...@@ -1085,24 +1068,21 @@ static void enetc_pl_mac_link_up(struct phylink_config *config, ...@@ -1085,24 +1068,21 @@ static void enetc_pl_mac_link_up(struct phylink_config *config,
pause_off_thresh = 1 * ENETC_MAC_MAXFRM_SIZE; pause_off_thresh = 1 * ENETC_MAC_MAXFRM_SIZE;
} }
enetc_port_wr(hw, ENETC_PM0_PAUSE_QUANTA, init_quanta); enetc_port_mac_wr(si, ENETC_PM0_PAUSE_QUANTA, init_quanta);
enetc_port_wr(hw, ENETC_PM1_PAUSE_QUANTA, init_quanta); enetc_port_mac_wr(si, ENETC_PM0_PAUSE_THRESH, refresh_quanta);
enetc_port_wr(hw, ENETC_PM0_PAUSE_THRESH, refresh_quanta);
enetc_port_wr(hw, ENETC_PM1_PAUSE_THRESH, refresh_quanta);
enetc_port_wr(hw, ENETC_PPAUONTR, pause_on_thresh); enetc_port_wr(hw, ENETC_PPAUONTR, pause_on_thresh);
enetc_port_wr(hw, ENETC_PPAUOFFTR, pause_off_thresh); enetc_port_wr(hw, ENETC_PPAUOFFTR, pause_off_thresh);
cmd_cfg = enetc_port_rd(hw, ENETC_PM0_CMD_CFG); cmd_cfg = enetc_port_mac_rd(si, ENETC_PM0_CMD_CFG);
if (rx_pause) if (rx_pause)
cmd_cfg &= ~ENETC_PM0_PAUSE_IGN; cmd_cfg &= ~ENETC_PM0_PAUSE_IGN;
else else
cmd_cfg |= ENETC_PM0_PAUSE_IGN; cmd_cfg |= ENETC_PM0_PAUSE_IGN;
enetc_port_wr(hw, ENETC_PM0_CMD_CFG, cmd_cfg); enetc_port_mac_wr(si, ENETC_PM0_CMD_CFG, cmd_cfg);
enetc_port_wr(hw, ENETC_PM1_CMD_CFG, cmd_cfg);
enetc_mac_enable(hw, true); enetc_mac_enable(si, true);
} }
static void enetc_pl_mac_link_down(struct phylink_config *config, static void enetc_pl_mac_link_down(struct phylink_config *config,
...@@ -1111,7 +1091,7 @@ static void enetc_pl_mac_link_down(struct phylink_config *config, ...@@ -1111,7 +1091,7 @@ static void enetc_pl_mac_link_down(struct phylink_config *config,
{ {
struct enetc_pf *pf = phylink_to_enetc_pf(config); struct enetc_pf *pf = phylink_to_enetc_pf(config);
enetc_mac_enable(&pf->si->hw, false); enetc_mac_enable(pf->si, false);
} }
static const struct phylink_mac_ops enetc_mac_phylink_ops = { static const struct phylink_mac_ops enetc_mac_phylink_ops = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7