2023-03-21 18:22:53 +00:00
|
|
|
From patchwork Tue Mar 21 17:33:58 2023
|
2023-03-20 16:20:40 +00:00
|
|
|
Content-Type: text/plain; charset="utf-8"
|
|
|
|
|
MIME-Version: 1.0
|
|
|
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
|
X-Patchwork-Submitter: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?=
|
|
|
|
|
<noltari@gmail.com>
|
2023-03-21 18:22:53 +00:00
|
|
|
X-Patchwork-Id: 13183004
|
2023-03-20 16:20:40 +00:00
|
|
|
X-Patchwork-Delegate: kuba@kernel.org
|
|
|
|
|
Return-Path: <netdev-owner@vger.kernel.org>
|
|
|
|
|
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])
|
2023-03-21 18:22:53 +00:00
|
|
|
by smtp.lore.kernel.org (Postfix) with ESMTP id B2B12C74A5B
|
|
|
|
|
for <netdev@archiver.kernel.org>; Tue, 21 Mar 2023 17:35:12 +0000 (UTC)
|
2023-03-20 16:20:40 +00:00
|
|
|
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
|
2023-03-21 18:22:53 +00:00
|
|
|
id S230297AbjCURfK (ORCPT <rfc822;netdev@archiver.kernel.org>);
|
|
|
|
|
Tue, 21 Mar 2023 13:35:10 -0400
|
|
|
|
|
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47438 "EHLO
|
2023-03-20 16:20:40 +00:00
|
|
|
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
|
2023-03-21 18:22:53 +00:00
|
|
|
with ESMTP id S230374AbjCURex (ORCPT
|
|
|
|
|
<rfc822;netdev@vger.kernel.org>); Tue, 21 Mar 2023 13:34:53 -0400
|
|
|
|
|
Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com
|
|
|
|
|
[IPv6:2a00:1450:4864:20::432])
|
|
|
|
|
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C906B5550A;
|
|
|
|
|
Tue, 21 Mar 2023 10:34:26 -0700 (PDT)
|
|
|
|
|
Received: by mail-wr1-x432.google.com with SMTP id y14so14546846wrq.4;
|
|
|
|
|
Tue, 21 Mar 2023 10:34:26 -0700 (PDT)
|
2023-03-20 16:20:40 +00:00
|
|
|
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
|
2023-03-21 18:22:53 +00:00
|
|
|
d=gmail.com; s=20210112; t=1679420064;
|
2023-03-20 16:20:40 +00:00
|
|
|
h=content-transfer-encoding:mime-version:references:in-reply-to
|
|
|
|
|
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
|
|
|
|
|
:message-id:reply-to;
|
2023-03-21 18:22:53 +00:00
|
|
|
bh=vnvnwWc5Tmg09HBQo/m9RbRM6yM8KLx8r1VA+Abfg3k=;
|
|
|
|
|
b=eFv+mwe94Y2YZMiJP5gydXVrGlbIAR5HCrY0rdcoGoMPzQUHLFckZeYCgEKudI55I7
|
|
|
|
|
gMLZYCtLwvDXvKeHM2AUigsq2YuJSeF5QwICPrhTnMwUGBg4yyyltrc3+J0lSd6/4kQv
|
|
|
|
|
h0yM1Oo4v0d8CuqjBU6bXienIk34AFVJfsPq+vWQTjAbUL7ht4WHZ2Ez2MFoTvZpkIJA
|
|
|
|
|
5iWMyVoMbugZl6eqNRjvDHFmtBtrZIv8AFs10r2Ca6+Yxm+aq0v33DRkbSVVqgFPNEzy
|
|
|
|
|
q5QOXOeLBPL6BvyovOpmVSWGoHf1zFV7lrzcqi+uc+FuYxQ9dyN3ND73DrrhWSkLaSg9
|
|
|
|
|
r8yA==
|
2023-03-20 16:20:40 +00:00
|
|
|
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
|
2023-03-21 18:22:53 +00:00
|
|
|
d=1e100.net; s=20210112; t=1679420064;
|
2023-03-20 16:20:40 +00:00
|
|
|
h=content-transfer-encoding:mime-version:references:in-reply-to
|
|
|
|
|
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
|
|
|
|
|
:subject:date:message-id:reply-to;
|
2023-03-21 18:22:53 +00:00
|
|
|
bh=vnvnwWc5Tmg09HBQo/m9RbRM6yM8KLx8r1VA+Abfg3k=;
|
|
|
|
|
b=jIRB8pIlrLA/ovhnEoePs/6SX8fn6l7l4fY2CxX2pLrTbP1JI8AAetPavvrNVQTr2M
|
|
|
|
|
Vm0iLbKyL/VpTq9+bSN1SMjaoi4lAMj0pgafoHrwABMVZpFauYvtCfSYTstZ2pw4Dr1j
|
|
|
|
|
wYQGj3BUSpFIYHtSIDMkb5449WA3T3TONhaQLRFAUCBD6gAFyEky5fY+DIHrGaj352B6
|
|
|
|
|
9ST/tkqHgPpuFlmromr42KQWoTFU+Pj0Uhyp7ru4BsnF7tTshWroZZIHUJmSACudEadr
|
|
|
|
|
fBPiuurX9jgp9zNqj8Oy0HjiVUnULFCapj8yICGp5s44uDAK/XFqFXpOuJ8ptS6uPazU
|
|
|
|
|
xUwg==
|
|
|
|
|
X-Gm-Message-State: AO0yUKX2w6QZfaGDHtlZAlY/U8F8VuJa3HwlgXbxgGChgdgvIoFThawv
|
|
|
|
|
oDyFAhWbVfe4DxwXTwxgJ/I=
|
2023-03-20 16:20:40 +00:00
|
|
|
X-Google-Smtp-Source:
|
2023-03-21 18:22:53 +00:00
|
|
|
AK7set+sH60XiJYup7bqrZTzFJVNe1YGcX/UTfjWV9xfGwNyodc34cHvKpqNagw5J+vEpv6CKvNHaA==
|
|
|
|
|
X-Received: by 2002:adf:f344:0:b0:2cd:de25:1c76 with SMTP id
|
|
|
|
|
e4-20020adff344000000b002cdde251c76mr12989754wrp.17.1679420064464;
|
|
|
|
|
Tue, 21 Mar 2023 10:34:24 -0700 (PDT)
|
2023-03-20 16:20:40 +00:00
|
|
|
Received: from atlantis.lan (255.red-79-146-124.dynamicip.rima-tde.net.
|
|
|
|
|
[79.146.124.255])
|
|
|
|
|
by smtp.gmail.com with ESMTPSA id
|
2023-03-21 18:22:53 +00:00
|
|
|
b13-20020a056000054d00b002da1261aa44sm184775wrf.48.2023.03.21.10.34.22
|
2023-03-20 16:20:40 +00:00
|
|
|
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
|
2023-03-21 18:22:53 +00:00
|
|
|
Tue, 21 Mar 2023 10:34:23 -0700 (PDT)
|
2023-03-20 16:20:40 +00:00
|
|
|
From: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?= <noltari@gmail.com>
|
2023-03-21 18:22:53 +00:00
|
|
|
To: f.fainelli@gmail.com, jonas.gorski@gmail.com, andrew@lunn.ch,
|
|
|
|
|
olteanv@gmail.com, davem@davemloft.net, edumazet@google.com,
|
|
|
|
|
kuba@kernel.org, pabeni@redhat.com, robh+dt@kernel.org,
|
2023-03-20 16:20:40 +00:00
|
|
|
krzysztof.kozlowski+dt@linaro.org, netdev@vger.kernel.org,
|
|
|
|
|
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org
|
|
|
|
|
Cc: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?= <noltari@gmail.com>
|
2023-03-21 18:22:53 +00:00
|
|
|
Subject: [PATCH v2 3/4] net: dsa: b53: mmap: allow passing a chip ID
|
|
|
|
|
Date: Tue, 21 Mar 2023 18:33:58 +0100
|
|
|
|
|
Message-Id: <20230321173359.251778-4-noltari@gmail.com>
|
2023-03-20 16:20:40 +00:00
|
|
|
X-Mailer: git-send-email 2.30.2
|
2023-03-21 18:22:53 +00:00
|
|
|
In-Reply-To: <20230321173359.251778-1-noltari@gmail.com>
|
2023-03-20 16:20:40 +00:00
|
|
|
References: <20230320155024.164523-1-noltari@gmail.com>
|
2023-03-21 18:22:53 +00:00
|
|
|
<20230321173359.251778-1-noltari@gmail.com>
|
2023-03-20 16:20:40 +00:00
|
|
|
MIME-Version: 1.0
|
|
|
|
|
Precedence: bulk
|
|
|
|
|
List-ID: <netdev.vger.kernel.org>
|
|
|
|
|
X-Mailing-List: netdev@vger.kernel.org
|
|
|
|
|
X-Patchwork-Delegate: kuba@kernel.org
|
|
|
|
|
|
2023-03-21 18:22:53 +00:00
|
|
|
BCM6318 and BCM63268 SoCs require a special handling for their RGMIIs, so we
|
|
|
|
|
should be able to identify them as a special BCM63xx switch.
|
2023-03-20 16:20:40 +00:00
|
|
|
|
|
|
|
|
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
|
|
|
|
|
---
|
2023-03-21 18:22:53 +00:00
|
|
|
v2:
|
|
|
|
|
- Add missing chip to b53_switch_chips[].
|
|
|
|
|
- Fix device_get_match_data() casting warning.
|
|
|
|
|
- Add BCM63268_DEVICE_ID to BCM6318 too.
|
|
|
|
|
- Add BCM6318 in commit description.
|
2023-03-20 16:20:40 +00:00
|
|
|
|
2023-03-21 18:22:53 +00:00
|
|
|
drivers/net/dsa/b53/b53_common.c | 13 +++++++++++++
|
|
|
|
|
drivers/net/dsa/b53/b53_mmap.c | 32 +++++++++++++++++++++++---------
|
|
|
|
|
drivers/net/dsa/b53/b53_priv.h | 9 ++++++++-
|
|
|
|
|
3 files changed, 44 insertions(+), 10 deletions(-)
|
|
|
|
|
|
|
|
|
|
--- a/drivers/net/dsa/b53/b53_common.c
|
|
|
|
|
+++ b/drivers/net/dsa/b53/b53_common.c
|
|
|
|
|
@@ -2461,6 +2461,19 @@ static const struct b53_chip_data b53_sw
|
|
|
|
|
.jumbo_size_reg = B53_JUMBO_MAX_SIZE_63XX,
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
+ .chip_id = BCM63268_DEVICE_ID,
|
|
|
|
|
+ .dev_name = "BCM63268",
|
|
|
|
|
+ .vlans = 4096,
|
|
|
|
|
+ .enabled_ports = 0, /* pdata must provide them */
|
|
|
|
|
+ .arl_bins = 4,
|
|
|
|
|
+ .arl_buckets = 1024,
|
|
|
|
|
+ .imp_port = 8,
|
|
|
|
|
+ .vta_regs = B53_VTA_REGS_63XX,
|
|
|
|
|
+ .duplex_reg = B53_DUPLEX_STAT_63XX,
|
|
|
|
|
+ .jumbo_pm_reg = B53_JUMBO_PORT_MASK_63XX,
|
|
|
|
|
+ .jumbo_size_reg = B53_JUMBO_MAX_SIZE_63XX,
|
|
|
|
|
+ },
|
|
|
|
|
+ {
|
|
|
|
|
.chip_id = BCM53010_DEVICE_ID,
|
|
|
|
|
.dev_name = "BCM53010",
|
|
|
|
|
.vlans = 4096,
|
2023-03-20 16:20:40 +00:00
|
|
|
--- a/drivers/net/dsa/b53/b53_mmap.c
|
|
|
|
|
+++ b/drivers/net/dsa/b53/b53_mmap.c
|
2023-04-01 18:58:54 +00:00
|
|
|
@@ -262,7 +262,7 @@ static int b53_mmap_probe_of(struct plat
|
2023-03-20 16:20:40 +00:00
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
|
|
pdata->regs = mem;
|
|
|
|
|
- pdata->chip_id = BCM63XX_DEVICE_ID;
|
2023-03-21 18:22:53 +00:00
|
|
|
+ pdata->chip_id = (u32)(unsigned long)device_get_match_data(dev);
|
2023-03-20 16:20:40 +00:00
|
|
|
pdata->big_endian = of_property_read_bool(np, "big-endian");
|
|
|
|
|
|
|
|
|
|
of_ports = of_get_child_by_name(np, "ports");
|
2023-04-01 18:58:54 +00:00
|
|
|
@@ -346,14 +346,28 @@ static void b53_mmap_shutdown(struct pla
|
2023-03-20 16:20:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static const struct of_device_id b53_mmap_of_table[] = {
|
|
|
|
|
- { .compatible = "brcm,bcm3384-switch" },
|
|
|
|
|
- { .compatible = "brcm,bcm6318-switch" },
|
|
|
|
|
- { .compatible = "brcm,bcm6328-switch" },
|
|
|
|
|
- { .compatible = "brcm,bcm6362-switch" },
|
|
|
|
|
- { .compatible = "brcm,bcm6368-switch" },
|
|
|
|
|
- { .compatible = "brcm,bcm63268-switch" },
|
|
|
|
|
- { .compatible = "brcm,bcm63xx-switch" },
|
|
|
|
|
- { /* sentinel */ },
|
|
|
|
|
+ {
|
|
|
|
|
+ .compatible = "brcm,bcm3384-switch",
|
|
|
|
|
+ .data = (void *)BCM63XX_DEVICE_ID,
|
|
|
|
|
+ }, {
|
|
|
|
|
+ .compatible = "brcm,bcm6318-switch",
|
2023-03-21 18:22:53 +00:00
|
|
|
+ .data = (void *)BCM63268_DEVICE_ID,
|
2023-03-20 16:20:40 +00:00
|
|
|
+ }, {
|
|
|
|
|
+ .compatible = "brcm,bcm6328-switch",
|
|
|
|
|
+ .data = (void *)BCM63XX_DEVICE_ID,
|
|
|
|
|
+ }, {
|
|
|
|
|
+ .compatible = "brcm,bcm6362-switch",
|
|
|
|
|
+ .data = (void *)BCM63XX_DEVICE_ID,
|
|
|
|
|
+ }, {
|
|
|
|
|
+ .compatible = "brcm,bcm6368-switch",
|
|
|
|
|
+ .data = (void *)BCM63XX_DEVICE_ID,
|
|
|
|
|
+ }, {
|
|
|
|
|
+ .compatible = "brcm,bcm63268-switch",
|
|
|
|
|
+ .data = (void *)BCM63268_DEVICE_ID,
|
|
|
|
|
+ }, {
|
|
|
|
|
+ .compatible = "brcm,bcm63xx-switch",
|
|
|
|
|
+ .data = (void *)BCM63XX_DEVICE_ID,
|
|
|
|
|
+ }, { /* sentinel */ }
|
|
|
|
|
};
|
|
|
|
|
MODULE_DEVICE_TABLE(of, b53_mmap_of_table);
|
|
|
|
|
|
|
|
|
|
--- a/drivers/net/dsa/b53/b53_priv.h
|
|
|
|
|
+++ b/drivers/net/dsa/b53/b53_priv.h
|
|
|
|
|
@@ -75,6 +75,7 @@ enum {
|
|
|
|
|
BCM53125_DEVICE_ID = 0x53125,
|
|
|
|
|
BCM53128_DEVICE_ID = 0x53128,
|
|
|
|
|
BCM63XX_DEVICE_ID = 0x6300,
|
|
|
|
|
+ BCM63268_DEVICE_ID = 0x63268,
|
|
|
|
|
BCM53010_DEVICE_ID = 0x53010,
|
|
|
|
|
BCM53011_DEVICE_ID = 0x53011,
|
|
|
|
|
BCM53012_DEVICE_ID = 0x53012,
|
|
|
|
|
@@ -186,7 +187,13 @@ static inline int is531x5(struct b53_dev
|
|
|
|
|
|
|
|
|
|
static inline int is63xx(struct b53_device *dev)
|
|
|
|
|
{
|
|
|
|
|
- return dev->chip_id == BCM63XX_DEVICE_ID;
|
|
|
|
|
+ return dev->chip_id == BCM63XX_DEVICE_ID ||
|
|
|
|
|
+ dev->chip_id == BCM63268_DEVICE_ID;
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+static inline int is63268(struct b53_device *dev)
|
|
|
|
|
+{
|
|
|
|
|
+ return dev->chip_id == BCM63268_DEVICE_ID;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline int is5301x(struct b53_device *dev)
|
