From: Ioana Ciornei <ciorneiioana@gmail.com>
To: Andrew Lunn <andrew@lunn.ch>,
Heiner Kallweit <hkallweit1@gmail.com>,
Russell King <linux@armlinux.org.uk>,
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 09/19] net: phy: aquantia: implement generic .handle_interrupt() callback
Date: Thu, 29 Oct 2020 12:07:31 +0200 [thread overview]
Message-ID: <20201029100741.462818-10-ciorneiioana@gmail.com> (raw)
In-Reply-To: <20201029100741.462818-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.
Cc: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
---
drivers/net/phy/aquantia_main.c | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/drivers/net/phy/aquantia_main.c b/drivers/net/phy/aquantia_main.c
index 41e7c1432497..e7f315898efb 100644
--- a/drivers/net/phy/aquantia_main.c
+++ b/drivers/net/phy/aquantia_main.c
@@ -270,6 +270,24 @@ static int aqr_ack_interrupt(struct phy_device *phydev)
return (reg < 0) ? reg : 0;
}
+static irqreturn_t aqr_handle_interrupt(struct phy_device *phydev)
+{
+ int irq_status;
+
+ irq_status = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_TX_VEND_INT_STATUS2);
+ if (irq_status < 0) {
+ phy_error(phydev);
+ return IRQ_NONE;
+ }
+
+ if (irq_status == 0)
+ return IRQ_NONE;
+
+ phy_trigger_machine(phydev);
+
+ return IRQ_HANDLED;
+}
+
static int aqr_read_status(struct phy_device *phydev)
{
int val;
@@ -585,6 +603,7 @@ static struct phy_driver aqr_driver[] = {
.config_aneg = aqr_config_aneg,
.config_intr = aqr_config_intr,
.ack_interrupt = aqr_ack_interrupt,
+ .handle_interrupt = aqr_handle_interrupt,
.read_status = aqr_read_status,
},
{
@@ -593,6 +612,7 @@ static struct phy_driver aqr_driver[] = {
.config_aneg = aqr_config_aneg,
.config_intr = aqr_config_intr,
.ack_interrupt = aqr_ack_interrupt,
+ .handle_interrupt = aqr_handle_interrupt,
.read_status = aqr_read_status,
},
{
@@ -601,6 +621,7 @@ static struct phy_driver aqr_driver[] = {
.config_aneg = aqr_config_aneg,
.config_intr = aqr_config_intr,
.ack_interrupt = aqr_ack_interrupt,
+ .handle_interrupt = aqr_handle_interrupt,
.read_status = aqr_read_status,
.suspend = aqr107_suspend,
.resume = aqr107_resume,
@@ -611,6 +632,7 @@ static struct phy_driver aqr_driver[] = {
.config_aneg = aqr_config_aneg,
.config_intr = aqr_config_intr,
.ack_interrupt = aqr_ack_interrupt,
+ .handle_interrupt = aqr_handle_interrupt,
.read_status = aqr_read_status,
},
{
@@ -621,6 +643,7 @@ static struct phy_driver aqr_driver[] = {
.config_aneg = aqr_config_aneg,
.config_intr = aqr_config_intr,
.ack_interrupt = aqr_ack_interrupt,
+ .handle_interrupt = aqr_handle_interrupt,
.read_status = aqr107_read_status,
.get_tunable = aqr107_get_tunable,
.set_tunable = aqr107_set_tunable,
@@ -639,6 +662,7 @@ static struct phy_driver aqr_driver[] = {
.config_aneg = aqr_config_aneg,
.config_intr = aqr_config_intr,
.ack_interrupt = aqr_ack_interrupt,
+ .handle_interrupt = aqr_handle_interrupt,
.read_status = aqr107_read_status,
.get_tunable = aqr107_get_tunable,
.set_tunable = aqr107_set_tunable,
@@ -655,6 +679,7 @@ static struct phy_driver aqr_driver[] = {
.config_aneg = aqr_config_aneg,
.config_intr = aqr_config_intr,
.ack_interrupt = aqr_ack_interrupt,
+ .handle_interrupt = aqr_handle_interrupt,
.read_status = aqr_read_status,
},
};
--
2.28.0
next prev parent reply other threads:[~2020-10-29 10:08 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-29 10:07 [PATCH net-next 00/19] net: phy: add support for shared interrupts (part 1) Ioana Ciornei
2020-10-29 10:07 ` [PATCH net-next 01/19] net: phy: export phy_error and phy_trigger_machine Ioana Ciornei
2020-10-29 10:07 ` [PATCH net-next 02/19] net: phy: add a shutdown procedure Ioana Ciornei
2020-10-29 10:07 ` [PATCH net-next 03/19] net: phy: make .ack_interrupt() optional Ioana Ciornei
2020-10-29 10:07 ` [PATCH net-next 04/19] net: phy: at803x: implement generic .handle_interrupt() callback Ioana Ciornei
2020-10-29 10:07 ` [PATCH net-next 05/19] net: phy: at803x: remove the use of .ack_interrupt() Ioana Ciornei
2020-10-29 10:07 ` [PATCH net-next 06/19] net: phy: mscc: use phy_trigger_machine() to notify link change Ioana Ciornei
2020-10-29 10:07 ` [PATCH net-next 07/19] net: phy: mscc: implement generic .handle_interrupt() callback Ioana Ciornei
2020-10-29 10:07 ` [PATCH net-next 08/19] net: phy: mscc: remove the use of .ack_interrupt() Ioana Ciornei
2020-10-29 10:07 ` Ioana Ciornei [this message]
2020-10-29 10:07 ` [PATCH net-next 10/19] net: phy: aquantia: " Ioana Ciornei
2020-10-29 10:07 ` [PATCH net-next 11/19] net: phy: broadcom: implement generic .handle_interrupt() callback Ioana Ciornei
2020-10-29 10:07 ` [PATCH net-next 12/19] net: phy: broadcom: remove use of ack_interrupt() Ioana Ciornei
2020-10-29 10:07 ` [PATCH net-next 13/19] net: phy: cicada: implement the generic .handle_interrupt() callback Ioana Ciornei
2020-10-29 10:07 ` [PATCH net-next 14/19] net: phy: cicada: remove the use of .ack_interrupt() Ioana Ciornei
2020-10-29 10:07 ` [PATCH net-next 15/19] net: phy: davicom: implement generic .handle_interrupt() calback Ioana Ciornei
2020-10-29 10:07 ` [PATCH net-next 16/19] net: phy: davicom: remove the use of .ack_interrupt() Ioana Ciornei
2020-10-29 10:07 ` [PATCH net-next 17/19] net: phy: add genphy_handle_interrupt_no_ack() Ioana Ciornei
2020-10-29 10:07 ` [PATCH net-next 18/19] net: phy: realtek: implement generic .handle_interrupt() callback Ioana Ciornei
2020-10-29 10:07 ` [PATCH net-next 19/19] net: phy: realtek: remove the use of .ack_interrupt() Ioana Ciornei
2020-10-30 21:56 ` [PATCH net-next 00/19] net: phy: add support for shared interrupts (part 1) Heiner Kallweit
2020-10-30 22:06 ` Vladimir Oltean
2020-10-30 22:33 ` Heiner Kallweit
2020-10-30 22:46 ` Vladimir Oltean
2020-10-31 5:27 ` Ioana Ciornei
2020-10-30 22:42 ` Heiner Kallweit
2020-10-30 23:36 ` Andrew Lunn
2020-10-31 5:22 ` Ioana Ciornei
2020-10-31 10:18 ` Heiner Kallweit
2020-10-31 10:57 ` Ioana Ciornei
2020-10-31 14:32 ` Andrew Lunn
2020-10-31 14:51 ` Ioana Ciornei
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=20201029100741.462818-10-ciorneiioana@gmail.com \
--to=ciorneiioana@gmail.com \
--cc=andrew@lunn.ch \
--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
all inboxes | Powered by JetHome®