natsemi: Support Aculab E1/T1 cPCI carrier cards
Subsystems (2)
cover natsemi: Support Aculab E1/T1 cPCI carrier cards
These patches add support for the Aculab E1/T1 cPCI carrier card to the natsemi driver. The first patch provides support for using the MII port with no PHY and the second adds the quirk required to configure the card.
--
"You grabbed my hand and we fell into it, like a daydream - or a fever."
PATCH 1/2 natsemi: Add support for using MII port with no PHY
This patch provides code paths which allow the natsemi driver to use the external MII port on the chip but ignore any PHYs that may be attached to it. The link state will be left as it was when the driver started and can be configured via ethtool. Any PHYs that are present can be accessed via the MII ioctl()s.
This is useful for systems where the device is connected without a PHY or where either information or actions outside the scope of the driver are required in order to use the PHYs.
---
Previous versions of this patch exposed the new functionality as a module option. This has been removed. Any hardware that needs this should be identifiable by a quirk since it unlikely to behave correctly with an unmodified driver.
drivers/net/natsemi.c +56 -32
@@ -568,6 +568,8 @@u32 intr_status;/* Do not touch the nic registers */ int hands_off; +/* Don't pay attention to the reported link state. */ +int ignore_phy;/* external phy that is used: only valid if dev->if_port != PORT_TP */ int mii;int phy_addr_external;
@@ -696,7 +698,10 @@struct netdev_private *np =netdev_priv (dev);u32 tmp; -netif_carrier_off (dev); +if (np->ignore_phy) +netif_carrier_on (dev); +else +netif_carrier_off (dev);/* get the initial settings from hardware */ tmp =mdio_read (dev,MII_BMCR );
@@ -806,8 +811,10 @@ np->hands_off =0 ; np->intr_status =0 ; np->eeprom_size = natsemi_pci_info[chip_idx].eeprom_size; + np->ignore_phy =0 ;/* Initial port: +* - If configured to ignore the PHY set up for external. * - If the nic was configured to use an external phy and if find_mii * finds a phy: use external port, first phy that replies. * - Otherwise: internal port.
@@ -815,7 +822,7 @@* The address would be used to access a phy over the mii bus, but * the internal phy is accessed through mapped registers. */ -if (readl (ioaddr + ChipConfig) & CfgExtPhy) +if (np->ignore_phy ||readl (ioaddr + ChipConfig) & CfgExtPhy) dev->if_port =PORT_MII ;else dev->if_port =PORT_TP ;
@@ -825,7 +832,9 @@if (dev->if_port !=PORT_TP ) { np->phy_addr_external =find_mii (dev); -if (np->phy_addr_external ==PHY_ADDR_NONE ) { +/* If we're ignoring the PHY it doesn't matter if we can't +* find one. */ +if (!np->ignore_phy && np->phy_addr_external ==PHY_ADDR_NONE ) { dev->if_port =PORT_TP ; np->phy_addr_external =PHY_ADDR_INTERNAL ; }
@@ -891,6 +900,8 @@printk ("%02x, IRQ %d" , dev->dev_addr[i], irq);if (dev->if_port ==PORT_TP )printk (", port TP.\n" ); +else if (np->ignore_phy) +printk (", port MII, ignoring PHY\n" );else printk (", port MII, phy ad %d.\n" , np->phy_addr_external); }
@@ -1571,42 +1582,45 @@ {struct netdev_private *np =netdev_priv (dev);void __iomem * ioaddr =ns_ioaddr (dev); -int duplex; +int duplex = np->duplex;u16 bmsr; -/* The link status field is latched: it remains low after a temporary -* link failure until it's read. We need the current link status, -* thus read twice. -*/ -mdio_read (dev,MII_BMSR ); - bmsr =mdio_read (dev,MII_BMSR ); +/* If we are ignoring the PHY then don't try reading it. */ +if (!np->ignore_phy) { +/* The link status field is latched: it remains low +* after a temporary link failure until it's read. We +* need the current link status, thus read twice. +*/ +mdio_read (dev,MII_BMSR ); + bmsr =mdio_read (dev,MII_BMSR ); -if (!(bmsr &BMSR_LSTATUS )) { -if (netif_carrier_ok (dev)) { +if (!(bmsr &BMSR_LSTATUS )) { +if (netif_carrier_ok (dev)) { +if (netif_msg_link (np)) +printk (KERN_NOTICE "%s: link down.\n" , + dev->name); +netif_carrier_off (dev); +undo_cable_magic (dev); + } +return ; + } +if (!netif_carrier_ok (dev)) {if (netif_msg_link (np)) -printk (KERN_NOTICE "%s: link down.\n" , - dev->name); -netif_carrier_off (dev); -undo_cable_magic (dev); +printk (KERN_NOTICE "%s: link up.\n" , dev->name); +netif_carrier_on (dev); +do_cable_magic (dev); } -return ; - } -if (!netif_carrier_ok (dev)) { -if (netif_msg_link (np)) -printk (KERN_NOTICE "%s: link up.\n" , dev->name); -netif_carrier_on (dev); -do_cable_magic (dev); - } - duplex = np->full_duplex; -if (!duplex) { -if (bmsr &BMSR_ANEGCOMPLETE ) { -int tmp =mii_nway_result ( - np->advertising &mdio_read (dev,MII_LPA )); -if (tmp ==LPA_100FULL || tmp ==LPA_10FULL ) + duplex = np->full_duplex; +if (!duplex) { +if (bmsr &BMSR_ANEGCOMPLETE ) { +int tmp =mii_nway_result ( + np->advertising &mdio_read (dev,MII_LPA )); +if (tmp ==LPA_100FULL || tmp ==LPA_10FULL ) + duplex =1 ; + }else if (mdio_read (dev,MII_BMCR ) &BMCR_FULLDPLX ) duplex =1 ; - }else if (mdio_read (dev,MII_BMCR ) &BMCR_FULLDPLX ) - duplex =1 ; + } }/* if duplex is set then bit 28 must be set, too */
@@ -2819,6 +2833,16 @@ }/* +* If we're ignoring the PHY then autoneg and the internal +* transciever are really not going to work so don't let the +* user select them. +*/ +if (np->ignore_phy && (ecmd->autoneg ==AUTONEG_ENABLE || + ecmd->port ==PORT_TP )) { +return -EINVAL ; + } + +/* * maxtxpkt, maxrxpkt: ignored for now. * * transceiver:
--
"You grabbed my hand and we fell into it, like a daydream - or a fever."
Re: [patch 1/2] natsemi: Add support for using MII port with no PHY
Quoted 2 lines · Mark Brown
Signed-off-by Mark Brown <[email protected]>
[...]
Quoted 4 lines
drivers/net/natsemi.c +3
-1-if (np->phy_addr_external ==PHY_ADDR_NONE ) { +/* If we're ignoring the PHY it doesn't matter if we can't +* find one. */ +if (!np->ignore_phy && np->phy_addr_external ==PHY_ADDR_NONE ) {
[...]
Quoted 7 lines
drivers/net/natsemi.c +7
-0+if (!np->ignore_phy) { +/* The link status field is latched: it remains low +* after a temporary link failure until it's read. We +* need the current link status, thus read twice. +*/ +mdio_read (dev,MII_BMSR ); + bmsr =mdio_read (dev,MII_BMSR );
[...]
drivers/net/natsemi.c line 2840
Quoted 6 lines
drivers/net/natsemi.c +5
-0/* +* If we're ignoring the PHY then autoneg and the internal +* transciever are really not going to work so don't let the +* user select them. +*/ + if (np->ignore_phy && (ecmd->autoneg == AUTONEG_ENABLE ||
A trivial comment actually, Is there a point to write multi-line comments in two different formats ?
Thanks,
Signature · 2 lines
Ahmed S. Darwish http://darwish-07.blogspot.com
Re: [patch 1/2] natsemi: Add support for using MII port with no PHY
In reply to Mark BrownQuoted 10 lines · Mark Brown
This patch provides code paths which allow the natsemi driver to use the external MII port on the chip but ignore any PHYs that may be attached to it. The link state will be left as it was when the driver started and can be configured via ethtool. Any PHYs that are present can be accessed via the MII ioctl()s.
This is useful for systems where the device is connected without a PHY or where either information or actions outside the scope of the driver are required in order to use the PHYs.
Quoted 8 lines
Signed-off-by Mark Brown <[email protected]>---
Previous versions of this patch exposed the new functionality as a module option. This has been removed. Any hardware that needs this should be identifiable by a quirk since it unlikely to behave correctly with an unmodified driver.
I ACK this general concept. Please update for the minor issues and resend.
Quoted 72 lines
Index:
linux/drivers/net/natsemi.c
===================================================================drivers/net/natsemi.c +15
-4@@ -568,6 +568,8 @@u32 intr_status;/* Do not touch the nic registers */ int hands_off; +/* Don't pay attention to the reported link state. */ +int ignore_phy;/* external phy that is used: only valid if dev->if_port != PORT_TP */ int mii;int phy_addr_external;@@ -696,7 +698,10 @@struct netdev_private *np =netdev_priv (dev);u32 tmp; -netif_carrier_off (dev); +if (np->ignore_phy) +netif_carrier_on (dev); +else +netif_carrier_off (dev);/* get the initial settings from hardware */ tmp =mdio_read (dev,MII_BMCR );@@ -806,8 +811,10 @@ np->hands_off =0 ; np->intr_status =0 ; np->eeprom_size = natsemi_pci_info[chip_idx].eeprom_size; + np->ignore_phy =0 ;/* Initial port: +* - If configured to ignore the PHY set up for external. * - If the nic was configured to use an external phy and if find_mii * finds a phy: use external port, first phy that replies. * - Otherwise: internal port. @@ -815,7 +822,7 @@* The address would be used to access a phy over the mii bus, but * the internal phy is accessed through mapped registers. */ -if (readl (ioaddr + ChipConfig) & CfgExtPhy) +if (np->ignore_phy ||readl (ioaddr + ChipConfig) & CfgExtPhy) dev->if_port =PORT_MII ;else dev->if_port =PORT_TP ;@@ -825,7 +832,9 @@if (dev->if_port !=PORT_TP ) { np->phy_addr_external =find_mii (dev); -if (np->phy_addr_external ==PHY_ADDR_NONE ) { +/* If we're ignoring the PHY it doesn't matter if we can't +* find one. */ +if (!np->ignore_phy && np->phy_addr_external ==PHY_ADDR_NONE ) { dev->if_port =PORT_TP ; np->phy_addr_external =PHY_ADDR_INTERNAL ; }@@ -891,6 +900,8 @@printk ("%02x, IRQ %d" , dev->dev_addr[i], irq);if (dev->if_port ==PORT_TP )printk (", port TP.\n" ); +else if (np->ignore_phy) +printk (", port MII, ignoring PHY\n" );else printk (", port MII, phy ad %d.\n" , np->phy_addr_external); }@@ -1571,42 +1582,45 @@ {struct netdev_private *np =netdev_priv (dev);void __iomem * ioaddr =ns_ioaddr (dev); -int duplex; +int duplex = np->duplex;
drivers/net/natsemi.c line 1589
Quoted 10 lines
drivers/net/natsemi.c +2
-6u16 bmsr; -/* The link status field is latched: it remains low after a temporary -* link failure until it's read. We need the current link status, -* thus read twice. -*/ -mdio_read (dev,MII_BMSR ); - bmsr =mdio_read (dev,MII_BMSR ); +/* If we are ignoring the PHY then don't try reading it. */ +if (!np->ignore_phy) {
This change causes a lot of needless indentation changes. I would prefer something like
if (np->ignore_phy) return;
or
if (np->ignore_phy) goto step_2;
Quoted 63 lines
drivers/net/natsemi.c +29
-22+/* The link status field is latched: it remains low +* after a temporary link failure until it's read. We +* need the current link status, thus read twice. +*/ +mdio_read (dev,MII_BMSR ); + bmsr =mdio_read (dev,MII_BMSR ); -if (!(bmsr &BMSR_LSTATUS )) { -if (netif_carrier_ok (dev)) { +if (!(bmsr &BMSR_LSTATUS )) { +if (netif_carrier_ok (dev)) { +if (netif_msg_link (np)) +printk (KERN_NOTICE "%s: link down.\n" , + dev->name); +netif_carrier_off (dev); +undo_cable_magic (dev); + } +return ; + } +if (!netif_carrier_ok (dev)) {if (netif_msg_link (np)) -printk (KERN_NOTICE "%s: link down.\n" , - dev->name); -netif_carrier_off (dev); -undo_cable_magic (dev); +printk (KERN_NOTICE "%s: link up.\n" , dev->name); +netif_carrier_on (dev); +do_cable_magic (dev); } -return ; - } -if (!netif_carrier_ok (dev)) { -if (netif_msg_link (np)) -printk (KERN_NOTICE "%s: link up.\n" , dev->name); -netif_carrier_on (dev); -do_cable_magic (dev); - } - duplex = np->full_duplex; -if (!duplex) { -if (bmsr &BMSR_ANEGCOMPLETE ) { -int tmp =mii_nway_result ( - np->advertising &mdio_read (dev,MII_LPA )); -if (tmp ==LPA_100FULL || tmp ==LPA_10FULL ) + duplex = np->full_duplex; +if (!duplex) { +if (bmsr &BMSR_ANEGCOMPLETE ) { +int tmp =mii_nway_result ( + np->advertising &mdio_read (dev,MII_LPA )); +if (tmp ==LPA_100FULL || tmp ==LPA_10FULL ) + duplex =1 ; + }else if (mdio_read (dev,MII_BMCR ) &BMCR_FULLDPLX ) duplex =1 ; - }else if (mdio_read (dev,MII_BMCR ) &BMCR_FULLDPLX ) - duplex =1 ; + } }/* if duplex is set then bit 28 must be set, too */ @@ -2819,6 +2833,16 @@ }/*
drivers/net/natsemi.c line 2845
Quoted 10 lines
drivers/net/natsemi.c +10
-0+* If we're ignoring the PHY then autoneg and the internal +* transciever are really not going to work so don't let the +* user select them. +*/ +if (np->ignore_phy && (ecmd->autoneg ==AUTONEG_ENABLE || + ecmd->port ==PORT_TP )) { +return -EINVAL ; + } + +/*
always kill the braces surrounding a single C statement
PATCH 2/2 natsemi: Support Aculab E1/T1 PMXc cPCI carrier cards
In reply to Mark BrownAculab E1/T1 PMXc cPCI carrier card cards present a natsemi on the cPCI bus with an oversized EEPROM using a direct MII<->MII connection with no PHY. This patch adds a new device table entry supporting these cards.
drivers/net/natsemi.c +10 -1
@@ -244,6 +244,9 @@ MII_EN_SCRM = 0x0004, /* enable scrambler (tp) */ }; +enum { +NATSEMI_FLAG_IGNORE_PHY =0x1 , +};/* array of board data directly indexed by pci_tbl[x].driver_data */ static const struct {
@@ -251,10 +254,12 @@unsigned long flags;unsigned int eeprom_size; } natsemi_pci_info[] __devinitdata = { + { "Aculab E1/T1 PMXc cPCI carrier card", NATSEMI_FLAG_IGNORE_PHY, 128 }, { "NatSemi DP8381[56]", 0, 24 }, };static const struct pci_device_id natsemi_pci_tbl[]__devinitdata = { + {PCI_VENDOR_ID_NS ,0x0020 ,0x12d9 ,0x000c ,0 ,0 ,0 }, {PCI_VENDOR_ID_NS ,0x0020 ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, { }/* terminate list */ };
@@ -811,7 +816,11 @@ np->hands_off =0 ; np->intr_status =0 ; np->eeprom_size = natsemi_pci_info[chip_idx].eeprom_size; - np->ignore_phy =0 ; +if (natsemi_pci_info[chip_idx].flags &NATSEMI_FLAG_IGNORE_PHY ) { + np->ignore_phy =1 ; + }else { + np->ignore_phy =0 ; + }/* Initial port: * - If configured to ignore the PHY set up for external.
--
"You grabbed my hand and we fell into it, like a daydream - or a fever."
Re: [patch 2/2] natsemi: Support Aculab E1/T1 PMXc cPCI carrier cards
Quoted 7 lines · Mark Brown
Aculab E1/T1 PMXc cPCI carrier card cards present a natsemi on the cPCI bus with an oversized EEPROM using a direct MII<->MII connection with no PHY. This patch adds a new device table entry supporting these cards.
Signed-off-by Mark Brown <[email protected]>
drivers/net/natsemi.c line 823
Quoted 9 lines
drivers/net/natsemi.c +5
-1@@ -811,7 +816,11 @@ np->hands_off =0 ; np->intr_status =0 ; np->eeprom_size = natsemi_pci_info[chip_idx].eeprom_size; - np->ignore_phy =0 ; +if (natsemi_pci_info[chip_idx].flags &NATSEMI_FLAG_IGNORE_PHY ) { + np->ignore_phy =1 ; + }else { + np->ignore_phy =0 ; + }
I ACK the patch itself, but since you have to resend anyway, please kill the braces surrounding the above single-C-stmt lines.