From patchwork Sun Jan 21 19:54:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Werner X-Patchwork-Id: 13524668 X-Patchwork-Delegate: kuba@kernel.org Received: from mail.systec-electronic.com (mail.systec-electronic.com [77.220.239.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1F8B8364A4; Sun, 21 Jan 2024 20:15:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=77.220.239.22 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705868128; cv=none; b=rAsGuWA6J3qwAajOORGvnZWHligb/RWzq7r3TzvQ5YGc8YnjHUZIl7v96lc1bdMgSxL2wGVJ1pyXIRZ+rhirEpzH/O96WIQn+nY6yZTAX1cUNg0FZMUrhK38Sr28oYVIQX9iP8mm1cpiMLSyTIG1hreqMnkIhNKOuvbtqPbNikM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705868128; c=relaxed/simple; bh=r7Mad+18u+jwnU/YF4L3AU0sCRqVEO0/VeJu9ihAzqQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CKEjnAyASMveEL72IXI4W7oPqxba3Ho8rYFHbg7izC7kw5c5FSenrGaPZpahO4hHoCxLV0OcirxUx0kIzh+dfj3sKSDf9B4fLZH5Q3zw8LX5SkXZpkxXF7ZMC7a2T4dDDiX1jSog6Akbv/Bu7z6pcoqb2n0jrdPNF3P9j0JUiu4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=systec-electronic.com; spf=pass smtp.mailfrom=systec-electronic.com; dkim=pass (2048-bit key) header.d=systec-electronic.com header.i=@systec-electronic.com header.b=LWx6bbWE; arc=none smtp.client-ip=77.220.239.22 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=systec-electronic.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=systec-electronic.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=systec-electronic.com header.i=@systec-electronic.com header.b="LWx6bbWE" Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.systec-electronic.com (Postfix) with ESMTP id DD7DB941A5D0; Sun, 21 Jan 2024 21:15:15 +0100 (CET) Received: from mail.systec-electronic.com ([127.0.0.1]) by localhost (mail.systec-electronic.com [127.0.0.1]) (amavis, port 10032) with ESMTP id VBdqbwpY4LHf; Sun, 21 Jan 2024 21:15:15 +0100 (CET) Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.systec-electronic.com (Postfix) with ESMTP id 3AEB7941A5CF; Sun, 21 Jan 2024 21:15:15 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.systec-electronic.com 3AEB7941A5CF DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=systec-electronic.com; s=B34D3B04-5DC7-11EE-83E3-4D8CAB78E8CD; t=1705868115; bh=0fVqfQUXQoF1AGoP7P+W4Vw6CmKt77YMbNYaAqbRPvo=; h=From:To:Date:Message-ID:MIME-Version; b=LWx6bbWEcje9I+A8Vak4nT5lrpVEA7eRTY6tIzJf/DrH2erUNq1PdayYL08MOC9k1 nzsQhTJrAiVRn4t0xdvNyJ/DDSPHb5kGLE9EY7wSuSBwhHYc4gfUDD9b+m1t+eSYGM 9AleKwOQEOYiLHNSAK3SuUBJMl+UIBZUwegRiIaiYaHQLnnr5s26KJAH87U2zSZ1Sb xo4tLsoZX5IpE30ATIThdKh+bO3XHc4w/eZJ/DRxuO/suG0e7eE6m2pGhBeEOfn4iM xO0n2uEMuxGsJo8sYgHeVLEnqmnddKubxFAmIA5usSUgpmPQ5lBEz57rW6kZueJDik 2IRVgtpo4Z6wA== X-Virus-Scanned: amavis at systec-electronic.com Received: from mail.systec-electronic.com ([127.0.0.1]) by localhost (mail.systec-electronic.com [127.0.0.1]) (amavis, port 10026) with ESMTP id SyEDDzDb2M5X; Sun, 21 Jan 2024 21:15:15 +0100 (CET) Received: from ws-565760.systec.local (unknown [212.185.67.148]) by mail.systec-electronic.com (Postfix) with ESMTPSA id E6733940168B; Sun, 21 Jan 2024 21:15:14 +0100 (CET) From: Andre Werner To: andrew@lunn.ch, hkallweit1@gmail.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: linux@armlinux.org.uk, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Andre Werner Subject: [RFC net-next v4 1/2] net: phy: phy_device: Prevent nullptr exceptions on ISR Date: Sun, 21 Jan 2024 20:54:48 +0100 Message-ID: <20240121201511.8997-2-andre.werner@systec-electronic.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240121201511.8997-1-andre.werner@systec-electronic.com> References: <20240121201511.8997-1-andre.werner@systec-electronic.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org X-Patchwork-State: RFC If phydev->irq is set unconditionally, check for valid interrupt handler or fall back to polling mode to prevent nullptr exceptions in interrupt service routine. Signed-off-by: Andre Werner Reviewed-by: Andrew Lunn Reviewed-by: Andrew Lunn --- v4: - Delete phydev_warn and comment as suggested. --- drivers/net/phy/phy_device.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 3611ea64875e..7cbe7c714177 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -1413,6 +1413,11 @@ int phy_sfp_probe(struct phy_device *phydev, } EXPORT_SYMBOL(phy_sfp_probe); +static bool phy_drv_supports_irq(struct phy_driver *phydrv) +{ + return phydrv->config_intr && phydrv->handle_interrupt; +} + /** * phy_attach_direct - attach a network device to a given PHY device pointer * @dev: network device to attach @@ -1527,6 +1532,9 @@ int phy_attach_direct(struct net_device *dev, struct phy_device *phydev, if (phydev->dev_flags & PHY_F_NO_IRQ) phydev->irq = PHY_POLL; + if (!phy_drv_supports_irq(phydev->drv) && phy_interrupt_is_valid(phydev)) + phydev->irq = PHY_POLL; + /* Port is set to PORT_TP by default and the actual PHY driver will set * it to different value depending on the PHY configuration. If we have * the generic PHY driver we can't figure it out, thus set the old @@ -2992,11 +3000,6 @@ s32 phy_get_internal_delay(struct phy_device *phydev, struct device *dev, } EXPORT_SYMBOL(phy_get_internal_delay); -static bool phy_drv_supports_irq(struct phy_driver *phydrv) -{ - return phydrv->config_intr && phydrv->handle_interrupt; -} - static int phy_led_set_brightness(struct led_classdev *led_cdev, enum led_brightness value) { From patchwork Sun Jan 21 19:54:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Werner X-Patchwork-Id: 13524667 X-Patchwork-Delegate: kuba@kernel.org Received: from mail.systec-electronic.com (mail.systec-electronic.com [77.220.239.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1F8F538396; Sun, 21 Jan 2024 20:15:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=77.220.239.22 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705868127; cv=none; b=iqTXG8NqDrcZjLdNJhy/fQmVYjNc6iHJUIf9VQI9AePE/EkQ68GBpNdHGRImofMhgQSfDShIPJ3w3ebd7KTgSNeBg+qmNtmNBNZMV4s8gDb/a+YBzvGFbKoGzu0qKEGA0a7O5Qu2LTVBd6bDVtuboahDxp0+0ZezEAoRqf+o430= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705868127; c=relaxed/simple; bh=DdaAMfAqRKaoKK0URN081uvxzjr0aE5O73JQyc3Qw08=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JeYASHo5YUabT3KKpGJbznUjsRcKDCXAgsyalN7/ngegQ1wKv5moh+Rqtvkf+BOwGayTBNMq9P65LdD5AAFXUtD2B18JJhoKQuDsaA7ymQRFEaajs5PguXpsd9XOoEa4lCOXWW+6LpHCT1lv1d6clo7vkR9h/4TCQH18mfLNrxM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=systec-electronic.com; spf=pass smtp.mailfrom=systec-electronic.com; dkim=pass (2048-bit key) header.d=systec-electronic.com header.i=@systec-electronic.com header.b=eRcrZ4Fj; arc=none smtp.client-ip=77.220.239.22 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=systec-electronic.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=systec-electronic.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=systec-electronic.com header.i=@systec-electronic.com header.b="eRcrZ4Fj" Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.systec-electronic.com (Postfix) with ESMTP id 19AFA9400107; Sun, 21 Jan 2024 21:15:16 +0100 (CET) Received: from mail.systec-electronic.com ([127.0.0.1]) by localhost (mail.systec-electronic.com [127.0.0.1]) (amavis, port 10032) with ESMTP id YYmRd1COwZLT; Sun, 21 Jan 2024 21:15:16 +0100 (CET) Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.systec-electronic.com (Postfix) with ESMTP id E7FD9941A5D1; Sun, 21 Jan 2024 21:15:15 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.systec-electronic.com E7FD9941A5D1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=systec-electronic.com; s=B34D3B04-5DC7-11EE-83E3-4D8CAB78E8CD; t=1705868115; bh=I79RkeIuOJntt4ag+ghEKT/mdW6n3a9EF+d3EcXI4Ps=; h=From:To:Date:Message-ID:MIME-Version; b=eRcrZ4FjS6XsZnr8ZpUS539S9iKhucY2fzUOmXCLR/Dfyy9Hxyl/a+d/1piE41GeO C+9Jewp/EYruNpRgSaoHF++tJbkYrnC3UAa6j64hbWbM/kttl1h6kOyQn0fi7ly1s4 ybnG7uw4kd5ph3vf0X/n2uk3NgnVpoSQU+kkuZqX3f5ZI8SK31kwC1jr7lY+MViJ6o 5J12bW5mwYQmw/GwIwHaP1UapPapYVNlFDHA/GrUx6h4T7O+VOifKU1jYDYwSjcjFY xPxV2g13OPHuxVHhMg4tWun+yBFXuXzCWB78jArsxVJ+S8fHZquz1Qv8M/ZMxYBpzJ LQGCZDz/GEeLQ== X-Virus-Scanned: amavis at systec-electronic.com Received: from mail.systec-electronic.com ([127.0.0.1]) by localhost (mail.systec-electronic.com [127.0.0.1]) (amavis, port 10026) with ESMTP id 8APQRCsXv_pK; Sun, 21 Jan 2024 21:15:15 +0100 (CET) Received: from ws-565760.systec.local (unknown [212.185.67.148]) by mail.systec-electronic.com (Postfix) with ESMTPSA id 338D59400107; Sun, 21 Jan 2024 21:15:15 +0100 (CET) From: Andre Werner To: andrew@lunn.ch, hkallweit1@gmail.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: linux@armlinux.org.uk, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Andre Werner Subject: [RFC net-next v4 2/2] net: phy: adin1100: Add interrupt support for link change Date: Sun, 21 Jan 2024 20:54:49 +0100 Message-ID: <20240121201511.8997-3-andre.werner@systec-electronic.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240121201511.8997-1-andre.werner@systec-electronic.com> References: <20240121201511.8997-1-andre.werner@systec-electronic.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org X-Patchwork-State: RFC An interrupt handler was added to the driver as well as functions to enable interrupts at the phy. There are several interrupts maskable at the phy, but only link change interrupts are handled by the driver yet. Signed-off-by: Andre Werner Reviewed-by: etc and resend. --- v4: - Change read-modify-write behavior as suggested to phy_modify_mmd. --- drivers/net/phy/adin1100.c | 56 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/drivers/net/phy/adin1100.c b/drivers/net/phy/adin1100.c index 7619d6185801..7c82384e5d30 100644 --- a/drivers/net/phy/adin1100.c +++ b/drivers/net/phy/adin1100.c @@ -18,6 +18,12 @@ #define PHY_ID_ADIN1110 0x0283bc91 #define PHY_ID_ADIN2111 0x0283bca1 +#define ADIN_PHY_SUBSYS_IRQ_MASK 0x0021 +#define ADIN_LINK_STAT_CHNG_IRQ_EN BIT(1) + +#define ADIN_PHY_SUBSYS_IRQ_STATUS 0x0011 +#define ADIN_LINK_STAT_CHNG BIT(1) + #define ADIN_FORCED_MODE 0x8000 #define ADIN_FORCED_MODE_EN BIT(0) @@ -136,6 +142,54 @@ static int adin_config_aneg(struct phy_device *phydev) return genphy_c45_config_aneg(phydev); } +static int adin_phy_ack_intr(struct phy_device *phydev) +{ + /* Clear pending interrupts */ + int rc = phy_read_mmd(phydev, MDIO_MMD_VEND2, + ADIN_PHY_SUBSYS_IRQ_STATUS); + + return rc < 0 ? rc : 0; +} + +static int adin_config_intr(struct phy_device *phydev) +{ + int ret; + u16 irq_mask; + + ret = adin_phy_ack_intr(phydev); + + if (ret) + return ret; + + if (phydev->interrupts == PHY_INTERRUPT_ENABLED) + irq_mask = ADIN_LINK_STAT_CHNG_IRQ_EN; + else + irq_mask = 0; + + return phy_modify_mmd(phydev, MDIO_MMD_VEND2, + ADIN_PHY_SUBSYS_IRQ_MASK, + ADIN_LINK_STAT_CHNG_IRQ_EN, irq_mask); +} + +static irqreturn_t adin_phy_handle_interrupt(struct phy_device *phydev) +{ + int irq_status; + + irq_status = phy_read_mmd(phydev, MDIO_MMD_VEND2, + ADIN_PHY_SUBSYS_IRQ_STATUS); + if (irq_status < 0) { + phy_error(phydev); + return IRQ_NONE; + } + + if (!(irq_status & ADIN_LINK_STAT_CHNG)) + return IRQ_NONE; + + phy_trigger_machine(phydev); + + return IRQ_HANDLED; +} + static int adin_set_powerdown_mode(struct phy_device *phydev, bool en) { int ret; @@ -275,6 +329,8 @@ static struct phy_driver adin_driver[] = { .probe = adin_probe, .config_aneg = adin_config_aneg, .read_status = adin_read_status, + .config_intr = adin_config_intr, + .handle_interrupt = adin_phy_handle_interrupt, .set_loopback = adin_set_loopback, .suspend = adin_suspend, .resume = adin_resume,