Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=114342f2d38439cb1a54f1f724fa38729b093c48
Commit:     114342f2d38439cb1a54f1f724fa38729b093c48
Parent:     faca94ffaed31528e2e859ee3c26d7d4dba6702f
Author:     Michael Chan <[EMAIL PROTECTED]>
AuthorDate: Mon Oct 15 02:12:26 2007 -0700
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Mon Oct 15 12:26:38 2007 -0700

    [TG3]: Fix performance regression on 5705.
    
    A performance regression was introduced by the following commit:
    
        commit ee6a99b539a50b4e9398938a0a6d37f8bf911550
        Author: Michael Chan <[EMAIL PROTECTED]>
        Date:   Wed Jul 18 21:49:10 2007 -0700
    
        [TG3]: Fix msi issue with kexec/kdump.
    
    In making that change, the PCI latency timer and cache line size
    registers were not restored after chip reset.  On the 5705, the
    latency timer gets reset to 0 during chip reset and this causes
    very poor performance.
    
    Update version to 3.84.
    
    Signed-off-by: Michael Chan <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
 drivers/net/tg3.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 30b1cca..b9e1dc6 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -64,8 +64,8 @@
 
 #define DRV_MODULE_NAME                "tg3"
 #define PFX DRV_MODULE_NAME    ": "
-#define DRV_MODULE_VERSION     "3.83"
-#define DRV_MODULE_RELDATE     "October 10, 2007"
+#define DRV_MODULE_VERSION     "3.84"
+#define DRV_MODULE_RELDATE     "October 12, 2007"
 
 #define TG3_DEF_MAC_MODE       0
 #define TG3_DEF_RX_MODE                0
@@ -5056,6 +5056,12 @@ static void tg3_restore_pci_state(struct tg3 *tp)
 
        pci_write_config_dword(tp->pdev, TG3PCI_COMMAND, tp->pci_cmd);
 
+       if (!(tp->tg3_flags2 & TG3_FLG2_PCI_EXPRESS)) {
+               pci_write_config_byte(tp->pdev, PCI_CACHE_LINE_SIZE,
+                                     tp->pci_cacheline_sz);
+               pci_write_config_byte(tp->pdev, PCI_LATENCY_TIMER,
+                                     tp->pci_lat_timer);
+       }
        /* Make sure PCI-X relaxed ordering bit is clear. */
        if (tp->pcix_cap) {
                u16 pcix_cmd;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to