← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/net/e1000e/82571.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/net/e1000e/82571.c
300
300
                func->set_lan_id = e1000_set_lan_id_single_port;
301
301
                func->check_mng_mode = e1000e_check_mng_mode_generic;
302
302
                func->led_on = e1000e_led_on_generic;
 
303
                func->blink_led = e1000e_blink_led_generic;
303
304
 
304
305
                /* FWSM register */
305
306
                mac->has_fwsm = true;
320
321
        default:
321
322
                func->check_mng_mode = e1000e_check_mng_mode_generic;
322
323
                func->led_on = e1000e_led_on_generic;
 
324
                func->blink_led = e1000e_blink_led_generic;
323
325
 
324
326
                /* FWSM register */
325
327
                mac->has_fwsm = true;
431
433
        case e1000_82573:
432
434
        case e1000_82574:
433
435
        case e1000_82583:
434
 
                /* Disable ASPM L0s due to hardware errata */
435
 
                e1000e_disable_aspm(adapter->pdev, PCIE_LINK_STATE_L0S);
436
 
 
437
436
                if (pdev->device == E1000_DEV_ID_82573L) {
438
437
                        adapter->flags |= FLAG_HAS_JUMBO_FRAMES;
439
438
                        adapter->max_hw_frame_size = DEFAULT_JUMBO;
594
593
 
595
594
                extcnf_ctrl |= E1000_EXTCNF_CTRL_MDIO_SW_OWNERSHIP;
596
595
 
597
 
                msleep(2);
 
596
                usleep_range(2000, 4000);
598
597
                i++;
599
598
        } while (i < MDIO_OWNERSHIP_TIMEOUT);
600
599
 
816
815
 
817
816
        /* Check for pending operations. */
818
817
        for (i = 0; i < E1000_FLASH_UPDATES; i++) {
819
 
                msleep(1);
 
818
                usleep_range(1000, 2000);
820
819
                if ((er32(EECD) & E1000_EECD_FLUPD) == 0)
821
820
                        break;
822
821
        }
840
839
        ew32(EECD, eecd);
841
840
 
842
841
        for (i = 0; i < E1000_FLASH_UPDATES; i++) {
843
 
                msleep(1);
 
842
                usleep_range(1000, 2000);
844
843
                if ((er32(EECD) & E1000_EECD_FLUPD) == 0)
845
844
                        break;
846
845
        }
930
929
                if (er32(EEMNGCTL) &
931
930
                    E1000_NVM_CFG_DONE_PORT_0)
932
931
                        break;
933
 
                msleep(1);
 
932
                usleep_range(1000, 2000);
934
933
                timeout--;
935
934
        }
936
935
        if (!timeout) {
1037
1036
        ew32(TCTL, E1000_TCTL_PSP);
1038
1037
        e1e_flush();
1039
1038
 
1040
 
        msleep(10);
 
1039
        usleep_range(10000, 20000);
1041
1040
 
1042
1041
        /*
1043
1042
         * Must acquire the MDIO ownership before MAC reset.
2066
2065
                                  | FLAG_HAS_SMART_POWER_DOWN
2067
2066
                                  | FLAG_HAS_AMT
2068
2067
                                  | FLAG_HAS_SWSM_ON_LOAD,
2069
 
        .flags2                 = FLAG2_DISABLE_ASPM_L1,
 
2068
        .flags2                 = FLAG2_DISABLE_ASPM_L1
 
2069
                                  | FLAG2_DISABLE_ASPM_L0S,
2070
2070
        .pba                    = 20,
2071
2071
        .max_hw_frame_size      = ETH_FRAME_LEN + ETH_FCS_LEN,
2072
2072
        .get_variants           = e1000_get_variants_82571,
2086
2086
                                  | FLAG_HAS_SMART_POWER_DOWN
2087
2087
                                  | FLAG_HAS_AMT
2088
2088
                                  | FLAG_HAS_CTRLEXT_ON_LOAD,
2089
 
        .flags2                   = FLAG2_CHECK_PHY_HANG,
 
2089
        .flags2                   = FLAG2_CHECK_PHY_HANG
 
2090
                                  | FLAG2_DISABLE_ASPM_L0S,
2090
2091
        .pba                    = 32,
2091
2092
        .max_hw_frame_size      = DEFAULT_JUMBO,
2092
2093
        .get_variants           = e1000_get_variants_82571,
2104
2105
                                  | FLAG_HAS_SMART_POWER_DOWN
2105
2106
                                  | FLAG_HAS_AMT
2106
2107
                                  | FLAG_HAS_CTRLEXT_ON_LOAD,
 
2108
        .flags2                 = FLAG2_DISABLE_ASPM_L0S,
2107
2109
        .pba                    = 32,
2108
2110
        .max_hw_frame_size      = ETH_FRAME_LEN + ETH_FCS_LEN,
2109
2111
        .get_variants           = e1000_get_variants_82571,