Commit 380b153c authored by Sebastian Poehn's avatar Sebastian Poehn Committed by David S. Miller

gianfar v2: code cleanups

This patch:
# improves readability of some gianfar nfc code
Signed-off-by: default avatarSebastian Poehn <sebastian.poehn@belden.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2bda8a0c
...@@ -409,6 +409,7 @@ extern const char gfar_driver_version[]; ...@@ -409,6 +409,7 @@ extern const char gfar_driver_version[];
#define RQFCR_HASHTBL_2 0x00060000 #define RQFCR_HASHTBL_2 0x00060000
#define RQFCR_HASHTBL_3 0x00080000 #define RQFCR_HASHTBL_3 0x00080000
#define RQFCR_HASH 0x00010000 #define RQFCR_HASH 0x00010000
#define RQFCR_QUEUE 0x0000FC00
#define RQFCR_CLE 0x00000200 #define RQFCR_CLE 0x00000200
#define RQFCR_RJE 0x00000100 #define RQFCR_RJE 0x00000100
#define RQFCR_AND 0x00000080 #define RQFCR_AND 0x00000080
......
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
#include <linux/mii.h> #include <linux/mii.h>
#include <linux/phy.h> #include <linux/phy.h>
#include <linux/sort.h> #include <linux/sort.h>
#include <linux/if_vlan.h>
#include "gianfar.h" #include "gianfar.h"
...@@ -1051,17 +1052,17 @@ static int gfar_convert_to_filer(struct ethtool_rx_flow_spec *rule, ...@@ -1051,17 +1052,17 @@ static int gfar_convert_to_filer(struct ethtool_rx_flow_spec *rule,
vlan_mask = RQFPR_VLN; vlan_mask = RQFPR_VLN;
/* Separate the fields */ /* Separate the fields */
id = rule->h_ext.vlan_tci & 0xFFF; id = rule->h_ext.vlan_tci & VLAN_VID_MASK;
id_mask = rule->m_ext.vlan_tci & 0xFFF; id_mask = rule->m_ext.vlan_tci & VLAN_VID_MASK;
cfi = (rule->h_ext.vlan_tci >> 12) & 1; cfi = rule->h_ext.vlan_tci & VLAN_CFI_MASK;
cfi_mask = (rule->m_ext.vlan_tci >> 12) & 1; cfi_mask = rule->m_ext.vlan_tci & VLAN_CFI_MASK;
prio = (rule->h_ext.vlan_tci >> 13) & 0x7; prio = (rule->h_ext.vlan_tci & VLAN_PRIO_MASK) >> VLAN_PRIO_SHIFT;
prio_mask = (rule->m_ext.vlan_tci >> 13) & 0x7; prio_mask = (rule->m_ext.vlan_tci & VLAN_PRIO_MASK) >> VLAN_PRIO_SHIFT;
if (cfi == 1 && cfi_mask == 1) { if (cfi == VLAN_TAG_PRESENT && cfi_mask == VLAN_TAG_PRESENT) {
vlan |= RQFPR_CFI; vlan |= RQFPR_CFI;
vlan_mask |= RQFPR_CFI; vlan_mask |= RQFPR_CFI;
} else if (cfi == 0 && cfi_mask == 1) { } else if (cfi != VLAN_TAG_PRESENT && cfi_mask == VLAN_TAG_PRESENT) {
vlan_mask |= RQFPR_CFI; vlan_mask |= RQFPR_CFI;
} }
} }
...@@ -1262,21 +1263,21 @@ static void gfar_cluster_filer(struct filer_table *tab) ...@@ -1262,21 +1263,21 @@ static void gfar_cluster_filer(struct filer_table *tab)
} }
} }
/* Swaps the 0xFF80 masked bits of a1<>a2 and b1<>b2 */ /* Swaps the masked bits of a1<>a2 and b1<>b2 */
static void gfar_swap_ff80_bits(struct gfar_filer_entry *a1, static void gfar_swap_bits(struct gfar_filer_entry *a1,
struct gfar_filer_entry *a2, struct gfar_filer_entry *b1, struct gfar_filer_entry *a2, struct gfar_filer_entry *b1,
struct gfar_filer_entry *b2) struct gfar_filer_entry *b2, u32 mask)
{ {
u32 temp[4]; u32 temp[4];
temp[0] = a1->ctrl & 0xFF80; temp[0] = a1->ctrl & mask;
temp[1] = a2->ctrl & 0xFF80; temp[1] = a2->ctrl & mask;
temp[2] = b1->ctrl & 0xFF80; temp[2] = b1->ctrl & mask;
temp[3] = b2->ctrl & 0xFF80; temp[3] = b2->ctrl & mask;
a1->ctrl &= ~0xFF80; a1->ctrl &= ~mask;
a2->ctrl &= ~0xFF80; a2->ctrl &= ~mask;
b1->ctrl &= ~0xFF80; b1->ctrl &= ~mask;
b2->ctrl &= ~0xFF80; b2->ctrl &= ~mask;
a1->ctrl |= temp[1]; a1->ctrl |= temp[1];
a2->ctrl |= temp[0]; a2->ctrl |= temp[0];
...@@ -1305,7 +1306,7 @@ static u32 gfar_generate_mask_table(struct gfar_mask_entry *mask_table, ...@@ -1305,7 +1306,7 @@ static u32 gfar_generate_mask_table(struct gfar_mask_entry *mask_table,
mask_table[and_index - 1].end = i - 1; mask_table[and_index - 1].end = i - 1;
and_index++; and_index++;
} }
/* cluster starts will be separated because they should /* cluster starts and ends will be separated because they should
* hold their position */ * hold their position */
if (tab->fe[i].ctrl & RQFCR_CLE) if (tab->fe[i].ctrl & RQFCR_CLE)
block_index++; block_index++;
...@@ -1356,10 +1357,13 @@ static void gfar_sort_mask_table(struct gfar_mask_entry *mask_table, ...@@ -1356,10 +1357,13 @@ static void gfar_sort_mask_table(struct gfar_mask_entry *mask_table,
new_first = mask_table[start].start + 1; new_first = mask_table[start].start + 1;
new_last = mask_table[i - 1].end; new_last = mask_table[i - 1].end;
gfar_swap_ff80_bits(&temp_table->fe[new_first], gfar_swap_bits(&temp_table->fe[new_first],
&temp_table->fe[old_first], &temp_table->fe[old_first],
&temp_table->fe[new_last], &temp_table->fe[new_last],
&temp_table->fe[old_last]); &temp_table->fe[old_last],
RQFCR_QUEUE | RQFCR_CLE |
RQFCR_RJE | RQFCR_AND
);
start = i; start = i;
size = 0; size = 0;
......
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