From 68629cc4f116e30d2e741ebfbb3096cff4bb6508 Mon Sep 17 00:00:00 2001 From: Adrian Chadd Date: Mon, 22 Oct 2012 22:32:52 +0000 Subject: [PATCH] Don't try to cache the page setting - always set the page before doing a switch register read/write. PR: kern/172968 --- sys/dev/etherswitch/arswitch/arswitch_reg.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/sys/dev/etherswitch/arswitch/arswitch_reg.c b/sys/dev/etherswitch/arswitch/arswitch_reg.c index 4a2fa6a977a..4ec71ba661c 100644 --- a/sys/dev/etherswitch/arswitch/arswitch_reg.c +++ b/sys/dev/etherswitch/arswitch/arswitch_reg.c @@ -72,10 +72,17 @@ arswitch_split_setpage(device_t dev, uint32_t addr, uint16_t *phy, *phy = (((addr) >> 6) & 0x07) | 0x10; *reg = ((addr) >> 1) & 0x1f; - if (sc->page != page) { - MDIO_WRITEREG(device_get_parent(dev), 0x18, 0, page); - sc->page = page; - } + /* + * The earlier code would only switch the page + * over if the page were different. Experiments have + * shown that this is unstable. + * + * Hence, the page is always set here. + * + * See PR kern/172968 + */ + MDIO_WRITEREG(device_get_parent(dev), 0x18, 0, page); + sc->page = page; } /*