diff options
Diffstat (limited to 'drivers/net/e1000/e1000_ethtool.c')
-rw-r--r-- | drivers/net/e1000/e1000_ethtool.c | 160 |
1 files changed, 80 insertions, 80 deletions
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c index 05e1fb3cf49f..701531e72e7b 100644 --- a/drivers/net/e1000/e1000_ethtool.c +++ b/drivers/net/e1000/e1000_ethtool.c | |||
@@ -36,7 +36,7 @@ extern int e1000_up(struct e1000_adapter *adapter); | |||
36 | extern void e1000_down(struct e1000_adapter *adapter); | 36 | extern void e1000_down(struct e1000_adapter *adapter); |
37 | extern void e1000_reinit_locked(struct e1000_adapter *adapter); | 37 | extern void e1000_reinit_locked(struct e1000_adapter *adapter); |
38 | extern void e1000_reset(struct e1000_adapter *adapter); | 38 | extern void e1000_reset(struct e1000_adapter *adapter); |
39 | extern int e1000_set_spd_dplx(struct e1000_adapter *adapter, uint16_t spddplx); | 39 | extern int e1000_set_spd_dplx(struct e1000_adapter *adapter, u16 spddplx); |
40 | extern int e1000_setup_all_rx_resources(struct e1000_adapter *adapter); | 40 | extern int e1000_setup_all_rx_resources(struct e1000_adapter *adapter); |
41 | extern int e1000_setup_all_tx_resources(struct e1000_adapter *adapter); | 41 | extern int e1000_setup_all_tx_resources(struct e1000_adapter *adapter); |
42 | extern void e1000_free_all_rx_resources(struct e1000_adapter *adapter); | 42 | extern void e1000_free_all_rx_resources(struct e1000_adapter *adapter); |
@@ -289,7 +289,7 @@ e1000_set_pauseparam(struct net_device *netdev, | |||
289 | return retval; | 289 | return retval; |
290 | } | 290 | } |
291 | 291 | ||
292 | static uint32_t | 292 | static u32 |
293 | e1000_get_rx_csum(struct net_device *netdev) | 293 | e1000_get_rx_csum(struct net_device *netdev) |
294 | { | 294 | { |
295 | struct e1000_adapter *adapter = netdev_priv(netdev); | 295 | struct e1000_adapter *adapter = netdev_priv(netdev); |
@@ -297,7 +297,7 @@ e1000_get_rx_csum(struct net_device *netdev) | |||
297 | } | 297 | } |
298 | 298 | ||
299 | static int | 299 | static int |
300 | e1000_set_rx_csum(struct net_device *netdev, uint32_t data) | 300 | e1000_set_rx_csum(struct net_device *netdev, u32 data) |
301 | { | 301 | { |
302 | struct e1000_adapter *adapter = netdev_priv(netdev); | 302 | struct e1000_adapter *adapter = netdev_priv(netdev); |
303 | adapter->rx_csum = data; | 303 | adapter->rx_csum = data; |
@@ -309,14 +309,14 @@ e1000_set_rx_csum(struct net_device *netdev, uint32_t data) | |||
309 | return 0; | 309 | return 0; |
310 | } | 310 | } |
311 | 311 | ||
312 | static uint32_t | 312 | static u32 |
313 | e1000_get_tx_csum(struct net_device *netdev) | 313 | e1000_get_tx_csum(struct net_device *netdev) |
314 | { | 314 | { |
315 | return (netdev->features & NETIF_F_HW_CSUM) != 0; | 315 | return (netdev->features & NETIF_F_HW_CSUM) != 0; |
316 | } | 316 | } |
317 | 317 | ||
318 | static int | 318 | static int |
319 | e1000_set_tx_csum(struct net_device *netdev, uint32_t data) | 319 | e1000_set_tx_csum(struct net_device *netdev, u32 data) |
320 | { | 320 | { |
321 | struct e1000_adapter *adapter = netdev_priv(netdev); | 321 | struct e1000_adapter *adapter = netdev_priv(netdev); |
322 | 322 | ||
@@ -335,7 +335,7 @@ e1000_set_tx_csum(struct net_device *netdev, uint32_t data) | |||
335 | } | 335 | } |
336 | 336 | ||
337 | static int | 337 | static int |
338 | e1000_set_tso(struct net_device *netdev, uint32_t data) | 338 | e1000_set_tso(struct net_device *netdev, u32 data) |
339 | { | 339 | { |
340 | struct e1000_adapter *adapter = netdev_priv(netdev); | 340 | struct e1000_adapter *adapter = netdev_priv(netdev); |
341 | if ((adapter->hw.mac_type < e1000_82544) || | 341 | if ((adapter->hw.mac_type < e1000_82544) || |
@@ -357,7 +357,7 @@ e1000_set_tso(struct net_device *netdev, uint32_t data) | |||
357 | return 0; | 357 | return 0; |
358 | } | 358 | } |
359 | 359 | ||
360 | static uint32_t | 360 | static u32 |
361 | e1000_get_msglevel(struct net_device *netdev) | 361 | e1000_get_msglevel(struct net_device *netdev) |
362 | { | 362 | { |
363 | struct e1000_adapter *adapter = netdev_priv(netdev); | 363 | struct e1000_adapter *adapter = netdev_priv(netdev); |
@@ -365,7 +365,7 @@ e1000_get_msglevel(struct net_device *netdev) | |||
365 | } | 365 | } |
366 | 366 | ||
367 | static void | 367 | static void |
368 | e1000_set_msglevel(struct net_device *netdev, uint32_t data) | 368 | e1000_set_msglevel(struct net_device *netdev, u32 data) |
369 | { | 369 | { |
370 | struct e1000_adapter *adapter = netdev_priv(netdev); | 370 | struct e1000_adapter *adapter = netdev_priv(netdev); |
371 | adapter->msg_enable = data; | 371 | adapter->msg_enable = data; |
@@ -375,7 +375,7 @@ static int | |||
375 | e1000_get_regs_len(struct net_device *netdev) | 375 | e1000_get_regs_len(struct net_device *netdev) |
376 | { | 376 | { |
377 | #define E1000_REGS_LEN 32 | 377 | #define E1000_REGS_LEN 32 |
378 | return E1000_REGS_LEN * sizeof(uint32_t); | 378 | return E1000_REGS_LEN * sizeof(u32); |
379 | } | 379 | } |
380 | 380 | ||
381 | static void | 381 | static void |
@@ -384,10 +384,10 @@ e1000_get_regs(struct net_device *netdev, | |||
384 | { | 384 | { |
385 | struct e1000_adapter *adapter = netdev_priv(netdev); | 385 | struct e1000_adapter *adapter = netdev_priv(netdev); |
386 | struct e1000_hw *hw = &adapter->hw; | 386 | struct e1000_hw *hw = &adapter->hw; |
387 | uint32_t *regs_buff = p; | 387 | u32 *regs_buff = p; |
388 | uint16_t phy_data; | 388 | u16 phy_data; |
389 | 389 | ||
390 | memset(p, 0, E1000_REGS_LEN * sizeof(uint32_t)); | 390 | memset(p, 0, E1000_REGS_LEN * sizeof(u32)); |
391 | 391 | ||
392 | regs->version = (1 << 24) | (hw->revision_id << 16) | hw->device_id; | 392 | regs->version = (1 << 24) | (hw->revision_id << 16) | hw->device_id; |
393 | 393 | ||
@@ -412,44 +412,44 @@ e1000_get_regs(struct net_device *netdev, | |||
412 | IGP01E1000_PHY_AGC_A); | 412 | IGP01E1000_PHY_AGC_A); |
413 | e1000_read_phy_reg(hw, IGP01E1000_PHY_AGC_A & | 413 | e1000_read_phy_reg(hw, IGP01E1000_PHY_AGC_A & |
414 | IGP01E1000_PHY_PAGE_SELECT, &phy_data); | 414 | IGP01E1000_PHY_PAGE_SELECT, &phy_data); |
415 | regs_buff[13] = (uint32_t)phy_data; /* cable length */ | 415 | regs_buff[13] = (u32)phy_data; /* cable length */ |
416 | e1000_write_phy_reg(hw, IGP01E1000_PHY_PAGE_SELECT, | 416 | e1000_write_phy_reg(hw, IGP01E1000_PHY_PAGE_SELECT, |
417 | IGP01E1000_PHY_AGC_B); | 417 | IGP01E1000_PHY_AGC_B); |
418 | e1000_read_phy_reg(hw, IGP01E1000_PHY_AGC_B & | 418 | e1000_read_phy_reg(hw, IGP01E1000_PHY_AGC_B & |
419 | IGP01E1000_PHY_PAGE_SELECT, &phy_data); | 419 | IGP01E1000_PHY_PAGE_SELECT, &phy_data); |
420 | regs_buff[14] = (uint32_t)phy_data; /* cable length */ | 420 | regs_buff[14] = (u32)phy_data; /* cable length */ |
421 | e1000_write_phy_reg(hw, IGP01E1000_PHY_PAGE_SELECT, | 421 | e1000_write_phy_reg(hw, IGP01E1000_PHY_PAGE_SELECT, |
422 | IGP01E1000_PHY_AGC_C); | 422 | IGP01E1000_PHY_AGC_C); |
423 | e1000_read_phy_reg(hw, IGP01E1000_PHY_AGC_C & | 423 | e1000_read_phy_reg(hw, IGP01E1000_PHY_AGC_C & |
424 | IGP01E1000_PHY_PAGE_SELECT, &phy_data); | 424 | IGP01E1000_PHY_PAGE_SELECT, &phy_data); |
425 | regs_buff[15] = (uint32_t)phy_data; /* cable length */ | 425 | regs_buff[15] = (u32)phy_data; /* cable length */ |
426 | e1000_write_phy_reg(hw, IGP01E1000_PHY_PAGE_SELECT, | 426 | e1000_write_phy_reg(hw, IGP01E1000_PHY_PAGE_SELECT, |
427 | IGP01E1000_PHY_AGC_D); | 427 | IGP01E1000_PHY_AGC_D); |
428 | e1000_read_phy_reg(hw, IGP01E1000_PHY_AGC_D & | 428 | e1000_read_phy_reg(hw, IGP01E1000_PHY_AGC_D & |
429 | IGP01E1000_PHY_PAGE_SELECT, &phy_data); | 429 | IGP01E1000_PHY_PAGE_SELECT, &phy_data); |
430 | regs_buff[16] = (uint32_t)phy_data; /* cable length */ | 430 | regs_buff[16] = (u32)phy_data; /* cable length */ |
431 | regs_buff[17] = 0; /* extended 10bt distance (not needed) */ | 431 | regs_buff[17] = 0; /* extended 10bt distance (not needed) */ |
432 | e1000_write_phy_reg(hw, IGP01E1000_PHY_PAGE_SELECT, 0x0); | 432 | e1000_write_phy_reg(hw, IGP01E1000_PHY_PAGE_SELECT, 0x0); |
433 | e1000_read_phy_reg(hw, IGP01E1000_PHY_PORT_STATUS & | 433 | e1000_read_phy_reg(hw, IGP01E1000_PHY_PORT_STATUS & |
434 | IGP01E1000_PHY_PAGE_SELECT, &phy_data); | 434 | IGP01E1000_PHY_PAGE_SELECT, &phy_data); |
435 | regs_buff[18] = (uint32_t)phy_data; /* cable polarity */ | 435 | regs_buff[18] = (u32)phy_data; /* cable polarity */ |
436 | e1000_write_phy_reg(hw, IGP01E1000_PHY_PAGE_SELECT, | 436 | e1000_write_phy_reg(hw, IGP01E1000_PHY_PAGE_SELECT, |
437 | IGP01E1000_PHY_PCS_INIT_REG); | 437 | IGP01E1000_PHY_PCS_INIT_REG); |
438 | e1000_read_phy_reg(hw, IGP01E1000_PHY_PCS_INIT_REG & | 438 | e1000_read_phy_reg(hw, IGP01E1000_PHY_PCS_INIT_REG & |
439 | IGP01E1000_PHY_PAGE_SELECT, &phy_data); | 439 | IGP01E1000_PHY_PAGE_SELECT, &phy_data); |
440 | regs_buff[19] = (uint32_t)phy_data; /* cable polarity */ | 440 | regs_buff[19] = (u32)phy_data; /* cable polarity */ |
441 | regs_buff[20] = 0; /* polarity correction enabled (always) */ | 441 | regs_buff[20] = 0; /* polarity correction enabled (always) */ |
442 | regs_buff[22] = 0; /* phy receive errors (unavailable) */ | 442 | regs_buff[22] = 0; /* phy receive errors (unavailable) */ |
443 | regs_buff[23] = regs_buff[18]; /* mdix mode */ | 443 | regs_buff[23] = regs_buff[18]; /* mdix mode */ |
444 | e1000_write_phy_reg(hw, IGP01E1000_PHY_PAGE_SELECT, 0x0); | 444 | e1000_write_phy_reg(hw, IGP01E1000_PHY_PAGE_SELECT, 0x0); |
445 | } else { | 445 | } else { |
446 | e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_STATUS, &phy_data); | 446 | e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_STATUS, &phy_data); |
447 | regs_buff[13] = (uint32_t)phy_data; /* cable length */ | 447 | regs_buff[13] = (u32)phy_data; /* cable length */ |
448 | regs_buff[14] = 0; /* Dummy (to align w/ IGP phy reg dump) */ | 448 | regs_buff[14] = 0; /* Dummy (to align w/ IGP phy reg dump) */ |
449 | regs_buff[15] = 0; /* Dummy (to align w/ IGP phy reg dump) */ | 449 | regs_buff[15] = 0; /* Dummy (to align w/ IGP phy reg dump) */ |
450 | regs_buff[16] = 0; /* Dummy (to align w/ IGP phy reg dump) */ | 450 | regs_buff[16] = 0; /* Dummy (to align w/ IGP phy reg dump) */ |
451 | e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_data); | 451 | e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_data); |
452 | regs_buff[17] = (uint32_t)phy_data; /* extended 10bt distance */ | 452 | regs_buff[17] = (u32)phy_data; /* extended 10bt distance */ |
453 | regs_buff[18] = regs_buff[13]; /* cable polarity */ | 453 | regs_buff[18] = regs_buff[13]; /* cable polarity */ |
454 | regs_buff[19] = 0; /* Dummy (to align w/ IGP phy reg dump) */ | 454 | regs_buff[19] = 0; /* Dummy (to align w/ IGP phy reg dump) */ |
455 | regs_buff[20] = regs_buff[17]; /* polarity correction */ | 455 | regs_buff[20] = regs_buff[17]; /* polarity correction */ |
@@ -459,7 +459,7 @@ e1000_get_regs(struct net_device *netdev, | |||
459 | } | 459 | } |
460 | regs_buff[21] = adapter->phy_stats.idle_errors; /* phy idle errors */ | 460 | regs_buff[21] = adapter->phy_stats.idle_errors; /* phy idle errors */ |
461 | e1000_read_phy_reg(hw, PHY_1000T_STATUS, &phy_data); | 461 | e1000_read_phy_reg(hw, PHY_1000T_STATUS, &phy_data); |
462 | regs_buff[24] = (uint32_t)phy_data; /* phy local receiver status */ | 462 | regs_buff[24] = (u32)phy_data; /* phy local receiver status */ |
463 | regs_buff[25] = regs_buff[24]; /* phy remote receiver status */ | 463 | regs_buff[25] = regs_buff[24]; /* phy remote receiver status */ |
464 | if (hw->mac_type >= e1000_82540 && | 464 | if (hw->mac_type >= e1000_82540 && |
465 | hw->mac_type < e1000_82571 && | 465 | hw->mac_type < e1000_82571 && |
@@ -477,14 +477,14 @@ e1000_get_eeprom_len(struct net_device *netdev) | |||
477 | 477 | ||
478 | static int | 478 | static int |
479 | e1000_get_eeprom(struct net_device *netdev, | 479 | e1000_get_eeprom(struct net_device *netdev, |
480 | struct ethtool_eeprom *eeprom, uint8_t *bytes) | 480 | struct ethtool_eeprom *eeprom, u8 *bytes) |
481 | { | 481 | { |
482 | struct e1000_adapter *adapter = netdev_priv(netdev); | 482 | struct e1000_adapter *adapter = netdev_priv(netdev); |
483 | struct e1000_hw *hw = &adapter->hw; | 483 | struct e1000_hw *hw = &adapter->hw; |
484 | uint16_t *eeprom_buff; | 484 | u16 *eeprom_buff; |
485 | int first_word, last_word; | 485 | int first_word, last_word; |
486 | int ret_val = 0; | 486 | int ret_val = 0; |
487 | uint16_t i; | 487 | u16 i; |
488 | 488 | ||
489 | if (eeprom->len == 0) | 489 | if (eeprom->len == 0) |
490 | return -EINVAL; | 490 | return -EINVAL; |
@@ -494,7 +494,7 @@ e1000_get_eeprom(struct net_device *netdev, | |||
494 | first_word = eeprom->offset >> 1; | 494 | first_word = eeprom->offset >> 1; |
495 | last_word = (eeprom->offset + eeprom->len - 1) >> 1; | 495 | last_word = (eeprom->offset + eeprom->len - 1) >> 1; |
496 | 496 | ||
497 | eeprom_buff = kmalloc(sizeof(uint16_t) * | 497 | eeprom_buff = kmalloc(sizeof(u16) * |
498 | (last_word - first_word + 1), GFP_KERNEL); | 498 | (last_word - first_word + 1), GFP_KERNEL); |
499 | if (!eeprom_buff) | 499 | if (!eeprom_buff) |
500 | return -ENOMEM; | 500 | return -ENOMEM; |
@@ -514,7 +514,7 @@ e1000_get_eeprom(struct net_device *netdev, | |||
514 | for (i = 0; i < last_word - first_word + 1; i++) | 514 | for (i = 0; i < last_word - first_word + 1; i++) |
515 | le16_to_cpus(&eeprom_buff[i]); | 515 | le16_to_cpus(&eeprom_buff[i]); |
516 | 516 | ||
517 | memcpy(bytes, (uint8_t *)eeprom_buff + (eeprom->offset & 1), | 517 | memcpy(bytes, (u8 *)eeprom_buff + (eeprom->offset & 1), |
518 | eeprom->len); | 518 | eeprom->len); |
519 | kfree(eeprom_buff); | 519 | kfree(eeprom_buff); |
520 | 520 | ||
@@ -523,14 +523,14 @@ e1000_get_eeprom(struct net_device *netdev, | |||
523 | 523 | ||
524 | static int | 524 | static int |
525 | e1000_set_eeprom(struct net_device *netdev, | 525 | e1000_set_eeprom(struct net_device *netdev, |
526 | struct ethtool_eeprom *eeprom, uint8_t *bytes) | 526 | struct ethtool_eeprom *eeprom, u8 *bytes) |
527 | { | 527 | { |
528 | struct e1000_adapter *adapter = netdev_priv(netdev); | 528 | struct e1000_adapter *adapter = netdev_priv(netdev); |
529 | struct e1000_hw *hw = &adapter->hw; | 529 | struct e1000_hw *hw = &adapter->hw; |
530 | uint16_t *eeprom_buff; | 530 | u16 *eeprom_buff; |
531 | void *ptr; | 531 | void *ptr; |
532 | int max_len, first_word, last_word, ret_val = 0; | 532 | int max_len, first_word, last_word, ret_val = 0; |
533 | uint16_t i; | 533 | u16 i; |
534 | 534 | ||
535 | if (eeprom->len == 0) | 535 | if (eeprom->len == 0) |
536 | return -EOPNOTSUPP; | 536 | return -EOPNOTSUPP; |
@@ -590,7 +590,7 @@ e1000_get_drvinfo(struct net_device *netdev, | |||
590 | { | 590 | { |
591 | struct e1000_adapter *adapter = netdev_priv(netdev); | 591 | struct e1000_adapter *adapter = netdev_priv(netdev); |
592 | char firmware_version[32]; | 592 | char firmware_version[32]; |
593 | uint16_t eeprom_data; | 593 | u16 eeprom_data; |
594 | 594 | ||
595 | strncpy(drvinfo->driver, e1000_driver_name, 32); | 595 | strncpy(drvinfo->driver, e1000_driver_name, 32); |
596 | strncpy(drvinfo->version, e1000_driver_version, 32); | 596 | strncpy(drvinfo->version, e1000_driver_version, 32); |
@@ -674,13 +674,13 @@ e1000_set_ringparam(struct net_device *netdev, | |||
674 | adapter->tx_ring = txdr; | 674 | adapter->tx_ring = txdr; |
675 | adapter->rx_ring = rxdr; | 675 | adapter->rx_ring = rxdr; |
676 | 676 | ||
677 | rxdr->count = max(ring->rx_pending,(uint32_t)E1000_MIN_RXD); | 677 | rxdr->count = max(ring->rx_pending,(u32)E1000_MIN_RXD); |
678 | rxdr->count = min(rxdr->count,(uint32_t)(mac_type < e1000_82544 ? | 678 | rxdr->count = min(rxdr->count,(u32)(mac_type < e1000_82544 ? |
679 | E1000_MAX_RXD : E1000_MAX_82544_RXD)); | 679 | E1000_MAX_RXD : E1000_MAX_82544_RXD)); |
680 | rxdr->count = ALIGN(rxdr->count, REQ_RX_DESCRIPTOR_MULTIPLE); | 680 | rxdr->count = ALIGN(rxdr->count, REQ_RX_DESCRIPTOR_MULTIPLE); |
681 | 681 | ||
682 | txdr->count = max(ring->tx_pending,(uint32_t)E1000_MIN_TXD); | 682 | txdr->count = max(ring->tx_pending,(u32)E1000_MIN_TXD); |
683 | txdr->count = min(txdr->count,(uint32_t)(mac_type < e1000_82544 ? | 683 | txdr->count = min(txdr->count,(u32)(mac_type < e1000_82544 ? |
684 | E1000_MAX_TXD : E1000_MAX_82544_TXD)); | 684 | E1000_MAX_TXD : E1000_MAX_82544_TXD)); |
685 | txdr->count = ALIGN(txdr->count, REQ_TX_DESCRIPTOR_MULTIPLE); | 685 | txdr->count = ALIGN(txdr->count, REQ_TX_DESCRIPTOR_MULTIPLE); |
686 | 686 | ||
@@ -728,13 +728,13 @@ err_setup: | |||
728 | return err; | 728 | return err; |
729 | } | 729 | } |
730 | 730 | ||
731 | static bool reg_pattern_test(struct e1000_adapter *adapter, uint64_t *data, | 731 | static bool reg_pattern_test(struct e1000_adapter *adapter, u64 *data, |
732 | int reg, uint32_t mask, uint32_t write) | 732 | int reg, u32 mask, u32 write) |
733 | { | 733 | { |
734 | static const uint32_t test[] = | 734 | static const u32 test[] = |
735 | {0x5A5A5A5A, 0xA5A5A5A5, 0x00000000, 0xFFFFFFFF}; | 735 | {0x5A5A5A5A, 0xA5A5A5A5, 0x00000000, 0xFFFFFFFF}; |
736 | uint8_t __iomem *address = adapter->hw.hw_addr + reg; | 736 | u8 __iomem *address = adapter->hw.hw_addr + reg; |
737 | uint32_t read; | 737 | u32 read; |
738 | int i; | 738 | int i; |
739 | 739 | ||
740 | for (i = 0; i < ARRAY_SIZE(test); i++) { | 740 | for (i = 0; i < ARRAY_SIZE(test); i++) { |
@@ -751,11 +751,11 @@ static bool reg_pattern_test(struct e1000_adapter *adapter, uint64_t *data, | |||
751 | return false; | 751 | return false; |
752 | } | 752 | } |
753 | 753 | ||
754 | static bool reg_set_and_check(struct e1000_adapter *adapter, uint64_t *data, | 754 | static bool reg_set_and_check(struct e1000_adapter *adapter, u64 *data, |
755 | int reg, uint32_t mask, uint32_t write) | 755 | int reg, u32 mask, u32 write) |
756 | { | 756 | { |
757 | uint8_t __iomem *address = adapter->hw.hw_addr + reg; | 757 | u8 __iomem *address = adapter->hw.hw_addr + reg; |
758 | uint32_t read; | 758 | u32 read; |
759 | 759 | ||
760 | writel(write & mask, address); | 760 | writel(write & mask, address); |
761 | read = readl(address); | 761 | read = readl(address); |
@@ -788,10 +788,10 @@ static bool reg_set_and_check(struct e1000_adapter *adapter, uint64_t *data, | |||
788 | } while (0) | 788 | } while (0) |
789 | 789 | ||
790 | static int | 790 | static int |
791 | e1000_reg_test(struct e1000_adapter *adapter, uint64_t *data) | 791 | e1000_reg_test(struct e1000_adapter *adapter, u64 *data) |
792 | { | 792 | { |
793 | uint32_t value, before, after; | 793 | u32 value, before, after; |
794 | uint32_t i, toggle; | 794 | u32 i, toggle; |
795 | 795 | ||
796 | /* The status register is Read Only, so a write should fail. | 796 | /* The status register is Read Only, so a write should fail. |
797 | * Some bits that get toggled are ignored. | 797 | * Some bits that get toggled are ignored. |
@@ -884,11 +884,11 @@ e1000_reg_test(struct e1000_adapter *adapter, uint64_t *data) | |||
884 | } | 884 | } |
885 | 885 | ||
886 | static int | 886 | static int |
887 | e1000_eeprom_test(struct e1000_adapter *adapter, uint64_t *data) | 887 | e1000_eeprom_test(struct e1000_adapter *adapter, u64 *data) |
888 | { | 888 | { |
889 | uint16_t temp; | 889 | u16 temp; |
890 | uint16_t checksum = 0; | 890 | u16 checksum = 0; |
891 | uint16_t i; | 891 | u16 i; |
892 | 892 | ||
893 | *data = 0; | 893 | *data = 0; |
894 | /* Read and add up the contents of the EEPROM */ | 894 | /* Read and add up the contents of the EEPROM */ |
@@ -901,7 +901,7 @@ e1000_eeprom_test(struct e1000_adapter *adapter, uint64_t *data) | |||
901 | } | 901 | } |
902 | 902 | ||
903 | /* If Checksum is not Correct return error else test passed */ | 903 | /* If Checksum is not Correct return error else test passed */ |
904 | if ((checksum != (uint16_t) EEPROM_SUM) && !(*data)) | 904 | if ((checksum != (u16) EEPROM_SUM) && !(*data)) |
905 | *data = 2; | 905 | *data = 2; |
906 | 906 | ||
907 | return *data; | 907 | return *data; |
@@ -919,12 +919,12 @@ e1000_test_intr(int irq, void *data) | |||
919 | } | 919 | } |
920 | 920 | ||
921 | static int | 921 | static int |
922 | e1000_intr_test(struct e1000_adapter *adapter, uint64_t *data) | 922 | e1000_intr_test(struct e1000_adapter *adapter, u64 *data) |
923 | { | 923 | { |
924 | struct net_device *netdev = adapter->netdev; | 924 | struct net_device *netdev = adapter->netdev; |
925 | uint32_t mask, i = 0; | 925 | u32 mask, i = 0; |
926 | bool shared_int = true; | 926 | bool shared_int = true; |
927 | uint32_t irq = adapter->pdev->irq; | 927 | u32 irq = adapter->pdev->irq; |
928 | 928 | ||
929 | *data = 0; | 929 | *data = 0; |
930 | 930 | ||
@@ -1070,7 +1070,7 @@ e1000_setup_desc_rings(struct e1000_adapter *adapter) | |||
1070 | struct e1000_tx_ring *txdr = &adapter->test_tx_ring; | 1070 | struct e1000_tx_ring *txdr = &adapter->test_tx_ring; |
1071 | struct e1000_rx_ring *rxdr = &adapter->test_rx_ring; | 1071 | struct e1000_rx_ring *rxdr = &adapter->test_rx_ring; |
1072 | struct pci_dev *pdev = adapter->pdev; | 1072 | struct pci_dev *pdev = adapter->pdev; |
1073 | uint32_t rctl; | 1073 | u32 rctl; |
1074 | int i, ret_val; | 1074 | int i, ret_val; |
1075 | 1075 | ||
1076 | /* Setup Tx descriptor ring and Tx buffers */ | 1076 | /* Setup Tx descriptor ring and Tx buffers */ |
@@ -1096,8 +1096,8 @@ e1000_setup_desc_rings(struct e1000_adapter *adapter) | |||
1096 | txdr->next_to_use = txdr->next_to_clean = 0; | 1096 | txdr->next_to_use = txdr->next_to_clean = 0; |
1097 | 1097 | ||
1098 | E1000_WRITE_REG(&adapter->hw, TDBAL, | 1098 | E1000_WRITE_REG(&adapter->hw, TDBAL, |
1099 | ((uint64_t) txdr->dma & 0x00000000FFFFFFFF)); | 1099 | ((u64) txdr->dma & 0x00000000FFFFFFFF)); |
1100 | E1000_WRITE_REG(&adapter->hw, TDBAH, ((uint64_t) txdr->dma >> 32)); | 1100 | E1000_WRITE_REG(&adapter->hw, TDBAH, ((u64) txdr->dma >> 32)); |
1101 | E1000_WRITE_REG(&adapter->hw, TDLEN, | 1101 | E1000_WRITE_REG(&adapter->hw, TDLEN, |
1102 | txdr->count * sizeof(struct e1000_tx_desc)); | 1102 | txdr->count * sizeof(struct e1000_tx_desc)); |
1103 | E1000_WRITE_REG(&adapter->hw, TDH, 0); | 1103 | E1000_WRITE_REG(&adapter->hw, TDH, 0); |
@@ -1153,8 +1153,8 @@ e1000_setup_desc_rings(struct e1000_adapter *adapter) | |||
1153 | rctl = E1000_READ_REG(&adapter->hw, RCTL); | 1153 | rctl = E1000_READ_REG(&adapter->hw, RCTL); |
1154 | E1000_WRITE_REG(&adapter->hw, RCTL, rctl & ~E1000_RCTL_EN); | 1154 | E1000_WRITE_REG(&adapter->hw, RCTL, rctl & ~E1000_RCTL_EN); |
1155 | E1000_WRITE_REG(&adapter->hw, RDBAL, | 1155 | E1000_WRITE_REG(&adapter->hw, RDBAL, |
1156 | ((uint64_t) rxdr->dma & 0xFFFFFFFF)); | 1156 | ((u64) rxdr->dma & 0xFFFFFFFF)); |
1157 | E1000_WRITE_REG(&adapter->hw, RDBAH, ((uint64_t) rxdr->dma >> 32)); | 1157 | E1000_WRITE_REG(&adapter->hw, RDBAH, ((u64) rxdr->dma >> 32)); |
1158 | E1000_WRITE_REG(&adapter->hw, RDLEN, rxdr->size); | 1158 | E1000_WRITE_REG(&adapter->hw, RDLEN, rxdr->size); |
1159 | E1000_WRITE_REG(&adapter->hw, RDH, 0); | 1159 | E1000_WRITE_REG(&adapter->hw, RDH, 0); |
1160 | E1000_WRITE_REG(&adapter->hw, RDT, 0); | 1160 | E1000_WRITE_REG(&adapter->hw, RDT, 0); |
@@ -1202,7 +1202,7 @@ e1000_phy_disable_receiver(struct e1000_adapter *adapter) | |||
1202 | static void | 1202 | static void |
1203 | e1000_phy_reset_clk_and_crs(struct e1000_adapter *adapter) | 1203 | e1000_phy_reset_clk_and_crs(struct e1000_adapter *adapter) |
1204 | { | 1204 | { |
1205 | uint16_t phy_reg; | 1205 | u16 phy_reg; |
1206 | 1206 | ||
1207 | /* Because we reset the PHY above, we need to re-force TX_CLK in the | 1207 | /* Because we reset the PHY above, we need to re-force TX_CLK in the |
1208 | * Extended PHY Specific Control Register to 25MHz clock. This | 1208 | * Extended PHY Specific Control Register to 25MHz clock. This |
@@ -1226,8 +1226,8 @@ e1000_phy_reset_clk_and_crs(struct e1000_adapter *adapter) | |||
1226 | static int | 1226 | static int |
1227 | e1000_nonintegrated_phy_loopback(struct e1000_adapter *adapter) | 1227 | e1000_nonintegrated_phy_loopback(struct e1000_adapter *adapter) |
1228 | { | 1228 | { |
1229 | uint32_t ctrl_reg; | 1229 | u32 ctrl_reg; |
1230 | uint16_t phy_reg; | 1230 | u16 phy_reg; |
1231 | 1231 | ||
1232 | /* Setup the Device Control Register for PHY loopback test. */ | 1232 | /* Setup the Device Control Register for PHY loopback test. */ |
1233 | 1233 | ||
@@ -1293,8 +1293,8 @@ e1000_nonintegrated_phy_loopback(struct e1000_adapter *adapter) | |||
1293 | static int | 1293 | static int |
1294 | e1000_integrated_phy_loopback(struct e1000_adapter *adapter) | 1294 | e1000_integrated_phy_loopback(struct e1000_adapter *adapter) |
1295 | { | 1295 | { |
1296 | uint32_t ctrl_reg = 0; | 1296 | u32 ctrl_reg = 0; |
1297 | uint32_t stat_reg = 0; | 1297 | u32 stat_reg = 0; |
1298 | 1298 | ||
1299 | adapter->hw.autoneg = false; | 1299 | adapter->hw.autoneg = false; |
1300 | 1300 | ||
@@ -1363,8 +1363,8 @@ e1000_integrated_phy_loopback(struct e1000_adapter *adapter) | |||
1363 | static int | 1363 | static int |
1364 | e1000_set_phy_loopback(struct e1000_adapter *adapter) | 1364 | e1000_set_phy_loopback(struct e1000_adapter *adapter) |
1365 | { | 1365 | { |
1366 | uint16_t phy_reg = 0; | 1366 | u16 phy_reg = 0; |
1367 | uint16_t count = 0; | 1367 | u16 count = 0; |
1368 | 1368 | ||
1369 | switch (adapter->hw.mac_type) { | 1369 | switch (adapter->hw.mac_type) { |
1370 | case e1000_82543: | 1370 | case e1000_82543: |
@@ -1416,7 +1416,7 @@ static int | |||
1416 | e1000_setup_loopback_test(struct e1000_adapter *adapter) | 1416 | e1000_setup_loopback_test(struct e1000_adapter *adapter) |
1417 | { | 1417 | { |
1418 | struct e1000_hw *hw = &adapter->hw; | 1418 | struct e1000_hw *hw = &adapter->hw; |
1419 | uint32_t rctl; | 1419 | u32 rctl; |
1420 | 1420 | ||
1421 | if (hw->media_type == e1000_media_type_fiber || | 1421 | if (hw->media_type == e1000_media_type_fiber || |
1422 | hw->media_type == e1000_media_type_internal_serdes) { | 1422 | hw->media_type == e1000_media_type_internal_serdes) { |
@@ -1451,8 +1451,8 @@ static void | |||
1451 | e1000_loopback_cleanup(struct e1000_adapter *adapter) | 1451 | e1000_loopback_cleanup(struct e1000_adapter *adapter) |
1452 | { | 1452 | { |
1453 | struct e1000_hw *hw = &adapter->hw; | 1453 | struct e1000_hw *hw = &adapter->hw; |
1454 | uint32_t rctl; | 1454 | u32 rctl; |
1455 | uint16_t phy_reg; | 1455 | u16 phy_reg; |
1456 | 1456 | ||
1457 | rctl = E1000_READ_REG(hw, RCTL); | 1457 | rctl = E1000_READ_REG(hw, RCTL); |
1458 | rctl &= ~(E1000_RCTL_LBM_TCVR | E1000_RCTL_LBM_MAC); | 1458 | rctl &= ~(E1000_RCTL_LBM_TCVR | E1000_RCTL_LBM_MAC); |
@@ -1578,7 +1578,7 @@ e1000_run_loopback_test(struct e1000_adapter *adapter) | |||
1578 | } | 1578 | } |
1579 | 1579 | ||
1580 | static int | 1580 | static int |
1581 | e1000_loopback_test(struct e1000_adapter *adapter, uint64_t *data) | 1581 | e1000_loopback_test(struct e1000_adapter *adapter, u64 *data) |
1582 | { | 1582 | { |
1583 | /* PHY loopback cannot be performed if SoL/IDER | 1583 | /* PHY loopback cannot be performed if SoL/IDER |
1584 | * sessions are active */ | 1584 | * sessions are active */ |
@@ -1603,7 +1603,7 @@ out: | |||
1603 | } | 1603 | } |
1604 | 1604 | ||
1605 | static int | 1605 | static int |
1606 | e1000_link_test(struct e1000_adapter *adapter, uint64_t *data) | 1606 | e1000_link_test(struct e1000_adapter *adapter, u64 *data) |
1607 | { | 1607 | { |
1608 | *data = 0; | 1608 | *data = 0; |
1609 | if (adapter->hw.media_type == e1000_media_type_internal_serdes) { | 1609 | if (adapter->hw.media_type == e1000_media_type_internal_serdes) { |
@@ -1647,7 +1647,7 @@ e1000_get_sset_count(struct net_device *netdev, int sset) | |||
1647 | 1647 | ||
1648 | static void | 1648 | static void |
1649 | e1000_diag_test(struct net_device *netdev, | 1649 | e1000_diag_test(struct net_device *netdev, |
1650 | struct ethtool_test *eth_test, uint64_t *data) | 1650 | struct ethtool_test *eth_test, u64 *data) |
1651 | { | 1651 | { |
1652 | struct e1000_adapter *adapter = netdev_priv(netdev); | 1652 | struct e1000_adapter *adapter = netdev_priv(netdev); |
1653 | bool if_running = netif_running(netdev); | 1653 | bool if_running = netif_running(netdev); |
@@ -1657,9 +1657,9 @@ e1000_diag_test(struct net_device *netdev, | |||
1657 | /* Offline tests */ | 1657 | /* Offline tests */ |
1658 | 1658 | ||
1659 | /* save speed, duplex, autoneg settings */ | 1659 | /* save speed, duplex, autoneg settings */ |
1660 | uint16_t autoneg_advertised = adapter->hw.autoneg_advertised; | 1660 | u16 autoneg_advertised = adapter->hw.autoneg_advertised; |
1661 | uint8_t forced_speed_duplex = adapter->hw.forced_speed_duplex; | 1661 | u8 forced_speed_duplex = adapter->hw.forced_speed_duplex; |
1662 | uint8_t autoneg = adapter->hw.autoneg; | 1662 | u8 autoneg = adapter->hw.autoneg; |
1663 | 1663 | ||
1664 | DPRINTK(HW, INFO, "offline testing starting\n"); | 1664 | DPRINTK(HW, INFO, "offline testing starting\n"); |
1665 | 1665 | ||
@@ -1877,7 +1877,7 @@ e1000_led_blink_callback(unsigned long data) | |||
1877 | } | 1877 | } |
1878 | 1878 | ||
1879 | static int | 1879 | static int |
1880 | e1000_phys_id(struct net_device *netdev, uint32_t data) | 1880 | e1000_phys_id(struct net_device *netdev, u32 data) |
1881 | { | 1881 | { |
1882 | struct e1000_adapter *adapter = netdev_priv(netdev); | 1882 | struct e1000_adapter *adapter = netdev_priv(netdev); |
1883 | 1883 | ||
@@ -1927,7 +1927,7 @@ e1000_nway_reset(struct net_device *netdev) | |||
1927 | 1927 | ||
1928 | static void | 1928 | static void |
1929 | e1000_get_ethtool_stats(struct net_device *netdev, | 1929 | e1000_get_ethtool_stats(struct net_device *netdev, |
1930 | struct ethtool_stats *stats, uint64_t *data) | 1930 | struct ethtool_stats *stats, u64 *data) |
1931 | { | 1931 | { |
1932 | struct e1000_adapter *adapter = netdev_priv(netdev); | 1932 | struct e1000_adapter *adapter = netdev_priv(netdev); |
1933 | int i; | 1933 | int i; |
@@ -1936,15 +1936,15 @@ e1000_get_ethtool_stats(struct net_device *netdev, | |||
1936 | for (i = 0; i < E1000_GLOBAL_STATS_LEN; i++) { | 1936 | for (i = 0; i < E1000_GLOBAL_STATS_LEN; i++) { |
1937 | char *p = (char *)adapter+e1000_gstrings_stats[i].stat_offset; | 1937 | char *p = (char *)adapter+e1000_gstrings_stats[i].stat_offset; |
1938 | data[i] = (e1000_gstrings_stats[i].sizeof_stat == | 1938 | data[i] = (e1000_gstrings_stats[i].sizeof_stat == |
1939 | sizeof(uint64_t)) ? *(uint64_t *)p : *(uint32_t *)p; | 1939 | sizeof(u64)) ? *(u64 *)p : *(u32 *)p; |
1940 | } | 1940 | } |
1941 | /* BUG_ON(i != E1000_STATS_LEN); */ | 1941 | /* BUG_ON(i != E1000_STATS_LEN); */ |
1942 | } | 1942 | } |
1943 | 1943 | ||
1944 | static void | 1944 | static void |
1945 | e1000_get_strings(struct net_device *netdev, uint32_t stringset, uint8_t *data) | 1945 | e1000_get_strings(struct net_device *netdev, u32 stringset, u8 *data) |
1946 | { | 1946 | { |
1947 | uint8_t *p = data; | 1947 | u8 *p = data; |
1948 | int i; | 1948 | int i; |
1949 | 1949 | ||
1950 | switch (stringset) { | 1950 | switch (stringset) { |