Commit cedca418 authored by Linus Walleij's avatar Linus Walleij Committed by David S. Miller

net: gemini: Look up L3 maxlen from table

The code to calculate the hardware register enumerator
for the maximum L3 length isn't entirely simple to read.
Use the existing defines and rewrite the function into a
table look-up.
Acked-by: default avatarMichał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 750c721e
...@@ -401,26 +401,57 @@ static int gmac_setup_phy(struct net_device *netdev) ...@@ -401,26 +401,57 @@ static int gmac_setup_phy(struct net_device *netdev)
return 0; return 0;
} }
static int gmac_pick_rx_max_len(int max_l3_len) /* The maximum frame length is not logically enumerated in the
{ * hardware, so we do a table lookup to find the applicable max
/* index = CONFIG_MAXLEN_XXX values */ * frame length.
static const int max_len[8] = { */
1536, 1518, 1522, 1542, struct gmac_max_framelen {
9212, 10236, 1518, 1518 unsigned int max_l3_len;
}; u8 val;
int i, n = 5; };
max_l3_len += ETH_HLEN + VLAN_HLEN; static const struct gmac_max_framelen gmac_maxlens[] = {
{
.max_l3_len = 1518,
.val = CONFIG0_MAXLEN_1518,
},
{
.max_l3_len = 1522,
.val = CONFIG0_MAXLEN_1522,
},
{
.max_l3_len = 1536,
.val = CONFIG0_MAXLEN_1536,
},
{
.max_l3_len = 1542,
.val = CONFIG0_MAXLEN_1542,
},
{
.max_l3_len = 9212,
.val = CONFIG0_MAXLEN_9k,
},
{
.max_l3_len = 10236,
.val = CONFIG0_MAXLEN_10k,
},
};
static int gmac_pick_rx_max_len(unsigned int max_l3_len)
{
const struct gmac_max_framelen *maxlen;
int maxtot;
int i;
if (max_l3_len > max_len[n]) maxtot = max_l3_len + ETH_HLEN + VLAN_HLEN;
return -1;
for (i = 0; i < 5; i++) { for (i = 0; i < ARRAY_SIZE(gmac_maxlens); i++) {
if (max_len[i] >= max_l3_len && max_len[i] < max_len[n]) maxlen = &gmac_maxlens[i];
n = i; if (maxtot <= maxlen->max_l3_len)
return maxlen->val;
} }
return n; return -1;
} }
static int gmac_init(struct net_device *netdev) static int gmac_init(struct net_device *netdev)
......
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