[net-next,v2,00/19] net: phy: add support for shared interrupts (part 1)

Message

Ioana Ciornei Nov. 1, 2020, 12:50 p.m. UTC

From: Ioana Ciornei <[e-mail]>

This patch set aims to actually add support for shared interrupts in
phylib and not only for multi-PHY devices. While we are at it,
streamline the interrupt handling in phylib.

For a bit of context, at the moment, there are multiple phy_driver ops
that deal with this subject:

- .config_intr() - Enable/disable the interrupt line.

- .ack_interrupt() - Should quiesce any interrupts that may have been
  fired.  It's also used by phylib in conjunction with .config_intr() to
  clear any pending interrupts after the line was disabled, and before
  it is going to be enabled.

- .did_interrupt() - Intended for multi-PHY devices with a shared IRQ
  line and used by phylib to discern which PHY from the package was the
  one that actually fired the interrupt.

- .handle_interrupt() - Completely overrides the default interrupt
  handling logic from phylib. The PHY driver is responsible for checking
  if any interrupt was fired by the respective PHY and choose
  accordingly if it's the one that should trigger the link state machine.

From my point of view, the interrupt handling in phylib has become
somewhat confusing with all these callbacks that actually read the same
PHY register - the interrupt status.  A more streamlined approach would
be to just move the responsibility to write an interrupt handler to the
driver (as any other device driver does) and make .handle_interrupt()
the only way to deal with interrupts.

Another advantage with this approach would be that phylib would gain
support for shared IRQs between different PHY (not just multi-PHY
devices), something which at the moment would require extending every
PHY driver anyway in order to implement their .did_interrupt() callback
and duplicate the same logic as in .ack_interrupt(). The disadvantage
of making .did_interrupt() mandatory would be that we are slightly
changing the semantics of the phylib API and that would increase
confusion instead of reducing it.

What I am proposing is the following:

- As a first step, make the .ack_interrupt() callback optional so that
  we do not break any PHY driver amid the transition.

- Every PHY driver gains a .handle_interrupt() implementation that, for
  the most part, would look like below:

	irq_status = phy_read(phydev, INTR_STATUS);
	if (irq_status < 0) {
		phy_error(phydev);
		return IRQ_NONE;
	}

	if (!(irq_status & irq_mask))
		return IRQ_NONE;

	phy_trigger_machine(phydev);

	return IRQ_HANDLED;

- Remove each PHY driver's implementation of the .ack_interrupt() by
  actually taking care of quiescing any pending interrupts before
  enabling/after disabling the interrupt line.

- Finally, after all drivers have been ported, remove the
  .ack_interrupt() and .did_interrupt() callbacks from phy_driver.

This patch set is part 1 and it addresses the changes needed in phylib
and 7 PHY drivers. The rest can be found on my Github branch here:
https://github.com/IoanaCiornei/linux/commits/phylib-shared-irq

I do not have access to most of these PHY's, therefore I Cc-ed the
latest contributors to the individual PHY drivers in order to have
access, hopefully, to more regression testing.

Changes in v2:
 - Rework the .handle_interrupt() implementation for each driver so that
   only the enabled interrupts are taken into account when
   IRQ_NONE/IRQ_HANDLED it returned. The main idea is so that we avoid
   falsely blaming a device for triggering an interrupt when this is not
   the case.
   The only devices for which I was unable to make this adjustment were
   the BCM8706, BCM8727, BCMAC131 and BCM5241 since I do not have access
   to their datasheets.
 - I also updated the pseudo-code added in the cover-letter so that it's
   more clear how a .handle_interrupt() callback should look like.

