Re: + forcedeth-mac-address-fix.patch added to -mm tree

[Yinghai Lu]

On Tue, Apr 1, 2008 at 2:10 PM,  <akpm@xxxxxxxxxxxxxxxxxxxx> wrote:
>
>  The patch titled
>      forcedeth: mac address fix
>  has been added to the -mm tree.  Its filename is
>      forcedeth-mac-address-fix.patch
>
>  Before you just go and hit "reply", please:
>    a) Consider who else should be cc'ed
>    b) Prefer to cc a suitable mailing list as well
>    c) Ideally: find the original patch on the mailing list and do a
>       reply-to-all to that, adding suitable additional cc's
>
>  *** Remember to use Documentation/SubmitChecklist when testing your code ***
>
>  See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
>  out what to do about this
>
>  The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
>
>  ------------------------------------------------------
>  Subject: forcedeth: mac address fix
>  From: Ayaz Abdulla <aabdulla@xxxxxxxxxx>
>
>  This critical patch fixes a mac address issue recently introduced.  If the
>  device's mac address was in correct order and the flag
>  NVREG_TRANSMITPOLL_MAC_ADDR_REV was set, during nv_remove the flag would get
>  cleared.  During next load, the mac address would get reversed because the
>  flag is missing.
>
>  As it has been indicated previously, the flag is cleared across a low power
>  transition.  Therefore, the driver should set the mac address back into the
>  reversed order when clearing the flag.
>
>  Also, the driver should set back the flag after a low power transition to
>  protect against kexec command calling nv_probe a second time.
>
>  Signed-off-by: Ayaz Abdulla <aabdulla@xxxxxxxxxx>
>  Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
>  ---
>
>   drivers/net/forcedeth.c |   26 ++++++++++++++++++++++++--
>   1 file changed, 24 insertions(+), 2 deletions(-)
>
>  diff -puN drivers/net/forcedeth.c~forcedeth-mac-address-fix drivers/net/forcedeth.c
>  --- a/drivers/net/forcedeth.c~forcedeth-mac-address-fix
>  +++ a/drivers/net/forcedeth.c
>  @@ -5327,8 +5327,7 @@ static int __devinit nv_probe(struct pci
>
>         /* check the workaround bit for correct mac address order */
>         txreg = readl(base + NvRegTransmitPoll);
>  -       if ((txreg & NVREG_TRANSMITPOLL_MAC_ADDR_REV) ||
>  -           (id->driver_data & DEV_HAS_CORRECT_MACADDR)) {
>  +       if (id->driver_data & DEV_HAS_CORRECT_MACADDR) {
>                 /* mac address is already in correct order */
>                 dev->dev_addr[0] = (np->orig_mac[0] >>  0) & 0xff;
>                 dev->dev_addr[1] = (np->orig_mac[0] >>  8) & 0xff;
>  @@ -5336,6 +5335,22 @@ static int __devinit nv_probe(struct pci
>                 dev->dev_addr[3] = (np->orig_mac[0] >> 24) & 0xff;
>                 dev->dev_addr[4] = (np->orig_mac[1] >>  0) & 0xff;
>                 dev->dev_addr[5] = (np->orig_mac[1] >>  8) & 0xff;
>  +       } else if (txreg & NVREG_TRANSMITPOLL_MAC_ADDR_REV) {
>  +               /* mac address is already in correct order */
>  +               dev->dev_addr[0] = (np->orig_mac[0] >>  0) & 0xff;
>  +               dev->dev_addr[1] = (np->orig_mac[0] >>  8) & 0xff;
>  +               dev->dev_addr[2] = (np->orig_mac[0] >> 16) & 0xff;
>  +               dev->dev_addr[3] = (np->orig_mac[0] >> 24) & 0xff;
>  +               dev->dev_addr[4] = (np->orig_mac[1] >>  0) & 0xff;
>  +               dev->dev_addr[5] = (np->orig_mac[1] >>  8) & 0xff;
>  +               /*
>  +                * Set orig mac address back to the reversed version.
>  +                * This flag will be cleared during low power transition.
>  +                * Therefore, we should always put back the reversed address.
>  +                */
>  +               np->orig_mac[0] = (dev->dev_addr[5] << 0) + (dev->dev_addr[4] << 8) +
>  +                       (dev->dev_addr[3] << 16) + (dev->dev_addr[2] << 24);
>  +               np->orig_mac[1] = (dev->dev_addr[1] << 0) + (dev->dev_addr[0] << 8);
>         } else {
>                 /* need to reverse mac address to correct order */
>                 dev->dev_addr[0] = (np->orig_mac[1] >>  8) & 0xff;
>  @@ -5606,7 +5621,9 @@ out:
>   static int nv_resume(struct pci_dev *pdev)
>   {
>         struct net_device *dev = pci_get_drvdata(pdev);
>  +       u8 __iomem *base = get_hwbase(dev);
>         int rc = 0;
>  +       u32 txreg;
>
>         if (!netif_running(dev))
>                 goto out;
>  @@ -5617,6 +5634,11 @@ static int nv_resume(struct pci_dev *pde
>         pci_restore_state(pdev);
>         pci_enable_wake(pdev, PCI_D0, 0);
>
>  +       /* restore mac address reverse flag */
>  +       txreg = readl(base + NvRegTransmitPoll);
>  +       txreg |= NVREG_TRANSMITPOLL_MAC_ADDR_REV;
>  +       writel(txreg, base + NvRegTransmitPoll);
>  +
>         rc = nv_open(dev);
>   out:
>         return rc;
>  _
>

Andrew,
how about this patch status? it should get into 2.6.25

YH
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/