[PATCH net 0/2] tg3: Update copyright and fix for tx timeout with 5762

[PATCH net 0/2] tg3: Update copyright and fix for tx timeout with 5762

[Siva Reddy Kallam]

From: Siva Reddy Kallam <siva.kallam@broadcom.com>

First patch:
        Update copyright

Second patch:
        Add higher cpu clock for 5762

Sanjeev Bansal (1):
  tg3: Add higher cpu clock for 5762.

Siva Reddy Kallam (1):
  tg3: Update copyright

 drivers/net/ethernet/broadcom/tg3.c | 17 +++++++++++++----
 drivers/net/ethernet/broadcom/tg3.h |  4 ++--
 2 files changed, 15 insertions(+), 6 deletions(-)

-- 
1.8.3.1

[PATCH net 1/2] tg3: Update copyright

[Siva Reddy Kallam]

From: Siva Reddy Kallam <siva.kallam@broadcom.com>

Signed-off-by: Siva Reddy Kallam <siva.kallam@broadcom.com>
Reviewed-by: Michael Chan <michael.chan@broadcom.com>
---
 drivers/net/ethernet/broadcom/tg3.c | 4 ++++
 drivers/net/ethernet/broadcom/tg3.h | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index 3be87ef..2ee1527 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -6,11 +6,15 @@
  * Copyright (C) 2004 Sun Microsystems Inc.
  * Copyright (C) 2005-2016 Broadcom Corporation.
  * Copyright (C) 2016-2017 Broadcom Limited.
+ * Copyright (C) 2018 Broadcom. All Rights Reserved. The term "Broadcom"
+ * refers to Broadcom Inc. and/or its subsidiaries.
  *
  * Firmware is:
  *	Derived from proprietary unpublished source code,
  *	Copyright (C) 2000-2016 Broadcom Corporation.
  *	Copyright (C) 2016-2017 Broadcom Ltd.
+ *	Copyright (C) 2018 Broadcom. All Rights Reserved. The term "Broadcom"
+ *	refers to Broadcom Inc. and/or its subsidiaries.
  *
  *	Permission is hereby granted for the distribution of this firmware
  *	data in hexadecimal or equivalent format, provided this copyright
diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
index 1d61aa3..a772a33 100644
--- a/drivers/net/ethernet/broadcom/tg3.h
+++ b/drivers/net/ethernet/broadcom/tg3.h
@@ -7,6 +7,8 @@
  * Copyright (C) 2004 Sun Microsystems Inc.
  * Copyright (C) 2007-2016 Broadcom Corporation.
  * Copyright (C) 2016-2017 Broadcom Limited.
+ * Copyright (C) 2018 Broadcom. All Rights Reserved. The term "Broadcom"
+ * refers to Broadcom Inc. and/or its subsidiaries.
  */
 
 #ifndef _T3_H
-- 
1.8.3.1

[PATCH net 2/2] tg3: Add higher cpu clock for 5762.

[Siva Reddy Kallam]

From: Sanjeev Bansal <sanjeevb.bansal@broadcom.com>

This patch has fix for TX timeout while running bi-directional
traffic with 100 Mbps using 5762.

Signed-off-by: Sanjeev Bansal <sanjeevb.bansal@broadcom.com>
Signed-off-by: Siva Reddy Kallam <siva.kallam@broadcom.com>
Reviewed-by: Michael Chan <michael.chan@broadcom.com>
---
 drivers/net/ethernet/broadcom/tg3.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index 2ee1527..aa1374d 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -9294,6 +9294,15 @@ static int tg3_chip_reset(struct tg3 *tp)
 
 	tg3_restore_clk(tp);
 
+	/* Increase the core clock speed to fix tx timeout issue for 5762
+	 * with 100Mbps link speed.
+	 */
+	if (tg3_asic_rev(tp) == ASIC_REV_5762) {
+		val = tr32(TG3_CPMU_CLCK_ORIDE_ENABLE);
+		tw32(TG3_CPMU_CLCK_ORIDE_ENABLE, val |
+		     TG3_CPMU_MAC_ORIDE_ENABLE);
+	}
+
 	/* Reprobe ASF enable state.  */
 	tg3_flag_clear(tp, ENABLE_ASF);
 	tp->phy_flags &= ~(TG3_PHYFLG_1G_ON_VAUX_OK |
-- 
1.8.3.1

Re: [PATCH net 0/2] tg3: Update copyright and fix for tx timeout with 5762

[David Miller]

From: Siva Reddy Kallam <siva.kallam@broadom.com>
Date: Mon, 16 Jul 2018 11:13:30 +0530

> From: Siva Reddy Kallam <siva.kallam@broadcom.com>
> 
> First patch:
>         Update copyright
> 
> Second patch:
>         Add higher cpu clock for 5762

Series applied, thank you.