Commit 237de6ef authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'hip04' 



Ding Tianhong says:

====================
add hisilicon hip04 ethernet driver

v13:
- Fix the problem of alignment parameters for function and checkpatch warming.

v12:
- According Alex's suggestion, modify the changelog and add MODULE_DEVICE_TABLE
  for hip04 ethernet.

v11:
- Add ethtool support for tx coalecse getting and setting, the xmit_more
  is not supported for this patch, but I think it could work for hip04,
  will support it later after some tests for performance better.

  Here are some performance test results by ping and iperf(add tx_coalesce_frames/users),
  it looks that the performance and latency is more better by tx_coalesce_frames/usecs.

  - Before:
    $ ping 192.168.1.1 ...
    === 192.168.1.1 ping statistics ===
    24 packets transmitted, 24 received, 0% packet loss, time 22999ms
    rtt min/avg/max/mdev = 0.180/0.202/0.403/0.043 ms

    $ iperf -c 192.168.1.1 ...
    [ ID] Interval       Transfer     Bandwidth
    [  3]  0.0- 1.0 sec   115 MBytes   945 Mbits/sec

  - After:
    $ ping 192.168.1.1 ...
    === 192.168.1.1 ping statistics ===
    24 packets transmitted, 24 received, 0% packet loss, time 22999ms
    rtt min/avg/max/mdev = 0.178/0.190/0.380/0.041 ms

    $ iperf -c 192.168.1.1 ...
    [ ID] Interval       Transfer     Bandwidth
    [  3]  0.0- 1.0 sec   115 MBytes   965 Mbits/sec

v10:
- According Arnd's suggestion, remove the skb_orphan and use the hrtimer
  for the cleanup of the TX queue and add some modification for the hip04
  drivers.
  1) drop the broken skb_orphan call
  2) drop the workqueue
  3) batch cleanup based on tx_coalesce_frames/usecs for better throughput
  4) use a reasonable default tx timeout (200us, could be shorted
     based on measurements) with a range timer
  5) fix napi poll function return value
  6) use a lockless queue for cleanup

v9:
- There is no tx completion interrupts to free DMAd Tx packets, it means taht
  we rely on new tx packets arriving to run the destructors of completed packets,
  which open up space in their sockets's send queues. Sometimes we don't get such
  new packets causing Tx to stall, a single UDP transmitter is a good example of
  this situation, so we need a clean up workqueue to reclaims completed packets,
  the workqueue will only free the last packets which is already stay for several jiffies.
  Also fix some format cleanups.

v8:
- Use poll to reclaim xmitted buffer as workaround since no tx done interrupt

v7:
- Remove select NET_CORE in 0002

v6:
- Suggest by Russell: Use netdev_sent_queue & netdev_completed_queue to solve latency issue
  Also shorten the period of timer, which is used to wakeup the queue since no
  tx completed interrupt.

v5:
- no big change, fix typo

v4:
- Modify accoringly to the suggetion from Arnd, Florian, Eric, David
  Use of_parse_phandle_with_fixed_args & syscon_node_to_regmap get ppe info
  Add skb_orphan() and tx_timer for reclaim since no tx_finished interrupt
  Update timeout, and move of_phy_connect to probe to reuse open/stop

v3:
- Suggest from Arnd, use syscon & regmap_write/read to replace static void __iomem *ppebase.
  Modify hisilicon-hip04-net.txt accrordingly to suggestion from Florian and Sergei.

v2:
- Got many suggestions from Russell, Arnd, Florian, Mark and Sergei
  Remove memcpy, use dma_map/unmap_single, use dma_alloc_coherent rather than dma_pool, etc.
  Refer property in ethernet.txt, change ppe description, etc.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3ff13f1c a41ea46a

Documentation/devicetree/bindings/net/hisilicon-hip04-net.txt

0 → 100644
+88 −0
Original line number Diff line number Diff line 
Hisilicon hip04 Ethernet Controller



* Ethernet controller node



Required properties:

- compatible: should be "hisilicon,hip04-mac".

- reg: address and length of the register set for the device.

- interrupts: interrupt for the device.

- port-handle: <phandle port channel>

	phandle, specifies a reference to the syscon ppe node

	port, port number connected to the controller

	channel, recv channel start from channel * number (RX_DESC_NUM)

- phy-mode: see ethernet.txt [1].



Optional properties:

- phy-handle: see ethernet.txt [1].



