| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20240227093945.21525-7-bastien.curutchet@bootlin.com>
Date: Tue, 27 Feb 2024 10:39:45 +0100
From: Bastien Curutchet <bastien.curutchet@...tlin.com>
To: "David S. Miller" <davem@...emloft.net>,
Eric Dumazet <edumazet@...gle.com>,
Jakub Kicinski <kuba@...nel.org>,
Paolo Abeni <pabeni@...hat.com>,
Rob Herring <robh+dt@...nel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@...aro.org>,
Conor Dooley <conor+dt@...nel.org>,
Pavel Machek <pavel@....cz>,
Lee Jones <lee@...nel.org>,
Richard Cochran <richardcochran@...il.com>,
Andrew Lunn <andrew@...n.ch>,
Heiner Kallweit <hkallweit1@...il.com>,
Russell King <linux@...linux.org.uk>,
Bastien Curutchet <bastien.curutchet@...tlin.com>
Cc: linux-kernel@...r.kernel.org,
netdev@...r.kernel.org,
devicetree@...r.kernel.org,
linux-leds@...r.kernel.org,
Thomas Petazzoni <thomas.petazzoni@...tlin.com>,
herve.codina@...tlin.com,
maxime.chevallier@...tlin.com,
christophercordahi@...ometrics.ca
Subject: [PATCH v2 6/6] net: phy: DP83640: Add fiber mode enabling/disabling from device tree
The PHY is able to use copper or fiber. The fiber mode can be enabled or
disabled by hardware strap. If hardware strap is incorrect, PHY can't
establish link.
Add a DT attribute 'ti,fiber-mode' that can be use to override the
hardware strap configuration. If the property is not present, hardware
strap configuration is left as is.
Signed-off-by: Bastien Curutchet <bastien.curutchet@...tlin.com>
---
drivers/net/phy/dp83640.c | 55 +++++++++++++++++++++++++++++++++++
drivers/net/phy/dp83640_reg.h | 5 ++++
2 files changed, 60 insertions(+)
diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c
index b371dea23937..886f2bc3710d 100644
--- a/drivers/net/phy/dp83640.c
+++ b/drivers/net/phy/dp83640.c
@@ -16,6 +16,7 @@
#include <linux/net_tstamp.h>
#include <linux/netdevice.h>
#include <linux/if_vlan.h>
+#include <linux/of.h>
#include <linux/phy.h>
#include <linux/ptp_classify.h>
#include <linux/ptp_clock_kernel.h>
@@ -141,6 +142,11 @@ struct dp83640_private {
/* queues of incoming and outgoing packets */
struct sk_buff_head rx_queue;
struct sk_buff_head tx_queue;
+
+#define FIBER_MODE_DEFAULT 0
+#define FIBER_MODE_ENABLE 1
+#define FIBER_MODE_DISABLE 2
+ int fiber;
};
struct dp83640_clock {
@@ -1141,6 +1147,17 @@ static int dp83640_config_init(struct phy_device *phydev)
val = phy_read(phydev, PCFCR) & ~PCF_EN;
phy_write(phydev, PCFCR, val);
+ if (dp83640->fiber != FIBER_MODE_DEFAULT) {
+ val = phy_read(phydev, PCSR) & ~FX_EN;
+ if (dp83640->fiber == FIBER_MODE_ENABLE)
+ val |= FX_EN;
+ phy_write(phydev, PCSR, val);
+
+ /* Write SOFT_RESET bit to ensure configuration */
+ val = phy_read(phydev, PHYCR2) | SOFT_RESET;
+ phy_write(phydev, PHYCR2, val);
+ }
+
return 0;
}
@@ -1440,6 +1457,39 @@ static int dp83640_ts_info(struct mii_timestamper *mii_ts,
return 0;
}
+#ifdef CONFIG_OF_MDIO
+static int dp83640_of_init(struct phy_device *phydev)
+{
+ struct dp83640_private *dp83640 = phydev->priv;
+ struct device *dev = &phydev->mdio.dev;
+ struct device_node *of_node = dev->of_node;
+ const char *fiber;
+ int ret;
+
+ if (of_property_present(of_node, "ti,fiber-mode")) {
+ ret = of_property_read_string(of_node, "ti,fiber-mode", &fiber);
+ if (ret)
+ return ret;
+
+ dp83640->fiber = FIBER_MODE_DEFAULT;
+ if (!strncmp(fiber, "enable", 6))
+ dp83640->fiber = FIBER_MODE_ENABLE;
+ else if (!strncmp(fiber, "disable", 7))
+ dp83640->fiber = FIBER_MODE_DISABLE;
+ else
+ return -EINVAL;
+ }
+
+ return 0;
+}
+#else
+static int dp83640_of_init(struct phy_device *phydev)
+{
+ dp83640->fiber = FIBER_MODE_DEFAULT;
+ return 0;
+}
+#endif /* CONFIG_OF_MDIO */
+
static int dp83640_probe(struct phy_device *phydev)
{
struct dp83640_clock *clock;
@@ -1472,6 +1522,10 @@ static int dp83640_probe(struct phy_device *phydev)
phydev->mii_ts = &dp83640->mii_ts;
phydev->priv = dp83640;
+ err = dp83640_of_init(phydev);
+ if (err < 0)
+ goto of_failed;
+
spin_lock_init(&dp83640->rx_lock);
skb_queue_head_init(&dp83640->rx_queue);
skb_queue_head_init(&dp83640->tx_queue);
@@ -1494,6 +1548,7 @@ static int dp83640_probe(struct phy_device *phydev)
no_register:
clock->chosen = NULL;
+of_failed:
kfree(dp83640);
no_memory:
dp83640_clock_put(clock);
diff --git a/drivers/net/phy/dp83640_reg.h b/drivers/net/phy/dp83640_reg.h
index b5adb8958c08..cbecf04da5a5 100644
--- a/drivers/net/phy/dp83640_reg.h
+++ b/drivers/net/phy/dp83640_reg.h
@@ -6,6 +6,7 @@
#define HAVE_DP83640_REGISTERS
/* #define PAGE0 0x0000 */
+#define PCSR 0x0016 /* PCS Configuration and Status Register */
#define LEDCR 0x0018 /* PHY Control Register */
#define PHYCR 0x0019 /* PHY Control Register */
#define PHYCR2 0x001c /* PHY Control Register 2 */
@@ -54,6 +55,9 @@
#define PTP_GPIOMON 0x001e /* PTP GPIO Monitor Register */
#define PTP_RXHASH 0x001f /* PTP Receive Hash Register */
+/* Bit definitions for the PCSR register */
+#define FX_EN BIT(6) /* Enable FX Fiber Mode */
+
/* Bit definitions for the LEDCR register */
#define DP83640_LED_DIS(x) BIT((x) + 9) /* Disable LED */
#define DP83640_LED_DRV(x) BIT((x) + 3) /* Force LED val to output */
@@ -64,6 +68,7 @@
#define LED_CNFG_1 BIT(6) /* LED configuration, bit 1 */
/* Bit definitions for the PHYCR2 register */
+#define SOFT_RESET BIT(9) /* Soft Reset */
#define BC_WRITE (1<<11) /* Broadcast Write Enable */
/* Bit definitions for the EDCR register */
--
2.43.0
Powered by blists - more mailing lists