net: phylink: add separate pcs operations structure
Add a separate set of PCS operations, which MAC drivers can use to couple phylink with their associated MAC PCS layer. The PCS operations include: - pcs_get_state() - reads the link up/down, resolved speed, duplex and pause from the PCS. - pcs_config() - configures the PCS for the specified mode, PHY interface type, and setting the advertisement. - pcs_an_restart() - restarts 802.3 in-band negotiation with the link partner - pcs_link_up() - informs the PCS that link has come up, and the parameters of the link. Link parameters are used to program the PCS for fixed speed and non-inband modes. Reviewed-by: Andrew Lunn <andrew@lunn.ch> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
e7765d634a
commit
4c0d6d3a7a
@@ -270,9 +270,97 @@ void mac_link_up(struct phylink_config *config, struct phy_device *phy,
|
||||
int speed, int duplex, bool tx_pause, bool rx_pause);
|
||||
#endif
|
||||
|
||||
/**
|
||||
* struct phylink_pcs_ops - MAC PCS operations structure.
|
||||
* @pcs_get_state: read the current MAC PCS link state from the hardware.
|
||||
* @pcs_config: configure the MAC PCS for the selected mode and state.
|
||||
* @pcs_an_restart: restart 802.3z BaseX autonegotiation.
|
||||
* @pcs_link_up: program the PCS for the resolved link configuration
|
||||
* (where necessary).
|
||||
*/
|
||||
struct phylink_pcs_ops {
|
||||
void (*pcs_get_state)(struct phylink_config *config,
|
||||
struct phylink_link_state *state);
|
||||
int (*pcs_config)(struct phylink_config *config, unsigned int mode,
|
||||
phy_interface_t interface,
|
||||
const unsigned long *advertising);
|
||||
void (*pcs_an_restart)(struct phylink_config *config);
|
||||
void (*pcs_link_up)(struct phylink_config *config, unsigned int mode,
|
||||
phy_interface_t interface, int speed, int duplex);
|
||||
};
|
||||
|
||||
#if 0 /* For kernel-doc purposes only. */
|
||||
/**
|
||||
* pcs_get_state() - Read the current inband link state from the hardware
|
||||
* @config: a pointer to a &struct phylink_config.
|
||||
* @state: a pointer to a &struct phylink_link_state.
|
||||
*
|
||||
* Read the current inband link state from the MAC PCS, reporting the
|
||||
* current speed in @state->speed, duplex mode in @state->duplex, pause
|
||||
* mode in @state->pause using the %MLO_PAUSE_RX and %MLO_PAUSE_TX bits,
|
||||
* negotiation completion state in @state->an_complete, and link up state
|
||||
* in @state->link. If possible, @state->lp_advertising should also be
|
||||
* populated.
|
||||
*
|
||||
* When present, this overrides mac_pcs_get_state() in &struct
|
||||
* phylink_mac_ops.
|
||||
*/
|
||||
void pcs_get_state(struct phylink_config *config,
|
||||
struct phylink_link_state *state);
|
||||
|
||||
/**
|
||||
* pcs_config() - Configure the PCS mode and advertisement
|
||||
* @config: a pointer to a &struct phylink_config.
|
||||
* @mode: one of %MLO_AN_FIXED, %MLO_AN_PHY, %MLO_AN_INBAND.
|
||||
* @interface: interface mode to be used
|
||||
* @advertising: adertisement ethtool link mode mask
|
||||
*
|
||||
* Configure the PCS for the operating mode, the interface mode, and set
|
||||
* the advertisement mask.
|
||||
*
|
||||
* When operating in %MLO_AN_INBAND, inband should always be enabled,
|
||||
* otherwise inband should be disabled.
|
||||
*
|
||||
* For SGMII, there is no advertisement from the MAC side, the PCS should
|
||||
* be programmed to acknowledge the inband word from the PHY.
|
||||
*
|
||||
* For 1000BASE-X, the advertisement should be programmed into the PCS.
|
||||
*
|
||||
* For most 10GBASE-R, there is no advertisement.
|
||||
*/
|
||||
int (*pcs_config)(struct phylink_config *config, unsigned int mode,
|
||||
phy_interface_t interface, const unsigned long *advertising);
|
||||
|
||||
/**
|
||||
* pcs_an_restart() - restart 802.3z BaseX autonegotiation
|
||||
* @config: a pointer to a &struct phylink_config.
|
||||
*
|
||||
* When PCS ops are present, this overrides mac_an_restart() in &struct
|
||||
* phylink_mac_ops.
|
||||
*/
|
||||
void (*pcs_an_restart)(struct phylink_config *config);
|
||||
|
||||
/**
|
||||
* pcs_link_up() - program the PCS for the resolved link configuration
|
||||
* @config: a pointer to a &struct phylink_config.
|
||||
* @mode: link autonegotiation mode
|
||||
* @interface: link &typedef phy_interface_t mode
|
||||
* @speed: link speed
|
||||
* @duplex: link duplex
|
||||
*
|
||||
* This call will be made just before mac_link_up() to inform the PCS of
|
||||
* the resolved link parameters. For example, a PCS operating in SGMII
|
||||
* mode without in-band AN needs to be manually configured for the link
|
||||
* and duplex setting. Otherwise, this should be a no-op.
|
||||
*/
|
||||
void (*pcs_link_up)(struct phylink_config *config, unsigned int mode,
|
||||
phy_interface_t interface, int speed, int duplex);
|
||||
#endif
|
||||
|
||||
struct phylink *phylink_create(struct phylink_config *, struct fwnode_handle *,
|
||||
phy_interface_t iface,
|
||||
const struct phylink_mac_ops *mac_ops);
|
||||
void phylink_add_pcs(struct phylink *, const struct phylink_pcs_ops *ops);
|
||||
void phylink_destroy(struct phylink *);
|
||||
|
||||
int phylink_connect_phy(struct phylink *, struct phy_device *);
|
||||
|
Reference in New Issue
Block a user