[1] Documentation/devicetree/bindings/net/ethernet.txt





* Ethernet ppe node:

Control rx & tx fifos of all ethernet controllers.

Have 2048 recv channels shared by all ethernet controllers, only if no overlap.

Each controller's recv channel start from channel * number (RX_DESC_NUM).



Required properties:

- compatible: "hisilicon,hip04-ppe", "syscon".

- reg: address and length of the register set for the device.





* MDIO bus node:



Required properties:



- compatible: should be "hisilicon,hip04-mdio".

- Inherits from MDIO bus node binding [2]

[2] Documentation/devicetree/bindings/net/phy.txt



Example:

	mdio {

		compatible = "hisilicon,hip04-mdio";

		reg = <0x28f1000 0x1000>;

		#address-cells = <1>;

		#size-cells = <0>;



		phy0: ethernet-phy@0 {

			compatible = "ethernet-phy-ieee802.3-c22";

			reg = <0>;

			marvell,reg-init = <18 0x14 0 0x8001>;

		};



		phy1: ethernet-phy@1 {

			compatible = "ethernet-phy-ieee802.3-c22";

			reg = <1>;

			marvell,reg-init = <18 0x14 0 0x8001>;

		};

	};



	ppe: ppe@28c0000 {

		compatible = "hisilicon,hip04-ppe", "syscon";

		reg = <0x28c0000 0x10000>;

	};



	fe: ethernet@28b0000 {

		compatible = "hisilicon,hip04-mac";

		reg = <0x28b0000 0x10000>;

		interrupts = <0 413 4>;

		phy-mode = "mii";

		port-handle = <&ppe 31 0>;

	};



	ge0: ethernet@2800000 {

		compatible = "hisilicon,hip04-mac";

		reg = <0x2800000 0x10000>;

		interrupts = <0 402 4>;

		phy-mode = "sgmii";

		port-handle = <&ppe 0 1>;

		phy-handle = <&phy0>;

	};



	ge8: ethernet@2880000 {

		compatible = "hisilicon,hip04-mac";

		reg = <0x2880000 0x10000>;

		interrupts = <0 410 4>;

		phy-mode = "sgmii";

		port-handle = <&ppe 8 2>;

		phy-handle = <&phy1>;

	};

drivers/net/ethernet/hisilicon/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -24,4 +24,13 @@ config HIX5HD2_GMAC 
	help

	  This selects the hix5hd2 mac family network device.



config HIP04_ETH

	tristate "HISILICON P04 Ethernet support"

	select PHYLIB

	select MARVELL_PHY

	select MFD_SYSCON

	---help---

	  If you wish to compile a kernel for a hardware with hisilicon p04 SoC and

	  want to use the internal ethernet then you should answer Y to this.



endif # NET_VENDOR_HISILICON

drivers/net/ethernet/hisilicon/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -3,3 +3,4 @@ 
#



obj-$(CONFIG_HIX5HD2_GMAC) += hix5hd2_gmac.o

obj-$(CONFIG_HIP04_ETH) += hip04_mdio.o hip04_eth.o

drivers/net/ethernet/hisilicon/hip04_eth.c

0 → 100644
+969 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/hisilicon/hip04_mdio.c

0 → 100644
+186 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2014 Linaro Ltd.

 * Copyright (c) 2014 Hisilicon Limited.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 */



#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/io.h>

#include <linux/of_mdio.h>

#include <linux/delay.h>



#define MDIO_CMD_REG		0x0

#define MDIO_ADDR_REG		0x4

#define MDIO_WDATA_REG		0x8

#define MDIO_RDATA_REG		0xc

#define MDIO_STA_REG		0x10



#define MDIO_START		BIT(14)

#define MDIO_R_VALID		BIT(1)

#define MDIO_READ	        (BIT(12) | BIT(11) | MDIO_START)

#define MDIO_WRITE	        (BIT(12) | BIT(10) | MDIO_START)



struct hip04_mdio_priv {

	void __iomem *base;

};



#define WAIT_TIMEOUT 10

static int hip04_mdio_wait_ready(struct mii_bus *bus)

{

	struct hip04_mdio_priv *priv = bus->priv;

	int i;



	for (i = 0; readl_relaxed(priv->base + MDIO_CMD_REG) & MDIO_START; i++) {

		if (i == WAIT_TIMEOUT)

			return -ETIMEDOUT;

		msleep(20);

	}



	return 0;

}



