> +struct lan8814_priv {
> + const struct kszphy_type *type;
> + int led_mode;
> + bool rmii_ref_clk_sel;
> + bool rmii_ref_clk_sel_val;
> + u64 stats[ARRAY_SIZE(kszphy_hw_stats)];
> + struct mii_timestamper mii_ts;
> + struct phy_device *phydev;
> + struct lan8814_ptp ptp;
> + int hwts_tx_en;
> + int hwts_rx_en;
> + int layer;
> + int version;
> +};
...
> @@ -304,7 +698,7 @@ static int kszphy_nand_tree_disable(struct phy_device
> *phydev)
> /* Some config bits need to be set again on resume, handle them here. */
> static int kszphy_config_reset(struct phy_device *phydev)
> {
> - struct kszphy_priv *priv = phydev->priv;
> + struct lan8814_priv *priv = phydev->priv;
> int ret;
>
> if (priv->rmii_ref_clk_sel) {
...
> +static int lan8814_probe(struct phy_device *phydev)
> +{
> + struct lan8814_priv *priv;
> + struct clk *clk;
> + const struct kszphy_type *type = phydev->drv->driver_data;
> + const struct device_node *np = phydev->mdio.dev.of_node;
> +
> + priv = devm_kzalloc(&phydev->mdio.dev, sizeof(*priv), GFP_KERNEL);
> + if (!priv)
> + return -ENOMEM;
> static struct phy_driver ksphy_driver[] = {
> {
> .phy_id = PHY_ID_KS8737,
> @@ -1352,7 +2392,7 @@ static struct phy_driver ksphy_driver[] = {
> .phy_id_mask = MICREL_PHY_ID_MASK,
> .name = "Microchip INDY Gigabit Quad PHY",
> .driver_data = &ksz9021_type,
> - .probe = kszphy_probe,
> + .probe = lan8814_probe,
> .soft_reset = genphy_soft_reset,
> .read_status = ksz9031_read_status,
> .get_sset_count = kszphy_get_sset_count,
> @@ -1360,6 +2400,8 @@ static struct phy_driver ksphy_driver[] = {
> .get_stats = kszphy_get_stats,
> .suspend = genphy_suspend,
> .resume = kszphy_resume,
> + .config_intr = lan8814_config_intr,
> + .handle_interrupt = lan8814_handle_interrupt,
> }, {
> .phy_id = PHY_ID_KSZ9131,
> .phy_id_mask = MICREL_PHY_ID_MASK,
If i'm reading this correctly, only PHYs using lan8814_probe() have a
lan8814_priv. All the other phys have a kszphy_priv. Yet in
kszphy_config_reset() you seem to assume it is a lan8814_priv. This is
dangerous.
It would be much better to define a kszphy_ptp_priv structure, and put
a pointer to it in kszphy_priv. Allocate this structure in
lan8814_probe() and leave it NULL otherwise.
Andrew
