Merge branch 'net-phy-improve-starting-PHY' (2ab64da6) · Commits · 戴 / test

drivers/net/phy/phy.c

+32 −32

Original line number	Diff line number	Diff line
		@@ -785,28 +785,27 @@ static int phy_enable_interrupts(struct phy_device *phydev)
		}

		/**
		* phy_start_interrupts - request and enable interrupts for a PHY device
		* phy_request_interrupt - request interrupt for a PHY device
		* @phydev: target phy_device struct
		*
		* Description: Request the interrupt for the given PHY.
		* If this fails, then we set irq to PHY_POLL.
		* Otherwise, we enable the interrupts in the PHY.
		* This should only be called with a valid IRQ number.
		* Returns 0 on success or < 0 on error.
		*/
		int phy_start_interrupts(struct phy_device *phydev)
		void phy_request_interrupt(struct phy_device *phydev)
		{
		if (request_threaded_irq(phydev->irq, NULL, phy_interrupt,
		int err;

		err = request_threaded_irq(phydev->irq, NULL, phy_interrupt,
		IRQF_ONESHOT \| IRQF_SHARED,
		phydev_name(phydev), phydev) < 0) {
		phydev_warn(phydev, "Can't get IRQ %d\n", phydev->irq);
		phydev_name(phydev), phydev);
		if (err) {
		phydev_warn(phydev, "Error %d requesting IRQ %d, falling back to polling\n",
		err, phydev->irq);
		phydev->irq = PHY_POLL;
		return 0;
		}

		return phy_enable_interrupts(phydev);
		}
		EXPORT_SYMBOL(phy_start_interrupts);
		EXPORT_SYMBOL(phy_request_interrupt);

		/**
		* phy_stop - Bring down the PHY link, and stop checking the status
		@@ -852,33 +851,34 @@ EXPORT_SYMBOL(phy_stop);
		*/
		void phy_start(struct phy_device *phydev)
		{
		int err = 0;
		int err;

		mutex_lock(&phydev->lock);

		switch (phydev->state) {
		case PHY_READY:
		phydev->state = PHY_UP;
		break;
		case PHY_HALTED:
		if (phydev->state != PHY_READY && phydev->state != PHY_HALTED) {
		WARN(1, "called from state %s\n",
		phy_state_to_str(phydev->state));
		goto out;
		}

		/* if phy was suspended, bring the physical link up again */
		__phy_resume(phydev);

		/* make sure interrupts are re-enabled for the PHY */
		/* make sure interrupts are enabled for the PHY */
		if (phy_interrupt_is_valid(phydev)) {
		err = phy_enable_interrupts(phydev);
		if (err < 0)
		break;
		goto out;
		}

		if (phydev->state == PHY_READY)
		phydev->state = PHY_UP;
		else
		phydev->state = PHY_RESUMING;
		break;
		default:
		break;
		}
		mutex_unlock(&phydev->lock);

		phy_trigger_machine(phydev);
		phy_start_machine(phydev);
		out:
		mutex_unlock(&phydev->lock);
		}
		EXPORT_SYMBOL(phy_start);

drivers/net/phy/phy_device.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -951,9 +951,8 @@ int phy_connect_direct(struct net_device dev, struct phy_device phydev,
		return rc;

		phy_prepare_link(phydev, handler);
		phy_start_machine(phydev);
		if (phydev->irq > 0)
		phy_start_interrupts(phydev);
		if (phy_interrupt_is_valid(phydev))
		phy_request_interrupt(phydev);

		return 0;
		}

drivers/net/phy/phylink.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -676,9 +676,8 @@ static int phylink_bringup_phy(struct phylink pl, struct phy_device phy)
		__ETHTOOL_LINK_MODE_MASK_NBITS, pl->supported,
		__ETHTOOL_LINK_MODE_MASK_NBITS, phy->advertising);

		phy_start_machine(phy);
		if (phy->irq > 0)
		phy_start_interrupts(phy);
		if (phy_interrupt_is_valid(phy))
		phy_request_interrupt(phy);

		return 0;
		}

include/linux/phy.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -1047,7 +1047,7 @@ void phy_ethtool_ksettings_get(struct phy_device *phydev,
		int phy_ethtool_ksettings_set(struct phy_device *phydev,
		const struct ethtool_link_ksettings *cmd);
		int phy_mii_ioctl(struct phy_device phydev, struct ifreq ifr, int cmd);
		int phy_start_interrupts(struct phy_device *phydev);
		void phy_request_interrupt(struct phy_device *phydev);
		void phy_print_status(struct phy_device *phydev);
		int phy_set_max_speed(struct phy_device *phydev, u32 max_speed);
		void phy_remove_link_mode(struct phy_device *phydev, u32 link_mode);

Admin message