static int hip04_mdio_read(struct mii_bus *bus, int mii_id, int regnum)

{

	struct hip04_mdio_priv *priv = bus->priv;

	u32 val;

	int ret;



	ret = hip04_mdio_wait_ready(bus);

	if (ret < 0)

		goto out;



	val = regnum | (mii_id << 5) | MDIO_READ;

	writel_relaxed(val, priv->base + MDIO_CMD_REG);



	ret = hip04_mdio_wait_ready(bus);

	if (ret < 0)

		goto out;



	val = readl_relaxed(priv->base + MDIO_STA_REG);

	if (val & MDIO_R_VALID) {

		dev_err(bus->parent, "SMI bus read not valid\n");

		ret = -ENODEV;

		goto out;

	}



	val = readl_relaxed(priv->base + MDIO_RDATA_REG);

	ret = val & 0xFFFF;

out:

	return ret;

}



static int hip04_mdio_write(struct mii_bus *bus, int mii_id,

			    int regnum, u16 value)

{

	struct hip04_mdio_priv *priv = bus->priv;

	u32 val;

	int ret;



	ret = hip04_mdio_wait_ready(bus);

	if (ret < 0)

		goto out;



	writel_relaxed(value, priv->base + MDIO_WDATA_REG);

	val = regnum | (mii_id << 5) | MDIO_WRITE;

	writel_relaxed(val, priv->base + MDIO_CMD_REG);

out:

	return ret;

}



static int hip04_mdio_reset(struct mii_bus *bus)

{

	int temp, i;



	for (i = 0; i < PHY_MAX_ADDR; i++) {

		hip04_mdio_write(bus, i, 22, 0);

		temp = hip04_mdio_read(bus, i, MII_BMCR);

		if (temp < 0)

			continue;



		temp |= BMCR_RESET;

		if (hip04_mdio_write(bus, i, MII_BMCR, temp) < 0)

			continue;

	}



	mdelay(500);

	return 0;

}



static int hip04_mdio_probe(struct platform_device *pdev)

{

	struct resource *r;

	struct mii_bus *bus;

	struct hip04_mdio_priv *priv;

	int ret;



	bus = mdiobus_alloc_size(sizeof(struct hip04_mdio_priv));

	if (!bus) {

		dev_err(&pdev->dev, "Cannot allocate MDIO bus\n");

		return -ENOMEM;

	}



	bus->name = "hip04_mdio_bus";

	bus->read = hip04_mdio_read;

	bus->write = hip04_mdio_write;

	bus->reset = hip04_mdio_reset;

	snprintf(bus->id, MII_BUS_ID_SIZE, "%s-mii", dev_name(&pdev->dev));

	bus->parent = &pdev->dev;

	priv = bus->priv;



	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	priv->base = devm_ioremap_resource(&pdev->dev, r);

	if (IS_ERR(priv->base)) {

		ret = PTR_ERR(priv->base);

		goto out_mdio;

	}



	ret = of_mdiobus_register(bus, pdev->dev.of_node);

	if (ret < 0) {

		dev_err(&pdev->dev, "Cannot register MDIO bus (%d)\n", ret);

		goto out_mdio;

	}



	platform_set_drvdata(pdev, bus);



	return 0;



out_mdio:

	mdiobus_free(bus);

	return ret;

}



static int hip04_mdio_remove(struct platform_device *pdev)

{

	struct mii_bus *bus = platform_get_drvdata(pdev);



	mdiobus_unregister(bus);

	mdiobus_free(bus);



	return 0;

}



static const struct of_device_id hip04_mdio_match[] = {

	{ .compatible = "hisilicon,hip04-mdio" },

	{ }

};

MODULE_DEVICE_TABLE(of, hip04_mdio_match);



static struct platform_driver hip04_mdio_driver = {

	.probe = hip04_mdio_probe,

	.remove = hip04_mdio_remove,

	.driver = {

		.name = "hip04-mdio",

		.owner = THIS_MODULE,

		.of_match_table = hip04_mdio_match,

	},

};



module_platform_driver(hip04_mdio_driver);



MODULE_DESCRIPTION("HISILICON P04 MDIO interface driver");

MODULE_LICENSE("GPL v2");

MODULE_ALIAS("platform:hip04-mdio");

CRA Git | Maintained and supported by SUSTech CRA and CCSE