liteeth: do MII/GMII detection in gateware for gmii_mii phy
This commit is contained in:
parent
07b7c2a13f
commit
0b1a2e1022
|
@ -83,58 +83,78 @@ class LiteEthPHYGMIIMIIRX(Module):
|
||||||
|
|
||||||
|
|
||||||
class LiteEthGMIIMIIModeDetection(Module, AutoCSR):
|
class LiteEthGMIIMIIModeDetection(Module, AutoCSR):
|
||||||
def __init__(self):
|
def __init__(self, clk_freq):
|
||||||
self._reset = CSRStorage()
|
|
||||||
self._counter = CSRStatus(32)
|
|
||||||
self._mode = CSRStorage()
|
|
||||||
self.mode = Signal()
|
self.mode = Signal()
|
||||||
|
self._mode = CSRStatus()
|
||||||
|
|
||||||
# # #
|
# # #
|
||||||
|
|
||||||
# Note:
|
mode = Signal()
|
||||||
# For now mode detection is done with gateware and software.
|
update_mode = Signal()
|
||||||
# We will probably do it in gateware in the future
|
self.sync += \
|
||||||
# (we will need to pass clk_freq parameter to PHY)
|
If(update_mode,
|
||||||
|
self.mode.eq(mode)
|
||||||
|
)
|
||||||
|
self.comb += self._mode.status.eq(self.mode)
|
||||||
|
|
||||||
# Principle:
|
# Principle:
|
||||||
# sys_clk >= 125MHz
|
# sys_clk >= 125MHz
|
||||||
# eth_rx <= 125Mhz
|
# eth_rx <= 125Mhz
|
||||||
# We generate a pulse in eth_rx clock domain that increments
|
# We generate ticks every 1024 clock cycles in eth_rx domain
|
||||||
# a counter in sys_clk domain.
|
# and measure ticks period in sys_clk domain.
|
||||||
|
|
||||||
# Generate a pulse every 4 clock cycles (eth_rx clock domain)
|
# Generate a tick every 1024 clock cycles (eth_rx clock domain)
|
||||||
eth_pulse = Signal()
|
eth_tick = Signal()
|
||||||
eth_counter = Signal(2)
|
eth_counter = Signal(10)
|
||||||
self.sync.eth_rx += eth_counter.eq(eth_counter + 1)
|
self.sync.eth_rx += eth_counter.eq(eth_counter + 1)
|
||||||
self.comb += eth_pulse.eq(eth_counter == 0)
|
self.comb += eth_tick.eq(eth_counter == 0)
|
||||||
|
|
||||||
# Synchronize pulse (sys clock domain)
|
# Synchronize tick (sys clock domain)
|
||||||
sys_pulse = Signal()
|
sys_tick = Signal()
|
||||||
eth_ps = PulseSynchronizer("eth_rx", "sys")
|
eth_ps = PulseSynchronizer("eth_rx", "sys")
|
||||||
self.comb += [
|
self.comb += [
|
||||||
eth_ps.i.eq(eth_pulse),
|
eth_ps.i.eq(eth_tick),
|
||||||
sys_pulse.eq(eth_ps.o)
|
sys_tick.eq(eth_ps.o)
|
||||||
]
|
]
|
||||||
self.submodules += eth_ps
|
self.submodules += eth_ps
|
||||||
|
|
||||||
# Count pulses (sys clock domain)
|
# sys_clk domain counter
|
||||||
counter = Counter(32)
|
sys_counter = Counter(24)
|
||||||
self.submodules += counter
|
self.submodules += sys_counter
|
||||||
self.comb += [
|
|
||||||
counter.reset.eq(self._reset.storage),
|
|
||||||
counter.ce.eq(sys_pulse)
|
|
||||||
]
|
|
||||||
self.comb += self._counter.status.eq(counter.value)
|
|
||||||
|
|
||||||
# Output mode
|
fsm = FSM(reset_state="IDLE")
|
||||||
self.comb += self.mode.eq(self._mode.storage)
|
self.submodules += fsm
|
||||||
|
|
||||||
|
fsm.act("IDLE",
|
||||||
|
sys_counter.reset.eq(1),
|
||||||
|
If(sys_tick,
|
||||||
|
NextState("COUNT")
|
||||||
|
)
|
||||||
|
)
|
||||||
|
fsm.act("COUNT",
|
||||||
|
sys_counter.ce.eq(1),
|
||||||
|
If(sys_tick,
|
||||||
|
NextState("DETECTION")
|
||||||
|
)
|
||||||
|
)
|
||||||
|
fsm.act("DETECTION",
|
||||||
|
update_mode.eq(1),
|
||||||
|
# if freq < 125MHz-5% use MII mode
|
||||||
|
If(sys_counter.value > int((clk_freq/125000000)*1024*1.05),
|
||||||
|
mode.eq(1)
|
||||||
|
# if freq >= 125MHz-5% use GMII mode
|
||||||
|
).Else(
|
||||||
|
mode.eq(0)
|
||||||
|
),
|
||||||
|
NextState("IDLE")
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class LiteEthPHYGMIIMII(Module, AutoCSR):
|
class LiteEthPHYGMIIMII(Module, AutoCSR):
|
||||||
def __init__(self, clock_pads, pads, with_hw_init_reset=True):
|
def __init__(self, clock_pads, pads, clk_freq, with_hw_init_reset=True):
|
||||||
self.dw = 8
|
self.dw = 8
|
||||||
# Note: we can use GMII CRG since it also handles tx clock pad used for MII
|
# Note: we can use GMII CRG since it also handles tx clock pad used for MII
|
||||||
self.submodules.mode_detection = LiteEthGMIIMIIModeDetection()
|
self.submodules.mode_detection = LiteEthGMIIMIIModeDetection(clk_freq)
|
||||||
mode = self.mode_detection.mode
|
mode = self.mode_detection.mode
|
||||||
self.submodules.crg = LiteEthPHYGMIICRG(clock_pads, pads, with_hw_init_reset, mode == modes["MII"])
|
self.submodules.crg = LiteEthPHYGMIICRG(clock_pads, pads, with_hw_init_reset, mode == modes["MII"])
|
||||||
self.submodules.tx = RenameClockDomains(LiteEthPHYGMIIMIITX(pads, mode), "eth_tx")
|
self.submodules.tx = RenameClockDomains(LiteEthPHYGMIIMIITX(pads, mode), "eth_tx")
|
||||||
|
|
|
@ -497,21 +497,16 @@ static int test_user_abort(void)
|
||||||
|
|
||||||
static void boot_sequence(void)
|
static void boot_sequence(void)
|
||||||
{
|
{
|
||||||
int eth_ok;
|
|
||||||
|
|
||||||
if(test_user_abort()) {
|
if(test_user_abort()) {
|
||||||
#ifdef FLASH_BOOT_ADDRESS
|
#ifdef FLASH_BOOT_ADDRESS
|
||||||
flashboot();
|
flashboot();
|
||||||
#endif
|
#endif
|
||||||
serialboot();
|
serialboot();
|
||||||
#ifdef CSR_ETHPHY_MODE_DETECTION_MODE_ADDR
|
#ifdef CSR_ETHPHY_MODE_DETECTION_MODE_ADDR
|
||||||
eth_ok = eth_mode_detection();
|
eth_mode();
|
||||||
#else
|
|
||||||
eth_ok = 1;
|
|
||||||
#endif
|
#endif
|
||||||
#ifdef CSR_ETHMAC_BASE
|
#ifdef CSR_ETHMAC_BASE
|
||||||
if (eth_ok)
|
netboot();
|
||||||
netboot();
|
|
||||||
#endif
|
#endif
|
||||||
printf("No boot medium found\n");
|
printf("No boot medium found\n");
|
||||||
}
|
}
|
||||||
|
@ -531,7 +526,7 @@ int main(int i, char **c)
|
||||||
crcbios();
|
crcbios();
|
||||||
id_print();
|
id_print();
|
||||||
#ifdef CSR_ETHMAC_BASE
|
#ifdef CSR_ETHMAC_BASE
|
||||||
ethreset();
|
eth_init();
|
||||||
#endif
|
#endif
|
||||||
#ifdef CSR_SDRAM_BASE
|
#ifdef CSR_SDRAM_BASE
|
||||||
sdr_ok = sdrinit();
|
sdr_ok = sdrinit();
|
||||||
|
|
|
@ -14,7 +14,7 @@ int microudp_send(unsigned short src_port, unsigned short dst_port, unsigned int
|
||||||
void microudp_set_callback(udp_callback callback);
|
void microudp_set_callback(udp_callback callback);
|
||||||
void microudp_service(void);
|
void microudp_service(void);
|
||||||
|
|
||||||
void ethreset(void);
|
void eth_init(void);
|
||||||
int eth_mode_detection(void);
|
void eth_mode(void);
|
||||||
|
|
||||||
#endif /* __MICROUDP_H */
|
#endif /* __MICROUDP_H */
|
||||||
|
|
|
@ -433,7 +433,7 @@ static void busy_wait(unsigned int ds)
|
||||||
while(timer0_value_read()) timer0_update_value_write(1);
|
while(timer0_value_read()) timer0_update_value_write(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ethreset(void)
|
void eth_init(void)
|
||||||
{
|
{
|
||||||
ethphy_crg_reset_write(0);
|
ethphy_crg_reset_write(0);
|
||||||
busy_wait(2);
|
busy_wait(2);
|
||||||
|
@ -445,50 +445,15 @@ void ethreset(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CSR_ETHPHY_MODE_DETECTION_MODE_ADDR
|
#ifdef CSR_ETHPHY_MODE_DETECTION_MODE_ADDR
|
||||||
static int eth_test_frequency(unsigned int freq, unsigned int target, unsigned int margin)
|
void eth_mode(void)
|
||||||
{
|
{
|
||||||
if (freq < (target - margin))
|
|
||||||
return 0;
|
|
||||||
else if (freq > (target + margin))
|
|
||||||
return 0;
|
|
||||||
else
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
int eth_mode_detection(void)
|
|
||||||
{
|
|
||||||
unsigned int frequency;
|
|
||||||
|
|
||||||
ethphy_mode_detection_reset_write(1);
|
|
||||||
busy_wait(1);
|
|
||||||
ethphy_mode_detection_reset_write(0);
|
|
||||||
busy_wait(1);
|
|
||||||
frequency = ethphy_mode_detection_counter_read()*4*10;
|
|
||||||
ethphy_mode_detection_reset_write(1);
|
|
||||||
|
|
||||||
printf("Ethernet phy mode: ");
|
printf("Ethernet phy mode: ");
|
||||||
/* 10Mbps */
|
if (ethphy_mode_detection_mode_read())
|
||||||
if(eth_test_frequency(frequency, 2500000, 1000000)) {
|
printf("MII");
|
||||||
ethphy_mode_detection_mode_write(1);
|
else
|
||||||
printf("10Mbps (MII)\n");
|
printf("GMII");
|
||||||
return 1;
|
printf("\n");
|
||||||
/* 100Mbps */
|
|
||||||
} else if(eth_test_frequency(frequency, 25000000, 1000000)) {
|
|
||||||
ethphy_mode_detection_mode_write(1);
|
|
||||||
printf("100Mbps (MII)\n");
|
|
||||||
return 1;
|
|
||||||
/* 1Gbps */
|
|
||||||
} else if(eth_test_frequency(frequency, 125000000, 1000000)) {
|
|
||||||
ethphy_mode_detection_mode_write(0);
|
|
||||||
printf("1Gbps (GMII)\n");
|
|
||||||
return 1;
|
|
||||||
/* Failed */
|
|
||||||
} else {
|
|
||||||
printf("Failed to detect link speed\n");
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -122,7 +122,7 @@ class MiniSoC(BaseSoC):
|
||||||
def __init__(self, platform, **kwargs):
|
def __init__(self, platform, **kwargs):
|
||||||
BaseSoC.__init__(self, platform, **kwargs)
|
BaseSoC.__init__(self, platform, **kwargs)
|
||||||
|
|
||||||
self.submodules.ethphy = LiteEthPHY(platform.request("eth_clocks"), platform.request("eth"))
|
self.submodules.ethphy = LiteEthPHY(platform.request("eth_clocks"), platform.request("eth"), clk_freq=self.clk_freq)
|
||||||
self.submodules.ethmac = LiteEthMAC(phy=self.ethphy, dw=32, interface="wishbone")
|
self.submodules.ethmac = LiteEthMAC(phy=self.ethphy, dw=32, interface="wishbone")
|
||||||
self.add_wb_slave(mem_decoder(self.mem_map["ethmac"]), self.ethmac.bus)
|
self.add_wb_slave(mem_decoder(self.mem_map["ethmac"]), self.ethmac.bus)
|
||||||
self.add_memory_region("ethmac", self.mem_map["ethmac"]+self.shadow_address, 0x2000)
|
self.add_memory_region("ethmac", self.mem_map["ethmac"]+self.shadow_address, 0x2000)
|
||||||
|
|
Loading…
Reference in New Issue