RE: [PATCH] net/r8169: Remove the firmware of RTL8111D

hayeswang
2010-12-01T09:54:57Z

[-- Attachment #1: Type: text/plain, Size: 1930 bytes --]

Hi Romieu,

the rtl8168d_3_hw_phy_config is RTL8111DP which is different from RTL8111D(L).
I want to deal with RTL8111D first.

The attatched file is the linux-firmware patch.

I would think the situation for the failure of request_firmware. However, maybe
it is fine to go along.

Thanks for your suggestion and reply.

Best Regards,
Hayes

> -----Original Message-----
> From: Francois Romieu [mailto:romieu@fr.zoreil.com]
> Sent: Wednesday, December 01, 2010 4:08 PM
> To: Hayeswang
> Cc: netdev@vger.kernel.org; linux-kernel@vger.kernel.org; Ben
> Hutchings
> Subject: Re: [PATCH] net/r8169: Remove the firmware of RTL8111D
>
> Hayes Wang <hayeswang@realtek.com> :
> > Remove the firmware of RTL8111D from the kernel.
> > The binary file of firmware would be moved to
> linux-firmware repository.
>
> The driver can not simply go along when request_firmware
> fails. Though Ben's
> code did not take care of it, the driver should imho
> propagate some return
> code. Ben ?
>
> There is no change in rtl8168d_3_hw_phy_config : could you
> add a comment
> so that people know it is different ?
>
> Could you Cc: the linux-firmware patch as well ?
>
> Minor nit: please keep the code free of capitalized hex data.
>
> > diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
> > index 7d33ef4..cad1ba8 100644
> > --- a/drivers/net/r8169.c
> > +++ b/drivers/net/r8169.c
> [...]
> > @@ -1383,6 +1384,28 @@ static void rtl_phy_write(void
> __iomem *ioaddr, const struct phy_reg *regs, int
> > }
> > }
> >
> > +static void rtl_phy_write_fw(void __iomem *ioaddr, const
> struct firmware *fw)
> > +{
> [...]
> > + default:
> > + printk(KERN_WARNING "%s: Unknown action\n",
> > + __FUNCTION__);
>
> A bit old school. It gives no information about the device.
> Use netif_{err/info} or such ?
>
> Thanks.
>
> --
> Ueimor
>
>
> ------Please consider the environment before printing this e-mail.
>
>
>

[-- Attachment #2: 0001-rtl_nic-Add-firmware-for-RTL8111D-L.patch --]
[-- Type: application/octet-stream, Size: 3982 bytes --]

>From 706b34566b9318ae50b9b931178ee6b66b05080a Mon Sep 17 00:00:00 2001
From: Hayes Wang <hayeswang@realtek.com>
Date: Wed, 1 Dec 2010 10:21:47 +0800
Subject: [PATCH] rtl_nic: Add firmware for RTL8111D(L)

Add firmware for r8169 of kernel for RTL8111D
rtl_nic/rtl8168d-1.fw
rtl_nic/rtl8168d-2.fw

Signed-off-by: Hayes Wang <hayeswang@realtek.com>
---
WHENCE | 14 ++++++++++++++
rtl_nic/rtl8168d-1.fw | Bin 0 -> 1492 bytes
rtl_nic/rtl8168d-2.fw | Bin 0 -> 1324 bytes
3 files changed, 14 insertions(+), 0 deletions(-)
create mode 100644 rtl_nic/rtl8168d-1.fw
create mode 100644 rtl_nic/rtl8168d-2.fw

diff --git a/WHENCE b/WHENCE
index 907fe68..e2aca61 100644
--- a/WHENCE
+++ b/WHENCE
@@ -1451,3 +1451,17 @@ Licence: Redistributable. See LICENCE.rtlwifi_firmware for details.

--------------------------------------------------------------------------

+Driver: r8169 - RealTek 8169/8168/8101 ethernet driver.
+
+File: rtl_nic/rtl8168d-1.fw
+File: rtl_nic/rtl8168d-2.fw
+
+Licence:
+ * Copyright (c) 2010, Realtek Semiconductor Corporation
+ *
+ * Permission is hereby granted for the distribution of this firmware
+ * data in hexadecimal or equivalent format, provided this copyright
+ * notice is accompanying it.
+
+--------------------------------------------------------------------------
+
diff --git a/rtl_nic/rtl8168d-1.fw b/rtl_nic/rtl8168d-1.fw
new file mode 100644
index 0000000000000000000000000000000000000000..99e002de1fb965d53822bc9ea0f5a8ca12d27f62
GIT binary patch
literal 1492
zcmb7^&2LO$6vppN=N_%1<0Fx(AYx^uEX1yhrar4ANXv!=@gJx}lSjwKS7IZ?qOFKT
zM$#s%SeTtHN*bc#8Z8OQj1|)lQ@=C!PBeBFH_v<C^YK3KbIyIkV55F6gi>G%6l$ho
zD$klqeWq`$OYDCKBk%%P`DE%FAg0B%D`gr=vo_XQ({Lm4TmQ);rk>YJ-cSdz<mS6f
zg=W)@LDS%bDSg}2Lu}J1cEL1(J%TUg^?OX!o2L2SoFAHIXTTDCza{t`ESf%FFb%+Q
z<$cqtm8OnyQ>WMNG_9r92zK7>d~COHRwuFU?`EC%HNM@>VT`-1HXY2x8gx6t`#^#{
z$^PL4_c<<@_Ja|)4a}icZ@X!#YP#auP2;<2+Mf9Oc9@FP^x9jNnSLCH_XgsoOw-p)
z*U51n5j_07DKvJ>MW+6P=uJ<erSV>Ng!AF=d?R#p4Es%YhW^G6W$;nMeGT|p7W>E<
z4NYV4s9ZE%<lM1)rb*UyE%uP-^RO56dGNbCC&yGTeIKSLFHL%7I<qn92|e=psc^SV
zezz~&E!j)Irmv6VxH7#vv7H_&?qLJm7MPdiXt|!+>yFab)6C0VG$YTs<UX6)_L?3Z
zV@8<0FJNu|t0~KVoks?3ickLLl<^g*<vpv_*iY}h#)`N`ZJ!!N_PsYbI7bKKbwDlG
z$aV2PWV=E7H3|xSeI2o`Yuvn8WBesP_eIS0|IC4(^=X@_o!rz}G~=A<E2gVxyOVj%
zmFOumQHx8srrJyy&cB;CJxF3Q9z$%<gKoY@-G0`?4RBi%a~o$4COS+<(0mY{<7=@;
z$axyuRqXn|SaDt_O{d_IuJcOlnr{#Dg0F=hroI2pJK6JD@%n`mrbFDTt88kWG`;*l
zY>Ii{pLKt9&UBI*{`T~qV&-@UYW6fduxHS8jyJ3D+|)r_?iv63A#|cf+Y-}@%ce&D
z{r9{Rk6M|lIn(bd^~hVyv9ZoS;r9#9i}_~enPGaH4osWT(eWd8iW&WY?KsQ%W$G8s
z6T`aoEu7z>?<Mw{OwasI{szI--@9Afxk_G0?FDpA!7Bj${%>=k4h!u;e+%D$0d{s%
VTES$40^aVxniVE*_&j`k?+=A!Np1iD

literal 0
HcmV?d00001

diff --git a/rtl_nic/rtl8168d-2.fw b/rtl_nic/rtl8168d-2.fw
new file mode 100644
index 0000000000000000000000000000000000000000..7022ab0af4753c529a1646bc921d9d1889767fde
GIT binary patch
literal 1324
zcmb7^OGs2<6vyv8?#a}eDFQJ=C8D+3qOA)l&Bs_&Ot#U5;ihF^kZ^R`qy_DQ7UQ@W
ziU~%jRV@lyxXlNMk<wL11BJ0w`JR5?eAl#PtMi@r|NPIn*L7<2SHV?vL>+Z?Yg078
zExKkTwsqtZ@)2@#Su{N$dg_$u^l8!AM$x7w(ZL}41bRv|ld*ahJsq+BEdF%6^_lnh
zRngCbqKP~`JFJZ0H+rPax5s>W-O9o>U$!DW(ZxE^`h@6y99%ikm0{5lFcy6cqL=VR
z?w~J;mQ%ayf@t+m(Hyv+npsxB@yy3Ty{PF&9S_+-uG24CI%?~su%)BC!51)iiSI`y
zUE*Kb_%QL&<Pl#8U&Q(X_*{JDS-2Ue?<>(8%wK$u9O0tb_HbHkov4`|OmXCBKy-3V
zbjlH}QFe0A?#S$<Yn|DcX|>k3G20BbcW}M5Z+F+QA*y%n4wLL~0DOf4wNHrNIw#tD
zR&<QL&OE0loGpW;1s-l!iI%)UlAl-={o&iE;KSfZf#ZGn-<)0(Yih8wR=>u{%#j+t
z-NdZ2n>Jz$rzzg$j^)LJmv-zq`WP98yBz(@`!D|?I4(QnKWzBViw4=v|J;Gc9n_h+
zi=ut?^nvSP_%t_?1xNm}?cvd{h?Tf1uqKJiFne~4nAbKYj~=5|mN`6lGw%@lKVxnQ
zY%bUur{R1SoHs=$2ALcEgVD(``W`!TcgY7sx52Rpt{!j&eH~mLdb96~b1&5q>o3~y
zPhvCmN{8tCNpz!AbpDFyLM1mmDLO>0V5#Uu{F@%%Q@3aj_4eZE+}w(<hrzME1+E?J
z)cM#b+R03Tl<2X5=o9W^`V0Sw64A<UqC0Q-Cb_Hdp2dHFu@5{sVh->b%(>r(`Yw7q
z+&Q)I2sY<DI<oK`oj!#H`XhJvH$CLO43;@!zB12aFdrXfCTz3!MIQ`-kKBzIc`rnF
s;j_ZExGJa-aHx-eF5&XeBL^8HCt4d+XFjA3|3pX1)b;<3yC$CZAI_u&^8f$<

literal 0
HcmV?d00001

--
1.7.3.2