| Message ID | 20210625065401.30170-10-mark.cave-ayland@ilande.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | dp8393x: fixes for MacOS toolbox ROM | expand |
On 6/25/21 8:54 AM, Mark Cave-Ayland wrote: > Currently when a LOAD CAM command is executed the entries are loaded into the > CAM from memory in order which is incorrect. According to the datasheet the > first entry in the CAM descriptor is the entry index which means that each > descriptor may update any single entry in the CAM rather than the Nth entry. > > Decode the CAM entry index and use it store the descriptor in the appropriate > slot in the CAM. This fixes the issue where the MacOS toolbox loads a single > CAM descriptor into the final slot in order to perform a loopback test which > must succeed before the Ethernet port is enabled. > > Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> > --- > hw/net/dp8393x.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
On 6/25/21 8:54 AM, Mark Cave-Ayland wrote: > Currently when a LOAD CAM command is executed the entries are loaded into the > CAM from memory in order which is incorrect. According to the datasheet the > first entry in the CAM descriptor is the entry index which means that each > descriptor may update any single entry in the CAM rather than the Nth entry. > > Decode the CAM entry index and use it store the descriptor in the appropriate > slot in the CAM. This fixes the issue where the MacOS toolbox loads a single > CAM descriptor into the final slot in order to perform a loopback test which > must succeed before the Ethernet port is enabled. > > Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> > --- > hw/net/dp8393x.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Patch queued to mips-next.
diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c index 6789bcd3af..172fd06694 100644 --- a/hw/net/dp8393x.c +++ b/hw/net/dp8393x.c @@ -270,7 +270,7 @@ static void dp8393x_update_irq(dp8393xState *s) static void dp8393x_do_load_cam(dp8393xState *s) { int width, size; - uint16_t index = 0; + uint16_t index; width = (s->regs[SONIC_DCR] & SONIC_DCR_DW) ? 2 : 1; size = sizeof(uint16_t) * 4 * width; @@ -279,6 +279,7 @@ static void dp8393x_do_load_cam(dp8393xState *s) /* Fill current entry */ address_space_read(&s->as, dp8393x_cdp(s), MEMTXATTRS_UNSPECIFIED, s->data, size); + index = dp8393x_get(s, width, 0) & 0xf; s->cam[index][0] = dp8393x_get(s, width, 1) & 0xff; s->cam[index][1] = dp8393x_get(s, width, 1) >> 8; s->cam[index][2] = dp8393x_get(s, width, 2) & 0xff; @@ -291,7 +292,6 @@ static void dp8393x_do_load_cam(dp8393xState *s) /* Move to next entry */ s->regs[SONIC_CDC]--; s->regs[SONIC_CDP] += size; - index++; } /* Read CAM enable */
Currently when a LOAD CAM command is executed the entries are loaded into the CAM from memory in order which is incorrect. According to the datasheet the first entry in the CAM descriptor is the entry index which means that each descriptor may update any single entry in the CAM rather than the Nth entry. Decode the CAM entry index and use it store the descriptor in the appropriate slot in the CAM. This fixes the issue where the MacOS toolbox loads a single CAM descriptor into the final slot in order to perform a loopback test which must succeed before the Ethernet port is enabled. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> --- hw/net/dp8393x.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)