aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Kirsher <jeffrey.t.kirsher@intel.com>2006-01-12 19:51:25 -0500
committerJeff Garzik <jgarzik@pobox.com>2006-01-17 07:48:04 -0500
commitfb3d47d4c4cd79eeddd0ee1b470e157840dccf21 (patch)
tree7328582b0ce82e9956b8fda1a129c6f6a335c368
parenta2917e22dcaa53e8ad2d8dc3bcfa55a4b04e6d0f (diff)
[PATCH] e1000: Added PCIe bus information
This is two patches, the first is adding additional bus information for the 8257{1|2|3} controllers. The second patch was orginally a community patch to print bus type/speed/width, and enhanced by us. Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
-rw-r--r--drivers/net/e1000/e1000_main.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index ca4e5e9255d2..75cd6dfbaa37 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -807,6 +807,26 @@ e1000_probe(struct pci_dev *pdev,
807 if(eeprom_data & eeprom_apme_mask) 807 if(eeprom_data & eeprom_apme_mask)
808 adapter->wol |= E1000_WUFC_MAG; 808 adapter->wol |= E1000_WUFC_MAG;
809 809
810 /* print bus type/speed/width info */
811 {
812 struct e1000_hw *hw = &adapter->hw;
813 DPRINTK(PROBE, INFO, "(PCI%s:%s:%s) ",
814 ((hw->bus_type == e1000_bus_type_pcix) ? "-X" :
815 (hw->bus_type == e1000_bus_type_pci_express ? " Express":"")),
816 ((hw->bus_speed == e1000_bus_speed_2500) ? "2.5Gb/s" :
817 (hw->bus_speed == e1000_bus_speed_133) ? "133MHz" :
818 (hw->bus_speed == e1000_bus_speed_120) ? "120MHz" :
819 (hw->bus_speed == e1000_bus_speed_100) ? "100MHz" :
820 (hw->bus_speed == e1000_bus_speed_66) ? "66MHz" : "33MHz"),
821 ((hw->bus_width == e1000_bus_width_64) ? "64-bit" :
822 (hw->bus_width == e1000_bus_width_pciex_4) ? "Width x4" :
823 (hw->bus_width == e1000_bus_width_pciex_1) ? "Width x1" :
824 "32-bit"));
825 }
826
827 for (i = 0; i < 6; i++)
828 printk("%2.2x%c", netdev->dev_addr[i], i == 5 ? '\n' : ':');
829
810 /* reset the hardware with the new settings */ 830 /* reset the hardware with the new settings */
811 e1000_reset(adapter); 831 e1000_reset(adapter);
812 832