From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751217AbdBBJrg (ORCPT ); Thu, 2 Feb 2017 04:47:36 -0500 Received: from mail-lf0-f46.google.com ([209.85.215.46]:35838 "EHLO mail-lf0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751148AbdBBJrd (ORCPT ); Thu, 2 Feb 2017 04:47:33 -0500 Subject: Re: [PATCH 1/2] net: ethernet: bgmac: init sequence bug To: Jon Mason , David Miller References: <1485988752-21030-1-git-send-email-jon.mason@broadcom.com> <1485988752-21030-2-git-send-email-jon.mason@broadcom.com> Cc: rafal@milecki.pl, bcm-kernel-feedback-list@broadcom.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Zac Schroff From: Sergei Shtylyov Message-ID: <65fcc617-bc30-26b2-40d0-ba6a00687c33@cogentembedded.com> Date: Thu, 2 Feb 2017 12:47:28 +0300 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.7.0 MIME-Version: 1.0 In-Reply-To: <1485988752-21030-2-git-send-email-jon.mason@broadcom.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hello! On 2/2/2017 1:39 AM, Jon Mason wrote: > From: Zac Schroff > > Fix a bug in the 'bgmac' driver init sequence that blind writes for init > sequence where it should preserve most bits other than the ones it is > deliberately manipulating. > > Signed-off-by: Zac Schroff > Signed-off-by: Jon Mason > Fixes: f6a95a24957 ("net: ethernet: bgmac: Add platform device support") > --- > drivers/net/ethernet/broadcom/bgmac-platform.c | 10 +++++++--- > include/linux/bcma/bcma_regs.h | 1 + > 2 files changed, 8 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/ethernet/broadcom/bgmac-platform.c b/drivers/net/ethernet/broadcom/bgmac-platform.c > index 6f736c1..9bbe05c 100644 > --- a/drivers/net/ethernet/broadcom/bgmac-platform.c > +++ b/drivers/net/ethernet/broadcom/bgmac-platform.c > @@ -61,15 +61,19 @@ static bool platform_bgmac_clk_enabled(struct bgmac *bgmac) > > static void platform_bgmac_clk_enable(struct bgmac *bgmac, u32 flags) > { > - bgmac_idm_write(bgmac, BCMA_IOCTL, > - (BCMA_IOCTL_CLK | BCMA_IOCTL_FGC | flags)); > + u32 regval; > + > + /* Some bits of BCMA_IOCTL set by HW/ATF & should not change */ > + regval = bgmac_idm_read(bgmac, BCMA_IOCTL) & BCMA_IOCTL_DO_NOT_MODIFY; > + regval |= ((flags & (~BCMA_IOCTL_DO_NOT_MODIFY)) | BCMA_IOCTL_CLK); The innermost parens aren't necessary. And the outermost as well. [...] MBR, Sergei