2015-05-21 21:47:40

by Nathan Sullivan

Subject: [PATCH] net: macb: Disable half duplex gigabit on Zynq

According to the Zynq TRM, gigabit half duplex is not supported. Add a
new cap and compatible string so Zynq can avoid advertising that mode.

Signed-off-by: Nathan Sullivan <[email protected]>
---
drivers/net/ethernet/cadence/macb.c | 12 ++++++++++++
drivers/net/ethernet/cadence/macb.h | 1 +
2 files changed, 13 insertions(+)

diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
index 61aa570..e7c0ef6 100644
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@ -350,6 +350,9 @@ static int macb_mii_probe(struct net_device *dev)
else
phydev->supported &= PHY_BASIC_FEATURES;

+ if (bp->caps & MACB_CAPS_NO_GIGABIT_HALF)
+ phydev->supported &= ~SUPPORTED_1000baseT_Half;
+
phydev->advertising = phydev->supported;

bp->link = 0;
@@ -2693,6 +2696,14 @@ static const struct macb_config emac_config = {
.init = at91ether_init,
};

+static const struct macb_config zynq_config = {
+ .caps = MACB_CAPS_SG_DISABLED | MACB_CAPS_GIGABIT_MODE_AVAILABLE |
+ MACB_CAPS_NO_GIGABIT_HALF,
+ .dma_burst_length = 16,
+ .clk_init = macb_clk_init,
+ .init = macb_init,
+};
+
static const struct of_device_id macb_dt_ids[] = {
{ .compatible = "cdns,at32ap7000-macb" },
{ .compatible = "cdns,at91sam9260-macb", .data = &at91sam9260_config },
@@ -2703,6 +2714,7 @@ static const struct of_device_id macb_dt_ids[] = {
{ .compatible = "atmel,sama5d4-gem", .data = &sama5d4_config },
{ .compatible = "cdns,at91rm9200-emac", .data = &emac_config },
{ .compatible = "cdns,emac", .data = &emac_config },
+ { .compatible = "cdns,zynq-gem", .data = &zynq_config },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, macb_dt_ids);
diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h
index eb7d76f..24b1d9b 100644
--- a/drivers/net/ethernet/cadence/macb.h
+++ b/drivers/net/ethernet/cadence/macb.h
@@ -393,6 +393,7 @@
#define MACB_CAPS_ISR_CLEAR_ON_WRITE 0x00000001
#define MACB_CAPS_USRIO_HAS_CLKEN 0x00000002
#define MACB_CAPS_USRIO_DEFAULT_IS_MII 0x00000004
+#define MACB_CAPS_NO_GIGABIT_HALF 0x00000008
#define MACB_CAPS_FIFO_MODE 0x10000000
#define MACB_CAPS_GIGABIT_MODE_AVAILABLE 0x20000000
#define MACB_CAPS_SG_DISABLED 0x40000000
--
1.7.10.4

2015-05-21 21:57:08

by Soren Brinkmann

Subject: Re: [PATCH] net: macb: Disable half duplex gigabit on Zynq

On Thu, 2015-05-21 at 04:47PM -0500, Nathan Sullivan wrote:
> According to the Zynq TRM, gigabit half duplex is not supported. Add a
> new cap and compatible string so Zynq can avoid advertising that mode.
>
> Signed-off-by: Nathan Sullivan <[email protected]>
> ---
> drivers/net/ethernet/cadence/macb.c | 12 ++++++++++++
> drivers/net/ethernet/cadence/macb.h | 1 +
> 2 files changed, 13 insertions(+)
>
> diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
> index 61aa570..e7c0ef6 100644
> --- a/drivers/net/ethernet/cadence/macb.c
> +++ b/drivers/net/ethernet/cadence/macb.c
> @@ -350,6 +350,9 @@ static int macb_mii_probe(struct net_device *dev)
> else
> phydev->supported &= PHY_BASIC_FEATURES;
>
> + if (bp->caps & MACB_CAPS_NO_GIGABIT_HALF)
> + phydev->supported &= ~SUPPORTED_1000baseT_Half;
> +
> phydev->advertising = phydev->supported;
>
> bp->link = 0;
> @@ -2693,6 +2696,14 @@ static const struct macb_config emac_config = {
> .init = at91ether_init,
> };
>
> +static const struct macb_config zynq_config = {
> + .caps = MACB_CAPS_SG_DISABLED | MACB_CAPS_GIGABIT_MODE_AVAILABLE |
> + MACB_CAPS_NO_GIGABIT_HALF,
> + .dma_burst_length = 16,
> + .clk_init = macb_clk_init,
> + .init = macb_init,
> +};
> +
> static const struct of_device_id macb_dt_ids[] = {
> { .compatible = "cdns,at32ap7000-macb" },
> { .compatible = "cdns,at91sam9260-macb", .data = &at91sam9260_config },
> @@ -2703,6 +2714,7 @@ static const struct of_device_id macb_dt_ids[] = {
> { .compatible = "atmel,sama5d4-gem", .data = &sama5d4_config },
> { .compatible = "cdns,at91rm9200-emac", .data = &emac_config },
> { .compatible = "cdns,emac", .data = &emac_config },
> + { .compatible = "cdns,zynq-gem", .data = &zynq_config },

I wanted to add something like that already to sort out the clocks in a
better way, but never got to it. So, ACK at least for this part, but it
needs to be documented in the binding documentation.

Sören