* [GIT PULL] bcm43xx: Update B6PHY initialization
@ 2006-02-01 0:06 Danny van Dyk
[not found] ` <43DFFB6C.9050907-aBrp7R+bbdUdnm+yROfE0A@public.gmane.org>
0 siblings, 1 reply; 7+ messages in thread
From: Danny van Dyk @ 2006-02-01 0:06 UTC (permalink / raw)
To: John W. Linville, netdev-u79uwXL29TY76Z2rM5mHXA,
bcm43xx-dev-0fE9KPoRgkgATYTw5x5z8w
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi John,
I'm slowly trying to get accustomed to git, so I'll try a short patch
as a first step. So please
git pull rsync://pitr.amd64.dev.gentoo.org/kugelfang/wireless-2.6.git
I hope I did set up everything correctly :-)
Danny
- --
Danny van Dyk <kugelfang-aBrp7R+bbdUdnm+yROfE0A@public.gmane.org>
Gentoo/AMD64 Project, Gentoo Scientific Project
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)
iD8DBQFD3/traVNL8NrtU6IRAnt1AJ9AL8PZyOQKcqX0PvoHJt83P1PGWgCgoKap
Ye/hY6nu6Cs8dkt4HmaWqiw=
=rbQh
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 7+ messages in thread[parent not found: <43DFFB6C.9050907-aBrp7R+bbdUdnm+yROfE0A@public.gmane.org>]
* Re: [GIT PULL] bcm43xx: Update B6PHY initialization [not found] ` <43DFFB6C.9050907-aBrp7R+bbdUdnm+yROfE0A@public.gmane.org> @ 2006-02-01 0:21 ` Jeff Garzik [not found] ` <20060201002101.GA8306-oTNwCEtKUwI/11+TDStg7g@public.gmane.org> 0 siblings, 1 reply; 7+ messages in thread From: Jeff Garzik @ 2006-02-01 0:21 UTC (permalink / raw) To: Danny van Dyk Cc: John W. Linville, netdev-u79uwXL29TY76Z2rM5mHXA, bcm43xx-dev-0fE9KPoRgkgATYTw5x5z8w On Wed, Feb 01, 2006 at 01:06:04AM +0100, Danny van Dyk wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > Hi John, > > I'm slowly trying to get accustomed to git, so I'll try a short patch > as a first step. So please > > git pull rsync://pitr.amd64.dev.gentoo.org/kugelfang/wireless-2.6.git Your git pull email needs to include a summary of included changesets, and a patch for others to review. Jeff ^ permalink raw reply [flat|nested] 7+ messages in thread
[parent not found: <20060201002101.GA8306-oTNwCEtKUwI/11+TDStg7g@public.gmane.org>]
* Re: [GIT PULL] bcm43xx: Update B6PHY initialization [not found] ` <20060201002101.GA8306-oTNwCEtKUwI/11+TDStg7g@public.gmane.org> @ 2006-02-01 9:51 ` Danny van Dyk [not found] ` <200602011051.00973.kugelfang-aBrp7R+bbdUdnm+yROfE0A@public.gmane.org> 0 siblings, 1 reply; 7+ messages in thread From: Danny van Dyk @ 2006-02-01 9:51 UTC (permalink / raw) To: John W. Linville Cc: netdev-u79uwXL29TY76Z2rM5mHXA, bcm43xx-dev-0fE9KPoRgkgATYTw5x5z8w John, please git pull rsync://pitr.amd64.dev.gentoo.org/kugelfang/wireless-2.6.git which will provide this changeset: Danny van Dyk: [bcm43xx] Sync bcm43xx_phy_initb6() with specs diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_phy.c b/drivers/net/wireless/bcm43xx/bcm43xx_phy.c index f5e7a6a..d90f207 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_phy.c +++ b/drivers/net/wireless/bcm43xx/bcm43xx_phy.c @@ -947,7 +947,7 @@ static void bcm43xx_phy_initb6(struct bc bcm43xx_radio_write16(bcm, 0x0050, 0x0020); if ((bcm->current_core->radio->manufact == 0x17F) && (bcm->current_core->radio->version == 0x2050) && - (bcm->current_core->radio->revision == 2)) { + (bcm->current_core->radio->revision <= 2)) { bcm43xx_radio_write16(bcm, 0x0050, 0x0020); bcm43xx_radio_write16(bcm, 0x005A, 0x0070); bcm43xx_radio_write16(bcm, 0x005B, 0x007B); @@ -984,10 +984,15 @@ static void bcm43xx_phy_initb6(struct bc bcm43xx_write16(bcm, 0x03E4, 0x0009); if (phy->type == BCM43xx_PHYTYPE_B) { bcm43xx_write16(bcm, 0x03E6, 0x8140); - bcm43xx_phy_write(bcm, 0x0016, 0x5410); - bcm43xx_phy_write(bcm, 0x0017, 0xA820); - bcm43xx_phy_write(bcm, 0x0007, 0x0062); - TODO();//TODO: calibrate stuff. + bcm43xx_phy_write(bcm, 0x0016, 0x0410); + bcm43xx_phy_write(bcm, 0x0017, 0x0820); + bcm43xx_phy_write(bcm, 0x0062, 0x0007); + (void) bcm43xx_radio_calibrationvalue(bcm); + bcm43xx_phy_lo_b_measure(bcm); + if (bcm->sprom.boardflags & BCM43xx_BFL_RSSI) { + bcm43xx_calc_nrssi_slope(bcm); + bcm43xx_calc_nrssi_threshold(bcm); + } bcm43xx_phy_init_pctl(bcm); } else bcm43xx_write16(bcm, 0x03E6, 0x0); diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_radio.c b/drivers/net/wireless/bcm43xx/bcm43xx_radio.c index 5ce6ace..3901aa9 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_radio.c +++ b/drivers/net/wireless/bcm43xx/bcm43xx_radio.c @@ -1184,7 +1184,7 @@ int bcm43xx_radio_set_interference_mitig return 0; } -static u16 bcm43xx_radio_calibrationvalue(struct bcm43xx_private *bcm) +u16 bcm43xx_radio_calibrationvalue(struct bcm43xx_private *bcm) { u16 reg, index, ret; diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_radio.h b/drivers/net/wireless/bcm43xx/bcm43xx_radio.h index 89fe292..a5d2e10 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_radio.h +++ b/drivers/net/wireless/bcm43xx/bcm43xx_radio.h @@ -89,5 +89,6 @@ void bcm43xx_nrssi_hw_update(struct bcm4 void bcm43xx_nrssi_mem_update(struct bcm43xx_private *bcm); void bcm43xx_radio_set_tx_iq(struct bcm43xx_private *bcm); +u16 bcm43xx_radio_calibrationvalue(struct bcm43xx_private *bcm); #endif /* BCM43xx_RADIO_H_ */ -- Danny van Dyk <kugelfang-aBrp7R+bbdUdnm+yROfE0A@public.gmane.org> Gentoo/AMD64 Project, Gentoo Scientific Project -- Danny van Dyk <kugelfang-aBrp7R+bbdUdnm+yROfE0A@public.gmane.org> Gentoo/AMD64 Project, Gentoo Scientific Project ^ permalink raw reply related [flat|nested] 7+ messages in thread
[parent not found: <200602011051.00973.kugelfang-aBrp7R+bbdUdnm+yROfE0A@public.gmane.org>]
* Re: Re: [GIT PULL] bcm43xx: Update B6PHY initialization [not found] ` <200602011051.00973.kugelfang-aBrp7R+bbdUdnm+yROfE0A@public.gmane.org> @ 2006-02-01 13:55 ` Michael Buesch [not found] ` <200602011455.34307.mbuesch-KuiJ5kEpwI6ELgA04lAiVw@public.gmane.org> 2006-02-10 0:51 ` John W. Linville 1 sibling, 1 reply; 7+ messages in thread From: Michael Buesch @ 2006-02-01 13:55 UTC (permalink / raw) To: Danny van Dyk Cc: bcm43xx-dev-0fE9KPoRgkgATYTw5x5z8w, netdev-u79uwXL29TY76Z2rM5mHXA, bcm43xx-dev-0fE9KPoRgkgATYTw5x5z8w [-- Attachment #1: Type: text/plain, Size: 3763 bytes --] On Wednesday 01 February 2006 10:51, Danny van Dyk wrote: > John, please > > git pull rsync://pitr.amd64.dev.gentoo.org/kugelfang/wireless-2.6.git > > which will provide this changeset: > > Danny van Dyk: > [bcm43xx] Sync bcm43xx_phy_initb6() with specs Danny, _please_ make sure to apply patches to the softmac _and_ the dscape branch. Otherwise patches will get lost. It is very important to keep both branches in sync. I know that this is annoying work, but we must stick with it, until we have a usable 80211 stack in the kernel. I also know that 99% of the people are not interrested in the dscape branch, but it is important to keep it working. The only way to find weaknesses in d80211 is to maintain drivers which use it. Besides that, you can also request a pull from me. The git snapshots are generated from my tree, so this is the fastest way to get your changes into the snapshots. But that's entirely your decision. > diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_phy.c > b/drivers/net/wireless/bcm43xx/bcm43xx_phy.c > index f5e7a6a..d90f207 100644 > --- a/drivers/net/wireless/bcm43xx/bcm43xx_phy.c > +++ b/drivers/net/wireless/bcm43xx/bcm43xx_phy.c > @@ -947,7 +947,7 @@ static void bcm43xx_phy_initb6(struct bc > bcm43xx_radio_write16(bcm, 0x0050, 0x0020); > if ((bcm->current_core->radio->manufact == 0x17F) && > (bcm->current_core->radio->version == 0x2050) && > - (bcm->current_core->radio->revision == 2)) { > + (bcm->current_core->radio->revision <= 2)) { > bcm43xx_radio_write16(bcm, 0x0050, 0x0020); > bcm43xx_radio_write16(bcm, 0x005A, 0x0070); > bcm43xx_radio_write16(bcm, 0x005B, 0x007B); > @@ -984,10 +984,15 @@ static void bcm43xx_phy_initb6(struct bc > bcm43xx_write16(bcm, 0x03E4, 0x0009); > if (phy->type == BCM43xx_PHYTYPE_B) { > bcm43xx_write16(bcm, 0x03E6, 0x8140); > - bcm43xx_phy_write(bcm, 0x0016, 0x5410); > - bcm43xx_phy_write(bcm, 0x0017, 0xA820); > - bcm43xx_phy_write(bcm, 0x0007, 0x0062); > - TODO();//TODO: calibrate stuff. > + bcm43xx_phy_write(bcm, 0x0016, 0x0410); > + bcm43xx_phy_write(bcm, 0x0017, 0x0820); > + bcm43xx_phy_write(bcm, 0x0062, 0x0007); > + (void) bcm43xx_radio_calibrationvalue(bcm); > + bcm43xx_phy_lo_b_measure(bcm); > + if (bcm->sprom.boardflags & BCM43xx_BFL_RSSI) { > + bcm43xx_calc_nrssi_slope(bcm); > + bcm43xx_calc_nrssi_threshold(bcm); > + } > bcm43xx_phy_init_pctl(bcm); > } else > bcm43xx_write16(bcm, 0x03E6, 0x0); > diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_radio.c > b/drivers/net/wireless/bcm43xx/bcm43xx_radio.c > index 5ce6ace..3901aa9 100644 > --- a/drivers/net/wireless/bcm43xx/bcm43xx_radio.c > +++ b/drivers/net/wireless/bcm43xx/bcm43xx_radio.c > @@ -1184,7 +1184,7 @@ int bcm43xx_radio_set_interference_mitig > return 0; > } > > -static u16 bcm43xx_radio_calibrationvalue(struct bcm43xx_private *bcm) > +u16 bcm43xx_radio_calibrationvalue(struct bcm43xx_private *bcm) > { > u16 reg, index, ret; > > diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_radio.h > b/drivers/net/wireless/bcm43xx/bcm43xx_radio.h > index 89fe292..a5d2e10 100644 > --- a/drivers/net/wireless/bcm43xx/bcm43xx_radio.h > +++ b/drivers/net/wireless/bcm43xx/bcm43xx_radio.h > @@ -89,5 +89,6 @@ void bcm43xx_nrssi_hw_update(struct bcm4 > void bcm43xx_nrssi_mem_update(struct bcm43xx_private *bcm); > > void bcm43xx_radio_set_tx_iq(struct bcm43xx_private *bcm); > +u16 bcm43xx_radio_calibrationvalue(struct bcm43xx_private *bcm); > > #endif /* BCM43xx_RADIO_H_ */ > -- > Danny van Dyk <kugelfang-aBrp7R+bbdUdnm+yROfE0A@public.gmane.org> > Gentoo/AMD64 Project, Gentoo Scientific Project > -- Greetings Michael. [-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --] ^ permalink raw reply [flat|nested] 7+ messages in thread
[parent not found: <200602011455.34307.mbuesch-KuiJ5kEpwI6ELgA04lAiVw@public.gmane.org>]
* Re: Re: [GIT PULL] bcm43xx: Update B6PHY initialization [not found] ` <200602011455.34307.mbuesch-KuiJ5kEpwI6ELgA04lAiVw@public.gmane.org> @ 2006-02-01 18:54 ` Danny van Dyk [not found] ` <200602011954.52325.kugelfang-aBrp7R+bbdUdnm+yROfE0A@public.gmane.org> 0 siblings, 1 reply; 7+ messages in thread From: Danny van Dyk @ 2006-02-01 18:54 UTC (permalink / raw) To: John Linville Cc: Michael Buesch, bcm43xx-dev-0fE9KPoRgkgATYTw5x5z8w, netdev-u79uwXL29TY76Z2rM5mHXA John, > On Wednesday 01 February 2006 10:51, Danny van Dyk wrote: > > John, please > > > > git pull rsync://pitr.amd64.dev.gentoo.org/kugelfang/wireless-2.6.git > > > > which will provide this changeset: > > > > Danny van Dyk: > > [bcm43xx] Sync bcm43xx_phy_initb6() with specs > > Danny, _please_ make sure to apply patches to the softmac _and_ the dscape > branch. Otherwise patches will get lost. > It is very important to keep both branches in sync. I just added the very same patch to the dscape-all branch in my repo. Please git pull rsync://pitr.amd64.dev.gentoo.org/kugelfang/wireless-2.6.git I don't post the patch again, as it is really the same as the previously sent patch When applying it, I noticed that the dscape branch's bcm43xx is differently named than the softmac branch's. Why ? :-) Danny -- Danny van Dyk <kugelfang-aBrp7R+bbdUdnm+yROfE0A@public.gmane.org> Gentoo/AMD64 Project, Gentoo Scientific Project ^ permalink raw reply [flat|nested] 7+ messages in thread
[parent not found: <200602011954.52325.kugelfang-aBrp7R+bbdUdnm+yROfE0A@public.gmane.org>]
* Re: Re: [GIT PULL] bcm43xx: Update B6PHY initialization [not found] ` <200602011954.52325.kugelfang-aBrp7R+bbdUdnm+yROfE0A@public.gmane.org> @ 2006-02-01 18:56 ` Michael Buesch 0 siblings, 0 replies; 7+ messages in thread From: Michael Buesch @ 2006-02-01 18:56 UTC (permalink / raw) To: Danny van Dyk Cc: John Linville, bcm43xx-dev-0fE9KPoRgkgATYTw5x5z8w, netdev-u79uwXL29TY76Z2rM5mHXA [-- Attachment #1: Type: text/plain, Size: 268 bytes --] On Wednesday 01 February 2006 19:54, you wrote: > When applying it, I noticed that the dscape branch's bcm43xx is differently > named than the softmac branch's. Why ? :-) Both branches can co-exist in one tree (see branch "domesday") -- Greetings Michael. [-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --] ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [GIT PULL] bcm43xx: Update B6PHY initialization [not found] ` <200602011051.00973.kugelfang-aBrp7R+bbdUdnm+yROfE0A@public.gmane.org> 2006-02-01 13:55 ` Michael Buesch @ 2006-02-10 0:51 ` John W. Linville 1 sibling, 0 replies; 7+ messages in thread From: John W. Linville @ 2006-02-10 0:51 UTC (permalink / raw) To: Danny van Dyk Cc: netdev-u79uwXL29TY76Z2rM5mHXA, bcm43xx-dev-0fE9KPoRgkgATYTw5x5z8w In the future, please include a Signed-off-by: line in your patches or git commits...thanks! John On Wed, Feb 01, 2006 at 10:51:00AM +0100, Danny van Dyk wrote: > John, please > > git pull rsync://pitr.amd64.dev.gentoo.org/kugelfang/wireless-2.6.git > > which will provide this changeset: > > Danny van Dyk: > [bcm43xx] Sync bcm43xx_phy_initb6() with specs > > diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_phy.c > b/drivers/net/wireless/bcm43xx/bcm43xx_phy.c > index f5e7a6a..d90f207 100644 > --- a/drivers/net/wireless/bcm43xx/bcm43xx_phy.c > +++ b/drivers/net/wireless/bcm43xx/bcm43xx_phy.c > @@ -947,7 +947,7 @@ static void bcm43xx_phy_initb6(struct bc > bcm43xx_radio_write16(bcm, 0x0050, 0x0020); > if ((bcm->current_core->radio->manufact == 0x17F) && > (bcm->current_core->radio->version == 0x2050) && > - (bcm->current_core->radio->revision == 2)) { > + (bcm->current_core->radio->revision <= 2)) { > bcm43xx_radio_write16(bcm, 0x0050, 0x0020); > bcm43xx_radio_write16(bcm, 0x005A, 0x0070); > bcm43xx_radio_write16(bcm, 0x005B, 0x007B); > @@ -984,10 +984,15 @@ static void bcm43xx_phy_initb6(struct bc > bcm43xx_write16(bcm, 0x03E4, 0x0009); > if (phy->type == BCM43xx_PHYTYPE_B) { > bcm43xx_write16(bcm, 0x03E6, 0x8140); > - bcm43xx_phy_write(bcm, 0x0016, 0x5410); > - bcm43xx_phy_write(bcm, 0x0017, 0xA820); > - bcm43xx_phy_write(bcm, 0x0007, 0x0062); > - TODO();//TODO: calibrate stuff. > + bcm43xx_phy_write(bcm, 0x0016, 0x0410); > + bcm43xx_phy_write(bcm, 0x0017, 0x0820); > + bcm43xx_phy_write(bcm, 0x0062, 0x0007); > + (void) bcm43xx_radio_calibrationvalue(bcm); > + bcm43xx_phy_lo_b_measure(bcm); > + if (bcm->sprom.boardflags & BCM43xx_BFL_RSSI) { > + bcm43xx_calc_nrssi_slope(bcm); > + bcm43xx_calc_nrssi_threshold(bcm); > + } > bcm43xx_phy_init_pctl(bcm); > } else > bcm43xx_write16(bcm, 0x03E6, 0x0); > diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_radio.c > b/drivers/net/wireless/bcm43xx/bcm43xx_radio.c > index 5ce6ace..3901aa9 100644 > --- a/drivers/net/wireless/bcm43xx/bcm43xx_radio.c > +++ b/drivers/net/wireless/bcm43xx/bcm43xx_radio.c > @@ -1184,7 +1184,7 @@ int bcm43xx_radio_set_interference_mitig > return 0; > } > > -static u16 bcm43xx_radio_calibrationvalue(struct bcm43xx_private *bcm) > +u16 bcm43xx_radio_calibrationvalue(struct bcm43xx_private *bcm) > { > u16 reg, index, ret; > > diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_radio.h > b/drivers/net/wireless/bcm43xx/bcm43xx_radio.h > index 89fe292..a5d2e10 100644 > --- a/drivers/net/wireless/bcm43xx/bcm43xx_radio.h > +++ b/drivers/net/wireless/bcm43xx/bcm43xx_radio.h > @@ -89,5 +89,6 @@ void bcm43xx_nrssi_hw_update(struct bcm4 > void bcm43xx_nrssi_mem_update(struct bcm43xx_private *bcm); > > void bcm43xx_radio_set_tx_iq(struct bcm43xx_private *bcm); > +u16 bcm43xx_radio_calibrationvalue(struct bcm43xx_private *bcm); > > #endif /* BCM43xx_RADIO_H_ */ > -- > Danny van Dyk <kugelfang-aBrp7R+bbdUdnm+yROfE0A@public.gmane.org> > Gentoo/AMD64 Project, Gentoo Scientific Project > > -- > Danny van Dyk <kugelfang-aBrp7R+bbdUdnm+yROfE0A@public.gmane.org> > Gentoo/AMD64 Project, Gentoo Scientific Project -- John W. Linville linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2006-02-10 0:51 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-02-01 0:06 [GIT PULL] bcm43xx: Update B6PHY initialization Danny van Dyk
[not found] ` <43DFFB6C.9050907-aBrp7R+bbdUdnm+yROfE0A@public.gmane.org>
2006-02-01 0:21 ` Jeff Garzik
[not found] ` <20060201002101.GA8306-oTNwCEtKUwI/11+TDStg7g@public.gmane.org>
2006-02-01 9:51 ` Danny van Dyk
[not found] ` <200602011051.00973.kugelfang-aBrp7R+bbdUdnm+yROfE0A@public.gmane.org>
2006-02-01 13:55 ` Michael Buesch
[not found] ` <200602011455.34307.mbuesch-KuiJ5kEpwI6ELgA04lAiVw@public.gmane.org>
2006-02-01 18:54 ` Danny van Dyk
[not found] ` <200602011954.52325.kugelfang-aBrp7R+bbdUdnm+yROfE0A@public.gmane.org>
2006-02-01 18:56 ` Michael Buesch
2006-02-10 0:51 ` John W. Linville
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).