Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B5C09C10F05 for ; Sat, 23 Mar 2019 18:44:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7E738218D4 for ; Sat, 23 Mar 2019 18:44:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="e6X+nhZy" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727596AbfCWSlp (ORCPT ); Sat, 23 Mar 2019 14:41:45 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:37575 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727482AbfCWSlo (ORCPT ); Sat, 23 Mar 2019 14:41:44 -0400 Received: by mail-wm1-f67.google.com with SMTP id v14so5127144wmf.2 for ; Sat, 23 Mar 2019 11:41:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:cc:from:subject:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=4TII4UuVtFTcVaviEaZMZG+00yb5qfHqV98HIN2wYnc=; b=e6X+nhZyyu4npWjD6iSOzGWSDrnYF+3yJwDnrxlGbWqs7UKcoORQgXptN02DBMqU42 3KhGxoF2xy0+tfMqYJO/a19YC5/7txAnqW4A1tqi+YiONOWoV1UZkSmjhs9dPyOE8FMd /PbYtAL0j1Bs5Ci2okZXlol1F81So+Ao1Ixf3thQOM6n4miXJPFlOptzU6x0iTyi0hQT A0B2GtAkblXUTEXdPFv0AumHI0aBJ5T9G5Pkw5iVjR7o3i0bYVGBo5ygW/B35clCM3Bl c1CRsl0Mc+EZduGOAUfRp6rF340QOnWXTfHLbEJkYAEpPUrldF9tWR36J3a4NTnZoQvL 5cdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:cc:from:subject:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=4TII4UuVtFTcVaviEaZMZG+00yb5qfHqV98HIN2wYnc=; b=JtYDa+vASYLvdWajF9a8k/wgcdMCIQ+jFgGFw4Tm2Xbbig2oabll0hoXAyL0RmUg9n 9Cp9F1LEF2Ym7qY5OTkfwJNKUC76x654kZT6rrywSGBXxoi0gqJxwrw5iZyByPiNyu2R CczRsHxaFVWAdjSCVy7s1OvR8fuN+1vNyKA+aaV/Z7mc2v1S8g5Gku9w5oYZmft7EaYH OitC7ulMfzf1zYKcxba9AfAOl5IXHST26Z/IvPKOVnJQNvu0RlrgvVZJ1cFckfsHcwnE ZCNt8rpSFUSEr3m3HO4pKZ2Gi0xotP8K8gnbi8rNOIQeFJI8lsFgD7cJdtTo2oJi6uRB 0lUg== X-Gm-Message-State: APjAAAVTXyfDl0owfVG/rpmsu/9J8ioDMmeCkjEY2P9Z9E6ZuHz2FgQz ApGsGvlbsq1ATYAYHNfgiKvCT/j2 X-Google-Smtp-Source: APXvYqzC3/v/+IuWQ/V6v2uHPqzMLMcfi51DYq40dgeqyFvNUGOI7c9cbMNhYNrM733jfTBmcYLGPg== X-Received: by 2002:a05:600c:210e:: with SMTP id u14mr705119wml.50.1553366502756; Sat, 23 Mar 2019 11:41:42 -0700 (PDT) Received: from ?IPv6:2003:ea:8bc4:dc00:49b3:4cd3:4cd9:effe? (p200300EA8BC4DC0049B34CD34CD9EFFE.dip0.t-ipconnect.de. [2003:ea:8bc4:dc00:49b3:4cd3:4cd9:effe]) by smtp.googlemail.com with ESMTPSA id t15sm14829003wmt.2.2019.03.23.11.41.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 23 Mar 2019 11:41:41 -0700 (PDT) To: Vivien Didelot , Andrew Lunn , Florian Fainelli , David Miller Cc: "netdev@vger.kernel.org" From: Heiner Kallweit Subject: [PATCH net] net: dsa: mv88e6xxx: fix few issues in mv88e6390x_port_set_cmode Message-ID: <95edb9b6-d779-a1b9-77cd-7e86cb41f73d@gmail.com> Date: Sat, 23 Mar 2019 19:41:32 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patches fixes few issues in mv88e6390x_port_set_cmode(). 1. When entering the function the old cmode may be 0, in this case mv88e6390x_serdes_get_lane() returns -ENODEV. As result we bail out and have no chance to set a new mode. Therefore deal properly with -ENODEV. 2. Once we have disabled power and irq, let's set the cached cmode to 0. This reflects the actual status and is cleaner if we bail out with an error in the following function calls. 3. The cached cmode is used by mv88e6390x_serdes_get_lane(), mv88e6390_serdes_power_lane() and mv88e6390_serdes_irq_enable(). Currently we set the cached mode to the new one at the very end of the function only, means until then we use the old one what may be wrong. 4. When calling mv88e6390_serdes_irq_enable() we use the lane value belonging to the old cmode. Get the lane belonging to the new cmode before calling this function. It's hard to provide a good "Fixes" tag because quite a few smaller changes have been done to the code in question recently. Fixes: d235c48b40d3 ("net: dsa: mv88e6xxx: power serdes on/off for 10G interfaces on 6390X") Signed-off-by: Heiner Kallweit --- drivers/net/dsa/mv88e6xxx/port.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/drivers/net/dsa/mv88e6xxx/port.c b/drivers/net/dsa/mv88e6xxx/port.c index dce84a2a6..c44b2822e 100644 --- a/drivers/net/dsa/mv88e6xxx/port.c +++ b/drivers/net/dsa/mv88e6xxx/port.c @@ -427,18 +427,22 @@ int mv88e6390x_port_set_cmode(struct mv88e6xxx_chip *chip, int port, return 0; lane = mv88e6390x_serdes_get_lane(chip, port); - if (lane < 0) + if (lane < 0 && lane != -ENODEV) return lane; - if (chip->ports[port].serdes_irq) { - err = mv88e6390_serdes_irq_disable(chip, port, lane); + if (lane >= 0) { + if (chip->ports[port].serdes_irq) { + err = mv88e6390_serdes_irq_disable(chip, port, lane); + if (err) + return err; + } + + err = mv88e6390x_serdes_power(chip, port, false); if (err) return err; } - err = mv88e6390x_serdes_power(chip, port, false); - if (err) - return err; + chip->ports[port].cmode = 0; if (cmode) { err = mv88e6xxx_port_read(chip, port, MV88E6XXX_PORT_STS, ®); @@ -452,6 +456,12 @@ int mv88e6390x_port_set_cmode(struct mv88e6xxx_chip *chip, int port, if (err) return err; + chip->ports[port].cmode = cmode; + + lane = mv88e6390x_serdes_get_lane(chip, port); + if (lane < 0) + return lane; + err = mv88e6390x_serdes_power(chip, port, true); if (err) return err; @@ -463,8 +473,6 @@ int mv88e6390x_port_set_cmode(struct mv88e6xxx_chip *chip, int port, } } - chip->ports[port].cmode = cmode; - return 0; } -- 2.21.0