Skip to content

Commit 4284b6a

Browse files
ffainellidavem330
authored andcommitted
phy: allow drivers to flag a PHY device as internal
libphy currently always reports a PHY as an external transceiver from the ethtool output. This is inaccurate, because some drivers should be able to tell that a PHY device is an internal transceiver of an Ethernet MAC. Add a new flag (PHY_IS_INTERNAL) which can be set by PHY drivers just like other flags, and a corresponding helper: phy_is_internal() which can be used by networking drivers to query if a given PHY device is internal. Signed-off-by: Florian Fainelli <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 7ec8721 commit 4284b6a

File tree

3 files changed

+17
-1
lines changed

3 files changed

+17
-1
lines changed

drivers/net/phy/phy.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,8 @@ int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd)
294294
cmd->duplex = phydev->duplex;
295295
cmd->port = PORT_MII;
296296
cmd->phy_address = phydev->addr;
297-
cmd->transceiver = XCVR_EXTERNAL;
297+
cmd->transceiver = phy_is_internal(phydev) ?
298+
XCVR_INTERNAL : XCVR_EXTERNAL;
298299
cmd->autoneg = phydev->autoneg;
299300

300301
return 0;

drivers/net/phy/phy_device.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1017,6 +1017,9 @@ static int phy_probe(struct device *dev)
10171017
phy_interrupt_is_valid(phydev))
10181018
phydev->irq = PHY_POLL;
10191019

1020+
if (phydrv->flags & PHY_IS_INTERNAL)
1021+
phydev->is_internal = true;
1022+
10201023
mutex_lock(&phydev->lock);
10211024

10221025
/* Start out supporting everything. Eventually,

include/linux/phy.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949

5050
#define PHY_HAS_INTERRUPT 0x00000001
5151
#define PHY_HAS_MAGICANEG 0x00000002
52+
#define PHY_IS_INTERNAL 0x00000004
5253

5354
/* Interface Mode definitions */
5455
typedef enum {
@@ -261,6 +262,7 @@ struct phy_c45_device_ids {
261262
* phy_id: UID for this device found during discovery
262263
* c45_ids: 802.3-c45 Device Identifers if is_c45.
263264
* is_c45: Set to true if this phy uses clause 45 addressing.
265+
* is_internal: Set to true if this phy is internal to a MAC.
264266
* state: state of the PHY for management purposes
265267
* dev_flags: Device-specific flags used by the PHY driver.
266268
* addr: Bus address of PHY
@@ -298,6 +300,7 @@ struct phy_device {
298300

299301
struct phy_c45_device_ids c45_ids;
300302
bool is_c45;
303+
bool is_internal;
301304

302305
enum phy_state state;
303306

@@ -520,6 +523,15 @@ static inline bool phy_interrupt_is_valid(struct phy_device *phydev)
520523
return phydev->irq != PHY_POLL && phydev->irq != PHY_IGNORE_INTERRUPT;
521524
}
522525

526+
/**
527+
* phy_is_internal - Convenience function for testing if a PHY is internal
528+
* @phydev: the phy_device struct
529+
*/
530+
static inline bool phy_is_internal(struct phy_device *phydev)
531+
{
532+
return phydev->is_internal;
533+
}
534+
523535
struct phy_device *phy_device_create(struct mii_bus *bus, int addr, int phy_id,
524536
bool is_c45, struct phy_c45_device_ids *c45_ids);
525537
struct phy_device *get_phy_device(struct mii_bus *bus, int addr, bool is_c45);

0 commit comments

Comments
 (0)