|
|
@@ -1,96 +1,125 @@
|
|
|
-From patchwork Mon Mar 20 15:50:23 2023
|
|
|
+From patchwork Tue Mar 21 17:33:58 2023
|
|
|
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?=
|
|
|
<[email protected]>
|
|
|
-X-Patchwork-Id: 13181525
|
|
|
+X-Patchwork-Id: 13183004
|
|
|
X-Patchwork-Delegate: [email protected]
|
|
|
Return-Path: <[email protected]>
|
|
|
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 AA605C7618D
|
|
|
- for <[email protected]>; Mon, 20 Mar 2023 16:00:42 +0000 (UTC)
|
|
|
+ by smtp.lore.kernel.org (Postfix) with ESMTP id B2B12C74A5B
|
|
|
+ for <[email protected]>; Tue, 21 Mar 2023 17:35:12 +0000 (UTC)
|
|
|
Received: ([email protected]) by vger.kernel.org via listexpand
|
|
|
- id S233060AbjCTQAk (ORCPT <rfc822;[email protected]>);
|
|
|
- Mon, 20 Mar 2023 12:00:40 -0400
|
|
|
-Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50606 "EHLO
|
|
|
+ id S230297AbjCURfK (ORCPT <rfc822;[email protected]>);
|
|
|
+ Tue, 21 Mar 2023 13:35:10 -0400
|
|
|
+Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47438 "EHLO
|
|
|
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
|
|
|
- with ESMTP id S233508AbjCTQAL (ORCPT
|
|
|
- <rfc822;[email protected]>); Mon, 20 Mar 2023 12:00:11 -0400
|
|
|
-Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com
|
|
|
- [IPv6:2a00:1450:4864:20::332])
|
|
|
- by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C8A523E0BA;
|
|
|
- Mon, 20 Mar 2023 08:50:37 -0700 (PDT)
|
|
|
-Received: by mail-wm1-x332.google.com with SMTP id
|
|
|
- fm20-20020a05600c0c1400b003ead37e6588so9459945wmb.5;
|
|
|
- Mon, 20 Mar 2023 08:50:37 -0700 (PDT)
|
|
|
+ with ESMTP id S230374AbjCURex (ORCPT
|
|
|
+ <rfc822;[email protected]>); 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)
|
|
|
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
|
|
|
- d=gmail.com; s=20210112; t=1679327432;
|
|
|
+ d=gmail.com; s=20210112; t=1679420064;
|
|
|
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;
|
|
|
- bh=16/AUEfT4/3aNTDuWfjKv1lfTz12+h3pg0SmLHFA5Y8=;
|
|
|
- b=n+22dPTXjE1jqw2beYW8Kqab5uczPETidauati8u3xeWTbKyfCENVVcYJBQgNPM3pw
|
|
|
- BeH+srFpkROFpxJ+btOlNSEZA4pIuBf2EOOU4AWrlPTWglRDxVHZ3X7kVDptJnxVGvre
|
|
|
- zNQ31LP8wxHP9XSFxYbkK9ybYYC8WP3fQZwcGcAgliP2cbKQMwuUP/i2w3Hqml8t6rP1
|
|
|
- 5HaZgmWt9wdh8c76nCWP03IuNM9oJ9qa3YWDBrVVN2eMe0mGxZmKR+Wb/BZj3o5ezJmu
|
|
|
- q41drXRwHBC6vF1K+HHeOgAcMlTKIJUAo2daNVm/UBTXj2SXsvfh4nfgrWVAexOpd/uP
|
|
|
- elYw==
|
|
|
+ bh=vnvnwWc5Tmg09HBQo/m9RbRM6yM8KLx8r1VA+Abfg3k=;
|
|
|
+ b=eFv+mwe94Y2YZMiJP5gydXVrGlbIAR5HCrY0rdcoGoMPzQUHLFckZeYCgEKudI55I7
|
|
|
+ gMLZYCtLwvDXvKeHM2AUigsq2YuJSeF5QwICPrhTnMwUGBg4yyyltrc3+J0lSd6/4kQv
|
|
|
+ h0yM1Oo4v0d8CuqjBU6bXienIk34AFVJfsPq+vWQTjAbUL7ht4WHZ2Ez2MFoTvZpkIJA
|
|
|
+ 5iWMyVoMbugZl6eqNRjvDHFmtBtrZIv8AFs10r2Ca6+Yxm+aq0v33DRkbSVVqgFPNEzy
|
|
|
+ q5QOXOeLBPL6BvyovOpmVSWGoHf1zFV7lrzcqi+uc+FuYxQ9dyN3ND73DrrhWSkLaSg9
|
|
|
+ r8yA==
|
|
|
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
|
|
|
- d=1e100.net; s=20210112; t=1679327432;
|
|
|
+ d=1e100.net; s=20210112; t=1679420064;
|
|
|
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;
|
|
|
- bh=16/AUEfT4/3aNTDuWfjKv1lfTz12+h3pg0SmLHFA5Y8=;
|
|
|
- b=6ZfI8DXxxDA2NF5hw1Mfoc/pGgW+OfRfwgMoE4jB/ABbQg8zdQ/Ja7FGIqVPbi2hZe
|
|
|
- fvd7j+dw8CZvNbkRbsYQvMTwRfDRonn8aAwJBBNkMyTcm8s3D5BRURzVpe0ScyzPYvxQ
|
|
|
- 0cXZASSL+EXA7Fyf51y4emSNy6Xb3nY0pjKWFUphqra9TdFQzhtnpdlN3tTwXFN9jlEu
|
|
|
- 3Se1FWEiQP5FRtqXIU/oefh5FMXoJEDCKq8geZ04mouAdeVxZd/FUBR754EY6uNAhMVG
|
|
|
- hef4iX7HeDpTCJLCprNVFgQ80bbl/uh+QnBtEVGlDFcH4GR7csGSIp2g/3Qzj/m78rkz
|
|
|
- ml1Q==
|
|
|
-X-Gm-Message-State: AO0yUKUPCBZQSCICZA8m4nHTp32xYgPPzQnSGO9a0aop0wLJeOUszuYx
|
|
|
- hH7zNhPrx7BZWaytny88AN0=
|
|
|
+ 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=
|
|
|
X-Google-Smtp-Source:
|
|
|
- AK7set9y2vPkyUF0Tln19u08/DwcR4L11U6iFXPmpi6kdzFhq0OrCiFNu8aAeCvisP/C/rvYvKH9Lw==
|
|
|
-X-Received: by 2002:a05:600c:310e:b0:3e9:f15b:935b with SMTP id
|
|
|
- g14-20020a05600c310e00b003e9f15b935bmr34745262wmo.32.1679327432097;
|
|
|
- Mon, 20 Mar 2023 08:50:32 -0700 (PDT)
|
|
|
+ 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)
|
|
|
Received: from atlantis.lan (255.red-79-146-124.dynamicip.rima-tde.net.
|
|
|
[79.146.124.255])
|
|
|
by smtp.gmail.com with ESMTPSA id
|
|
|
- 3-20020a05600c020300b003eddefd8792sm4812333wmi.14.2023.03.20.08.50.30
|
|
|
+ b13-20020a056000054d00b002da1261aa44sm184775wrf.48.2023.03.21.10.34.22
|
|
|
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
|
|
|
- Mon, 20 Mar 2023 08:50:31 -0700 (PDT)
|
|
|
+ Tue, 21 Mar 2023 10:34:23 -0700 (PDT)
|
|
|
From: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?= <[email protected]>
|
|
|
-To: [email protected], [email protected], [email protected],
|
|
|
- [email protected], [email protected], [email protected],
|
|
|
- [email protected], [email protected],
|
|
|
+To: [email protected], [email protected], [email protected],
|
|
|
+ [email protected], [email protected], [email protected],
|
|
|
+ [email protected], [email protected], [email protected],
|
|
|
[email protected], [email protected],
|
|
|
[email protected], [email protected]
|
|
|
Cc: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?= <[email protected]>
|
|
|
-Subject: [PATCH 3/4] net: dsa: b53: mmap: allow passing a chip ID
|
|
|
-Date: Mon, 20 Mar 2023 16:50:23 +0100
|
|
|
-Message-Id: <20230320155024.164523[email protected]>
|
|
|
+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[email protected]>
|
|
|
X-Mailer: git-send-email 2.30.2
|
|
|
-In-Reply-To: <20230320155024.164523[email protected]>
|
|
|
+In-Reply-To: <20230321173359.251778[email protected]>
|
|
|
References: <[email protected]>
|
|
|
+ <[email protected]>
|
|
|
MIME-Version: 1.0
|
|
|
Precedence: bulk
|
|
|
List-ID: <netdev.vger.kernel.org>
|
|
|
X-Mailing-List: [email protected]
|
|
|
X-Patchwork-Delegate: [email protected]
|
|
|
|
|
|
-BCM63268 SoCs require a special handling for their RGMIIs, so we should be
|
|
|
-able to identify them as a special BCM63xx switch.
|
|
|
+BCM6318 and BCM63268 SoCs require a special handling for their RGMIIs, so we
|
|
|
+should be able to identify them as a special BCM63xx switch.
|
|
|
|
|
|
Signed-off-by: Álvaro Fernández Rojas <[email protected]>
|
|
|
---
|
|
|
- drivers/net/dsa/b53/b53_mmap.c | 32 +++++++++++++++++++++++---------
|
|
|
- drivers/net/dsa/b53/b53_priv.h | 9 ++++++++-
|
|
|
- 2 files changed, 31 insertions(+), 10 deletions(-)
|
|
|
+ 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.
|
|
|
|
|
|
+ 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,
|
|
|
--- a/drivers/net/dsa/b53/b53_mmap.c
|
|
|
+++ b/drivers/net/dsa/b53/b53_mmap.c
|
|
|
@@ -248,7 +248,7 @@ static int b53_mmap_probe_of(struct plat
|
|
|
@@ -98,7 +127,7 @@ Signed-off-by: Álvaro Fernández Rojas <[email protected]>
|
|
|
|
|
|
pdata->regs = mem;
|
|
|
- pdata->chip_id = BCM63XX_DEVICE_ID;
|
|
|
-+ pdata->chip_id = (u32)device_get_match_data(dev);
|
|
|
++ pdata->chip_id = (u32)(unsigned long)device_get_match_data(dev);
|
|
|
pdata->big_endian = of_property_read_bool(np, "big-endian");
|
|
|
|
|
|
of_ports = of_get_child_by_name(np, "ports");
|
|
|
@@ -119,7 +148,7 @@ Signed-off-by: Álvaro Fernández Rojas <[email protected]>
|
|
|
+ .data = (void *)BCM63XX_DEVICE_ID,
|
|
|
+ }, {
|
|
|
+ .compatible = "brcm,bcm6318-switch",
|
|
|
-+ .data = (void *)BCM63XX_DEVICE_ID,
|
|
|
++ .data = (void *)BCM63268_DEVICE_ID,
|
|
|
+ }, {
|
|
|
+ .compatible = "brcm,bcm6328-switch",
|
|
|
+ .data = (void *)BCM63XX_DEVICE_ID,
|
Álvaro Fernández Rojas