Commit 6041d8bf authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-phy-clean-up-phy-h' 

Heiner Kallweit says:

====================
net: phy: clean up phy.h

This series is a starting point to clean up phy.h and remove
definitions which are phylib-internal.
====================

Link: https://patch.msgid.link/d14f8a69-dc21-4ff7-8401-574ffe2f4bc5@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents a24c6ccc 6b2edfba

drivers/net/phy/phy.c

+3 −3
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ void phy_ethtool_ksettings_get(struct phy_device *phydev, 
		cmd->base.port = PORT_BNC;

	else

		cmd->base.port = phydev->port;

	cmd->base.transceiver = phy_is_internal(phydev) ?

	cmd->base.transceiver = phydev->is_internal ?

				XCVR_INTERNAL : XCVR_EXTERNAL;

	cmd->base.phy_address = phydev->mdio.addr;

	cmd->base.autoneg = phydev->autoneg;
@@ -520,12 +520,12 @@ int __phy_hwtstamp_set(struct phy_device *phydev, 
 * @phydev: the phy_device struct

 * @jiffies: Run the state machine after these jiffies

 */

void phy_queue_state_machine(struct phy_device *phydev, unsigned long jiffies)

static void phy_queue_state_machine(struct phy_device *phydev,

				    unsigned long jiffies)

{

	mod_delayed_work(system_power_efficient_wq, &phydev->state_queue,

			 jiffies);

}

EXPORT_SYMBOL(phy_queue_state_machine);



/**

 * phy_trigger_machine - Trigger the state machine to run now

drivers/net/phy/phy_device.c

+20 −20
Original line number Diff line number Diff line
@@ -45,6 +45,17 @@ MODULE_DESCRIPTION("PHY library"); 
MODULE_AUTHOR("Andy Fleming");

MODULE_LICENSE("GPL");



#define	PHY_ANY_ID	"MATCH ANY PHY"

#define	PHY_ANY_UID	0xffffffff



struct phy_fixup {

	struct list_head list;

	char bus_id[MII_BUS_ID_SIZE + 3];

	u32 phy_uid;

	u32 phy_uid_mask;

	int (*run)(struct phy_device *phydev);

};



__ETHTOOL_DECLARE_LINK_MODE_MASK(phy_basic_features) __ro_after_init;

EXPORT_SYMBOL_GPL(phy_basic_features);
@@ -80,37 +91,28 @@ static const int phy_all_ports_features_array[7] = { 
	ETHTOOL_LINK_MODE_Backplane_BIT,

};



const int phy_10_100_features_array[4] = {

static const int phy_10_100_features_array[4] = {

	ETHTOOL_LINK_MODE_10baseT_Half_BIT,

	ETHTOOL_LINK_MODE_10baseT_Full_BIT,

	ETHTOOL_LINK_MODE_100baseT_Half_BIT,

	ETHTOOL_LINK_MODE_100baseT_Full_BIT,

};

EXPORT_SYMBOL_GPL(phy_10_100_features_array);



const int phy_basic_t1_features_array[3] = {

static const int phy_basic_t1_features_array[3] = {

	ETHTOOL_LINK_MODE_TP_BIT,

	ETHTOOL_LINK_MODE_10baseT1L_Full_BIT,

	ETHTOOL_LINK_MODE_100baseT1_Full_BIT,

};

EXPORT_SYMBOL_GPL(phy_basic_t1_features_array);



const int phy_basic_t1s_p2mp_features_array[2] = {

static const int phy_basic_t1s_p2mp_features_array[2] = {

	ETHTOOL_LINK_MODE_TP_BIT,

	ETHTOOL_LINK_MODE_10baseT1S_P2MP_Half_BIT,

};

EXPORT_SYMBOL_GPL(phy_basic_t1s_p2mp_features_array);



const int phy_gbit_features_array[2] = {

static const int phy_gbit_features_array[2] = {

	ETHTOOL_LINK_MODE_1000baseT_Half_BIT,

	ETHTOOL_LINK_MODE_1000baseT_Full_BIT,

};

EXPORT_SYMBOL_GPL(phy_gbit_features_array);



const int phy_10gbit_features_array[1] = {

	ETHTOOL_LINK_MODE_10000baseT_Full_BIT,

};

EXPORT_SYMBOL_GPL(phy_10gbit_features_array);



static const int phy_eee_cap1_features_array[] = {

	ETHTOOL_LINK_MODE_100baseT_Full_BIT,
@@ -185,8 +187,7 @@ static void features_init(void) 
	linkmode_set_bit_array(phy_gbit_features_array,

			       ARRAY_SIZE(phy_gbit_features_array),

			       phy_10gbit_features);

	linkmode_set_bit_array(phy_10gbit_features_array,

			       ARRAY_SIZE(phy_10gbit_features_array),

	linkmode_set_bit(ETHTOOL_LINK_MODE_10000baseT_Full_BIT,

			 phy_10gbit_features);



	linkmode_set_bit_array(phy_eee_cap1_features_array,
@@ -378,7 +379,7 @@ static SIMPLE_DEV_PM_OPS(mdio_bus_phy_pm_ops, mdio_bus_phy_suspend, 
 *	comparison

 * @run: The actual code to be run when a matching PHY is found

 */

int phy_register_fixup(const char *bus_id, u32 phy_uid, u32 phy_uid_mask,

static int phy_register_fixup(const char *bus_id, u32 phy_uid, u32 phy_uid_mask,

			      int (*run)(struct phy_device *))

{

	struct phy_fixup *fixup = kzalloc(sizeof(*fixup), GFP_KERNEL);
@@ -397,7 +398,6 @@ int phy_register_fixup(const char *bus_id, u32 phy_uid, u32 phy_uid_mask, 


	return 0;

}

EXPORT_SYMBOL(phy_register_fixup);



/* Registers a fixup to be run on any PHY with the UID in phy_uid */

int phy_register_fixup_for_uid(u32 phy_uid, u32 phy_uid_mask,
@@ -544,7 +544,7 @@ phy_interface_show(struct device *dev, struct device_attribute *attr, char *buf) 
	struct phy_device *phydev = to_phy_device(dev);

	const char *mode = NULL;



	if (phy_is_internal(phydev))

	if (phydev->is_internal)

		mode = "internal";

	else

		mode = phy_modes(phydev->interface);

include/linux/phy.h

+0 −29
Original line number Diff line number Diff line
@@ -54,11 +54,6 @@ extern __ETHTOOL_DECLARE_LINK_MODE_MASK(phy_eee_cap2_features) __ro_after_init; 
#define PHY_EEE_CAP2_FEATURES ((unsigned long *)&phy_eee_cap2_features)



extern const int phy_basic_ports_array[3];

extern const int phy_10_100_features_array[4];

extern const int phy_basic_t1_features_array[3];

extern const int phy_basic_t1s_p2mp_features_array[2];

extern const int phy_gbit_features_array[2];

extern const int phy_10gbit_features_array[1];



/*

 * Set phydev->irq to PHY_POLL if interrupts are not supported,
@@ -1287,9 +1282,6 @@ struct phy_driver { 
#define to_phy_driver(d) container_of_const(to_mdio_common_driver(d),		\

				      struct phy_driver, mdiodrv)



#define PHY_ANY_ID "MATCH ANY PHY"

#define PHY_ANY_UID 0xffffffff



#define PHY_ID_MATCH_EXACT(id) .phy_id = (id), .phy_id_mask = GENMASK(31, 0)

#define PHY_ID_MATCH_MODEL(id) .phy_id = (id), .phy_id_mask = GENMASK(31, 4)

#define PHY_ID_MATCH_VENDOR(id) .phy_id = (id), .phy_id_mask = GENMASK(31, 10)
@@ -1322,15 +1314,6 @@ static inline bool phydev_id_compare(struct phy_device *phydev, u32 id) 
	return phy_id_compare(id, phydev->phy_id, phydev->drv->phy_id_mask);

}



/* A Structure for boards to register fixups with the PHY Lib */

struct phy_fixup {

	struct list_head list;

	char bus_id[MII_BUS_ID_SIZE + 3];

	u32 phy_uid;

	u32 phy_uid_mask;

	int (*run)(struct phy_device *phydev);

};



const char *phy_speed_to_str(int speed);

const char *phy_duplex_to_str(unsigned int duplex);

const char *phy_rate_matching_to_str(int rate_matching);
@@ -1756,15 +1739,6 @@ static inline bool phy_is_default_hwtstamp(struct phy_device *phydev) 
	return phy_has_hwtstamp(phydev) && phydev->default_timestamp;

}



/**

 * phy_is_internal - Convenience function for testing if a PHY is internal

 * @phydev: the phy_device struct

 */

static inline bool phy_is_internal(struct phy_device *phydev)

{

	return phydev->is_internal;

}



/**

 * phy_on_sfp - Convenience function for testing if a PHY is on an SFP module

 * @phydev: the phy_device struct
@@ -2088,7 +2062,6 @@ int phy_drivers_register(struct phy_driver *new_driver, int n, 
			 struct module *owner);

void phy_error(struct phy_device *phydev);

void phy_state_machine(struct work_struct *work);

void phy_queue_state_machine(struct phy_device *phydev, unsigned long jiffies);

void phy_trigger_machine(struct phy_device *phydev);

void phy_mac_interrupt(struct phy_device *phydev);

void phy_start_machine(struct phy_device *phydev);
@@ -2127,8 +2100,6 @@ s32 phy_get_internal_delay(struct phy_device *phydev, struct device *dev, 
void phy_resolve_pause(unsigned long *local_adv, unsigned long *partner_adv,

		       bool *tx_pause, bool *rx_pause);



int phy_register_fixup(const char *bus_id, u32 phy_uid, u32 phy_uid_mask,

		       int (*run)(struct phy_device *));

int phy_register_fixup_for_id(const char *bus_id,

			      int (*run)(struct phy_device *));

int phy_register_fixup_for_uid(u32 phy_uid, u32 phy_uid_mask,