From:   Colin Foster <colin.foster@in-advantage.com>
To:     netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
        devicetree@vger.kernel.org
Cc:     Russell King <linux@armlinux.org.uk>,
        Richard Cochran <richardcochran@gmail.com>,
        Florian Fainelli <f.fainelli@gmail.com>,
        Andrew Lunn <andrew@lunn.ch>, UNGLinuxDriver@microchip.com,
        Alexandre Belloni <alexandre.belloni@bootlin.com>,
        Claudiu Manoil <claudiu.manoil@nxp.com>,
        Vladimir Oltean <vladimir.oltean@nxp.com>,
        Paolo Abeni <pabeni@redhat.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Eric Dumazet <edumazet@google.com>,
        "David S. Miller" <davem@davemloft.net>,
        Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
        Rob Herring <robh+dt@kernel.org>, Lee Jones <lee@kernel.org>
Subject: [PATCH v5 net-next 06/13] net: dsa: felix: add configurable device quirks
Date:   Fri, 27 Jan 2023 11:35:52 -0800
Message-Id: <20230127193559.1001051-7-colin.foster@in-advantage.com>
In-Reply-To: <20230127193559.1001051-1-colin.foster@in-advantage.com>
References: <20230127193559.1001051-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?Z9qcycOI1zEkx4fNVc9bsl4Hp4AECm/rRktAeZws6oLCd/HvEdlxzPNlWds0?=
 =?us-ascii?Q?w2lKoi6pVHhs/Ej6nejM4WrYYGzCYprQbYF0MggkQJNQoox0nhEXwqAswNN+?=
 =?us-ascii?Q?IHhd79dwIF0DjtN/Vfv3R/DGr7nfhtD1jaXGSW2FKAlyGnPf11ncHjO8O2rv?=
 =?us-ascii?Q?0JJU3lb6xI1nIIvdUDzXR4kWfCUL//+L88D+qA9FHSeM417rnwC7EDaS82TP?=
 =?us-ascii?Q?gEQukBK2Ky8rc8xj/qkoYqkL78zDMOkmD/TJhEwIEwc+S/F+PsiN9REWWeDd?=
 =?us-ascii?Q?BefxNEI028/6E9kY7noqji+Qet+dRdYVi0NIhy/Isaqo8oAm8uuwYdTx3/9r?=
 =?us-ascii?Q?3WvaHVQFD1+1FDAxCgDRCJ57tt7BukcPM/YlocsobaxwTZuT1x7akrVhKJ4q?=
 =?us-ascii?Q?bo6EGSXcUl8BRNjmj+ZcodS3AWZdkuXHoOAwxuZnEJBQhJBGU4x5/i++WheF?=
 =?us-ascii?Q?cAtGbPPNjJR/nxGe908ojnNs12WeszxG6YCBQaKeBpGzfAh9nxdhU1GQAHrD?=
 =?us-ascii?Q?gBrNvV+3a/Oi6cmuZCjkFXfc5JOYHlB8Ok0uTvYKTYQVJVTA8Eb8W2d+Yfkb?=
 =?us-ascii?Q?qTvq7bya5aQSCILpkBsVKC+RAUUAxr2ZeXixHoDnpaOK1nwRJL0bhe5WJSyM?=
 =?us-ascii?Q?VGK6GWgiPWCz2KD2ZH1AyWlF/lIQZrQ5KsA0yke7KCUwbOI8ogk4nPZlWm/u?=
 =?us-ascii?Q?da89K3EJmNRFkbLmDmUw3Vw+3RUBi8e7mEY0qUjUz7Gus1qiUFKRysnCMq6o?=
 =?us-ascii?Q?AdqX0ffalpjGjE0A3luAmiU6EyzdIyGHNeGMGrcanSoAriXnAF+day67hnyZ?=
 =?us-ascii?Q?lcS64bwCRE0q2cGHXjQv+3fLGJEe6Y5psuoa9I0mUW+doHjc6RUjxSZ57rXa?=
 =?us-ascii?Q?cNYYDKOEFyMR0p63E+QJ4+P6j4EgrWhSZfvHz7XO12w+uMyLJXRjBVjbTUhv?=
 =?us-ascii?Q?IBrTvPuQozBn6ulAXxeAQyp+m+76hdX/r+JgDC4rPANPzbcqOOyb7bEQZJqh?=
 =?us-ascii?Q?RmEC+Ivujq41Voin7EHC78XRJcpZ0qrpcHWnrbhzm7QM4JI1Uw466L174CgK?=
 =?us-ascii?Q?dVAutDKoata/HCaHccxBR4lpQJniYvNdk9d/K8Ngc491EghOQAvdgM1fGuGQ?=
 =?us-ascii?Q?1BS3ZKZA4RhzdbjABQffnqP4WrVyZq19So1ZhobYvqhIpGZBQ0MXxcNOXwbG?=
 =?us-ascii?Q?NhhNiNNaE8TXVp01kNnYEVCombG5n2zn7D/O4pUSyjR9HTOpy8GdwZyc8fWq?=
 =?us-ascii?Q?/N8vbriyjvBw/YUjJwd9iV5IO5XkvPKKK2nvAnze4DP8A1hveHJqMtE/oMAh?=
 =?us-ascii?Q?xETnOhzfRfbTthvVPdbJncJvrP3vDvQ3t8X5weoTrKTPNHEiGTs11FR7Ub5P?=
 =?us-ascii?Q?rnORTqxO1RbnHuqB/0X0DshEnSEWtVSibiTZWs57baUxjdhlHMHctgSnpGk0?=
 =?us-ascii?Q?qHw07KcT+8qIQE90ia4p1g1SZC5+CS+kEmI5XRYh5wrdTihMVWWlZ0b860bk?=
 =?us-ascii?Q?JMrXBk+76dQ7bznjK2tX32bIDOuVfc9aosR0PdAJq7R924E8wCPUoucWH/Zr?=
 =?us-ascii?Q?xK+Q/cj7dZ6yo8jDow9BzxdkUv1x9ApKLJI+RIhLFMO3EcLKVI7vWhHuI7Qw?=
 =?us-ascii?Q?WWzwJbt2EV0p0xohEnl0zGU=3D?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 239e9969-fb3a-4783-3705-08db009dc4d4
X-MS-Exchange-CrossTenant-AuthSource: DM5PR1001MB2345.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2023 19:36:21.6727
 (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: z4W8IBy+WaflT1t6VdPehmBkeGJ5WLdxqfpRn/04IkWu53kyTZdNBD0qK8wRworhEBitblXZh9kmWCHDB+cnq45abkEpccE6vJnnb/5ssCo=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA2PR10MB4636
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-v5
    * 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 f57b4095b793..462a1a683996 100644
--- a/drivers/net/dsa/ocelot/felix.c
+++ b/drivers/net/dsa/ocelot/felix.c
@@ -1075,9 +1075,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,
@@ -1092,7 +1095,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 be22d6ccd7c8..9e1ae1dde0d9 100644
--- a/drivers/net/dsa/ocelot/felix.h
+++ b/drivers/net/dsa/ocelot/felix.h
@@ -36,6 +36,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 43dc8ed4854d..354aa3dbfde7 100644
--- a/drivers/net/dsa/ocelot/felix_vsc9959.c
+++ b/drivers/net/dsa/ocelot/felix_vsc9959.c
@@ -2593,6 +2593,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 88ed3a2e487a..287b64b788db 100644
--- a/drivers/net/dsa/ocelot/seville_vsc9953.c
+++ b/drivers/net/dsa/ocelot/seville_vsc9953.c
@@ -971,6 +971,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