net: an RTL8139 driver, and the e1000 stops refusing the PCIe parts
Two NICs, and unlike the RTL8111 last commit, QEMU emulates both -- so both are tested rather than reasoned about. **RTL8139** is its own driver and not a mode of the 8169, because it is its own chip. No descriptor rings: the receiver is one circular buffer the chip writes packets into back to back behind four-byte headers, and the transmitter is four fixed slots. Putting both programming models behind one set of function pointers is how a mode flag ends up threaded through every path. Three details are the whole driver. CAPR runs sixteen bytes behind the true read position -- a quirk of the part, not an off-by-one. WRAP means the chip runs a packet past the end of the buffer rather than splitting it, so the 8 KB buffer is allocated as 8 KB + 16 + one maximum frame; getting that wrong is a chip writing past its allocation at line rate. And a length field of 0xFFF0 means "still writing this one", so treating it as a length copies a partial packet and loses the alignment for everything after it. **The e1000 now matches the PCIe 8257x parts.** Its header refused them, with a note saying they "differ in NVM access and initialisation, and claiming a device this driver has not been shown to initialise is worse than not claiming it". That was right, and the second half is answerable: QEMU emulates the 82574L, so it can be *shown* to initialise. What differs turned out to be one register. EERD moved its address field from bits 8-15 to bits 2-15 and its done bit from 4 to 1; the rings, RCTL, TCTL and ICR are identical. So there is a per-instance flag for the NVM layout and seven more ids -- not a second copy of four hundred lines of ring code. The wrong pair of constants fails silently, reading the wrong word or waiting for a bit that never sets, and the MAC comes out as zeroes; that is why it is named in the header rather than papered over. Still refused: the ICH/PCH parts (82562, 82577-82579, I217-I219), which put the PHY behind a MAC-PHY interconnect and need a different bring-up nothing here can test. Tested, each booted alone: rtl8139 (10ec:8139) and 82574L (8086:10d3) both bind, read a real MAC, complete DHCP and ping 4 of 4 with no loss. The classic 82540EM does the same, which is the regression that mattered for the NVM change. Both supported display configurations: one boot each, no traps, no panics, socktest and memfdtest green. Also recorded: the Chromebox CN62 carries an RTL8111, not an Intel part, so last commit's driver covers it too. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
Nexoniarz
parent
4a723cfc0e
commit
0331d548c4
6 changed files with 530 additions and 8 deletions
|
|
@ -42,6 +42,10 @@ struct e1000 {
|
|||
|
||||
uint8 mac[6];
|
||||
int ready;
|
||||
// Which generation's EERD layout this part speaks. See E1000_EERD_DONE_8257X
|
||||
// in e1000.h -- it is the only register whose shape differs between the
|
||||
// 8254x and the PCIe 8257x, and getting it wrong yields a MAC of zeroes.
|
||||
int nvm_8257x;
|
||||
uint64 rx_packets, tx_packets, rx_dropped;
|
||||
|
||||
// Which PCI device this instance drives. Kept so that attached() can match
|
||||
|
|
@ -86,10 +90,14 @@ static inline void wr(struct e1000 *e, int off, uint32 v) { *(volatile uint32
|
|||
static int
|
||||
eeprom_read(struct e1000 *e, int addr, uint16 *out)
|
||||
{
|
||||
wr(e, E1000_EERD, (addr << E1000_EERD_ADDR_SHIFT) | E1000_EERD_START);
|
||||
int shift = e->nvm_8257x ? E1000_EERD_ADDR_SHIFT_8257X
|
||||
: E1000_EERD_ADDR_SHIFT;
|
||||
uint32 done = e->nvm_8257x ? E1000_EERD_DONE_8257X : E1000_EERD_DONE;
|
||||
|
||||
wr(e, E1000_EERD, (addr << shift) | E1000_EERD_START);
|
||||
for (int i = 0; i < 100000; i++) {
|
||||
uint32 v = rd(e, E1000_EERD);
|
||||
if (v & E1000_EERD_DONE) {
|
||||
if (v & done) {
|
||||
*out = (uint16)(v >> E1000_EERD_DATA_SHIFT);
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -287,6 +295,20 @@ e1000_probe(struct pci_dev *d)
|
|||
return -1;
|
||||
|
||||
e->pdev = d;
|
||||
// Everything from 0x105E upwards in the table is PCIe; the 8254x ids are all
|
||||
// below it. Spelled as a list rather than a comparison because an id is not
|
||||
// a magnitude -- 0x150C is a PCIe part and 0x1078 is not.
|
||||
switch (d->device) {
|
||||
case E1000_DEV_82571EB_COPPER: case E1000_DEV_82572EI_COPPER:
|
||||
case E1000_DEV_82572EI: case E1000_DEV_82573E:
|
||||
case E1000_DEV_82573L: case E1000_DEV_82574L:
|
||||
case E1000_DEV_82583V:
|
||||
e->nvm_8257x = 1;
|
||||
break;
|
||||
default:
|
||||
e->nvm_8257x = 0;
|
||||
break;
|
||||
}
|
||||
initlock(&e->lock, "e1000");
|
||||
pci_enable(d, 0x0006); // memory space + bus master
|
||||
// ioremap rather than P2V: firmware may place a 64-bit BAR above the 4 GB the
|
||||
|
|
@ -374,6 +396,12 @@ static const struct pci_match e1000_match[] = {
|
|||
M(E1000_DEV_82546GB_COPPER), M(E1000_DEV_82546GB_FIBER),
|
||||
M(E1000_DEV_82546GB_SERDES),
|
||||
M(E1000_DEV_82547EI),
|
||||
// The PCIe generation. 82574L is emulated by QEMU and is what this was
|
||||
// tested against; the others share its register map and NVM layout.
|
||||
M(E1000_DEV_82571EB_COPPER), M(E1000_DEV_82572EI_COPPER),
|
||||
M(E1000_DEV_82572EI), M(E1000_DEV_82573E),
|
||||
M(E1000_DEV_82573L), M(E1000_DEV_82574L),
|
||||
M(E1000_DEV_82583V),
|
||||
{ 0, 0, 0, 0 },
|
||||
};
|
||||
#undef M
|
||||
|
|
|
|||
|
|
@ -26,11 +26,23 @@
|
|||
// the sort of second-hand hardware a system like this actually gets run on.
|
||||
// These are the cards in every desktop and server of that generation.
|
||||
//
|
||||
// Deliberately *not* included: the PCIe 8257x parts (82571-82574) and anything
|
||||
// newer. They present a similar register map but differ in NVM access and
|
||||
// initialisation, and claiming a device this driver has not been shown to
|
||||
// initialise is worse than not claiming it -- the card binds, reports a MAC of
|
||||
// nonsense, and nothing works for reasons that look nothing like the cause.
|
||||
// The PCIe 8257x parts used to be excluded here, on the argument that they
|
||||
// "differ in NVM access and initialisation, and claiming a device this driver
|
||||
// has not been shown to initialise is worse than not claiming it". That
|
||||
// argument was right and the second half of it is now answerable: QEMU
|
||||
// emulates the 82574L, so the part can be *shown* to initialise rather than
|
||||
// assumed to.
|
||||
//
|
||||
// What actually differs turned out to be one register's layout. EERD moved its
|
||||
// address field and its done bit between the two generations, and everything
|
||||
// else this driver touches -- the descriptor rings, RCTL, TCTL, the interrupt
|
||||
// cause register -- is the same. So the 8257x parts are matched, with the NVM
|
||||
// difference named below and handled, rather than a second copy of four
|
||||
// hundred lines of ring code.
|
||||
//
|
||||
// Still *not* included: the ICH/PCH parts (82562, 82577-82579, I217-I219).
|
||||
// Those put the PHY behind a MAC-PHY interconnect and need a genuinely
|
||||
// different bring-up, and nothing here can test one.
|
||||
#define E1000_DEV_82540EM 0x100E
|
||||
#define E1000_DEV_82540EM_LOM 0x1015
|
||||
#define E1000_DEV_82540EP_LOM 0x1016
|
||||
|
|
@ -57,6 +69,17 @@
|
|||
#define E1000_DEV_82546GB_COPPER 0x1079
|
||||
#define E1000_DEV_82546GB_FIBER 0x107A
|
||||
#define E1000_DEV_82546GB_SERDES 0x107B
|
||||
// The PCIe generation. 82574L is the one QEMU emulates and therefore the one
|
||||
// this driver has been shown to bring up; its siblings share the register map
|
||||
// and the NVM layout.
|
||||
#define E1000_DEV_82571EB_COPPER 0x105E
|
||||
#define E1000_DEV_82572EI_COPPER 0x107D
|
||||
#define E1000_DEV_82572EI 0x10B9
|
||||
#define E1000_DEV_82573E 0x108B
|
||||
#define E1000_DEV_82573L 0x109A
|
||||
#define E1000_DEV_82574L 0x10D3
|
||||
#define E1000_DEV_82583V 0x150C
|
||||
|
||||
#define E1000_DEV_82547EI 0x1019
|
||||
|
||||
// --- registers, byte offsets into BAR 0 ------------------------------------
|
||||
|
|
@ -96,12 +119,21 @@
|
|||
// STATUS
|
||||
#define E1000_STATUS_LU (1 << 1) // link up
|
||||
|
||||
// EERD
|
||||
// EERD, and the one thing that is not the same across the two generations.
|
||||
//
|
||||
// On the 8254x the address goes in bits 8-15 and the chip answers with bit 4.
|
||||
// On the PCIe 8257x the address is in bits 2-15 and the answer is bit 1. Using
|
||||
// the wrong pair does not fail loudly: it reads the wrong word, or waits for a
|
||||
// bit that will never be set, and the MAC ends up as zeroes or as somebody
|
||||
// else's address.
|
||||
#define E1000_EERD_START (1 << 0)
|
||||
#define E1000_EERD_DONE (1 << 4)
|
||||
#define E1000_EERD_ADDR_SHIFT 8
|
||||
#define E1000_EERD_DATA_SHIFT 16
|
||||
|
||||
#define E1000_EERD_DONE_8257X (1 << 1)
|
||||
#define E1000_EERD_ADDR_SHIFT_8257X 2
|
||||
|
||||
// RCTL
|
||||
#define E1000_RCTL_EN (1 << 1) // receiver enable
|
||||
#define E1000_RCTL_SBP (1 << 2) // store bad packets
|
||||
|
|
|
|||
Loading…
Reference in a new issue