[openwrt/staging/jow.git] /

From 3bb0844e7bcd0fb0bcfab6202b5edd349ef5250a Mon Sep 17 00:00:00 2001
From: Christian Marangi <ansuelsmth@gmail.com>
Date: Wed, 27 Jul 2022 13:35:10 +0200
Subject: [PATCH 01/14] net: dsa: qca8k: cache match data to speed up access

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 <ansuelsmth@gmail.com>
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
 drivers/net/dsa/qca/qca8k.c | 35 +++++++++++------------------------
 drivers/net/dsa/qca/qca8k.h |  1 +
 2 files changed, 12 insertions(+), 24 deletions(-)

--- 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 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
         * 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;
@@ -2146,23 +2144,19 @@ qca8k_phylink_mac_link_up(struct dsa_swi
 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;
@@ -2181,10 +2175,9 @@ static void qca8k_mib_autocast_handler(s
        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 */
@@ -2256,7 +2249,6 @@ qca8k_get_ethtool_stats(struct dsa_switc
                        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;
@@ -2266,9 +2258,7 @@ qca8k_get_ethtool_stats(struct dsa_switc
            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;
 
@@ -2291,15 +2281,12 @@ qca8k_get_ethtool_stats(struct dsa_switc
 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
@@ -3037,14 +3024,11 @@ static const struct dsa_switch_ops qca8k
 
 static int qca8k_read_switch_id(struct qca8k_priv *priv)
 {
-       const struct qca8k_match_data *data;
        u32 val;
        u8 id;
        int ret;
 
-       /* get the switches ID from the compatible */
-       data = of_device_get_match_data(priv->dev);
-       if (!data)
+       if (!priv->info)
                return -ENODEV;
 
        ret = qca8k_read(priv, QCA8K_REG_MASK_CTRL, &val);
@@ -3052,8 +3036,10 @@ static int qca8k_read_switch_id(struct q
                return -ENODEV;
 
        id = QCA8K_MASK_CTRL_DEVICE_ID(val);
-       if (id != data->id) {
-               dev_err(priv->dev, "Switch id detected %x but expected %x", id, data->id);
+       if (id != priv->info->id) {
+               dev_err(priv->dev,
+                       "Switch id detected %x but expected %x",
+                       id, priv->info->id);
                return -ENODEV;
        }
 
@@ -3078,6 +3064,7 @@ qca8k_sw_probe(struct mdio_device *mdiod
        if (!priv)
                return -ENOMEM;
 
+       priv->info = of_device_get_match_data(priv->dev);
        priv->bus = mdiodev->bus;
        priv->dev = &mdiodev->dev;
 
--- a/drivers/net/dsa/qca/qca8k.h
+++ b/drivers/net/dsa/qca/qca8k.h
@@ -393,6 +393,7 @@ struct qca8k_priv {
        struct qca8k_mgmt_eth_data mgmt_eth_data;
        struct qca8k_mib_eth_data mib_eth_data;
        struct qca8k_mdio_cache mdio_cache;
+       const struct qca8k_match_data *info;
 };
 
 struct qca8k_mib_desc {