* [PATCH 02/11] net: axienet: Add ioctl support
2012-10-04 18:14 [PATCH 01/11] net: axienet: Remove NETIF_F_SG dropping for no checksum feature Michal Simek
@ 2012-10-04 18:14 ` Michal Simek
2012-10-04 19:17 ` Ben Hutchings
2012-10-04 18:14 ` [PATCH 03/11] net: axienet: Do not use NO_IRQ Michal Simek
` (9 subsequent siblings)
10 siblings, 1 reply; 26+ messages in thread
From: Michal Simek @ 2012-10-04 18:14 UTC (permalink / raw)
To: netdev
Cc: linux-kernel, Michal Simek, Anirudha Sarangi, John Linn,
Grant Likely, Rob Herring, David S. Miller
Allow user to access the MDIO from userspace.
Signed-off-by: Michal Simek <monstr@monstr.eu>
CC: Anirudha Sarangi <anirudh@xilinx.com>
CC: John Linn <John.Linn@xilinx.com>
CC: Grant Likely <grant.likely@secretlab.ca>
CC: Rob Herring <rob.herring@calxeda.com>
CC: David S. Miller <davem@davemloft.net>
---
drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
index 50167ab..a5b41cd 100644
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
@@ -1053,6 +1053,20 @@ static void axienet_poll_controller(struct net_device *ndev)
}
#endif
+/* Ioctl MII Interface */
+static int axienet_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
+{
+ struct axienet_local *priv = netdev_priv(dev);
+
+ if (!netif_running(dev))
+ return -EINVAL;
+
+ if (!priv->phy_dev)
+ return -ENODEV;
+
+ return phy_mii_ioctl(priv->phy_dev, rq, cmd);
+}
+
static const struct net_device_ops axienet_netdev_ops = {
.ndo_open = axienet_open,
.ndo_stop = axienet_stop,
@@ -1061,6 +1075,7 @@ static const struct net_device_ops axienet_netdev_ops = {
.ndo_set_mac_address = netdev_set_mac_address,
.ndo_validate_addr = eth_validate_addr,
.ndo_set_rx_mode = axienet_set_multicast_list,
+ .ndo_do_ioctl = axienet_ioctl,
#ifdef CONFIG_NET_POLL_CONTROLLER
.ndo_poll_controller = axienet_poll_controller,
#endif
--
1.7.0.4
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH 02/11] net: axienet: Add ioctl support
2012-10-04 18:14 ` [PATCH 02/11] net: axienet: Add ioctl support Michal Simek
@ 2012-10-04 19:17 ` Ben Hutchings
2012-10-05 5:54 ` Michal Simek
0 siblings, 1 reply; 26+ messages in thread
From: Ben Hutchings @ 2012-10-04 19:17 UTC (permalink / raw)
To: Michal Simek
Cc: netdev, linux-kernel, Anirudha Sarangi, John Linn, Grant Likely,
Rob Herring, David S. Miller
On Thu, 2012-10-04 at 20:14 +0200, Michal Simek wrote:
> Allow user to access the MDIO from userspace.
>
> Signed-off-by: Michal Simek <monstr@monstr.eu>
> CC: Anirudha Sarangi <anirudh@xilinx.com>
> CC: John Linn <John.Linn@xilinx.com>
> CC: Grant Likely <grant.likely@secretlab.ca>
> CC: Rob Herring <rob.herring@calxeda.com>
> CC: David S. Miller <davem@davemloft.net>
> ---
> drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 15 +++++++++++++++
> 1 files changed, 15 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
> index 50167ab..a5b41cd 100644
> --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
> +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
> @@ -1053,6 +1053,20 @@ static void axienet_poll_controller(struct net_device *ndev)
> }
> #endif
>
> +/* Ioctl MII Interface */
> +static int axienet_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
> +{
> + struct axienet_local *priv = netdev_priv(dev);
> +
> + if (!netif_running(dev))
> + return -EINVAL;
Not sure this is the appropriate error code.
> + if (!priv->phy_dev)
> + return -ENODEV;
Error code should be EOPNOTSUPP - the device is present but just doesn't
support MDIO.
Ben.
> + return phy_mii_ioctl(priv->phy_dev, rq, cmd);
> +}
> +
> static const struct net_device_ops axienet_netdev_ops = {
> .ndo_open = axienet_open,
> .ndo_stop = axienet_stop,
> @@ -1061,6 +1075,7 @@ static const struct net_device_ops axienet_netdev_ops = {
> .ndo_set_mac_address = netdev_set_mac_address,
> .ndo_validate_addr = eth_validate_addr,
> .ndo_set_rx_mode = axienet_set_multicast_list,
> + .ndo_do_ioctl = axienet_ioctl,
> #ifdef CONFIG_NET_POLL_CONTROLLER
> .ndo_poll_controller = axienet_poll_controller,
> #endif
--
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH 02/11] net: axienet: Add ioctl support
2012-10-04 19:17 ` Ben Hutchings
@ 2012-10-05 5:54 ` Michal Simek
0 siblings, 0 replies; 26+ messages in thread
From: Michal Simek @ 2012-10-05 5:54 UTC (permalink / raw)
To: Ben Hutchings
Cc: netdev, linux-kernel, Anirudha Sarangi, John Linn, Grant Likely,
Rob Herring, David S. Miller
On 10/04/2012 09:17 PM, Ben Hutchings wrote:
> On Thu, 2012-10-04 at 20:14 +0200, Michal Simek wrote:
>> Allow user to access the MDIO from userspace.
>>
>> Signed-off-by: Michal Simek <monstr@monstr.eu>
>> CC: Anirudha Sarangi <anirudh@xilinx.com>
>> CC: John Linn <John.Linn@xilinx.com>
>> CC: Grant Likely <grant.likely@secretlab.ca>
>> CC: Rob Herring <rob.herring@calxeda.com>
>> CC: David S. Miller <davem@davemloft.net>
>> ---
>> drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 15 +++++++++++++++
>> 1 files changed, 15 insertions(+), 0 deletions(-)
>>
>> diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
>> index 50167ab..a5b41cd 100644
>> --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
>> +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
>> @@ -1053,6 +1053,20 @@ static void axienet_poll_controller(struct net_device *ndev)
>> }
>> #endif
>>
>> +/* Ioctl MII Interface */
>> +static int axienet_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
>> +{
>> + struct axienet_local *priv = netdev_priv(dev);
>> +
>> + if (!netif_running(dev))
>> + return -EINVAL;
>
> Not sure this is the appropriate error code.
>
>> + if (!priv->phy_dev)
>> + return -ENODEV;
>
> Error code should be EOPNOTSUPP - the device is present but just doesn't
> support MDIO.
ok. Thanks will fix it.
Thanks,
Michal
--
Michal Simek, Ing. (M.Eng)
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/
Microblaze U-BOOT custodian
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH 03/11] net: axienet: Do not use NO_IRQ
2012-10-04 18:14 [PATCH 01/11] net: axienet: Remove NETIF_F_SG dropping for no checksum feature Michal Simek
2012-10-04 18:14 ` [PATCH 02/11] net: axienet: Add ioctl support Michal Simek
@ 2012-10-04 18:14 ` Michal Simek
2012-10-04 18:14 ` [PATCH 04/11] net: axienet: Additional MDIO clock functionality Michal Simek
` (8 subsequent siblings)
10 siblings, 0 replies; 26+ messages in thread
From: Michal Simek @ 2012-10-04 18:14 UTC (permalink / raw)
To: netdev
Cc: linux-kernel, Michal Simek, Anirudha Sarangi, John Linn,
Grant Likely, Rob Herring, David S. Miller
NO_IRQ is not longer used by Microblaze.
Signed-off-by: Michal Simek <monstr@monstr.eu>
CC: Anirudha Sarangi <anirudh@xilinx.com>
CC: John Linn <John.Linn@xilinx.com>
CC: Grant Likely <grant.likely@secretlab.ca>
CC: Rob Herring <rob.herring@calxeda.com>
CC: David S. Miller <davem@davemloft.net>
---
drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
index a5b41cd..8d1db13 100644
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
@@ -1599,7 +1599,7 @@ static int __devinit axienet_of_probe(struct platform_device *op)
lp->rx_irq = irq_of_parse_and_map(np, 1);
lp->tx_irq = irq_of_parse_and_map(np, 0);
of_node_put(np);
- if ((lp->rx_irq == NO_IRQ) || (lp->tx_irq == NO_IRQ)) {
+ if ((!lp->rx_irq) || (!lp->tx_irq)) {
dev_err(&op->dev, "could not determine irqs\n");
ret = -ENOMEM;
goto err_iounmap_2;
--
1.7.0.4
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 04/11] net: axienet: Additional MDIO clock functionality
2012-10-04 18:14 [PATCH 01/11] net: axienet: Remove NETIF_F_SG dropping for no checksum feature Michal Simek
2012-10-04 18:14 ` [PATCH 02/11] net: axienet: Add ioctl support Michal Simek
2012-10-04 18:14 ` [PATCH 03/11] net: axienet: Do not use NO_IRQ Michal Simek
@ 2012-10-04 18:14 ` Michal Simek
2012-10-04 18:14 ` [PATCH 05/11] net: axienet: Enable VLAN support by default Michal Simek
` (7 subsequent siblings)
10 siblings, 0 replies; 26+ messages in thread
From: Michal Simek @ 2012-10-04 18:14 UTC (permalink / raw)
To: netdev
Cc: linux-kernel, Michal Simek, Wendy Liang, Nico Augustijn,
Anirudha Sarangi, John Linn, Grant Likely, Rob Herring,
David S. Miller
The MDIO clock was previously hard coded and it is now
calculated thanks to a patch from the community.
Modify the Xilinx patch to get the clock frequency from
the connected AXI bus instead of the CPU.
Currently, the AXI ethernet mdio bus id is set as the mdio device node start
address, but the mdio node don't have a start address. Use the start address
of the AXI ethernet controller which connects to the MDIO bus instead.
Signed-off-by: Wendy Liang <wendy.liang@petalogix.com>
Signed-off-by: Nico Augustijn <Nico.Augustijn@Adeas.nl>
CC: Anirudha Sarangi <anirudh@xilinx.com>
CC: John Linn <John.Linn@xilinx.com>
CC: Grant Likely <grant.likely@secretlab.ca>
CC: Rob Herring <rob.herring@calxeda.com>
CC: David S. Miller <davem@davemloft.net>
---
drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c | 76 +++++++++++----------
1 files changed, 40 insertions(+), 36 deletions(-)
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c b/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c
index e90e1f4..49acc1e 100644
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c
@@ -128,11 +128,11 @@ static int axienet_mdio_write(struct mii_bus *bus, int phy_id, int reg,
int axienet_mdio_setup(struct axienet_local *lp, struct device_node *np)
{
int ret;
- u32 clk_div, host_clock;
- u32 *property_p;
+ u32 clk_div;
struct mii_bus *bus;
struct resource res;
struct device_node *np1;
+ struct device_node *npp = 0; /* the ethernet controller device node */
/* clk_div can be calculated by deriving it from the equation:
* fMDIO = fHOST / ((1 + clk_div) * 2)
@@ -158,41 +158,46 @@ int axienet_mdio_setup(struct axienet_local *lp, struct device_node *np)
* fHOST can be read from the flattened device tree as property
* "clock-frequency" from the CPU
*/
-
- np1 = of_find_node_by_name(NULL, "cpu");
- if (!np1) {
- printk(KERN_WARNING "%s(): Could not find CPU device node.",
- __func__);
- printk(KERN_WARNING "Setting MDIO clock divisor to "
- "default %d\n", DEFAULT_CLOCK_DIVISOR);
- clk_div = DEFAULT_CLOCK_DIVISOR;
- goto issue;
- }
- property_p = (u32 *) of_get_property(np1, "clock-frequency", NULL);
- if (!property_p) {
- printk(KERN_WARNING "%s(): Could not find CPU property: "
- "clock-frequency.", __func__);
- printk(KERN_WARNING "Setting MDIO clock divisor to "
- "default %d\n", DEFAULT_CLOCK_DIVISOR);
+ np1 = of_get_parent(lp->phy_node);
+ if (np1)
+ npp = of_get_parent(np1);
+ if (!npp) {
+ dev_warn(lp->dev,
+ "Could not find ethernet controller device node.");
+ dev_warn(lp->dev, "Setting MDIO clock divisor to default %d\n",
+ DEFAULT_CLOCK_DIVISOR);
clk_div = DEFAULT_CLOCK_DIVISOR;
- goto issue;
+ } else {
+ u32 *property_p;
+
+ property_p = (uint32_t *)of_get_property(npp,
+ "clock-frequency", NULL);
+ if (!property_p) {
+ dev_warn(lp->dev, "Could not find clock ethernet " \
+ "controller property.");
+ dev_warn(lp->dev,
+ "Setting MDIO clock divisor to default %d\n",
+ DEFAULT_CLOCK_DIVISOR);
+ clk_div = DEFAULT_CLOCK_DIVISOR;
+ } else {
+ u32 host_clock = be32_to_cpup(property_p);
+
+ clk_div = (host_clock / (MAX_MDIO_FREQ * 2)) - 1;
+
+ /* If there is any remainder from the division of
+ * fHOST / (MAX_MDIO_FREQ * 2), then we need to add 1
+ * to the clock divisor or we will surely be
+ * above 2.5 MHz */
+ if (host_clock % (MAX_MDIO_FREQ * 2))
+ clk_div++;
+ dev_dbg(lp->dev, "Setting MDIO clock divisor to %u " \
+ "based on %u Hz host clock.\n",
+ clk_div, host_clock);
+ }
}
- host_clock = be32_to_cpup(property_p);
- clk_div = (host_clock / (MAX_MDIO_FREQ * 2)) - 1;
- /* If there is any remainder from the division of
- * fHOST / (MAX_MDIO_FREQ * 2), then we need to add
- * 1 to the clock divisor or we will surely be above 2.5 MHz */
- if (host_clock % (MAX_MDIO_FREQ * 2))
- clk_div++;
-
- printk(KERN_DEBUG "%s(): Setting MDIO clock divisor to %u based "
- "on %u Hz host clock.\n", __func__, clk_div, host_clock);
-
- of_node_put(np1);
-issue:
- axienet_iow(lp, XAE_MDIO_MC_OFFSET,
- (((u32) clk_div) | XAE_MDIO_MC_MDIOEN_MASK));
+ axienet_iow(lp, XAE_MDIO_MC_OFFSET, (((u32)clk_div) |
+ XAE_MDIO_MC_MDIOEN_MASK));
ret = axienet_mdio_wait_until_ready(lp);
if (ret < 0)
@@ -202,8 +207,7 @@ issue:
if (!bus)
return -ENOMEM;
- np1 = of_get_parent(lp->phy_node);
- of_address_to_resource(np1, 0, &res);
+ of_address_to_resource(npp, 0, &res);
snprintf(bus->id, MII_BUS_ID_SIZE, "%.8llx",
(unsigned long long) res.start);
--
1.7.0.4
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 05/11] net: axienet: Enable VLAN support by default
2012-10-04 18:14 [PATCH 01/11] net: axienet: Remove NETIF_F_SG dropping for no checksum feature Michal Simek
` (2 preceding siblings ...)
2012-10-04 18:14 ` [PATCH 04/11] net: axienet: Additional MDIO clock functionality Michal Simek
@ 2012-10-04 18:14 ` Michal Simek
2012-10-04 18:14 ` [PATCH 06/11] net: ll_temac: Fix mdio initialization Michal Simek
` (6 subsequent siblings)
10 siblings, 0 replies; 26+ messages in thread
From: Michal Simek @ 2012-10-04 18:14 UTC (permalink / raw)
To: netdev
Cc: linux-kernel, Michal Simek, Anirudha Sarangi, John Linn,
Grant Likely, Rob Herring, David S. Miller
The driver is using frame size for VLAN packets
but does not enable VLAN IP option.
Signed-off-by: Michal Simek <monstr@monstr.eu>
CC: Anirudha Sarangi <anirudh@xilinx.com>
CC: John Linn <John.Linn@xilinx.com>
CC: Grant Likely <grant.likely@secretlab.ca>
CC: Rob Herring <rob.herring@calxeda.com>
CC: David S. Miller <davem@davemloft.net>
---
drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
index 8d1db13..4ef148f 100644
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
@@ -483,6 +483,7 @@ static void axienet_device_reset(struct net_device *ndev)
__axienet_device_reset(lp, &ndev->dev, XAXIDMA_RX_CR_OFFSET);
lp->max_frm_size = XAE_MAX_VLAN_FRAME_SIZE;
+ lp->options |= XAE_OPTION_VLAN;
lp->options &= (~XAE_OPTION_JUMBO);
if ((ndev->mtu > XAE_MTU) &&
--
1.7.0.4
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 06/11] net: ll_temac: Fix mdio initialization
2012-10-04 18:14 [PATCH 01/11] net: axienet: Remove NETIF_F_SG dropping for no checksum feature Michal Simek
` (3 preceding siblings ...)
2012-10-04 18:14 ` [PATCH 05/11] net: axienet: Enable VLAN support by default Michal Simek
@ 2012-10-04 18:14 ` Michal Simek
2012-10-04 18:14 ` [PATCH 07/11] net: ll_temac: Fix DMA map size bug Michal Simek
` (5 subsequent siblings)
10 siblings, 0 replies; 26+ messages in thread
From: Michal Simek @ 2012-10-04 18:14 UTC (permalink / raw)
To: netdev
Cc: linux-kernel, Michal Simek, Anirudha Sarangi, John Linn,
Grant Likely, Rob Herring, David S. Miller
Current driver required to have phy-node directly in
the driver. After this fixed we can use standard structure.
DTS fragment:
phy-handle = <&phy0>;
mdio {
#address-cells = <1>;
#size-cells = <0>;
phy0: phy@7 {
compatible = "marvell,88e1111";
device_type = "ethernet-phy";
reg = <7>;
} ;
} ;
Signed-off-by: Michal Simek <monstr@monstr.eu>
CC: Anirudha Sarangi <anirudh@xilinx.com>
CC: John Linn <John.Linn@xilinx.com>
CC: Grant Likely <grant.likely@secretlab.ca>
CC: Rob Herring <rob.herring@calxeda.com>
CC: David S. Miller <davem@davemloft.net>
---
drivers/net/ethernet/xilinx/ll_temac_main.c | 11 ++++++-----
drivers/net/ethernet/xilinx/ll_temac_mdio.c | 5 +++--
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c
index f8e3518..482b572 100644
--- a/drivers/net/ethernet/xilinx/ll_temac_main.c
+++ b/drivers/net/ethernet/xilinx/ll_temac_main.c
@@ -1108,14 +1108,15 @@ static int __devinit temac_of_probe(struct platform_device *op)
}
temac_set_mac_address(ndev, (void *)addr);
- rc = temac_mdio_setup(lp, op->dev.of_node);
- if (rc)
- dev_warn(&op->dev, "error registering MDIO bus\n");
-
lp->phy_node = of_parse_phandle(op->dev.of_node, "phy-handle", 0);
- if (lp->phy_node)
+ if (lp->phy_node) {
dev_dbg(lp->dev, "using PHY node %s (%p)\n", np->full_name, np);
+ rc = temac_mdio_setup(lp, op->dev.of_node);
+ if (rc)
+ dev_warn(&op->dev, "error registering MDIO bus\n");
+ }
+
/* Add the device attributes */
rc = sysfs_create_group(&lp->dev->kobj, &temac_attr_group);
if (rc) {
diff --git a/drivers/net/ethernet/xilinx/ll_temac_mdio.c b/drivers/net/ethernet/xilinx/ll_temac_mdio.c
index 8cf9d4f..634d898 100644
--- a/drivers/net/ethernet/xilinx/ll_temac_mdio.c
+++ b/drivers/net/ethernet/xilinx/ll_temac_mdio.c
@@ -63,6 +63,7 @@ int temac_mdio_setup(struct temac_local *lp, struct device_node *np)
int clk_div;
int rc, size;
struct resource res;
+ struct device_node *np1 = of_get_parent(lp->phy_node);
/* Calculate a reasonable divisor for the clock rate */
clk_div = 0x3f; /* worst-case default setting */
@@ -85,7 +86,7 @@ int temac_mdio_setup(struct temac_local *lp, struct device_node *np)
if (!bus)
return -ENOMEM;
- of_address_to_resource(np, 0, &res);
+ of_address_to_resource(np1, 0, &res);
snprintf(bus->id, MII_BUS_ID_SIZE, "%.8llx",
(unsigned long long)res.start);
bus->priv = lp;
@@ -97,7 +98,7 @@ int temac_mdio_setup(struct temac_local *lp, struct device_node *np)
lp->mii_bus = bus;
- rc = of_mdiobus_register(bus, np);
+ rc = of_mdiobus_register(bus, np1);
if (rc)
goto err_register;
--
1.7.0.4
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 07/11] net: ll_temac: Fix DMA map size bug
2012-10-04 18:14 [PATCH 01/11] net: axienet: Remove NETIF_F_SG dropping for no checksum feature Michal Simek
` (4 preceding siblings ...)
2012-10-04 18:14 ` [PATCH 06/11] net: ll_temac: Fix mdio initialization Michal Simek
@ 2012-10-04 18:14 ` Michal Simek
2012-10-04 18:14 ` [PATCH 08/11] net: ll_temac: Do not use fixed mtu size Michal Simek
` (4 subsequent siblings)
10 siblings, 0 replies; 26+ messages in thread
From: Michal Simek @ 2012-10-04 18:14 UTC (permalink / raw)
To: netdev
Cc: linux-kernel, Michal Simek, Anirudha Sarangi, John Linn,
Grant Likely, Rob Herring, David S. Miller
DMA allocates skb->len instead of headlen
which is used for DMA.
The same fix was applied to the axienet driver.
Signed-off-by: Michal Simek <monstr@monstr.eu>
CC: Anirudha Sarangi <anirudh@xilinx.com>
CC: John Linn <John.Linn@xilinx.com>
CC: Grant Likely <grant.likely@secretlab.ca>
CC: Rob Herring <rob.herring@calxeda.com>
CC: David S. Miller <davem@davemloft.net>
---
drivers/net/ethernet/xilinx/ll_temac_main.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c
index 482b572..8786d92 100644
--- a/drivers/net/ethernet/xilinx/ll_temac_main.c
+++ b/drivers/net/ethernet/xilinx/ll_temac_main.c
@@ -710,8 +710,8 @@ static int temac_start_xmit(struct sk_buff *skb, struct net_device *ndev)
cur_p->app0 |= STS_CTRL_APP0_SOP;
cur_p->len = skb_headlen(skb);
- cur_p->phys = dma_map_single(ndev->dev.parent, skb->data, skb->len,
- DMA_TO_DEVICE);
+ cur_p->phys = dma_map_single(ndev->dev.parent, skb->data,
+ skb_headlen(skb), DMA_TO_DEVICE);
cur_p->app4 = (unsigned long)skb;
for (ii = 0; ii < num_frag; ii++) {
--
1.7.0.4
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 08/11] net: ll_temac: Do not use fixed mtu size
2012-10-04 18:14 [PATCH 01/11] net: axienet: Remove NETIF_F_SG dropping for no checksum feature Michal Simek
` (5 preceding siblings ...)
2012-10-04 18:14 ` [PATCH 07/11] net: ll_temac: Fix DMA map size bug Michal Simek
@ 2012-10-04 18:14 ` Michal Simek
2012-10-04 19:22 ` Ben Hutchings
2012-10-04 18:14 ` [PATCH 09/11] net: ll_temac: Move frag loading to frag loop Michal Simek
` (3 subsequent siblings)
10 siblings, 1 reply; 26+ messages in thread
From: Michal Simek @ 2012-10-04 18:14 UTC (permalink / raw)
To: netdev
Cc: linux-kernel, Michal Simek, Anirudha Sarangi, John Linn,
Grant Likely, Rob Herring, David S. Miller
Use max mtu instead.
Signed-off-by: Michal Simek <monstr@monstr.eu>
CC: Anirudha Sarangi <anirudh@xilinx.com>
CC: John Linn <John.Linn@xilinx.com>
CC: Grant Likely <grant.likely@secretlab.ca>
CC: Rob Herring <rob.herring@calxeda.com>
CC: David S. Miller <davem@davemloft.net>
---
drivers/net/ethernet/xilinx/ll_temac_main.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c
index 8786d92..8bafa15 100644
--- a/drivers/net/ethernet/xilinx/ll_temac_main.c
+++ b/drivers/net/ethernet/xilinx/ll_temac_main.c
@@ -212,7 +212,7 @@ static void temac_dma_bd_release(struct net_device *ndev)
break;
else {
dma_unmap_single(ndev->dev.parent, lp->rx_bd_v[i].phys,
- XTE_MAX_JUMBO_FRAME_SIZE, DMA_FROM_DEVICE);
+ ndev->mtu, DMA_FROM_DEVICE);
dev_kfree_skb(lp->rx_skb[i]);
}
}
@@ -274,7 +274,7 @@ static int temac_dma_bd_init(struct net_device *ndev)
sizeof(*lp->rx_bd_v) * ((i + 1) % RX_BD_NUM);
skb = netdev_alloc_skb_ip_align(ndev,
- XTE_MAX_JUMBO_FRAME_SIZE);
+ ndev->mtu);
if (skb == 0) {
dev_err(&ndev->dev, "alloc_skb error %d\n", i);
@@ -284,9 +284,9 @@ static int temac_dma_bd_init(struct net_device *ndev)
/* returns physical address of skb->data */
lp->rx_bd_v[i].phys = dma_map_single(ndev->dev.parent,
skb->data,
- XTE_MAX_JUMBO_FRAME_SIZE,
+ ndev->mtu,
DMA_FROM_DEVICE);
- lp->rx_bd_v[i].len = XTE_MAX_JUMBO_FRAME_SIZE;
+ lp->rx_bd_v[i].len = ndev->mtu;
lp->rx_bd_v[i].app0 = STS_CTRL_APP0_IRQONEND;
}
@@ -787,7 +787,7 @@ static void ll_temac_recv(struct net_device *ndev)
ndev->stats.rx_bytes += length;
new_skb = netdev_alloc_skb_ip_align(ndev,
- XTE_MAX_JUMBO_FRAME_SIZE);
+ ndev->mtu);
if (new_skb == 0) {
dev_err(&ndev->dev, "no memory for new sk_buff\n");
@@ -797,9 +797,9 @@ static void ll_temac_recv(struct net_device *ndev)
cur_p->app0 = STS_CTRL_APP0_IRQONEND;
cur_p->phys = dma_map_single(ndev->dev.parent, new_skb->data,
- XTE_MAX_JUMBO_FRAME_SIZE,
+ ndev->mtu,
DMA_FROM_DEVICE);
- cur_p->len = XTE_MAX_JUMBO_FRAME_SIZE;
+ cur_p->len = ndev->mtu;
lp->rx_skb[lp->rx_bd_ci] = new_skb;
lp->rx_bd_ci++;
--
1.7.0.4
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH 08/11] net: ll_temac: Do not use fixed mtu size
2012-10-04 18:14 ` [PATCH 08/11] net: ll_temac: Do not use fixed mtu size Michal Simek
@ 2012-10-04 19:22 ` Ben Hutchings
2012-10-05 5:58 ` Michal Simek
0 siblings, 1 reply; 26+ messages in thread
From: Ben Hutchings @ 2012-10-04 19:22 UTC (permalink / raw)
To: Michal Simek
Cc: netdev, linux-kernel, Anirudha Sarangi, John Linn, Grant Likely,
Rob Herring, David S. Miller
On Thu, 2012-10-04 at 20:14 +0200, Michal Simek wrote:
> Use max mtu instead.
[...]
MTU does not include the Ethernet header so I have no idea how this is
expected to work...
Ben.
--
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 08/11] net: ll_temac: Do not use fixed mtu size
2012-10-04 19:22 ` Ben Hutchings
@ 2012-10-05 5:58 ` Michal Simek
0 siblings, 0 replies; 26+ messages in thread
From: Michal Simek @ 2012-10-05 5:58 UTC (permalink / raw)
To: Ben Hutchings
Cc: netdev, linux-kernel, Anirudha Sarangi, John Linn, Grant Likely,
Rob Herring, David S. Miller
On 10/04/2012 09:22 PM, Ben Hutchings wrote:
> On Thu, 2012-10-04 at 20:14 +0200, Michal Simek wrote:
>> Use max mtu instead.
> [...]
>
> MTU does not include the Ethernet header so I have no idea how this is
> expected to work...
Right. This is wrong fix. It should be the same as is in axienet.
There is max_frm_size used which is mtu+header+tailer.
I will fix it.
Thanks,
Michal
--
Michal Simek, Ing. (M.Eng)
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/
Microblaze U-BOOT custodian
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH 09/11] net: ll_temac: Move frag loading to frag loop
2012-10-04 18:14 [PATCH 01/11] net: axienet: Remove NETIF_F_SG dropping for no checksum feature Michal Simek
` (6 preceding siblings ...)
2012-10-04 18:14 ` [PATCH 08/11] net: ll_temac: Do not use fixed mtu size Michal Simek
@ 2012-10-04 18:14 ` Michal Simek
2012-10-04 18:14 ` [PATCH 10/11] net: ll_temac: Simplify xmit Michal Simek
` (2 subsequent siblings)
10 siblings, 0 replies; 26+ messages in thread
From: Michal Simek @ 2012-10-04 18:14 UTC (permalink / raw)
To: netdev
Cc: linux-kernel, Michal Simek, Anirudha Sarangi, John Linn,
Grant Likely, Rob Herring, David S. Miller
Load frag value when necessary.
Signed-off-by: Michal Simek <monstr@monstr.eu>
CC: Anirudha Sarangi <anirudh@xilinx.com>
CC: John Linn <John.Linn@xilinx.com>
CC: Grant Likely <grant.likely@secretlab.ca>
CC: Rob Herring <rob.herring@calxeda.com>
CC: David S. Miller <davem@davemloft.net>
---
drivers/net/ethernet/xilinx/ll_temac_main.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c
index 8bafa15..fec42d9 100644
--- a/drivers/net/ethernet/xilinx/ll_temac_main.c
+++ b/drivers/net/ethernet/xilinx/ll_temac_main.c
@@ -686,7 +686,6 @@ static int temac_start_xmit(struct sk_buff *skb, struct net_device *ndev)
skb_frag_t *frag;
num_frag = skb_shinfo(skb)->nr_frags;
- frag = &skb_shinfo(skb)->frags[0];
start_p = lp->tx_bd_p + sizeof(*lp->tx_bd_v) * lp->tx_bd_tail;
cur_p = &lp->tx_bd_v[lp->tx_bd_tail];
@@ -715,6 +714,7 @@ static int temac_start_xmit(struct sk_buff *skb, struct net_device *ndev)
cur_p->app4 = (unsigned long)skb;
for (ii = 0; ii < num_frag; ii++) {
+ frag = &skb_shinfo(skb)->frags[ii];
lp->tx_bd_tail++;
if (lp->tx_bd_tail >= TX_BD_NUM)
lp->tx_bd_tail = 0;
@@ -725,7 +725,6 @@ static int temac_start_xmit(struct sk_buff *skb, struct net_device *ndev)
skb_frag_size(frag), DMA_TO_DEVICE);
cur_p->len = skb_frag_size(frag);
cur_p->app0 = 0;
- frag++;
}
cur_p->app0 |= STS_CTRL_APP0_EOP;
--
1.7.0.4
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 10/11] net: ll_temac: Simplify xmit
2012-10-04 18:14 [PATCH 01/11] net: axienet: Remove NETIF_F_SG dropping for no checksum feature Michal Simek
` (7 preceding siblings ...)
2012-10-04 18:14 ` [PATCH 09/11] net: ll_temac: Move frag loading to frag loop Michal Simek
@ 2012-10-04 18:14 ` Michal Simek
2012-10-04 18:14 ` [PATCH 11/11] net: xilinx: Show csum in bootlog Michal Simek
2012-10-04 18:26 ` [PATCH 01/11] net: axienet: Remove NETIF_F_SG dropping for no checksum feature David Miller
10 siblings, 0 replies; 26+ messages in thread
From: Michal Simek @ 2012-10-04 18:14 UTC (permalink / raw)
To: netdev
Cc: linux-kernel, Michal Simek, Anirudha Sarangi, John Linn,
Grant Likely, Rob Herring, David S. Miller
Use one return statement instead of two.
Signed-off-by: Michal Simek <monstr@monstr.eu>
CC: Anirudha Sarangi <anirudh@xilinx.com>
CC: John Linn <John.Linn@xilinx.com>
CC: Grant Likely <grant.likely@secretlab.ca>
CC: Rob Herring <rob.herring@calxeda.com>
CC: David S. Miller <davem@davemloft.net>
---
drivers/net/ethernet/xilinx/ll_temac_main.c | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c
index fec42d9..58b2869 100644
--- a/drivers/net/ethernet/xilinx/ll_temac_main.c
+++ b/drivers/net/ethernet/xilinx/ll_temac_main.c
@@ -690,10 +690,8 @@ static int temac_start_xmit(struct sk_buff *skb, struct net_device *ndev)
cur_p = &lp->tx_bd_v[lp->tx_bd_tail];
if (temac_check_tx_bd_space(lp, num_frag)) {
- if (!netif_queue_stopped(ndev)) {
+ if (!netif_queue_stopped(ndev))
netif_stop_queue(ndev);
- return NETDEV_TX_BUSY;
- }
return NETDEV_TX_BUSY;
}
--
1.7.0.4
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 11/11] net: xilinx: Show csum in bootlog
2012-10-04 18:14 [PATCH 01/11] net: axienet: Remove NETIF_F_SG dropping for no checksum feature Michal Simek
` (8 preceding siblings ...)
2012-10-04 18:14 ` [PATCH 10/11] net: ll_temac: Simplify xmit Michal Simek
@ 2012-10-04 18:14 ` Michal Simek
2012-10-04 19:15 ` Ben Hutchings
2012-10-04 18:26 ` [PATCH 01/11] net: axienet: Remove NETIF_F_SG dropping for no checksum feature David Miller
10 siblings, 1 reply; 26+ messages in thread
From: Michal Simek @ 2012-10-04 18:14 UTC (permalink / raw)
To: netdev
Cc: linux-kernel, Michal Simek, Anirudha Sarangi, John Linn,
Grant Likely, Rob Herring, David S. Miller
Just show current setting in bootlog.
Signed-off-by: Michal Simek <monstr@monstr.eu>
CC: Anirudha Sarangi <anirudh@xilinx.com>
CC: John Linn <John.Linn@xilinx.com>
CC: Grant Likely <grant.likely@secretlab.ca>
CC: Rob Herring <rob.herring@calxeda.com>
CC: David S. Miller <davem@davemloft.net>
---
drivers/net/ethernet/xilinx/ll_temac_main.c | 2 ++
drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 2 ++
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c
index 58b2869..8c31fcd 100644
--- a/drivers/net/ethernet/xilinx/ll_temac_main.c
+++ b/drivers/net/ethernet/xilinx/ll_temac_main.c
@@ -1052,12 +1052,14 @@ static int __devinit temac_of_probe(struct platform_device *op)
/* Setup checksum offload, but default to off if not specified */
lp->temac_features = 0;
p = (__be32 *)of_get_property(op->dev.of_node, "xlnx,txcsum", NULL);
+ dev_info(&op->dev, "TX_CSUM %d\n", be32_to_cpup(p));
if (p && be32_to_cpu(*p)) {
lp->temac_features |= TEMAC_FEATURE_TX_CSUM;
/* Can checksum TCP/UDP over IPv4. */
ndev->features |= NETIF_F_IP_CSUM;
}
p = (__be32 *)of_get_property(op->dev.of_node, "xlnx,rxcsum", NULL);
+ dev_info(&op->dev, "RX_CSUM %d\n", be32_to_cpup(p));
if (p && be32_to_cpu(*p))
lp->temac_features |= TEMAC_FEATURE_RX_CSUM;
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
index 4ef148f..9ea5be6 100644
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
@@ -1528,6 +1528,7 @@ static int __devinit axienet_of_probe(struct platform_device *op)
lp->features = 0;
p = (__be32 *) of_get_property(op->dev.of_node, "xlnx,txcsum", NULL);
+ dev_info(&op->dev, "TX_CSUM %d\n", be32_to_cpup(p));
if (p) {
switch (be32_to_cpup(p)) {
case 1:
@@ -1549,6 +1550,7 @@ static int __devinit axienet_of_probe(struct platform_device *op)
}
}
p = (__be32 *) of_get_property(op->dev.of_node, "xlnx,rxcsum", NULL);
+ dev_info(&op->dev, "RX_CSUM %d\n", be32_to_cpup(p));
if (p) {
switch (be32_to_cpup(p)) {
case 1:
--
1.7.0.4
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH 11/11] net: xilinx: Show csum in bootlog
2012-10-04 18:14 ` [PATCH 11/11] net: xilinx: Show csum in bootlog Michal Simek
@ 2012-10-04 19:15 ` Ben Hutchings
2012-10-05 5:48 ` Michal Simek
2012-10-05 9:35 ` Michal Simek
0 siblings, 2 replies; 26+ messages in thread
From: Ben Hutchings @ 2012-10-04 19:15 UTC (permalink / raw)
To: Michal Simek
Cc: netdev, linux-kernel, Anirudha Sarangi, John Linn, Grant Likely,
Rob Herring, David S. Miller
On Thu, 2012-10-04 at 20:14 +0200, Michal Simek wrote:
> Just show current setting in bootlog.
[...]
> --- a/drivers/net/ethernet/xilinx/ll_temac_main.c
> +++ b/drivers/net/ethernet/xilinx/ll_temac_main.c
> @@ -1052,12 +1052,14 @@ static int __devinit temac_of_probe(struct platform_device *op)
> /* Setup checksum offload, but default to off if not specified */
> lp->temac_features = 0;
> p = (__be32 *)of_get_property(op->dev.of_node, "xlnx,txcsum", NULL);
> + dev_info(&op->dev, "TX_CSUM %d\n", be32_to_cpup(p));
> if (p && be32_to_cpu(*p)) {
> lp->temac_features |= TEMAC_FEATURE_TX_CSUM;
> /* Can checksum TCP/UDP over IPv4. */
> ndev->features |= NETIF_F_IP_CSUM;
> }
> p = (__be32 *)of_get_property(op->dev.of_node, "xlnx,rxcsum", NULL);
> + dev_info(&op->dev, "RX_CSUM %d\n", be32_to_cpup(p));
[...]
Is there any particular reason you think this needs to be logged by
default, rather than letting users run ethtool -k? I suggest using
dev_dbg() instead.
Ben.
--
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH 11/11] net: xilinx: Show csum in bootlog
2012-10-04 19:15 ` Ben Hutchings
@ 2012-10-05 5:48 ` Michal Simek
2012-10-05 13:36 ` Ben Hutchings
2012-10-05 9:35 ` Michal Simek
1 sibling, 1 reply; 26+ messages in thread
From: Michal Simek @ 2012-10-05 5:48 UTC (permalink / raw)
To: Ben Hutchings
Cc: netdev, linux-kernel, Anirudha Sarangi, John Linn, Grant Likely,
Rob Herring, David S. Miller
On 10/04/2012 09:15 PM, Ben Hutchings wrote:
> On Thu, 2012-10-04 at 20:14 +0200, Michal Simek wrote:
>> Just show current setting in bootlog.
> [...]
>> --- a/drivers/net/ethernet/xilinx/ll_temac_main.c
>> +++ b/drivers/net/ethernet/xilinx/ll_temac_main.c
>> @@ -1052,12 +1052,14 @@ static int __devinit temac_of_probe(struct platform_device *op)
>> /* Setup checksum offload, but default to off if not specified */
>> lp->temac_features = 0;
>> p = (__be32 *)of_get_property(op->dev.of_node, "xlnx,txcsum", NULL);
>> + dev_info(&op->dev, "TX_CSUM %d\n", be32_to_cpup(p));
>> if (p && be32_to_cpu(*p)) {
>> lp->temac_features |= TEMAC_FEATURE_TX_CSUM;
>> /* Can checksum TCP/UDP over IPv4. */
>> ndev->features |= NETIF_F_IP_CSUM;
>> }
>> p = (__be32 *)of_get_property(op->dev.of_node, "xlnx,rxcsum", NULL);
>> + dev_info(&op->dev, "RX_CSUM %d\n", be32_to_cpup(p));
> [...]
>
> Is there any particular reason you think this needs to be logged by
> default, rather than letting users run ethtool -k? I suggest using
> dev_dbg() instead.
The reason was just to show it in the bootlog.
I will check ethtool support for these drivers.
Thanks for your comments,
Michal
--
Michal Simek, Ing. (M.Eng)
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/
Microblaze U-BOOT custodian
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH 11/11] net: xilinx: Show csum in bootlog
2012-10-05 5:48 ` Michal Simek
@ 2012-10-05 13:36 ` Ben Hutchings
0 siblings, 0 replies; 26+ messages in thread
From: Ben Hutchings @ 2012-10-05 13:36 UTC (permalink / raw)
To: monstr
Cc: netdev, linux-kernel, Anirudha Sarangi, John Linn, Grant Likely,
Rob Herring, David S. Miller
On Fri, 2012-10-05 at 07:48 +0200, Michal Simek wrote:
> On 10/04/2012 09:15 PM, Ben Hutchings wrote:
> > On Thu, 2012-10-04 at 20:14 +0200, Michal Simek wrote:
> >> Just show current setting in bootlog.
> > [...]
> >> --- a/drivers/net/ethernet/xilinx/ll_temac_main.c
> >> +++ b/drivers/net/ethernet/xilinx/ll_temac_main.c
> >> @@ -1052,12 +1052,14 @@ static int __devinit temac_of_probe(struct platform_device *op)
> >> /* Setup checksum offload, but default to off if not specified */
> >> lp->temac_features = 0;
> >> p = (__be32 *)of_get_property(op->dev.of_node, "xlnx,txcsum", NULL);
> >> + dev_info(&op->dev, "TX_CSUM %d\n", be32_to_cpup(p));
> >> if (p && be32_to_cpu(*p)) {
> >> lp->temac_features |= TEMAC_FEATURE_TX_CSUM;
> >> /* Can checksum TCP/UDP over IPv4. */
> >> ndev->features |= NETIF_F_IP_CSUM;
> >> }
> >> p = (__be32 *)of_get_property(op->dev.of_node, "xlnx,rxcsum", NULL);
> >> + dev_info(&op->dev, "RX_CSUM %d\n", be32_to_cpup(p));
> > [...]
> >
> > Is there any particular reason you think this needs to be logged by
> > default, rather than letting users run ethtool -k? I suggest using
> > dev_dbg() instead.
>
> The reason was just to show it in the bootlog.
> I will check ethtool support for these drivers.
'ethtool -k' should just work so long as the driver sets the right bits
in ndev->features.
Ben.
--
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 11/11] net: xilinx: Show csum in bootlog
2012-10-04 19:15 ` Ben Hutchings
2012-10-05 5:48 ` Michal Simek
@ 2012-10-05 9:35 ` Michal Simek
2012-10-05 13:51 ` Ben Hutchings
1 sibling, 1 reply; 26+ messages in thread
From: Michal Simek @ 2012-10-05 9:35 UTC (permalink / raw)
To: Ben Hutchings
Cc: netdev, linux-kernel, Anirudha Sarangi, John Linn, Grant Likely,
Rob Herring, David S. Miller
On 10/04/2012 09:15 PM, Ben Hutchings wrote:
> On Thu, 2012-10-04 at 20:14 +0200, Michal Simek wrote:
>> Just show current setting in bootlog.
> [...]
>> --- a/drivers/net/ethernet/xilinx/ll_temac_main.c
>> +++ b/drivers/net/ethernet/xilinx/ll_temac_main.c
>> @@ -1052,12 +1052,14 @@ static int __devinit temac_of_probe(struct platform_device *op)
>> /* Setup checksum offload, but default to off if not specified */
>> lp->temac_features = 0;
>> p = (__be32 *)of_get_property(op->dev.of_node, "xlnx,txcsum", NULL);
>> + dev_info(&op->dev, "TX_CSUM %d\n", be32_to_cpup(p));
>> if (p && be32_to_cpu(*p)) {
>> lp->temac_features |= TEMAC_FEATURE_TX_CSUM;
>> /* Can checksum TCP/UDP over IPv4. */
>> ndev->features |= NETIF_F_IP_CSUM;
>> }
>> p = (__be32 *)of_get_property(op->dev.of_node, "xlnx,rxcsum", NULL);
>> + dev_info(&op->dev, "RX_CSUM %d\n", be32_to_cpup(p));
> [...]
>
> Is there any particular reason you think this needs to be logged by
> default, rather than letting users run ethtool -k? I suggest using
> dev_dbg() instead.
Ok. I have looked at it and there are missing some bits in ndev->features.
Can you please check that my setting is correct?
It is SG DMA ip/driver.
ndev->features = NETIF_F_FRAGLIST | NETIF_F_SG
With two options for csum on RX/TX. They can be selected independently.
tx Partial csum over IPv4. -> NETIF_F_IP_CSUM
tx Full csum. -> NETIF_F_HW_CSUM
rx Full csum -> NETIF_F_RXCSUM
Is there any option to support partial csum?
Thanks,
Michal
--
Michal Simek, Ing. (M.Eng)
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/
Microblaze U-BOOT custodian
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH 11/11] net: xilinx: Show csum in bootlog
2012-10-05 9:35 ` Michal Simek
@ 2012-10-05 13:51 ` Ben Hutchings
2012-10-09 9:08 ` Michal Simek
0 siblings, 1 reply; 26+ messages in thread
From: Ben Hutchings @ 2012-10-05 13:51 UTC (permalink / raw)
To: monstr
Cc: netdev, linux-kernel, Anirudha Sarangi, John Linn, Grant Likely,
Rob Herring, David S. Miller
On Fri, 2012-10-05 at 11:35 +0200, Michal Simek wrote:
> On 10/04/2012 09:15 PM, Ben Hutchings wrote:
> > On Thu, 2012-10-04 at 20:14 +0200, Michal Simek wrote:
> >> Just show current setting in bootlog.
> > [...]
> >> --- a/drivers/net/ethernet/xilinx/ll_temac_main.c
> >> +++ b/drivers/net/ethernet/xilinx/ll_temac_main.c
> >> @@ -1052,12 +1052,14 @@ static int __devinit temac_of_probe(struct platform_device *op)
> >> /* Setup checksum offload, but default to off if not specified */
> >> lp->temac_features = 0;
> >> p = (__be32 *)of_get_property(op->dev.of_node, "xlnx,txcsum", NULL);
> >> + dev_info(&op->dev, "TX_CSUM %d\n", be32_to_cpup(p));
> >> if (p && be32_to_cpu(*p)) {
> >> lp->temac_features |= TEMAC_FEATURE_TX_CSUM;
> >> /* Can checksum TCP/UDP over IPv4. */
> >> ndev->features |= NETIF_F_IP_CSUM;
> >> }
> >> p = (__be32 *)of_get_property(op->dev.of_node, "xlnx,rxcsum", NULL);
> >> + dev_info(&op->dev, "RX_CSUM %d\n", be32_to_cpup(p));
> > [...]
> >
> > Is there any particular reason you think this needs to be logged by
> > default, rather than letting users run ethtool -k? I suggest using
> > dev_dbg() instead.
>
> Ok. I have looked at it and there are missing some bits in ndev->features.
>
> Can you please check that my setting is correct?
>
> It is SG DMA ip/driver.
> ndev->features = NETIF_F_FRAGLIST | NETIF_F_SG
NETIF_F_SG only; NETIF_F_FRAGLIST means you can handle skbs chained
through the frag_list pointer.
> With two options for csum on RX/TX. They can be selected independently.
> tx Partial csum over IPv4. -> NETIF_F_IP_CSUM
> tx Full csum. -> NETIF_F_HW_CSUM
NETIF_F_IP_CSUM means you have hardware checksum generation for TCP/IPv4
and UDP/IPv4 only (XAE_FEATURE_FULL_TX_CSUM).
NETIF_F_HW_CSUM means you have generic TCP-style checksum generation
using the csum_start and csum_offset fields of the skb
(XAE_FEATURE_PARTIAL_TX_CSUM). By the way, you're actually testing
XAE_FEATURE_PARTIAL_RX_CSUM in axienet_start_xmit()...
> rx Full csum -> NETIF_F_RXCSUM
>
> Is there any option to support partial csum?
There is no need to differentiate these in the device features. For TX
the stack needs to know whether to use a software fallback before
passing the skb to you, but on RX it looks at the ip_summed field of
each skb you pass up.
Ben.
--
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH 11/11] net: xilinx: Show csum in bootlog
2012-10-05 13:51 ` Ben Hutchings
@ 2012-10-09 9:08 ` Michal Simek
2012-10-09 16:56 ` Ben Hutchings
0 siblings, 1 reply; 26+ messages in thread
From: Michal Simek @ 2012-10-09 9:08 UTC (permalink / raw)
To: Ben Hutchings
Cc: netdev, linux-kernel, Anirudha Sarangi, John Linn, Grant Likely,
Rob Herring, David S. Miller, John Linn
On 10/05/2012 03:51 PM, Ben Hutchings wrote:
> On Fri, 2012-10-05 at 11:35 +0200, Michal Simek wrote:
>> On 10/04/2012 09:15 PM, Ben Hutchings wrote:
>>> On Thu, 2012-10-04 at 20:14 +0200, Michal Simek wrote:
>>>> Just show current setting in bootlog.
>>> [...]
>>>> --- a/drivers/net/ethernet/xilinx/ll_temac_main.c
>>>> +++ b/drivers/net/ethernet/xilinx/ll_temac_main.c
>>>> @@ -1052,12 +1052,14 @@ static int __devinit temac_of_probe(struct platform_device *op)
>>>> /* Setup checksum offload, but default to off if not specified */
>>>> lp->temac_features = 0;
>>>> p = (__be32 *)of_get_property(op->dev.of_node, "xlnx,txcsum", NULL);
>>>> + dev_info(&op->dev, "TX_CSUM %d\n", be32_to_cpup(p));
>>>> if (p && be32_to_cpu(*p)) {
>>>> lp->temac_features |= TEMAC_FEATURE_TX_CSUM;
>>>> /* Can checksum TCP/UDP over IPv4. */
>>>> ndev->features |= NETIF_F_IP_CSUM;
>>>> }
>>>> p = (__be32 *)of_get_property(op->dev.of_node, "xlnx,rxcsum", NULL);
>>>> + dev_info(&op->dev, "RX_CSUM %d\n", be32_to_cpup(p));
>>> [...]
>>>
>>> Is there any particular reason you think this needs to be logged by
>>> default, rather than letting users run ethtool -k? I suggest using
>>> dev_dbg() instead.
>>
>> Ok. I have looked at it and there are missing some bits in ndev->features.
>>
>> Can you please check that my setting is correct?
>>
>> It is SG DMA ip/driver.
>> ndev->features = NETIF_F_FRAGLIST | NETIF_F_SG
>
> NETIF_F_SG only; NETIF_F_FRAGLIST means you can handle skbs chained
> through the frag_list pointer.
The driver is able to handle skb fragments too. temac_start_xmit
>> With two options for csum on RX/TX. They can be selected independently.
>> tx Partial csum over IPv4. -> NETIF_F_IP_CSUM
>> tx Full csum. -> NETIF_F_HW_CSUM
>
> NETIF_F_IP_CSUM means you have hardware checksum generation for TCP/IPv4
> and UDP/IPv4 only (XAE_FEATURE_FULL_TX_CSUM).
>
> NETIF_F_HW_CSUM means you have generic TCP-style checksum generation
> using the csum_start and csum_offset fields of the skb
> (XAE_FEATURE_PARTIAL_TX_CSUM). By the way, you're actually testing
> XAE_FEATURE_PARTIAL_RX_CSUM in axienet_start_xmit()...
We have used non mainline ll_temac driver for a long time but we will
move to this mainline version soon. It is on my todo list to clean this
driver and test all these options.
Also performance tests will be necessary to do.
>> rx Full csum -> NETIF_F_RXCSUM
>>
>> Is there any option to support partial csum?
>
> There is no need to differentiate these in the device features. For TX
> the stack needs to know whether to use a software fallback before
> passing the skb to you, but on RX it looks at the ip_summed field of
> each skb you pass up.
Hardware can be setup asymmetrically. It means enable CSUM only on RX or TX.
All combination are valid.
The point here is if Linux is not able to handle this then we have to
create logic in the driver to support these options too.
Thanks,
Michal
--
Michal Simek, Ing. (M.Eng)
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/
Microblaze U-BOOT custodian
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH 11/11] net: xilinx: Show csum in bootlog
2012-10-09 9:08 ` Michal Simek
@ 2012-10-09 16:56 ` Ben Hutchings
2012-10-10 16:06 ` Michal Simek
0 siblings, 1 reply; 26+ messages in thread
From: Ben Hutchings @ 2012-10-09 16:56 UTC (permalink / raw)
To: monstr
Cc: netdev, linux-kernel, Anirudha Sarangi, John Linn, Grant Likely,
Rob Herring, David S. Miller, John Linn
On Tue, 2012-10-09 at 11:08 +0200, Michal Simek wrote:
> On 10/05/2012 03:51 PM, Ben Hutchings wrote:
> > On Fri, 2012-10-05 at 11:35 +0200, Michal Simek wrote:
> >> On 10/04/2012 09:15 PM, Ben Hutchings wrote:
> >>> On Thu, 2012-10-04 at 20:14 +0200, Michal Simek wrote:
> >>>> Just show current setting in bootlog.
> >>> [...]
> >>>> --- a/drivers/net/ethernet/xilinx/ll_temac_main.c
> >>>> +++ b/drivers/net/ethernet/xilinx/ll_temac_main.c
> >>>> @@ -1052,12 +1052,14 @@ static int __devinit temac_of_probe(struct platform_device *op)
> >>>> /* Setup checksum offload, but default to off if not specified */
> >>>> lp->temac_features = 0;
> >>>> p = (__be32 *)of_get_property(op->dev.of_node, "xlnx,txcsum", NULL);
> >>>> + dev_info(&op->dev, "TX_CSUM %d\n", be32_to_cpup(p));
> >>>> if (p && be32_to_cpu(*p)) {
> >>>> lp->temac_features |= TEMAC_FEATURE_TX_CSUM;
> >>>> /* Can checksum TCP/UDP over IPv4. */
> >>>> ndev->features |= NETIF_F_IP_CSUM;
> >>>> }
> >>>> p = (__be32 *)of_get_property(op->dev.of_node, "xlnx,rxcsum", NULL);
> >>>> + dev_info(&op->dev, "RX_CSUM %d\n", be32_to_cpup(p));
> >>> [...]
> >>>
> >>> Is there any particular reason you think this needs to be logged by
> >>> default, rather than letting users run ethtool -k? I suggest using
> >>> dev_dbg() instead.
> >>
> >> Ok. I have looked at it and there are missing some bits in ndev->features.
> >>
> >> Can you please check that my setting is correct?
> >>
> >> It is SG DMA ip/driver.
> >> ndev->features = NETIF_F_FRAGLIST | NETIF_F_SG
> >
> > NETIF_F_SG only; NETIF_F_FRAGLIST means you can handle skbs chained
> > through the frag_list pointer.
>
> The driver is able to handle skb fragments too. temac_start_xmit
"git grep -w -E 'frag_list|skb_walk_frags|skb_to_sgvec' drivers/net/ethernet/xilinx"
returns nothing in net-next.
[...]
> >> rx Full csum -> NETIF_F_RXCSUM
> >>
> >> Is there any option to support partial csum?
> >
> > There is no need to differentiate these in the device features. For TX
> > the stack needs to know whether to use a software fallback before
> > passing the skb to you, but on RX it looks at the ip_summed field of
> > each skb you pass up.
>
> Hardware can be setup asymmetrically. It means enable CSUM only on RX or TX.
> All combination are valid.
> The point here is if Linux is not able to handle this then we have to
> create logic in the driver to support these options too.
Linux handles this just fine. The point is you don't have to tell the
stack in advance whether or what kind of RX checksum validation your
devices will do. (In fact the only reason that feature flag exists at
all is so that it can be generically exposed through the ethtool API.)
Ben.
--
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH 11/11] net: xilinx: Show csum in bootlog
2012-10-09 16:56 ` Ben Hutchings
@ 2012-10-10 16:06 ` Michal Simek
2012-10-10 16:14 ` Ben Hutchings
0 siblings, 1 reply; 26+ messages in thread
From: Michal Simek @ 2012-10-10 16:06 UTC (permalink / raw)
To: Ben Hutchings
Cc: netdev, linux-kernel, Anirudha Sarangi, John Linn, Grant Likely,
Rob Herring, David S. Miller, John Linn
2012/10/9 Ben Hutchings <bhutchings@solarflare.com>:
> On Tue, 2012-10-09 at 11:08 +0200, Michal Simek wrote:
>> On 10/05/2012 03:51 PM, Ben Hutchings wrote:
>> > On Fri, 2012-10-05 at 11:35 +0200, Michal Simek wrote:
>> >> On 10/04/2012 09:15 PM, Ben Hutchings wrote:
>> >>> On Thu, 2012-10-04 at 20:14 +0200, Michal Simek wrote:
>> >>>> Just show current setting in bootlog.
>> >>> [...]
>> >>>> --- a/drivers/net/ethernet/xilinx/ll_temac_main.c
>> >>>> +++ b/drivers/net/ethernet/xilinx/ll_temac_main.c
>> >>>> @@ -1052,12 +1052,14 @@ static int __devinit temac_of_probe(struct platform_device *op)
>> >>>> /* Setup checksum offload, but default to off if not specified */
>> >>>> lp->temac_features = 0;
>> >>>> p = (__be32 *)of_get_property(op->dev.of_node, "xlnx,txcsum", NULL);
>> >>>> + dev_info(&op->dev, "TX_CSUM %d\n", be32_to_cpup(p));
>> >>>> if (p && be32_to_cpu(*p)) {
>> >>>> lp->temac_features |= TEMAC_FEATURE_TX_CSUM;
>> >>>> /* Can checksum TCP/UDP over IPv4. */
>> >>>> ndev->features |= NETIF_F_IP_CSUM;
>> >>>> }
>> >>>> p = (__be32 *)of_get_property(op->dev.of_node, "xlnx,rxcsum", NULL);
>> >>>> + dev_info(&op->dev, "RX_CSUM %d\n", be32_to_cpup(p));
>> >>> [...]
>> >>>
>> >>> Is there any particular reason you think this needs to be logged by
>> >>> default, rather than letting users run ethtool -k? I suggest using
>> >>> dev_dbg() instead.
>> >>
>> >> Ok. I have looked at it and there are missing some bits in ndev->features.
>> >>
>> >> Can you please check that my setting is correct?
>> >>
>> >> It is SG DMA ip/driver.
>> >> ndev->features = NETIF_F_FRAGLIST | NETIF_F_SG
>> >
>> > NETIF_F_SG only; NETIF_F_FRAGLIST means you can handle skbs chained
>> > through the frag_list pointer.
>>
>> The driver is able to handle skb fragments too. temac_start_xmit
>
> "git grep -w -E 'frag_list|skb_walk_frags|skb_to_sgvec' drivers/net/ethernet/xilinx"
> returns nothing in net-next.
What about this? Maybe it is different fragmentation.
drivers/net/ethernet/xilinx/ll_temac_main.c
688 num_frag = skb_shinfo(skb)->nr_frags;
689 frag = &skb_shinfo(skb)->frags[0];
>
> [...]
>> >> rx Full csum -> NETIF_F_RXCSUM
>> >>
>> >> Is there any option to support partial csum?
>> >
>> > There is no need to differentiate these in the device features. For TX
>> > the stack needs to know whether to use a software fallback before
>> > passing the skb to you, but on RX it looks at the ip_summed field of
>> > each skb you pass up.
>>
>> Hardware can be setup asymmetrically. It means enable CSUM only on RX or TX.
>> All combination are valid.
>> The point here is if Linux is not able to handle this then we have to
>> create logic in the driver to support these options too.
>
> Linux handles this just fine. The point is you don't have to tell the
> stack in advance whether or what kind of RX checksum validation your
> devices will do. (In fact the only reason that feature flag exists at
> all is so that it can be generically exposed through the ethtool API.)
Ok.
Thanks,
Michal
--
Michal Simek, Ing. (M.Eng)
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/
Microblaze U-BOOT custodian
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH 11/11] net: xilinx: Show csum in bootlog
2012-10-10 16:06 ` Michal Simek
@ 2012-10-10 16:14 ` Ben Hutchings
0 siblings, 0 replies; 26+ messages in thread
From: Ben Hutchings @ 2012-10-10 16:14 UTC (permalink / raw)
To: Michal Simek
Cc: netdev, linux-kernel, Anirudha Sarangi, John Linn, Grant Likely,
Rob Herring, David S. Miller, John Linn
On Wed, 2012-10-10 at 18:06 +0200, Michal Simek wrote:
> 2012/10/9 Ben Hutchings <bhutchings@solarflare.com>:
> > On Tue, 2012-10-09 at 11:08 +0200, Michal Simek wrote:
> >> On 10/05/2012 03:51 PM, Ben Hutchings wrote:
> >> > On Fri, 2012-10-05 at 11:35 +0200, Michal Simek wrote:
> >> >> On 10/04/2012 09:15 PM, Ben Hutchings wrote:
> >> >>> On Thu, 2012-10-04 at 20:14 +0200, Michal Simek wrote:
> >> >>>> Just show current setting in bootlog.
> >> >>> [...]
> >> >>>> --- a/drivers/net/ethernet/xilinx/ll_temac_main.c
> >> >>>> +++ b/drivers/net/ethernet/xilinx/ll_temac_main.c
> >> >>>> @@ -1052,12 +1052,14 @@ static int __devinit temac_of_probe(struct platform_device *op)
> >> >>>> /* Setup checksum offload, but default to off if not specified */
> >> >>>> lp->temac_features = 0;
> >> >>>> p = (__be32 *)of_get_property(op->dev.of_node, "xlnx,txcsum", NULL);
> >> >>>> + dev_info(&op->dev, "TX_CSUM %d\n", be32_to_cpup(p));
> >> >>>> if (p && be32_to_cpu(*p)) {
> >> >>>> lp->temac_features |= TEMAC_FEATURE_TX_CSUM;
> >> >>>> /* Can checksum TCP/UDP over IPv4. */
> >> >>>> ndev->features |= NETIF_F_IP_CSUM;
> >> >>>> }
> >> >>>> p = (__be32 *)of_get_property(op->dev.of_node, "xlnx,rxcsum", NULL);
> >> >>>> + dev_info(&op->dev, "RX_CSUM %d\n", be32_to_cpup(p));
> >> >>> [...]
> >> >>>
> >> >>> Is there any particular reason you think this needs to be logged by
> >> >>> default, rather than letting users run ethtool -k? I suggest using
> >> >>> dev_dbg() instead.
> >> >>
> >> >> Ok. I have looked at it and there are missing some bits in ndev->features.
> >> >>
> >> >> Can you please check that my setting is correct?
> >> >>
> >> >> It is SG DMA ip/driver.
> >> >> ndev->features = NETIF_F_FRAGLIST | NETIF_F_SG
> >> >
> >> > NETIF_F_SG only; NETIF_F_FRAGLIST means you can handle skbs chained
> >> > through the frag_list pointer.
> >>
> >> The driver is able to handle skb fragments too. temac_start_xmit
> >
> > "git grep -w -E 'frag_list|skb_walk_frags|skb_to_sgvec' drivers/net/ethernet/xilinx"
> > returns nothing in net-next.
>
> What about this? Maybe it is different fragmentation.
> drivers/net/ethernet/xilinx/ll_temac_main.c
> 688 num_frag = skb_shinfo(skb)->nr_frags;
> 689 frag = &skb_shinfo(skb)->frags[0];
[...]
Yes, the fact that you handle the frags array is indicated by feature
flag NETIF_F_SG.
Ben.
--
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 01/11] net: axienet: Remove NETIF_F_SG dropping for no checksum feature
2012-10-04 18:14 [PATCH 01/11] net: axienet: Remove NETIF_F_SG dropping for no checksum feature Michal Simek
` (9 preceding siblings ...)
2012-10-04 18:14 ` [PATCH 11/11] net: xilinx: Show csum in bootlog Michal Simek
@ 2012-10-04 18:26 ` David Miller
2012-10-05 5:22 ` Michal Simek
10 siblings, 1 reply; 26+ messages in thread
From: David Miller @ 2012-10-04 18:26 UTC (permalink / raw)
To: monstr
Cc: netdev, linux-kernel, anirudh, John.Linn, grant.likely, rob.herring
Sorry, no.
I've announced on netdev very clearly that net-next submissions are not
appropriate at this time and that only pure bug fixes should be submitted.
Watch for the announcement on netdev of net-next openning up after the
merge window closes, that's when you should resubmit this series.
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH 01/11] net: axienet: Remove NETIF_F_SG dropping for no checksum feature
2012-10-04 18:26 ` [PATCH 01/11] net: axienet: Remove NETIF_F_SG dropping for no checksum feature David Miller
@ 2012-10-05 5:22 ` Michal Simek
0 siblings, 0 replies; 26+ messages in thread
From: Michal Simek @ 2012-10-05 5:22 UTC (permalink / raw)
To: David Miller
Cc: netdev, linux-kernel, anirudh, John.Linn, grant.likely, rob.herring
Hi David,
On 10/04/2012 08:26 PM, David Miller wrote:
>
> Sorry, no.
>
> I've announced on netdev very clearly that net-next submissions are not
> appropriate at this time and that only pure bug fixes should be submitted.
>
> Watch for the announcement on netdev of net-next openning up after the
> merge window closes, that's when you should resubmit this series.
Sorry I should label it as RFC.
Thanks,
Michal
--
Michal Simek, Ing. (M.Eng)
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/
Microblaze U-BOOT custodian
^ permalink raw reply [flat|nested] 26+ messages in thread