From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-yw0-x243.google.com ([2607:f8b0:4002:c05::243]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1c1wDo-0007aX-Ka for barebox@lists.infradead.org; Wed, 02 Nov 2016 14:08:57 +0000 Received: by mail-yw0-x243.google.com with SMTP id h14so561388ywa.2 for ; Wed, 02 Nov 2016 07:08:34 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: <20161031165812.9958-1-l.stach@pengutronix.de> References: <20161031165812.9958-1-l.stach@pengutronix.de> From: Andrey Smirnov Date: Wed, 2 Nov 2016 07:08:32 -0700 Message-ID: List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: Re: [PATCH v2] net: e1000: fix i210 register remapping To: Lucas Stach Cc: "barebox@lists.infradead.org" On Mon, Oct 31, 2016 at 9:58 AM, Lucas Stach wrote: > Don't mask out the remapping flag before checking the register offset, > otherwise none of the switch statements will ever match. > > Fixes: ff6a64d42ffc (e1000: Consolidate register offset fixups) > Signed-off-by: Lucas Stach FWIW, as an author of the bug (sorry!): Acked-by: Andrey Smirnov > --- > v2: don't break it the other way around > --- > drivers/net/e1000/regio.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/e1000/regio.c b/drivers/net/e1000/regio.c > index b2e9d7b6a7df..1610d5851f05 100644 > --- a/drivers/net/e1000/regio.c > +++ b/drivers/net/e1000/regio.c > @@ -5,8 +5,6 @@ > static uint32_t e1000_true_offset(struct e1000_hw *hw, uint32_t reg) > { > if (reg & E1000_MIGHT_BE_REMAPPED) { > - reg &= ~E1000_MIGHT_BE_REMAPPED; > - > if (hw->mac_type == e1000_igb) { > switch (reg) { > case E1000_EEWR: > @@ -19,7 +17,8 @@ static uint32_t e1000_true_offset(struct e1000_hw *hw, uint32_t reg) > reg = E1000_I210_EEMNGCTL; > break; > } > - }; > + } > + reg &= ~E1000_MIGHT_BE_REMAPPED; > } > > return reg; > -- > 2.10.1 > > > _______________________________________________ > barebox mailing list > barebox@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/barebox _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox