From nobody Mon Apr 13 11:50:37 2026 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 863F9C43217 for ; Sat, 19 Nov 2022 23:14:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235316AbiKSXOo (ORCPT ); Sat, 19 Nov 2022 18:14:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37608 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234179AbiKSXOc (ORCPT ); Sat, 19 Nov 2022 18:14:32 -0500 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2100.outbound.protection.outlook.com [40.107.236.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A12E013F57; Sat, 19 Nov 2022 15:14:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LHhFjryaWuFbtaI633Y9FfkNQk4VHyFaZ6T1l+J2qzu4fICKAloOJes96PEA+WbXrG9Ie8h34z36Zircq/IHpj2sHzRbBLnkKA5SN4/IDiEwZVytXnb+tewWF4U+GT+NaOjrc0Sbve33NF/sHazKOA1HhVJ4FAr2rDjQnK0hJIt1+aSTxr4QgR0rb2ltcbJe7nDYREZp7zCBeGS/7fez+FphmFSX3Ed+a2QERgKOdpZ6BaS+COA7zJjDB19iO9BI2v4sI7vlyfsT5e0+gArSC6cK3FVVV8uwxNqud9eK5yTJugNVj3hvm+IAQ/DyNbSw5h6PA/tfOcXWPC26C3GIYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Y6IUfgqfMZdZybJigsJOyOYaWpjYlH91x7LB5DcjVaU=; b=IrEnT/4sPDDR4lXhUbmpHfIIOVqGRK97Sr/0NETI5CpwO5OIBTvwG/k+Y6GJu8YUSbDW6jtYEzE+iLanUil046qRqw/H8MXmynD9m3mLgj3IjY1eEcnLw6OXiDHSiHwkijEDRQRJ9nbcRbtGSXAyw1dmWXEsvf2lBjx08I4Q0XkRqGTSHc1YsQ/M2mk+ukdPnYnsvUt1CyO7iCM+jZeaWgUs2g2o5nEzO7AbYg9FbTCWwaEc6CR87kVSfzI8GE5OQEYG+4ja/5QQQK/VkFgWeHcONLUXUTZaxW307bBRBfpz/WmR0epvU8CiQfa2XYt1i++zKLmTZf+7YK92npAIHA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=in-advantage.com; dmarc=pass action=none header.from=in-advantage.com; dkim=pass header.d=in-advantage.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inadvantage.onmicrosoft.com; s=selector2-inadvantage-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Y6IUfgqfMZdZybJigsJOyOYaWpjYlH91x7LB5DcjVaU=; b=jKN19MFde+NB5l92W94d5VOhPpHaHZgBCBG8xthEl0pHP7l7EEL2qmqwZyT4ANDB/h+6jDDwT6a+ZeT9NcMB87NTA7bhB3BE3gtjyXe2dcc6GuUmjymy7lVqE2p6tiADiC/Kud60ZTKdqt2OILFPhsoaTix6hpCZoXXd0GmZLPc= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=in-advantage.com; Received: from MWHPR1001MB2351.namprd10.prod.outlook.com (2603:10b6:301:35::37) by CH2PR10MB4293.namprd10.prod.outlook.com (2603:10b6:610:7f::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5834.11; Sat, 19 Nov 2022 23:14:23 +0000 Received: from MWHPR1001MB2351.namprd10.prod.outlook.com ([fe80::45b5:a860:9cea:a74c]) by MWHPR1001MB2351.namprd10.prod.outlook.com ([fe80::45b5:a860:9cea:a74c%4]) with mapi id 15.20.5834.009; Sat, 19 Nov 2022 23:14:23 +0000 From: Colin Foster To: linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: Paolo Abeni , Eric Dumazet , "David S. Miller" , Florian Fainelli , Andrew Lunn , UNGLinuxDriver@microchip.com, Alexandre Belloni , Claudiu Manoil , Vladimir Oltean , Vladimir Oltean Subject: [PATCH v2 net-next 1/3] net: mscc: ocelot: remove redundant stats_layout pointers Date: Sat, 19 Nov 2022 15:14:04 -0800 Message-Id: <20221119231406.3167852-2-colin.foster@in-advantage.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221119231406.3167852-1-colin.foster@in-advantage.com> References: <20221119231406.3167852-1-colin.foster@in-advantage.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SJ0PR13CA0027.namprd13.prod.outlook.com (2603:10b6:a03:2c0::32) To MWHPR1001MB2351.namprd10.prod.outlook.com (2603:10b6:301:35::37) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWHPR1001MB2351:EE_|CH2PR10MB4293:EE_ X-MS-Office365-Filtering-Correlation-Id: 2a178bb6-0063-4fc4-77c6-08daca83cbd8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3PoPPRbEuNVPwyT8uVCJSWDisAqKaql3gU4+wYD17R/YweK15FW1cOSNZhQDDyhUy6FRElJGphEjf+DV1uZwjD/IdivqJTV52RUsvZJNdEWYCBCWrnPSi3uSYpbMfiJFUqdbpOToMvv4Kjfz/998cp9Ii5sTTiXrSHjy8jtEcbveqmbcDGTjI7ppjgLIRIBQXjtunKFr6AxV31OC2qWnc/l/u9ZlMqTJWLxSuB9dYA4KxyZUS2lnV33q6MqjaS8MoW/mAq1G/E9dETXpG4Ge7k6G0oiQmC20JIziItzunSF7jJcn1KsmFXFl7CQgBszwHJfTrIYXeElWWbMpN2MErEqe50UgICFyjYd6NunHwc2sO/l5tS+2J2wOJRbyq5R/gU+EsJw4zONgOBQ0VE5z4pT0QO7F9M9WY8FNkVaqY+5xG4WkTJtSoC1NMb0JHVRluXNNQ9YpmqdKmDGqB61c16esS8HXiiZT5ldcgKYjVoybLLkdnKBUPTSyEFGrk2Vjy4xyYwExY5cLiGrfz+Q4CLeaD5D3fwCp3+AlBn3NKmveW0w/QQfei9L3ALj/fy/AoJmJ12RC57rc0sQDkGtrm3WXE3cQnjqmojb/GOW3vivgQiptAunbdOW19j5sFPgZdqLPxmxNW7LE71/4ShbENnAJ3vViplN7Vow1gYBeEju0Pwh7iROQBFQvkUt4lMKHdlYjRFX3Qa8JoRljXPXyEA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR1001MB2351.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(366004)(396003)(136003)(376002)(39830400003)(346002)(451199015)(2906002)(26005)(86362001)(83380400001)(6512007)(4326008)(8676002)(66476007)(66556008)(66946007)(38350700002)(38100700002)(36756003)(41300700001)(44832011)(54906003)(8936002)(5660300002)(316002)(186003)(7416002)(52116002)(478600001)(1076003)(6666004)(6486002)(2616005)(6506007);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?REIzYUqIXbPDA6tOtnEx30zrJnYooTqn/LOrUQF1vc+ZeMQIA1z3LpVMw1jt?= =?us-ascii?Q?KIzEy9Jt0sSrjAUVdY77xmm/sykgc4+tF8hcfOaDbz10YbjgC3AWhmdpPugt?= =?us-ascii?Q?PZMATGtRkplJFKJLG/dw0eOx12ysUQRFbBMUsMHe5O8CImfYvQCpaQPesU0B?= =?us-ascii?Q?zBXz8QUXwGIYob7FZyoyDSLLkwfoymmZT1xHl+k6Jhd16rCMKNII1ql3QPNv?= =?us-ascii?Q?VsG2x25PvVfRpjD1TK5nHgM8QmKhCa4XuGKtMKu9DiAAFaLLO9sPMNqT/MXT?= =?us-ascii?Q?E11mqFXL+DajogPTbHzUgEzGWtMBNbxHAv4CiKlAAIsBN8WhZh/26Jfsb0v0?= =?us-ascii?Q?hmKOP1i8ZxLd/WOzNyFddWu2IJy0E6z/BFkGeF0eifaXJRGMM3dIt/Q8Ey8y?= =?us-ascii?Q?rBqVEZ/qaWNRn1sWJUu4JzxerOVfBxrSNtJv7VLEIe1nb4YNCrOdLJdsHL1J?= =?us-ascii?Q?LgmcBea3vNJqBzfm5LaycrDpwP51cLee8ukx/RvOPPHtG51nxwrwOgtc77v7?= =?us-ascii?Q?2lDah6u/oFxfcnWT6yVF0Un5C13QYC30ALvlyQ4l9MC88MDl/IdZewZSMj/D?= =?us-ascii?Q?xug/eKdGrrWAHrDo9wLFZ+okMaH/cejSYO/1L96ZmJtruxjAbQUw9VWjQI7I?= =?us-ascii?Q?YQhkRkijqOQb46yDthIzLHNlfhFgZ6LUi1+krB5o/B3E2xTU09usuLdL+4Gs?= =?us-ascii?Q?uGf1ups1Fgc6Rs6CKiXmFTQRCwenDVw3Ky7YTbxxhmVJM3mU44WU5o7KXJpj?= =?us-ascii?Q?QyXqTY4dRD/qizozuO+nS4RTzsZE+qh1a8LqogDAnJP9c2ssju79afB8V0/6?= =?us-ascii?Q?jxmKGvYcKAjg0Wh8cNPgWsh90l5svT4xqSLLVLiD05sdn0dszuYhamMRBo2W?= =?us-ascii?Q?nUDrgz6cPeJrpDEvWxE1GpShUMXITfB2PzzYPaI+6QUmOfXsc8xdoxiNLcX8?= =?us-ascii?Q?D2EANTDIWwIBLr9qwcDsE83Snp9tDjLEc+JWsnplsN0JoJAzyNQND19BnDCy?= =?us-ascii?Q?eAWKSzJAdQL79wDTCmGI2NM2Z6BkolDdkLg6qM8sPBdN+c/5TWNQOznR45hY?= =?us-ascii?Q?EJbJOkZm09rW2vJgr8vzoH8HteCMkrjXOfUeAVn3v5s5IHkNHbam0W/JIHLq?= =?us-ascii?Q?rJc5syoB/zYhM+54IcC4znWAex0LmtiDU+Yjg0mG3G2NwFCfhgLPf5Wzlii+?= =?us-ascii?Q?tmz5PVUpGYXOpXCvcGqaFANkCmm+KMshH/QFqz6lxc+uJ5Xj1he8C0+1ONoj?= =?us-ascii?Q?M1gkIuG0FC5YpbfuPN+jBta4o2ErnNqg7jyKtbhJxHuhhbsE/Sw1phRubCwF?= =?us-ascii?Q?bgdbIKXX0S6r72XRfAlKfI4VbzvLYxj2ITw3ZE49kCo2NugDQLSrV/rwzq8Z?= =?us-ascii?Q?gJXyQGVv9cVg/pkFVnDVSguFMG6PhfNU1WZ3nzpnXfCmFCrku0HT4ofkdaC6?= =?us-ascii?Q?KCXHRryCsaWEEXzhoD9yUiQKxasfoBGbP/+atFOpHRK3prm/GfIFq2Nmh79f?= =?us-ascii?Q?zChr9KrJ23A6oFOt2XTUJa+9IW/H3stNS5+iAIZLV5kHfTbh5sapZIqwMolA?= =?us-ascii?Q?3vDoj7y+nwh9gZmR+e+jP+3+Fk8CuzHl7l11BZrMs2sWEMMiqo5aAmn4Mjz7?= =?us-ascii?Q?+g=3D=3D?= X-OriginatorOrg: in-advantage.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2a178bb6-0063-4fc4-77c6-08daca83cbd8 X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Nov 2022 23:14:23.7709 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 48e842ca-fbd8-4633-a79d-0c955a7d3aae X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: YpmoooVaAWp4Hws9RLLepNpOgE8Rw+goKnDSWR1MttEhefR0+IIYofLfIBz6MYHQZvnb0i56P4PYV+HWaaoHhXz2bvNKDyCE6L+wXbtUpt0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR10MB4293 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Ever since commit 4d1d157fb6a4 ("net: mscc: ocelot: share the common stat definitions between all drivers") the stats_layout entry in ocelot and felix drivers have become redundant. Remove the unnecessary code. Suggested-by: Vladimir Oltean Signed-off-by: Colin Foster Reviewed-by: Vladimir Oltean --- v1->v2 * Fix unused variable build warning in v1 --- drivers/net/dsa/ocelot/felix.c | 1 - drivers/net/dsa/ocelot/felix.h | 1 - drivers/net/dsa/ocelot/felix_vsc9959.c | 5 ----- drivers/net/dsa/ocelot/seville_vsc9953.c | 5 ----- drivers/net/ethernet/mscc/ocelot_stats.c | 20 ++++++++++++-------- drivers/net/ethernet/mscc/ocelot_vsc7514.c | 5 ----- include/soc/mscc/ocelot.h | 1 - 7 files changed, 12 insertions(+), 26 deletions(-) diff --git a/drivers/net/dsa/ocelot/felix.c b/drivers/net/dsa/ocelot/felix.c index 44e160f32067..3b738cb2ae6e 100644 --- a/drivers/net/dsa/ocelot/felix.c +++ b/drivers/net/dsa/ocelot/felix.c @@ -1363,7 +1363,6 @@ static int felix_init_structs(struct felix *felix, in= t num_phys_ports) return -ENOMEM; =20 ocelot->map =3D felix->info->map; - ocelot->stats_layout =3D felix->info->stats_layout; ocelot->num_mact_rows =3D felix->info->num_mact_rows; ocelot->vcap =3D felix->info->vcap; ocelot->vcap_pol.base =3D felix->info->vcap_pol_base; diff --git a/drivers/net/dsa/ocelot/felix.h b/drivers/net/dsa/ocelot/felix.h index 42338116eed0..be22d6ccd7c8 100644 --- a/drivers/net/dsa/ocelot/felix.h +++ b/drivers/net/dsa/ocelot/felix.h @@ -28,7 +28,6 @@ struct felix_info { const struct ocelot_ops *ops; const u32 *port_modes; int num_mact_rows; - const struct ocelot_stat_layout *stats_layout; int num_ports; int num_tx_queues; struct vcap_props *vcap; diff --git a/drivers/net/dsa/ocelot/felix_vsc9959.c b/drivers/net/dsa/ocelo= t/felix_vsc9959.c index b0ae8d6156f6..01ac70fd7ddf 100644 --- a/drivers/net/dsa/ocelot/felix_vsc9959.c +++ b/drivers/net/dsa/ocelot/felix_vsc9959.c @@ -565,10 +565,6 @@ static const struct reg_field vsc9959_regfields[REGFIE= LD_MAX] =3D { [SYS_PAUSE_CFG_PAUSE_ENA] =3D REG_FIELD_ID(SYS_PAUSE_CFG, 0, 1, 7, 4), }; =20 -static const struct ocelot_stat_layout vsc9959_stats_layout[OCELOT_NUM_STA= TS] =3D { - OCELOT_COMMON_STATS, -}; - static const struct vcap_field vsc9959_vcap_es0_keys[] =3D { [VCAP_ES0_EGR_PORT] =3D { 0, 3}, [VCAP_ES0_IGR_PORT] =3D { 3, 3}, @@ -2546,7 +2542,6 @@ static const struct felix_info felix_info_vsc9959 =3D= { .regfields =3D vsc9959_regfields, .map =3D vsc9959_regmap, .ops =3D &vsc9959_ops, - .stats_layout =3D vsc9959_stats_layout, .vcap =3D vsc9959_vcap_props, .vcap_pol_base =3D VSC9959_VCAP_POLICER_BASE, .vcap_pol_max =3D VSC9959_VCAP_POLICER_MAX, diff --git a/drivers/net/dsa/ocelot/seville_vsc9953.c b/drivers/net/dsa/oce= lot/seville_vsc9953.c index 6500c1697dd6..88ed3a2e487a 100644 --- a/drivers/net/dsa/ocelot/seville_vsc9953.c +++ b/drivers/net/dsa/ocelot/seville_vsc9953.c @@ -543,10 +543,6 @@ static const struct reg_field vsc9953_regfields[REGFIE= LD_MAX] =3D { [SYS_PAUSE_CFG_PAUSE_ENA] =3D REG_FIELD_ID(SYS_PAUSE_CFG, 0, 1, 11, 4), }; =20 -static const struct ocelot_stat_layout vsc9953_stats_layout[OCELOT_NUM_STA= TS] =3D { - OCELOT_COMMON_STATS, -}; - static const struct vcap_field vsc9953_vcap_es0_keys[] =3D { [VCAP_ES0_EGR_PORT] =3D { 0, 4}, [VCAP_ES0_IGR_PORT] =3D { 4, 4}, @@ -970,7 +966,6 @@ static const struct felix_info seville_info_vsc9953 =3D= { .regfields =3D vsc9953_regfields, .map =3D vsc9953_regmap, .ops =3D &vsc9953_ops, - .stats_layout =3D vsc9953_stats_layout, .vcap =3D vsc9953_vcap_props, .vcap_pol_base =3D VSC9953_VCAP_POLICER_BASE, .vcap_pol_max =3D VSC9953_VCAP_POLICER_MAX, diff --git a/drivers/net/ethernet/mscc/ocelot_stats.c b/drivers/net/etherne= t/mscc/ocelot_stats.c index dbd20b125cea..5dc132f61d6a 100644 --- a/drivers/net/ethernet/mscc/ocelot_stats.c +++ b/drivers/net/ethernet/mscc/ocelot_stats.c @@ -9,6 +9,10 @@ #include #include "ocelot.h" =20 +static const struct ocelot_stat_layout ocelot_stats_layout[OCELOT_NUM_STAT= S] =3D { + OCELOT_COMMON_STATS, +}; + /* Read the counters from hardware and keep them in region->buf. * Caller must hold &ocelot->stat_view_lock. */ @@ -93,10 +97,10 @@ void ocelot_get_strings(struct ocelot *ocelot, int port= , u32 sset, u8 *data) return; =20 for (i =3D 0; i < OCELOT_NUM_STATS; i++) { - if (ocelot->stats_layout[i].name[0] =3D=3D '\0') + if (ocelot_stats_layout[i].name[0] =3D=3D '\0') continue; =20 - memcpy(data + i * ETH_GSTRING_LEN, ocelot->stats_layout[i].name, + memcpy(data + i * ETH_GSTRING_LEN, ocelot_stats_layout[i].name, ETH_GSTRING_LEN); } } @@ -137,7 +141,7 @@ int ocelot_get_sset_count(struct ocelot *ocelot, int po= rt, int sset) return -EOPNOTSUPP; =20 for (i =3D 0; i < OCELOT_NUM_STATS; i++) - if (ocelot->stats_layout[i].name[0] !=3D '\0') + if (ocelot_stats_layout[i].name[0] !=3D '\0') num_stats++; =20 return num_stats; @@ -154,7 +158,7 @@ static void ocelot_port_ethtool_stats_cb(struct ocelot = *ocelot, int port, for (i =3D 0; i < OCELOT_NUM_STATS; i++) { int index =3D port * OCELOT_NUM_STATS + i; =20 - if (ocelot->stats_layout[i].name[0] =3D=3D '\0') + if (ocelot_stats_layout[i].name[0] =3D=3D '\0') continue; =20 *data++ =3D ocelot->stats[index]; @@ -389,10 +393,10 @@ static int ocelot_prepare_stats_regions(struct ocelot= *ocelot) INIT_LIST_HEAD(&ocelot->stats_regions); =20 for (i =3D 0; i < OCELOT_NUM_STATS; i++) { - if (!ocelot->stats_layout[i].reg) + if (!ocelot_stats_layout[i].reg) continue; =20 - if (region && ocelot->stats_layout[i].reg =3D=3D last + 4) { + if (region && ocelot_stats_layout[i].reg =3D=3D last + 4) { region->count++; } else { region =3D devm_kzalloc(ocelot->dev, sizeof(*region), @@ -400,12 +404,12 @@ static int ocelot_prepare_stats_regions(struct ocelot= *ocelot) if (!region) return -ENOMEM; =20 - region->base =3D ocelot->stats_layout[i].reg; + region->base =3D ocelot_stats_layout[i].reg; region->count =3D 1; list_add_tail(®ion->node, &ocelot->stats_regions); } =20 - last =3D ocelot->stats_layout[i].reg; + last =3D ocelot_stats_layout[i].reg; } =20 list_for_each_entry(region, &ocelot->stats_regions, node) { diff --git a/drivers/net/ethernet/mscc/ocelot_vsc7514.c b/drivers/net/ether= net/mscc/ocelot_vsc7514.c index 93431d2ff4f1..b097fd4a4061 100644 --- a/drivers/net/ethernet/mscc/ocelot_vsc7514.c +++ b/drivers/net/ethernet/mscc/ocelot_vsc7514.c @@ -100,10 +100,6 @@ static const struct reg_field ocelot_regfields[REGFIEL= D_MAX] =3D { [SYS_PAUSE_CFG_PAUSE_ENA] =3D REG_FIELD_ID(SYS_PAUSE_CFG, 0, 1, 12, 4), }; =20 -static const struct ocelot_stat_layout ocelot_stats_layout[OCELOT_NUM_STAT= S] =3D { - OCELOT_COMMON_STATS, -}; - static void ocelot_pll5_init(struct ocelot *ocelot) { /* Configure PLL5. This will need a proper CCF driver @@ -138,7 +134,6 @@ static int ocelot_chip_init(struct ocelot *ocelot, cons= t struct ocelot_ops *ops) int ret; =20 ocelot->map =3D ocelot_regmap; - ocelot->stats_layout =3D ocelot_stats_layout; ocelot->num_mact_rows =3D 1024; ocelot->ops =3D ops; =20 diff --git a/include/soc/mscc/ocelot.h b/include/soc/mscc/ocelot.h index 967ba30ea636..995b5950afe6 100644 --- a/include/soc/mscc/ocelot.h +++ b/include/soc/mscc/ocelot.h @@ -967,7 +967,6 @@ struct ocelot { struct regmap *targets[TARGET_MAX]; struct regmap_field *regfields[REGFIELD_MAX]; const u32 *const *map; - const struct ocelot_stat_layout *stats_layout; struct list_head stats_regions; =20 u32 pool_size[OCELOT_SB_NUM][OCELOT_SB_POOL_NUM]; --=20 2.25.1 From nobody Mon Apr 13 11:50:37 2026 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 A8B09C433FE for ; Sat, 19 Nov 2022 23:14:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235404AbiKSXOu (ORCPT ); Sat, 19 Nov 2022 18:14:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37700 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235323AbiKSXOe (ORCPT ); Sat, 19 Nov 2022 18:14:34 -0500 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2100.outbound.protection.outlook.com [40.107.236.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D98611A3B3; Sat, 19 Nov 2022 15:14:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WZr/izxSbbo3lYrJ7LLaH7/TKw6MVltvRtojG/1+K3EvVed+HlqijGQKgM77sKdPHtRzdoIOpz+RWIW78XWsjgEQ5Sxm5dcW7mae+/W7suMv2jP4H8vYq9X3UNL8F9RtHT/eQTL6w/9Cp3Xa9TF2uJ6N2t05OW7j1ZMPM2kzZfu8UEyl7XO+VjtaVNtzx/31hjaaHt7SdB3pqjO65r1gPg/8uM2BPgCZTyvseC+nTpll7Qg0iFsnJjvlN4OdDfRXPm3oB6ZpU4hOOuUBQDSSls7OtZg3J11RbMIpM05Box87cRgpv0lnY0h7WENbdr1Kmw/QSAAVsaOpZA3QB+qChg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=3NA83SgFLebyowtH7rp6jDbvYBsMZIMHJ0Y8kGiRJ6s=; b=MXIXxrjBoNBLY53KFXYWVSm/MQ/ybITAJbBO/2QeC06yguV9WHc2bv6Z4FNsXX+vZPFhglpM+noOIrfUejIcgrdV0deFar0haXqblJ/2zAKqPcIrRfqeVHcLYx7eK8SCHGGx1TxBKAcWdZOkbCec1Umb8dmFVGqucsZSmFHvc/bFaNOW9eSQDqAAO29SYJtsJoCBeFjKinxKcoMm9q0GAsY8Fhd5ZY/YGBNDTc5lIyYaLbnqynQ+r5LdtpGfBp8YhoQGfbHouNC2MJ/EBftnkZQWuSRAngOB4vDPCQPwCmWDP4woa1izeW7C+2LMEmEGLOS4HSjtnoM/xMkqR+LtsA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=in-advantage.com; dmarc=pass action=none header.from=in-advantage.com; dkim=pass header.d=in-advantage.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inadvantage.onmicrosoft.com; s=selector2-inadvantage-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3NA83SgFLebyowtH7rp6jDbvYBsMZIMHJ0Y8kGiRJ6s=; b=PZLkPpRrrHp/M1k0LN8jA4epm3gFQm4LcgFeEikOD7Px1/v0nL+44VxvU7KYX9uHWzr6YHN7MTxojX/fH9+71NTP0jLrT4PdwoFZd09lQ3Yc2r1/n6aYwwd7dBkjqs2qbO2yOpmA3Xpf9ppBYnb1QCngUcnC/86UAtSVIbllB5A= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=in-advantage.com; Received: from MWHPR1001MB2351.namprd10.prod.outlook.com (2603:10b6:301:35::37) by CH2PR10MB4293.namprd10.prod.outlook.com (2603:10b6:610:7f::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5834.11; Sat, 19 Nov 2022 23:14:24 +0000 Received: from MWHPR1001MB2351.namprd10.prod.outlook.com ([fe80::45b5:a860:9cea:a74c]) by MWHPR1001MB2351.namprd10.prod.outlook.com ([fe80::45b5:a860:9cea:a74c%4]) with mapi id 15.20.5834.009; Sat, 19 Nov 2022 23:14:24 +0000 From: Colin Foster To: linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: Paolo Abeni , Eric Dumazet , "David S. Miller" , Florian Fainelli , Andrew Lunn , UNGLinuxDriver@microchip.com, Alexandre Belloni , Claudiu Manoil , Vladimir Oltean Subject: [PATCH v2 net-next 2/3] net: mscc: ocelot: remove unnecessary exposure of stats structures Date: Sat, 19 Nov 2022 15:14:05 -0800 Message-Id: <20221119231406.3167852-3-colin.foster@in-advantage.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221119231406.3167852-1-colin.foster@in-advantage.com> References: <20221119231406.3167852-1-colin.foster@in-advantage.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SJ0PR13CA0027.namprd13.prod.outlook.com (2603:10b6:a03:2c0::32) To MWHPR1001MB2351.namprd10.prod.outlook.com (2603:10b6:301:35::37) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWHPR1001MB2351:EE_|CH2PR10MB4293:EE_ X-MS-Office365-Filtering-Correlation-Id: fbfce4a8-b681-498f-e48e-08daca83cc69 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ScS/Xc563qtZ1yw6gZ26XOpgraRINYxRwYVaZD+1UT7sgAz8/Drd/xDu4NVai5i72m6FtfkR6Y/Mmq8dugak9UOeERPr0mt7IxOnb11nBqFhY0LW6yR/7KbniocTBAcDOOIkfWtMTiftI1YMcRIlTtY8ndDGoC6rcQfGFstOTjqiP3ufUAWDrhQQnDsvLX7QoDiXzZSnjdIh8Fwyj7Nk7vzQfBMNFjk3RJh4rhns2ARgOc90oHGeS8L9ITklknOyboliOf1+tCbqCXBpYpoPv+9UDq+KWGiCfpdkHCm63rP+T4FHbG6s79bLB8ULkLr9RpAK8WqSK4nIuQkDbIwLw42oisH3sL1ENb+GShZ4J1oOt+/xSjibISfslBo8f/rI260i5/PdTJkpLhyDaqkgPDFFNo1clAMctRerLN/M+mxhgCMfRJZYWWrZe2IvedVIes6Za2RfSEPKAeWLgFlMpAHXAm6EouAoXD/nqA92B0Y1imSSSTzu4aO0LJObixu8qvBTkoCFeDiLbZ90/R+wDFWFC9rCLdl3hwL7QCKIuxyYUTIlGRQO9P3InSYDscj7unvYGIbbKRzoxIog+pr3lK6FTrkBQVDlEKZyiEwxkZYUzAJt/qoASax8U9QcOPI86pMFS36nA61Oj9gs3HNt7ct2fRh5Md2Q9AMPFM6JRLLaoUwiF47fsmvtnHZja2Ag X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR1001MB2351.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(366004)(396003)(136003)(376002)(39830400003)(346002)(451199015)(2906002)(26005)(86362001)(83380400001)(6512007)(4326008)(8676002)(66476007)(66556008)(66946007)(38350700002)(38100700002)(36756003)(41300700001)(30864003)(44832011)(54906003)(8936002)(5660300002)(316002)(186003)(7416002)(52116002)(478600001)(1076003)(6666004)(6486002)(2616005)(6506007);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?3fkkAu7SASbh4Dlwds5FZAiFKLBqIc2xJLv1ZZ+QPdD+ytlXMJL2A3VNU5ND?= =?us-ascii?Q?JfIGEOp5EvwGFDlDH9o15ZzFhhma0//fY+CB2GRipDvdNjP8McFCTSrLDVUI?= =?us-ascii?Q?9NGRqs1Yy2C6pDt7Lw/CIOcIaXfoSBJao9qrj05RbKNo8/tgKe/lE0nQZK44?= =?us-ascii?Q?yvmv+2Oj+WxmFNXbOJusYmLW/4nGdD9YACwbTheGTUJIn7UjsOdJhHAwbOO1?= =?us-ascii?Q?YWJWv+c0QiqS1IPoy+1N362ux4DD7RQAd42/wUMK6bACeerDyemytJiKGXxh?= =?us-ascii?Q?WMhq5FUSo+e7VCR5Py0Me2FoIjGGxc1Oy6KhqltebA2G5I9ofDp/p5Y2Icgb?= =?us-ascii?Q?qeAqSCXiUk9Q4MLniLhUW82p+2icLMXLdYjr6IrzFB5LNlRzZZRLC7Nk4N5n?= =?us-ascii?Q?fT61ib4ZmYnYh4ymYomh/2DC5Dr9RJQxdtWm3165fM/PXuPRWgXNWTK2m8pU?= =?us-ascii?Q?7vpszsC87zZ5DsCKBpYitxTWpevKFWxc/jS0+U16MDTx4T/1cGAtUK4lp6Z9?= =?us-ascii?Q?BLZF/GyLrY/mfpvYi1mtOu1zF5NHzXfu5II2WJibD/5bzPrj8ix16Wk35CER?= =?us-ascii?Q?ABmywACNlhWW8tpsfzEkyxWutpGfFxHYL6d7ctPK/+b39XjXtdZl1f+MotgF?= =?us-ascii?Q?SAAI64GFUSEWzDplgr63IR+JtkXnI9p9zpFswWZBg9mRmdZ55lv18lMw7rHP?= =?us-ascii?Q?FyIB52fpyEHkcUvXqOnCdOx3LcZMr5b5bepB+Q+1zmgBfPH5BGA+o9K97Gl1?= =?us-ascii?Q?35wE9lCPxjmVhXBlUExsmmQsVvYP24DHOc2l/wpgOZraCD60PX1/sM5/SoAA?= =?us-ascii?Q?3gqNppuA5sVeI4+dpGAjanWX0G/gJemxa1KljJDPZ7bCX6vyAig6A+Uzeanx?= =?us-ascii?Q?XDOKXC6FNlATYgjowu1fQt2tzVH4ptfp5VFN0IM55hzDs9cmqvr4v8lRQRfu?= =?us-ascii?Q?qv8LwB5AOKuYM+1+irgURK567DnWNlOjvG0Bq9IZkoLXgtC3aqhpeGppQg13?= =?us-ascii?Q?uvSn4ifNjg/fb8j96WO731WNBnQaT3LXxG5imy3n5sp9B0VtnHBrjQNxhTx1?= =?us-ascii?Q?5qEICXMD28+43boPapbhLLInEgCIItMltW3+23o4djodjbI1Sury8ch6xxhE?= =?us-ascii?Q?AuuSMKtRUmPvK0eZukiHFwllnR+nNT5bzQPmiUwAry1mipJUc7frFKW+icmb?= =?us-ascii?Q?8vh1AFbriA9VATJsVJK+kuoQ/cMBFE8dWy4d0CZMKubiMgk/VBNQOyKmL84S?= =?us-ascii?Q?D59E+lEe1fB2Vm26EHd0d2HVQIBYI+RMOSZRg4bqa73jnAraS/WiBaCZ1dtA?= =?us-ascii?Q?CltOo8RNa50/V46xyH4ZMCyMHt2pbDrLq+oauAH/EVN6Ry4m/1WjTjSaI0ba?= =?us-ascii?Q?Wpa6nKfqrbbbq2JRffqeSaa8nr6YRz/4xEVyzlTGl6AkogfaCFjOyN7UThB+?= =?us-ascii?Q?/Q1YdjvdkY7oKhCa5v+W9MC/TQYmJXiQM0akeF+BgM257eoZL99XB83AjWVI?= =?us-ascii?Q?WvFIC9W023Ev434QdG581qrGc6LYyU2/VI3RtEeNEXCC1DmLVWvpb8Gn7QqJ?= =?us-ascii?Q?u4KKtYwE80zHhEd/cVv+vJEPPek3jc+pMbNNDaFL4FiokEQjMonM1QmWcio9?= =?us-ascii?Q?YA=3D=3D?= X-OriginatorOrg: in-advantage.com X-MS-Exchange-CrossTenant-Network-Message-Id: fbfce4a8-b681-498f-e48e-08daca83cc69 X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Nov 2022 23:14:24.6927 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 48e842ca-fbd8-4633-a79d-0c955a7d3aae X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: BK5dOwrgUXS51vBwKImZQ0TRnLdT0fFdLlgxT0mTGio9+6rbjaB96bznROtSITQUmlw/PGIvjBw3CZo5QRtEWnTp/HevGlegy8++sIi52i0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR10MB4293 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Since commit 4d1d157fb6a4 ("net: mscc: ocelot: share the common stat definitions between all drivers") there is no longer a need to share the stats structures to the world. Relocate these definitions to inside ocelot_stats.c instead of a global include header. Signed-off-by: Colin Foster Reviewed-by: Vladimir Oltean --- v1->v2 * No change --- drivers/net/ethernet/mscc/ocelot_stats.c | 216 +++++++++++++++++++++++ include/soc/mscc/ocelot.h | 215 ---------------------- 2 files changed, 216 insertions(+), 215 deletions(-) diff --git a/drivers/net/ethernet/mscc/ocelot_stats.c b/drivers/net/etherne= t/mscc/ocelot_stats.c index 5dc132f61d6a..68e9f450c468 100644 --- a/drivers/net/ethernet/mscc/ocelot_stats.c +++ b/drivers/net/ethernet/mscc/ocelot_stats.c @@ -9,6 +9,221 @@ #include #include "ocelot.h" =20 +enum ocelot_stat { + OCELOT_STAT_RX_OCTETS, + OCELOT_STAT_RX_UNICAST, + OCELOT_STAT_RX_MULTICAST, + OCELOT_STAT_RX_BROADCAST, + OCELOT_STAT_RX_SHORTS, + OCELOT_STAT_RX_FRAGMENTS, + OCELOT_STAT_RX_JABBERS, + OCELOT_STAT_RX_CRC_ALIGN_ERRS, + OCELOT_STAT_RX_SYM_ERRS, + OCELOT_STAT_RX_64, + OCELOT_STAT_RX_65_127, + OCELOT_STAT_RX_128_255, + OCELOT_STAT_RX_256_511, + OCELOT_STAT_RX_512_1023, + OCELOT_STAT_RX_1024_1526, + OCELOT_STAT_RX_1527_MAX, + OCELOT_STAT_RX_PAUSE, + OCELOT_STAT_RX_CONTROL, + OCELOT_STAT_RX_LONGS, + OCELOT_STAT_RX_CLASSIFIED_DROPS, + OCELOT_STAT_RX_RED_PRIO_0, + OCELOT_STAT_RX_RED_PRIO_1, + OCELOT_STAT_RX_RED_PRIO_2, + OCELOT_STAT_RX_RED_PRIO_3, + OCELOT_STAT_RX_RED_PRIO_4, + OCELOT_STAT_RX_RED_PRIO_5, + OCELOT_STAT_RX_RED_PRIO_6, + OCELOT_STAT_RX_RED_PRIO_7, + OCELOT_STAT_RX_YELLOW_PRIO_0, + OCELOT_STAT_RX_YELLOW_PRIO_1, + OCELOT_STAT_RX_YELLOW_PRIO_2, + OCELOT_STAT_RX_YELLOW_PRIO_3, + OCELOT_STAT_RX_YELLOW_PRIO_4, + OCELOT_STAT_RX_YELLOW_PRIO_5, + OCELOT_STAT_RX_YELLOW_PRIO_6, + OCELOT_STAT_RX_YELLOW_PRIO_7, + OCELOT_STAT_RX_GREEN_PRIO_0, + OCELOT_STAT_RX_GREEN_PRIO_1, + OCELOT_STAT_RX_GREEN_PRIO_2, + OCELOT_STAT_RX_GREEN_PRIO_3, + OCELOT_STAT_RX_GREEN_PRIO_4, + OCELOT_STAT_RX_GREEN_PRIO_5, + OCELOT_STAT_RX_GREEN_PRIO_6, + OCELOT_STAT_RX_GREEN_PRIO_7, + OCELOT_STAT_TX_OCTETS, + OCELOT_STAT_TX_UNICAST, + OCELOT_STAT_TX_MULTICAST, + OCELOT_STAT_TX_BROADCAST, + OCELOT_STAT_TX_COLLISION, + OCELOT_STAT_TX_DROPS, + OCELOT_STAT_TX_PAUSE, + OCELOT_STAT_TX_64, + OCELOT_STAT_TX_65_127, + OCELOT_STAT_TX_128_255, + OCELOT_STAT_TX_256_511, + OCELOT_STAT_TX_512_1023, + OCELOT_STAT_TX_1024_1526, + OCELOT_STAT_TX_1527_MAX, + OCELOT_STAT_TX_YELLOW_PRIO_0, + OCELOT_STAT_TX_YELLOW_PRIO_1, + OCELOT_STAT_TX_YELLOW_PRIO_2, + OCELOT_STAT_TX_YELLOW_PRIO_3, + OCELOT_STAT_TX_YELLOW_PRIO_4, + OCELOT_STAT_TX_YELLOW_PRIO_5, + OCELOT_STAT_TX_YELLOW_PRIO_6, + OCELOT_STAT_TX_YELLOW_PRIO_7, + OCELOT_STAT_TX_GREEN_PRIO_0, + OCELOT_STAT_TX_GREEN_PRIO_1, + OCELOT_STAT_TX_GREEN_PRIO_2, + OCELOT_STAT_TX_GREEN_PRIO_3, + OCELOT_STAT_TX_GREEN_PRIO_4, + OCELOT_STAT_TX_GREEN_PRIO_5, + OCELOT_STAT_TX_GREEN_PRIO_6, + OCELOT_STAT_TX_GREEN_PRIO_7, + OCELOT_STAT_TX_AGED, + OCELOT_STAT_DROP_LOCAL, + OCELOT_STAT_DROP_TAIL, + OCELOT_STAT_DROP_YELLOW_PRIO_0, + OCELOT_STAT_DROP_YELLOW_PRIO_1, + OCELOT_STAT_DROP_YELLOW_PRIO_2, + OCELOT_STAT_DROP_YELLOW_PRIO_3, + OCELOT_STAT_DROP_YELLOW_PRIO_4, + OCELOT_STAT_DROP_YELLOW_PRIO_5, + OCELOT_STAT_DROP_YELLOW_PRIO_6, + OCELOT_STAT_DROP_YELLOW_PRIO_7, + OCELOT_STAT_DROP_GREEN_PRIO_0, + OCELOT_STAT_DROP_GREEN_PRIO_1, + OCELOT_STAT_DROP_GREEN_PRIO_2, + OCELOT_STAT_DROP_GREEN_PRIO_3, + OCELOT_STAT_DROP_GREEN_PRIO_4, + OCELOT_STAT_DROP_GREEN_PRIO_5, + OCELOT_STAT_DROP_GREEN_PRIO_6, + OCELOT_STAT_DROP_GREEN_PRIO_7, + OCELOT_NUM_STATS, +}; + +struct ocelot_stat_layout { + u32 reg; + char name[ETH_GSTRING_LEN]; +}; + +/* 32-bit counter checked for wraparound by ocelot_port_update_stats() + * and copied to ocelot->stats. + */ +#define OCELOT_STAT(kind) \ + [OCELOT_STAT_ ## kind] =3D { .reg =3D SYS_COUNT_ ## kind } +/* Same as above, except also exported to ethtool -S. Standard counters sh= ould + * only be exposed to more specific interfaces rather than by their string= name. + */ +#define OCELOT_STAT_ETHTOOL(kind, ethtool_name) \ + [OCELOT_STAT_ ## kind] =3D { .reg =3D SYS_COUNT_ ## kind, .name =3D ethto= ol_name } + +#define OCELOT_COMMON_STATS \ + OCELOT_STAT_ETHTOOL(RX_OCTETS, "rx_octets"), \ + OCELOT_STAT_ETHTOOL(RX_UNICAST, "rx_unicast"), \ + OCELOT_STAT_ETHTOOL(RX_MULTICAST, "rx_multicast"), \ + OCELOT_STAT_ETHTOOL(RX_BROADCAST, "rx_broadcast"), \ + OCELOT_STAT_ETHTOOL(RX_SHORTS, "rx_shorts"), \ + OCELOT_STAT_ETHTOOL(RX_FRAGMENTS, "rx_fragments"), \ + OCELOT_STAT_ETHTOOL(RX_JABBERS, "rx_jabbers"), \ + OCELOT_STAT_ETHTOOL(RX_CRC_ALIGN_ERRS, "rx_crc_align_errs"), \ + OCELOT_STAT_ETHTOOL(RX_SYM_ERRS, "rx_sym_errs"), \ + OCELOT_STAT_ETHTOOL(RX_64, "rx_frames_below_65_octets"), \ + OCELOT_STAT_ETHTOOL(RX_65_127, "rx_frames_65_to_127_octets"), \ + OCELOT_STAT_ETHTOOL(RX_128_255, "rx_frames_128_to_255_octets"), \ + OCELOT_STAT_ETHTOOL(RX_256_511, "rx_frames_256_to_511_octets"), \ + OCELOT_STAT_ETHTOOL(RX_512_1023, "rx_frames_512_to_1023_octets"), \ + OCELOT_STAT_ETHTOOL(RX_1024_1526, "rx_frames_1024_to_1526_octets"), \ + OCELOT_STAT_ETHTOOL(RX_1527_MAX, "rx_frames_over_1526_octets"), \ + OCELOT_STAT_ETHTOOL(RX_PAUSE, "rx_pause"), \ + OCELOT_STAT_ETHTOOL(RX_CONTROL, "rx_control"), \ + OCELOT_STAT_ETHTOOL(RX_LONGS, "rx_longs"), \ + OCELOT_STAT_ETHTOOL(RX_CLASSIFIED_DROPS, "rx_classified_drops"), \ + OCELOT_STAT_ETHTOOL(RX_RED_PRIO_0, "rx_red_prio_0"), \ + OCELOT_STAT_ETHTOOL(RX_RED_PRIO_1, "rx_red_prio_1"), \ + OCELOT_STAT_ETHTOOL(RX_RED_PRIO_2, "rx_red_prio_2"), \ + OCELOT_STAT_ETHTOOL(RX_RED_PRIO_3, "rx_red_prio_3"), \ + OCELOT_STAT_ETHTOOL(RX_RED_PRIO_4, "rx_red_prio_4"), \ + OCELOT_STAT_ETHTOOL(RX_RED_PRIO_5, "rx_red_prio_5"), \ + OCELOT_STAT_ETHTOOL(RX_RED_PRIO_6, "rx_red_prio_6"), \ + OCELOT_STAT_ETHTOOL(RX_RED_PRIO_7, "rx_red_prio_7"), \ + OCELOT_STAT_ETHTOOL(RX_YELLOW_PRIO_0, "rx_yellow_prio_0"), \ + OCELOT_STAT_ETHTOOL(RX_YELLOW_PRIO_1, "rx_yellow_prio_1"), \ + OCELOT_STAT_ETHTOOL(RX_YELLOW_PRIO_2, "rx_yellow_prio_2"), \ + OCELOT_STAT_ETHTOOL(RX_YELLOW_PRIO_3, "rx_yellow_prio_3"), \ + OCELOT_STAT_ETHTOOL(RX_YELLOW_PRIO_4, "rx_yellow_prio_4"), \ + OCELOT_STAT_ETHTOOL(RX_YELLOW_PRIO_5, "rx_yellow_prio_5"), \ + OCELOT_STAT_ETHTOOL(RX_YELLOW_PRIO_6, "rx_yellow_prio_6"), \ + OCELOT_STAT_ETHTOOL(RX_YELLOW_PRIO_7, "rx_yellow_prio_7"), \ + OCELOT_STAT_ETHTOOL(RX_GREEN_PRIO_0, "rx_green_prio_0"), \ + OCELOT_STAT_ETHTOOL(RX_GREEN_PRIO_1, "rx_green_prio_1"), \ + OCELOT_STAT_ETHTOOL(RX_GREEN_PRIO_2, "rx_green_prio_2"), \ + OCELOT_STAT_ETHTOOL(RX_GREEN_PRIO_3, "rx_green_prio_3"), \ + OCELOT_STAT_ETHTOOL(RX_GREEN_PRIO_4, "rx_green_prio_4"), \ + OCELOT_STAT_ETHTOOL(RX_GREEN_PRIO_5, "rx_green_prio_5"), \ + OCELOT_STAT_ETHTOOL(RX_GREEN_PRIO_6, "rx_green_prio_6"), \ + OCELOT_STAT_ETHTOOL(RX_GREEN_PRIO_7, "rx_green_prio_7"), \ + OCELOT_STAT_ETHTOOL(TX_OCTETS, "tx_octets"), \ + OCELOT_STAT_ETHTOOL(TX_UNICAST, "tx_unicast"), \ + OCELOT_STAT_ETHTOOL(TX_MULTICAST, "tx_multicast"), \ + OCELOT_STAT_ETHTOOL(TX_BROADCAST, "tx_broadcast"), \ + OCELOT_STAT_ETHTOOL(TX_COLLISION, "tx_collision"), \ + OCELOT_STAT_ETHTOOL(TX_DROPS, "tx_drops"), \ + OCELOT_STAT_ETHTOOL(TX_PAUSE, "tx_pause"), \ + OCELOT_STAT_ETHTOOL(TX_64, "tx_frames_below_65_octets"), \ + OCELOT_STAT_ETHTOOL(TX_65_127, "tx_frames_65_to_127_octets"), \ + OCELOT_STAT_ETHTOOL(TX_128_255, "tx_frames_128_255_octets"), \ + OCELOT_STAT_ETHTOOL(TX_256_511, "tx_frames_256_511_octets"), \ + OCELOT_STAT_ETHTOOL(TX_512_1023, "tx_frames_512_1023_octets"), \ + OCELOT_STAT_ETHTOOL(TX_1024_1526, "tx_frames_1024_1526_octets"), \ + OCELOT_STAT_ETHTOOL(TX_1527_MAX, "tx_frames_over_1526_octets"), \ + OCELOT_STAT_ETHTOOL(TX_YELLOW_PRIO_0, "tx_yellow_prio_0"), \ + OCELOT_STAT_ETHTOOL(TX_YELLOW_PRIO_1, "tx_yellow_prio_1"), \ + OCELOT_STAT_ETHTOOL(TX_YELLOW_PRIO_2, "tx_yellow_prio_2"), \ + OCELOT_STAT_ETHTOOL(TX_YELLOW_PRIO_3, "tx_yellow_prio_3"), \ + OCELOT_STAT_ETHTOOL(TX_YELLOW_PRIO_4, "tx_yellow_prio_4"), \ + OCELOT_STAT_ETHTOOL(TX_YELLOW_PRIO_5, "tx_yellow_prio_5"), \ + OCELOT_STAT_ETHTOOL(TX_YELLOW_PRIO_6, "tx_yellow_prio_6"), \ + OCELOT_STAT_ETHTOOL(TX_YELLOW_PRIO_7, "tx_yellow_prio_7"), \ + OCELOT_STAT_ETHTOOL(TX_GREEN_PRIO_0, "tx_green_prio_0"), \ + OCELOT_STAT_ETHTOOL(TX_GREEN_PRIO_1, "tx_green_prio_1"), \ + OCELOT_STAT_ETHTOOL(TX_GREEN_PRIO_2, "tx_green_prio_2"), \ + OCELOT_STAT_ETHTOOL(TX_GREEN_PRIO_3, "tx_green_prio_3"), \ + OCELOT_STAT_ETHTOOL(TX_GREEN_PRIO_4, "tx_green_prio_4"), \ + OCELOT_STAT_ETHTOOL(TX_GREEN_PRIO_5, "tx_green_prio_5"), \ + OCELOT_STAT_ETHTOOL(TX_GREEN_PRIO_6, "tx_green_prio_6"), \ + OCELOT_STAT_ETHTOOL(TX_GREEN_PRIO_7, "tx_green_prio_7"), \ + OCELOT_STAT_ETHTOOL(TX_AGED, "tx_aged"), \ + OCELOT_STAT_ETHTOOL(DROP_LOCAL, "drop_local"), \ + OCELOT_STAT_ETHTOOL(DROP_TAIL, "drop_tail"), \ + OCELOT_STAT_ETHTOOL(DROP_YELLOW_PRIO_0, "drop_yellow_prio_0"), \ + OCELOT_STAT_ETHTOOL(DROP_YELLOW_PRIO_1, "drop_yellow_prio_1"), \ + OCELOT_STAT_ETHTOOL(DROP_YELLOW_PRIO_2, "drop_yellow_prio_2"), \ + OCELOT_STAT_ETHTOOL(DROP_YELLOW_PRIO_3, "drop_yellow_prio_3"), \ + OCELOT_STAT_ETHTOOL(DROP_YELLOW_PRIO_4, "drop_yellow_prio_4"), \ + OCELOT_STAT_ETHTOOL(DROP_YELLOW_PRIO_5, "drop_yellow_prio_5"), \ + OCELOT_STAT_ETHTOOL(DROP_YELLOW_PRIO_6, "drop_yellow_prio_6"), \ + OCELOT_STAT_ETHTOOL(DROP_YELLOW_PRIO_7, "drop_yellow_prio_7"), \ + OCELOT_STAT_ETHTOOL(DROP_GREEN_PRIO_0, "drop_green_prio_0"), \ + OCELOT_STAT_ETHTOOL(DROP_GREEN_PRIO_1, "drop_green_prio_1"), \ + OCELOT_STAT_ETHTOOL(DROP_GREEN_PRIO_2, "drop_green_prio_2"), \ + OCELOT_STAT_ETHTOOL(DROP_GREEN_PRIO_3, "drop_green_prio_3"), \ + OCELOT_STAT_ETHTOOL(DROP_GREEN_PRIO_4, "drop_green_prio_4"), \ + OCELOT_STAT_ETHTOOL(DROP_GREEN_PRIO_5, "drop_green_prio_5"), \ + OCELOT_STAT_ETHTOOL(DROP_GREEN_PRIO_6, "drop_green_prio_6"), \ + OCELOT_STAT_ETHTOOL(DROP_GREEN_PRIO_7, "drop_green_prio_7") + +struct ocelot_stats_region { + struct list_head node; + u32 base; + int count; + u32 *buf; +}; + static const struct ocelot_stat_layout ocelot_stats_layout[OCELOT_NUM_STAT= S] =3D { OCELOT_COMMON_STATS, }; @@ -460,3 +675,4 @@ void ocelot_stats_deinit(struct ocelot *ocelot) cancel_delayed_work(&ocelot->stats_work); destroy_workqueue(ocelot->stats_queue); } + diff --git a/include/soc/mscc/ocelot.h b/include/soc/mscc/ocelot.h index 995b5950afe6..df62be80a193 100644 --- a/include/soc/mscc/ocelot.h +++ b/include/soc/mscc/ocelot.h @@ -596,221 +596,6 @@ enum ocelot_ptp_pins { TOD_ACC_PIN }; =20 -enum ocelot_stat { - OCELOT_STAT_RX_OCTETS, - OCELOT_STAT_RX_UNICAST, - OCELOT_STAT_RX_MULTICAST, - OCELOT_STAT_RX_BROADCAST, - OCELOT_STAT_RX_SHORTS, - OCELOT_STAT_RX_FRAGMENTS, - OCELOT_STAT_RX_JABBERS, - OCELOT_STAT_RX_CRC_ALIGN_ERRS, - OCELOT_STAT_RX_SYM_ERRS, - OCELOT_STAT_RX_64, - OCELOT_STAT_RX_65_127, - OCELOT_STAT_RX_128_255, - OCELOT_STAT_RX_256_511, - OCELOT_STAT_RX_512_1023, - OCELOT_STAT_RX_1024_1526, - OCELOT_STAT_RX_1527_MAX, - OCELOT_STAT_RX_PAUSE, - OCELOT_STAT_RX_CONTROL, - OCELOT_STAT_RX_LONGS, - OCELOT_STAT_RX_CLASSIFIED_DROPS, - OCELOT_STAT_RX_RED_PRIO_0, - OCELOT_STAT_RX_RED_PRIO_1, - OCELOT_STAT_RX_RED_PRIO_2, - OCELOT_STAT_RX_RED_PRIO_3, - OCELOT_STAT_RX_RED_PRIO_4, - OCELOT_STAT_RX_RED_PRIO_5, - OCELOT_STAT_RX_RED_PRIO_6, - OCELOT_STAT_RX_RED_PRIO_7, - OCELOT_STAT_RX_YELLOW_PRIO_0, - OCELOT_STAT_RX_YELLOW_PRIO_1, - OCELOT_STAT_RX_YELLOW_PRIO_2, - OCELOT_STAT_RX_YELLOW_PRIO_3, - OCELOT_STAT_RX_YELLOW_PRIO_4, - OCELOT_STAT_RX_YELLOW_PRIO_5, - OCELOT_STAT_RX_YELLOW_PRIO_6, - OCELOT_STAT_RX_YELLOW_PRIO_7, - OCELOT_STAT_RX_GREEN_PRIO_0, - OCELOT_STAT_RX_GREEN_PRIO_1, - OCELOT_STAT_RX_GREEN_PRIO_2, - OCELOT_STAT_RX_GREEN_PRIO_3, - OCELOT_STAT_RX_GREEN_PRIO_4, - OCELOT_STAT_RX_GREEN_PRIO_5, - OCELOT_STAT_RX_GREEN_PRIO_6, - OCELOT_STAT_RX_GREEN_PRIO_7, - OCELOT_STAT_TX_OCTETS, - OCELOT_STAT_TX_UNICAST, - OCELOT_STAT_TX_MULTICAST, - OCELOT_STAT_TX_BROADCAST, - OCELOT_STAT_TX_COLLISION, - OCELOT_STAT_TX_DROPS, - OCELOT_STAT_TX_PAUSE, - OCELOT_STAT_TX_64, - OCELOT_STAT_TX_65_127, - OCELOT_STAT_TX_128_255, - OCELOT_STAT_TX_256_511, - OCELOT_STAT_TX_512_1023, - OCELOT_STAT_TX_1024_1526, - OCELOT_STAT_TX_1527_MAX, - OCELOT_STAT_TX_YELLOW_PRIO_0, - OCELOT_STAT_TX_YELLOW_PRIO_1, - OCELOT_STAT_TX_YELLOW_PRIO_2, - OCELOT_STAT_TX_YELLOW_PRIO_3, - OCELOT_STAT_TX_YELLOW_PRIO_4, - OCELOT_STAT_TX_YELLOW_PRIO_5, - OCELOT_STAT_TX_YELLOW_PRIO_6, - OCELOT_STAT_TX_YELLOW_PRIO_7, - OCELOT_STAT_TX_GREEN_PRIO_0, - OCELOT_STAT_TX_GREEN_PRIO_1, - OCELOT_STAT_TX_GREEN_PRIO_2, - OCELOT_STAT_TX_GREEN_PRIO_3, - OCELOT_STAT_TX_GREEN_PRIO_4, - OCELOT_STAT_TX_GREEN_PRIO_5, - OCELOT_STAT_TX_GREEN_PRIO_6, - OCELOT_STAT_TX_GREEN_PRIO_7, - OCELOT_STAT_TX_AGED, - OCELOT_STAT_DROP_LOCAL, - OCELOT_STAT_DROP_TAIL, - OCELOT_STAT_DROP_YELLOW_PRIO_0, - OCELOT_STAT_DROP_YELLOW_PRIO_1, - OCELOT_STAT_DROP_YELLOW_PRIO_2, - OCELOT_STAT_DROP_YELLOW_PRIO_3, - OCELOT_STAT_DROP_YELLOW_PRIO_4, - OCELOT_STAT_DROP_YELLOW_PRIO_5, - OCELOT_STAT_DROP_YELLOW_PRIO_6, - OCELOT_STAT_DROP_YELLOW_PRIO_7, - OCELOT_STAT_DROP_GREEN_PRIO_0, - OCELOT_STAT_DROP_GREEN_PRIO_1, - OCELOT_STAT_DROP_GREEN_PRIO_2, - OCELOT_STAT_DROP_GREEN_PRIO_3, - OCELOT_STAT_DROP_GREEN_PRIO_4, - OCELOT_STAT_DROP_GREEN_PRIO_5, - OCELOT_STAT_DROP_GREEN_PRIO_6, - OCELOT_STAT_DROP_GREEN_PRIO_7, - OCELOT_NUM_STATS, -}; - -struct ocelot_stat_layout { - u32 reg; - char name[ETH_GSTRING_LEN]; -}; - -/* 32-bit counter checked for wraparound by ocelot_port_update_stats() - * and copied to ocelot->stats. - */ -#define OCELOT_STAT(kind) \ - [OCELOT_STAT_ ## kind] =3D { .reg =3D SYS_COUNT_ ## kind } -/* Same as above, except also exported to ethtool -S. Standard counters sh= ould - * only be exposed to more specific interfaces rather than by their string= name. - */ -#define OCELOT_STAT_ETHTOOL(kind, ethtool_name) \ - [OCELOT_STAT_ ## kind] =3D { .reg =3D SYS_COUNT_ ## kind, .name =3D ethto= ol_name } - -#define OCELOT_COMMON_STATS \ - OCELOT_STAT_ETHTOOL(RX_OCTETS, "rx_octets"), \ - OCELOT_STAT_ETHTOOL(RX_UNICAST, "rx_unicast"), \ - OCELOT_STAT_ETHTOOL(RX_MULTICAST, "rx_multicast"), \ - OCELOT_STAT_ETHTOOL(RX_BROADCAST, "rx_broadcast"), \ - OCELOT_STAT_ETHTOOL(RX_SHORTS, "rx_shorts"), \ - OCELOT_STAT_ETHTOOL(RX_FRAGMENTS, "rx_fragments"), \ - OCELOT_STAT_ETHTOOL(RX_JABBERS, "rx_jabbers"), \ - OCELOT_STAT_ETHTOOL(RX_CRC_ALIGN_ERRS, "rx_crc_align_errs"), \ - OCELOT_STAT_ETHTOOL(RX_SYM_ERRS, "rx_sym_errs"), \ - OCELOT_STAT_ETHTOOL(RX_64, "rx_frames_below_65_octets"), \ - OCELOT_STAT_ETHTOOL(RX_65_127, "rx_frames_65_to_127_octets"), \ - OCELOT_STAT_ETHTOOL(RX_128_255, "rx_frames_128_to_255_octets"), \ - OCELOT_STAT_ETHTOOL(RX_256_511, "rx_frames_256_to_511_octets"), \ - OCELOT_STAT_ETHTOOL(RX_512_1023, "rx_frames_512_to_1023_octets"), \ - OCELOT_STAT_ETHTOOL(RX_1024_1526, "rx_frames_1024_to_1526_octets"), \ - OCELOT_STAT_ETHTOOL(RX_1527_MAX, "rx_frames_over_1526_octets"), \ - OCELOT_STAT_ETHTOOL(RX_PAUSE, "rx_pause"), \ - OCELOT_STAT_ETHTOOL(RX_CONTROL, "rx_control"), \ - OCELOT_STAT_ETHTOOL(RX_LONGS, "rx_longs"), \ - OCELOT_STAT_ETHTOOL(RX_CLASSIFIED_DROPS, "rx_classified_drops"), \ - OCELOT_STAT_ETHTOOL(RX_RED_PRIO_0, "rx_red_prio_0"), \ - OCELOT_STAT_ETHTOOL(RX_RED_PRIO_1, "rx_red_prio_1"), \ - OCELOT_STAT_ETHTOOL(RX_RED_PRIO_2, "rx_red_prio_2"), \ - OCELOT_STAT_ETHTOOL(RX_RED_PRIO_3, "rx_red_prio_3"), \ - OCELOT_STAT_ETHTOOL(RX_RED_PRIO_4, "rx_red_prio_4"), \ - OCELOT_STAT_ETHTOOL(RX_RED_PRIO_5, "rx_red_prio_5"), \ - OCELOT_STAT_ETHTOOL(RX_RED_PRIO_6, "rx_red_prio_6"), \ - OCELOT_STAT_ETHTOOL(RX_RED_PRIO_7, "rx_red_prio_7"), \ - OCELOT_STAT_ETHTOOL(RX_YELLOW_PRIO_0, "rx_yellow_prio_0"), \ - OCELOT_STAT_ETHTOOL(RX_YELLOW_PRIO_1, "rx_yellow_prio_1"), \ - OCELOT_STAT_ETHTOOL(RX_YELLOW_PRIO_2, "rx_yellow_prio_2"), \ - OCELOT_STAT_ETHTOOL(RX_YELLOW_PRIO_3, "rx_yellow_prio_3"), \ - OCELOT_STAT_ETHTOOL(RX_YELLOW_PRIO_4, "rx_yellow_prio_4"), \ - OCELOT_STAT_ETHTOOL(RX_YELLOW_PRIO_5, "rx_yellow_prio_5"), \ - OCELOT_STAT_ETHTOOL(RX_YELLOW_PRIO_6, "rx_yellow_prio_6"), \ - OCELOT_STAT_ETHTOOL(RX_YELLOW_PRIO_7, "rx_yellow_prio_7"), \ - OCELOT_STAT_ETHTOOL(RX_GREEN_PRIO_0, "rx_green_prio_0"), \ - OCELOT_STAT_ETHTOOL(RX_GREEN_PRIO_1, "rx_green_prio_1"), \ - OCELOT_STAT_ETHTOOL(RX_GREEN_PRIO_2, "rx_green_prio_2"), \ - OCELOT_STAT_ETHTOOL(RX_GREEN_PRIO_3, "rx_green_prio_3"), \ - OCELOT_STAT_ETHTOOL(RX_GREEN_PRIO_4, "rx_green_prio_4"), \ - OCELOT_STAT_ETHTOOL(RX_GREEN_PRIO_5, "rx_green_prio_5"), \ - OCELOT_STAT_ETHTOOL(RX_GREEN_PRIO_6, "rx_green_prio_6"), \ - OCELOT_STAT_ETHTOOL(RX_GREEN_PRIO_7, "rx_green_prio_7"), \ - OCELOT_STAT_ETHTOOL(TX_OCTETS, "tx_octets"), \ - OCELOT_STAT_ETHTOOL(TX_UNICAST, "tx_unicast"), \ - OCELOT_STAT_ETHTOOL(TX_MULTICAST, "tx_multicast"), \ - OCELOT_STAT_ETHTOOL(TX_BROADCAST, "tx_broadcast"), \ - OCELOT_STAT_ETHTOOL(TX_COLLISION, "tx_collision"), \ - OCELOT_STAT_ETHTOOL(TX_DROPS, "tx_drops"), \ - OCELOT_STAT_ETHTOOL(TX_PAUSE, "tx_pause"), \ - OCELOT_STAT_ETHTOOL(TX_64, "tx_frames_below_65_octets"), \ - OCELOT_STAT_ETHTOOL(TX_65_127, "tx_frames_65_to_127_octets"), \ - OCELOT_STAT_ETHTOOL(TX_128_255, "tx_frames_128_255_octets"), \ - OCELOT_STAT_ETHTOOL(TX_256_511, "tx_frames_256_511_octets"), \ - OCELOT_STAT_ETHTOOL(TX_512_1023, "tx_frames_512_1023_octets"), \ - OCELOT_STAT_ETHTOOL(TX_1024_1526, "tx_frames_1024_1526_octets"), \ - OCELOT_STAT_ETHTOOL(TX_1527_MAX, "tx_frames_over_1526_octets"), \ - OCELOT_STAT_ETHTOOL(TX_YELLOW_PRIO_0, "tx_yellow_prio_0"), \ - OCELOT_STAT_ETHTOOL(TX_YELLOW_PRIO_1, "tx_yellow_prio_1"), \ - OCELOT_STAT_ETHTOOL(TX_YELLOW_PRIO_2, "tx_yellow_prio_2"), \ - OCELOT_STAT_ETHTOOL(TX_YELLOW_PRIO_3, "tx_yellow_prio_3"), \ - OCELOT_STAT_ETHTOOL(TX_YELLOW_PRIO_4, "tx_yellow_prio_4"), \ - OCELOT_STAT_ETHTOOL(TX_YELLOW_PRIO_5, "tx_yellow_prio_5"), \ - OCELOT_STAT_ETHTOOL(TX_YELLOW_PRIO_6, "tx_yellow_prio_6"), \ - OCELOT_STAT_ETHTOOL(TX_YELLOW_PRIO_7, "tx_yellow_prio_7"), \ - OCELOT_STAT_ETHTOOL(TX_GREEN_PRIO_0, "tx_green_prio_0"), \ - OCELOT_STAT_ETHTOOL(TX_GREEN_PRIO_1, "tx_green_prio_1"), \ - OCELOT_STAT_ETHTOOL(TX_GREEN_PRIO_2, "tx_green_prio_2"), \ - OCELOT_STAT_ETHTOOL(TX_GREEN_PRIO_3, "tx_green_prio_3"), \ - OCELOT_STAT_ETHTOOL(TX_GREEN_PRIO_4, "tx_green_prio_4"), \ - OCELOT_STAT_ETHTOOL(TX_GREEN_PRIO_5, "tx_green_prio_5"), \ - OCELOT_STAT_ETHTOOL(TX_GREEN_PRIO_6, "tx_green_prio_6"), \ - OCELOT_STAT_ETHTOOL(TX_GREEN_PRIO_7, "tx_green_prio_7"), \ - OCELOT_STAT_ETHTOOL(TX_AGED, "tx_aged"), \ - OCELOT_STAT_ETHTOOL(DROP_LOCAL, "drop_local"), \ - OCELOT_STAT_ETHTOOL(DROP_TAIL, "drop_tail"), \ - OCELOT_STAT_ETHTOOL(DROP_YELLOW_PRIO_0, "drop_yellow_prio_0"), \ - OCELOT_STAT_ETHTOOL(DROP_YELLOW_PRIO_1, "drop_yellow_prio_1"), \ - OCELOT_STAT_ETHTOOL(DROP_YELLOW_PRIO_2, "drop_yellow_prio_2"), \ - OCELOT_STAT_ETHTOOL(DROP_YELLOW_PRIO_3, "drop_yellow_prio_3"), \ - OCELOT_STAT_ETHTOOL(DROP_YELLOW_PRIO_4, "drop_yellow_prio_4"), \ - OCELOT_STAT_ETHTOOL(DROP_YELLOW_PRIO_5, "drop_yellow_prio_5"), \ - OCELOT_STAT_ETHTOOL(DROP_YELLOW_PRIO_6, "drop_yellow_prio_6"), \ - OCELOT_STAT_ETHTOOL(DROP_YELLOW_PRIO_7, "drop_yellow_prio_7"), \ - OCELOT_STAT_ETHTOOL(DROP_GREEN_PRIO_0, "drop_green_prio_0"), \ - OCELOT_STAT_ETHTOOL(DROP_GREEN_PRIO_1, "drop_green_prio_1"), \ - OCELOT_STAT_ETHTOOL(DROP_GREEN_PRIO_2, "drop_green_prio_2"), \ - OCELOT_STAT_ETHTOOL(DROP_GREEN_PRIO_3, "drop_green_prio_3"), \ - OCELOT_STAT_ETHTOOL(DROP_GREEN_PRIO_4, "drop_green_prio_4"), \ - OCELOT_STAT_ETHTOOL(DROP_GREEN_PRIO_5, "drop_green_prio_5"), \ - OCELOT_STAT_ETHTOOL(DROP_GREEN_PRIO_6, "drop_green_prio_6"), \ - OCELOT_STAT_ETHTOOL(DROP_GREEN_PRIO_7, "drop_green_prio_7") - -struct ocelot_stats_region { - struct list_head node; - u32 base; - int count; - u32 *buf; -}; - enum ocelot_tag_prefix { OCELOT_TAG_PREFIX_DISABLED =3D 0, OCELOT_TAG_PREFIX_NONE, --=20 2.25.1 From nobody Mon Apr 13 11:50:37 2026 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 B36E9C4332F for ; Sat, 19 Nov 2022 23:14:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235271AbiKSXO5 (ORCPT ); Sat, 19 Nov 2022 18:14:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37854 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235350AbiKSXOk (ORCPT ); Sat, 19 Nov 2022 18:14:40 -0500 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2100.outbound.protection.outlook.com [40.107.236.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F2D8F13F64; Sat, 19 Nov 2022 15:14:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EEWzC1hlotSY1fSGESn6Ba+21/GedYxWcDrfEqYACfPBWixwqa4G0WWSK6dO8te/PSWj9AQ+c5g9IKrava0g9k/qcuaJ8oWKwQ8zg7G0+c4dfJymtpDx5wDLQ2Yfnyw2ebUizcLua8oHfelIPD841lcrGjxwV5kkO3n+O8f4OkRReJ/wJXl49Dh40NUoTlzJKKmSI4BkZbF5EOz8UvyeqnDBTK742wpulLOTI9rHjS+ZJuQS9V5MfeGzAc9ciGFRfrShSRYvC1DBncAFsuUEZk0fuRBE1teYnuoXPpkwMDF54AW1ta4FFJUcbikhuFGPSkJPL6SsrjpjsVhHQcyfLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=oU84Rbt19vAc/NrOPCabhl5B1B9LG6TK1vJ2rFw/GfA=; b=Zqy5B42zIxs0WHh8STVbeX6x9FPJy+jO2yesfThFjYnMXYUFkYqBnKOHmvzdGuXmvlYpBP8ZjKSk6+/qTe3m/3F4LpETq7tK1euzvthJ+p83+wyRpVw45LuNNxf52GOkaSy3FbbNBAjJDom0cg9ZhUQmHV/OUMq3CsEs94Y+iXr5uGOxbR5lp9v5LZvlv9KF+j3xnfHPlXi8SVmWexzPqeuNXIXWphYuGzR9mbgE1/LSb8e6Py+9Hnt36lfzypxxXU4Rnr8/vgPVA0Vo+1GGK6iHOEAN6nASC1g8iRXPI6fY/FJEytI/Hd5sdDqAL9aBpx0JaNVHHmh6lmtKfDc08g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=in-advantage.com; dmarc=pass action=none header.from=in-advantage.com; dkim=pass header.d=in-advantage.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inadvantage.onmicrosoft.com; s=selector2-inadvantage-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oU84Rbt19vAc/NrOPCabhl5B1B9LG6TK1vJ2rFw/GfA=; b=jAVmZoQgV+YhAbCkpEJPIQU9yVRucqSbEcKArjUYz/nRMO6LFj+ksuGrxdUhrIT+9A43udtjPRc2FhD58XmE0UoK1xqAdy1HNedvPqeNFUlTLxccGgSsrPrad+g+f29RricPWnlkLw4NaUEPqqvclMHrp4c3KS1mgd1i1ZEXPkU= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=in-advantage.com; Received: from MWHPR1001MB2351.namprd10.prod.outlook.com (2603:10b6:301:35::37) by CH2PR10MB4293.namprd10.prod.outlook.com (2603:10b6:610:7f::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5834.11; Sat, 19 Nov 2022 23:14:25 +0000 Received: from MWHPR1001MB2351.namprd10.prod.outlook.com ([fe80::45b5:a860:9cea:a74c]) by MWHPR1001MB2351.namprd10.prod.outlook.com ([fe80::45b5:a860:9cea:a74c%4]) with mapi id 15.20.5834.009; Sat, 19 Nov 2022 23:14:25 +0000 From: Colin Foster To: linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: Paolo Abeni , Eric Dumazet , "David S. Miller" , Florian Fainelli , Andrew Lunn , UNGLinuxDriver@microchip.com, Alexandre Belloni , Claudiu Manoil , Vladimir Oltean Subject: [PATCH v2 net-next 3/3] net: mscc: ocelot: issue a warning if stats are incorrectly ordered Date: Sat, 19 Nov 2022 15:14:06 -0800 Message-Id: <20221119231406.3167852-4-colin.foster@in-advantage.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221119231406.3167852-1-colin.foster@in-advantage.com> References: <20221119231406.3167852-1-colin.foster@in-advantage.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SJ0PR13CA0027.namprd13.prod.outlook.com (2603:10b6:a03:2c0::32) To MWHPR1001MB2351.namprd10.prod.outlook.com (2603:10b6:301:35::37) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWHPR1001MB2351:EE_|CH2PR10MB4293:EE_ X-MS-Office365-Filtering-Correlation-Id: 46ff3f0f-2b85-44a2-8cc1-08daca83ccf6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SifbMxJUBkfSE4zg7CVDsJiyybzAaoT/Ezzk2wxVJ6zjMss3BOmchq76sFdnUQl+b9NyWWDhkQTrtxDyISEvBjPoFZGbwRi79BU2Vor++8X3EsYEDs9Fv8o+CKUWVRQBE8BTwKEKDwKxpjhAti9HvJg8ynn/GkzhAHvOJZD1U6zFGHUF2UHbksE8dBSHSU0uZX2i7eaLg9+5EtcjMqYsp4FHa5pPDCfKF75QJJjUU6gkwtVm34OT9eyDlP/TthZNt2cfDdgx3Gcdhsvx2hdDJUcsQY1Wh5CqQ1+mgLzF2wO/wZvRbxpTjT9WJR6m+EnqyXeWFpzVV8qgeCh6fmTHpY1TchoW7rzIPAOrVI/F7AvAjxcd1xvCGhBw68adyCwUbD++dt93wEY+WQCr/TyyMD27PrCpw6UZt9DnXQHcIyfYBMOTTu7ki42Wmp6LGrHvLROK3gf94Vn7Ft94elZ/y0HJ5AZLgxnj36jE5c0d5/6VVup8lZxxd4G9qtJdha17uFVGjbvoVn1ND68AgWaSTVT/eiPh9dEsgXSRNXqwVG7jFdftR+2vte9dgGIl1d1njFi9LV7D9ucCRHyj9fzxvbnlq97xR5OfczNSs9aFNpdxKBnZ31Xags0BNpAFneMTjX7wvDXGEWEtM/Cn/8EwG4IgG6a8SG+8s6Vmb4TIX9/IHYeQDJHVRI0VJEnjNCTe X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR1001MB2351.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(366004)(396003)(136003)(376002)(39830400003)(346002)(451199015)(2906002)(26005)(86362001)(83380400001)(6512007)(4326008)(8676002)(66476007)(66556008)(66946007)(38350700002)(38100700002)(36756003)(41300700001)(44832011)(54906003)(8936002)(5660300002)(316002)(186003)(7416002)(52116002)(478600001)(1076003)(6666004)(6486002)(2616005)(6506007);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?NhZIhcUBScE55+0J1kzJPiQW+dxjv4QrxZpCRi7KTxjclYStk7+BYFWiSwmx?= =?us-ascii?Q?B2pvRJnj/e09zTmGDHQfQw29T+RYM49Gi413AGenQrGiMR2rfEoblicwGOBX?= =?us-ascii?Q?Xk9JBmI4Cl3CGjsA1n69/eQCluGKe5YfUqfCu91rxY5aWzWN37raWGxQeX3i?= =?us-ascii?Q?iR6fm4Cy+k/CePTuN5o7JRMncNxpwSC6Bp8sMba+sYElSehXh2gxeqoL5I2+?= =?us-ascii?Q?WzenY82fOFl709jy4LdhoKKUBzoBnleR6+cqYqsxlecZZrn1NF3LJbZechjO?= =?us-ascii?Q?u4F/j3505ZJ/Jq6xnAcvyygTdk7gtC3fmlkA7Gkq7CfWNw07aY7o1QXM6H1O?= =?us-ascii?Q?0wpK/ozN3wU3M9Cq3/dQAK41y7wowhM3hzJJEZ5zHz/UIYyPmUVuf/Eu7/5N?= =?us-ascii?Q?+w+mpSNIaQXnqrPiJboJXqU1ayknO0DnoMhwZa6HKOxrHAZuh57se9CqrYjp?= =?us-ascii?Q?+7tU5qMwZQPvL1QeIOHzIGtUSN5wn/903iHEimXGdU5MF0c9fz9Miv2tqMEc?= =?us-ascii?Q?tJTAe0qy3Lubye8tUzVcCOg3jsbnnZbsAb6YBBV5lXwT/jMCMLDWr+oSWBBh?= =?us-ascii?Q?NcoimTkDzX30VZrwMXYIwPz65LtptX2g66XtATOzu5XosXCwe9QG7igi9wvE?= =?us-ascii?Q?cn5zfIWxqzbN6H6hWhsAP0b7PLHwd5YxVEHvj5gUOQsV7AdHybQbXVPmaWOc?= =?us-ascii?Q?X46KyrzTWX67fC7g7xP0rds/SHGmBX0o4YtjLuS+fciP9/CE7UUHnJJjKhc6?= =?us-ascii?Q?Dy5/pyuiUm9Ej2LfHLVfBhAQfKWIXeOaFNLtAB+q45doY4yJ+8lzdzOMNimN?= =?us-ascii?Q?cRK9Xkz5zjxbf50ttWEfdbH+mCvmzZ1Jm0JlX/y/d0wqbtjzywiSyPRmIwz4?= =?us-ascii?Q?icCXANv2L7kvCt3ZY0LX9jufrDsr7yn7lMEbR6AksvhsNFwLAEX5GZewVHOX?= =?us-ascii?Q?unCVNi4eDoXJlnALNCgQqpoqA+Mvh7cl9iNz4JmbyjGfbVlUbcTNE+5CyvVw?= =?us-ascii?Q?kJPQJKaRe379JjiinhaFHslbVVgHaLrZiildKE1JTR1OHc9dJ2/zUdyCfF7J?= =?us-ascii?Q?0Wa9O9cMPKzFiE5w26l1Dd28aZkRYRRSqVuVddhKhw1XU1QJivreVIU27Z8a?= =?us-ascii?Q?YzSiU0tPsI7GlYSObRqpCOFVEdyZCXWjg1KmzNkRv5T4rWEVcrQZNf//D8Ww?= =?us-ascii?Q?79lj1MTwpvRaQojp+Ht6RkBReddw20r6pxZiKEUA1Pvsz4Jwt1M2+PrXVTAD?= =?us-ascii?Q?xH7tF1Wr2EgS+QTbrMPhtj3f/z4n1GPOr4yARFyFDPG5WLByGvh48jx0UAem?= =?us-ascii?Q?TlbiLqTPpodWZBUS1uIDW7DoJMbpcBSKhr11pO3rryjPGj7ZW0JQynt9CW4V?= =?us-ascii?Q?cyFFAxihsJVH9GBs+D0KRIZP03qH7PibgkjwH8J1OUeygtDufEHsVVEVHwzt?= =?us-ascii?Q?p3EpWFLD/SAV17VApsYyzVZ1fQm1C0hlWQq09PVU4FbwE3iLNLqcbC6fM6Bh?= =?us-ascii?Q?GK+ji69bpHcuNGbuQvrAeLoLXGEUc0tpjylF4B0AKjNfrEPTpkbPcvnCLuDg?= =?us-ascii?Q?ffzXOpHn+Ehj5JKdl1vyqDV0/1es50BVJvPn9Qo3tV2N/TXSpYsS6ZGxGPOv?= =?us-ascii?Q?MA=3D=3D?= X-OriginatorOrg: in-advantage.com X-MS-Exchange-CrossTenant-Network-Message-Id: 46ff3f0f-2b85-44a2-8cc1-08daca83ccf6 X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Nov 2022 23:14:25.5832 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 48e842ca-fbd8-4633-a79d-0c955a7d3aae X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: nGOfZ7RphEJ/Nf11de9NuL0STvy54DJeHWTCIUMFAPxtIcDxWFL/mXgleDytiwjEeNJ1e4ffmsPIMlgvnK73ZS6PWP6fxy3Hkr3uFZHEM2Y= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR10MB4293 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Ocelot uses regmap_bulk_read() operations to efficiently read stats registers. Currently the implementation relies on the stats layout to be ordered to be most efficient. Issue a warning if any future implementations happen to break this pattern. Signed-off-by: Colin Foster Co-developed-by: Vladimir Oltean Reviewed-by: Vladimir Oltean --- v1->v2 * New patch, picked up from previous mailings --- drivers/net/ethernet/mscc/ocelot_stats.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mscc/ocelot_stats.c b/drivers/net/etherne= t/mscc/ocelot_stats.c index 68e9f450c468..1478c3b21af1 100644 --- a/drivers/net/ethernet/mscc/ocelot_stats.c +++ b/drivers/net/ethernet/mscc/ocelot_stats.c @@ -602,7 +602,7 @@ EXPORT_SYMBOL(ocelot_port_get_stats64); static int ocelot_prepare_stats_regions(struct ocelot *ocelot) { struct ocelot_stats_region *region =3D NULL; - unsigned int last; + unsigned int last =3D 0; int i; =20 INIT_LIST_HEAD(&ocelot->stats_regions); @@ -619,6 +619,12 @@ static int ocelot_prepare_stats_regions(struct ocelot = *ocelot) if (!region) return -ENOMEM; =20 + /* enum ocelot_stat must be kept sorted in the same + * order as ocelot_stats_layout[i].reg in order to have + * efficient bulking + */ + WARN_ON(last >=3D ocelot_stats_layout[i].reg); + region->base =3D ocelot_stats_layout[i].reg; region->count =3D 1; list_add_tail(®ion->node, &ocelot->stats_regions); --=20 2.25.1