From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EF7F0C43334 for ; Sun, 24 Jul 2022 22:51:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232077AbiGXWvL (ORCPT ); Sun, 24 Jul 2022 18:51:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38294 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232007AbiGXWvI (ORCPT ); Sun, 24 Jul 2022 18:51:08 -0400 Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6E575767F; Sun, 24 Jul 2022 15:51:07 -0700 (PDT) Received: by mail-ed1-x529.google.com with SMTP id i13so2777678edj.11; Sun, 24 Jul 2022 15:51:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=C8kzD0JzPswLobJ7sKwgOf7aZPC0Em801txgcu10yYs=; b=j6hxMyEguk8lCxqm5TnSdv6on50wx/SwTYPR9zaD9CmNSGptx3nAmQBoq8rV0BnYUL 1kIneM4NcwnJN+UuGg9kTWg15ZF/7QyaivisATL7avjDTUrlmbdb6dIW1fFN794kMju0 rWR7byN+W8NLUAtmB8WKxVoaojEsb+dKGRNVPtQRByBRKPlWrskkpyXIo3e/v5RusIHg GXHpLt66ciOQcBxUYQm+cwxkn7hKOA49kVbsrxdq55BO96puZbCajwQ3qZJGs68fFxrV Pk0ScgJZk3nLpE2EomYZFM7dSP9li0/2cZ0VJnDuSxQixA3O33Q12aT7QLF2wvQkIh3y c0lQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=C8kzD0JzPswLobJ7sKwgOf7aZPC0Em801txgcu10yYs=; b=m6ygo7R6vkfOK4gsIzjAAMsEc/2hhtxYFyMqHwsYATpoWMTPPKqmVDJLpmg9BikKee 29Tud666lq3FlbvWswYwzryxPR9OJipuiLXZ1GB0G7/9qcC0jCOHv+8J3rvwx/ovHA+1 8REQf7vPwkf0pTunibP/M5wpDp9ufkzb+s8zqNvPwkOOfLnhnRslNp36rqw732KUme3H 4Wle6YrFpA6w5j+9c8VNNzWt096rS3fQE1LyqlXjZB2/idb2PkAqjWSySr2ZeaUb4qAa zzWmFG3y5knMPEoMTg4Dgr9swFXNbYcdtQAcnqX5CyqdOsymmMkShOovex770smjmgmi xkEg== X-Gm-Message-State: AJIora+jOkukJ61vlU78NNd3W3Z7e2bPGOIfs448egey4aeRx9WMaQBq f/VQyNqDerWYnHrlsEpIzQc= X-Google-Smtp-Source: AGRyM1uRidoYDazYyOWLEyGogK/4NxDyygXyv9kkTbunMPLnwgtAhQM9ZEc0oO1mfOr8Z/T4P2tC5w== X-Received: by 2002:a05:6402:1102:b0:43a:9cf7:68a3 with SMTP id u2-20020a056402110200b0043a9cf768a3mr10598919edv.68.1658703065747; Sun, 24 Jul 2022 15:51:05 -0700 (PDT) Received: from localhost.localdomain (93-42-69-122.ip85.fastwebnet.it. [93.42.69.122]) by smtp.googlemail.com with ESMTPSA id nc19-20020a1709071c1300b00722d5b26ecesm4645238ejc.205.2022.07.24.15.51.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Jul 2022 15:51:05 -0700 (PDT) From: Christian Marangi To: Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Nathan Chancellor , Nick Desaulniers , Tom Rix , Jens Axboe , Greg Kroah-Hartman , Christian Marangi , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, llvm@lists.linux.dev Subject: [net-next PATCH v4 01/14] net: dsa: qca8k: cache match data to speed up access Date: Sun, 24 Jul 2022 22:19:25 +0200 Message-Id: <20220724201938.17387-2-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220724201938.17387-1-ansuelsmth@gmail.com> References: <20220724201938.17387-1-ansuelsmth@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Using of_device_get_match_data is expensive. Cache match data to speed up access and rework user of match data to use the new cached value. Signed-off-by: Christian Marangi --- drivers/net/dsa/qca/qca8k.c | 28 ++++++++++------------------ drivers/net/dsa/qca/qca8k.h | 1 + 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/drivers/net/dsa/qca/qca8k.c b/drivers/net/dsa/qca/qca8k.c index 1cbb05b0323f..212b284f9f73 100644 --- a/drivers/net/dsa/qca/qca8k.c +++ b/drivers/net/dsa/qca/qca8k.c @@ -1462,8 +1462,8 @@ static int qca8k_find_cpu_port(struct dsa_switch *ds) static int qca8k_setup_of_pws_reg(struct qca8k_priv *priv) { + const struct qca8k_match_data *data = priv->info; struct device_node *node = priv->dev->of_node; - const struct qca8k_match_data *data; u32 val = 0; int ret; @@ -1472,8 +1472,6 @@ qca8k_setup_of_pws_reg(struct qca8k_priv *priv) * Should be applied by default but we set this just to make sure. */ if (priv->switch_id == QCA8K_ID_QCA8327) { - data = of_device_get_match_data(priv->dev); - /* Set the correct package of 148 pin for QCA8327 */ if (data->reduced_package) val |= QCA8327_PWS_PACKAGE148_EN; @@ -1996,23 +1994,19 @@ static void qca8k_setup_pcs(struct qca8k_priv *priv, struct qca8k_pcs *qpcs, static void qca8k_get_strings(struct dsa_switch *ds, int port, u32 stringset, uint8_t *data) { - const struct qca8k_match_data *match_data; struct qca8k_priv *priv = ds->priv; int i; if (stringset != ETH_SS_STATS) return; - match_data = of_device_get_match_data(priv->dev); - - for (i = 0; i < match_data->mib_count; i++) + for (i = 0; i < priv->info->mib_count; i++) strncpy(data + i * ETH_GSTRING_LEN, ar8327_mib[i].name, ETH_GSTRING_LEN); } static void qca8k_mib_autocast_handler(struct dsa_switch *ds, struct sk_buff *skb) { - const struct qca8k_match_data *match_data; struct qca8k_mib_eth_data *mib_eth_data; struct qca8k_priv *priv = ds->priv; const struct qca8k_mib_desc *mib; @@ -2031,10 +2025,9 @@ static void qca8k_mib_autocast_handler(struct dsa_switch *ds, struct sk_buff *sk if (port != mib_eth_data->req_port) goto exit; - match_data = device_get_match_data(priv->dev); data = mib_eth_data->data; - for (i = 0; i < match_data->mib_count; i++) { + for (i = 0; i < priv->info->mib_count; i++) { mib = &ar8327_mib[i]; /* First 3 mib are present in the skb head */ @@ -2106,7 +2099,6 @@ qca8k_get_ethtool_stats(struct dsa_switch *ds, int port, uint64_t *data) { struct qca8k_priv *priv = (struct qca8k_priv *)ds->priv; - const struct qca8k_match_data *match_data; const struct qca8k_mib_desc *mib; u32 reg, i, val; u32 hi = 0; @@ -2116,9 +2108,7 @@ qca8k_get_ethtool_stats(struct dsa_switch *ds, int port, qca8k_get_ethtool_stats_eth(ds, port, data) > 0) return; - match_data = of_device_get_match_data(priv->dev); - - for (i = 0; i < match_data->mib_count; i++) { + for (i = 0; i < priv->info->mib_count; i++) { mib = &ar8327_mib[i]; reg = QCA8K_PORT_MIB_COUNTER(port) + mib->offset; @@ -2141,15 +2131,12 @@ qca8k_get_ethtool_stats(struct dsa_switch *ds, int port, static int qca8k_get_sset_count(struct dsa_switch *ds, int port, int sset) { - const struct qca8k_match_data *match_data; struct qca8k_priv *priv = ds->priv; if (sset != ETH_SS_STATS) return 0; - match_data = of_device_get_match_data(priv->dev); - - return match_data->mib_count; + return priv->info->mib_count; } static int @@ -3168,6 +3155,11 @@ qca8k_sw_probe(struct mdio_device *mdiodev) if (ret) return ret; + /* Cache match data in priv struct. + * Match data is already checked in read_switch_id. + */ + priv->info = of_device_get_match_data(priv->dev); + priv->ds = devm_kzalloc(&mdiodev->dev, sizeof(*priv->ds), GFP_KERNEL); if (!priv->ds) return -ENOMEM; diff --git a/drivers/net/dsa/qca/qca8k.h b/drivers/net/dsa/qca/qca8k.h index ec58d0e80a70..0b990b46890a 100644 --- a/drivers/net/dsa/qca/qca8k.h +++ b/drivers/net/dsa/qca/qca8k.h @@ -401,6 +401,7 @@ struct qca8k_priv { struct qca8k_mdio_cache mdio_cache; struct qca8k_pcs pcs_port_0; struct qca8k_pcs pcs_port_6; + const struct qca8k_match_data *info; }; struct qca8k_mib_desc { -- 2.36.1