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 [thread overview]
Message-ID: <20230127193559.1001051-7-colin.foster@in-advantage.com> (raw)
In-Reply-To: <20230127193559.1001051-1-colin.foster@in-advantage.com>
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
next prev parent reply other threads:[~2023-01-27 19:37 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-27 19:35 [PATCH v5 net-next 00/13] add support for the the vsc7512 internal copper phys Colin Foster
2023-01-27 19:35 ` [PATCH v5 net-next 01/13] net: mscc: ocelot: expose ocelot wm functions Colin Foster
2023-01-27 19:37 ` Florian Fainelli
2023-01-27 19:35 ` [PATCH v5 net-next 02/13] net: mscc: ocelot: expose regfield definition to be used by other drivers Colin Foster
2023-01-27 19:38 ` Florian Fainelli
2023-01-27 19:35 ` [PATCH v5 net-next 03/13] net: mscc: ocelot: expose vcap_props structure Colin Foster
2023-01-27 19:38 ` Florian Fainelli
2023-01-27 19:35 ` [PATCH v5 net-next 04/13] net: mscc: ocelot: expose ocelot_reset routine Colin Foster
2023-01-27 19:38 ` Florian Fainelli
2023-01-27 19:35 ` [PATCH v5 net-next 05/13] net: mscc: ocelot: expose vsc7514_regmap definition Colin Foster
2023-01-27 19:39 ` Florian Fainelli
2023-01-27 19:35 ` Colin Foster [this message]
2023-01-27 19:39 ` [PATCH v5 net-next 06/13] net: dsa: felix: add configurable device quirks Florian Fainelli
2023-01-27 19:35 ` [PATCH v5 net-next 07/13] net: dsa: felix: add support for MFD configurations Colin Foster
2023-01-27 19:40 ` Florian Fainelli
2023-01-27 19:35 ` [PATCH v5 net-next 08/13] net: dsa: felix: add functionality when not all ports are supported Colin Foster
2023-01-27 19:41 ` Florian Fainelli
2023-01-27 19:35 ` [PATCH v5 net-next 09/13] mfd: ocelot: prepend resource size macros to be 32-bit Colin Foster
2023-01-27 19:41 ` Florian Fainelli
2023-01-27 19:35 ` [PATCH v5 net-next 10/13] dt-bindings: net: mscc,vsc7514-switch: add dsa binding for the vsc7512 Colin Foster
2023-01-30 21:10 ` Rob Herring
2023-01-27 19:35 ` [PATCH v5 net-next 11/13] dt-bindings: mfd: ocelot: add ethernet-switch hardware support Colin Foster
2023-01-30 21:10 ` Rob Herring
2023-01-27 19:35 ` [PATCH v5 net-next 12/13] net: dsa: ocelot: add external ocelot switch control Colin Foster
2023-01-27 19:53 ` Florian Fainelli
2023-01-27 19:35 ` [PATCH v5 net-next 13/13] mfd: " Colin Foster
2023-01-27 19:53 ` Florian Fainelli
2023-01-27 20:15 ` Colin Foster
2023-01-30 15:31 ` [PATCH v5 net-next 00/13] add support for the the vsc7512 internal copper phys Vladimir Oltean
2023-01-31 5:20 ` patchwork-bot+netdevbpf
2023-01-31 9:06 ` Lee Jones
2023-01-31 19:45 ` Jakub Kicinski
2023-01-31 19:55 ` Colin Foster
2023-02-01 10:15 ` Lee Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230127193559.1001051-7-colin.foster@in-advantage.com \
--to=colin.foster@in-advantage.com \
--cc=UNGLinuxDriver@microchip.com \
--cc=alexandre.belloni@bootlin.com \
--cc=andrew@lunn.ch \
--cc=claudiu.manoil@nxp.com \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=edumazet@google.com \
--cc=f.fainelli@gmail.com \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=kuba@kernel.org \
--cc=lee@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=richardcochran@gmail.com \
--cc=robh+dt@kernel.org \
--cc=vladimir.oltean@nxp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).