mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-14 06:35:12 +00:00
net: stmmac: replace the use_phy_wol field with a flag
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:
parent
309efe6eb4
commit
fd1d62d80e
4 changed files with 7 additions and 4 deletions
|
@ -628,7 +628,7 @@ static int ehl_common_data(struct pci_dev *pdev,
|
|||
{
|
||||
plat->rx_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->mrxpee = 1;
|
||||
|
|
|
@ -588,7 +588,10 @@ static int mediatek_dwmac_common_data(struct platform_device *pdev,
|
|||
int i;
|
||||
|
||||
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->maxmtu = ETH_DATA_LEN;
|
||||
plat->host_dma_width = priv_plat->variant->dma_bit_mask;
|
||||
|
|
|
@ -6877,7 +6877,7 @@ static int stmmac_hw_init(struct stmmac_priv *priv)
|
|||
*/
|
||||
priv->plat->enh_desc = priv->dma_cap.enh_desc;
|
||||
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;
|
||||
if (priv->dma_cap.hash_tb_sz) {
|
||||
priv->hw->multicast_filter_bins =
|
||||
|
|
|
@ -206,6 +206,7 @@ struct dwmac4_addrs {
|
|||
|
||||
#define STMMAC_FLAG_HAS_INTEGRATED_PCS BIT(0)
|
||||
#define STMMAC_FLAG_SPH_DISABLE BIT(1)
|
||||
#define STMMAC_FLAG_USE_PHY_WOL BIT(2)
|
||||
|
||||
struct plat_stmmacenet_data {
|
||||
int bus_id;
|
||||
|
@ -292,7 +293,6 @@ struct plat_stmmacenet_data {
|
|||
int msi_sfty_ue_vec;
|
||||
int msi_rx_base_vec;
|
||||
int msi_tx_base_vec;
|
||||
bool use_phy_wol;
|
||||
bool serdes_up_after_phy_linkup;
|
||||
const struct dwmac4_addrs *dwmac4_addrs;
|
||||
unsigned int flags;
|
||||
|
|
Loading…
Reference in a new issue