Skip to contentSkip to conversation

MACB: Set PHY address in kernel parameters

PATCH In review Anders Darander 3 participants 4 messages Mar 31, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 MACB: Set PHY address in kernel parameters

From: Anders Darander <[email protected]>

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.

---

Changes from V1:
* Made the variable type consistent with the module parameter declaration. (I.e. made it unsigned short).

 drivers/net/macb.c |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)
drivers/net/macb.c +13 -1
index c8a18a6..af7b61b 100644
@@ -53,6 +53,14 @@
 #define MACB_RX_INT_FLAGS	(MACB_BIT(RCOMP) | MACB_BIT(RXUBR)	\
 				 | MACB_BIT(ISR_ROVR))
 
+/*
+ * Setup PHY probeing
+ */
+
+static unsigned short 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;
Signature · 1 line
1.7.0.3
#1 lore raw
Quoted 9 lines · Anders Darander

From: Anders Darander <[email protected]>

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.

We're using phy_mask in one of our projects, it's still using 2.6.29, though. I think it's worth testing if it's still working.

static struct at91_eth_data __initdata p298_macb_data = {
.is_rmii = 0,
.phy_mask = ~(1 << 8),
};

at91_add_device_eth(&p298_macb_data);

cheers, Marc

Signature · 4 lines
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |
#2 lore raw
Quoted 2 lines · Marc Kleine-Budde

We're using phy_mask in one of our projects, it's still using 2.6.29, though. I think it's worth testing if it's still working.

Well, that was obviously something I overlooked / misinterpreted when I tried to solve our problem!

As I understand it, phy_mask is a bitfield for setting which PHYs should be enabled... Then this should have worked OK for us!

Quoted 6 lines

static struct at91_eth_data __initdata p298_macb_data = {
.is_rmii = 0,
.phy_mask = ~(1 << 8),
};

at91_add_device_eth(&p298_macb_data);

I've not tested it, but it should probably have worked.

Regards,
Anders

#3 lore raw
Quoted 9 lines · Anders Darander
Quoted 2 lines · Marc Kleine-Budde

We're using phy_mask in one of our projects, it's still using 2.6.29, though. I think it's worth testing if it's still working.

Well, that was obviously something I overlooked / misinterpreted when I tried to solve our problem!

As I understand it, phy_mask is a bitfield for setting which PHYs should be enabled... Then this should have worked OK for us!

Yes, it's a bitmask of PHYs that should be probed.

Quoted 8 lines
Quoted 6 lines

static struct at91_eth_data __initdata p298_macb_data = {
.is_rmii = 0,
.phy_mask = ~(1 << 8),
};

at91_add_device_eth(&p298_macb_data);

I've not tested it, but it should probably have worked.

Cheers, Marc

Signature · 4 lines
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |