* [PATCH v3] ARM: ep93xx: Use HW MAC filter in ethernet driver
@ 2012-08-21 11:36 Yan Burman
2012-08-25 7:18 ` Ryan Mallon
0 siblings, 1 reply; 2+ messages in thread
From: Yan Burman @ 2012-08-21 11:36 UTC (permalink / raw)
To: linux-arm-kernel
ARM: ep93xx: Use HW MAC filter in ethernet driver
Use HW MAC filtering for broadcasts and multicasts.
Do not always work in promiscuous mode.
Partially based on kernel 2.6.20.4 driver from cirrus logic.
Tested on 9302 and 9315 based boards.
Changes from v2:
* Some more minor style changes
Changes from v1:
* Some minor style fixes
* Use CRC32 code instead of duplicating code
* Fixed multicast reception (tested with omping)
Signed-off-by: Yan Burman <burman.yan@gmail.com>
diff --git a/drivers/net/ethernet/cirrus/Kconfig b/drivers/net/ethernet/cirrus/Kconfig
index 8388e36..b7b154f 100644
--- a/drivers/net/ethernet/cirrus/Kconfig
+++ b/drivers/net/ethernet/cirrus/Kconfig
@@ -46,6 +46,7 @@ config EP93XX_ETH
depends on ARM && ARCH_EP93XX
select NET_CORE
select MII
+ select CRC32
help
This is a driver for the ethernet hardware included in EP93xx CPUs.
Say Y if you are building a kernel for EP93xx based devices.
diff --git a/drivers/net/ethernet/cirrus/ep93xx_eth.c b/drivers/net/ethernet/cirrus/ep93xx_eth.c
index 78c5521..a92a033 100644
--- a/drivers/net/ethernet/cirrus/ep93xx_eth.c
+++ b/drivers/net/ethernet/cirrus/ep93xx_eth.c
@@ -25,6 +25,7 @@
#include <linux/delay.h>
#include <linux/io.h>
#include <linux/slab.h>
+#include <linux/crc32.h>
#include <mach/hardware.h>
@@ -37,8 +38,32 @@
#define MAX_PKT_SIZE 2044
#define PKT_BUF_SIZE 2048
+#define HASH_TBL_ENTRIES 8
+
#define REG_RXCTL 0x0000
-#define REG_RXCTL_DEFAULT 0x00073800
+#define REG_RXCTL_PAUSEA (1 << 20)
+#define REG_RXCTL_RXFCE1 (1 << 19)
+#define REG_RXCTL_RXFCE0 (1 << 18)
+#define REG_RXCTL_BCRC (1 << 17)
+#define REG_RXCTL_SRXON (1 << 16)
+#define REG_RXCTL_RCRCA (1 << 13)
+#define REG_RXCTL_RA (1 << 12)
+#define REG_RXCTL_PA (1 << 11)
+#define REG_RXCTL_BA (1 << 10)
+#define REG_RXCTL_MA (1 << 9)
+#define REG_RXCTL_IAHA (1 << 8)
+#define REG_RXCTL_IA3 (1 << 3)
+#define REG_RXCTL_IA2 (1 << 2)
+#define REG_RXCTL_IA1 (1 << 1)
+#define REG_RXCTL_IA0 (1 << 0)
+#define REG_RXCTL_DEFAULT (REG_RXCTL_BA | \
+ REG_RXCTL_RA | \
+ REG_RXCTL_RCRCA | \
+ REG_RXCTL_SRXON | \
+ REG_RXCTL_BCRC | \
+ REG_RXCTL_RXFCE0 | \
+ REG_RXCTL_IA0)
+
#define REG_TXCTL 0x0004
#define REG_TXCTL_ENABLE 0x00000001
#define REG_MIICMD 0x0010
@@ -57,6 +82,12 @@
#define REG_INTSTS_RX 0x00000004
#define REG_INTSTSC 0x002c
#define REG_AFP 0x004c
+#define REG_AFP_IA0 0
+#define REG_AFP_IA1 1
+#define REG_AFP_IA2 2
+#define REG_AFP_IA3 3
+#define REG_AFP_DTxP 6
+#define REG_AFP_HASH 7
#define REG_INDAD0 0x0050
#define REG_INDAD1 0x0051
#define REG_INDAD2 0x0052
@@ -386,6 +417,51 @@ static int ep93xx_xmit(struct sk_buff *skb, struct net_device *dev)
return NETDEV_TX_OK;
}
+static void ep93xx_set_mcast_tbl(struct net_device *dev, u8 *buf)
+{
+ struct netdev_hw_addr *ha;
+ u32 crc;
+
+ netdev_for_each_mc_addr(ha, dev) {
+ crc = ether_crc_le(ETH_ALEN, ha->addr);
+ buf[crc >> 29] |= (1 << ((crc >> 26) & 7));
+ }
+}
+
+static int ep93xx_ind_addr_write(struct net_device *dev, int afp, char *buf)
+{
+ u32 rxctl;
+ unsigned int i, len;
+ struct ep93xx_priv *ep = netdev_priv(dev);
+
+ switch (afp) {
+ case REG_AFP_IA0:
+ case REG_AFP_IA1:
+ case REG_AFP_IA2:
+ case REG_AFP_IA3:
+ case REG_AFP_DTxP:
+ len = ETH_ALEN;
+ break;
+
+ case REG_AFP_HASH:
+ len = HASH_TBL_ENTRIES;
+ break;
+
+ default:
+ pr_crit("invalid afp value: %d\n", afp);
+ return -EINVAL;
+ }
+
+ rxctl = rdl(ep, REG_RXCTL);
+ wrl(ep, REG_RXCTL, rxctl & ~REG_RXCTL_SRXON);
+ wrl(ep, REG_AFP, afp);
+ for (i = 0; i < len; i++)
+ wrb(ep, REG_INDAD0 + i, buf[i]);
+ wrl(ep, REG_RXCTL, rxctl);
+
+ return 0;
+}
+
static void ep93xx_tx_complete(struct net_device *dev)
{
struct ep93xx_priv *ep = netdev_priv(dev);
@@ -615,13 +691,7 @@ static int ep93xx_start_hw(struct net_device *dev)
wrl(ep, REG_RXDENQ, RX_QUEUE_ENTRIES);
wrl(ep, REG_RXSTSENQ, RX_QUEUE_ENTRIES);
- wrb(ep, REG_INDAD0, dev->dev_addr[0]);
- wrb(ep, REG_INDAD1, dev->dev_addr[1]);
- wrb(ep, REG_INDAD2, dev->dev_addr[2]);
- wrb(ep, REG_INDAD3, dev->dev_addr[3]);
- wrb(ep, REG_INDAD4, dev->dev_addr[4]);
- wrb(ep, REG_INDAD5, dev->dev_addr[5]);
- wrl(ep, REG_AFP, 0);
+ ep93xx_ind_addr_write(dev, REG_AFP_IA0, dev->dev_addr);
wrl(ep, REG_MAXFRMLEN, (MAX_PKT_SIZE << 16) | MAX_PKT_SIZE);
@@ -647,6 +717,30 @@ static void ep93xx_stop_hw(struct net_device *dev)
pr_crit("hw failed to reset\n");
}
+static void ep93xx_set_multicast_list(struct net_device *dev)
+{
+ struct ep93xx_priv *ep = netdev_priv(dev);
+
+ if (dev->flags & IFF_PROMISC) {
+ wrl(ep, REG_RXCTL, REG_RXCTL_PA | rdl(ep, REG_RXCTL));
+ } else if (dev->flags & IFF_ALLMULTI) {
+ wrl(ep, REG_RXCTL, REG_RXCTL_MA |
+ (rdl(ep, REG_RXCTL) & ~REG_RXCTL_PA));
+ ep93xx_ind_addr_write(dev, REG_AFP_HASH,
+ "\xff\xff\xff\xff\xff\xff\xff\xff");
+ } else if (!netdev_mc_empty(dev)) {
+ u8 tbl_multi[HASH_TBL_ENTRIES + 1] = {0};
+
+ ep93xx_set_mcast_tbl(dev, tbl_multi);
+ wrl(ep, REG_RXCTL, REG_RXCTL_MA |
+ (rdl(ep, REG_RXCTL) & ~REG_RXCTL_PA));
+ ep93xx_ind_addr_write(dev, REG_AFP_HASH, tbl_multi);
+ } else {
+ wrl(ep, REG_RXCTL,
+ rdl(ep, REG_RXCTL) & ~(REG_RXCTL_PA | REG_RXCTL_MA));
+ }
+}
+
static int ep93xx_open(struct net_device *dev)
{
struct ep93xx_priv *ep = netdev_priv(dev);
@@ -754,6 +848,7 @@ static const struct net_device_ops ep93xx_netdev_ops = {
.ndo_validate_addr = eth_validate_addr,
.ndo_change_mtu = eth_change_mtu,
.ndo_set_mac_address = eth_mac_addr,
+ .ndo_set_rx_mode = ep93xx_set_multicast_list,
};
static struct net_device *ep93xx_dev_alloc(struct ep93xx_eth_data *data)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH v3] ARM: ep93xx: Use HW MAC filter in ethernet driver
2012-08-21 11:36 [PATCH v3] ARM: ep93xx: Use HW MAC filter in ethernet driver Yan Burman
@ 2012-08-25 7:18 ` Ryan Mallon
0 siblings, 0 replies; 2+ messages in thread
From: Ryan Mallon @ 2012-08-25 7:18 UTC (permalink / raw)
To: linux-arm-kernel
On 21/08/12 21:36, Yan Burman wrote:
> ARM: ep93xx: Use HW MAC filter in ethernet driver
> Use HW MAC filtering for broadcasts and multicasts.
> Do not always work in promiscuous mode.
> Partially based on kernel 2.6.20.4 driver from cirrus logic.
> Tested on 9302 and 9315 based boards.
Hi Yan,
This looks fine to me, but can you please resend and Cc the appropriate
network list and maintainer so they can have a look to please.
Otherwise I am happy to take this in my tree.
Thanks,
~Ryan
>
> Changes from v2:
> * Some more minor style changes
>
> Changes from v1:
> * Some minor style fixes
> * Use CRC32 code instead of duplicating code
> * Fixed multicast reception (tested with omping)
>
> Signed-off-by: Yan Burman <burman.yan@gmail.com>
>
> diff --git a/drivers/net/ethernet/cirrus/Kconfig b/drivers/net/ethernet/cirrus/Kconfig
> index 8388e36..b7b154f 100644
> --- a/drivers/net/ethernet/cirrus/Kconfig
> +++ b/drivers/net/ethernet/cirrus/Kconfig
> @@ -46,6 +46,7 @@ config EP93XX_ETH
> depends on ARM && ARCH_EP93XX
> select NET_CORE
> select MII
> + select CRC32
> help
> This is a driver for the ethernet hardware included in EP93xx CPUs.
> Say Y if you are building a kernel for EP93xx based devices.
> diff --git a/drivers/net/ethernet/cirrus/ep93xx_eth.c b/drivers/net/ethernet/cirrus/ep93xx_eth.c
> index 78c5521..a92a033 100644
> --- a/drivers/net/ethernet/cirrus/ep93xx_eth.c
> +++ b/drivers/net/ethernet/cirrus/ep93xx_eth.c
> @@ -25,6 +25,7 @@
> #include <linux/delay.h>
> #include <linux/io.h>
> #include <linux/slab.h>
> +#include <linux/crc32.h>
>
> #include <mach/hardware.h>
>
> @@ -37,8 +38,32 @@
> #define MAX_PKT_SIZE 2044
> #define PKT_BUF_SIZE 2048
>
> +#define HASH_TBL_ENTRIES 8
> +
> #define REG_RXCTL 0x0000
> -#define REG_RXCTL_DEFAULT 0x00073800
> +#define REG_RXCTL_PAUSEA (1 << 20)
> +#define REG_RXCTL_RXFCE1 (1 << 19)
> +#define REG_RXCTL_RXFCE0 (1 << 18)
> +#define REG_RXCTL_BCRC (1 << 17)
> +#define REG_RXCTL_SRXON (1 << 16)
> +#define REG_RXCTL_RCRCA (1 << 13)
> +#define REG_RXCTL_RA (1 << 12)
> +#define REG_RXCTL_PA (1 << 11)
> +#define REG_RXCTL_BA (1 << 10)
> +#define REG_RXCTL_MA (1 << 9)
> +#define REG_RXCTL_IAHA (1 << 8)
> +#define REG_RXCTL_IA3 (1 << 3)
> +#define REG_RXCTL_IA2 (1 << 2)
> +#define REG_RXCTL_IA1 (1 << 1)
> +#define REG_RXCTL_IA0 (1 << 0)
> +#define REG_RXCTL_DEFAULT (REG_RXCTL_BA | \
> + REG_RXCTL_RA | \
> + REG_RXCTL_RCRCA | \
> + REG_RXCTL_SRXON | \
> + REG_RXCTL_BCRC | \
> + REG_RXCTL_RXFCE0 | \
> + REG_RXCTL_IA0)
> +
> #define REG_TXCTL 0x0004
> #define REG_TXCTL_ENABLE 0x00000001
> #define REG_MIICMD 0x0010
> @@ -57,6 +82,12 @@
> #define REG_INTSTS_RX 0x00000004
> #define REG_INTSTSC 0x002c
> #define REG_AFP 0x004c
> +#define REG_AFP_IA0 0
> +#define REG_AFP_IA1 1
> +#define REG_AFP_IA2 2
> +#define REG_AFP_IA3 3
> +#define REG_AFP_DTxP 6
> +#define REG_AFP_HASH 7
> #define REG_INDAD0 0x0050
> #define REG_INDAD1 0x0051
> #define REG_INDAD2 0x0052
> @@ -386,6 +417,51 @@ static int ep93xx_xmit(struct sk_buff *skb, struct net_device *dev)
> return NETDEV_TX_OK;
> }
>
> +static void ep93xx_set_mcast_tbl(struct net_device *dev, u8 *buf)
> +{
> + struct netdev_hw_addr *ha;
> + u32 crc;
> +
> + netdev_for_each_mc_addr(ha, dev) {
> + crc = ether_crc_le(ETH_ALEN, ha->addr);
> + buf[crc >> 29] |= (1 << ((crc >> 26) & 7));
> + }
> +}
> +
> +static int ep93xx_ind_addr_write(struct net_device *dev, int afp, char *buf)
> +{
> + u32 rxctl;
> + unsigned int i, len;
> + struct ep93xx_priv *ep = netdev_priv(dev);
> +
> + switch (afp) {
> + case REG_AFP_IA0:
> + case REG_AFP_IA1:
> + case REG_AFP_IA2:
> + case REG_AFP_IA3:
> + case REG_AFP_DTxP:
> + len = ETH_ALEN;
> + break;
> +
> + case REG_AFP_HASH:
> + len = HASH_TBL_ENTRIES;
> + break;
> +
> + default:
> + pr_crit("invalid afp value: %d\n", afp);
> + return -EINVAL;
> + }
> +
> + rxctl = rdl(ep, REG_RXCTL);
> + wrl(ep, REG_RXCTL, rxctl & ~REG_RXCTL_SRXON);
> + wrl(ep, REG_AFP, afp);
> + for (i = 0; i < len; i++)
> + wrb(ep, REG_INDAD0 + i, buf[i]);
> + wrl(ep, REG_RXCTL, rxctl);
> +
> + return 0;
> +}
> +
> static void ep93xx_tx_complete(struct net_device *dev)
> {
> struct ep93xx_priv *ep = netdev_priv(dev);
> @@ -615,13 +691,7 @@ static int ep93xx_start_hw(struct net_device *dev)
> wrl(ep, REG_RXDENQ, RX_QUEUE_ENTRIES);
> wrl(ep, REG_RXSTSENQ, RX_QUEUE_ENTRIES);
>
> - wrb(ep, REG_INDAD0, dev->dev_addr[0]);
> - wrb(ep, REG_INDAD1, dev->dev_addr[1]);
> - wrb(ep, REG_INDAD2, dev->dev_addr[2]);
> - wrb(ep, REG_INDAD3, dev->dev_addr[3]);
> - wrb(ep, REG_INDAD4, dev->dev_addr[4]);
> - wrb(ep, REG_INDAD5, dev->dev_addr[5]);
> - wrl(ep, REG_AFP, 0);
> + ep93xx_ind_addr_write(dev, REG_AFP_IA0, dev->dev_addr);
>
> wrl(ep, REG_MAXFRMLEN, (MAX_PKT_SIZE << 16) | MAX_PKT_SIZE);
>
> @@ -647,6 +717,30 @@ static void ep93xx_stop_hw(struct net_device *dev)
> pr_crit("hw failed to reset\n");
> }
>
> +static void ep93xx_set_multicast_list(struct net_device *dev)
> +{
> + struct ep93xx_priv *ep = netdev_priv(dev);
> +
> + if (dev->flags & IFF_PROMISC) {
> + wrl(ep, REG_RXCTL, REG_RXCTL_PA | rdl(ep, REG_RXCTL));
> + } else if (dev->flags & IFF_ALLMULTI) {
> + wrl(ep, REG_RXCTL, REG_RXCTL_MA |
> + (rdl(ep, REG_RXCTL) & ~REG_RXCTL_PA));
> + ep93xx_ind_addr_write(dev, REG_AFP_HASH,
> + "\xff\xff\xff\xff\xff\xff\xff\xff");
> + } else if (!netdev_mc_empty(dev)) {
> + u8 tbl_multi[HASH_TBL_ENTRIES + 1] = {0};
> +
> + ep93xx_set_mcast_tbl(dev, tbl_multi);
> + wrl(ep, REG_RXCTL, REG_RXCTL_MA |
> + (rdl(ep, REG_RXCTL) & ~REG_RXCTL_PA));
> + ep93xx_ind_addr_write(dev, REG_AFP_HASH, tbl_multi);
> + } else {
> + wrl(ep, REG_RXCTL,
> + rdl(ep, REG_RXCTL) & ~(REG_RXCTL_PA | REG_RXCTL_MA));
> + }
> +}
> +
> static int ep93xx_open(struct net_device *dev)
> {
> struct ep93xx_priv *ep = netdev_priv(dev);
> @@ -754,6 +848,7 @@ static const struct net_device_ops ep93xx_netdev_ops = {
> .ndo_validate_addr = eth_validate_addr,
> .ndo_change_mtu = eth_change_mtu,
> .ndo_set_mac_address = eth_mac_addr,
> + .ndo_set_rx_mode = ep93xx_set_multicast_list,
> };
>
> static struct net_device *ep93xx_dev_alloc(struct ep93xx_eth_data *data)
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-08-25 7:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-21 11:36 [PATCH v3] ARM: ep93xx: Use HW MAC filter in ethernet driver Yan Burman
2012-08-25 7:18 ` Ryan Mallon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).