Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10a435ab authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'aquantia-next' 



Igor Russkikh says:

====================
Aquantia atlantic driver update 2018/01

This patch is a set of cleanups and bugfixes in preparation to new
Aquantia hardware support.

Standard ARRAY_SIZE is now used through all the code,
some unused abstraction structures removed and cleaned up,
duplicate declarations removed.

Also two large declaration styling fixes:
- Hardware register set defines are lined up with kernel style
- Hardware access functions were not prefixed, now already
  defined hw_atl prefix is used.

patch v2 changes:
- patch reorganized because of its big size. New HW support
  will be submitted as a separate patchset.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3b039b42 9ec03bf6

drivers/net/ethernet/aquantia/atlantic/aq_common.h

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
#include <linux/pci.h>



#include "ver.h"

#include "aq_nic.h"

#include "aq_cfg.h"

#include "aq_utils.h"

drivers/net/ethernet/aquantia/atlantic/aq_hw.h

+28 −7
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 * version 2, as published by the Free Software Foundation.

 */



/* File aq_hw.h: Declaraion of abstract interface for NIC hardware specific

/* File aq_hw.h: Declaration of abstract interface for NIC hardware specific

 * functions.

 */
@@ -15,6 +15,8 @@ 
#define AQ_HW_H



#include "aq_common.h"

#include "aq_rss.h"

#include "hw_atl/hw_atl_utils.h"



/* NIC H/W capabilities */

struct aq_hw_caps_s {
@@ -86,13 +88,33 @@ struct aq_stats_s { 


#define AQ_HW_FLAG_ERRORS      (AQ_HW_FLAG_ERR_HW | AQ_HW_FLAG_ERR_UNPLUG)



#define AQ_NIC_FLAGS_IS_NOT_READY (AQ_NIC_FLAG_STOPPING | \

			AQ_NIC_FLAG_RESETTING | AQ_NIC_FLAG_CLOSING | \

			AQ_NIC_FLAG_ERR_UNPLUG | AQ_NIC_FLAG_ERR_HW)



#define AQ_NIC_FLAGS_IS_NOT_TX_READY (AQ_NIC_FLAGS_IS_NOT_READY | \

					AQ_NIC_LINK_DOWN)



struct aq_hw_s {

	struct aq_obj_s header;

	atomic_t flags;

	struct aq_nic_cfg_s *aq_nic_cfg;

	struct aq_pci_func_s *aq_pci_func;

	void __iomem *mmio;

	unsigned int not_ff_addr;

	struct aq_hw_link_status_s aq_link_status;

	struct hw_aq_atl_utils_mbox mbox;

	struct hw_atl_stats_s last_stats;

	struct aq_stats_s curr_stats;

	u64 speed;

	u32 itr_tx;

	u32 itr_rx;

	unsigned int chip_features;

	u32 fw_ver_actual;

	atomic_t dpc;

	u32 mbox_addr;

	u32 rpc_addr;

	u32 rpc_tid;

	struct hw_aq_atl_utils_fw_rpc rpc;

};



struct aq_ring_s;
@@ -102,7 +124,7 @@ struct sk_buff; 


struct aq_hw_ops {

	struct aq_hw_s *(*create)(struct aq_pci_func_s *aq_pci_func,

				  unsigned int port, struct aq_hw_ops *ops);

				  unsigned int port);



	void (*destroy)(struct aq_hw_s *self);
@@ -124,7 +146,6 @@ struct aq_hw_ops { 
				      struct aq_ring_s *aq_ring);



	int (*hw_get_mac_permanent)(struct aq_hw_s *self,

				    struct aq_hw_caps_s *aq_hw_caps,

				    u8 *mac);



	int (*hw_set_mac_address)(struct aq_hw_s *self, u8 *mac_addr);
@@ -135,8 +156,7 @@ struct aq_hw_ops { 


	int (*hw_reset)(struct aq_hw_s *self);



	int (*hw_init)(struct aq_hw_s *self, struct aq_nic_cfg_s *aq_nic_cfg,

		       u8 *mac_addr);

	int (*hw_init)(struct aq_hw_s *self, u8 *mac_addr);



	int (*hw_start)(struct aq_hw_s *self);
@@ -184,7 +204,8 @@ struct aq_hw_ops { 
			       struct aq_rss_parameters *rss_params);



	int (*hw_get_regs)(struct aq_hw_s *self,

			   struct aq_hw_caps_s *aq_hw_caps, u32 *regs_buff);

			   const struct aq_hw_caps_s *aq_hw_caps,

			   u32 *regs_buff);



	int (*hw_update_stats)(struct aq_hw_s *self);

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

