Commit 7b0c342f authored by Nikita Danilov's avatar Nikita Danilov Committed by David S. Miller
Browse files

net: atlantic: code style cleanup 



Thats a pure checkpatck walkthrough the code with no functional
changes. Reverse christmas tree, spacing, etc.

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 ea4b4d7f

drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c

+72 −36
Original line number Diff line number Diff line
@@ -18,7 +18,9 @@ static void aq_ethtool_get_regs(struct net_device *ndev, 
				struct ethtool_regs *regs, void *p)

{

	struct aq_nic_s *aq_nic = netdev_priv(ndev);

	u32 regs_count = aq_nic_get_regs_count(aq_nic);

	u32 regs_count;



	regs_count = aq_nic_get_regs_count(aq_nic);



	memset(p, 0, regs_count * sizeof(u32));

	aq_nic_get_regs(aq_nic, regs, p);
@@ -27,7 +29,9 @@ static void aq_ethtool_get_regs(struct net_device *ndev, 
static int aq_ethtool_get_regs_len(struct net_device *ndev)

{

	struct aq_nic_s *aq_nic = netdev_priv(ndev);

	u32 regs_count = aq_nic_get_regs_count(aq_nic);

	u32 regs_count;



	regs_count = aq_nic_get_regs_count(aq_nic);



	return regs_count * sizeof(u32);

}
@@ -104,7 +108,9 @@ static void aq_ethtool_stats(struct net_device *ndev, 
			     struct ethtool_stats *stats, u64 *data)

{

	struct aq_nic_s *aq_nic = netdev_priv(ndev);

	struct aq_nic_cfg_s *cfg = aq_nic_get_cfg(aq_nic);

	struct aq_nic_cfg_s *cfg;



	cfg = aq_nic_get_cfg(aq_nic);



	memset(data, 0, (ARRAY_SIZE(aq_ethtool_stat_names) +

			 ARRAY_SIZE(aq_ethtool_queue_stat_names) *
@@ -115,11 +121,15 @@ static void aq_ethtool_stats(struct net_device *ndev, 
static void aq_ethtool_get_drvinfo(struct net_device *ndev,

				   struct ethtool_drvinfo *drvinfo)

{

	struct aq_nic_s *aq_nic = netdev_priv(ndev);

	struct aq_nic_cfg_s *cfg = aq_nic_get_cfg(aq_nic);

	struct pci_dev *pdev = to_pci_dev(ndev->dev.parent);

	u32 firmware_version = aq_nic_get_fw_version(aq_nic);

	u32 regs_count = aq_nic_get_regs_count(aq_nic);

	struct aq_nic_s *aq_nic = netdev_priv(ndev);

	struct aq_nic_cfg_s *cfg;

	u32 firmware_version;

	u32 regs_count;



	cfg = aq_nic_get_cfg(aq_nic);

	firmware_version = aq_nic_get_fw_version(aq_nic);

	regs_count = aq_nic_get_regs_count(aq_nic);



	strlcat(drvinfo->driver, AQ_CFG_DRV_NAME, sizeof(drvinfo->driver));

	strlcat(drvinfo->version, AQ_CFG_DRV_VERSION, sizeof(drvinfo->version));
@@ -140,10 +150,12 @@ static void aq_ethtool_get_drvinfo(struct net_device *ndev, 
static void aq_ethtool_get_strings(struct net_device *ndev,

				   u32 stringset, u8 *data)

{

	int i, si;

	struct aq_nic_s *aq_nic = netdev_priv(ndev);

	struct aq_nic_cfg_s *cfg = aq_nic_get_cfg(aq_nic);

	struct aq_nic_cfg_s *cfg;

	u8 *p = data;

	int i, si;



	cfg = aq_nic_get_cfg(aq_nic);



	switch (stringset) {

	case ETH_SS_STATS:
@@ -198,9 +210,11 @@ static int aq_ethtool_set_phys_id(struct net_device *ndev, 


static int aq_ethtool_get_sset_count(struct net_device *ndev, int stringset)

{

	int ret = 0;

	struct aq_nic_s *aq_nic = netdev_priv(ndev);

	struct aq_nic_cfg_s *cfg = aq_nic_get_cfg(aq_nic);

	struct aq_nic_cfg_s *cfg;

	int ret = 0;



	cfg = aq_nic_get_cfg(aq_nic);



	switch (stringset) {

	case ETH_SS_STATS:
@@ -213,6 +227,7 @@ static int aq_ethtool_get_sset_count(struct net_device *ndev, int stringset) 
	default:

		ret = -EOPNOTSUPP;

	}



	return ret;

}
@@ -224,7 +239,9 @@ static u32 aq_ethtool_get_rss_indir_size(struct net_device *ndev) 
static u32 aq_ethtool_get_rss_key_size(struct net_device *ndev)

{

	struct aq_nic_s *aq_nic = netdev_priv(ndev);

	struct aq_nic_cfg_s *cfg = aq_nic_get_cfg(aq_nic);

	struct aq_nic_cfg_s *cfg;



	cfg = aq_nic_get_cfg(aq_nic);



	return sizeof(cfg->aq_rss.hash_secret_key);

}
@@ -233,9 +250,11 @@ static int aq_ethtool_get_rss(struct net_device *ndev, u32 *indir, u8 *key, 
			      u8 *hfunc)

{

	struct aq_nic_s *aq_nic = netdev_priv(ndev);

	struct aq_nic_cfg_s *cfg = aq_nic_get_cfg(aq_nic);

	struct aq_nic_cfg_s *cfg;

	unsigned int i = 0U;



	cfg = aq_nic_get_cfg(aq_nic);



	if (hfunc)

		*hfunc = ETH_RSS_HASH_TOP; /* Toeplitz */

	if (indir) {
@@ -245,6 +264,7 @@ static int aq_ethtool_get_rss(struct net_device *ndev, u32 *indir, u8 *key, 
	if (key)

		memcpy(key, cfg->aq_rss.hash_secret_key,

		       sizeof(cfg->aq_rss.hash_secret_key));



	return 0;

}
@@ -288,9 +308,11 @@ static int aq_ethtool_get_rxnfc(struct net_device *ndev, 
				u32 *rule_locs)

{

	struct aq_nic_s *aq_nic = netdev_priv(ndev);

	struct aq_nic_cfg_s *cfg = aq_nic_get_cfg(aq_nic);

	struct aq_nic_cfg_s *cfg;

	int err = 0;



	cfg = aq_nic_get_cfg(aq_nic);



	switch (cmd->cmd) {

	case ETHTOOL_GRXRINGS:

		cmd->data = cfg->vecs;
@@ -315,8 +337,8 @@ static int aq_ethtool_get_rxnfc(struct net_device *ndev, 
static int aq_ethtool_set_rxnfc(struct net_device *ndev,

				struct ethtool_rxnfc *cmd)

{

	int err = 0;

	struct aq_nic_s *aq_nic = netdev_priv(ndev);

	int err = 0;



	switch (cmd->cmd) {

	case ETHTOOL_SRXCLSRLINS:
@@ -337,7 +359,9 @@ static int aq_ethtool_get_coalesce(struct net_device *ndev, 
				   struct ethtool_coalesce *coal)

{

	struct aq_nic_s *aq_nic = netdev_priv(ndev);

	struct aq_nic_cfg_s *cfg = aq_nic_get_cfg(aq_nic);

	struct aq_nic_cfg_s *cfg;



	cfg = aq_nic_get_cfg(aq_nic);



	if (cfg->itr == AQ_CFG_INTERRUPT_MODERATION_ON ||

	    cfg->itr == AQ_CFG_INTERRUPT_MODERATION_AUTO) {
@@ -351,6 +375,7 @@ static int aq_ethtool_get_coalesce(struct net_device *ndev, 
		coal->rx_max_coalesced_frames = 1;

		coal->tx_max_coalesced_frames = 1;

	}



	return 0;

}
@@ -358,7 +383,9 @@ static int aq_ethtool_set_coalesce(struct net_device *ndev, 
				   struct ethtool_coalesce *coal)

{

	struct aq_nic_s *aq_nic = netdev_priv(ndev);

	struct aq_nic_cfg_s *cfg = aq_nic_get_cfg(aq_nic);

	struct aq_nic_cfg_s *cfg;



	cfg = aq_nic_get_cfg(aq_nic);



	/* This is not yet supported

	 */
@@ -400,7 +427,9 @@ static void aq_ethtool_get_wol(struct net_device *ndev, 
			       struct ethtool_wolinfo *wol)

{

	struct aq_nic_s *aq_nic = netdev_priv(ndev);

	struct aq_nic_cfg_s *cfg = aq_nic_get_cfg(aq_nic);

	struct aq_nic_cfg_s *cfg;



	cfg = aq_nic_get_cfg(aq_nic);



	wol->supported = AQ_NIC_WOL_MODES;

	wol->wolopts = cfg->wol;
@@ -411,9 +440,11 @@ static int aq_ethtool_set_wol(struct net_device *ndev, 
{

	struct pci_dev *pdev = to_pci_dev(ndev->dev.parent);

	struct aq_nic_s *aq_nic = netdev_priv(ndev);

	struct aq_nic_cfg_s *cfg = aq_nic_get_cfg(aq_nic);

	struct aq_nic_cfg_s *cfg;

	int err = 0;



	cfg = aq_nic_get_cfg(aq_nic);



	if (wol->wolopts & ~AQ_NIC_WOL_MODES)

		return -EOPNOTSUPP;
@@ -599,23 +630,28 @@ static void aq_get_ringparam(struct net_device *ndev, 
			     struct ethtool_ringparam *ring)

{

	struct aq_nic_s *aq_nic = netdev_priv(ndev);

	struct aq_nic_cfg_s *aq_nic_cfg = aq_nic_get_cfg(aq_nic);

	struct aq_nic_cfg_s *cfg;



	cfg = aq_nic_get_cfg(aq_nic);



	ring->rx_pending = aq_nic_cfg->rxds;

	ring->tx_pending = aq_nic_cfg->txds;

	ring->rx_pending = cfg->rxds;

	ring->tx_pending = cfg->txds;



	ring->rx_max_pending = aq_nic_cfg->aq_hw_caps->rxds_max;

	ring->tx_max_pending = aq_nic_cfg->aq_hw_caps->txds_max;

	ring->rx_max_pending = cfg->aq_hw_caps->rxds_max;

	ring->tx_max_pending = cfg->aq_hw_caps->txds_max;

}



static int aq_set_ringparam(struct net_device *ndev,

			    struct ethtool_ringparam *ring)

{

	int err = 0;

	bool ndev_running = false;

	struct aq_nic_s *aq_nic = netdev_priv(ndev);

	struct aq_nic_cfg_s *aq_nic_cfg = aq_nic_get_cfg(aq_nic);

	const struct aq_hw_caps_s *hw_caps = aq_nic_cfg->aq_hw_caps;

	const struct aq_hw_caps_s *hw_caps;

	bool ndev_running = false;

	struct aq_nic_cfg_s *cfg;

	int err = 0;



	cfg = aq_nic_get_cfg(aq_nic);

	hw_caps = cfg->aq_hw_caps;



	if (ring->rx_mini_pending || ring->rx_jumbo_pending) {

		err = -EOPNOTSUPP;
@@ -629,18 +665,18 @@ static int aq_set_ringparam(struct net_device *ndev, 


	aq_nic_free_vectors(aq_nic);



	aq_nic_cfg->rxds = max(ring->rx_pending, hw_caps->rxds_min);

	aq_nic_cfg->rxds = min(aq_nic_cfg->rxds, hw_caps->rxds_max);

	aq_nic_cfg->rxds = ALIGN(aq_nic_cfg->rxds, AQ_HW_RXD_MULTIPLE);

	cfg->rxds = max(ring->rx_pending, hw_caps->rxds_min);

	cfg->rxds = min(cfg->rxds, hw_caps->rxds_max);

	cfg->rxds = ALIGN(cfg->rxds, AQ_HW_RXD_MULTIPLE);



	aq_nic_cfg->txds = max(ring->tx_pending, hw_caps->txds_min);

	aq_nic_cfg->txds = min(aq_nic_cfg->txds, hw_caps->txds_max);

	aq_nic_cfg->txds = ALIGN(aq_nic_cfg->txds, AQ_HW_TXD_MULTIPLE);

	cfg->txds = max(ring->tx_pending, hw_caps->txds_min);

	cfg->txds = min(cfg->txds, hw_caps->txds_max);

	cfg->txds = ALIGN(cfg->txds, AQ_HW_TXD_MULTIPLE);



	for (aq_nic->aq_vecs = 0; aq_nic->aq_vecs < aq_nic_cfg->vecs;

	for (aq_nic->aq_vecs = 0; aq_nic->aq_vecs < cfg->vecs;

	     aq_nic->aq_vecs++) {

		aq_nic->aq_vec[aq_nic->aq_vecs] =

		    aq_vec_alloc(aq_nic, aq_nic->aq_vecs, aq_nic_cfg);

		    aq_vec_alloc(aq_nic, aq_nic->aq_vecs, cfg);

		if (unlikely(!aq_nic->aq_vec[aq_nic->aq_vecs])) {

			err = -ENOMEM;

			goto err_exit;

drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.c

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ u64 aq_hw_read_reg64(struct aq_hw_s *hw, u32 reg) 
	u64 value = aq_hw_read_reg(hw, reg);



	value |= (u64)aq_hw_read_reg(hw, reg + 4) << 32;



	return value;

}

drivers/net/ethernet/aquantia/atlantic/aq_main.c

+7 −4
Original line number Diff line number Diff line
@@ -53,8 +53,8 @@ struct net_device *aq_ndev_alloc(void) 


static int aq_ndev_open(struct net_device *ndev)

{

	int err = 0;

	struct aq_nic_s *aq_nic = netdev_priv(ndev);

	int err = 0;



	err = aq_nic_init(aq_nic);

	if (err < 0)
@@ -75,13 +75,14 @@ static int aq_ndev_open(struct net_device *ndev) 
err_exit:

	if (err < 0)

		aq_nic_deinit(aq_nic, true);



	return err;

}



static int aq_ndev_close(struct net_device *ndev)

{

	int err = 0;

	struct aq_nic_s *aq_nic = netdev_priv(ndev);

	int err = 0;



	err = aq_nic_stop(aq_nic);

	if (err < 0)
@@ -120,7 +121,9 @@ static int aq_ndev_start_xmit(struct sk_buff *skb, struct net_device *ndev) 
static int aq_ndev_change_mtu(struct net_device *ndev, int new_mtu)

{

	struct aq_nic_s *aq_nic = netdev_priv(ndev);

	int err = aq_nic_set_mtu(aq_nic, new_mtu + ETH_HLEN);

	int err;



	err = aq_nic_set_mtu(aq_nic, new_mtu + ETH_HLEN);



	if (err < 0)

		goto err_exit;
@@ -133,8 +136,8 @@ err_exit: 
static int aq_ndev_set_features(struct net_device *ndev,

				netdev_features_t features)

{

	bool is_vlan_rx_strip = !!(features & NETIF_F_HW_VLAN_CTAG_RX);

	bool is_vlan_tx_insert = !!(features & NETIF_F_HW_VLAN_CTAG_TX);

	bool is_vlan_rx_strip = !!(features & NETIF_F_HW_VLAN_CTAG_RX);

	struct aq_nic_s *aq_nic = netdev_priv(ndev);

	bool need_ndev_restart = false;

	struct aq_nic_cfg_s *aq_cfg;

drivers/net/ethernet/aquantia/atlantic/aq_nic.c

+23 −16
Original line number Diff line number Diff line
@@ -41,10 +41,6 @@ static void aq_nic_update_ndev_stats(struct aq_nic_s *self); 


static void aq_nic_rss_init(struct aq_nic_s *self, unsigned int num_rss_queues)

{

	struct aq_nic_cfg_s *cfg = &self->aq_nic_cfg;

	struct aq_rss_parameters *rss_params = &cfg->aq_rss;

	int i = 0;



	static u8 rss_key[AQ_CFG_RSS_HASHKEY_SIZE] = {

		0x1e, 0xad, 0x71, 0x87, 0x65, 0xfc, 0x26, 0x7d,

		0x0d, 0x45, 0x67, 0x74, 0xcd, 0x06, 0x1a, 0x18,
@@ -52,6 +48,11 @@ static void aq_nic_rss_init(struct aq_nic_s *self, unsigned int num_rss_queues) 
		0x19, 0x13, 0x4b, 0xa9, 0xd0, 0x3e, 0xfe, 0x70,

		0x25, 0x03, 0xab, 0x50, 0x6a, 0x8b, 0x82, 0x0c

	};

	struct aq_nic_cfg_s *cfg = &self->aq_nic_cfg;

	struct aq_rss_parameters *rss_params;

	int i = 0;



	rss_params = &cfg->aq_rss;



	rss_params->hash_secret_key_size = sizeof(rss_key);

	memcpy(rss_params->hash_secret_key, rss_key, sizeof(rss_key));
@@ -180,6 +181,7 @@ static int aq_nic_update_link_status(struct aq_nic_s *self) 
		netif_tx_disable(self->ndev);

		aq_utils_obj_set(&self->flags, AQ_NIC_LINK_DOWN);

	}



	return 0;

}
@@ -194,6 +196,7 @@ static irqreturn_t aq_linkstate_threaded_isr(int irq, void *private) 


	self->aq_hw_ops->hw_irq_enable(self->aq_hw,

				       BIT(self->aq_nic_cfg.link_irq_vec));



	return IRQ_HANDLED;

}
@@ -224,7 +227,8 @@ static void aq_nic_service_timer_cb(struct timer_list *t) 
{

	struct aq_nic_s *self = from_timer(self, t, service_timer);



	mod_timer(&self->service_timer, jiffies + AQ_CFG_SERVICE_TIMER_INTERVAL);

	mod_timer(&self->service_timer,

		  jiffies + AQ_CFG_SERVICE_TIMER_INTERVAL);



	aq_ndev_schedule_work(&self->service_task);

}
@@ -326,8 +330,8 @@ struct net_device *aq_nic_get_ndev(struct aq_nic_s *self) 
int aq_nic_init(struct aq_nic_s *self)

{

	struct aq_vec_s *aq_vec = NULL;

	int err = 0;

	unsigned int i = 0U;

	int err = 0;



	self->power_state = AQ_HW_POWER_STATE_D0;

	mutex_lock(&self->fwreq_mutex);
@@ -371,8 +375,8 @@ err_exit: 
int aq_nic_start(struct aq_nic_s *self)

{

	struct aq_vec_s *aq_vec = NULL;

	int err = 0;

	unsigned int i = 0U;

	int err = 0;



	err = self->aq_hw_ops->hw_multicast_list_set(self->aq_hw,

						     self->mc_list.ar,
@@ -464,14 +468,16 @@ err_exit: 
unsigned int aq_nic_map_skb(struct aq_nic_s *self, struct sk_buff *skb,

			    struct aq_ring_s *ring)

{

	unsigned int ret = 0U;

	unsigned int nr_frags = skb_shinfo(skb)->nr_frags;

	unsigned int frag_count = 0U;

	unsigned int dx = ring->sw_tail;

	struct aq_ring_buff_s *first = NULL;

	struct aq_ring_buff_s *dx_buff = &ring->buff_ring[dx];

	struct aq_ring_buff_s *dx_buff;

	bool need_context_tag = false;

	unsigned int frag_count = 0U;

	unsigned int ret = 0U;

	unsigned int dx;



	dx = ring->sw_tail;

	dx_buff = &ring->buff_ring[dx];

	dx_buff->flags = 0U;



	if (unlikely(skb_is_gso(skb))) {
@@ -610,11 +616,11 @@ exit: 


int aq_nic_xmit(struct aq_nic_s *self, struct sk_buff *skb)

{

	unsigned int vec = skb->queue_mapping % self->aq_nic_cfg.vecs;

	struct aq_ring_s *ring = NULL;

	unsigned int frags = 0U;

	unsigned int vec = skb->queue_mapping % self->aq_nic_cfg.vecs;

	unsigned int tc = 0U;

	int err = NETDEV_TX_OK;

	unsigned int tc = 0U;



	frags = skb_shinfo(skb)->nr_frags + 1;
@@ -712,6 +718,7 @@ int aq_nic_set_multicast_list(struct aq_nic_s *self, struct net_device *ndev) 
		if (err < 0)

			return err;

	}



	return aq_nic_set_packet_filter(self, packet_filter);

}
@@ -756,10 +763,10 @@ int aq_nic_get_regs_count(struct aq_nic_s *self) 


void aq_nic_get_stats(struct aq_nic_s *self, u64 *data)

{

	unsigned int i = 0U;

	unsigned int count = 0U;

	struct aq_vec_s *aq_vec = NULL;

	struct aq_stats_s *stats;

	unsigned int count = 0U;

	unsigned int i = 0U;



	if (self->aq_fw_ops->update_stats) {

		mutex_lock(&self->fwreq_mutex);
@@ -809,8 +816,8 @@ err_exit:; 


static void aq_nic_update_ndev_stats(struct aq_nic_s *self)

{

	struct net_device *ndev = self->ndev;

	struct aq_stats_s *stats = self->aq_hw_ops->hw_get_hw_stats(self->aq_hw);

	struct net_device *ndev = self->ndev;



	ndev->stats.rx_packets = stats->dma_pkt_rc;

	ndev->stats.rx_bytes = stats->dma_oct_rc;

drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c

+5 −3
Original line number Diff line number Diff line
@@ -185,6 +185,7 @@ unsigned int aq_pci_func_get_irq_type(struct aq_nic_s *self) 
		return AQ_HW_IRQ_MSIX;

	if (self->pdev->msi_enabled)

		return AQ_HW_IRQ_MSI;



	return AQ_HW_IRQ_LEGACY;

}
@@ -196,12 +197,12 @@ static void aq_pci_free_irq_vectors(struct aq_nic_s *self) 
static int aq_pci_probe(struct pci_dev *pdev,

			const struct pci_device_id *pci_id)

{

	struct aq_nic_s *self;

	int err;

	struct net_device *ndev;

	resource_size_t mmio_pa;

	u32 bar;

	struct aq_nic_s *self;

	u32 numvecs;

	u32 bar;

	int err;



	err = pci_enable_device(pdev);

	if (err)
@@ -311,6 +312,7 @@ err_ndev: 
	pci_release_regions(pdev);

err_pci_func:

	pci_disable_device(pdev);



	return err;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE