From patchwork Mon Feb 28 12:10:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baruch Siach X-Patchwork-Id: 12763134 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0EA60C433F5 for ; Mon, 28 Feb 2022 12:10:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235750AbiB1MKt (ORCPT ); Mon, 28 Feb 2022 07:10:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42922 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235076AbiB1MKs (ORCPT ); Mon, 28 Feb 2022 07:10:48 -0500 Received: from mx.tkos.co.il (guitar.tcltek.co.il [84.110.109.230]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5222763BFB for ; Mon, 28 Feb 2022 04:10:09 -0800 (PST) Received: from tarshish.tkos.co.il (unknown [10.0.8.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx.tkos.co.il (Postfix) with ESMTPS id ED85E44083B; Mon, 28 Feb 2022 14:09:26 +0200 (IST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tkos.co.il; s=default; t=1646050167; bh=VaRkIvpFKJPDIJtGvQL86kMl7OjD3aj4SKE+ePTxGdk=; h=From:To:Cc:Subject:Date:From; b=fTdowWgCNjEtnSCDAk1qqrvCU28HISY/gvxCu+tN40LXch9qQWOPdAW9n5wCcZlcy Tbe3Nm9ppqxOJETYNRuGVT7h2D8m7wv9RHUEVRxA7V7hNH0dLZFPg1m0Qgzbn7n2Ik 33tV9/y/k+iBeMRnMfkZRHSghu6kmM7aW+wL+V7FpOfBSww4LZwzMXyejTCUZf6nbB WcHh3/8geKCABR5qu0jn2SneG2BinjNMMjye5kBwutqzh9aDSXrsu2+Ml1Us7lhcLB prT4FedbP0BgIcHzlxlEgH+IhwgYbdpJEQUnkQPdPZHiiZ2IpGs6cDZ2bvvGqYQzD5 ++4mX//+ZYIng== From: Baruch Siach To: Andrew Lunn , Vivien Didelot Cc: Baruch Siach , netdev@vger.kernel.org, Russell King Subject: [PATCH net-next 1/2] net: dsa: mv88e6xxx: don't error out cmode set on missing lane Date: Mon, 28 Feb 2022 14:10:02 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Baruch Siach When the given cmode has no serdes, mv88e6xxx_serdes_get_lane() returns -NODEV. Earlier in the same function the code skips serdes handing in this case. Do the same after cmode set. Signed-off-by: Baruch Siach --- drivers/net/dsa/mv88e6xxx/port.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/dsa/mv88e6xxx/port.c b/drivers/net/dsa/mv88e6xxx/port.c index d08e3ec2b042..a58997f1fd69 100644 --- a/drivers/net/dsa/mv88e6xxx/port.c +++ b/drivers/net/dsa/mv88e6xxx/port.c @@ -610,6 +610,8 @@ static int mv88e6xxx_port_set_cmode(struct mv88e6xxx_chip *chip, int port, chip->ports[port].cmode = cmode; lane = mv88e6xxx_serdes_get_lane(chip, port); + if (lane == -ENODEV) + return 0; if (lane < 0) return lane; From patchwork Mon Feb 28 12:10:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baruch Siach X-Patchwork-Id: 12763133 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2D08EC433EF for ; Mon, 28 Feb 2022 12:10:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235644AbiB1MKt (ORCPT ); Mon, 28 Feb 2022 07:10:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42924 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229502AbiB1MKs (ORCPT ); Mon, 28 Feb 2022 07:10:48 -0500 Received: from mx.tkos.co.il (guitar.tcltek.co.il [84.110.109.230]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5241A65D06 for ; Mon, 28 Feb 2022 04:10:09 -0800 (PST) Received: from tarshish.tkos.co.il (unknown [10.0.8.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx.tkos.co.il (Postfix) with ESMTPS id 7CEAD440F8D; Mon, 28 Feb 2022 14:09:27 +0200 (IST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tkos.co.il; s=default; t=1646050167; bh=E2MMN69dcGNxkn8xHGLbTClfgrl4qAPiGO37ixK9Q6U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GTiV1r7U/P9tI02xs6RZ39oYFw/XkVbUC3NU5Q5bbWKTyfx51xmpDthbEjTyiUgXb PxXVgKgA1mxkcKMjVccVA89kNLgL0uTrI2g6p8N1MVk2luS9WWtu8mrVxNtAIQQpRz 71bkTeC9w6L7vIoMR1QJQStY7iB07ig+0PG+kUNx4GJVZobVN2uP8w0iynUTDp+YsB hAKtnZ7GAzBGrLEnGtHwPYt2vcZrtTkc9tc7ETyN7ja1f2wjRWuxT3l6CAR5bdW+Xl 331HkYgTWLhW4/SiL1hjPHOZpfa1PvffLNvcRhGyWIFRfgwC4nqktQnkdnIue0ZrB4 vhGuGY36WvwRg== From: Baruch Siach To: Andrew Lunn , Vivien Didelot Cc: Baruch Siach , netdev@vger.kernel.org, Russell King Subject: [PATCH net-next 2/2] net: dsa: mv88e6xxx: support RMII cmode Date: Mon, 28 Feb 2022 14:10:03 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Baruch Siach Add support for direct RMII MAC mode. This allows hardware with CPU port connected in direct 100M fixed link to work properly. Signed-off-by: Baruch Siach --- drivers/net/dsa/mv88e6xxx/port.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/dsa/mv88e6xxx/port.c b/drivers/net/dsa/mv88e6xxx/port.c index a58997f1fd69..795b3128768f 100644 --- a/drivers/net/dsa/mv88e6xxx/port.c +++ b/drivers/net/dsa/mv88e6xxx/port.c @@ -550,6 +550,9 @@ static int mv88e6xxx_port_set_cmode(struct mv88e6xxx_chip *chip, int port, mode = PHY_INTERFACE_MODE_1000BASEX; switch (mode) { + case PHY_INTERFACE_MODE_RMII: + cmode = MV88E6XXX_PORT_STS_CMODE_RMII; + break; case PHY_INTERFACE_MODE_1000BASEX: cmode = MV88E6XXX_PORT_STS_CMODE_1000BASEX; break;