Skip to content

Commit

Permalink
net: thunderx: move filter register related macro into proper place
Browse files Browse the repository at this point in the history
The ThunderX NIC has set of registers which allows to configure
filter policy for ingress packets. There are three possible regimes
of filtering multicasts, broadcasts and unicasts: accept all, reject all
and accept filter allowed only.

Current implementation has enum with all of them and two generic macro
for enabling filtering et all (CAM_ACCEPT) and enabling/disabling
broadcast packets, which also should be corrected in order to represent
register bits properly. All these values are private for driver and
there is no need to ‘publish’ them via header file.

This commit is to move filtering register manipulation values from
header file into source with explicit assignment of exact register
values to them to be used while register configuring.

Signed-off-by: Vadim Lomovtsev <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
Vadim Lomovtsev authored and davem330 committed Apr 1, 2018
1 parent 5e8b270 commit f8ad1f3
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 11 deletions.
13 changes: 13 additions & 0 deletions drivers/net/ethernet/cavium/thunder/thunder_bgx.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,19 @@
#define DRV_NAME "thunder_bgx"
#define DRV_VERSION "1.0"

/* RX_DMAC_CTL configuration */
enum MCAST_MODE {
MCAST_MODE_REJECT = 0x0,
MCAST_MODE_ACCEPT = 0x1,
MCAST_MODE_CAM_FILTER = 0x2,
RSVD = 0x3
};

#define BCAST_ACCEPT BIT(0)
#define CAM_ACCEPT BIT(3)
#define MCAST_MODE_MASK 0x3
#define BGX_MCAST_MODE(x) (x << 1)

struct lmac {
struct bgx *bgx;
int dmac;
Expand Down
11 changes: 0 additions & 11 deletions drivers/net/ethernet/cavium/thunder/thunder_bgx.h
Original file line number Diff line number Diff line change
Expand Up @@ -205,17 +205,6 @@
#define LMAC_INTR_LINK_UP BIT(0)
#define LMAC_INTR_LINK_DOWN BIT(1)

/* RX_DMAC_CTL configuration*/
enum MCAST_MODE {
MCAST_MODE_REJECT,
MCAST_MODE_ACCEPT,
MCAST_MODE_CAM_FILTER,
RSVD
};

#define BCAST_ACCEPT 1
#define CAM_ACCEPT 1

void octeon_mdiobus_force_mod_depencency(void);
void bgx_lmac_rx_tx_enable(int node, int bgx_idx, int lmacid, bool enable);
void bgx_add_dmac_addr(u64 dmac, int node, int bgx_idx, int lmac);
Expand Down

0 comments on commit f8ad1f3

Please sign in to comment.