Skip to content

Commit 59ca4e5

Browse files
IoanaCiorneikuba-moo
IoanaCiornei
authored and
kuba-moo
committed
net: phy: micrel: implement generic .handle_interrupt() callback
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: Divya Koppera <[email protected]> Cc: Oleksij Rempel <[email protected]> Cc: Philippe Schenker <[email protected]> Cc: Marek Vasut <[email protected]> Cc: Antoine Tenart <[email protected]> Signed-off-by: Ioana Ciornei <[email protected]> Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 84c8f77 commit 59ca4e5

File tree

1 file changed

+34
-0
lines changed

1 file changed

+34
-0
lines changed

‎drivers/net/phy/micrel.c

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@
4848
#define KSZPHY_INTCS_LINK_UP BIT(8)
4949
#define KSZPHY_INTCS_ALL (KSZPHY_INTCS_LINK_UP |\
5050
KSZPHY_INTCS_LINK_DOWN)
51+
#define KSZPHY_INTCS_LINK_DOWN_STATUS BIT(2)
52+
#define KSZPHY_INTCS_LINK_UP_STATUS BIT(0)
53+
#define KSZPHY_INTCS_STATUS (KSZPHY_INTCS_LINK_DOWN_STATUS |\
54+
KSZPHY_INTCS_LINK_UP_STATUS)
5155

5256
/* PHY Control 1 */
5357
#define MII_KSZPHY_CTRL_1 0x1e
@@ -182,6 +186,24 @@ static int kszphy_config_intr(struct phy_device *phydev)
182186
return phy_write(phydev, MII_KSZPHY_INTCS, temp);
183187
}
184188

