From patchwork Wed Mar 15 16:38:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Klaus Kudielka X-Patchwork-Id: 70320 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp7602wrt; Wed, 15 Mar 2023 09:54:15 -0700 (PDT) X-Google-Smtp-Source: AK7set9/+wiRNwcZVdGZYIhKwhU24f4pq0UcknDanUeaJlvRXwb/JDl3exPkiAxDAAN0m41b0ZTd X-Received: by 2002:a17:90b:4f87:b0:23d:360:877d with SMTP id qe7-20020a17090b4f8700b0023d0360877dmr391269pjb.32.1678899254866; Wed, 15 Mar 2023 09:54:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678899254; cv=none; d=google.com; s=arc-20160816; b=YNbtF7E1MPzYTrc6eGWPQ5LCLjBMM+bMnFlRb6xVCAu87IRismtnimBF2rqTdIqNuL ORcDd+JDuxiXLvQs/mtF16yrnLWBWrxZ2sZ2BOp9ltOKleqedTlboRDvrsiqJBKZ6N7n AudHboV0dVweYjfFouES1f9Yk+eU+tm98WckAIKAjv96l+SqRaNnP6kfx9ItIz1QMsg1 RvQ7DRVPMKE/Ke8/6V6u5Pkv7pavhrkEG7ovIY7GnRyzDMPPCdK2PYytox2fkcSa1aZL aaIInDiVm93pTzrT0xPN0kt5S2PFohkdez5ptbL5Jz2klZOzh+VIRm8SUYA+iYrIglJz VgPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=jHCDDp3f7xSAExOpOr3eGZoTj0+tT1KskMeeSxr/wG0=; b=TKJcX/I34iJw0PHztrp9YaaZxeQZz3MUf+/KccwXYhS58sRUtjaAcbgJlg6fkHW9Kd nGSihPveJNoltzcEiqbkW7V5twUAVn0OhLgZzGf/h1bgcHOJd+naJyUUgxNukWr5gQVv x63kXQ+WciBHHMRptaqs27jqAtw9pIJ1yd/MGvJ8Xdo24c8o2u4AV/P2aW8K8mGqP2yP tFqv3y/0TPeM3dR+XexkmqzYaNPbsCbPSmCPMGYS0LAWjNhALOIqkIWa8niQwGq0QauI hI5aDBs0KvlzhWI/exObosY6is7cDD0QiyrWsZh1clb519ilDLYtosek/p28mYPcfuEG Omyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=OqA3g4np; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id lk15-20020a17090308cf00b00177568a0e53si5242797plb.252.2023.03.15.09.54.02; Wed, 15 Mar 2023 09:54:14 -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=@gmail.com header.s=20210112 header.b=OqA3g4np; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232805AbjCOQld (ORCPT + 99 others); Wed, 15 Mar 2023 12:41:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37490 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232096AbjCOQlG (ORCPT ); Wed, 15 Mar 2023 12:41:06 -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 5EF1E93; Wed, 15 Mar 2023 09:39:57 -0700 (PDT) Received: by mail-wm1-x335.google.com with SMTP id o11-20020a05600c4fcb00b003eb33ea29a8so1688800wmq.1; Wed, 15 Mar 2023 09:39:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678898352; 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=jHCDDp3f7xSAExOpOr3eGZoTj0+tT1KskMeeSxr/wG0=; b=OqA3g4npinc8sGg+XBVsLBNx6JmNECKM49/UaeGlgugzCTiobtxtNY9tXsV4N0ANYB Bw5MqBLjrxNbiEjeRGYZs1GeIZIenfQo2xeif3s5wa3UXRoYqZbwp76QpKHCuqkg4lUp xv9xfDM5zdm1tQxPXmZqb6plDyZId5qljZz7RjrF8uktVc0wq2JTd6X9TZZ5pBYhRcvw 6RV5QJy7++Q9+TJbU8Q+YNjAfUN4U+rJsKa34peRxkwaeQ1Cn3YOAeS9IjQS64K8LBxp 3fIsywIB2tMvvA1K6AVI/nMznVsMTXRE4WFuTQd9+uS1s7WdPtr0NySLcUjYAjDj6x8k ZtuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678898352; 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=jHCDDp3f7xSAExOpOr3eGZoTj0+tT1KskMeeSxr/wG0=; b=g3K+r4HV9Bl1GT6WMGFSvQAy+mHbJbG6l8uc+Mf0sKELkzYJtRwRiodbha464ce764 3ptv+sUVHeLlDnHu1HfJV3eY8tPlVIbQNUftN+mm/ffNFd3z0ai8b8qophgf+B2a8Qe2 /GXhzohMy8BKA5FhrZuj01syfZiyea2V3SZ3uJILs7cnP6LK0PmC174AtIIWF8g80wBS A7HjhI+jUC4T9aHANoJcmVQyXjU63svmvU0kbMuIZjO0qj2PuthnOnQg74Q8cyT+qc0r tJeD+nrPiQqUyP+U/QtUuc/7BUcsw1Xz/zjZeLK5/ulZgfsJ9EIulqcADjLGaA7I4sCu a3HA== X-Gm-Message-State: AO0yUKV+IhqP5zAc2AcIRxMrf6fZtwRdiMGU7tl4qosnga6zSLFf5waP c+hkFOQgrX1OjnW8jMN8uzE= X-Received: by 2002:a05:600c:45c6:b0:3eb:2e27:2d0c with SMTP id s6-20020a05600c45c600b003eb2e272d0cmr16252830wmo.1.1678898352158; Wed, 15 Mar 2023 09:39:12 -0700 (PDT) Received: from mars.. ([2a02:168:6806:0:839a:f879:3eb0:8b4e]) by smtp.gmail.com with ESMTPSA id z17-20020a5d4d11000000b002c5a1bd527dsm5039595wrt.96.2023.03.15.09.39.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Mar 2023 09:39:12 -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-next v4 1/4] net: dsa: mv88e6xxx: don't dispose of Global2 IRQ mappings from mdiobus code Date: Wed, 15 Mar 2023 17:38:43 +0100 Message-Id: <20230315163846.3114-2-klaus.kudielka@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230315163846.3114-1-klaus.kudielka@gmail.com> References: <20230315163846.3114-1-klaus.kudielka@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760453465507665446?= X-GMAIL-MSGID: =?utf-8?q?1760453465507665446?= 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 = [ 0, phy_base_addr ). All switch families have phy_base_addr = 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 Tested-by: Vladimir Oltean Reviewed-by: Florian Fainelli --- Notes: 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/mv88e6xxx/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 *chip) int mv88e6xxx_g2_irq_mdio_setup(struct mv88e6xxx_chip *chip, struct mii_bus *bus) { - int phy, irq, err, err_phy; + int phy, irq; for (phy = 0; phy < chip->info->num_internal_phys; phy++) { irq = irq_find_mapping(chip->g2_irq.domain, phy); - if (irq < 0) { - err = irq; - goto out; - } + if (irq < 0) + return irq; + bus->irq[chip->info->phy_base_addr + phy] = irq; } return 0; -out: - err_phy = phy; - - for (phy = 0; phy < err_phy; phy++) - irq_dispose_mapping(bus->irq[phy]); - - return err; } void mv88e6xxx_g2_irq_mdio_free(struct mv88e6xxx_chip *chip, struct mii_bus *bus) { - int phy; - - for (phy = 0; phy < chip->info->num_internal_phys; phy++) - irq_dispose_mapping(bus->irq[phy]); } From patchwork Wed Mar 15 16:38:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Klaus Kudielka X-Patchwork-Id: 70319 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp7394wrt; Wed, 15 Mar 2023 09:53:42 -0700 (PDT) X-Google-Smtp-Source: AK7set8woRwyipw6mYD9WrLboJglm+m84xbMY+y/qn1s1onWZftg9PDr/4m2i/aEK/5PXa72xhdu X-Received: by 2002:a05:6a20:3d8a:b0:be:d4be:50a2 with SMTP id s10-20020a056a203d8a00b000bed4be50a2mr504469pzi.32.1678899222353; Wed, 15 Mar 2023 09:53:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678899222; cv=none; d=google.com; s=arc-20160816; b=l48HKHDxJzj4Xq1qy9YT4cZ87uWjNtTdscwnU/Vj9UiJL6bXP1IVQpcM5kfBEc9eKj ltGRjDi2fq5cQfkVB4iRJs4QF8oXE5PKbehJN/vIsFewrq/VCujHkWkZNbbUeruDrzkq wbtnpKfgkDZXPSxEsgrJWHCRQ5b5r1NTQ6for8dAeJZ++Tex6yXPD2DSqwA3avsncWrr 1jw8DLb2RaYwEg8iqdazgv5nshhXpR7/13AwIJ9sOR2dYKiCIyWEiKL2A9GT7E05OprB 7KoY8TOuO9UF9VigZjyGlpGB0xUyBBxG3hJrG3KSEWeIXfVMEFSPpaBi/x4BBRMOCcsW 1nDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=SKVRMB5BJ3/mPmCndwc4TZq7o7ayvF8yXJpP+m6AseI=; b=zTr5ljq7yr+6KFC2Nv/LPKxfoUAk+uPotRdfZoTSToh+f5oOant1vzfPLDjXH6rlyS +5X24chaUk7MhRLoIH80xla/NnmINDLwPF3A0Kox+7LPSCla0zDVbBWaFQLhniLUNTjn i2CA8EixGy/P58A9K9ofgZ5nydio6KYWUmoly6LzWK87WXSr47KPtKDqkwGkzUvPrbRv VDbdbcBAT8witCIKcD/DAUAqMNkM8vPKYqNqZV+n2vSqUdeq8J9y3fwudIA1x8uPx8RT dhGZoN5koyvuNTvRvvABXkpYYlLCTleII+F8nY+D1HyWkXdwKrgYwGt0vHVV4gS7H7cQ 5RcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b="jy9/Smt3"; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v12-20020a63d54c000000b0050726756ee8si5578369pgi.93.2023.03.15.09.53.28; Wed, 15 Mar 2023 09:53:42 -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=@gmail.com header.s=20210112 header.b="jy9/Smt3"; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232761AbjCOQl2 (ORCPT + 99 others); Wed, 15 Mar 2023 12:41:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36740 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232670AbjCOQlH (ORCPT ); Wed, 15 Mar 2023 12:41:07 -0400 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 766A010CD; Wed, 15 Mar 2023 09:39:57 -0700 (PDT) Received: by mail-wm1-x332.google.com with SMTP id r19-20020a05600c459300b003eb3e2a5e7bso1699382wmo.0; Wed, 15 Mar 2023 09:39:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678898353; 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=SKVRMB5BJ3/mPmCndwc4TZq7o7ayvF8yXJpP+m6AseI=; b=jy9/Smt3vGOi0D1C/8Nw7Hr+3cWytF5NcVK9/FgtKfhvOTVPsyLOly1cwpy1d2vVWA 0E60oBPTMSxEbREKdtAPArR4Mm6GZcY9rOBhOldq9P6TDGpynVjYbG4U2fj6SkUpF0EB 37rt4kS9oB2yDP7fkNRGPF7T4P59abXHEIR2kSfdUdyO/+nv3HnrBABEmSc95syFQTVz RRtnznbLMa9FJ39oPGlBovnFPzJ5UxDUozOEaWF7VAd0THBv1YoweUXsbGgpkYnQjcZd AYHAhiZLSh0Dc3k6yNfxrF3y6evzIVG7+Wjd/axtM627Cl8F0rR4cxWBepkXOFF3EAKP vsNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678898353; 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=SKVRMB5BJ3/mPmCndwc4TZq7o7ayvF8yXJpP+m6AseI=; b=XADF+0QsrtevOpiyCdVDeHHQ0iRH4TECrxi3HYDmdmuymv4+d7ZAo73MNUmAwLamBQ TjyGm3ulOZEN9x9TAUDDSfDat6CrcoE8K7/5vSIXDqjqV7zzhPVqwmugjqJ25txTl1O7 aVYrsyAUpu3ODBQlE/3j/B152SWPAjF1BJz/aZ+Xl3QNzXltfBhY58LIY2tqZLgwsAJo XnlfaxfqVojdrQpG9oaXpufNggxVFR/5k1sY70ICl7MntC/I9c6XszaBYvKIGXHnroqj /Gxa8DF3gnJsPlGWiQX+PUpD/L75wufMte41I6+oB62RCg/Cot4GnAWQ5+C9vsDn7YK6 3+ow== X-Gm-Message-State: AO0yUKVx/XmUasLOHQ2gB+OFpx6eSLPH4GQsS7JqdxjRMiqSpKWQScjJ UJL6TgGqOnNyKCheJ9yam+4= X-Received: by 2002:a05:600c:4ed0:b0:3e2:20c7:6553 with SMTP id g16-20020a05600c4ed000b003e220c76553mr18258946wmq.13.1678898352718; Wed, 15 Mar 2023 09:39:12 -0700 (PDT) Received: from mars.. ([2a02:168:6806:0:839a:f879:3eb0:8b4e]) by smtp.gmail.com with ESMTPSA id z17-20020a5d4d11000000b002c5a1bd527dsm5039595wrt.96.2023.03.15.09.39.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Mar 2023 09:39:12 -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 v4 2/4] net: dsa: mv88e6xxx: re-order functions Date: Wed, 15 Mar 2023 17:38:44 +0100 Message-Id: <20230315163846.3114-3-klaus.kudielka@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230315163846.3114-1-klaus.kudielka@gmail.com> References: <20230315163846.3114-1-klaus.kudielka@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760453430951161697?= X-GMAIL-MSGID: =?utf-8?q?1760453430951161697?= 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 Reviewed-by: Vladimir Oltean Reviewed-by: Florian Fainelli --- 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/chip.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); } -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 = ds->priv; - u8 cmode; - int err; - int i; - - chip->ds = ds; - ds->slave_mii_bus = 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 = MV88E6XXX_MAX_PVT_SWITCHES - - ds->dst->last_switch - 1; - - mv88e6xxx_reg_lock(chip); - - if (chip->info->ops->setup_errata) { - err = chip->info->ops->setup_errata(chip); - if (err) - goto unlock; - } - - /* Cache the cmode of each port. */ - for (i = 0; i < mv88e6xxx_num_ports(chip); i++) { - if (chip->info->ops->port_get_cmode) { - err = chip->info->ops->port_get_cmode(chip, i, &cmode); - if (err) - goto unlock; - - chip->ports[i].cmode = cmode; - } - } - - err = 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 = mv88e6xxx_stu_setup(chip); - if (err) - goto unlock; - - /* Setup Switch Port Registers */ - for (i = 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 = -EINVAL; - goto unlock; - } - - err = mv88e6xxx_setup_port(chip, i); - if (err) - goto unlock; - } - - err = mv88e6xxx_irl_setup(chip); - if (err) - goto unlock; - - err = mv88e6xxx_mac_setup(chip); - if (err) - goto unlock; - - err = mv88e6xxx_phy_setup(chip); - if (err) - goto unlock; - - err = mv88e6xxx_pvt_setup(chip); - if (err) - goto unlock; - - err = mv88e6xxx_atu_setup(chip); - if (err) - goto unlock; - - err = mv88e6xxx_broadcast_setup(chip, 0); - if (err) - goto unlock; - - err = mv88e6xxx_pot_setup(chip); - if (err) - goto unlock; - - err = mv88e6xxx_rmu_setup(chip); - if (err) - goto unlock; - - err = mv88e6xxx_rsvd2cpu_setup(chip); - if (err) - goto unlock; - - err = mv88e6xxx_trunk_setup(chip); - if (err) - goto unlock; - - err = mv88e6xxx_devmap_setup(chip); - if (err) - goto unlock; - - err = mv88e6xxx_pri_setup(chip); - if (err) - goto unlock; - - /* Setup PTP Hardware Clock and timestamping */ - if (chip->info->ptp_support) { - err = mv88e6xxx_ptp_setup(chip); - if (err) - goto unlock; - - err = mv88e6xxx_hwtstamp_setup(chip); - if (err) - goto unlock; - } - - err = 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 = mv88e6xxx_setup_devlink_resources(ds); - if (err) - return err; - - err = mv88e6xxx_setup_devlink_params(ds); - if (err) - goto out_resources; - - err = 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[] = { [MV88E6XXX_FAMILY_6341] = MV88E6XXX_PORT_SWITCH_ID_PROD_6341, @@ -4054,6 +3875,185 @@ static int mv88e6xxx_mdios_register(struct mv88e6xxx_chip *chip, return 0; } +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 = ds->priv; + u8 cmode; + int err; + int i; + + chip->ds = ds; + ds->slave_mii_bus = 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 = MV88E6XXX_MAX_PVT_SWITCHES - + ds->dst->last_switch - 1; + + mv88e6xxx_reg_lock(chip); + + if (chip->info->ops->setup_errata) { + err = chip->info->ops->setup_errata(chip); + if (err) + goto unlock; + } + + /* Cache the cmode of each port. */ + for (i = 0; i < mv88e6xxx_num_ports(chip); i++) { + if (chip->info->ops->port_get_cmode) { + err = chip->info->ops->port_get_cmode(chip, i, &cmode); + if (err) + goto unlock; + + chip->ports[i].cmode = cmode; + } + } + + err = 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 = mv88e6xxx_stu_setup(chip); + if (err) + goto unlock; + + /* Setup Switch Port Registers */ + for (i = 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 = -EINVAL; + goto unlock; + } + + err = mv88e6xxx_setup_port(chip, i); + if (err) + goto unlock; + } + + err = mv88e6xxx_irl_setup(chip); + if (err) + goto unlock; + + err = mv88e6xxx_mac_setup(chip); + if (err) + goto unlock; + + err = mv88e6xxx_phy_setup(chip); + if (err) + goto unlock; + + err = mv88e6xxx_pvt_setup(chip); + if (err) + goto unlock; + + err = mv88e6xxx_atu_setup(chip); + if (err) + goto unlock; + + err = mv88e6xxx_broadcast_setup(chip, 0); + if (err) + goto unlock; + + err = mv88e6xxx_pot_setup(chip); + if (err) + goto unlock; + + err = mv88e6xxx_rmu_setup(chip); + if (err) + goto unlock; + + err = mv88e6xxx_rsvd2cpu_setup(chip); + if (err) + goto unlock; + + err = mv88e6xxx_trunk_setup(chip); + if (err) + goto unlock; + + err = mv88e6xxx_devmap_setup(chip); + if (err) + goto unlock; + + err = mv88e6xxx_pri_setup(chip); + if (err) + goto unlock; + + /* Setup PTP Hardware Clock and timestamping */ + if (chip->info->ptp_support) { + err = mv88e6xxx_ptp_setup(chip); + if (err) + goto unlock; + + err = mv88e6xxx_hwtstamp_setup(chip); + if (err) + goto unlock; + } + + err = 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 = mv88e6xxx_setup_devlink_resources(ds); + if (err) + return err; + + err = mv88e6xxx_setup_devlink_params(ds); + if (err) + goto out_resources; + + err = 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 = ds->priv; From patchwork Wed Mar 15 16:38:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Klaus Kudielka X-Patchwork-Id: 70323 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp8204wrt; Wed, 15 Mar 2023 09:55:42 -0700 (PDT) X-Google-Smtp-Source: AK7set/m834JEuLg2cNvUKw3fjUJS234LfbLlMCTMvkaQcvoBNXD5m4WFoEv2+6bU7dCDKOyq7vS X-Received: by 2002:a17:90b:180b:b0:23b:4005:26e6 with SMTP id lw11-20020a17090b180b00b0023b400526e6mr382325pjb.34.1678899342396; Wed, 15 Mar 2023 09:55:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678899342; cv=none; d=google.com; s=arc-20160816; b=JHJDg9AYEqyZ4JPgRAtz9DRqyk+zXJEPCV/bUxRmbnHADDsjZKGzBXw4xkJTXDmfdD XwIGQF9rV0+FYlBVFRyNH9vpEGRlcGDEIN/SiE1o9sFokZM+BzyValk8kMzK01qBwNTw 6P+gFUoHYcupIy3254BPaAJ4vu+hkU3z16hdscTPvOEweSVoUXcny3uLthBSDoIIpbPL 6NLNoGMV5hgiilkLMBAPI0x4nNGYskDbvw8yToLQ3jpvVz/fbBjHduPnfchk526xbOqt 4/+3scLcS/IlD30AOPUhxQnQZ4fIU7W/txvcC9HYLbABbhOztKn3HehjbUehslIGJvZz fPiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=/x+Wo8GJSxYlFZrOvyBDiJziMXbwhDX9RPgPROXl/vk=; b=aRN1ps4L0EacBCiL3oF13zcaZCwScIa2J7m+E0yEQnLpb3PLghJWXf16A5c0Jc46aS x3TNYEbJBZp3pOC1RNG/bJeDbmfyWvsjoxGsLNMrrcuYkRsQSU/CVUecj9OTRaKztZsP QJrG/xZbCP+Db0B2Ufm6vs8la1WcTTCxhPzaw9TXazcOgaHverxtK9/oYhJQq+a8uQvZ BpUFrfpXmyGAqpvAgb81MjJqqd7XrpqPRXHRTaseebilElkog4hY30ZrUI4B0k2ZY/nj XzKwPZIiMLTRl80WWN+s/9BC4stCgDzSU8feDgTp+gTU9bcJFZUrigRFVeecJiCMoYGN mn8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=HMc2lP7m; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id il15-20020a17090b164f00b0023f14c9a5fesi336369pjb.100.2023.03.15.09.55.14; Wed, 15 Mar 2023 09:55:42 -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=@gmail.com header.s=20210112 header.b=HMc2lP7m; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232525AbjCOQlY (ORCPT + 99 others); Wed, 15 Mar 2023 12:41:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37788 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232360AbjCOQlE (ORCPT ); Wed, 15 Mar 2023 12:41:04 -0400 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ADA4A30DA; Wed, 15 Mar 2023 09:39:57 -0700 (PDT) Received: by mail-wm1-x329.google.com with SMTP id bh21-20020a05600c3d1500b003ed1ff06fb0so1686385wmb.3; Wed, 15 Mar 2023 09:39:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678898353; 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=/x+Wo8GJSxYlFZrOvyBDiJziMXbwhDX9RPgPROXl/vk=; b=HMc2lP7m+IVCQsXEGouwsbnAhnfXazvAiVaccMhwkaGD8EDUNvrUdL4ZqaIe9lT0OW wu6Ya+NgHyLu/5GchMv6UU/26xe0fujDsY7k2WR5sgBcGnlQTpfUiIv+6Xh7u95SvfvB mAY2s5kSa+DduI1HnwLb6LavwpvN5HWawqGQ+f4mBNxLl5JhU/Srlor+LKuo0n+RYeOq ZSJ6U14hSoAllJsyKU+QbTcHDgaRXxiZcoEnHzLtl8OKZbPtcrL0WJ8iC1BAmxwzqul0 pSDHmXOICUqOwskdxg7hJELaAk0p/ijVY7BjSidE0j8jpa/MRFB6LUBCdYnCukeQRehq wVlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678898353; 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=/x+Wo8GJSxYlFZrOvyBDiJziMXbwhDX9RPgPROXl/vk=; b=mWG6SqXT4VjLm/fSoSSl9h90ZDajueeVskFbnMxvqdaOYQIos3wGoPiEun9Q7l8oTc t6g7rWwo1IDL5Tp1WbQI3zKq2FE6STh5oRJtoRx9Azd+HnYnmLwV7g6w8gXhROq5dDZ2 DZ6Ej/kb4akgz8OP5M+Si7wTUn6L3F67/ER4ExuuqTa1jw6iraCK6kYUgxnSTWB+cDAj 2P9YtOFC5N+NQo8PGwPzPFJ5ZDUmz/1xGn5JC6u0mV71z9ifGROQfB+DCk6eahGlMd0m gZRDOCydemGT8ksz7BhaGEda+rYAk0vguvX4EdlhHH+/WPYBI9oYbtY3t3ix+TxDvtZm q4oA== X-Gm-Message-State: AO0yUKXGoYXFvNhXkqIV3wG0NwqAHyTwkCu885jKWDulOe+375H1D46h AQnwkWWEzY4MXzEVOkjh588= X-Received: by 2002:a05:600c:ccf:b0:3eb:36fa:b78d with SMTP id fk15-20020a05600c0ccf00b003eb36fab78dmr18796927wmb.23.1678898353229; Wed, 15 Mar 2023 09:39:13 -0700 (PDT) Received: from mars.. ([2a02:168:6806:0:839a:f879:3eb0:8b4e]) by smtp.gmail.com with ESMTPSA id z17-20020a5d4d11000000b002c5a1bd527dsm5039595wrt.96.2023.03.15.09.39.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Mar 2023 09:39:13 -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 v4 3/4] net: dsa: mv88e6xxx: move call to mv88e6xxx_mdios_register() Date: Wed, 15 Mar 2023 17:38:45 +0100 Message-Id: <20230315163846.3114-4-klaus.kudielka@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230315163846.3114-1-klaus.kudielka@gmail.com> References: <20230315163846.3114-1-klaus.kudielka@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760453556995500368?= X-GMAIL-MSGID: =?utf-8?q?1760453556995500368?= 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 Reviewed-by: Vladimir Oltean Tested-by: Vladimir Oltean Reviewed-by: Florian Fainelli --- Notes: v2: Extend the cleanup in mv88e6xxx_setup() to remove the mdio bus on failure 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/chip.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 mv88e6xxx_chip *chip) } } -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 = chip->dev->of_node; struct device_node *child; int err; @@ -3877,9 +3877,12 @@ static int mv88e6xxx_mdios_register(struct mv88e6xxx_chip *chip, static void mv88e6xxx_teardown(struct dsa_switch *ds) { + struct mv88e6xxx_chip *chip = ds->priv; + mv88e6xxx_teardown_devlink_params(ds); dsa_devlink_resources_unregister(ds); mv88e6xxx_teardown_devlink_regions_global(ds); + mv88e6xxx_mdios_unregister(chip); } static int mv88e6xxx_setup(struct dsa_switch *ds) @@ -3889,6 +3892,10 @@ static int mv88e6xxx_setup(struct dsa_switch *ds) int err; int i; + err = mv88e6xxx_mdios_register(chip); + if (err) + return err; + chip->ds = ds; ds->slave_mii_bus = mv88e6xxx_default_mdio_bus(chip); @@ -4015,7 +4022,7 @@ static int mv88e6xxx_setup(struct dsa_switch *ds) mv88e6xxx_reg_unlock(chip); if (err) - return err; + goto out_mdios; /* 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 = mv88e6xxx_setup_devlink_resources(ds); if (err) - return err; + goto out_mdios; err = 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); return err; } @@ -7220,18 +7229,12 @@ static int mv88e6xxx_probe(struct mdio_device *mdiodev) if (err) goto out_g1_atu_prob_irq; - err = mv88e6xxx_mdios_register(chip, np); - if (err) - goto out_g1_vtu_prob_irq; - err = mv88e6xxx_register_switch(chip); if (err) - goto out_mdio; + goto out_g1_vtu_prob_irq; return 0; -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 *mdiodev) mv88e6xxx_phy_destroy(chip); mv88e6xxx_unregister_switch(chip); - mv88e6xxx_mdios_unregister(chip); mv88e6xxx_g1_vtu_prob_irq_free(chip); mv88e6xxx_g1_atu_prob_irq_free(chip); From patchwork Wed Mar 15 16:38:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Klaus Kudielka X-Patchwork-Id: 70325 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp8381wrt; Wed, 15 Mar 2023 09:56:08 -0700 (PDT) X-Google-Smtp-Source: AK7set80NZj+A48qGKLVP6gcC3rhhyDf5OUPue+fnDys8f3TVRU7LDlQK0eVnPVOSS774MI+VioW X-Received: by 2002:a17:90b:38c3:b0:233:ebf8:424f with SMTP id nn3-20020a17090b38c300b00233ebf8424fmr580819pjb.0.1678899368375; Wed, 15 Mar 2023 09:56:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678899368; cv=none; d=google.com; s=arc-20160816; b=AYW57HV4WTRpyvJjTaGsb0oXwAG5wYN3HCwYTqplMLWUDai7lTKlvhmywty2Atkr+l bACkCZs3muLTr/BNNVhvBz3ZctWreo4edeeVo+FOpnx4QnEogVObVkRofUPZ86MF58xf YEbaWjyKClPsGiyzalTmlo/v2U4jwBMP+hqTXIh7SFvJ7V/4IY9ZKgnIh+0VVI+RfnjW cdZakozX2kfm0uqFG1FT01Hek0krMMaWLQucvB7c0PFmT9EF0tHU1CJbUktlEzfKO2ap 3HfYFe4bHYrvOCsSoxc6Mjg6bhE6oPWdYvUBER7XL2NOO6hIa+TKNzwtza2HqchX/RLX Aleg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=r3JeHlD2DJ70R0jw0cbmmZc+e39yS+644tBOVlRHHhU=; b=YD13BaD3LHUKqovHx7MRGA0GaRYzsznMRkwWr1/DsLnktpQJXpzi2B//G2ngDJ0Bmh Wlgl7Eej9WXHqIQbGKMTelfksu5O7sbGCY6fsNCIxgBLFa31Vw0IknFll2+t3vFd4Fpb N5O1UTlZl4GekrNhRiHZR7/FVLJwzL2unV+FVG0UJewKiySi6jt0CWUsvUK/MQpuEiPU Z9aK3ws+g2kIuQ2NzjFMENL3/puZuY0x5VGIXYAtwPsYuo9+DO70m4Ca4C/8z6gD1VYM reEtuzkQZlaO8hOP9ke7HWfbFL0TxAJ/XcPNx+fpc3j00KyRc+xohEWb7FXmSOPmo1he HRWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=laW2OFRH; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 16-20020a17090a0b9000b0023d15e7e1d0si1968064pjr.12.2023.03.15.09.55.54; Wed, 15 Mar 2023 09:56:08 -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=@gmail.com header.s=20210112 header.b=laW2OFRH; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232792AbjCOQlb (ORCPT + 99 others); Wed, 15 Mar 2023 12:41:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36728 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232678AbjCOQlH (ORCPT ); Wed, 15 Mar 2023 12:41:07 -0400 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1C4EF168A2; Wed, 15 Mar 2023 09:40:01 -0700 (PDT) Received: by mail-wm1-x32f.google.com with SMTP id bg16-20020a05600c3c9000b003eb34e21bdfso1480059wmb.0; Wed, 15 Mar 2023 09:40:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678898354; 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=r3JeHlD2DJ70R0jw0cbmmZc+e39yS+644tBOVlRHHhU=; b=laW2OFRHNWxZUIXhOuio/PYddOojdw3J825tBUJ7Nf8cpPknjCMn9CxIbDZLzokqNq g4tluzoQKVFHIbPSreqxpl9Nyk0E31QCK/o3ED3jsHpyCRZmjiLrl0Gh/0Yrt8kdUg+z iUvVQvHCxFYnAn49IgV5NFK0vRTFnQ2B66aFmopCRtB5/xux9yy57ISb6gXIlX0tWlFA SdOSUoiKCFXxGUr6vxNTy2d5s6KjUfLoA0suR8Grrxp9W432OsOoV8UMCdIbGQjSy5Sx IQfD39pNEOWOJ0TKwZlL2gQMsefSzEbyFpK9Oa54NeWQ8EOQxIEutwal/K9J6V8+x9BD +sLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678898354; 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=r3JeHlD2DJ70R0jw0cbmmZc+e39yS+644tBOVlRHHhU=; b=MhBaf+4LskhNNahF6r4VzPIs/JvLrFXZympiOqvucxJrGlrLrohoRkJQK/7dIC0pCd /2XGrv7JDhPjROWhSwoIveLBcbu4gZwM45dY5GHynaOw/b45Laz2uLAt1Gh8ytAKnWnu cMFoTeV+p4rkomDRWtwWzkkulMwplJUy97FSCdX73KcgSNMfpApC6FUXxO8ax/dwZD89 vOE1T3hI+Ua+EwaNqrfJLiDg2XMqqxkmVQuMd+kIkkMGZnMT6HZArcCE5oq/yYrkXI3y nz1oswOeEZFMcfRCc6oq5VRw/YLLAIwSlrPo4AGFQNhwRHAJmZYbkNmIJzt+tkyIUsV6 k1/Q== X-Gm-Message-State: AO0yUKVLSILdDjz7QGBGtCdEdOM6YkJy/oNnHoGV/iidVg47mp5JweXX 0EzfOb/Iz3AoIUTNRBTPLYM= X-Received: by 2002:a05:600c:c0b:b0:3ed:2dbf:6a80 with SMTP id fm11-20020a05600c0c0b00b003ed2dbf6a80mr4625223wmb.5.1678898353861; Wed, 15 Mar 2023 09:39:13 -0700 (PDT) Received: from mars.. ([2a02:168:6806:0:839a:f879:3eb0:8b4e]) by smtp.gmail.com with ESMTPSA id z17-20020a5d4d11000000b002c5a1bd527dsm5039595wrt.96.2023.03.15.09.39.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Mar 2023 09:39:13 -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 v4 4/4] net: dsa: mv88e6xxx: mask apparently non-existing phys during probing Date: Wed, 15 Mar 2023 17:38:46 +0100 Message-Id: <20230315163846.3114-5-klaus.kudielka@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230315163846.3114-1-klaus.kudielka@gmail.com> References: <20230315163846.3114-1-klaus.kudielka@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760453583915433063?= X-GMAIL-MSGID: =?utf-8?q?1760453583915433063?= 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 Reviewed-by: Vladimir Oltean Reviewed-by: Florian Fainelli --- Notes: v2: Patch is new 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/chip.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_chip *chip, bus->read_c45 = mv88e6xxx_mdio_read_c45; bus->write_c45 = mv88e6xxx_mdio_write_c45; bus->parent = chip->dev; + bus->phy_mask = GENMASK(31, mv88e6xxx_num_ports(chip)); if (!external) { err = mv88e6xxx_g2_irq_mdio_setup(chip, bus);