From patchwork Wed Dec 30 04:22:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qingfang Deng X-Patchwork-Id: 11992925 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=-8.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,UNWANTED_LANGUAGE_BODY,USER_AGENT_GIT 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 6256DC433E0 for ; Wed, 30 Dec 2020 04:23:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3249221BE5 for ; Wed, 30 Dec 2020 04:23:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726261AbgL3EXB (ORCPT ); Tue, 29 Dec 2020 23:23:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44962 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726138AbgL3EXB (ORCPT ); Tue, 29 Dec 2020 23:23:01 -0500 Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 42DA9C061799; Tue, 29 Dec 2020 20:22:21 -0800 (PST) Received: by mail-pl1-x62e.google.com with SMTP id e2so8128039plt.12; Tue, 29 Dec 2020 20:22:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=IKBiEHqg4SSqGyYjhMdmyNqw/bCFJO3ye0n/qk4/Rlk=; b=HICTRHSu8qq4tnK+SXv1/FOpqGIo+pa5z2wjeScubjjAcdWC8kN7b+REuM07TNwh+0 Rg0ZmkBC4NoUV+vQszZWO6AqB9/jvIeLnJi2wjRjkqKM+1KG607d88iF//lxNPVtAm5f VIKNC6MYRfy/oW/sy59lwtjG9hKLo+XoJ2pRHVqFky+bbGOw/93640bq6tcJ/FxngDBf 1TNgLr655YuksXoKI0JxuyMJKJoiQlxeSzfyVPiY7XXIM5MMpC0mmxeJ4LAL8Mp5LkpR adTiaPjDFStgzHyDoWzbhyZAeLqdF3AtJlK5Pv2lfsKxq5iUyIbAmETizz2rUeHiHkAW nzUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=IKBiEHqg4SSqGyYjhMdmyNqw/bCFJO3ye0n/qk4/Rlk=; b=b5i/KEjyi8rkbBbkWthgzulYuxDzukNStFl5vW9jyVUSGG/5pxzIRWGIDVdvvHbISV R++wJq3WxIhzS1dkIPIx20Hdj4ucmKF2qPzpb3D6CHIyJcTKbK8/iypGM7kIe6/pQVVQ F24NNH/qTEvYe00iV8YCj1fAw9Enh8YyTmWukh/5t+Rez8JtODBRZ3lyP07EVlfyjMz6 vyPo1dusEgU68ZFIgdIhRooRzHe0welL6pfh0jNAAGgzCwM00zsOVY25YVhPi6MP2r0y EfcljtLyKJGUFq2h45mrwSES+wEZjoE+FA7b/jfmQn8QiELafEo/et+sJbmSEqBmQpfA XUiA== X-Gm-Message-State: AOAM531XHuf9NVKJEf2E9MnXkd0yF+9pPxd3+KHeue3JOXpshmjAkcu2 6exaz/qyi2kOHZt7fXMeQhPFcvUrIKefoSt5 X-Google-Smtp-Source: ABdhPJy7V86WPzr5u90q5aZTDI839wPSPLhlME5izcJTxTbKHzRCs9j+pZbwuVOG3SZhWZVJBl2gqw== X-Received: by 2002:a17:902:b94a:b029:dc:18f2:8063 with SMTP id h10-20020a170902b94ab02900dc18f28063mr52634934pls.8.1609302140631; Tue, 29 Dec 2020 20:22:20 -0800 (PST) Received: from container-ubuntu.lan ([171.211.27.109]) by smtp.gmail.com with ESMTPSA id u14sm37925808pfk.111.2020.12.29.20.22.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Dec 2020 20:22:20 -0800 (PST) From: DENG Qingfang To: "David S. Miller" , Andrew Lunn , Florian Fainelli , Heiner Kallweit , Jakub Kicinski , Landen Chao , Marc Zyngier , Matthias Brugger , Philipp Zabel , Russell King , Sean Wang , Thomas Gleixner , Vivien Didelot , Vladimir Oltean , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: Weijie Gao , Chuanhong Guo , Linus Walleij , =?utf-8?q?Ren=C3=A9_van_Dorst?= Subject: Registering IRQ for MT7530 internal PHYs Date: Wed, 30 Dec 2020 12:22:08 +0800 Message-Id: <20201230042208.8997-1-dqfext@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi, I added MT7530 IRQ support and registered its internal PHYs to IRQ. It works but my patch used two hacks. 1. Removed phy_drv_supports_irq check, because config_intr and handle_interrupt are not set for Generic PHY. 2. Allocated ds->slave_mii_bus before calling ds->ops->setup, because we cannot call dsa_slave_mii_bus_init which is private. Any better ideas? Regards, Qingfang diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c index a67cac15a724..d59a8c50ede3 100644 --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -1639,6 +1640,125 @@ mtk_get_tag_protocol(struct dsa_switch *ds, int port, } } +static irqreturn_t +mt7530_irq(int irq, void *data) +{ + struct mt7530_priv *priv = data; + bool handled = false; + int phy; + u32 val; + + val = mt7530_read(priv, MT7530_SYS_INT_STS); + mt7530_write(priv, MT7530_SYS_INT_STS, val); + + dev_info_ratelimited(priv->dev, "interrupt status: 0x%08x\n", val); + dev_info_ratelimited(priv->dev, "interrupt enable: 0x%08x\n", mt7530_read(priv, MT7530_SYS_INT_EN)); + + for (phy = 0; phy < MT7530_NUM_PHYS; phy++) { + if (val & BIT(phy)) { + unsigned int child_irq; + + child_irq = irq_find_mapping(priv->irq_domain, phy); + handle_nested_irq(child_irq); + handled = true; + } + } + + return handled ? IRQ_HANDLED : IRQ_NONE; +} + +static void mt7530_irq_mask(struct irq_data *d) +{ + struct mt7530_priv *priv = irq_data_get_irq_chip_data(d); + + priv->irq_enable &= ~BIT(d->hwirq); +} + +static void mt7530_irq_unmask(struct irq_data *d) +{ + struct mt7530_priv *priv = irq_data_get_irq_chip_data(d); + + priv->irq_enable |= BIT(d->hwirq); +} + +static void mt7530_irq_bus_lock(struct irq_data *d) +{ + struct mt7530_priv *priv = irq_data_get_irq_chip_data(d); + + mutex_lock(&priv->reg_mutex); +} + +static void mt7530_irq_bus_sync_unlock(struct irq_data *d) +{ + struct mt7530_priv *priv = irq_data_get_irq_chip_data(d); + + mt7530_write(priv, MT7530_SYS_INT_EN, priv->irq_enable); + mutex_unlock(&priv->reg_mutex); +} + +static struct irq_chip mt7530_irq_chip = { + .name = MT7530_NAME, + .irq_mask = mt7530_irq_mask, + .irq_unmask = mt7530_irq_unmask, + .irq_bus_lock = mt7530_irq_bus_lock, + .irq_bus_sync_unlock = mt7530_irq_bus_sync_unlock, +}; + +static int +mt7530_irq_map(struct irq_domain *domain, unsigned int irq, + irq_hw_number_t hwirq) +{ + irq_set_chip_data(irq, domain->host_data); + irq_set_chip_and_handler(irq, &mt7530_irq_chip, handle_simple_irq); + irq_set_noprobe(irq); + + return 0; +} + +static const struct irq_domain_ops mt7530_irq_domain_ops = { + .map = mt7530_irq_map, + .xlate = irq_domain_xlate_onecell, +}; + +static void +mt7530_irq_init(struct mt7530_priv *priv) +{ + struct mii_bus *bus = priv->ds->slave_mii_bus; + struct device *dev = priv->dev; + struct device_node *np = dev->of_node; + int parent_irq; + int phy, ret; + + parent_irq = of_irq_get(np, 0); + if (parent_irq <= 0) { + dev_err(dev, "failed to get parent IRQ: %d\n", parent_irq); + return; + } + + mt7530_set(priv, MT7530_TOP_SIG_CTRL, TOP_SIG_CTRL_NORMAL); + ret = devm_request_threaded_irq(dev, parent_irq, NULL, mt7530_irq, + IRQF_ONESHOT, MT7530_NAME, priv); + if (ret) { + dev_err(dev, "failed to request IRQ: %d\n", ret); + return; + } + + priv->irq_domain = irq_domain_add_linear(np, MT7530_NUM_PHYS, + &mt7530_irq_domain_ops, priv); + if (!priv->irq_domain) { + dev_err(dev, "failed to create IRQ domain\n"); + return; + } + + /* IRQ for internal PHYs */ + for (phy = 0; phy < MT7530_NUM_PHYS; phy++) { + unsigned int irq = irq_create_mapping(priv->irq_domain, phy); + + irq_set_parent(irq, parent_irq); + bus->irq[phy] = irq; + } +} + static int mt7530_setup(struct dsa_switch *ds) { @@ -2578,8 +2698,13 @@ static int mt753x_setup(struct dsa_switch *ds) { struct mt7530_priv *priv = ds->priv; + int ret = priv->info->sw_setup(ds); - return priv->info->sw_setup(ds); + /* Setup interrupt */ + if (!ret) + mt7530_irq_init(priv); + + return ret; } static int @@ -2780,6 +2905,9 @@ mt7530_remove(struct mdio_device *mdiodev) dev_err(priv->dev, "Failed to disable io pwr: %d\n", ret); + if (priv->irq_domain) + irq_domain_remove(priv->irq_domain); + dsa_unregister_switch(priv->ds); mutex_destroy(&priv->reg_mutex); } @@ -2788,7 +2916,7 @@ static struct mdio_driver mt7530_mdio_driver = { .probe = mt7530_probe, .remove = mt7530_remove, .mdiodrv.driver = { - .name = "mt7530", + .name = MT7530_NAME, .of_match_table = mt7530_of_match, }, }; diff --git a/drivers/net/dsa/mt7530.h b/drivers/net/dsa/mt7530.h index 32d8969b3ace..b1988d8085bb 100644 --- a/drivers/net/dsa/mt7530.h +++ b/drivers/net/dsa/mt7530.h @@ -6,7 +6,10 @@ #ifndef __MT7530_H #define __MT7530_H +#define MT7530_NAME "mt7530" + #define MT7530_NUM_PORTS 7 +#define MT7530_NUM_PHYS 5 #define MT7530_CPU_PORT 6 #define MT7530_NUM_FDB_RECORDS 2048 #define MT7530_ALL_MEMBERS 0xff @@ -380,6 +383,12 @@ enum mt7531_sgmii_force_duplex { #define SYS_CTRL_SW_RST BIT(1) #define SYS_CTRL_REG_RST BIT(0) +/* Register for system interrupt */ +#define MT7530_SYS_INT_EN 0x7008 + +/* Register for system interrupt status */ +#define MT7530_SYS_INT_STS 0x700c + /* Register for PHY Indirect Access Control */ #define MT7531_PHY_IAC 0x701C #define MT7531_PHY_ACS_ST BIT(31) @@ -761,6 +770,8 @@ struct mt7530_priv { struct mt7530_port ports[MT7530_NUM_PORTS]; /* protect among processes for registers access*/ struct mutex reg_mutex; + struct irq_domain *irq_domain; + u32 irq_enable; }; struct mt7530_hw_vlan_entry { diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 80c2e646c093..cdddc27e2df7 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -2846,12 +2846,6 @@ static int phy_probe(struct device *dev) phydev->drv = phydrv; - /* Disable the interrupt if the PHY doesn't support it - * but the interrupt is still a valid one - */ - if (!phy_drv_supports_irq(phydrv) && phy_interrupt_is_valid(phydev)) - phydev->irq = PHY_POLL; - if (phydrv->flags & PHY_IS_INTERNAL) phydev->is_internal = true; diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c index 183003e45762..ef5db1106581 100644 --- a/net/dsa/dsa2.c +++ b/net/dsa/dsa2.c @@ -448,19 +448,19 @@ static int dsa_switch_setup(struct dsa_switch *ds) if (err) goto unregister_devlink_ports; + ds->slave_mii_bus = devm_mdiobus_alloc(ds->dev); + if (!ds->slave_mii_bus) { + err = -ENOMEM; + goto unregister_notifier; + } + err = ds->ops->setup(ds); if (err < 0) goto unregister_notifier; devlink_params_publish(ds->devlink); - if (!ds->slave_mii_bus && ds->ops->phy_read) { - ds->slave_mii_bus = devm_mdiobus_alloc(ds->dev); - if (!ds->slave_mii_bus) { - err = -ENOMEM; - goto unregister_notifier; - } - + if (ds->ops->phy_read) { dsa_slave_mii_bus_init(ds); err = mdiobus_register(ds->slave_mii_bus);