Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Colin Foster <colin.foster@in-advantage.com>
To:     linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org,
        devicetree@vger.kernel.org, netdev@vger.kernel.org
Cc:     Russell King <linux@armlinux.org.uk>,
        Linus Walleij <linus.walleij@linaro.org>,
        UNGLinuxDriver@microchip.com,
        Alexandre Belloni <alexandre.belloni@bootlin.com>,
        Claudiu Manoil <claudiu.manoil@nxp.com>,
        Lee Jones <lee@kernel.org>,
        Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
        Rob Herring <robh+dt@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Eric Dumazet <edumazet@google.com>,
        "David S. Miller" <davem@davemloft.net>,
        Vladimir Oltean <olteanv@gmail.com>,
        Florian Fainelli <f.fainelli@gmail.com>,
        Vivien Didelot <vivien.didelot@gmail.com>,
        Andrew Lunn <andrew@lunn.ch>,
        Vladimir Oltean <vladimir.oltean@nxp.com>
Subject: [PATCH v3 net-next 06/14] net: dsa: felix: add configurable device quirks
Date:   Sun, 25 Sep 2022 17:29:20 -0700
Message-Id: <20220926002928.2744638-7-colin.foster@in-advantage.com>
In-Reply-To: <20220926002928.2744638-1-colin.foster@in-advantage.com>
References: <20220926002928.2744638-1-colin.foster@in-advantage.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?uBkVwnNvdErNVBM4O1H/JG7IQVZCAXPL9gvWmgh18jrPwSCtlyPIKL8aHzb6?=
 =?us-ascii?Q?dYsU8FkL6zQmZ0lILPtUyfWnyPiX2zpIQB8MlZ8J7IzZuhS3b070Ppl/+gJo?=
 =?us-ascii?Q?9X9AjThWMUhQp3yV4oNjhtBqwLKTOFkXOfD5fEnksgI8uTYuAdqt7/mj12XI?=
 =?us-ascii?Q?RqCIZQ4Hof773z5wHYlBUAfx1S3kMdeOcMmAqDrhmprWjPfJxgEc2znd/YKi?=
 =?us-ascii?Q?bopzhruobZ7H7VVHYyuRVSiYqWxqSMYJfqCxt5Nc4vrvvwc+jFTmkD/raw6+?=
 =?us-ascii?Q?WEqkQNxONs+tz9uQckWT4XkSXv6ftAK03UAOt0MjdOUvK7oE0XrMfO0JAroB?=
 =?us-ascii?Q?76+Nxr/2eLP3XdrBfYIH2i4Sv6Cjts1DSUZPUwpvedWR1zV9bN+Hk34Cx9Wg?=
 =?us-ascii?Q?SocHJMxNACb/eTsYbY58G8ePF/3pqSLv2mMbcr5VE12PnrKtQ87gUZnBFxav?=
 =?us-ascii?Q?kgl3ITua6aQ3mEyvLzmOQBjUlas1wF+zGuHbiGZdMnFICqQAb0XFJALBwtoc?=
 =?us-ascii?Q?WWEsPvcH4UOJym08Jur5KjVxQa/W5vyZRvWI7+cHBRRa+Q8/aqEbmfDTy+fI?=
 =?us-ascii?Q?vmg9wBG62hr84T/LBPNu8y6+GiiSUoJQ/Xhb/yN1nUOy3aFgOg6uIHkTnds+?=
 =?us-ascii?Q?JwS6AmO00vYo15iuKfYOB6i04evr9cfky0NswKpN30lwb7ytprvhT3ubtXvF?=
 =?us-ascii?Q?93I/Z5Ux4qAkDFhXNYCfrqI+18K0OWNVuSR5lUVkuXyoasQWrZtGuFnT0Oli?=
 =?us-ascii?Q?LE+sucEknR5NbC5fa9gqeZ9FWhZ5xG1wS2xOjgtDNSS/GiiYvbobH2QDXSAU?=
 =?us-ascii?Q?ZC9NhjOhQi8LUXQQxstwQDdrhG4zcUodok7Q2k0WDLh/ELxVmHfXO6pJuzA+?=
 =?us-ascii?Q?hksGTV7rGwFDOoI3vf0/eyRaD92MIZDw5KJauPHo1kBclMhuO0rQlpNY/reI?=
 =?us-ascii?Q?5ukQ0SQkfwkphPzk5mM39C+gH0KrZ/SeJmgo8G7yIXv2eC0nAxpmQ+crRC2V?=
 =?us-ascii?Q?GBIlr6qlpeXXhgmmNvWq7RO7Xpe/vTMl5q9vNDFtMjz2SJ7bbmAfM6xC5+bq?=
 =?us-ascii?Q?BGYsFaxV97VSfoqpnD1MzQYje9mCwINrCID649OQ/N+iF+4fSxYU0XRgjmuV?=
 =?us-ascii?Q?ceivW9Dw1YeXj1+SzjM0QZMqFNWpXqyPyQyryUgRrOCSC1lCyCGJWmubFffv?=
 =?us-ascii?Q?ZSWUKZk7gIi4+BLrx/5B97GQZJPBS4u9OGDhiff+9JEfwAD1qut4Dk3zXCj/?=
 =?us-ascii?Q?TXQoxgM6o/dEoYspsGDzWZly6YfoVhm5EYPGdZB0zDmCk3NVrfwHT8k6pQy9?=
 =?us-ascii?Q?3xj2It9TAEIOWXYHo8LDeawzSnXOUZsePm41Qvs47mhjdiRirwFLD2RxriRa?=
 =?us-ascii?Q?L2oJTzx8PrUg59ee3bSPgoCVkpULDEX8ECJA2feLJzANh/1PvZ9YayjlnsBa?=
 =?us-ascii?Q?UTm1th31o7Th3fyv/uwLHRtPk9ZXJqzBf0/AYW9fU1+PIXQ/zHztvBhgDJ57?=
 =?us-ascii?Q?WTO688McQxxQv68q1PkDMm5mq5jZpjPLNluASOf7uryEr3Ui+09E6x4yeMB7?=
 =?us-ascii?Q?1cpthoX+Rv84caNLRUCIebvYePkt6w45Qpxo0+RRZBD67T6Q1+anXNm0Npph?=
 =?us-ascii?Q?WA=3D=3D?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e8c25ded-3bc0-4413-db45-08da9f564c02
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2022 00:30:22.0418
 (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: Cb0NEcsLnoE6seWf5STenbBBYaxEaWt9GkBE6BdDalBLxl6cQtn8c/mSBKXvAiU8PgPTiC2U7umy2Hw8d1Q/GacbkKGoBYa3IyqPmiK8w34=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLAPR10MB4849
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The define FELIX_MAC_QUIRKS was used directly in the felix.c shared driver.
Other devices (VSC7512 for example) don't require the same quirks, so they
need to be configured on a per-device basis.

Signed-off-by: Colin Foster <colin.foster@in-advantage.com>
Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---

v2 & v3
    * No changes

v1 from previous RFC:
    * No changes

---
 drivers/net/dsa/ocelot/felix.c           | 7 +++++--
 drivers/net/dsa/ocelot/felix.h           | 1 +
 drivers/net/dsa/ocelot/felix_vsc9959.c   | 1 +
 drivers/net/dsa/ocelot/seville_vsc9953.c | 1 +
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/net/dsa/ocelot/felix.c b/drivers/net/dsa/ocelot/felix.c
index d2a9d292160c..07c2f1b6913d 100644
--- a/drivers/net/dsa/ocelot/felix.c
+++ b/drivers/net/dsa/ocelot/felix.c
@@ -1082,9 +1082,12 @@ static void felix_phylink_mac_link_down(struct dsa_switch *ds, int port,
 					phy_interface_t interface)
 {
 	struct ocelot *ocelot = ds->priv;
+	struct felix *felix;
+
+	felix = ocelot_to_felix(ocelot);
 
 	ocelot_phylink_mac_link_down(ocelot, port, link_an_mode, interface,
-				     FELIX_MAC_QUIRKS);
+				     felix->info->quirks);
 }
 
 static void felix_phylink_mac_link_up(struct dsa_switch *ds, int port,
@@ -1099,7 +1102,7 @@ static void felix_phylink_mac_link_up(struct dsa_switch *ds, int port,
 
 	ocelot_phylink_mac_link_up(ocelot, port, phydev, link_an_mode,
 				   interface, speed, duplex, tx_pause, rx_pause,
-				   FELIX_MAC_QUIRKS);
+				   felix->info->quirks);
 
 	if (felix->info->port_sched_speed_set)
 		felix->info->port_sched_speed_set(ocelot, port, speed);
diff --git a/drivers/net/dsa/ocelot/felix.h b/drivers/net/dsa/ocelot/felix.h
index e4fd5eef57a0..f94a445c2542 100644
--- a/drivers/net/dsa/ocelot/felix.h
+++ b/drivers/net/dsa/ocelot/felix.h
@@ -33,6 +33,7 @@ struct felix_info {
 	u16				vcap_pol_base2;
 	u16				vcap_pol_max2;
 	const struct ptp_clock_info	*ptp_caps;
+	unsigned long			quirks;
 
 	/* Some Ocelot switches are integrated into the SoC without the
 	 * extraction IRQ line connected to the ARM GIC. By enabling this
diff --git a/drivers/net/dsa/ocelot/felix_vsc9959.c b/drivers/net/dsa/ocelot/felix_vsc9959.c
index 2ec49e42b3f4..2fd2bb499e9c 100644
--- a/drivers/net/dsa/ocelot/felix_vsc9959.c
+++ b/drivers/net/dsa/ocelot/felix_vsc9959.c
@@ -2605,6 +2605,7 @@ static const struct felix_info felix_info_vsc9959 = {
 	.num_mact_rows		= 2048,
 	.num_ports		= VSC9959_NUM_PORTS,
 	.num_tx_queues		= OCELOT_NUM_TC,
+	.quirks			= FELIX_MAC_QUIRKS,
 	.quirk_no_xtr_irq	= true,
 	.ptp_caps		= &vsc9959_ptp_caps,
 	.mdio_bus_alloc		= vsc9959_mdio_bus_alloc,
diff --git a/drivers/net/dsa/ocelot/seville_vsc9953.c b/drivers/net/dsa/ocelot/seville_vsc9953.c
index 5b29fa930627..e589d07f84db 100644
--- a/drivers/net/dsa/ocelot/seville_vsc9953.c
+++ b/drivers/net/dsa/ocelot/seville_vsc9953.c
@@ -1071,6 +1071,7 @@ static const struct felix_info seville_info_vsc9953 = {
 	.vcap_pol_max		= VSC9953_VCAP_POLICER_MAX,
 	.vcap_pol_base2		= VSC9953_VCAP_POLICER_BASE2,
 	.vcap_pol_max2		= VSC9953_VCAP_POLICER_MAX2,
+	.quirks			= FELIX_MAC_QUIRKS,
 	.num_mact_rows		= 2048,
 	.num_ports		= VSC9953_NUM_PORTS,
 	.num_tx_queues		= OCELOT_NUM_TC,
-- 
2.25.1