From patchwork Wed Jun 24 12:16:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Murphy X-Patchwork-Id: 191646 Delivered-To: patch@linaro.org Received: by 2002:a92:1f07:0:0:0:0:0 with SMTP id i7csp532587ile; Wed, 24 Jun 2020 05:16:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwYz+/bC+GtM8ElqTS+ts7Qbv7BnaVyxOnxGOzIWoqy4ygRwlpewKEMRxAEMCVaqRFcOXot X-Received: by 2002:a17:906:824c:: with SMTP id f12mr15104744ejx.443.1593000991846; Wed, 24 Jun 2020 05:16:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593000991; cv=none; d=google.com; s=arc-20160816; b=yNsv7kFTk+DupprJPjtgFQu3Gzl2HcsZfsaEhrIKQBHzLYQfkyPTzHMzYmR/lf+EZ0 oOV2bel2R4hrS/JL27FQG5az3UgvT+vkfhFDmzbBT2pnHbRNR/R5cfVeGMbBrXalTizZ OgK7HaBK77ixTgXlcNbGE40xRUixmngkyVJn3kk2ULLzyZebn2jCMXw28p75GKRwb/nb YieWjOeqenjMYxTnPGFpBUQCPrnvZNOLWFa5LE2AdTQEfafMNO36wUcxIRKYFvZmx4Hi B1W8TXuWJ3W5T4HM/7Ftniv6TOQ+AX/k8Ca0ldJhhctwi6CpOi00DzGLqhaZweNaM5p1 ygHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=XhPJ2yYNr68Ft+JNlBWY8oS1LW8GSDpIsS4l8OFORNI=; b=PiN+xzoWyKzy38VQzMxm88pxGfYBmRFN/pLpmMCvhXUtH7/JiXseom8doDf4u1ZwUv cbTt/FcRRYMx5sImkTyTwbOt/ClEskJZ79mXZ8pZbBj64tGhNgEmfoLitkhRz8GgXai+ nnY0ljofat9KxZY9QCr9i0b5XKW6bvdcrMMM9HiOcZI0T8A10OfwpLd+CDpMLm/KAFJf EATYJMmHObQdXJ1HNF+S1Dd6Xw/aRmO+j9Hr1IDc2kcSyAq1vr7/wCgaNQpDwn/ix3JP CSG1A25ENe3YZRXsLiu28k3c4jgzSZie6v4ega6clWuKvd0sFWH//cndLgm9GsAJzK0g KZVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=Z4ZvKIVx; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m17si13317464eds.189.2020.06.24.05.16.31; Wed, 24 Jun 2020 05:16:31 -0700 (PDT) Received-SPF: pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=Z4ZvKIVx; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388669AbgFXMQa (ORCPT + 6 others); Wed, 24 Jun 2020 08:16:30 -0400 Received: from fllv0016.ext.ti.com ([198.47.19.142]:38804 "EHLO fllv0016.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388296AbgFXMQ3 (ORCPT ); Wed, 24 Jun 2020 08:16:29 -0400 Received: from lelv0266.itg.ti.com ([10.180.67.225]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 05OCGNYm066089; Wed, 24 Jun 2020 07:16:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1593000983; bh=XhPJ2yYNr68Ft+JNlBWY8oS1LW8GSDpIsS4l8OFORNI=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=Z4ZvKIVx8kUmUTV4ZHihEzl0s13kRCiMFXaCKN3IbyXyn6M9RQsmUQAiJ8sEwvLC+ qPka9uLMqGT5eHyADGAJbpMyZwshAZ09irHayCd0yHSGdDwHKKhJYupjxpnpH5Kvfd 0fogp3/v4TGzKPW6uMWXAw+yTHfYxLqPxkSbQmLA= Received: from DLEE109.ent.ti.com (dlee109.ent.ti.com [157.170.170.41]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 05OCGNgF069096 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 24 Jun 2020 07:16:23 -0500 Received: from DLEE100.ent.ti.com (157.170.170.30) by DLEE109.ent.ti.com (157.170.170.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1979.3; Wed, 24 Jun 2020 07:16:22 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DLEE100.ent.ti.com (157.170.170.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1979.3 via Frontend Transport; Wed, 24 Jun 2020 07:16:22 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 05OCGMLC056780; Wed, 24 Jun 2020 07:16:22 -0500 From: Dan Murphy To: , , , , CC: , , , Dan Murphy Subject: [PATCH net-next v11 2/5] net: phy: Add a helper to return the index for of the internal delay Date: Wed, 24 Jun 2020 07:16:02 -0500 Message-ID: <20200624121605.18259-3-dmurphy@ti.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200624121605.18259-1-dmurphy@ti.com> References: <20200624121605.18259-1-dmurphy@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Add a helper function that will return the index in the array for the passed in internal delay value. The helper requires the array, size and delay value. The helper will then return the index for the exact match or return the index for the index to the closest smaller value. Signed-off-by: Dan Murphy --- drivers/net/phy/phy_device.c | 99 ++++++++++++++++++++++++++++++++++++ include/linux/phy.h | 4 ++ 2 files changed, 103 insertions(+) -- 2.26.2 diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 29ef4456ac25..6d47485e68f9 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -31,6 +31,7 @@ #include #include #include +#include MODULE_DESCRIPTION("PHY library"); MODULE_AUTHOR("Andy Fleming"); @@ -2708,6 +2709,104 @@ void phy_get_pause(struct phy_device *phydev, bool *tx_pause, bool *rx_pause) } EXPORT_SYMBOL(phy_get_pause); +#if IS_ENABLED(CONFIG_OF_MDIO) +static int phy_get_int_delay_property(struct device *dev, const char *name) +{ + s32 int_delay; + int ret; + + ret = device_property_read_u32(dev, name, &int_delay); + if (ret) + return ret; + + return int_delay; +} +#else +static int phy_get_int_delay_property(struct device *dev, const char *name) +{ + return -EINVAL; +} +#endif + +/** + * phy_get_delay_index - returns the index of the internal delay + * @phydev: phy_device struct + * @dev: pointer to the devices device struct + * @delay_values: array of delays the PHY supports + * @size: the size of the delay array + * @is_rx: boolean to indicate to get the rx internal delay + * + * Returns the index within the array of internal delay passed in. + * If the device property is not present then the interface type is checked + * if the interface defines use of internal delay then a 1 is returned otherwise + * a 0 is returned. + * The array must be in ascending order. If PHY does not have an ascending order + * array then size = 0 and the value of the delay property is returned. + * Return -EINVAL if the delay is invalid or cannot be found. + */ +s32 phy_get_internal_delay(struct phy_device *phydev, struct device *dev, + const int *delay_values, int size, bool is_rx) +{ + s32 delay; + int i; + + if (is_rx) { + delay = phy_get_int_delay_property(dev, "rx-internal-delay-ps"); + if (delay < 0 && size == 0) { + if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID || + phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID) + return 1; + else + return 0; + } + + } else { + delay = phy_get_int_delay_property(dev, "tx-internal-delay-ps"); + if (delay < 0 && size == 0) { + if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID || + phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID) + return 1; + else + return 0; + } + } + + if (delay < 0) + return delay; + + if (delay && size == 0) + return delay; + + if (delay < delay_values[0] || delay > delay_values[size - 1]) { + phydev_err(phydev, "Delay %d is out of range\n", delay); + return -EINVAL; + } + + if (delay == delay_values[0]) + return 0; + + for (i = 1; i < size; i++) { + if (delay == delay_values[i]) + return i; + + /* Find an approximate index by looking up the table */ + if (delay > delay_values[i - 1] && + delay < delay_values[i]) { + if (delay - delay_values[i - 1] < + delay_values[i] - delay) + return i - 1; + else + return i; + } + } + + phydev_err(phydev, "error finding internal delay index for %d\n", + delay); + + return -EINVAL; +} +EXPORT_SYMBOL(phy_get_internal_delay); + static bool phy_drv_supports_irq(struct phy_driver *phydrv) { return phydrv->config_intr && phydrv->ack_interrupt; diff --git a/include/linux/phy.h b/include/linux/phy.h index 9248dd2ce4ca..bce5729be753 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -1434,6 +1434,10 @@ void phy_set_asym_pause(struct phy_device *phydev, bool rx, bool tx); bool phy_validate_pause(struct phy_device *phydev, struct ethtool_pauseparam *pp); void phy_get_pause(struct phy_device *phydev, bool *tx_pause, bool *rx_pause); + +s32 phy_get_internal_delay(struct phy_device *phydev, struct device *dev, + const int *delay_values, int size, bool is_rx); + void phy_resolve_pause(unsigned long *local_adv, unsigned long *partner_adv, bool *tx_pause, bool *rx_pause);