From patchwork Tue Jun 23 13:48:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Murphy X-Patchwork-Id: 191484 Delivered-To: patch@linaro.org Received: by 2002:a92:1f07:0:0:0:0:0 with SMTP id i7csp1996475ile; Tue, 23 Jun 2020 06:49:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyfw4mFeAHpwQ5+mVLZ9hCTzQPWzCd/D5CmuXZHXruKwuP8Mp5igET/3ywIOf/V2hT5DOKn X-Received: by 2002:a50:e801:: with SMTP id e1mr1921868edn.251.1592920146486; Tue, 23 Jun 2020 06:49:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592920146; cv=none; d=google.com; s=arc-20160816; b=Ue+6F6Xo4p3ng2SBqUH2MyLmnJsfwYdevoyeKG8Q9W6P8kP4DAcOiP2Iw66df6TFQy vfY8k9Ix0pGtGgq2jDkYHiad/FCRBsC3/tzLu5adEOVgpwhPTKcdcL4acN31a0Lgkb3D NrFq5f9iti6VYZiJnFuoaE/8JJt/I/WAnEBu/h66lqlbeFM3IO0QFdWEmNtmc5EZMA+g m7ODjDxtTExu5uwqy3MR7Pud09lyebKybhnU3JSOxmCafMjrprcEjCGXJPqSksHuP55G GPLSzO3fdhxRDTq3/VWflB2MJXZFeSeW3vJjO8c5lUar789gRmXx8fH6F+qkr4Qq6oR5 jEwA== 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=Qs655vx2aySdbX1vG29sRtFyWV9hqkfoFvwyhBhceUY=; b=kumt7QbM9+Yi+qTvCSEmUANLQU6YoAyWB/xeYLVvrvM2reCsFZkGJR2aBK7oSzvgD0 vlkSExqtSi5b1jKsyxNQK3t44y+tLWH1xXsc1Yme3syRnXMoP0v7oOp8HkgE1CgWvpgP v2ALpt50WuYlYSbpcD9eXdaI32alI929pQXGb7T20akTYSx/5hfld72wMDrsmUhyHxBY JhcTaoOTfUnEcW8imfIb2fUcabE8Kk7TFqg3z2x/rvoB+k80FKRXVFH3A8UNib+BqrIA XbkfwgRh+WSu1V4hPtCRTh2Ay6BYyc4GECjn8ksy3RplYQKfDR5vFoAfqJDY+ZYT5W4i Ituw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=fETe9Py0; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-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 wp10si10691361ejb.56.2020.06.23.06.49.06; Tue, 23 Jun 2020 06:49:06 -0700 (PDT) Received-SPF: pass (google.com: domain of netdev-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=fETe9Py0; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-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 S1732772AbgFWNtA (ORCPT + 9 others); Tue, 23 Jun 2020 09:49:00 -0400 Received: from lelv0142.ext.ti.com ([198.47.23.249]:55232 "EHLO lelv0142.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732762AbgFWNs5 (ORCPT ); Tue, 23 Jun 2020 09:48:57 -0400 Received: from fllv0034.itg.ti.com ([10.64.40.246]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id 05NDmquK110153; Tue, 23 Jun 2020 08:48:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1592920132; bh=Qs655vx2aySdbX1vG29sRtFyWV9hqkfoFvwyhBhceUY=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=fETe9Py0HO2O0dL2yEifRiU7hEt7IvfUuhP3LGSBvIlidC0hrGZDHE6BUIzwdg2Lu 1h+KGtFnGUiQ7g/AuR0KsITrssX+6nIftLNTnAWwSOyNnhmLXEgwVNJiSzIh1OtdvH 6Dm5dsXAjicBIKBgG8pIE7BDl3bfUvTTGIZzKJjc= Received: from DFLE114.ent.ti.com (dfle114.ent.ti.com [10.64.6.35]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 05NDmqRb003929 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 23 Jun 2020 08:48:52 -0500 Received: from DFLE100.ent.ti.com (10.64.6.21) by DFLE114.ent.ti.com (10.64.6.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1979.3; Tue, 23 Jun 2020 08:48:52 -0500 Received: from fllv0040.itg.ti.com (10.64.41.20) by DFLE100.ent.ti.com (10.64.6.21) 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; Tue, 23 Jun 2020 08:48:52 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0040.itg.ti.com (8.15.2/8.15.2) with ESMTP id 05NDmqOg093622; Tue, 23 Jun 2020 08:48:52 -0500 From: Dan Murphy To: , , , , CC: , , , Dan Murphy Subject: [PATCH net-next v10 2/5] net: phy: Add a helper to return the index for of the internal delay Date: Tue, 23 Jun 2020 08:48:33 -0500 Message-ID: <20200623134836.21981-3-dmurphy@ti.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200623134836.21981-1-dmurphy@ti.com> References: <20200623134836.21981-1-dmurphy@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@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 | 100 +++++++++++++++++++++++++++++++++++ include/linux/phy.h | 4 ++ 2 files changed, 104 insertions(+) -- 2.26.2 diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 29ef4456ac25..96f242eed058 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,105 @@ 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 inline 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);