189+
static irqreturn_t kszphy_handle_interrupt(struct phy_device *phydev)
190+
{
191+
int irq_status;
192+
193+
irq_status = phy_read(phydev, MII_KSZPHY_INTCS);
194+
if (irq_status < 0) {
195+
phy_error(phydev);
196+
return IRQ_NONE;
197+
}
198+
199+
if ((irq_status & KSZPHY_INTCS_STATUS))
200+
return IRQ_NONE;
201+
202+
phy_trigger_machine(phydev);
203+
204+
return IRQ_HANDLED;
205+
}
206+
185207
static int kszphy_rmii_clk_sel(struct phy_device *phydev, bool val)
186208
{
187209
int ctrl;
@@ -1162,6 +1184,7 @@ static struct phy_driver ksphy_driver[] = {
11621184
.config_init = kszphy_config_init,
11631185
.ack_interrupt = kszphy_ack_interrupt,
11641186
.config_intr = kszphy_config_intr,
1187+
.handle_interrupt = kszphy_handle_interrupt,
11651188
.suspend = genphy_suspend,
11661189
.resume = genphy_resume,
11671190
}, {
@@ -1174,6 +1197,7 @@ static struct phy_driver ksphy_driver[] = {
11741197
.config_init = kszphy_config_init,
11751198
.ack_interrupt = kszphy_ack_interrupt,
11761199
.config_intr = kszphy_config_intr,
1200+
.handle_interrupt = kszphy_handle_interrupt,
11771201
.get_sset_count = kszphy_get_sset_count,
11781202
.get_strings = kszphy_get_strings,
11791203
.get_stats = kszphy_get_stats,
@@ -1189,6 +1213,7 @@ static struct phy_driver ksphy_driver[] = {
11891213
.config_init = kszphy_config_init,
11901214
.ack_interrupt = kszphy_ack_interrupt,
11911215
.config_intr = kszphy_config_intr,
1216+
.handle_interrupt = kszphy_handle_interrupt,
11921217
.get_sset_count = kszphy_get_sset_count,
11931218
.get_strings = kszphy_get_strings,
11941219
.get_stats = kszphy_get_stats,
@@ -1205,6 +1230,7 @@ static struct phy_driver ksphy_driver[] = {
12051230
.config_aneg = ksz8041_config_aneg,
12061231
.ack_interrupt = kszphy_ack_interrupt,
12071232
.config_intr = kszphy_config_intr,
1233+
.handle_interrupt = kszphy_handle_interrupt,
12081234
.get_sset_count = kszphy_get_sset_count,
12091235
.get_strings = kszphy_get_strings,
12101236
.get_stats = kszphy_get_stats,
@@ -1220,6 +1246,7 @@ static struct phy_driver ksphy_driver[] = {
12201246
.config_init = kszphy_config_init,
12211247
.ack_interrupt = kszphy_ack_interrupt,
12221248
.config_intr = kszphy_config_intr,
1249+
.handle_interrupt = kszphy_handle_interrupt,
12231250
.get_sset_count = kszphy_get_sset_count,
12241251
.get_strings = kszphy_get_strings,
12251252
.get_stats = kszphy_get_stats,
@@ -1233,6 +1260,7 @@ static struct phy_driver ksphy_driver[] = {
12331260
.config_init = kszphy_config_init,
12341261
.ack_interrupt = kszphy_ack_interrupt,
12351262
.config_intr = kszphy_config_intr,
1263+
.handle_interrupt = kszphy_handle_interrupt,
12361264
.get_sset_count = kszphy_get_sset_count,
12371265
.get_strings = kszphy_get_strings,
12381266
.get_stats = kszphy_get_stats,
@@ -1249,6 +1277,7 @@ static struct phy_driver ksphy_driver[] = {
12491277
.config_init = kszphy_config_init,
12501278
.ack_interrupt = kszphy_ack_interrupt,
12511279
.config_intr = kszphy_config_intr,
1280+
.handle_interrupt = kszphy_handle_interrupt,
12521281
.get_sset_count = kszphy_get_sset_count,
12531282
.get_strings = kszphy_get_strings,
12541283
.get_stats = kszphy_get_stats,
@@ -1264,6 +1293,7 @@ static struct phy_driver ksphy_driver[] = {
12641293
.config_init = ksz8081_config_init,
12651294
.ack_interrupt = kszphy_ack_interrupt,
12661295
.config_intr = kszphy_config_intr,
1296+
.handle_interrupt = kszphy_handle_interrupt,
12671297
.get_sset_count = kszphy_get_sset_count,
12681298
.get_strings = kszphy_get_strings,
12691299
.get_stats = kszphy_get_stats,
@@ -1277,6 +1307,7 @@ static struct phy_driver ksphy_driver[] = {
12771307
.config_init = ksz8061_config_init,
12781308
.ack_interrupt = kszphy_ack_interrupt,
12791309
.config_intr = kszphy_config_intr,
1310+
.handle_interrupt = kszphy_handle_interrupt,
12801311
.suspend = genphy_suspend,
12811312
.resume = genphy_resume,
12821313
}, {
@@ -1290,6 +1321,7 @@ static struct phy_driver ksphy_driver[] = {
12901321
.config_init = ksz9021_config_init,
12911322
.ack_interrupt = kszphy_ack_interrupt,
12921323
.config_intr = kszphy_config_intr,
1324+
.handle_interrupt = kszphy_handle_interrupt,
12931325
.get_sset_count = kszphy_get_sset_count,
12941326
.get_strings = kszphy_get_strings,
12951327
.get_stats = kszphy_get_stats,
@@ -1309,6 +1341,7 @@ static struct phy_driver ksphy_driver[] = {
13091341
.read_status = ksz9031_read_status,
13101342
.ack_interrupt = kszphy_ack_interrupt,
13111343
.config_intr = kszphy_config_intr,
1344+
.handle_interrupt = kszphy_handle_interrupt,
13121345
.get_sset_count = kszphy_get_sset_count,
13131346
.get_strings = kszphy_get_strings,
13141347
.get_stats = kszphy_get_stats,
@@ -1338,6 +1371,7 @@ static struct phy_driver ksphy_driver[] = {
13381371
.read_status = genphy_read_status,
13391372
.ack_interrupt = kszphy_ack_interrupt,
13401373
.config_intr = kszphy_config_intr,
1374+
.handle_interrupt = kszphy_handle_interrupt,
13411375
.get_sset_count = kszphy_get_sset_count,
13421376
.get_strings = kszphy_get_strings,
13431377
.get_stats = kszphy_get_stats,

0 commit comments

Comments
 (0)