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

Commit 65b342f1 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'Aquantia-atlantic-driver-new-devices-support' 



Igor Russkikh says:

====================
Aquantia atlantic driver new devices support

This patchset introduces a support for new Aquantia hardware:
AQC11x family with updated hardware (B1) and firmware (2.x and 3.x branches).

For that, a number of improvements in overall driver model were done:
 - Firmware specific ops tables. Firmware 2.x and 3.x series support
   functions are now in separate fw2x module.
 - PCI module cleanup and simplification done.
 - Verified and tested hardware reset process.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f9b6ae29 6de97c04

drivers/net/ethernet/aquantia/atlantic/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -39,4 +39,5 @@ atlantic-objs := aq_main.o \ 
	hw_atl/hw_atl_a0.o \

	hw_atl/hw_atl_b0.o \

	hw_atl/hw_atl_utils.o \

	hw_atl/hw_atl_utils_fw2x.o \

	hw_atl/hw_atl_llh.o

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

+7 −1
Original line number Diff line number Diff line
@@ -65,7 +65,13 @@ 


/*#define AQ_CFG_MAC_ADDR_PERMANENT {0x30, 0x0E, 0xE3, 0x12, 0x34, 0x56}*/



#define AQ_CFG_FC_MODE 3U

#define AQ_NIC_FC_OFF    0U

#define AQ_NIC_FC_TX     1U

#define AQ_NIC_FC_RX     2U

#define AQ_NIC_FC_FULL   3U

#define AQ_NIC_FC_AUTO   4U



#define AQ_CFG_FC_MODE AQ_NIC_FC_FULL



#define AQ_CFG_SPEED_MSK  0xFFFFU	/* 0xFFFFU==auto_neg */

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

+38 −0
Original line number Diff line number Diff line
@@ -19,4 +19,42 @@ 
#include "aq_cfg.h"

#include "aq_utils.h"



#define PCI_VENDOR_ID_AQUANTIA  0x1D6A



#define AQ_DEVICE_ID_0001	0x0001

#define AQ_DEVICE_ID_D100	0xD100

#define AQ_DEVICE_ID_D107	0xD107

#define AQ_DEVICE_ID_D108	0xD108

#define AQ_DEVICE_ID_D109	0xD109



#define AQ_DEVICE_ID_AQC100	0x00B1

#define AQ_DEVICE_ID_AQC107	0x07B1

#define AQ_DEVICE_ID_AQC108	0x08B1

#define AQ_DEVICE_ID_AQC109	0x09B1

#define AQ_DEVICE_ID_AQC111	0x11B1

#define AQ_DEVICE_ID_AQC112	0x12B1



#define AQ_DEVICE_ID_AQC100S	0x80B1

#define AQ_DEVICE_ID_AQC107S	0x87B1

#define AQ_DEVICE_ID_AQC108S	0x88B1

#define AQ_DEVICE_ID_AQC109S	0x89B1

#define AQ_DEVICE_ID_AQC111S	0x91B1

#define AQ_DEVICE_ID_AQC112S	0x92B1



#define AQ_DEVICE_ID_AQC111E	0x51B1

#define AQ_DEVICE_ID_AQC112E	0x52B1



#define HW_ATL_NIC_NAME "aQuantia AQtion 10Gbit Network Adapter"



#define AQ_HWREV_ANY	0

#define AQ_HWREV_1	1

#define AQ_HWREV_2	2



#define AQ_NIC_RATE_10G        BIT(0)

#define AQ_NIC_RATE_5G         BIT(1)

#define AQ_NIC_RATE_5GSR       BIT(2)

#define AQ_NIC_RATE_2GS        BIT(3)

#define AQ_NIC_RATE_1G         BIT(4)

#define AQ_NIC_RATE_100M       BIT(5)



#endif /* AQ_COMMON_H */

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

