#include int ceph_armor(char *dst, const char *src, const char *end); int ceph_unarmor(char *dst, const char *src, const char *end); /* * base64 encode/decode. */ static const char *pem_key = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; static int encode_bits(int c) { return pem_key[c]; } static int decode_bits(char c) { if (c >= 'A' && c <= 'Z') return c - 'A'; if (c >= 'a' && c <= 'z') return c - 'a' + 26; if (c >= '0' && c <= '9') return c - '0' + 52; if (c == '+') return 62; if (c == '/') return 63; if (c == '=') return 0; /* just non-negative, please */ return -EINVAL; } int ceph_armor(char *dst, const char *src, const char *end) { int olen = 0; int line = 0; while (src < end) { unsigned char a, b, c; a = *src++; *dst++ = encode_bits(a >> 2); if (src < end) { b = *src++; *dst++ = encode_bits(((a & 3) << 4) | (b >> 4)); if (src < end) { c = *src++; *dst++ = encode_bits(((b & 15) << 2) | (c >> 6)); *dst++ = encode_bits(c & 63); } else { *dst++ = encode_bits((b & 15) << 2); *dst++ = '='; } } else { *dst++ = encode_bits(((a & 3) << 4)); *dst++ = '='; *dst++ = '='; } olen += 4; line += 4; if (line == 64) { line = 0; *(dst++) = '\n'; olen++; } } return olen; } int ceph_unarmor(char *dst, const char *src, const char *end) { int olen = 0; while (src < end) { int a, b, c, d; if (src[0] == '\n') { src++; continue; } if (src + 4 > end) return -EINVAL; a = decode_bits(src[0]); b = decode_bits(src[1]); c = decode_bits(src[2]); d = decode_bits(src[3]); if (a < 0 || b < 0 || c < 0 || d < 0) return -EINVAL; *dst++ = (a << 2) | (b >> 4); if (src[2] == '=') return olen + 1; *dst++ = ((b & 15) << 4) | (c >> 2); if (src[3] == '=') return olen + 2; *dst++ = ((c & 3) << 6) | d; olen += 3; src += 4; } return olen; } >diff

diff options

author	Romain Perier <romain.perier@free-electrons.com>	2017-01-30 20:29:33 +0100
committer	David S. Miller <davem@davemloft.net>	2017-01-30 16:50:56 -0500
commit	891daf49b0f6e900af6bde51e2dc2cbc72b83f4e (patch)
tree	c3ece580aad9d789166579fe7cafacc9f4199d4f
parent	cdaf25dfc058ee6f7a7b2e2353de00fa288c0cd4 (diff)

net: dsa: mv88e6xxx: Don't forbid MDIO I/Os for PHY addr >= num_of_ports

Some Marvell ethernet switches have internal ethernet transceivers with hardcoded phy addresses. These addresses can be greater than the number of ports or its value might be different than the associated port number. This is for example the case for MV88E6341 that has 6 ports and internal Port 1 to Port4 PHYs mapped at SMI addresses from 0x11 to 0x14. This commits fixes the issue by removing the condition in MDIO callbacks. Signed-off-by: Romain Perier <romain.perier@free-electrons.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Reviewed-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by: David S. Miller <davem@davemloft.net>

-rw-r--r--

drivers/net/dsa/mv88e6xxx/chip.c

6

1 files changed, 0 insertions, 6 deletions