+3 −3
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ u32 aq_hw_read_reg(struct aq_hw_s *hw, u32 reg) 
	u32 value = readl(hw->mmio + reg);



	if ((~0U) == value && (~0U) == readl(hw->mmio + hw->not_ff_addr))

		aq_utils_obj_set(&hw->header.flags, AQ_HW_FLAG_ERR_UNPLUG);

		aq_utils_obj_set(&hw->flags, AQ_HW_FLAG_ERR_UNPLUG);



	return value;

}
@@ -54,11 +54,11 @@ int aq_hw_err_from_flags(struct aq_hw_s *hw) 
{

	int err = 0;



	if (aq_utils_obj_test(&hw->header.flags, AQ_HW_FLAG_ERR_UNPLUG)) {

	if (aq_utils_obj_test(&hw->flags, AQ_HW_FLAG_ERR_UNPLUG)) {

		err = -ENXIO;

		goto err_exit;

	}

	if (aq_utils_obj_test(&hw->header.flags, AQ_HW_FLAG_ERR_HW)) {

	if (aq_utils_obj_test(&hw->flags, AQ_HW_FLAG_ERR_HW)) {

		err = -EIO;

		goto err_exit;

	}

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

+14 −82
Original line number Diff line number Diff line
@@ -13,37 +13,32 @@ 
#include "aq_nic.h"

#include "aq_pci_func.h"

#include "aq_ethtool.h"

#include "hw_atl/hw_atl_a0.h"

#include "hw_atl/hw_atl_b0.h"



#include <linux/netdevice.h>

#include <linux/module.h>



static const struct pci_device_id aq_pci_tbl[] = {

	{ PCI_VDEVICE(AQUANTIA, HW_ATL_DEVICE_ID_0001), },

	{ PCI_VDEVICE(AQUANTIA, HW_ATL_DEVICE_ID_D100), },

	{ PCI_VDEVICE(AQUANTIA, HW_ATL_DEVICE_ID_D107), },

	{ PCI_VDEVICE(AQUANTIA, HW_ATL_DEVICE_ID_D108), },

	{ PCI_VDEVICE(AQUANTIA, HW_ATL_DEVICE_ID_D109), },

	{}

};



MODULE_DEVICE_TABLE(pci, aq_pci_tbl);



MODULE_LICENSE("GPL v2");

MODULE_VERSION(AQ_CFG_DRV_VERSION);

MODULE_AUTHOR(AQ_CFG_DRV_AUTHOR);

MODULE_DESCRIPTION(AQ_CFG_DRV_DESC);



static struct aq_hw_ops *aq_pci_probe_get_hw_ops_by_id(struct pci_dev *pdev)

static const struct net_device_ops aq_ndev_ops;



struct net_device *aq_ndev_alloc(void)

{

	struct aq_hw_ops *ops = NULL;

	struct net_device *ndev = NULL;

	struct aq_nic_s *aq_nic = NULL;



	ops = hw_atl_a0_get_ops_by_id(pdev);

	if (!ops)

		ops = hw_atl_b0_get_ops_by_id(pdev);

	ndev = alloc_etherdev_mq(sizeof(struct aq_nic_s), AQ_CFG_VECS_MAX);

	if (!ndev)

		return NULL;



	return ops;

	aq_nic = netdev_priv(ndev);

	aq_nic->ndev = ndev;

	ndev->netdev_ops = &aq_ndev_ops;

	ndev->ethtool_ops = &aq_ethtool_ops;



	return ndev;

}



static int aq_ndev_open(struct net_device *ndev)
@@ -170,66 +165,3 @@ static const struct net_device_ops aq_ndev_ops = { 
	.ndo_set_mac_address = aq_ndev_set_mac_address,

	.ndo_set_features = aq_ndev_set_features

};
 


static int aq_pci_probe(struct pci_dev *pdev,

			const struct pci_device_id *pci_id)

{

	struct aq_hw_ops *aq_hw_ops = NULL;

	struct aq_pci_func_s *aq_pci_func = NULL;

	int err = 0;



	err = pci_enable_device(pdev);

	if (err < 0)

		goto err_exit;

	aq_hw_ops = aq_pci_probe_get_hw_ops_by_id(pdev);

	aq_pci_func = aq_pci_func_alloc(aq_hw_ops, pdev,

					&aq_ndev_ops, &aq_ethtool_ops);

	if (!aq_pci_func) {

		err = -ENOMEM;

		goto err_exit;

	}

	err = aq_pci_func_init(aq_pci_func);

	if (err < 0)

		goto err_exit;



err_exit:

	if (err < 0) {

		if (aq_pci_func)

			aq_pci_func_free(aq_pci_func);

	}

	return err;

}



static void aq_pci_remove(struct pci_dev *pdev)

{

	struct aq_pci_func_s *aq_pci_func = pci_get_drvdata(pdev);



	aq_pci_func_deinit(aq_pci_func);

	aq_pci_func_free(aq_pci_func);

}



static int aq_pci_suspend(struct pci_dev *pdev, pm_message_t pm_msg)

{

	struct aq_pci_func_s *aq_pci_func = pci_get_drvdata(pdev);



	return aq_pci_func_change_pm_state(aq_pci_func, &pm_msg);

}



static int aq_pci_resume(struct pci_dev *pdev)

{

	struct aq_pci_func_s *aq_pci_func = pci_get_drvdata(pdev);

	pm_message_t pm_msg = PMSG_RESTORE;



	return aq_pci_func_change_pm_state(aq_pci_func, &pm_msg);

}



static struct pci_driver aq_pci_ops = {

	.name = AQ_CFG_DRV_NAME,

	.id_table = aq_pci_tbl,

	.probe = aq_pci_probe,

	.remove = aq_pci_remove,

	.suspend = aq_pci_suspend,

	.resume = aq_pci_resume,

};



module_pci_driver(aq_pci_ops);

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

+2 −0
Original line number Diff line number Diff line
@@ -14,4 +14,6 @@ 


#include "aq_common.h"



struct net_device *aq_ndev_alloc(void);



#endif /* AQ_MAIN_H */