Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp1317686yba; Tue, 2 Apr 2019 06:46:38 -0700 (PDT) X-Google-Smtp-Source: APXvYqxVHG3yxWkqYO5shLAgXhRlTShmLpk+jpurWvRuHnmtvf89Sfm5slSu9LqUj9YzTEezhlFa X-Received: by 2002:a17:902:820c:: with SMTP id x12mr57894448pln.199.1554212798552; Tue, 02 Apr 2019 06:46:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554212798; cv=none; d=google.com; s=arc-20160816; b=eEEsIA/+iselbn+hPGU67lVBmisgTUT3eQToyLviD4Le/7HnO73js9dEhv0PqK8eKV Brl/cfszvYBrts/IwNDMu0VY2petTJFwnwCW5GHXQiN/NaLPJISlEN0hQRbB3+mVtg+M Vyv2Tjen5Vy+33z5SqSFjpnYGWou3+MpqhZv15smVoBjK7BgIzT0kpP7pTIFIzwMoqpB +1lzZZSM63FCq50bzbf/WNghLAARcMIZ1/nCvZNtWkIYNNv1tq8Yy4t3yeexYms5n7Su 6EIJeCF+sob+4QOTDUvMzK8xlntxQTA7UbSS+7NmRSZt5yymFyapqy0D4Vbu4AnYtvg6 CAjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:in-reply-to:subject:message-id:date:cc:to :from:mime-version:content-transfer-encoding:content-disposition; bh=kCqMT+giUs8pCimBh1LkrX6n1TOFjrXoxVzcKYrTOH4=; b=yWYLwF00f6hBP68oeXECT4vkk9ovltS5/1YVm/t3DGWiKAclArOBx4gee4Akp0YHPD kXy7klvbIVuhYLM/NE0DeGvhW4uoT6MoGZLTAWhONGJLNJjQOwm7VeGStAS32almXCgT Mcd2AOaULuywQFXejQTwveIQRlO7jV8hbKvT2LYaf2BjAaJzwEOVJcd7BuzJUl9hG2FM PbI+dYl4WiyrFGyogK5n17WZtCIsAKGW2cCFDgmeFc6a0go7RInA+vO1h1c9VI7WA0h5 gtnijrnNYbdS+OCOPHYdFHSBMTms6o8fUVirLFziK5sr/dGp+npiSK3BDOwGNtiUt6ae cmXQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j7si1869179plk.221.2019.04.02.06.46.23; Tue, 02 Apr 2019 06:46:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732087AbfDBNpG (ORCPT + 99 others); Tue, 2 Apr 2019 09:45:06 -0400 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:43390 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731465AbfDBNkI (ORCPT ); Tue, 2 Apr 2019 09:40:08 -0400 Received: from [167.98.27.226] (helo=deadeye) by shadbolt.decadent.org.uk with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1hBJe0-0002ob-Es; Tue, 02 Apr 2019 14:40:04 +0100 Received: from ben by deadeye with local (Exim 4.92) (envelope-from ) id 1hBJdx-0004wg-IA; Tue, 02 Apr 2019 14:40:01 +0100 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 From: Ben Hutchings To: linux-kernel@vger.kernel.org, stable@vger.kernel.org CC: akpm@linux-foundation.org, Denis Kirjanov , "James Hogan" , "Jonas Gorski" , linux-mips@vger.kernel.org, "Florian Fainelli" , "Ralf Baechle" , "Paul Burton" Date: Tue, 02 Apr 2019 14:38:28 +0100 Message-ID: X-Mailer: LinuxStableQueue (scripts by bwh) X-Patchwork-Hint: ignore Subject: [PATCH 3.16 77/99] MIPS: BCM63XX: fix switch core reset on BCM6368 In-Reply-To: X-SA-Exim-Connect-IP: 167.98.27.226 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.16.65-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: Jonas Gorski commit 8a38dacf87180738d42b058334c951eba15d2d47 upstream. The Ethernet Switch core mask was set to 0, causing the switch core to be not reset on BCM6368 on boot. Provide the proper mask so the switch core gets reset to a known good state. Fixes: 799faa626c71 ("MIPS: BCM63XX: add core reset helper") Signed-off-by: Jonas Gorski Signed-off-by: Paul Burton Cc: linux-mips@vger.kernel.org Cc: Ralf Baechle Cc: James Hogan Cc: Florian Fainelli Signed-off-by: Ben Hutchings --- arch/mips/bcm63xx/reset.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/mips/bcm63xx/reset.c +++ b/arch/mips/bcm63xx/reset.c @@ -119,7 +119,7 @@ #define BCM6368_RESET_DSL 0 #define BCM6368_RESET_SAR SOFTRESET_6368_SAR_MASK #define BCM6368_RESET_EPHY SOFTRESET_6368_EPHY_MASK -#define BCM6368_RESET_ENETSW 0 +#define BCM6368_RESET_ENETSW SOFTRESET_6368_ENETSW_MASK #define BCM6368_RESET_PCM SOFTRESET_6368_PCM_MASK #define BCM6368_RESET_MPI SOFTRESET_6368_MPI_MASK #define BCM6368_RESET_PCIE 0