From: Tim Harvey <tharvey@gateworks.com>
To: Joe Hershberger <joe.hershberger@ni.com>,
Ramon Fried <rfried.dev@gmail.com>
Cc: Hannu Lounento <hannu.lounento@ge.com>,
Martyn Welch <martyn.welch@collabora.co.uk>,
Sebastian Reichel <sebastian.reichel@collabora.co.uk>,
U-Boot Mailing List <u-boot@lists.denx.de>
Subject: Re: [PATCH] net: e1000: do not attempt to set hwaddr for i210 without FLASH
Date: Fri, 11 Jun 2021 09:01:18 -0700 [thread overview]
Message-ID: <CAJ+vNU367oEYmP0bRJbUN-zW6FegXwQcw42QMyBLCEKupqhh=A@mail.gmail.com> (raw)
In-Reply-To: <CAGi-RULwnmp09J6djqxHoz_bkJa5pPWE++_5oj1fZ580o7HMdw@mail.gmail.com>
On Thu, Apr 22, 2021 at 5:11 PM Ramon Fried <rfried.dev@gmail.com> wrote:
>
> On Fri, Apr 16, 2021 at 11:25 PM Tim Harvey <tharvey@gateworks.com> wrote:
> >
> > commit f1bcad22dd19 ("net: e1000: add support for writing to EEPROM")
> > adds support for storing hwaddr in EEPROM however i210 devices do not
> > support this and thus results in errors such as:
> > Warning: e1000#0 failed to set MAC address'
> >
> > Check if a flash device is present and if not return -ENOSYS indicating
> > this is not supported.
> >
> > Signed-off-by: Tim Harvey <tharvey@gateworks.com>
> > ---
> > drivers/net/e1000.c | 4 ++++
> > drivers/net/e1000.h | 1 +
> > 2 files changed, 5 insertions(+)
> >
> > diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
> > index 694114eca7..60613b7df0 100644
> > --- a/drivers/net/e1000.c
> > +++ b/drivers/net/e1000.c
> > @@ -5673,6 +5673,10 @@ static int e1000_write_hwaddr(struct eth_device *dev)
> >
> > DEBUGOUT("%s: mac=%pM\n", __func__, mac);
> >
> > + if ((hw->eeprom.type == e1000_eeprom_invm) &&
> > + !(E1000_READ_REG(hw, EECD) & E1000_EECD_FLASH_DETECTED_I210))
> > + return -ENOSYS;
> > +
> > memset(current_mac, 0, 6);
> >
> > /* Read from EEPROM, not from registers, to make sure
> > diff --git a/drivers/net/e1000.h b/drivers/net/e1000.h
> > index 072851ba31..082154a997 100644
> > --- a/drivers/net/e1000.h
> > +++ b/drivers/net/e1000.h
> > @@ -1245,6 +1245,7 @@ struct e1000_hw {
> > #define E1000_EECD_FLUPD 0x00080000 /* Update FLASH */
> > #define E1000_EECD_FLUPD_I210 0x00800000 /* Update FLASH */
> > #define E1000_EECD_FLUDONE_I210 0x04000000 /* Update FLASH done*/
> > +#define E1000_EECD_FLASH_DETECTED_I210 0x00080000 /* FLASH detected */
> > #define E1000_FLUDONE_ATTEMPTS 20000
> > #define E1000_EECD_AUPDEN 0x00100000 /* Enable Autonomous FLASH update */
> > #define E1000_EECD_SHADV 0x00200000 /* Shadow RAM Data Valid */
> > --
> > 2.17.1
> >
> Reviewed-by: Ramon Fried <rfried.dev@gmail.com>
Joe / Ramon,
Can one of you pick this up? If I need to re-submit with Ramon's
'reviewed by' please let me know.
Best regards,
Tim
next prev parent reply other threads:[~2021-06-11 16:01 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-16 20:25 [PATCH] net: e1000: do not attempt to set hwaddr for i210 without FLASH Tim Harvey
2021-04-23 0:11 ` Ramon Fried
2021-06-11 16:01 ` Tim Harvey [this message]
2021-06-12 18:23 ` Ramon Fried
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAJ+vNU367oEYmP0bRJbUN-zW6FegXwQcw42QMyBLCEKupqhh=A@mail.gmail.com' \
--to=tharvey@gateworks.com \
--cc=hannu.lounento@ge.com \
--cc=joe.hershberger@ni.com \
--cc=martyn.welch@collabora.co.uk \
--cc=rfried.dev@gmail.com \
--cc=sebastian.reichel@collabora.co.uk \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.