Commit 58128fa0 authored by Nikita Danilov's avatar Nikita Danilov Committed by David S. Miller

net: atlantic: add msglevel configuration

We add ethtool msglevel configuration and change some
printouts to use netdev_info set of functions.
Signed-off-by: default avatarNikita Danilov <ndanilov@marvell.com>
Signed-off-by: default avatarIgor Russkikh <irusskikh@marvell.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8aaa112a
...@@ -607,6 +607,20 @@ static int aq_set_ringparam(struct net_device *ndev, ...@@ -607,6 +607,20 @@ static int aq_set_ringparam(struct net_device *ndev,
return err; return err;
} }
static u32 aq_get_msg_level(struct net_device *ndev)
{
struct aq_nic_s *aq_nic = netdev_priv(ndev);
return aq_nic->msg_enable;
}
static void aq_set_msg_level(struct net_device *ndev, u32 data)
{
struct aq_nic_s *aq_nic = netdev_priv(ndev);
aq_nic->msg_enable = data;
}
const struct ethtool_ops aq_ethtool_ops = { const struct ethtool_ops aq_ethtool_ops = {
.get_link = aq_ethtool_get_link, .get_link = aq_ethtool_get_link,
.get_regs_len = aq_ethtool_get_regs_len, .get_regs_len = aq_ethtool_get_regs_len,
...@@ -628,6 +642,8 @@ const struct ethtool_ops aq_ethtool_ops = { ...@@ -628,6 +642,8 @@ const struct ethtool_ops aq_ethtool_ops = {
.set_rxfh = aq_ethtool_set_rss, .set_rxfh = aq_ethtool_set_rss,
.get_rxnfc = aq_ethtool_get_rxnfc, .get_rxnfc = aq_ethtool_get_rxnfc,
.set_rxnfc = aq_ethtool_set_rxnfc, .set_rxnfc = aq_ethtool_set_rxnfc,
.get_msglevel = aq_get_msg_level,
.set_msglevel = aq_set_msg_level,
.get_sset_count = aq_ethtool_get_sset_count, .get_sset_count = aq_ethtool_get_sset_count,
.get_ethtool_stats = aq_ethtool_stats, .get_ethtool_stats = aq_ethtool_stats,
.get_link_ksettings = aq_ethtool_get_link_ksettings, .get_link_ksettings = aq_ethtool_get_link_ksettings,
......
...@@ -144,9 +144,9 @@ static int aq_nic_update_link_status(struct aq_nic_s *self) ...@@ -144,9 +144,9 @@ static int aq_nic_update_link_status(struct aq_nic_s *self)
return err; return err;
if (self->link_status.mbps != self->aq_hw->aq_link_status.mbps) { if (self->link_status.mbps != self->aq_hw->aq_link_status.mbps) {
pr_info("%s: link change old %d new %d\n", netdev_info(self->ndev, "%s: link change old %d new %d\n",
AQ_CFG_DRV_NAME, self->link_status.mbps, AQ_CFG_DRV_NAME, self->link_status.mbps,
self->aq_hw->aq_link_status.mbps); self->aq_hw->aq_link_status.mbps);
aq_nic_update_interrupt_moderation_settings(self); aq_nic_update_interrupt_moderation_settings(self);
if (self->aq_ptp) { if (self->aq_ptp) {
...@@ -306,6 +306,7 @@ void aq_nic_ndev_init(struct aq_nic_s *self) ...@@ -306,6 +306,7 @@ void aq_nic_ndev_init(struct aq_nic_s *self)
self->ndev->priv_flags = aq_hw_caps->hw_priv_flags; self->ndev->priv_flags = aq_hw_caps->hw_priv_flags;
self->ndev->priv_flags |= IFF_LIVE_ADDR_CHANGE; self->ndev->priv_flags |= IFF_LIVE_ADDR_CHANGE;
self->msg_enable = NETIF_MSG_DRV | NETIF_MSG_LINK;
self->ndev->mtu = aq_nic_cfg->mtu - ETH_HLEN; self->ndev->mtu = aq_nic_cfg->mtu - ETH_HLEN;
self->ndev->max_mtu = aq_hw_caps->mtu - ETH_FCS_LEN - ETH_HLEN; self->ndev->max_mtu = aq_hw_caps->mtu - ETH_FCS_LEN - ETH_HLEN;
......
...@@ -88,6 +88,7 @@ struct aq_hw_rx_fltrs_s { ...@@ -88,6 +88,7 @@ struct aq_hw_rx_fltrs_s {
struct aq_nic_s { struct aq_nic_s {
atomic_t flags; atomic_t flags;
u32 msg_enable;
struct aq_vec_s *aq_vec[AQ_CFG_VECS_MAX]; struct aq_vec_s *aq_vec[AQ_CFG_VECS_MAX];
struct aq_ring_s *aq_ring_tx[AQ_CFG_VECS_MAX * AQ_CFG_TCS_MAX]; struct aq_ring_s *aq_ring_tx[AQ_CFG_VECS_MAX * AQ_CFG_TCS_MAX];
struct aq_hw_s *aq_hw; struct aq_hw_s *aq_hw;
......
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