Proxmox-Port/linux-loongson
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson synced 2025-09-07 14:19:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

net: stmmac: replace the use_phy_wol field with a flag

Browse Source 
Drop the boolean field of the plat_stmmacenet_data structure in favor of a
simple bitfield flag.

Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Reviewed-by: Andrew Halaney <ahalaney@redhat.com>
Link: https://lore.kernel.org/r/20230710090001.303225-4-brgl@bgdev.pl
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Bartosz Golaszewski 2023-07-10 10:59:52 +02:00 committed by Jakub Kicinski
parent 309efe6eb4
commit fd1d62d80e
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
View File

@ -628,7 +628,7 @@ static int ehl_common_data(struct pci_dev *pdev,
{ {
plat->rx_queues_to_use = 8; plat->rx_queues_to_use = 8;
plat->tx_queues_to_use = 8; plat->tx_queues_to_use = 8;
plat->use_phy_wol = 1; plat->flags |= STMMAC_FLAG_USE_PHY_WOL;
plat->safety_feat_cfg->tsoee = 1; plat->safety_feat_cfg->tsoee = 1;
plat->safety_feat_cfg->mrxpee = 1; plat->safety_feat_cfg->mrxpee = 1;

5
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c
View File

@ -588,7 +588,10 @@ static int mediatek_dwmac_common_data(struct platform_device *pdev,
int i; int i;
plat->interface = priv_plat->phy_mode; plat->interface = priv_plat->phy_mode;
plat->use_phy_wol = priv_plat->mac_wol ? 0 : 1; if (priv_plat->mac_wol)
plat->flags |= STMMAC_FLAG_USE_PHY_WOL;
else
plat->flags &= ~STMMAC_FLAG_USE_PHY_WOL;
plat->riwt_off = 1; plat->riwt_off = 1;
plat->maxmtu = ETH_DATA_LEN; plat->maxmtu = ETH_DATA_LEN;
plat->host_dma_width = priv_plat->variant->dma_bit_mask; plat->host_dma_width = priv_plat->variant->dma_bit_mask;

2
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
View File

@ -6877,7 +6877,7 @@ static int stmmac_hw_init(struct stmmac_priv *priv)
*/ */
priv->plat->enh_desc = priv->dma_cap.enh_desc; priv->plat->enh_desc = priv->dma_cap.enh_desc;
priv->plat->pmt = priv->dma_cap.pmt_remote_wake_up && priv->plat->pmt = priv->dma_cap.pmt_remote_wake_up &&
!priv->plat->use_phy_wol; !(priv->plat->flags & STMMAC_FLAG_USE_PHY_WOL);
priv->hw->pmt = priv->plat->pmt; priv->hw->pmt = priv->plat->pmt;
if (priv->dma_cap.hash_tb_sz) { if (priv->dma_cap.hash_tb_sz) {
priv->hw->multicast_filter_bins = priv->hw->multicast_filter_bins =

2
include/linux/stmmac.h
View File

@ -206,6 +206,7 @@ struct dwmac4_addrs {
#define STMMAC_FLAG_HAS_INTEGRATED_PCS BIT(0) #define STMMAC_FLAG_HAS_INTEGRATED_PCS BIT(0)
#define STMMAC_FLAG_SPH_DISABLE BIT(1) #define STMMAC_FLAG_SPH_DISABLE BIT(1)
#define STMMAC_FLAG_USE_PHY_WOL BIT(2)
struct plat_stmmacenet_data { struct plat_stmmacenet_data {
int bus_id; int bus_id;
@ -292,7 +293,6 @@ struct plat_stmmacenet_data {
int msi_sfty_ue_vec; int msi_sfty_ue_vec;
int msi_rx_base_vec; int msi_rx_base_vec;
int msi_tx_base_vec; int msi_tx_base_vec;
bool use_phy_wol;
bool serdes_up_after_phy_linkup; bool serdes_up_after_phy_linkup;
const struct dwmac4_addrs *dwmac4_addrs; const struct dwmac4_addrs *dwmac4_addrs;
unsigned int flags; unsigned int flags;