MACB: Set PHY address in kernel parameters
in [Kernel]
|
Prev: [PATCH][RFC] x86: remove SMP check/taint for AMD K7 (was Re: KVM warning about uncertified CPU for SMP for AMD model 2, stepping 3)
Next: sched: check for prev_cpu == this_cpu before calling wake_affine()
From: Jiri Pirko on 31 Mar 2010 06:10 Wed, Mar 31, 2010 at 09:51:42AM CEST, anders.darander(a)gmail.com wrote: >From: Anders Darander <ad(a)datarespons.se> > >Add the possibility to set the phy address. This is needed if an integrated >switch is connected to the MAC, as it is often the case that the highest port >is the one connected to the MAC of the MCU. > >E.g. in the case of the Micrel KSZ8873, port 3 is the one to connect to the >MCU, thus, the MAC needs to connect to phy address 0x03, instead of the first >phy found. > >Signed-off-by: Anders Darander <ad(a)datarespons.se> >--- > drivers/net/macb.c | 14 +++++++++++++- > 1 files changed, 13 insertions(+), 1 deletions(-) > >diff --git a/drivers/net/macb.c b/drivers/net/macb.c >index c8a18a6..9b4e301 100644 >--- a/drivers/net/macb.c >+++ b/drivers/net/macb.c >@@ -53,6 +53,14 @@ > #define MACB_RX_INT_FLAGS (MACB_BIT(RCOMP) | MACB_BIT(RXUBR) \ > | MACB_BIT(ISR_ROVR)) > >+/* >+ * Setup PHY probeing >+ */ >+ >+static int phy_addr = PHY_MAX_ADDR; >+module_param(phy_addr, ushort, 0); >+MODULE_PARAM_DESC(phy_addr, "PHY address connected to the MACB"); >+ > static void __macb_set_hwaddr(struct macb *bp) > { > u32 bottom; >@@ -193,7 +201,11 @@ static int macb_mii_probe(struct net_device *dev) > struct eth_platform_data *pdata; > int ret; > >- phydev = phy_find_first(bp->mii_bus); >+ if (phy_addr >= PHY_MAX_ADDRESS) >+ phydev = phy_find_first(bp->mii_bus); >+ else >+ phydev = bp->mii_bus->phy_map[phy_addr]; >+ > if (!phydev) { > printk (KERN_ERR "%s: no PHY found\n", dev->name); > return -1; >-- >1.7.0.3 > This is really ugly :( Should be done differently, more general. I've been thinking about this for a while. Maybe the solution is to integrate the switch into DSA subsystem. See net/dsa. Not sure though... Jirka -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Anders Darander on 31 Mar 2010 06:20
* Jiri Pirko <jpirko(a)redhat.com> [100331 12:03]: > Wed, Mar 31, 2010 at 09:51:42AM CEST, anders.darander(a)gmail.com wrote: > > > >- phydev = phy_find_first(bp->mii_bus); > >+ if (phy_addr >= PHY_MAX_ADDRESS) > >+ phydev = phy_find_first(bp->mii_bus); > >+ else > >+ phydev = bp->mii_bus->phy_map[phy_addr]; > >+ > > if (!phydev) { > > printk (KERN_ERR "%s: no PHY found\n", dev->name); > > return -1; > > This is really ugly :( Should be done differently, more general. I've been > thinking about this for a while. Maybe the solution is to integrate the switch > into DSA subsystem. See net/dsa. Not sure though... A more general solution is always welcome... However, although I've not tested it, I think that Marc Kleine-Budde came up with the correct solution. That was using phy_mask, and set it up in the *eth_data structure in the board setup code. Thus, it seems that the needed functionality is readily available. (Working in the embedded field, I've no problem with defining HW-related things in the board setup code, as opposite of having it dynamically defined). Regards, Anders -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |