Paths

Table of Contentst

awg: Move MAC soft reset around to avoid soft reset timeout
ClosedPublic
Actions

Authored by kevans on Jan 15 2019, 2:50 AM.

Details

Reviewers

manu
ganbold

Commits

rS343095: awg: Move MAC soft reset to awg_init_locked to avoid soft reset timeout

Summary

From NetBSD: Since the MAC can get stuck in reset state with no link, ignore reset timeouts and continue with
initializing the device.

Fixes "soft reset timeout" issue at boot with no network cable plugged in.

awg_init may be called multiple times throughout normal interface usage, so the tx/rx descriptor base address registers must be written after each MAC reset and are moved as such.

This problem has been observed on FreeBSD, H3/H2+ devices with an internal phy (includes OrangePi R1, OrangePi One at least).

Obtained from: NetBSD

Test Plan

Test w/ OrangePi R1 as well as other boards not previously experiencing any issues.

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Skipped

Unit

Tests Skipped

Build Status

Buildable 21967

Event Timeline

kevans created this revision.Jan 15 2019, 2:50 AM

Herald added subscribers: andrew, imp. · View Herald TranscriptJan 15 2019, 2:50 AM

Harbormaster completed remote builds in B21963: Diff 52847.Jan 15 2019, 2:50 AM

ganbold accepted this revision.Jan 15 2019, 3:29 AM

This revision is now accepted and ready to land.Jan 15 2019, 3:29 AM

manu added inline comments.Jan 15 2019, 4:43 AM

sys/arm/allwinner/if_awg.c
798	Is this really needed ? I don't really see how moving dma setup here change things.

kevans added inline comments.Jan 15 2019, 12:49 PM

sys/arm/allwinner/if_awg.c
798	Right, I kind of suspect it's not critical, but I didn't put much time into thinking about it since it was in jmcneill's commit and I think there's good value in staying relatively in-sync

Remove unrelated DMA change

This revision now requires review to proceed.Jan 15 2019, 2:53 PM

Harbormaster completed remote builds in B21967: Diff 52852.Jan 15 2019, 2:53 PM

manu accepted this revision.Jan 15 2019, 3:02 PM

This revision is now accepted and ready to land.Jan 15 2019, 3:02 PM

Further testing reveals that awg doesn't consistently work without the removed DMA change. I don't know much about network drivers, but I suspect awg_init is being called multiple times and the soft reset wipes out EMAC_{TX,RX}_DMA_LIST. They aren't being reset in this path, only on attach.

Restore the original version; awg_init will be called as an interface is down'd and up'd throughout the course of normal usage that the MAC reset will wipe out these registers. Otherwise, you end up with a not-actually-stable awg interface.

This revision now requires review to proceed.Jan 15 2019, 9:35 PM

Harbormaster completed remote builds in B21973: Diff 52866.Jan 15 2019, 9:36 PM

In D18844#402482, @kevans wrote:

Restore the original version; awg_init will be called as an interface is down'd and up'd throughout the course of normal usage that the MAC reset will wipe out these registers. Otherwise, you end up with a not-actually-stable awg interface.

Ah ok, make sense now.
Thanks.

This revision is now accepted and ready to land.Jan 16 2019, 7:19 AM

Closed by commit rS343095: awg: Move MAC soft reset to awg_init_locked to avoid soft reset timeout (authored by kevans). · Explain WhyJan 16 2019, 2:42 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Path

Size

sys/

arm/

allwinner/

if_awg.c

69 lines

Diff 52852

View Options

sys/arm/allwinner/if_awg.c

awg: Move MAC soft reset around to avoid soft reset timeoutClosedPublicActions