From patchwork Fri Nov 13 16:52:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ioana Ciornei X-Patchwork-Id: 1399953 Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=B5QKWdB6; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CXkzk6gbvz9sSs for ; Sat, 14 Nov 2020 03:52:50 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726143AbgKMQws (ORCPT ); Fri, 13 Nov 2020 11:52:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53428 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726057AbgKMQwr (ORCPT ); Fri, 13 Nov 2020 11:52:47 -0500 Received: from mail-ed1-x541.google.com (mail-ed1-x541.google.com [IPv6:2a00:1450:4864:20::541]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 09F14C0613D1; Fri, 13 Nov 2020 08:52:47 -0800 (PST) Received: by mail-ed1-x541.google.com with SMTP id v22so11448905edt.9; Fri, 13 Nov 2020 08:52:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=IKZ0bJ9wrwGZuyOlCMns8U747V5thrsJagTuvXdjRs0=; b=B5QKWdB6XLthMd7loD3Jk4sxXaEtcB8n4U3Mb9hq/gcdCgkrxNRynMEJwW61FU1DA4 RFSyMseFIBfVzxrexJKoO9Ck+E80Ef8+IgbaMnb8PVifymkACaiH7oN2tQD/jzR0t234 zczqDejfx0GN1I3kgCtzwVLJfRCEKAKYXZ7/eBBqW15cKXYj3ChnQb+ila0eLJUG3zyQ kMHyzxm1wkifKclRrCHYP+Amf/q2nEchq/RsB4V30/8n8+4GB0JTIXhz6Tf7gmuIfcvM 86sF/dVj8+/h9GKbs22RUp/LJNLZnV/JUyeca6rhOjvLKMX3XXnBeoBRQx7l2555/0O0 95hQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=IKZ0bJ9wrwGZuyOlCMns8U747V5thrsJagTuvXdjRs0=; b=Zt6DzowDeErhuzg2IEQdR0S+VuPZzG5oIwYdPnHvcr25/EWesnwsYKqk/rg2nGs18h bN7RFlUkhhcxnFMwTkRn5OplYXgs1ohtvVpzL0jWzncknOMy+WYo7cEb6AH69I7SBKnX lmjSDketeFbGsAkVYYW+p2R6azL+6qGvfmtoAUyRo2vYYPxGV8I3i645xOtG3QYjU/Yc FBSTMcv4V4YQ/bY5ZXJU+7IjLZxTraigr4RAWACE9z+vEsvcxR6j89Q+/MxiDnXZlbrQ y4hdNjqJ+mJL86Xo4ocrRaiv7eG8nackTfaYi4jnWRpGhRI0ARL8oIQJANPsPF0qlj2S TZmQ== X-Gm-Message-State: AOAM531AYUdVAUjUhOrSASc05QWO+SURkNbox3DxnTWLUp6dDfmeReWX ueyw6cPBx9N3yXj21tNO+ZLRa1ThXv5jKQ== X-Google-Smtp-Source: ABdhPJyybBa61atUbsLzBLVcxFjcWl8+HHcmbs0PP4Up1VBGFheVfq+mRInAYCPlJ0iukA6bUsjPJw== X-Received: by 2002:a05:6402:22d1:: with SMTP id dm17mr3411288edb.179.1605286365300; Fri, 13 Nov 2020 08:52:45 -0800 (PST) Received: from yoga-910.localhost ([188.25.2.177]) by smtp.gmail.com with ESMTPSA id rp28sm4076570ejb.77.2020.11.13.08.52.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Nov 2020 08:52:43 -0800 (PST) From: Ioana Ciornei To: Andrew Lunn , Heiner Kallweit , Russell King , Florian Fainelli , Jakub Kicinski , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ioana Ciornei , Alexandru Ardelean , Andre Edich , Baruch Siach , Christophe Leroy , Kavya Sree Kotagiri , Linus Walleij , Marco Felsch , Marek Vasut , Maxim Kochetkov , Nisar Sayed , Oleksij Rempel , Robert Hancock , Yuiko Oshino Subject: [PATCH RESEND net-next 00/18] net: phy: add support for shared interrupts (part 2) Date: Fri, 13 Nov 2020 18:52:08 +0200 Message-Id: <20201113165226.561153-1-ciorneiioana@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Ioana Ciornei 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 2 of the entire change set and it addresses the changes needed in 9 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. Ioana Ciornei (18): net: phy: vitesse: implement generic .handle_interrupt() callback net: phy: vitesse: remove the use of .ack_interrupt() net: phy: microchip: implement generic .handle_interrupt() callback net: phy: microchip: remove the use of .ack_interrupt() net: phy: marvell: implement generic .handle_interrupt() callback net: phy: marvell: remove the use of .ack_interrupt() net: phy: lxt: implement generic .handle_interrupt() callback net: phy: lxt: remove the use of .ack_interrupt() net: phy: nxp-tja11xx: implement generic .handle_interrupt() callback net: phy: nxp-tja11xx: remove the use of .ack_interrupt() net: phy: amd: implement generic .handle_interrupt() callback net: phy: amd: remove the use of .ack_interrupt() net: phy: smsc: implement generic .handle_interrupt() callback net: phy: smsc: remove the use of .ack_interrupt() net: phy: ste10Xp: implement generic .handle_interrupt() callback net: phy: ste10Xp: remove the use of .ack_interrupt() net: phy: adin: implement generic .handle_interrupt() callback net: phy: adin: remove the use of the .ack_interrupt() drivers/net/phy/adin.c | 45 +++++++++++++--- drivers/net/phy/amd.c | 37 +++++++++++-- drivers/net/phy/lxt.c | 94 ++++++++++++++++++++++++++++++---- drivers/net/phy/marvell.c | 88 ++++++++++++++++--------------- drivers/net/phy/microchip.c | 24 +++++++-- drivers/net/phy/microchip_t1.c | 28 +++++++--- drivers/net/phy/nxp-tja11xx.c | 42 +++++++++++++-- drivers/net/phy/smsc.c | 55 ++++++++++++++++---- drivers/net/phy/ste10Xp.c | 53 +++++++++++++------ drivers/net/phy/vitesse.c | 61 ++++++++++++++-------- 10 files changed, 405 insertions(+), 122 deletions(-) Cc: Alexandru Ardelean Cc: Andre Edich Cc: Baruch Siach Cc: Christophe Leroy Cc: Kavya Sree Kotagiri Cc: Linus Walleij Cc: Marco Felsch Cc: Marek Vasut Cc: Maxim Kochetkov Cc: Nisar Sayed Cc: Oleksij Rempel Cc: Robert Hancock Cc: Yuiko Oshino