From: Ioana Ciornei <ciorneiioana@gmail.com>
To: Andrew Lunn <andrew@lunn.ch>,
Heiner Kallweit <hkallweit1@gmail.com>,
Russell King <linux@armlinux.org.uk>,
Florian Fainelli <f.fainelli@gmail.com>,
Jakub Kicinski <kuba@kernel.org>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Ioana Ciornei <ioana.ciornei@nxp.com>
Subject: [PATCH net-next v2 15/19] net: phy: davicom: implement generic .handle_interrupt() calback
Date: Sun, 1 Nov 2020 14:51:10 +0200 [thread overview]
Message-ID: <20201101125114.1316879-16-ciorneiioana@gmail.com> (raw)
In-Reply-To: <20201101125114.1316879-1-ciorneiioana@gmail.com>
From: Ioana Ciornei <ioana.ciornei@nxp.com>
In an attempt to actually support shared IRQs in phylib, we now move the
responsibility of triggering the phylib state machine or just returning
IRQ_NONE, based on the IRQ status register, to the PHY driver. Having
3 different IRQ handling callbacks (.handle_interrupt(),
.did_interrupt() and .ack_interrupt() ) is confusing so let the PHY
driver implement directly an IRQ handler like any other device driver.
Make this driver follow the new convention.
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
---
Changes in v2:
- Adjust .handle_interrupt() so that we only take into account the
enabled IRQs.
drivers/net/phy/davicom.c | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/drivers/net/phy/davicom.c b/drivers/net/phy/davicom.c
index 942f277463a4..bfa6c835070f 100644
--- a/drivers/net/phy/davicom.c
+++ b/drivers/net/phy/davicom.c
@@ -47,6 +47,10 @@
#define MII_DM9161_INTR_STOP \
(MII_DM9161_INTR_DPLX_MASK | MII_DM9161_INTR_SPD_MASK \
| MII_DM9161_INTR_LINK_MASK | MII_DM9161_INTR_MASK)
+#define MII_DM9161_INTR_CHANGE \
+ (MII_DM9161_INTR_DPLX_CHANGE | \
+ MII_DM9161_INTR_SPD_CHANGE | \
+ MII_DM9161_INTR_LINK_CHANGE)
/* DM9161 10BT Configuration/Status */
#define MII_DM9161_10BTCSR 0x12
@@ -77,6 +81,24 @@ static int dm9161_config_intr(struct phy_device *phydev)
return temp;
}
+static irqreturn_t dm9161_handle_interrupt(struct phy_device *phydev)
+{
+ int irq_status;
+
+ irq_status = phy_read(phydev, MII_DM9161_INTR);
+ if (irq_status < 0) {
+ phy_error(phydev);
+ return IRQ_NONE;
+ }
+
+ if (!(irq_status & MII_DM9161_INTR_CHANGE))
+ return IRQ_NONE;
+
+ phy_trigger_machine(phydev);
+
+ return IRQ_HANDLED;
+}
+
static int dm9161_config_aneg(struct phy_device *phydev)
{
int err;
@@ -149,6 +171,7 @@ static struct phy_driver dm91xx_driver[] = {
.config_aneg = dm9161_config_aneg,
.ack_interrupt = dm9161_ack_interrupt,
.config_intr = dm9161_config_intr,
+ .handle_interrupt = dm9161_handle_interrupt,
}, {
.phy_id = 0x0181b8b0,
.name = "Davicom DM9161B/C",
@@ -158,6 +181,7 @@ static struct phy_driver dm91xx_driver[] = {
.config_aneg = dm9161_config_aneg,
.ack_interrupt = dm9161_ack_interrupt,
.config_intr = dm9161_config_intr,
+ .handle_interrupt = dm9161_handle_interrupt,
}, {
.phy_id = 0x0181b8a0,
.name = "Davicom DM9161A",
@@ -167,6 +191,7 @@ static struct phy_driver dm91xx_driver[] = {
.config_aneg = dm9161_config_aneg,
.ack_interrupt = dm9161_ack_interrupt,
.config_intr = dm9161_config_intr,
+ .handle_interrupt = dm9161_handle_interrupt,
}, {
.phy_id = 0x00181b80,
.name = "Davicom DM9131",
@@ -174,6 +199,7 @@ static struct phy_driver dm91xx_driver[] = {
/* PHY_BASIC_FEATURES */
.ack_interrupt = dm9161_ack_interrupt,
.config_intr = dm9161_config_intr,
+ .handle_interrupt = dm9161_handle_interrupt,
} };
module_phy_driver(dm91xx_driver);
--
2.28.0
next prev parent reply other threads:[~2020-11-01 12:53 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-01 12:50 [PATCH net-next v2 00/19] net: phy: add support for shared interrupts (part 1) Ioana Ciornei
2020-11-01 12:50 ` [PATCH net-next v2 01/19] net: phy: export phy_error and phy_trigger_machine Ioana Ciornei
2020-11-01 12:50 ` [PATCH net-next v2 02/19] net: phy: add a shutdown procedure Ioana Ciornei
2023-08-03 18:16 ` Uwe Kleine-König
2023-08-03 18:24 ` Florian Fainelli
2023-08-03 18:49 ` Russell King (Oracle)
2020-11-01 12:50 ` [PATCH net-next v2 03/19] net: phy: make .ack_interrupt() optional Ioana Ciornei
2020-11-01 12:50 ` [PATCH net-next v2 04/19] net: phy: at803x: implement generic .handle_interrupt() callback Ioana Ciornei
2020-11-04 18:09 ` Oleksij Rempel
2020-11-01 12:51 ` [PATCH net-next v2 05/19] net: phy: at803x: remove the use of .ack_interrupt() Ioana Ciornei
2020-11-04 18:09 ` Oleksij Rempel
2020-11-01 12:51 ` [PATCH net-next v2 06/19] net: phy: mscc: use phy_trigger_machine() to notify link change Ioana Ciornei
2020-11-05 0:10 ` Vladimir Oltean
2020-11-01 12:51 ` [PATCH net-next v2 07/19] net: phy: mscc: implement generic .handle_interrupt() callback Ioana Ciornei
2020-11-05 0:08 ` Vladimir Oltean
2020-11-01 12:51 ` [PATCH net-next v2 08/19] net: phy: mscc: remove the use of .ack_interrupt() Ioana Ciornei
2020-11-05 0:07 ` Vladimir Oltean
2020-11-01 12:51 ` [PATCH net-next v2 09/19] net: phy: aquantia: implement generic .handle_interrupt() callback Ioana Ciornei
2020-11-01 12:51 ` [PATCH net-next v2 10/19] net: phy: aquantia: remove the use of .ack_interrupt() Ioana Ciornei
2020-11-01 12:51 ` [PATCH net-next v2 11/19] net: phy: broadcom: implement generic .handle_interrupt() callback Ioana Ciornei
2020-11-01 12:51 ` [PATCH net-next v2 12/19] net: phy: broadcom: remove use of ack_interrupt() Ioana Ciornei
2020-11-01 12:51 ` [PATCH net-next v2 13/19] net: phy: cicada: implement the generic .handle_interrupt() callback Ioana Ciornei
2020-11-01 12:51 ` [PATCH net-next v2 14/19] net: phy: cicada: remove the use of .ack_interrupt() Ioana Ciornei
2020-11-01 12:51 ` Ioana Ciornei [this message]
2020-11-01 12:51 ` [PATCH net-next v2 16/19] net: phy: davicom: " Ioana Ciornei
2020-11-01 12:51 ` [PATCH net-next v2 17/19] net: phy: add genphy_handle_interrupt_no_ack() Ioana Ciornei
2020-11-01 12:51 ` [PATCH net-next v2 18/19] net: phy: realtek: implement generic .handle_interrupt() callback Ioana Ciornei
2020-11-01 12:51 ` [PATCH net-next v2 19/19] net: phy: realtek: remove the use of .ack_interrupt() Ioana Ciornei
2020-11-03 16:44 ` [PATCH net-next v2 00/19] net: phy: add support for shared interrupts (part 1) Andrew Lunn
2020-11-03 22:53 ` Michael Walle
2020-11-06 0:36 ` Jakub Kicinski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201101125114.1316879-16-ciorneiioana@gmail.com \
--to=ciorneiioana@gmail.com \
--cc=andrew@lunn.ch \
--cc=f.fainelli@gmail.com \
--cc=hkallweit1@gmail.com \
--cc=ioana.ciornei@nxp.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).