Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28117b08 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'ravb-r8a7795' 



Simon Horman says:

====================
ravb: Add support for r8a7795 SoC

please consider this series for net-next.
It enhances the ravb driver to support the r8a7795 SoC.

Changes:

* Dropped RFC prefix
* Details in changelog of individual patches

Base:

* net-next/master

Availability:

To aid review of this in conjunction with other EtherAVB changes
the following branches are available in my renesas tree on kernel.org.

* me/r8a7795-ravb-driver-v4: this series
* me/r8a7795-ravb-pfc-v2: r8a7795 sh-pfc update for EthernetAVB
* me/r8a7795-ravb-integration-v4: enable EthernetAVB on r8a7795
* me/r8a7795-ravb-driver-and-integration-v4.runtime:
      the above three branches with their runtime dependencies
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f8e1100a 22d4df8f

Documentation/devicetree/bindings/net/renesas,ravb.txt

+62 −7
Original line number Diff line number Diff line
@@ -6,8 +6,12 @@ interface contains. 
Required properties:

- compatible: "renesas,etheravb-r8a7790" if the device is a part of R8A7790 SoC.

	      "renesas,etheravb-r8a7794" if the device is a part of R8A7794 SoC.

	      "renesas,etheravb-r8a7795" if the device is a part of R8A7795 SoC.

- reg: offset and length of (1) the register block and (2) the stream buffer.

- interrupts: interrupt specifier for the sole interrupt.

- interrupts: A list of interrupt-specifiers, one for each entry in

	      interrupt-names.

	      If interrupt-names is not present, an interrupt specifier

	      for a single muxed interrupt.

- phy-mode: see ethernet.txt file in the same directory.

- phy-handle: see ethernet.txt file in the same directory.

- #address-cells: number of address cells for the MDIO bus, must be equal to 1.
@@ -18,6 +22,12 @@ Required properties: 
Optional properties:

- interrupt-parent: the phandle for the interrupt controller that services

		    interrupts for this device.

- interrupt-names: A list of interrupt names.

		   For the R8A7795 SoC this property is mandatory;

		   it should include one entry per channel, named "ch%u",

		   where %u is the channel number ranging from 0 to 24.

		   For other SoCs this property is optional; if present

		   it should contain "mux" for a single muxed interrupt.

- pinctrl-names: pin configuration state name ("default").

- renesas,no-ether-link: boolean, specify when a board does not provide a proper

			 AVB_LINK signal.
@@ -27,13 +37,46 @@ Optional properties: 
Example:



	ethernet@e6800000 {

		compatible = "renesas,etheravb-r8a7790";

		reg = <0 0xe6800000 0 0x800>, <0 0xee0e8000 0 0x4000>;

		compatible = "renesas,etheravb-r8a7795";

		reg = <0 0xe6800000 0 0x800>, <0 0xe6a00000 0 0x10000>;

		interrupt-parent = <&gic>;

		interrupts = <0 163 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp8_clks R8A7790_CLK_ETHERAVB>;

		phy-mode = "rmii";

		interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "ch0", "ch1", "ch2", "ch3",

				  "ch4", "ch5", "ch6", "ch7",

				  "ch8", "ch9", "ch10", "ch11",

				  "ch12", "ch13", "ch14", "ch15",

				  "ch16", "ch17", "ch18", "ch19",

				  "ch20", "ch21", "ch22", "ch23",

				  "ch24";

		clocks = <&mstp8_clks R8A7795_CLK_ETHERAVB>;

		power-domains = <&cpg_clocks>;

		phy-mode = "rgmii-id";

		phy-handle = <&phy0>;



		pinctrl-0 = <&ether_pins>;

		pinctrl-names = "default";

		renesas,no-ether-link;
@@ -41,8 +84,20 @@ Example: 
		#size-cells = <0>;



		phy0: ethernet-phy@0 {

			rxc-skew-ps = <900>;

			rxdv-skew-ps = <0>;

			rxd0-skew-ps = <0>;

			rxd1-skew-ps = <0>;

			rxd2-skew-ps = <0>;

			rxd3-skew-ps = <0>;

			txc-skew-ps = <900>;

			txen-skew-ps = <0>;

			txd0-skew-ps = <0>;

			txd1-skew-ps = <0>;

			txd2-skew-ps = <0>;

			txd3-skew-ps = <0>;

			reg = <0>;

			interrupt-parent = <&gpio2>;

			interrupts = <15 IRQ_TYPE_LEVEL_LOW>;

			interrupts = <11 IRQ_TYPE_LEVEL_LOW>;

		};

	};