+23 −23
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ struct aq_hw_caps_s { 
	u64 hw_features;

	u64 link_speed_msk;

	unsigned int hw_priv_flags;

	u32 media_type;

	u32 rxds;

	u32 txds;

	u32 txhwb_alignment;
@@ -30,7 +31,7 @@ struct aq_hw_caps_s { 
	u32 vecs;

	u32 mtu;

	u32 mac_regs_count;

	u8 ports;

	u32 hw_alive_check_addr;

	u8 msix_irqs;

	u8 tcs;

	u8 rxd_alignment;
@@ -41,7 +42,6 @@ struct aq_hw_caps_s { 
	u8 rx_rings;

	bool flow_control;

	bool is_64_dma;

	u32 fw_ver_expected;

};



struct aq_hw_link_status_s {
@@ -95,12 +95,15 @@ struct aq_stats_s { 
#define AQ_NIC_FLAGS_IS_NOT_TX_READY (AQ_NIC_FLAGS_IS_NOT_READY | \

					AQ_NIC_LINK_DOWN)



#define AQ_HW_MEDIA_TYPE_TP    1U

#define AQ_HW_MEDIA_TYPE_FIBRE 2U



struct aq_hw_s {

	atomic_t flags;

	u8 rbl_enabled:1;

	struct aq_nic_cfg_s *aq_nic_cfg;

	struct aq_pci_func_s *aq_pci_func;

	const struct aq_fw_ops *aq_fw_ops;

	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;
@@ -119,19 +122,9 @@ struct aq_hw_s { 


struct aq_ring_s;

struct aq_ring_param_s;

struct aq_nic_cfg_s;

struct sk_buff;



struct aq_hw_ops {

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

				  unsigned int port);



	void (*destroy)(struct aq_hw_s *self);



	int (*get_hw_caps)(struct aq_hw_s *self,

			   struct aq_hw_caps_s *aq_hw_caps,

			   unsigned short device,

			   unsigned short subsystem_device);



	int (*hw_ring_tx_xmit)(struct aq_hw_s *self, struct aq_ring_s *aq_ring,

			       unsigned int frags);
@@ -145,15 +138,8 @@ struct aq_hw_ops { 
	int (*hw_ring_tx_head_update)(struct aq_hw_s *self,

				      struct aq_ring_s *aq_ring);



	int (*hw_get_mac_permanent)(struct aq_hw_s *self,

				    u8 *mac);



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



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



	int (*hw_set_link_speed)(struct aq_hw_s *self, u32 speed);



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



	int (*hw_init)(struct aq_hw_s *self, u8 *mac_addr);
@@ -207,8 +193,6 @@ struct aq_hw_ops { 
			   const struct aq_hw_caps_s *aq_hw_caps,

			   u32 *regs_buff);



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



	struct aq_stats_s *(*hw_get_hw_stats)(struct aq_hw_s *self);



	int (*hw_get_fw_version)(struct aq_hw_s *self, u32 *fw_version);
@@ -218,4 +202,20 @@ struct aq_hw_ops { 
	int (*hw_set_power)(struct aq_hw_s *self, unsigned int power_state);

};



struct aq_fw_ops {

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



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



	int (*get_mac_permanent)(struct aq_hw_s *self, u8 *mac);



	int (*set_link_speed)(struct aq_hw_s *self, u32 speed);



	int (*set_state)(struct aq_hw_s *self, enum hal_atl_utils_fw_state_e state);



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



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

};



#endif /* AQ_HW_H */

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

+4 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 


#include "aq_hw_utils.h"

#include "aq_hw.h"

#include "aq_nic.h"



void aq_hw_write_reg_bit(struct aq_hw_s *aq_hw, u32 addr, u32 msk,

			 u32 shift, u32 val)
@@ -39,7 +40,9 @@ 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))

	if ((~0U) == value &&

	    (~0U) == readl(hw->mmio +

			   hw->aq_nic_cfg->aq_hw_caps->hw_alive_check_addr))

		aq_utils_obj_set(&hw->flags, AQ_HW_FLAG_ERR_UNPLUG);



	return value;