From nobody Wed Feb 11 13:06:28 2026 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 1D4CFC74A44 for ; Tue, 14 Mar 2023 18:28:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230300AbjCNS2q (ORCPT ); Tue, 14 Mar 2023 14:28:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35004 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230137AbjCNS2j (ORCPT ); Tue, 14 Mar 2023 14:28:39 -0400 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3365B4F79; Tue, 14 Mar 2023 11:28:06 -0700 (PDT) Received: by mail-wm1-x336.google.com with SMTP id c8-20020a05600c0ac800b003ed2f97a63eso942826wmr.3; Tue, 14 Mar 2023 11:28:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678818484; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XjgfVrrzqzZG1qqVxNM9bM9LJAcqmVcDeMqlw6Kxzgg=; b=aD6NxyzRFngsopmrdASrjcU0vQ8iim1I31ReP2hBX64zvFL5W8+0S7zrnVxPbAnEaX Vhzz+MWrztqfY2vG1x3xG7FIhapwhI2uaRKkquK/I83zcvipG4qmbZtHnYDCQBg9ygzW 3vhlxjngcI3YTG/L9G15ZICGiPcTGnVj4acsgCAu+453FOiOUUtWy89QMAOsKeSVPArc JwOwOIr5usvQJG46BS1K62oecZmSFvnovQT6XxZoAvxPd0a7tHz8328alimpTnC9oPo+ ZYvdFhgEZEr1UyNuC/v2/0dEz3g7l3qE4Hqq3Rwc4/EnXWZMrM/SkQ31bW8ck8xIefCO AAnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678818484; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XjgfVrrzqzZG1qqVxNM9bM9LJAcqmVcDeMqlw6Kxzgg=; b=hZpxweL9G+97Fzif5dqcrCRazqzD+WiYhW0PftKYhQFl54kHAuUoVLKWXla5UjbxEo L3Th6icHMtaovek/+GOlYH5DG+CnWlqYXOn+mWPCpFx4WOQE+ka1koCop65UALJD70PM pSQAbp791dEhq8DXh4m9jGGJ7W2OOXA45hkGdIAvw+INBnN40RUF9Aon42LPQYrsxLZo mMUX5IG9Gq6h/rdrDobjPx2An+vGvZebQ9MFXNDhGwYRXvzi9ZKfg4SZmPSgdiA7hUhy tum7Mf3ZiIpfcgVczfv6ZMy4twVrENRLtVrrXuSElJcVm4QQpfpcvo+hGfgE9IoNs1R9 YSYw== X-Gm-Message-State: AO0yUKUZ9ymoweuJD+I75RGPgMU7yVn2alqf182E3xaYIe7IoG9AaKQI gnHb0a6FgZkuDDHnOtkuSqg= X-Google-Smtp-Source: AK7set/848at0crloBLbVrsau93TK46DK5Atd/Uh6tA9eqD/xyvv/pgIBlouHZypcgcl2N3E2OsjKw== X-Received: by 2002:a05:600c:19d4:b0:3ed:22b3:627a with SMTP id u20-20020a05600c19d400b003ed22b3627amr8505728wmq.1.1678818483993; Tue, 14 Mar 2023 11:28:03 -0700 (PDT) Received: from mars.. ([2a02:168:6806:0:5862:40de:7045:5e1b]) by smtp.gmail.com with ESMTPSA id u7-20020a7bc047000000b003e206cc7237sm3443490wmc.24.2023.03.14.11.28.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Mar 2023 11:28:03 -0700 (PDT) From: Klaus Kudielka To: Andrew Lunn Cc: Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Richard Cochran , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Klaus Kudielka Subject: [PATCH net-next v3 2/4] net: dsa: mv88e6xxx: re-order functions Date: Tue, 14 Mar 2023 19:26:57 +0100 Message-Id: <20230314182659.63686-3-klaus.kudielka@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230314182659.63686-1-klaus.kudielka@gmail.com> References: <20230314182659.63686-1-klaus.kudielka@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Move mv88e6xxx_setup() below mv88e6xxx_mdios_register(), so that we are able to call the latter one from here. Do the same thing for the inverse functions. Signed-off-by: Klaus Kudielka Reviewed-by: Andrew Lunn --- v2: No change v3: No change drivers/net/dsa/mv88e6xxx/chip.c | 358 +++++++++++++++---------------- 1 file changed, 179 insertions(+), 179 deletions(-) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/c= hip.c index 0a5d6c7bb1..496015baac 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -3672,185 +3672,6 @@ static int mv88e6390_setup_errata(struct mv88e6xxx_= chip *chip) return mv88e6xxx_software_reset(chip); } =20 -static void mv88e6xxx_teardown(struct dsa_switch *ds) -{ - mv88e6xxx_teardown_devlink_params(ds); - dsa_devlink_resources_unregister(ds); - mv88e6xxx_teardown_devlink_regions_global(ds); -} - -static int mv88e6xxx_setup(struct dsa_switch *ds) -{ - struct mv88e6xxx_chip *chip =3D ds->priv; - u8 cmode; - int err; - int i; - - chip->ds =3D ds; - ds->slave_mii_bus =3D mv88e6xxx_default_mdio_bus(chip); - - /* Since virtual bridges are mapped in the PVT, the number we support - * depends on the physical switch topology. We need to let DSA figure - * that out and therefore we cannot set this at dsa_register_switch() - * time. - */ - if (mv88e6xxx_has_pvt(chip)) - ds->max_num_bridges =3D MV88E6XXX_MAX_PVT_SWITCHES - - ds->dst->last_switch - 1; - - mv88e6xxx_reg_lock(chip); - - if (chip->info->ops->setup_errata) { - err =3D chip->info->ops->setup_errata(chip); - if (err) - goto unlock; - } - - /* Cache the cmode of each port. */ - for (i =3D 0; i < mv88e6xxx_num_ports(chip); i++) { - if (chip->info->ops->port_get_cmode) { - err =3D chip->info->ops->port_get_cmode(chip, i, &cmode); - if (err) - goto unlock; - - chip->ports[i].cmode =3D cmode; - } - } - - err =3D mv88e6xxx_vtu_setup(chip); - if (err) - goto unlock; - - /* Must be called after mv88e6xxx_vtu_setup (which flushes the - * VTU, thereby also flushing the STU). - */ - err =3D mv88e6xxx_stu_setup(chip); - if (err) - goto unlock; - - /* Setup Switch Port Registers */ - for (i =3D 0; i < mv88e6xxx_num_ports(chip); i++) { - if (dsa_is_unused_port(ds, i)) - continue; - - /* Prevent the use of an invalid port. */ - if (mv88e6xxx_is_invalid_port(chip, i)) { - dev_err(chip->dev, "port %d is invalid\n", i); - err =3D -EINVAL; - goto unlock; - } - - err =3D mv88e6xxx_setup_port(chip, i); - if (err) - goto unlock; - } - - err =3D mv88e6xxx_irl_setup(chip); - if (err) - goto unlock; - - err =3D mv88e6xxx_mac_setup(chip); - if (err) - goto unlock; - - err =3D mv88e6xxx_phy_setup(chip); - if (err) - goto unlock; - - err =3D mv88e6xxx_pvt_setup(chip); - if (err) - goto unlock; - - err =3D mv88e6xxx_atu_setup(chip); - if (err) - goto unlock; - - err =3D mv88e6xxx_broadcast_setup(chip, 0); - if (err) - goto unlock; - - err =3D mv88e6xxx_pot_setup(chip); - if (err) - goto unlock; - - err =3D mv88e6xxx_rmu_setup(chip); - if (err) - goto unlock; - - err =3D mv88e6xxx_rsvd2cpu_setup(chip); - if (err) - goto unlock; - - err =3D mv88e6xxx_trunk_setup(chip); - if (err) - goto unlock; - - err =3D mv88e6xxx_devmap_setup(chip); - if (err) - goto unlock; - - err =3D mv88e6xxx_pri_setup(chip); - if (err) - goto unlock; - - /* Setup PTP Hardware Clock and timestamping */ - if (chip->info->ptp_support) { - err =3D mv88e6xxx_ptp_setup(chip); - if (err) - goto unlock; - - err =3D mv88e6xxx_hwtstamp_setup(chip); - if (err) - goto unlock; - } - - err =3D mv88e6xxx_stats_setup(chip); - if (err) - goto unlock; - -unlock: - mv88e6xxx_reg_unlock(chip); - - if (err) - return err; - - /* Have to be called without holding the register lock, since - * they take the devlink lock, and we later take the locks in - * the reverse order when getting/setting parameters or - * resource occupancy. - */ - err =3D mv88e6xxx_setup_devlink_resources(ds); - if (err) - return err; - - err =3D mv88e6xxx_setup_devlink_params(ds); - if (err) - goto out_resources; - - err =3D mv88e6xxx_setup_devlink_regions_global(ds); - if (err) - goto out_params; - - return 0; - -out_params: - mv88e6xxx_teardown_devlink_params(ds); -out_resources: - dsa_devlink_resources_unregister(ds); - - return err; -} - -static int mv88e6xxx_port_setup(struct dsa_switch *ds, int port) -{ - return mv88e6xxx_setup_devlink_regions_port(ds, port); -} - -static void mv88e6xxx_port_teardown(struct dsa_switch *ds, int port) -{ - mv88e6xxx_teardown_devlink_regions_port(ds, port); -} - /* prod_id for switch families which do not have a PHY model number */ static const u16 family_prod_id_table[] =3D { [MV88E6XXX_FAMILY_6341] =3D MV88E6XXX_PORT_SWITCH_ID_PROD_6341, @@ -4054,6 +3875,185 @@ static int mv88e6xxx_mdios_register(struct mv88e6xx= x_chip *chip, return 0; } =20 +static void mv88e6xxx_teardown(struct dsa_switch *ds) +{ + mv88e6xxx_teardown_devlink_params(ds); + dsa_devlink_resources_unregister(ds); + mv88e6xxx_teardown_devlink_regions_global(ds); +} + +static int mv88e6xxx_setup(struct dsa_switch *ds) +{ + struct mv88e6xxx_chip *chip =3D ds->priv; + u8 cmode; + int err; + int i; + + chip->ds =3D ds; + ds->slave_mii_bus =3D mv88e6xxx_default_mdio_bus(chip); + + /* Since virtual bridges are mapped in the PVT, the number we support + * depends on the physical switch topology. We need to let DSA figure + * that out and therefore we cannot set this at dsa_register_switch() + * time. + */ + if (mv88e6xxx_has_pvt(chip)) + ds->max_num_bridges =3D MV88E6XXX_MAX_PVT_SWITCHES - + ds->dst->last_switch - 1; + + mv88e6xxx_reg_lock(chip); + + if (chip->info->ops->setup_errata) { + err =3D chip->info->ops->setup_errata(chip); + if (err) + goto unlock; + } + + /* Cache the cmode of each port. */ + for (i =3D 0; i < mv88e6xxx_num_ports(chip); i++) { + if (chip->info->ops->port_get_cmode) { + err =3D chip->info->ops->port_get_cmode(chip, i, &cmode); + if (err) + goto unlock; + + chip->ports[i].cmode =3D cmode; + } + } + + err =3D mv88e6xxx_vtu_setup(chip); + if (err) + goto unlock; + + /* Must be called after mv88e6xxx_vtu_setup (which flushes the + * VTU, thereby also flushing the STU). + */ + err =3D mv88e6xxx_stu_setup(chip); + if (err) + goto unlock; + + /* Setup Switch Port Registers */ + for (i =3D 0; i < mv88e6xxx_num_ports(chip); i++) { + if (dsa_is_unused_port(ds, i)) + continue; + + /* Prevent the use of an invalid port. */ + if (mv88e6xxx_is_invalid_port(chip, i)) { + dev_err(chip->dev, "port %d is invalid\n", i); + err =3D -EINVAL; + goto unlock; + } + + err =3D mv88e6xxx_setup_port(chip, i); + if (err) + goto unlock; + } + + err =3D mv88e6xxx_irl_setup(chip); + if (err) + goto unlock; + + err =3D mv88e6xxx_mac_setup(chip); + if (err) + goto unlock; + + err =3D mv88e6xxx_phy_setup(chip); + if (err) + goto unlock; + + err =3D mv88e6xxx_pvt_setup(chip); + if (err) + goto unlock; + + err =3D mv88e6xxx_atu_setup(chip); + if (err) + goto unlock; + + err =3D mv88e6xxx_broadcast_setup(chip, 0); + if (err) + goto unlock; + + err =3D mv88e6xxx_pot_setup(chip); + if (err) + goto unlock; + + err =3D mv88e6xxx_rmu_setup(chip); + if (err) + goto unlock; + + err =3D mv88e6xxx_rsvd2cpu_setup(chip); + if (err) + goto unlock; + + err =3D mv88e6xxx_trunk_setup(chip); + if (err) + goto unlock; + + err =3D mv88e6xxx_devmap_setup(chip); + if (err) + goto unlock; + + err =3D mv88e6xxx_pri_setup(chip); + if (err) + goto unlock; + + /* Setup PTP Hardware Clock and timestamping */ + if (chip->info->ptp_support) { + err =3D mv88e6xxx_ptp_setup(chip); + if (err) + goto unlock; + + err =3D mv88e6xxx_hwtstamp_setup(chip); + if (err) + goto unlock; + } + + err =3D mv88e6xxx_stats_setup(chip); + if (err) + goto unlock; + +unlock: + mv88e6xxx_reg_unlock(chip); + + if (err) + return err; + + /* Have to be called without holding the register lock, since + * they take the devlink lock, and we later take the locks in + * the reverse order when getting/setting parameters or + * resource occupancy. + */ + err =3D mv88e6xxx_setup_devlink_resources(ds); + if (err) + return err; + + err =3D mv88e6xxx_setup_devlink_params(ds); + if (err) + goto out_resources; + + err =3D mv88e6xxx_setup_devlink_regions_global(ds); + if (err) + goto out_params; + + return 0; + +out_params: + mv88e6xxx_teardown_devlink_params(ds); +out_resources: + dsa_devlink_resources_unregister(ds); + + return err; +} + +static int mv88e6xxx_port_setup(struct dsa_switch *ds, int port) +{ + return mv88e6xxx_setup_devlink_regions_port(ds, port); +} + +static void mv88e6xxx_port_teardown(struct dsa_switch *ds, int port) +{ + mv88e6xxx_teardown_devlink_regions_port(ds, port); +} + static int mv88e6xxx_get_eeprom_len(struct dsa_switch *ds) { struct mv88e6xxx_chip *chip =3D ds->priv; --=20 2.39.2 From nobody Wed Feb 11 13:06:28 2026 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 75BA9C05027 for ; Tue, 14 Mar 2023 18:28:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230320AbjCNS2t (ORCPT ); Tue, 14 Mar 2023 14:28:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35134 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230239AbjCNS2l (ORCPT ); Tue, 14 Mar 2023 14:28:41 -0400 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 25E36B4207; Tue, 14 Mar 2023 11:28:12 -0700 (PDT) Received: by mail-wm1-x32b.google.com with SMTP id az3-20020a05600c600300b003ed2920d585so3924391wmb.2; Tue, 14 Mar 2023 11:28:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678818486; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mejdm1PVBamcQlmV+ZPGdHyY8u7PvL3G0WvxDB+iTUc=; b=Dz4Fq0SkB1GGcjIAK2UqKsToHpEYEeivigC6CUyH97xIUBKHtFiWyNinxazqWqPI01 iu+mXB0EDIhFonLyk06xP6H1yeo+1z9JGdzbFh/aEJcqpvw4eVr6D6C7+bMWxhHWq5bk 6XlMDxLRJUjRhpsFhCEf2wTGr/fR93B/rPTk8khEdeY9ZQYGN251zUB7FqlldNfeHjL1 hJQiLB2sP0oKmycpsW+kffpm0yrTz87ngB+7y22Fm4aOXlLjhYfz7vfY4pr7GKchsQkr I2g6QUfspicJOa2sQ8Q+IvMhowz2MFSkICPBRMjllPc+DDPz5IvKWpomtZMNu7g15W6o nNDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678818486; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mejdm1PVBamcQlmV+ZPGdHyY8u7PvL3G0WvxDB+iTUc=; b=y4ZSifVMI8vXaNi7JjKQ48PCtxYPahGvngz9DTqwDJ75KQGAWd5kerXxCkW+fTkd0m DAx67ZjFoEv3BjFv5dCHY61+Xkof++2Du6m+PfhYS05RJ+W/NUwXDaEOK7wFYuDlCgGa JyPQVvIgjDeJiZ5CJbsOcLQVaRHtnUerrteVUlHZwFj5+8ovE8Oh6Ir7uemTjUxkUxfl Ny+w1azS/Vjv1Rz5fNzr/ysdheayZaLjc8jVzLjCGTKD55K7sDc9WEntHGI8S8Sq/Bga 0zJYIhwvZpwQwYBv2Uwg7RaMrYr6uTopBFeMj+eL5+7W1tchoflXr79DWLGUZvkH38Hl zRZg== X-Gm-Message-State: AO0yUKUjKzh6jcQkeHiPqOp+iiVEAmfy0SguAvvLVIyMtcXSsaOqxP2e QXJuXs/jIt7AQtx3co+QxOo= X-Google-Smtp-Source: AK7set8HaWF313rQh2Xnm405UFcOtov29/qY6dNQZEbMSDg2rw9QUKy9JGmPPzsu6iV4HNe6qG0Png== X-Received: by 2002:a05:600c:4693:b0:3dc:4b87:a570 with SMTP id p19-20020a05600c469300b003dc4b87a570mr16917460wmo.35.1678818486569; Tue, 14 Mar 2023 11:28:06 -0700 (PDT) Received: from mars.. ([2a02:168:6806:0:5862:40de:7045:5e1b]) by smtp.gmail.com with ESMTPSA id u7-20020a7bc047000000b003e206cc7237sm3443490wmc.24.2023.03.14.11.28.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Mar 2023 11:28:06 -0700 (PDT) From: Klaus Kudielka To: Andrew Lunn Cc: Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Richard Cochran , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Klaus Kudielka Subject: [PATCH net-next v3 3/4] net: dsa: mv88e6xxx: move call to mv88e6xxx_mdios_register() Date: Tue, 14 Mar 2023 19:26:58 +0100 Message-Id: <20230314182659.63686-4-klaus.kudielka@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230314182659.63686-1-klaus.kudielka@gmail.com> References: <20230314182659.63686-1-klaus.kudielka@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Call the rather expensive mv88e6xxx_mdios_register() at the beginning of mv88e6xxx_setup(). This avoids the double call via mv88e6xxx_probe() during boot. For symmetry, call mv88e6xxx_mdios_unregister() at the end of mv88e6xxx_teardown(). Link: https://lore.kernel.org/lkml/449bde236c08d5ab5e54abd73b645d8b29955894= .camel@gmail.com/ Suggested-by: Andrew Lunn Signed-off-by: Klaus Kudielka Reviewed-by: Andrew Lunn --- v2: Extend the cleanup in mv88e6xxx_setup() to remove the mdio bus on failu= re v3: No change drivers/net/dsa/mv88e6xxx/chip.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/c= hip.c index 496015baac..29b0f3bb1c 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -3840,9 +3840,9 @@ static void mv88e6xxx_mdios_unregister(struct mv88e6x= xx_chip *chip) } } =20 -static int mv88e6xxx_mdios_register(struct mv88e6xxx_chip *chip, - struct device_node *np) +static int mv88e6xxx_mdios_register(struct mv88e6xxx_chip *chip) { + struct device_node *np =3D chip->dev->of_node; struct device_node *child; int err; =20 @@ -3877,9 +3877,12 @@ static int mv88e6xxx_mdios_register(struct mv88e6xxx= _chip *chip, =20 static void mv88e6xxx_teardown(struct dsa_switch *ds) { + struct mv88e6xxx_chip *chip =3D ds->priv; + mv88e6xxx_teardown_devlink_params(ds); dsa_devlink_resources_unregister(ds); mv88e6xxx_teardown_devlink_regions_global(ds); + mv88e6xxx_mdios_unregister(chip); } =20 static int mv88e6xxx_setup(struct dsa_switch *ds) @@ -3889,6 +3892,10 @@ static int mv88e6xxx_setup(struct dsa_switch *ds) int err; int i; =20 + err =3D mv88e6xxx_mdios_register(chip); + if (err) + return err; + chip->ds =3D ds; ds->slave_mii_bus =3D mv88e6xxx_default_mdio_bus(chip); =20 @@ -4015,7 +4022,7 @@ static int mv88e6xxx_setup(struct dsa_switch *ds) mv88e6xxx_reg_unlock(chip); =20 if (err) - return err; + goto out_mdios; =20 /* Have to be called without holding the register lock, since * they take the devlink lock, and we later take the locks in @@ -4024,7 +4031,7 @@ static int mv88e6xxx_setup(struct dsa_switch *ds) */ err =3D mv88e6xxx_setup_devlink_resources(ds); if (err) - return err; + goto out_mdios; =20 err =3D mv88e6xxx_setup_devlink_params(ds); if (err) @@ -4040,6 +4047,8 @@ static int mv88e6xxx_setup(struct dsa_switch *ds) mv88e6xxx_teardown_devlink_params(ds); out_resources: dsa_devlink_resources_unregister(ds); +out_mdios: + mv88e6xxx_mdios_unregister(chip); =20 return err; } @@ -7220,18 +7229,12 @@ static int mv88e6xxx_probe(struct mdio_device *mdio= dev) if (err) goto out_g1_atu_prob_irq; =20 - err =3D mv88e6xxx_mdios_register(chip, np); - if (err) - goto out_g1_vtu_prob_irq; - err =3D mv88e6xxx_register_switch(chip); if (err) - goto out_mdio; + goto out_g1_vtu_prob_irq; =20 return 0; =20 -out_mdio: - mv88e6xxx_mdios_unregister(chip); out_g1_vtu_prob_irq: mv88e6xxx_g1_vtu_prob_irq_free(chip); out_g1_atu_prob_irq: @@ -7268,7 +7271,6 @@ static void mv88e6xxx_remove(struct mdio_device *mdio= dev) =20 mv88e6xxx_phy_destroy(chip); mv88e6xxx_unregister_switch(chip); - mv88e6xxx_mdios_unregister(chip); =20 mv88e6xxx_g1_vtu_prob_irq_free(chip); mv88e6xxx_g1_atu_prob_irq_free(chip); --=20 2.39.2 From nobody Wed Feb 11 13:06:28 2026 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 3D0AAC05027 for ; Tue, 14 Mar 2023 18:28:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230354AbjCNS2w (ORCPT ); Tue, 14 Mar 2023 14:28:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34782 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230281AbjCNS2m (ORCPT ); Tue, 14 Mar 2023 14:28:42 -0400 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA824B4215; Tue, 14 Mar 2023 11:28:13 -0700 (PDT) Received: by mail-wm1-x335.google.com with SMTP id fm20-20020a05600c0c1400b003ead37e6588so13812723wmb.5; Tue, 14 Mar 2023 11:28:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678818490; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uCZkrMLZx8ZVMQLFuANkNwADh4tGUpOBmEXyzie1B/E=; b=UarJ3AuQtgdT97POi2QL4jhEBe0WUGNTBL9LOFoKiy5WPNaL6vER6d6ibVrQIAmjlL DDfARMnIDTGFvCAd3DqhXAe44PBm5frJHA1s0/zqr+zMAbeDcpXvibgSPlpM5/rZgKSR iUIQKlOp3QIwPt0NS0vQ7szqSi5vvFkA6Uh53hal4F1lYAGBJ/QBvDwWoccPpAuIW2Vm NC4/EjVYiVKw4RC43f9xGHFi8/wDFWL//QIW5JoVAJgnCndFqwaHEAHJFBn5CYlamf28 13IqIpbvm7Jmty7Yl8l2xmSjX4s1qpnQt2Zek9q1Rq4orLMVHqjHdXxkiYrRy7iH6Asx wC1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678818490; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uCZkrMLZx8ZVMQLFuANkNwADh4tGUpOBmEXyzie1B/E=; b=YCSTzlN3x+wdVjSCfHWU8RO8bl0y8REJJl/+4cZW4Bjokj5TFk+h2/uT7bI63dNxHp CcJlF5ykbHwI83w4LXLFfis9x9f254D7y9ylx1/v976L+xme/3kSYj8RJOmPZswqFCGx SB70saJfdaOHC8gUPqudIeiEJfe0nJmYQCRC20wPffbcwwDN4iukj0un1A7j/WGfRzat GP1VnAEBsEvjpuSixZwrHrJ6bogm+Rc0ujboB/7XNPkvlkhaZzFjskkAKy6qYe/gcyeK dO4W4A+YRyFVOKs3RjIjaw6ahZSHlOkQpB6DuaA2pZlv288JwqpnEk1/dS1It+PY1qUl p6Jg== X-Gm-Message-State: AO0yUKXxyH3YaLyGstSXJO33/wE/MCJeB+cpQJLCmt4gJL6zR2/hSdNu VX0KwG389+8/2Lt3L3P9iRA= X-Google-Smtp-Source: AK7set+lUkWThuG1N23QJqHPUBSaOk5Y13PSBdLBj0pekiBWwf/CEnjZKJzslUlaJPscTptKfZRI5Q== X-Received: by 2002:a05:600c:3c89:b0:3eb:38e6:f659 with SMTP id bg9-20020a05600c3c8900b003eb38e6f659mr15820259wmb.15.1678818490700; Tue, 14 Mar 2023 11:28:10 -0700 (PDT) Received: from mars.. ([2a02:168:6806:0:5862:40de:7045:5e1b]) by smtp.gmail.com with ESMTPSA id u7-20020a7bc047000000b003e206cc7237sm3443490wmc.24.2023.03.14.11.28.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Mar 2023 11:28:10 -0700 (PDT) From: Klaus Kudielka To: Andrew Lunn Cc: Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Richard Cochran , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Klaus Kudielka Subject: [PATCH net-next v3 4/4] net: dsa: mv88e6xxx: mask apparently non-existing phys during probing Date: Tue, 14 Mar 2023 19:26:59 +0100 Message-Id: <20230314182659.63686-5-klaus.kudielka@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230314182659.63686-1-klaus.kudielka@gmail.com> References: <20230314182659.63686-1-klaus.kudielka@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" To avoid excessive mdio bus transactions during probing, mask all phy addresses that do not exist (there is a 1:1 mapping between switch port number and phy address). Suggested-by: Andrew Lunn Signed-off-by: Klaus Kudielka Reviewed-by: Andrew Lunn --- v2: Patch is new v3: No change drivers/net/dsa/mv88e6xxx/chip.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/c= hip.c index 29b0f3bb1c..c52798d9ce 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -3797,6 +3797,7 @@ static int mv88e6xxx_mdio_register(struct mv88e6xxx_c= hip *chip, bus->read_c45 =3D mv88e6xxx_mdio_read_c45; bus->write_c45 =3D mv88e6xxx_mdio_write_c45; bus->parent =3D chip->dev; + bus->phy_mask =3D GENMASK(31, mv88e6xxx_num_ports(chip)); =20 if (!external) { err =3D mv88e6xxx_g2_irq_mdio_setup(chip, bus); --=20 2.39.2 From nobody Wed Feb 11 13:06:28 2026 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 23D78C74A44 for ; Tue, 14 Mar 2023 18:28:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230224AbjCNS2e (ORCPT ); Tue, 14 Mar 2023 14:28:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34774 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229986AbjCNS2a (ORCPT ); Tue, 14 Mar 2023 14:28:30 -0400 Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 47C1F974B2; Tue, 14 Mar 2023 11:27:59 -0700 (PDT) Received: by mail-wm1-x330.google.com with SMTP id k25-20020a7bc419000000b003ed23114fa7so5125478wmi.4; Tue, 14 Mar 2023 11:27:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678818478; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=cpdp6mwTYG7IePlpnlQJFBmoOMjhOjLp24K1zGTlFNU=; b=PUyr3fxaz+N2AaTQqZJwFy0FE7SsS3jZslC3BdyWDqeErYGkt/MwJmIdPGcLRrOG7I gMorSoOmo9InY4V5wlN+zdNKZeRNRtoRee05cjXae+IIwUQ+0hfdp8bdX8QkaA4RHmAm UjU9sZL36pz0DkkiFGGd4DsYPH749C26gNoUjr5SXjuOXbkTIlgkw6WX+HAyWNwLGkHZ VDQPX7o8fL0clrI+meexl5Ly82Gjdu6xIBMI3HBxWW2+AJzrlq7rSdUMQpEizOXmMk0W DOyrRJeslVYRyOCOX9CLD3CAXU4IovjHkt7p+14nkuSttZkVKAkc58YsvMRaQyrOrTwx FfSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678818478; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cpdp6mwTYG7IePlpnlQJFBmoOMjhOjLp24K1zGTlFNU=; b=a/butNyufmCOZs9AW1iCCWAsMFwcacrOFscxqdj2OW2nbPp9iF+j7fGitxLHLb9Jdv mnhdg0dnQMD6Qh/6eqwA3TVwDopLZFaHy5sf0WTRmTmtYoEvlBIZuvZa72iwEdSPeHOY 74ijwxlCir5Agi0JZ0laH+4bp01QALG6c8Q/F9uclQuoO9pDdfZOg6BVrNhDr/LbeCLs eDftRaCvHq4YoTq8Et+l4mG1D4mOFROVZ3TUOJZubYZV6i/JesoorRuGt5iZHjc2iLE0 vxobRbLsCNbA3xiy0X8lHLr9huGRQWDlE+RQAwzdUvyX2YYDIzigssPYgRPN/zXyplxn p0sg== X-Gm-Message-State: AO0yUKVKrmpTMgmnywnNoZd82x+Dk0UtQ/4Dj/kxOYC5OMNJ0Falk7VA uHFYfS0jRM2fbPP0Blrm3Nw= X-Google-Smtp-Source: AK7set/jTU7svTZhwhdiK+tgNSXGJxZjnnVjtXqRDa48RGioubUkxtWbU9aRxu1dOgylpE+qTFxI5A== X-Received: by 2002:a05:600c:1c17:b0:3ed:2f7b:daf with SMTP id j23-20020a05600c1c1700b003ed2f7b0dafmr1431749wms.10.1678818477625; Tue, 14 Mar 2023 11:27:57 -0700 (PDT) Received: from mars.. ([2a02:168:6806:0:5862:40de:7045:5e1b]) by smtp.gmail.com with ESMTPSA id u7-20020a7bc047000000b003e206cc7237sm3443490wmc.24.2023.03.14.11.27.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Mar 2023 11:27:57 -0700 (PDT) From: Klaus Kudielka To: Andrew Lunn Cc: Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Richard Cochran , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Vladimir Oltean , Klaus Kudielka Subject: [PATCH] net: dsa: mv88e6xxx: don't dispose of Global2 IRQ mappings from mdiobus code Date: Tue, 14 Mar 2023 19:26:56 +0100 Message-Id: <20230314182659.63686-2-klaus.kudielka@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230314182659.63686-1-klaus.kudielka@gmail.com> References: <20230314182659.63686-1-klaus.kudielka@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Vladimir Oltean irq_find_mapping() does not need irq_dispose_mapping(), only irq_create_mapping() does. Calling irq_dispose_mapping() from mv88e6xxx_g2_irq_mdio_free() and from the error path of mv88e6xxx_g2_irq_mdio_setup() effectively means that the mdiobus logic (for internal PHY interrupts) is disposing of a hwirq->virq mapping which it is not responsible of (but instead, the function pair mv88e6xxx_g2_irq_setup() + mv88e6xxx_g2_irq_free() is). With the current code structure, this isn't such a huge problem, because mv88e6xxx_g2_irq_mdio_free() is called relatively close to the real owner of the IRQ mappings: mv88e6xxx_remove() -> mv88e6xxx_unregister_switch() -> mv88e6xxx_mdios_unregister() -> mv88e6xxx_g2_irq_mdio_free() -> mv88e6xxx_g2_irq_free() and the switch isn't 'live' in any way such that it would be able of generating interrupts at this point (mv88e6xxx_unregister_switch() has been called). However, there is a desire to split mv88e6xxx_mdios_unregister() and mv88e6xxx_g2_irq_free() such that mv88e6xxx_mdios_unregister() only gets called from mv88e6xxx_teardown(). This is much more problematic, as can be seen below. In a cross-chip scenario (say 3 switches d0032004.mdio-mii:10, d0032004.mdio-mii:11 and d0032004.mdio-mii:12 which form a single DSA tree), it is possible to unbind the device driver from a single switch (say d0032004.mdio-mii:10). When that happens, mv88e6xxx_remove() will be called for just that one switch, and this will call mv88e6xxx_unregister_switch() which will tear down the entire tree (calling mv88e6xxx_teardown() for all 3 switches). Assuming mv88e6xxx_mdios_unregister() was moved to mv88e6xxx_teardown(), at this stage, all 3 switches will have called irq_dispose_mapping() on their mdiobus virqs. When we bind again the device driver to d0032004.mdio-mii:10, mv88e6xxx_probe() is called for it, which calls dsa_register_switch(). The DSA tree is now complete again, and mv88e6xxx_setup() is called for all 3 switches. Also assuming that mv88e6xxx_mdios_register() is moved to mv88e6xxx_setup() (the 2 assumptions go together), at this point, d0032004.mdio-mii:11 and d0032004.mdio-mii:12 don't have an IRQ mapping for the internal PHYs anymore, as they've disposed of it in mv88e6xxx_teardown(). Whereas switch d0032004.mdio-mii:10 has re-created it, because its code path comes from mv88e6xxx_probe(). Simply put, this change prepares the driver to handle the movement of mv88e6xxx_mdios_register() to mv88e6xxx_setup() for cross-chip DSA trees. Also, the code being deleted was partially wrong anyway (in a way which may have hidden this other issue). mv88e6xxx_g2_irq_mdio_setup() populates bus->irq[] starting with offset chip->info->phy_base_addr, but the teardown path doesn't apply that offset too. So it disposes of virq 0 for phy =3D [ 0, phy_base_addr ). All switch families have phy_base_addr =3D 0, except for MV88E6141 and MV88E6341 which have it as 0x10. I guess those families would have happened to work by mistake in cross-chip scenarios too. I'm deleting the body of mv88e6xxx_g2_irq_mdio_free() but leaving its call sites and prototype in place. This is because, if we ever need to add back some teardown procedure in the future, it will be perhaps error-prone to deduce the proper call sites again. Whereas like this, no extra code should get generated, it shouldn't bother anybody. Signed-off-by: Vladimir Oltean Signed-off-by: Klaus Kudielka --- v3: Patch is new drivers/net/dsa/mv88e6xxx/global2.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/drivers/net/dsa/mv88e6xxx/global2.c b/drivers/net/dsa/mv88e6xx= x/global2.c index ed3b2f88e7..a26546d3d7 100644 --- a/drivers/net/dsa/mv88e6xxx/global2.c +++ b/drivers/net/dsa/mv88e6xxx/global2.c @@ -1176,31 +1176,19 @@ int mv88e6xxx_g2_irq_setup(struct mv88e6xxx_chip *c= hip) int mv88e6xxx_g2_irq_mdio_setup(struct mv88e6xxx_chip *chip, struct mii_bus *bus) { - int phy, irq, err, err_phy; + int phy, irq; =20 for (phy =3D 0; phy < chip->info->num_internal_phys; phy++) { irq =3D irq_find_mapping(chip->g2_irq.domain, phy); - if (irq < 0) { - err =3D irq; - goto out; - } + if (irq < 0) + return irq; + bus->irq[chip->info->phy_base_addr + phy] =3D irq; } return 0; -out: - err_phy =3D phy; - - for (phy =3D 0; phy < err_phy; phy++) - irq_dispose_mapping(bus->irq[phy]); - - return err; } =20 void mv88e6xxx_g2_irq_mdio_free(struct mv88e6xxx_chip *chip, struct mii_bus *bus) { - int phy; - - for (phy =3D 0; phy < chip->info->num_internal_phys; phy++) - irq_dispose_mapping(bus->irq[phy]); } --=20 2.39.2