Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 648ea013 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: phy: Allow pre-declaration of MDIO devices 



Allow board support code to collect pre-declarations for MDIO devices by
registering them with mdiobus_register_board_info(). SPI and I2C buses
have a similar feature, we were missing this for MDIO devices, but this
is particularly useful for e.g: MDIO-connected switches which need to
provide their port layout (often board-specific) to a MDIO Ethernet
switch driver.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 71e0bbde

drivers/net/phy/Makefile

+2 −1
Original line number Diff line number Diff line 
# Makefile for Linux PHY drivers and MDIO bus drivers



libphy-y			:= phy.o phy_device.o mdio_bus.o mdio_device.o

libphy-y			:= phy.o phy_device.o mdio_bus.o mdio_device.o \

				   mdio-boardinfo.o

libphy-$(CONFIG_SWPHY)		+= swphy.o

libphy-$(CONFIG_LED_TRIGGER_PHY)	+= phy_led_triggers.o

drivers/net/phy/mdio-boardinfo.c

0 → 100644
+86 −0
Original line number Diff line number Diff line 
/*

 * mdio-boardinfo - Collect pre-declarations for MDIO devices

 *

 * This program is free software; you can redistribute  it and/or modify it

 * under  the terms of  the GNU General  Public License as published by the

 * Free Software Foundation;  either version 2 of the  License, or (at your

 * option) any later version.

 */



#include <linux/kernel.h>

#include <linux/slab.h>

#include <linux/export.h>

#include <linux/mutex.h>

#include <linux/list.h>



#include "mdio-boardinfo.h"



static LIST_HEAD(mdio_board_list);

static DEFINE_MUTEX(mdio_board_lock);



/**

 * mdiobus_setup_mdiodev_from_board_info - create and setup MDIO devices

 * from pre-collected board specific MDIO information

 * @mdiodev: MDIO device pointer

 * Context: can sleep

 */

void mdiobus_setup_mdiodev_from_board_info(struct mii_bus *bus)

{

	struct mdio_board_entry *be;

	struct mdio_device *mdiodev;

	struct mdio_board_info *bi;

	int ret;



	mutex_lock(&mdio_board_lock);

	list_for_each_entry(be, &mdio_board_list, list) {

		bi = &be->board_info;



		if (strcmp(bus->id, bi->bus_id))

			continue;



		mdiodev = mdio_device_create(bus, bi->mdio_addr);

		if (IS_ERR(mdiodev))

			continue;



		strncpy(mdiodev->modalias, bi->modalias,

			sizeof(mdiodev->modalias));

		mdiodev->bus_match = mdio_device_bus_match;

		mdiodev->dev.platform_data = (void *)bi->platform_data;



		ret = mdio_device_register(mdiodev);

		if (ret) {

			mdio_device_free(mdiodev);

			continue;

		}

	}

	mutex_unlock(&mdio_board_lock);

}



/**

 * mdio_register_board_info - register MDIO devices for a given board

 * @info: array of devices descriptors

 * @n: number of descriptors provided

 * Context: can sleep

 *

 * The board info passed can be marked with __initdata but be pointers

 * such as platform_data etc. are copied as-is

 */

int mdiobus_register_board_info(const struct mdio_board_info *info,

				unsigned int n)

{

	struct mdio_board_entry *be;

	unsigned int i;



	be = kcalloc(n, sizeof(*be), GFP_KERNEL);

	if (!be)

		return -ENOMEM;



	for (i = 0; i < n; i++, be++, info++) {

		memcpy(&be->board_info, info, sizeof(*info));

		mutex_lock(&mdio_board_lock);

		list_add_tail(&be->list, &mdio_board_list);

		mutex_unlock(&mdio_board_lock);

	}



	return 0;

}

drivers/net/phy/mdio-boardinfo.h

0 → 100644
+19 −0
Original line number Diff line number Diff line 
/*

 * mdio-boardinfo.h - board info interface internal to the mdio_bus

 * component

 */



#ifndef __MDIO_BOARD_INFO_H

#define __MDIO_BOARD_INFO_H



#include <linux/phy.h>

#include <linux/mutex.h>



struct mdio_board_entry {

	struct list_head	list;

	struct mdio_board_info	board_info;

};



void mdiobus_setup_mdiodev_from_board_info(struct mii_bus *bus);



#endif /* __MDIO_BOARD_INFO_H */

drivers/net/phy/mdio_bus.c

+4 −0
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ 
#define CREATE_TRACE_POINTS

#include <trace/events/mdio.h>



#include "mdio-boardinfo.h"



int mdiobus_register_device(struct mdio_device *mdiodev)

{

	if (mdiodev->bus->mdio_map[mdiodev->addr])
@@ -343,6 +345,8 @@ int __mdiobus_register(struct mii_bus *bus, struct module *owner) 
		}

	}



	mdiobus_setup_mdiodev_from_board_info(bus);



	bus->state = MDIOBUS_REGISTERED;

	pr_info("%s: probed\n", bus->name);

	return 0;

drivers/net/phy/mdio_device.c

+11 −0
Original line number Diff line number Diff line
@@ -34,6 +34,17 @@ static void mdio_device_release(struct device *dev) 
	kfree(to_mdio_device(dev));

}



int mdio_device_bus_match(struct device *dev, struct device_driver *drv)

{

	struct mdio_device *mdiodev = to_mdio_device(dev);

	struct mdio_driver *mdiodrv = to_mdio_driver(drv);



	if (mdiodrv->mdiodrv.flags & MDIO_DEVICE_IS_PHY)

		return 0;



	return strcmp(mdiodev->modalias, drv->name) == 0;

}



struct mdio_device *mdio_device_create(struct mii_bus *bus, int addr)

{

	struct mdio_device *mdiodev;