igb: move timesync init into a seperate function
Current code is quite large and making igb_probe difficult to read. Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
0e15439ae5
commit
115f459a53
1 changed files with 65 additions and 50 deletions
|
@ -1566,56 +1566,6 @@ static int __devinit igb_probe(struct pci_dev *pdev,
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
switch (hw->mac.type) {
|
|
||||||
case e1000_82576:
|
|
||||||
/*
|
|
||||||
* Initialize hardware timer: we keep it running just in case
|
|
||||||
* that some program needs it later on.
|
|
||||||
*/
|
|
||||||
memset(&adapter->cycles, 0, sizeof(adapter->cycles));
|
|
||||||
adapter->cycles.read = igb_read_clock;
|
|
||||||
adapter->cycles.mask = CLOCKSOURCE_MASK(64);
|
|
||||||
adapter->cycles.mult = 1;
|
|
||||||
/**
|
|
||||||
* Scale the NIC clock cycle by a large factor so that
|
|
||||||
* relatively small clock corrections can be added or
|
|
||||||
* substracted at each clock tick. The drawbacks of a large
|
|
||||||
* factor are a) that the clock register overflows more quickly
|
|
||||||
* (not such a big deal) and b) that the increment per tick has
|
|
||||||
* to fit into 24 bits. As a result we need to use a shift of
|
|
||||||
* 19 so we can fit a value of 16 into the TIMINCA register.
|
|
||||||
*/
|
|
||||||
adapter->cycles.shift = IGB_82576_TSYNC_SHIFT;
|
|
||||||
wr32(E1000_TIMINCA,
|
|
||||||
(1 << E1000_TIMINCA_16NS_SHIFT) |
|
|
||||||
(16 << IGB_82576_TSYNC_SHIFT));
|
|
||||||
|
|
||||||
/* Set registers so that rollover occurs soon to test this. */
|
|
||||||
wr32(E1000_SYSTIML, 0x00000000);
|
|
||||||
wr32(E1000_SYSTIMH, 0xFF800000);
|
|
||||||
wrfl();
|
|
||||||
|
|
||||||
timecounter_init(&adapter->clock,
|
|
||||||
&adapter->cycles,
|
|
||||||
ktime_to_ns(ktime_get_real()));
|
|
||||||
/*
|
|
||||||
* Synchronize our NIC clock against system wall clock. NIC
|
|
||||||
* time stamp reading requires ~3us per sample, each sample
|
|
||||||
* was pretty stable even under load => only require 10
|
|
||||||
* samples for each offset comparison.
|
|
||||||
*/
|
|
||||||
memset(&adapter->compare, 0, sizeof(adapter->compare));
|
|
||||||
adapter->compare.source = &adapter->clock;
|
|
||||||
adapter->compare.target = ktime_get_real;
|
|
||||||
adapter->compare.num_samples = 10;
|
|
||||||
timecompare_update(&adapter->compare, 0);
|
|
||||||
break;
|
|
||||||
case e1000_82575:
|
|
||||||
/* 82575 does not support timesync */
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
dev_info(&pdev->dev, "Intel(R) Gigabit Ethernet Network Connection\n");
|
dev_info(&pdev->dev, "Intel(R) Gigabit Ethernet Network Connection\n");
|
||||||
/* print bus type/speed/width info */
|
/* print bus type/speed/width info */
|
||||||
dev_info(&pdev->dev, "%s: (PCIe:%s:%s) %pM\n",
|
dev_info(&pdev->dev, "%s: (PCIe:%s:%s) %pM\n",
|
||||||
|
@ -1781,6 +1731,70 @@ static void __devinit igb_probe_vfs(struct igb_adapter * adapter)
|
||||||
#endif /* CONFIG_PCI_IOV */
|
#endif /* CONFIG_PCI_IOV */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* igb_init_hw_timer - Initialize hardware timer used with IEEE 1588 timestamp
|
||||||
|
* @adapter: board private structure to initialize
|
||||||
|
*
|
||||||
|
* igb_init_hw_timer initializes the function pointer and values for the hw
|
||||||
|
* timer found in hardware.
|
||||||
|
**/
|
||||||
|
static void igb_init_hw_timer(struct igb_adapter *adapter)
|
||||||
|
{
|
||||||
|
struct e1000_hw *hw = &adapter->hw;
|
||||||
|
|
||||||
|
switch (hw->mac.type) {
|
||||||
|
case e1000_82576:
|
||||||
|
/*
|
||||||
|
* Initialize hardware timer: we keep it running just in case
|
||||||
|
* that some program needs it later on.
|
||||||
|
*/
|
||||||
|
memset(&adapter->cycles, 0, sizeof(adapter->cycles));
|
||||||
|
adapter->cycles.read = igb_read_clock;
|
||||||
|
adapter->cycles.mask = CLOCKSOURCE_MASK(64);
|
||||||
|
adapter->cycles.mult = 1;
|
||||||
|
/**
|
||||||
|
* Scale the NIC clock cycle by a large factor so that
|
||||||
|
* relatively small clock corrections can be added or
|
||||||
|
* substracted at each clock tick. The drawbacks of a large
|
||||||
|
* factor are a) that the clock register overflows more quickly
|
||||||
|
* (not such a big deal) and b) that the increment per tick has
|
||||||
|
* to fit into 24 bits. As a result we need to use a shift of
|
||||||
|
* 19 so we can fit a value of 16 into the TIMINCA register.
|
||||||
|
*/
|
||||||
|
adapter->cycles.shift = IGB_82576_TSYNC_SHIFT;
|
||||||
|
wr32(E1000_TIMINCA,
|
||||||
|
(1 << E1000_TIMINCA_16NS_SHIFT) |
|
||||||
|
(16 << IGB_82576_TSYNC_SHIFT));
|
||||||
|
|
||||||
|
/* Set registers so that rollover occurs soon to test this. */
|
||||||
|
wr32(E1000_SYSTIML, 0x00000000);
|
||||||
|
wr32(E1000_SYSTIMH, 0xFF800000);
|
||||||
|
wrfl();
|
||||||
|
|
||||||
|
timecounter_init(&adapter->clock,
|
||||||
|
&adapter->cycles,
|
||||||
|
ktime_to_ns(ktime_get_real()));
|
||||||
|
/*
|
||||||
|
* Synchronize our NIC clock against system wall clock. NIC
|
||||||
|
* time stamp reading requires ~3us per sample, each sample
|
||||||
|
* was pretty stable even under load => only require 10
|
||||||
|
* samples for each offset comparison.
|
||||||
|
*/
|
||||||
|
memset(&adapter->compare, 0, sizeof(adapter->compare));
|
||||||
|
adapter->compare.source = &adapter->clock;
|
||||||
|
adapter->compare.target = ktime_get_real;
|
||||||
|
adapter->compare.num_samples = 10;
|
||||||
|
timecompare_update(&adapter->compare, 0);
|
||||||
|
break;
|
||||||
|
case e1000_82575:
|
||||||
|
/* 82575 does not support timesync */
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* igb_sw_init - Initialize general software structures (struct igb_adapter)
|
* igb_sw_init - Initialize general software structures (struct igb_adapter)
|
||||||
* @adapter: board private structure to initialize
|
* @adapter: board private structure to initialize
|
||||||
|
@ -1816,6 +1830,7 @@ static int __devinit igb_sw_init(struct igb_adapter *adapter)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
igb_init_hw_timer(adapter);
|
||||||
igb_probe_vfs(adapter);
|
igb_probe_vfs(adapter);
|
||||||
|
|
||||||
/* Explicitly disable IRQ since the NIC can be in any state. */
|
/* Explicitly disable IRQ since the NIC can be in any state. */
|
||||||
|
|
Reference in a new issue