Ioana Ciornei (19):
  net: phy: export phy_error and phy_trigger_machine
  net: phy: add a shutdown procedure
  net: phy: make .ack_interrupt() optional
  net: phy: at803x: implement generic .handle_interrupt() callback
  net: phy: at803x: remove the use of .ack_interrupt()
  net: phy: mscc: use phy_trigger_machine() to notify link change
  net: phy: mscc: implement generic .handle_interrupt() callback
  net: phy: mscc: remove the use of .ack_interrupt()
  net: phy: aquantia: implement generic .handle_interrupt() callback
  net: phy: aquantia: remove the use of .ack_interrupt()
  net: phy: broadcom: implement generic .handle_interrupt() callback
  net: phy: broadcom: remove use of ack_interrupt()
  net: phy: cicada: implement the generic .handle_interrupt() callback
  net: phy: cicada: remove the use of .ack_interrupt()
  net: phy: davicom: implement generic .handle_interrupt() calback
  net: phy: davicom: remove the use of .ack_interrupt()
  net: phy: add genphy_handle_interrupt_no_ack()
  net: phy: realtek: implement generic .handle_interrupt() callback
  net: phy: realtek: remove the use of .ack_interrupt()

 drivers/net/phy/aquantia_main.c  |  59 +++++++++----
 drivers/net/phy/at803x.c         |  50 +++++++++--
 drivers/net/phy/bcm-cygnus.c     |   2 +-
 drivers/net/phy/bcm-phy-lib.c    |  49 ++++++++++-
 drivers/net/phy/bcm-phy-lib.h    |   1 +
 drivers/net/phy/bcm54140.c       |  46 +++++++---
 drivers/net/phy/bcm63xx.c        |  20 +++--
 drivers/net/phy/bcm87xx.c        |  50 ++++++-----
 drivers/net/phy/broadcom.c       |  70 +++++++++++-----
 drivers/net/phy/cicada.c         |  35 +++++++-
 drivers/net/phy/davicom.c        |  63 ++++++++++----
 drivers/net/phy/mscc/mscc_main.c |  70 ++++++++--------
 drivers/net/phy/phy.c            |   6 +-
 drivers/net/phy/phy_device.c     |  23 ++++-
 drivers/net/phy/realtek.c        | 140 +++++++++++++++++++++++++++----
 include/linux/phy.h              |   3 +
 16 files changed, 529 insertions(+), 158 deletions(-)

Cc: Alexandru Ardelean <[e-mail]>
Cc: Andre Edich <[e-mail]>
Cc: Antoine Tenart <[e-mail]>
Cc: Baruch Siach <[e-mail]>
Cc: Christophe Leroy <[e-mail]>
Cc: Dan Murphy <[e-mail]>
Cc: Divya Koppera <[e-mail]>
Cc: Florian Fainelli <[e-mail]>
Cc: Hauke Mehrtens <[e-mail]>
Cc: Heiner Kallweit <[e-mail]>
Cc: Jerome Brunet <[e-mail]>
Cc: Kavya Sree Kotagiri <[e-mail]>
Cc: Linus Walleij <[e-mail]>
Cc: Marco Felsch <[e-mail]>
Cc: Marek Vasut <[e-mail]>
Cc: Martin Blumenstingl <[e-mail]>
Cc: Mathias Kresin <[e-mail]>
Cc: Maxim Kochetkov <[e-mail]>
Cc: Michael Walle <[e-mail]>
Cc: Neil Armstrong <[e-mail]>
Cc: Nisar Sayed <[e-mail]>
Cc: Oleksij Rempel <[e-mail]>
Cc: Philippe Schenker <[e-mail]>
Cc: Willy Liu <[e-mail]>
Cc: Yuiko Oshino <[e-mail]>

Comments

Andrew Lunn Nov. 3, 2020, 4:44 p.m. UTC | #1

On Sun, Nov 01, 2020 at 02:50:55PM +0200, Ioana Ciornei wrote:
> From: Ioana Ciornei <[e-mail]>
> 
> This patch set aims to actually add support for shared interrupts in
> phylib and not only for multi-PHY devices. While we are at it,
> streamline the interrupt handling in phylib.

Hi Ioana

I did some quick testing with the Marvell PHY. This is one of the
drivers you have not changed. But it at least tests some of the core
changes.

Tested-by: Andrew Lunn <[e-mail]>

I will try to review the actual changes soon.

    Andrew

Michael Walle Nov. 3, 2020, 10:53 p.m. UTC | #2

Am 2020-11-01 13:50, schrieb Ioana Ciornei:
> From: Ioana Ciornei <[e-mail]>
> 
> This patch set aims to actually add support for shared interrupts in
> phylib and not only for multi-PHY devices. While we are at it,
> streamline the interrupt handling in phylib.

For the Broadcom BCM54140:
Tested-by: Michael Walle <[e-mail]>

-michael

Jakub Kicinski Nov. 6, 2020, 12:36 a.m. UTC | #3

On Sun,  1 Nov 2020 14:50:55 +0200 Ioana Ciornei wrote:
> From: Ioana Ciornei <[e-mail]>
> 
> This patch set aims to actually add support for shared interrupts in
> phylib and not only for multi-PHY devices. While we are at it,
> streamline the interrupt handling in phylib.

Applied, thank you!