drivers/net/ethernet/renesas/ravb.h

+7 −0
Original line number Diff line number Diff line
@@ -766,6 +766,11 @@ struct ravb_ptp { 
	struct ravb_ptp_perout perout[N_PER_OUT];

};



enum ravb_chip_id {

	RCAR_GEN2,

	RCAR_GEN3,

};



struct ravb_private {

	struct net_device *ndev;

	struct platform_device *pdev;
@@ -806,6 +811,8 @@ struct ravb_private { 
	int msg_enable;

	int speed;

	int duplex;

	int emac_irq;

	enum ravb_chip_id chip_id;



	unsigned no_avb_link:1;

	unsigned avb_link_active_low:1;

drivers/net/ethernet/renesas/ravb_main.c

+74 −27
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ static void ravb_ring_free(struct net_device *ndev, int q) 
	if (priv->rx_ring[q]) {

		ring_size = sizeof(struct ravb_ex_rx_desc) *

			    (priv->num_rx_ring[q] + 1);

		dma_free_coherent(NULL, ring_size, priv->rx_ring[q],

		dma_free_coherent(ndev->dev.parent, ring_size, priv->rx_ring[q],

				  priv->rx_desc_dma[q]);

		priv->rx_ring[q] = NULL;

	}
@@ -209,7 +209,7 @@ static void ravb_ring_free(struct net_device *ndev, int q) 
	if (priv->tx_ring[q]) {

		ring_size = sizeof(struct ravb_tx_desc) *

			    (priv->num_tx_ring[q] * NUM_TX_DESC + 1);

		dma_free_coherent(NULL, ring_size, priv->tx_ring[q],

		dma_free_coherent(ndev->dev.parent, ring_size, priv->tx_ring[q],

				  priv->tx_desc_dma[q]);

		priv->tx_ring[q] = NULL;

	}
@@ -240,13 +240,13 @@ static void ravb_ring_format(struct net_device *ndev, int q) 
		rx_desc = &priv->rx_ring[q][i];

		/* The size of the buffer should be on 16-byte boundary. */

		rx_desc->ds_cc = cpu_to_le16(ALIGN(PKT_BUF_SZ, 16));

		dma_addr = dma_map_single(&ndev->dev, priv->rx_skb[q][i]->data,

		dma_addr = dma_map_single(ndev->dev.parent, priv->rx_skb[q][i]->data,

					  ALIGN(PKT_BUF_SZ, 16),

					  DMA_FROM_DEVICE);

		/* We just set the data size to 0 for a failed mapping which

		 * should prevent DMA from happening...

		 */

		if (dma_mapping_error(&ndev->dev, dma_addr))

		if (dma_mapping_error(ndev->dev.parent, dma_addr))

			rx_desc->ds_cc = cpu_to_le16(0);

		rx_desc->dptr = cpu_to_le32(dma_addr);

		rx_desc->die_dt = DT_FEMPTY;
@@ -309,7 +309,7 @@ static int ravb_ring_init(struct net_device *ndev, int q) 


	/* Allocate all RX descriptors. */

	ring_size = sizeof(struct ravb_ex_rx_desc) * (priv->num_rx_ring[q] + 1);

	priv->rx_ring[q] = dma_alloc_coherent(NULL, ring_size,

	priv->rx_ring[q] = dma_alloc_coherent(ndev->dev.parent, ring_size,

					      &priv->rx_desc_dma[q],

					      GFP_KERNEL);

	if (!priv->rx_ring[q])
@@ -320,7 +320,7 @@ static int ravb_ring_init(struct net_device *ndev, int q) 
	/* Allocate all TX descriptors. */

	ring_size = sizeof(struct ravb_tx_desc) *

		    (priv->num_tx_ring[q] * NUM_TX_DESC + 1);

	priv->tx_ring[q] = dma_alloc_coherent(NULL, ring_size,

	priv->tx_ring[q] = dma_alloc_coherent(ndev->dev.parent, ring_size,

					      &priv->tx_desc_dma[q],

					      GFP_KERNEL);

	if (!priv->tx_ring[q])
@@ -443,7 +443,7 @@ static int ravb_tx_free(struct net_device *ndev, int q) 
		size = le16_to_cpu(desc->ds_tagl) & TX_DS;

		/* Free the original skb. */

		if (priv->tx_skb[q][entry / NUM_TX_DESC]) {

			dma_unmap_single(&ndev->dev, le32_to_cpu(desc->dptr),

			dma_unmap_single(ndev->dev.parent, le32_to_cpu(desc->dptr),

					 size, DMA_TO_DEVICE);

			/* Last packet descriptor? */

			if (entry % NUM_TX_DESC == NUM_TX_DESC - 1) {
@@ -546,7 +546,7 @@ static bool ravb_rx(struct net_device *ndev, int *quota, int q) 


			skb = priv->rx_skb[q][entry];

			priv->rx_skb[q][entry] = NULL;

			dma_unmap_single(&ndev->dev, le32_to_cpu(desc->dptr),

			dma_unmap_single(ndev->dev.parent, le32_to_cpu(desc->dptr),

					 ALIGN(PKT_BUF_SZ, 16),

					 DMA_FROM_DEVICE);

			get_ts &= (q == RAVB_NC) ?
@@ -586,14 +586,14 @@ static bool ravb_rx(struct net_device *ndev, int *quota, int q) 
			if (!skb)

				break;	/* Better luck next round. */

			ravb_set_buffer_align(skb);

			dma_addr = dma_map_single(&ndev->dev, skb->data,

			dma_addr = dma_map_single(ndev->dev.parent, skb->data,

						  le16_to_cpu(desc->ds_cc),

						  DMA_FROM_DEVICE);

			skb_checksum_none_assert(skb);

			/* We just set the data size to 0 for a failed mapping

			 * which should prevent DMA  from happening...

			 */

			if (dma_mapping_error(&ndev->dev, dma_addr))

			if (dma_mapping_error(ndev->dev.parent, dma_addr))

				desc->ds_cc = cpu_to_le16(0);

			desc->dptr = cpu_to_le32(dma_addr);

			priv->rx_skb[q][entry] = skb;
@@ -889,6 +889,22 @@ static int ravb_phy_init(struct net_device *ndev) 
		return -ENOENT;

	}



	/* This driver only support 10/100Mbit speeds on Gen3

	 * at this time.

	 */

	if (priv->chip_id == RCAR_GEN3) {

		int err;



		err = phy_set_max_speed(phydev, SPEED_100);

		if (err) {

			netdev_err(ndev, "failed to limit PHY to 100Mbit/s\n");

			phy_disconnect(phydev);

			return err;

		}



		netdev_info(ndev, "limited PHY to 100Mbit/s\n");

	}



	netdev_info(ndev, "attached PHY %d (IRQ %d) to driver %s\n",

		    phydev->addr, phydev->irq, phydev->drv->name);
@@ -1197,6 +1213,15 @@ static int ravb_open(struct net_device *ndev) 
		goto out_napi_off;

	}



	if (priv->chip_id == RCAR_GEN3) {

		error = request_irq(priv->emac_irq, ravb_interrupt,

				    IRQF_SHARED, ndev->name, ndev);

		if (error) {

			netdev_err(ndev, "cannot request IRQ\n");

			goto out_free_irq;

		}

	}



	/* Device init */

	error = ravb_dmac_init(ndev);

	if (error)
@@ -1220,6 +1245,7 @@ out_ptp_stop: 
	ravb_ptp_stop(ndev);

out_free_irq:

	free_irq(ndev->irq, ndev);

	free_irq(priv->emac_irq, ndev);

out_napi_off:

	napi_disable(&priv->napi[RAVB_NC]);

	napi_disable(&priv->napi[RAVB_BE]);
@@ -1300,8 +1326,8 @@ static netdev_tx_t ravb_start_xmit(struct sk_buff *skb, struct net_device *ndev) 
		 entry / NUM_TX_DESC * DPTR_ALIGN;

	len = PTR_ALIGN(skb->data, DPTR_ALIGN) - skb->data;

	memcpy(buffer, skb->data, len);

	dma_addr = dma_map_single(&ndev->dev, buffer, len, DMA_TO_DEVICE);

	if (dma_mapping_error(&ndev->dev, dma_addr))

	dma_addr = dma_map_single(ndev->dev.parent, buffer, len, DMA_TO_DEVICE);

	if (dma_mapping_error(ndev->dev.parent, dma_addr))

		goto drop;



	desc = &priv->tx_ring[q][entry];
@@ -1310,8 +1336,8 @@ static netdev_tx_t ravb_start_xmit(struct sk_buff *skb, struct net_device *ndev) 


	buffer = skb->data + len;

	len = skb->len - len;

	dma_addr = dma_map_single(&ndev->dev, buffer, len, DMA_TO_DEVICE);

	if (dma_mapping_error(&ndev->dev, dma_addr))

	dma_addr = dma_map_single(ndev->dev.parent, buffer, len, DMA_TO_DEVICE);

	if (dma_mapping_error(ndev->dev.parent, dma_addr))

		goto unmap;



	desc++;
@@ -1323,7 +1349,7 @@ static netdev_tx_t ravb_start_xmit(struct sk_buff *skb, struct net_device *ndev) 
		ts_skb = kmalloc(sizeof(*ts_skb), GFP_ATOMIC);

		if (!ts_skb) {

			desc--;

			dma_unmap_single(&ndev->dev, dma_addr, len,

			dma_unmap_single(ndev->dev.parent, dma_addr, len,

					 DMA_TO_DEVICE);

			goto unmap;

		}
@@ -1358,7 +1384,7 @@ exit: 
	return NETDEV_TX_OK;



unmap:

	dma_unmap_single(&ndev->dev, le32_to_cpu(desc->dptr),

	dma_unmap_single(ndev->dev.parent, le32_to_cpu(desc->dptr),

			 le16_to_cpu(desc->ds_tagl), DMA_TO_DEVICE);

drop:

	dev_kfree_skb_any(skb);
@@ -1625,10 +1651,20 @@ static int ravb_mdio_release(struct ravb_private *priv) 
	return 0;

}



static const struct of_device_id ravb_match_table[] = {

	{ .compatible = "renesas,etheravb-r8a7790", .data = (void *)RCAR_GEN2 },

	{ .compatible = "renesas,etheravb-r8a7794", .data = (void *)RCAR_GEN2 },

	{ .compatible = "renesas,etheravb-r8a7795", .data = (void *)RCAR_GEN3 },

	{ }

};

MODULE_DEVICE_TABLE(of, ravb_match_table);



static int ravb_probe(struct platform_device *pdev)

{

	struct device_node *np = pdev->dev.of_node;

	const struct of_device_id *match;

	struct ravb_private *priv;

	enum ravb_chip_id chip_id;

	struct net_device *ndev;

	int error, irq, q;

	struct resource *res;
@@ -1657,6 +1693,13 @@ static int ravb_probe(struct platform_device *pdev) 
	/* The Ether-specific entries in the device structure. */

	ndev->base_addr = res->start;

	ndev->dma = -1;



	match = of_match_device(of_match_ptr(ravb_match_table), &pdev->dev);

	chip_id = (enum ravb_chip_id)match->data;



	if (chip_id == RCAR_GEN3)

		irq = platform_get_irq_byname(pdev, "ch22");

	else

		irq = platform_get_irq(pdev, 0);

	if (irq < 0) {

		error = irq;
@@ -1688,6 +1731,17 @@ static int ravb_probe(struct platform_device *pdev) 
	priv->avb_link_active_low =

		of_property_read_bool(np, "renesas,ether-link-active-low");



	if (chip_id == RCAR_GEN3) {

		irq = platform_get_irq_byname(pdev, "ch24");

		if (irq < 0) {

			error = irq;

			goto out_release;

		}

		priv->emac_irq = irq;

	}



	priv->chip_id = chip_id;



	/* Set function */

	ndev->netdev_ops = &ravb_netdev_ops;

	ndev->ethtool_ops = &ravb_ethtool_ops;
@@ -1708,7 +1762,7 @@ static int ravb_probe(struct platform_device *pdev) 


	/* Allocate descriptor base address table */

	priv->desc_bat_size = sizeof(struct ravb_desc) * DBAT_ENTRY_NUM;

	priv->desc_bat = dma_alloc_coherent(NULL, priv->desc_bat_size,

	priv->desc_bat = dma_alloc_coherent(ndev->dev.parent, priv->desc_bat_size,

					    &priv->desc_bat_dma, GFP_KERNEL);

	if (!priv->desc_bat) {

		dev_err(&ndev->dev,
@@ -1763,7 +1817,7 @@ out_napi_del: 
	netif_napi_del(&priv->napi[RAVB_BE]);

	ravb_mdio_release(priv);

out_dma_free:

	dma_free_coherent(NULL, priv->desc_bat_size, priv->desc_bat,

	dma_free_coherent(ndev->dev.parent, priv->desc_bat_size, priv->desc_bat,

			  priv->desc_bat_dma);

out_release:

	if (ndev)
@@ -1779,7 +1833,7 @@ static int ravb_remove(struct platform_device *pdev) 
	struct net_device *ndev = platform_get_drvdata(pdev);

	struct ravb_private *priv = netdev_priv(ndev);



	dma_free_coherent(NULL, priv->desc_bat_size, priv->desc_bat,

	dma_free_coherent(ndev->dev.parent, priv->desc_bat_size, priv->desc_bat,

			  priv->desc_bat_dma);

	/* Set reset mode */

	ravb_write(ndev, CCC_OPC_RESET, CCC);
@@ -1818,13 +1872,6 @@ static const struct dev_pm_ops ravb_dev_pm_ops = { 
#define RAVB_PM_OPS NULL

#endif



static const struct of_device_id ravb_match_table[] = {

	{ .compatible = "renesas,etheravb-r8a7790" },

	{ .compatible = "renesas,etheravb-r8a7794" },

	{ }

};

MODULE_DEVICE_TABLE(of, ravb_match_table);



static struct platform_driver ravb_driver = {

	.probe		= ravb_probe,

	.remove		= ravb_remove,

drivers/net/phy/phy_device.c

+40 −19
Original line number Diff line number Diff line
@@ -1239,36 +1239,57 @@ static int gen10g_resume(struct phy_device *phydev) 
	return 0;

}



static void of_set_phy_supported(struct phy_device *phydev)

static int __set_phy_supported(struct phy_device *phydev, u32 max_speed)

{

	struct device_node *node = phydev->dev.of_node;

	u32 max_speed;



	if (!IS_ENABLED(CONFIG_OF_MDIO))

		return;



	if (!node)

		return;



	if (!of_property_read_u32(node, "max-speed", &max_speed)) {

	/* The default values for phydev->supported are provided by the PHY

		 * driver "features" member, we want to reset to sane defaults fist

	 * driver "features" member, we want to reset to sane defaults first

	 * before supporting higher speeds.

	 */

	phydev->supported &= PHY_DEFAULT_FEATURES;



	switch (max_speed) {

	default:

			return;



		return -ENOTSUPP;

	case SPEED_1000:

		phydev->supported |= PHY_1000BT_FEATURES;

		/* fall through */

	case SPEED_100:

		phydev->supported |= PHY_100BT_FEATURES;

		/* fall through */

	case SPEED_10:

		phydev->supported |= PHY_10BT_FEATURES;

	}



	return 0;

}



int phy_set_max_speed(struct phy_device *phydev, u32 max_speed)

{

	int err;



	err = __set_phy_supported(phydev, max_speed);

	if (err)

		return err;



	phydev->advertising = phydev->supported;



	return 0;

}

EXPORT_SYMBOL(phy_set_max_speed);



static void of_set_phy_supported(struct phy_device *phydev)

{

	struct device_node *node = phydev->dev.of_node;

	u32 max_speed;



	if (!IS_ENABLED(CONFIG_OF_MDIO))

		return;



	if (!node)

		return;



	if (!of_property_read_u32(node, "max-speed", &max_speed))

		__set_phy_supported(phydev, max_speed);

}



/**

include/linux/phy.h

+1 −0
Original line number Diff line number Diff line
@@ -798,6 +798,7 @@ int phy_mii_ioctl(struct phy_device *phydev, struct ifreq *ifr, int cmd); 
int phy_start_interrupts(struct phy_device *phydev);

void phy_print_status(struct phy_device *phydev);

void phy_device_free(struct phy_device *phydev);

int phy_set_max_speed(struct phy_device *phydev, u32 max_speed);



int phy_register_fixup(const char *bus_id, u32 phy_uid, u32 phy_uid_mask,

		       int (*run)(struct phy_device *));