Commit 5bdbdb82 authored by David S. Miller's avatar David S. Miller

Merge branch 'dpaa2-switch-small-cleanup'

Ioana Ciornei says:

====================
dpaa2-switch: small cleanup

This patch set addresses various low-hanging issues in both dpaa2-switch
and dpaa2-eth drivers.
Unused ABI functions are removed from dpaa2-switch, all the kernel-doc
warnings are fixed up in both drivers and the coding style for the
remaining ABIs is fixed-up a bit.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 91306d1d 4fe72de6
...@@ -13,11 +13,12 @@ ...@@ -13,11 +13,12 @@
/** Key Generator properties */ /** Key Generator properties */
/** /**
* Number of masks per key extraction * DPKG_NUM_OF_MASKS - Number of masks per key extraction
*/ */
#define DPKG_NUM_OF_MASKS 4 #define DPKG_NUM_OF_MASKS 4
/** /**
* Number of extractions per key profile * DPKG_MAX_NUM_OF_EXTRACTS - Number of extractions per key profile
*/ */
#define DPKG_MAX_NUM_OF_EXTRACTS 10 #define DPKG_MAX_NUM_OF_EXTRACTS 10
......
...@@ -83,39 +83,21 @@ int dpmac_get_attributes(struct fsl_mc_io *mc_io, ...@@ -83,39 +83,21 @@ int dpmac_get_attributes(struct fsl_mc_io *mc_io,
u16 token, u16 token,
struct dpmac_attr *attr); struct dpmac_attr *attr);
/** /* DPMAC link configuration/state options */
* DPMAC link configuration/state options
*/
/**
* Enable auto-negotiation
*/
#define DPMAC_LINK_OPT_AUTONEG BIT_ULL(0) #define DPMAC_LINK_OPT_AUTONEG BIT_ULL(0)
/**
* Enable half-duplex mode
*/
#define DPMAC_LINK_OPT_HALF_DUPLEX BIT_ULL(1) #define DPMAC_LINK_OPT_HALF_DUPLEX BIT_ULL(1)
/**
* Enable pause frames
*/
#define DPMAC_LINK_OPT_PAUSE BIT_ULL(2) #define DPMAC_LINK_OPT_PAUSE BIT_ULL(2)
/**
* Enable a-symmetric pause frames
*/
#define DPMAC_LINK_OPT_ASYM_PAUSE BIT_ULL(3) #define DPMAC_LINK_OPT_ASYM_PAUSE BIT_ULL(3)
/** /* Advertised link speeds */
* Advertised link speeds
*/
#define DPMAC_ADVERTISED_10BASET_FULL BIT_ULL(0) #define DPMAC_ADVERTISED_10BASET_FULL BIT_ULL(0)
#define DPMAC_ADVERTISED_100BASET_FULL BIT_ULL(1) #define DPMAC_ADVERTISED_100BASET_FULL BIT_ULL(1)
#define DPMAC_ADVERTISED_1000BASET_FULL BIT_ULL(2) #define DPMAC_ADVERTISED_1000BASET_FULL BIT_ULL(2)
#define DPMAC_ADVERTISED_10000BASET_FULL BIT_ULL(4) #define DPMAC_ADVERTISED_10000BASET_FULL BIT_ULL(4)
#define DPMAC_ADVERTISED_2500BASEX_FULL BIT_ULL(5) #define DPMAC_ADVERTISED_2500BASEX_FULL BIT_ULL(5)
/** /* Advertise auto-negotiation enable */
* Advertise auto-negotiation enable
*/
#define DPMAC_ADVERTISED_AUTONEG BIT_ULL(3) #define DPMAC_ADVERTISED_AUTONEG BIT_ULL(3)
/** /**
......
...@@ -17,6 +17,8 @@ ...@@ -17,6 +17,8 @@
* This function has to be called before the following functions: * This function has to be called before the following functions:
* - dpni_set_rx_tc_dist() * - dpni_set_rx_tc_dist()
* - dpni_set_qos_table() * - dpni_set_qos_table()
*
* Return: '0' on Success; Error code otherwise.
*/ */
int dpni_prepare_key_cfg(const struct dpkg_profile_cfg *cfg, u8 *key_cfg_buf) int dpni_prepare_key_cfg(const struct dpkg_profile_cfg *cfg, u8 *key_cfg_buf)
{ {
...@@ -1793,6 +1795,8 @@ int dpni_get_api_version(struct fsl_mc_io *mc_io, ...@@ -1793,6 +1795,8 @@ int dpni_get_api_version(struct fsl_mc_io *mc_io,
* If cfg.enable is set to 0 the command will clear flow steering table. * If cfg.enable is set to 0 the command will clear flow steering table.
* The packets will be classified according to settings made in * The packets will be classified according to settings made in
* dpni_set_rx_hash_dist() * dpni_set_rx_hash_dist()
*
* Return: '0' on Success; Error code otherwise.
*/ */
int dpni_set_rx_fs_dist(struct fsl_mc_io *mc_io, int dpni_set_rx_fs_dist(struct fsl_mc_io *mc_io,
u32 cmd_flags, u32 cmd_flags,
...@@ -1826,6 +1830,8 @@ int dpni_set_rx_fs_dist(struct fsl_mc_io *mc_io, ...@@ -1826,6 +1830,8 @@ int dpni_set_rx_fs_dist(struct fsl_mc_io *mc_io,
* If cfg.enable is set to 1 the packets will be classified using a hash * If cfg.enable is set to 1 the packets will be classified using a hash
* function based on the key received in cfg.key_cfg_iova parameter. * function based on the key received in cfg.key_cfg_iova parameter.
* If cfg.enable is set to 0 the packets will be sent to the default queue * If cfg.enable is set to 0 the packets will be sent to the default queue
*
* Return: '0' on Success; Error code otherwise.
*/ */
int dpni_set_rx_hash_dist(struct fsl_mc_io *mc_io, int dpni_set_rx_hash_dist(struct fsl_mc_io *mc_io,
u32 cmd_flags, u32 cmd_flags,
......
This diff is collapsed.
...@@ -13,9 +13,6 @@ ...@@ -13,9 +13,6 @@
struct fsl_mc_io; struct fsl_mc_io;
/**
* Number of irq's
*/
#define DPRTC_MAX_IRQ_NUM 1 #define DPRTC_MAX_IRQ_NUM 1
#define DPRTC_IRQ_INDEX 0 #define DPRTC_IRQ_INDEX 0
......
...@@ -75,8 +75,6 @@ ...@@ -75,8 +75,6 @@
#define DPSW_CMDID_FDB_DUMP DPSW_CMD_ID(0x08A) #define DPSW_CMDID_FDB_DUMP DPSW_CMD_ID(0x08A)
#define DPSW_CMDID_IF_GET_PORT_MAC_ADDR DPSW_CMD_ID(0x0A7) #define DPSW_CMDID_IF_GET_PORT_MAC_ADDR DPSW_CMD_ID(0x0A7)
#define DPSW_CMDID_IF_GET_PRIMARY_MAC_ADDR DPSW_CMD_ID(0x0A8)
#define DPSW_CMDID_IF_SET_PRIMARY_MAC_ADDR DPSW_CMD_ID(0x0A9)
#define DPSW_CMDID_CTRL_IF_GET_ATTR DPSW_CMD_ID(0x0A0) #define DPSW_CMDID_CTRL_IF_GET_ATTR DPSW_CMD_ID(0x0A0)
#define DPSW_CMDID_CTRL_IF_SET_POOLS DPSW_CMD_ID(0x0A1) #define DPSW_CMDID_CTRL_IF_SET_POOLS DPSW_CMD_ID(0x0A1)
...@@ -342,7 +340,7 @@ struct dpsw_cmd_vlan_manage_if { ...@@ -342,7 +340,7 @@ struct dpsw_cmd_vlan_manage_if {
__le16 vlan_id; __le16 vlan_id;
__le32 pad1; __le32 pad1;
/* cmd word 1-4 */ /* cmd word 1-4 */
__le64 if_id[4]; __le64 if_id;
}; };
struct dpsw_cmd_vlan_remove { struct dpsw_cmd_vlan_remove {
...@@ -388,7 +386,7 @@ struct dpsw_cmd_fdb_multicast_op { ...@@ -388,7 +386,7 @@ struct dpsw_cmd_fdb_multicast_op {
u8 mac_addr[6]; u8 mac_addr[6];
__le16 pad2; __le16 pad2;
/* cmd word 2-5 */ /* cmd word 2-5 */
__le64 if_id[4]; __le64 if_id;
}; };
struct dpsw_cmd_fdb_dump { struct dpsw_cmd_fdb_dump {
...@@ -443,11 +441,6 @@ struct dpsw_rsp_if_get_mac_addr { ...@@ -443,11 +441,6 @@ struct dpsw_rsp_if_get_mac_addr {
u8 mac_addr[6]; u8 mac_addr[6];
}; };
struct dpsw_cmd_if_set_mac_addr {
__le16 if_id;
u8 mac_addr[6];
};
struct dpsw_cmd_set_egress_flood { struct dpsw_cmd_set_egress_flood {
__le16 fdb_id; __le16 fdb_id;
u8 flood_type; u8 flood_type;
......
This diff is collapsed.
This diff is collapsed.
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