From: David S. Miller Date: Wed, 24 Jun 2020 21:52:49 +0000 (-0700) Subject: Merge branch 'net-phy-call-phy_disable_interrupts-in-phy_init_hw' X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=482f3bae5bf33522041590c0fde51c3e9651349f;p=linux.git Merge branch 'net-phy-call-phy_disable_interrupts-in-phy_init_hw' Jisheng Zhang says: ==================== net: phy: call phy_disable_interrupts() in phy_init_hw() We face an issue with rtl8211f, a pin is shared between INTB and PMEB, and the PHY Register Accessible Interrupt is enabled by default, so the INTB/PMEB pin is always active in polling mode case. As Heiner pointed out "I was thinking about calling phy_disable_interrupts() in phy_init_hw(), to have a defined init state as we don't know in which state the PHY is if the PHY driver is loaded. We shouldn't assume that it's the chip power-on defaults, BIOS or boot loader could have changed this. Or in case of dual-boot systems the other OS could leave the PHY in whatever state." patch1 makes phy_disable_interrupts() non-static so that it could be used in phy_init_hw() to have a defined init state. patch2 calls phy_disable_interrupts() in phy_init_hw() to have a defined init state. Since v3: - call phy_disable_interrupts() have interrupts disabled first then config_init, thank Florian Since v2: - Don't export phy_disable_interrupts() but just make it non-static Since v1: - EXPORT the correct symbol ==================== Signed-off-by: David S. Miller --- 482f3bae5bf33522041590c0fde51c3e9651349f