From patchwork Wed Oct 25 22:04:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Berger X-Patchwork-Id: 830407 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Z+rjLyrq"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yMkln5WhHz9t2W for ; Thu, 26 Oct 2017 09:07:49 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932384AbdJYWHs (ORCPT ); Wed, 25 Oct 2017 18:07:48 -0400 Received: from mail-qt0-f194.google.com ([209.85.216.194]:44253 "EHLO mail-qt0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932211AbdJYWFH (ORCPT ); Wed, 25 Oct 2017 18:05:07 -0400 Received: by mail-qt0-f194.google.com with SMTP id 8so2016636qtv.1; Wed, 25 Oct 2017 15:05:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fKVJwDXCXTWTp7pxCSDXEsoP5z2PLyEvsV8EL4yhTz4=; b=Z+rjLyrqSNNT+m6K1AtGwX8wZsKsnfPZP8lsC34KHDYpX+v957egbceRUktInQnE1Z HEd9BWwpHztJckZq3t1l8DvnyALYHCvhI2DUJeA4m1qlAHZfa/ZtEsfs/HhATTZERipE U+xcrALtk+kgGHfiZa4Bzf+yN1Wvrr030whaRW8+Y9gvGWx7XgsZ1k/KxGspNudam2No zEpD/nfAC7mKYqnH2kcSoU6TjOUonvz5ELG3zzqOZqwXMjMKgdW3Idz+ZdjwcPtBe6pm K8URx8lSb4ptSknROxNpAmrPej59pzr3oy90j56zy1VVNKalTLRV/nlsBIT+cH5bN4nX 8DJA== 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; bh=fKVJwDXCXTWTp7pxCSDXEsoP5z2PLyEvsV8EL4yhTz4=; b=AMb4yR2+fa9IsK5VaC4yfM0r43lwq7kRJDrikRlAOJN+SfD1B24Ugo2fyqp43yeR4u +0Q7bAjBCK8/sR3siM41+t1sAM8rIzL81B0r6me0f2oVPqymYMQ38pwkpKW0UESJJ2NO AF0fHAF/Ytg3rxZ6krSPOh4F5JYV7PXJ0Y984zeWbPmUXszkPYx8Fzy9Et34Vctj99Wn zyFtSvc8iNugPSypzaP07PVOCr7Pycp4sdKV1FiOWVw4i/8yFTO7ZI76ZIsHEz4VD7Kg 0yQZ4yhCJQoG8gkxo8Tr08/b3tQqxCvB/y+9ObJ8uFUGAbrvGJ5aeSqEaxsDHWOYLiux zUmw== X-Gm-Message-State: AMCzsaVa/OIlGQ9D5tMo1+DkR4nA8CIUyElRy9Iyfaume3/QtOVYuZKD 45XXIYkTZJu5unKU2Fsb4Yw= X-Google-Smtp-Source: ABhQp+RlQ8rNfRvOwIuOa/Y9O/9IaLrFdyvx8DnAlT1sknPJwCQjzqyCEut6OX5j0txvL7Fl0PRsOw== X-Received: by 10.200.63.245 with SMTP id v50mr32913219qtk.323.1508969106665; Wed, 25 Oct 2017 15:05:06 -0700 (PDT) Received: from stb-bld-02.irv.broadcom.com ([192.19.255.250]) by smtp.gmail.com with ESMTPSA id f38sm2690246qtf.17.2017.10.25.15.05.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Oct 2017 15:05:06 -0700 (PDT) From: Doug Berger To: Florian Fainelli Cc: Doug Berger , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 1/9] net: bcmgenet: correct bad merge Date: Wed, 25 Oct 2017 15:04:11 -0700 Message-Id: <20171025220419.24951-2-opendmb@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171025220419.24951-1-opendmb@gmail.com> References: <20171025220419.24951-1-opendmb@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org As noted in the net-next submission for GENETv5 support [1], there were merge conflicts with an earlier net submission [2] that had not yet found its way to the net-next repository. Unfortunately, when the branches were merged the conflicts were not correctly resolved. This commit attempts to correct that. [1] https://lkml.org/lkml/2017/3/13/1145 [2] https://lkml.org/lkml/2017/3/9/890 Fixes: 101c431492d2 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net") Signed-off-by: Doug Berger --- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c index 9cebca896913..f6e8e01be1c8 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -2602,12 +2602,6 @@ static void bcmgenet_irq_task(struct work_struct *work) priv->irq0_stat = 0; spin_unlock_irqrestore(&priv->lock, flags); - if (status & UMAC_IRQ_MPD_R) { - netif_dbg(priv, wol, priv->dev, - "magic packet detected, waking up\n"); - bcmgenet_power_up(priv, GENET_POWER_WOL_MAGIC); - } - /* Link UP/DOWN event */ if (status & UMAC_IRQ_LINK_EVENT) phy_mac_interrupt(priv->phydev, @@ -2698,23 +2692,13 @@ static irqreturn_t bcmgenet_isr0(int irq, void *dev_id) } } - if (priv->irq0_stat & (UMAC_IRQ_PHY_DET_R | - UMAC_IRQ_PHY_DET_F | - UMAC_IRQ_LINK_EVENT | - UMAC_IRQ_HFB_SM | - UMAC_IRQ_HFB_MM)) { - /* all other interested interrupts handled in bottom half */ - schedule_work(&priv->bcmgenet_irq_work); - } - if ((priv->hw_params->flags & GENET_HAS_MDIO_INTR) && status & (UMAC_IRQ_MDIO_DONE | UMAC_IRQ_MDIO_ERROR)) { wake_up(&priv->wq); } /* all other interested interrupts handled in bottom half */ - status &= (UMAC_IRQ_LINK_EVENT | - UMAC_IRQ_MPD_R); + status &= UMAC_IRQ_LINK_EVENT; if (status) { /* Save irq status for bottom-half processing. */ spin_lock_irqsave(&priv->lock, flags);