From patchwork Wed Apr 3 18:19:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1076267 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; 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.b="hJHNRIPh"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44ZDs55Hb1z9sPj for ; Thu, 4 Apr 2019 05:20:25 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726399AbfDCSUY (ORCPT ); Wed, 3 Apr 2019 14:20:24 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:32937 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726144AbfDCSUY (ORCPT ); Wed, 3 Apr 2019 14:20:24 -0400 Received: by mail-wr1-f66.google.com with SMTP id q1so150615wrp.0 for ; Wed, 03 Apr 2019 11:20:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=sr9JXSf7XDXXzrU+wHbny90v8l0mKGrQThygmDqPq40=; b=hJHNRIPhC2yq9UqjcydAm6ijY9AdRRZl5rGFlCKGq+ks0b0pQLLlqIBgTcXTPqbD7G K8u8+WbdYIo/SrELL/eXqq7g1GIhd0zmOnye8Fq2w1+uv+K3I1Su+z/ned7tS65ppzOF KkTTtbUqTj57emeC4T3tJTtjJ8bViCZp5mldxdC+0C2QNuCBzgzVE7KseG9i/7jXFKDW K7vPEn9abZELBDkDP4ldTpZr093ZXZ0zFZ1V4HEMP+v8tz6B8q6FLjvb+hOBNMD2F3ov LhDCBFOolVTTIQWiT4zDTAAYcbHro1RsUA2+vBfNxMxp8EiOpOzLUyLAhM+fUfVbfXgN QpkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=sr9JXSf7XDXXzrU+wHbny90v8l0mKGrQThygmDqPq40=; b=d2VdqDXJmRuzNR86XscZfVPmE8D3bPYFc2SvkpiGvrp8mCmQOIw9l68FDp9BpzKDTF NZrPRC2ApdStay6wv17RGA/EVwI1H+eBks8V6I0B9SbBw43IImIPONq0Hwxze3RIhFL/ vV+ZoRdaFYg7F1LXDfaYMt05RzT8J7i1mnLV8h7tfSDZPUqV3v42RNNdO3nsA2lXmdGG TtU7NowxuJl3n7bEd+2p0YxTVWT4onqlRqITjueVshhpisV2VFxh6xJmW8VBWB5wwe/h +YUdCVUv3QSZn1z1JAf/NQUghD1dqzlZ/BbycelIVrNKo/3F76zjkrNRh0fWVc7TReWT M4Aw== X-Gm-Message-State: APjAAAVBTaYKTVui0Kvy6OOtXhOjDz6Dy16jjZaz6orW9F1xW3tQVZ2l u/cu7sovWKTYFjZlDmwP/zwGTYyw X-Google-Smtp-Source: APXvYqzSqmPZVUYfqXKYF9K6bOEjQ1IB7eecGEYdwLFObRsQigE9ohI6aGSN/c0UVgFXcBMWRmd43Q== X-Received: by 2002:adf:f48d:: with SMTP id l13mr735302wro.2.1554315622130; Wed, 03 Apr 2019 11:20:22 -0700 (PDT) Received: from ?IPv6:2003:ea:8be1:dd00:ed2b:516:5ae8:487f? (p200300EA8BE1DD00ED2B05165AE8487F.dip0.t-ipconnect.de. [2003:ea:8be1:dd00:ed2b:516:5ae8:487f]) by smtp.googlemail.com with ESMTPSA id w18sm24850743wru.24.2019.04.03.11.20.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Apr 2019 11:20:21 -0700 (PDT) Subject: [PATCH net-next 1/2] net: phy: allow a PHY driver to define neither features nor get_features From: Heiner Kallweit To: Andrew Lunn , Florian Fainelli , David Miller Cc: "netdev@vger.kernel.org" References: Message-ID: Date: Wed, 3 Apr 2019 20:19:09 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Meanwhile we have generic functions for reading the abilities of Clause 22 / 45 PHY's. This allows to use them as fallback in case callback get_features isn't set. Benefit is the reduction of boilerplate code in PHY drivers. Signed-off-by: Heiner Kallweit --- drivers/net/phy/phy_device.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 72fc714c9..3a3166a7d 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -2143,12 +2143,17 @@ static int phy_probe(struct device *dev) */ if (phydrv->features) { linkmode_copy(phydev->supported, phydrv->features); - } else { + } else if (phydrv->get_features) { err = phydrv->get_features(phydev); - if (err) - goto out; + } else if (phydev->is_c45) { + err = genphy_c45_pma_read_abilities(phydev); + } else { + err = genphy_read_abilities(phydev); } + if (err) + goto out; + of_set_phy_supported(phydev); linkmode_copy(phydev->advertising, phydev->supported); @@ -2218,9 +2223,9 @@ int phy_driver_register(struct phy_driver *new_driver, struct module *owner) /* Either the features are hard coded, or dynamically * determine. It cannot be both or neither */ - if (WARN_ON((!new_driver->features && !new_driver->get_features) || - (new_driver->features && new_driver->get_features))) { - pr_err("%s: Driver features are missing\n", new_driver->name); + if (WARN_ON(new_driver->features && new_driver->get_features)) { + pr_err("%s: features and get_features must not both be set\n", + new_driver->name); return -EINVAL; } From patchwork Wed Apr 3 18:20:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1076268 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; 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.b="f/iya4Ka"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44ZDs773z6z9sPj for ; Thu, 4 Apr 2019 05:20:27 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726656AbfDCSU1 (ORCPT ); Wed, 3 Apr 2019 14:20:27 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:40353 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726144AbfDCSUZ (ORCPT ); Wed, 3 Apr 2019 14:20:25 -0400 Received: by mail-wm1-f65.google.com with SMTP id z24so9602982wmi.5 for ; Wed, 03 Apr 2019 11:20:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=YITLNzD5A5EnXYq0eDKp9zEFOWrm+fv0cezUHCBxMb0=; b=f/iya4KaQeLWbNMO2bjadS30hE926tP6JpkV9WmAfKv+qEnGb5XWSr1aJYVAlDcRPG MUVs/u2f0FICYlNL4a2HRGxwsDfmr5BBQs+nO8JWfTIcwo5V3Gbr8fNDDGa7sY9QviCh jwp+y55yEXre7j513qLzpIUJZoVytpjXI4WQUEO4K2TL0Rsjr+JeDnCHzByPAAewrv5+ 137a1KTKsqBZ6pKLgzCC2difbuyK+rAmK1yAN4Eiz3zlVqLFiW7NvK2ZGo46yCFcmLBz xLHANAeeqVC0dtYTNbJ203acxCR0ayF0LMh6B3RM/7TrrCF1OGkB6woRCiDFFUEr8ZGc rcyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=YITLNzD5A5EnXYq0eDKp9zEFOWrm+fv0cezUHCBxMb0=; b=Ea4dVkjTSWWTGKSKEl8+BpyoyXqSxa/PZaEmyg4uWjAttQMwqlkQ1Xh6vbsyhKeCrk nabTwj3JLp9yt+s0d4OswjZXRk9BliscEVIH5kOvG9+NsP41bTAluLP9T64fjb2IhvQe UmZZh9f3h3Bwp8rpMjZy29lzhD0FhcHLwZY1qbYkUe+3x51mmoTGnM/HzY39v3mp5g6a 4gbYlq2EsXtHt7yzru5eSFOkX0A/q+B9nLNavZMwLWd6RDuVX/CFf2N9figcknY2U/ck gvWM6mn+Hixl97eqv9w/SMlBiDervMtCHTjszZrJqUsR1MB86xevpPQTQCzwZc3/q/X5 jLhA== X-Gm-Message-State: APjAAAUmYN2NSJQg6NV47+kxZoRHSymVwZZpuQ63bfUcc2lbJmAMDo25 RV5b7FIYMrtwF+T1eR5X+foMVOaW X-Google-Smtp-Source: APXvYqxFGTlr8KBH/zJ/fGqZ+kydkJEg/TNJuARToJ+9nLcYnBzOKFip6P6ef75s9YmEPlvvsnC9OA== X-Received: by 2002:a1c:5588:: with SMTP id j130mr1018879wmb.72.1554315623770; Wed, 03 Apr 2019 11:20:23 -0700 (PDT) Received: from ?IPv6:2003:ea:8be1:dd00:ed2b:516:5ae8:487f? (p200300EA8BE1DD00ED2B05165AE8487F.dip0.t-ipconnect.de. [2003:ea:8be1:dd00:ed2b:516:5ae8:487f]) by smtp.googlemail.com with ESMTPSA id q19sm12640748wmq.23.2019.04.03.11.20.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Apr 2019 11:20:23 -0700 (PDT) Subject: [PATCH net-next 2/2] net: phy: realtek: remove setting callback get_features and use phylib fallback From: Heiner Kallweit To: Andrew Lunn , Florian Fainelli , David Miller Cc: "netdev@vger.kernel.org" References: Message-ID: <9881fca7-1531-ed66-e3d0-be0a9372f829@gmail.com> Date: Wed, 3 Apr 2019 20:20:09 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Now that phylib uses genphy_read_abilities() as fallback, we don't have to set callback get_features any longer. Signed-off-by: Heiner Kallweit --- drivers/net/phy/realtek.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c index 5ecbd41ed..d6a10f323 100644 --- a/drivers/net/phy/realtek.c +++ b/drivers/net/phy/realtek.c @@ -199,11 +199,9 @@ static struct phy_driver realtek_drvs[] = { { PHY_ID_MATCH_EXACT(0x00008201), .name = "RTL8201CP Ethernet", - .get_features = genphy_read_abilities, }, { PHY_ID_MATCH_EXACT(0x001cc816), .name = "RTL8201F Fast Ethernet", - .get_features = genphy_read_abilities, .ack_interrupt = &rtl8201_ack_interrupt, .config_intr = &rtl8201_config_intr, .suspend = genphy_suspend, @@ -213,14 +211,12 @@ static struct phy_driver realtek_drvs[] = { }, { PHY_ID_MATCH_EXACT(0x001cc910), .name = "RTL8211 Gigabit Ethernet", - .get_features = genphy_read_abilities, .config_aneg = rtl8211_config_aneg, .read_mmd = &genphy_read_mmd_unsupported, .write_mmd = &genphy_write_mmd_unsupported, }, { PHY_ID_MATCH_EXACT(0x001cc912), .name = "RTL8211B Gigabit Ethernet", - .get_features = genphy_read_abilities, .ack_interrupt = &rtl821x_ack_interrupt, .config_intr = &rtl8211b_config_intr, .read_mmd = &genphy_read_mmd_unsupported, @@ -230,14 +226,12 @@ static struct phy_driver realtek_drvs[] = { }, { PHY_ID_MATCH_EXACT(0x001cc913), .name = "RTL8211C Gigabit Ethernet", - .get_features = genphy_read_abilities, .config_init = rtl8211c_config_init, .read_mmd = &genphy_read_mmd_unsupported, .write_mmd = &genphy_write_mmd_unsupported, }, { PHY_ID_MATCH_EXACT(0x001cc914), .name = "RTL8211DN Gigabit Ethernet", - .get_features = genphy_read_abilities, .ack_interrupt = rtl821x_ack_interrupt, .config_intr = rtl8211e_config_intr, .suspend = genphy_suspend, @@ -245,7 +239,6 @@ static struct phy_driver realtek_drvs[] = { }, { PHY_ID_MATCH_EXACT(0x001cc915), .name = "RTL8211E Gigabit Ethernet", - .get_features = genphy_read_abilities, .ack_interrupt = &rtl821x_ack_interrupt, .config_intr = &rtl8211e_config_intr, .suspend = genphy_suspend, @@ -253,7 +246,6 @@ static struct phy_driver realtek_drvs[] = { }, { PHY_ID_MATCH_EXACT(0x001cc916), .name = "RTL8211F Gigabit Ethernet", - .get_features = genphy_read_abilities, .config_init = &rtl8211f_config_init, .ack_interrupt = &rtl8211f_ack_interrupt, .config_intr = &rtl8211f_config_intr, @@ -264,7 +256,6 @@ static struct phy_driver realtek_drvs[] = { }, { PHY_ID_MATCH_EXACT(0x001cc800), .name = "Generic Realtek PHY", - .get_features = genphy_read_abilities, .suspend = genphy_suspend, .resume = genphy_resume, .read_page = rtl821x_read_page, @@ -272,7 +263,6 @@ static struct phy_driver realtek_drvs[] = { }, { PHY_ID_MATCH_EXACT(0x001cc961), .name = "RTL8366RB Gigabit Ethernet", - .get_features = genphy_read_abilities, .config_init = &rtl8366rb_config_init, /* These interrupts are handled by the irq controller * embedded inside the RTL8366RB, they get unmasked when the