From: Thierry Reding <thierry.reding@gmail.com>
To: Andrew Lunn <andrew@lunn.ch>
Cc: "David S. Miller" <davem@davemloft.net>,
Heiner Kallweit <hkallweit1@gmail.com>,
Realtek linux nic maintainers <nic_swsd@realtek.com>,
netdev@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] r8169: Load MAC address from device tree if present
Date: Fri, 25 Jan 2019 16:33:10 +0100 [thread overview]
Message-ID: <20190125153310.GA30990@ulmo> (raw)
In-Reply-To: <20190125145711.GF12962@lunn.ch>
[-- Attachment #1: Type: text/plain, Size: 3102 bytes --]
On Fri, Jan 25, 2019 at 03:57:11PM +0100, Andrew Lunn wrote:
> On Fri, Jan 25, 2019 at 11:18:14AM +0100, Thierry Reding wrote:
> > From: Thierry Reding <treding@nvidia.com>
> >
> > If the system was booted using a device tree and if the device tree
> > contains a MAC address, use it instead of reading one from the EEPROM.
> > This is useful in situations where the EEPROM isn't properly programmed
> > or where the firmware wants to override the existing MAC address.
> >
> > Signed-off-by: Thierry Reding <treding@nvidia.com>
> > ---
> > Based on net-next.
> >
> > drivers/net/ethernet/realtek/r8169.c | 35 +++++++++++++++++-----------
> > 1 file changed, 22 insertions(+), 13 deletions(-)
> >
> > diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
> > index f574b6b557f9..fd9edd643ca5 100644
> > --- a/drivers/net/ethernet/realtek/r8169.c
> > +++ b/drivers/net/ethernet/realtek/r8169.c
> > @@ -6957,6 +6957,21 @@ static int rtl_alloc_irq(struct rtl8169_private *tp)
> > return pci_alloc_irq_vectors(tp->pci_dev, 1, 1, flags);
> > }
> >
> > +static void rtl_read_mac_address(struct rtl8169_private *tp,
> > + u8 mac_addr[ETH_ALEN])
> > +{
> > + /* Get MAC address */
> > + switch (tp->mac_version) {
> > + case RTL_GIGA_MAC_VER_35 ... RTL_GIGA_MAC_VER_38:
> > + case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_51:
> > + *(u32 *)&mac_addr[0] = rtl_eri_read(tp, 0xe0, ERIAR_EXGMAC);
> > + *(u16 *)&mac_addr[4] = rtl_eri_read(tp, 0xe4, ERIAR_EXGMAC);
> > + break;
> > + default:
> > + break;
> > + }
> > +}
> > +
> > DECLARE_RTL_COND(rtl_link_list_ready_cond)
> > {
> > return RTL_R8(tp, MCU) & LINK_LIST_RDY;
> > @@ -7148,6 +7163,7 @@ static int rtl_get_ether_clk(struct rtl8169_private *tp)
> > static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
> > {
> > const struct rtl_cfg_info *cfg = rtl_cfg_infos + ent->driver_data;
> > + u8 mac_addr[ETH_ALEN] __aligned(4);
>
> Hi Thierry
>
> Maybe now would be a good time to cleanup this __aligned(4), pointer
> aliasing, etc?
Are you proposing that I rewrite rtl_read_mac_address() to manually
extract bytes from each register read? Something along these lines:
value = rtl_eri_read(tp, 0xe0, ERIAR_EXGMAC);
mac_addr[0] = (value >> 0) & 0xff;
mac_addr[1] = (value >> 8) & 0xff;
mac_addr[2] = (value >> 16) & 0xff;
mac_addr[3] = (value >> 24) & 0xff;
value = rtl_eri_read(tp, 0xe4 ERIAR_EXGMAC);
mac_addr[4] = (value >> 0) & 0xff;
mac_addr[5] = (value >> 8) & 0xff;
Looks like maybe that should be a separate patch?
>
> > + /* get MAC address */
> > + if (eth_platform_get_mac_address(&pdev->dev, mac_addr))
> > + rtl_read_mac_address(tp, mac_addr);
> > +
>
> Maybe that could be made more readable with:
>
> err = eth_platform_get_mac_address(&pdev->dev, mac_addr);
> if (err)
> rtl_read_mac_address(tp, mac_addr);
I was following the same pattern that other drivers were, but I can
change to the above if you prefer.
Thanks,
Thierry
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2019-01-25 15:33 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-25 10:18 [PATCH] r8169: Load MAC address from device tree if present Thierry Reding
2019-01-25 14:57 ` Andrew Lunn
2019-01-25 15:33 ` Thierry Reding [this message]
2019-01-25 18:26 ` Heiner Kallweit
2019-01-25 19:07 ` Andrew Lunn
2019-01-25 19:23 ` Heiner Kallweit
2019-01-25 18:34 ` Heiner Kallweit
2019-01-29 17:40 ` Thierry Reding
2019-01-29 18:51 ` Heiner Kallweit
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=20190125153310.GA30990@ulmo \
--to=thierry.reding@gmail.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=hkallweit1@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nic_swsd@realtek.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).