Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp2742828rwd; Fri, 19 May 2023 09:34:20 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7oRhPE1hR+Pwnl5Tr2Jx73TQzE5qwU+7n+vwXEjdDj5Hp+IliPmFwLAgYNyBE06b0HcYf3 X-Received: by 2002:a05:6a21:9989:b0:101:6f60:120f with SMTP id ve9-20020a056a21998900b001016f60120fmr3036731pzb.39.1684514060280; Fri, 19 May 2023 09:34:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684514060; cv=none; d=google.com; s=arc-20160816; b=lK2QVFINZeTXh7TO0xX20ac7Xk3SoCTYUnvqvMNFMvfZgGaJFCooPu6GtFfZUzSpld IjNDdzph8/u0p2pDa9424CYGLCFiy+CkzE5xY//zn8Ac9Xmk1znB2t2AfmTnMEeMba+v 42YykZKaFAoOhZNMDMZCSmhz4tBCr4PxO1eikjlihkeOBI2wiDbWRGYr4o/ec7ueT5pZ qINo3Skk/vFmiwHpXZpBomJbaJNDRUPJ7hbpbvR/eYBLw67Fzau0E2sukrcGOkamJGME RK3NNTJQyW2t5BYpk2N84+vcSqjzP799yaAsDU8hxvbSQTvEUVG2xhkgzWO1Uaq1pGkr jhAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=F9VR5GWsmaIvh2GRlnTeCnpK7d8csC6dZRD/nCtAshA=; b=IdSDEzacQYIBs3GxWy7LTrg3w0wXFCO7JhDJonp9toswFniiQZkEEcVO2YOZF65HC1 sllBDW4uSTri7RAUPbFJlCYrikIekBqSK1X+/c5Y+AG5SN9n4nAIGQCGnzTP+LLjhWfO uTh/Q6jdEV67vwXVm3zySLfNwhwM6tODB0a1pTE1tN1i1KQf7ma7rM8P7cr8+cDuTdaO fXlZ6sj9pajRD6aK1Km55USmxd2bdp0o+9xM1TzMaYMGewr/FY6jhOrsQQEwm+JJ1TEA 87pPXMdzCn/bNnjem9ywMxPoIq0f2usMqiw5JwzZ5cbTUUJwfMXW4LLI+l0qkK9AhqQ5 /XNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lunn.ch header.s=20171124 header.b=Al8kK3Yw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=lunn.ch Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u11-20020a6540cb000000b005340840c0c7si3657406pgp.476.2023.05.19.09.34.07; Fri, 19 May 2023 09:34:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@lunn.ch header.s=20171124 header.b=Al8kK3Yw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=lunn.ch Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229653AbjESQWM (ORCPT + 99 others); Fri, 19 May 2023 12:22:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49918 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230144AbjESQWF (ORCPT ); Fri, 19 May 2023 12:22:05 -0400 Received: from vps0.lunn.ch (vps0.lunn.ch [156.67.10.101]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C7BEF1BD; Fri, 19 May 2023 09:21:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lunn.ch; s=20171124; h=In-Reply-To:Content-Disposition:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:From:Sender:Reply-To:Subject: Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Content-Disposition:In-Reply-To:References; bh=F9VR5GWsmaIvh2GRlnTeCnpK7d8csC6dZRD/nCtAshA=; b=Al8kK3YwCDmJ1zMU0PPrh+98h8 xqSzwayDzUWNoLxxMXAB7v+uhAH/z0E2vIavco5dSEBhcQbK51En/1QsJzh7MiIvCVVjHo9brmfXn AHiUCl3EMKHxr4QXmv/qSdITOMrOOS/jj7B7adrLp+7MhpTrR0huboKi2NtukFNiTrOY=; Received: from andrew by vps0.lunn.ch with local (Exim 4.94.2) (envelope-from ) id 1q02rL-00DLVY-Du; Fri, 19 May 2023 18:21:39 +0200 Date: Fri, 19 May 2023 18:21:39 +0200 From: Andrew Lunn To: alexis.lothore@bootlin.com Cc: Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Richard Cochran , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Russell King , netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, thomas.petazzoni@bootlin.com, paul.arola@telus.com, scott.roberts@telus.com, Marek =?iso-8859-1?Q?Beh=FAn?= Subject: Re: [PATCH net-next v2 7/7] net: dsa: mv88e6xxx: enable support for 88E6361 switch Message-ID: References: <20230519141303.245235-1-alexis.lothore@bootlin.com> <20230519141303.245235-8-alexis.lothore@bootlin.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230519141303.245235-8-alexis.lothore@bootlin.com> X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org > @@ -421,9 +421,14 @@ phy_interface_t mv88e6390x_port_max_speed_mode(struct mv88e6xxx_chip *chip, > int mv88e6393x_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port, > int speed, int duplex) > { > + bool is_6361 = > + chip->info->prod_num == MV88E6XXX_PORT_SWITCH_ID_PROD_6361; > u16 reg, ctrl; > int err; > > + if (is_6361 && speed > 2500) > + return -EOPNOTSUPP; I would move the comparison inside the if, so removing the ugly looking split is_6361 line. > + > if (speed == 200 && port != 0) > return -EOPNOTSUPP; > > @@ -506,8 +511,12 @@ int mv88e6393x_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port, > phy_interface_t mv88e6393x_port_max_speed_mode(struct mv88e6xxx_chip *chip, > int port) > { > + bool is_6361 = > + chip->info->prod_num == MV88E6XXX_PORT_SWITCH_ID_PROD_6361; > + > if (port == 0 || port == 9 || port == 10) > - return PHY_INTERFACE_MODE_10GBASER; > + return is_6361 ? PHY_INTERFACE_MODE_2500BASEX : > + PHY_INTERFACE_MODE_10GBASER; Please see if you can rearrange this code as well. Thanks Andrew