From patchwork Tue Jul 4 11:44:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Amit Pundir X-Patchwork-Id: 106945 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp897689qge; Tue, 4 Jul 2017 04:44:39 -0700 (PDT) X-Received: by 10.98.144.209 with SMTP id q78mr14644294pfk.81.1499168678481; Tue, 04 Jul 2017 04:44:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499168678; cv=none; d=google.com; s=arc-20160816; b=sp5jLnLTcueIpLsqdmvR8ewP3VETd/Yoq2RlztvMhv+gDCA67dlNCoKKOoLR0JXkUS sHxx3Fnl6tEW/Aj41GIGyLN+l9/kmUQdML1bpn5eDUo4qP1CTGE1SIwJKygyoSyrBHcl KjHzvF1oDZjSj3V3YCThS3vtBHE6TbW6ad5LcV8Ai3PtU9k6IPGGlGtTcPzKDvKBe5ak faOdFmY64Hhi4ojLl99q0AQ20qT8TJBffxyu2gwXO8LLwV6RsvvlQKgMfBaLNFfw7q9E KIcvQ0tmjXc5eIObhBFZLix19U6wGk9QaOd8aCtORhZW/wGHm5CTWIZ17/IRKqpt/BsY 1RuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=WT6eQp1wQOtxqsiqXXZZhm2p1EXbW+ML1QxqZHXb45w=; b=udpGQ8rvKvub2+r1lGoF7FS9KMWCujRFnqNTwcTbrpImEoMgM/zIy/ybkfLLvx6qtR XMy4Pd8UEKj34IxPPFrHc5YTx65Nq6Y1BRy4fEkIFgM4YE4o27dXfIlYuYVNNG32CnFH s54nSgZaasPKN0Zpndw0CH9cepZcXw3Xq1+63HgLSTleHwRBGAfueGk4+FH63AQkq/AU zl8gA97IvYc3cHOFymbcBRpar6ktxChYzRI7G+tG+e4xOSTSf7DeVkXJe6yLMU0+WKJ8 QtGKOoZgAMEg5CN7R5YF4QAWi9AKfNnfHU8uvsJbWC4Dy+vkrWkzls393TJfTjxFd/Xj tshQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=MZKt7QG8; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x10si14416295pfi.192.2017.07.04.04.44.38; Tue, 04 Jul 2017 04:44:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.b=MZKt7QG8; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752052AbdGDLoh (ORCPT + 6 others); Tue, 4 Jul 2017 07:44:37 -0400 Received: from mail-pf0-f169.google.com ([209.85.192.169]:34200 "EHLO mail-pf0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752040AbdGDLoh (ORCPT ); Tue, 4 Jul 2017 07:44:37 -0400 Received: by mail-pf0-f169.google.com with SMTP id q85so950334pfq.1 for ; Tue, 04 Jul 2017 04:44:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WT6eQp1wQOtxqsiqXXZZhm2p1EXbW+ML1QxqZHXb45w=; b=MZKt7QG8oGA/5vpXbcITKdqqoKxvUvAJkj42lf3WYejhRLRd2g7nTJ0puqZNQf3WMk qU/XmShFIGRbF5zjAwUT4tI3otNr9iITSkvXkkCjEhm59ZMCo4VICLbkrde5L0szfGwP 3AwWMHSWfR+weFn/Ma4BP4AXHAn6SSTiAEjdQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WT6eQp1wQOtxqsiqXXZZhm2p1EXbW+ML1QxqZHXb45w=; b=PSK/5Mf+q0Jq9klCVDtCgme0Cq1JWf4XpxP3ZwyzmPJg3nbNp7L5WP1Yx13229ZGfy Ba6POmMS2GgmQDysTyAWjERdmliNmxRi2kyoaOGE73yV2XUVG4JrWJjM75MXmm9KI5Ex FcZ2MiUi0fCFKetwfzN/V+tCivoCGkxOwucSsqXMI70h05MKzmWdrUfvtEzSIH+UBjvf ozMKKhsD0qEw4p+IUcSiEQ1aBiZpbTWjYv1ejIzLMreoMdWU27+LVrZoOEi9jt8rnvZ4 q3DnITFU+H8ApCsATmauAGZVTB8jYyrgVJh35meAd6xeX10G1ZLQv/OBDiCiZuB6O8E5 VK+g== X-Gm-Message-State: AIVw111yko+7bwDS19g9x3OMMD3KqjReIlq9rM5kHQqPfOmGfcvZZlsJ z9sKdNfZdTTM7wxd X-Received: by 10.99.0.65 with SMTP id 62mr14996533pga.115.1499168676515; Tue, 04 Jul 2017 04:44:36 -0700 (PDT) Received: from localhost.localdomain ([106.51.234.165]) by smtp.gmail.com with ESMTPSA id t83sm39782750pfg.91.2017.07.04.04.44.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 04 Jul 2017 04:44:35 -0700 (PDT) From: Amit Pundir To: Greg KH Cc: Stable , =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= , "David S . Miller" Subject: [PATCH for-3.18 1/5] bgmac: fix device initialization on Northstar SoCs (condition typo) Date: Tue, 4 Jul 2017 17:14:20 +0530 Message-Id: <1499168664-25980-2-git-send-email-amit.pundir@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1499168664-25980-1-git-send-email-amit.pundir@linaro.org> References: <1499168664-25980-1-git-send-email-amit.pundir@linaro.org> MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Rafał Miłecki commit 21697336d46b71dd031f29e426dda0b1e7f06cc0 upstream. On Northstar (Broadcom's ARM architecture) we need to manually enable all cores. Code for that is already in place, but the condition for it was wrong. Signed-off-by: Rafał Miłecki Signed-off-by: David S. Miller Signed-off-by: Amit Pundir --- drivers/net/ethernet/broadcom/bgmac.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- 2.7.4 diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c index 05c6af6c418f..7f34d91acdb9 100644 --- a/drivers/net/ethernet/broadcom/bgmac.c +++ b/drivers/net/ethernet/broadcom/bgmac.c @@ -1412,6 +1412,7 @@ static void bgmac_mii_unregister(struct bgmac *bgmac) /* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/chipattach */ static int bgmac_probe(struct bcma_device *core) { + struct bcma_chipinfo *ci = &core->bus->chipinfo; struct net_device *net_dev; struct bgmac *bgmac; struct ssb_sprom *sprom = &core->bus->sprom; @@ -1474,8 +1475,8 @@ static int bgmac_probe(struct bcma_device *core) bgmac_chip_reset(bgmac); /* For Northstar, we have to take all GMAC core out of reset */ - if (core->id.id == BCMA_CHIP_ID_BCM4707 || - core->id.id == BCMA_CHIP_ID_BCM53018) { + if (ci->id == BCMA_CHIP_ID_BCM4707 || + ci->id == BCMA_CHIP_ID_BCM53018) { struct bcma_device *ns_core; int ns_gmac;