bcm43xx: Update B6PHY initialization
Subsystems (3)
-----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 <[email protected]> Gentoo/AMD64 Project, Gentoo Scientific Project -----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)
iD8DBQFD3/traVNL8NrtU6IRAnt1AJ9AL8PZyOQKcqX0PvoHJt83P1PGWgCgoKap Ye/hY6nu6Cs8dkt4HmaWqiw=
=rbQh
-----END PGP SIGNATURE-----
Quoted 9 lines · Danny van Dyk
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1Hi 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
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
(quoted diff) +0 -0
b/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
index f5e7a6a..d90f207 100644
drivers/net/wireless/bcm43xx/bcm43xx_phy.c +10 -5
@@ -947,7 +947,7 @@ static void bcm43xx_phy_initb6(struct bcbcm43xx_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 bcbcm43xx_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 );
(quoted diff) +0 -0
b/drivers/net/wireless/bcm43xx/bcm43xx_radio.c
index 5ce6ace..3901aa9 100644
drivers/net/wireless/bcm43xx/bcm43xx_radio.c +1 -1
@@ -1184,7 +1184,7 @@ int bcm43xx_radio_set_interference_mitigreturn 0 ; } -static u16 bcm43xx_radio_calibrationvalue (struct bcm43xx_private *bcm) +u16 bcm43xx_radio_calibrationvalue (struct bcm43xx_private *bcm) {u16 reg, index, ret;
(quoted diff) +0 -0
b/drivers/net/wireless/bcm43xx/bcm43xx_radio.h
index 89fe292..a5d2e10 100644
drivers/net/wireless/bcm43xx/bcm43xx_radio.h +1 -0
@@ -89,5 +89,6 @@ void bcm43xx_nrssi_hw_update(struct bcm4void 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_ */
Signature · 6 lines
Danny van Dyk <[email protected]> Gentoo/AMD64 Project, Gentoo Scientific Project -- Danny van Dyk <[email protected]> Gentoo/AMD64 Project, Gentoo Scientific Project
Quoted 8 lines · Danny van Dyk
John, please
git pull rsync://pitr.amd64.dev.gentoo.org/kugelfang/wireless-2.6.git
which will provide this changeset:
Danny van Dyk:
[bcm43xx] Syncbcm43xx_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.
Quoted 64 lines
drivers/net/wireless/bcm43xx/bcm43xx_phy.c +10
-5@@ -947,7 +947,7 @@ static void bcm43xx_phy_initb6(struct bcbcm43xx_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 bcbcm43xx_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 );drivers/net/wireless/bcm43xx/bcm43xx_radio.c +1
-1@@ -1184,7 +1184,7 @@ int bcm43xx_radio_set_interference_mitigreturn 0 ; } -static u16 bcm43xx_radio_calibrationvalue (struct bcm43xx_private *bcm) +u16 bcm43xx_radio_calibrationvalue (struct bcm43xx_private *bcm) {u16 reg, index, ret;drivers/net/wireless/bcm43xx/bcm43xx_radio.h +1
-0@@ -89,5 +89,6 @@ void bcm43xx_nrssi_hw_update(struct bcm4void 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_ */ Signature · 2 lines
Danny van Dyk <[email protected]> Gentoo/AMD64 Project, Gentoo Scientific Project
Signature · 1 line
Greetings Michael.
John,
Quoted 5 lines · Danny van Dyk
Quoted 4 lines
John, please
git pull rsync://pitr.amd64.dev.gentoo.org/kugelfang/wireless-2.6.git
Quoted 8 lines
Quoted 4 lines
which will provide this changeset:
Danny van Dyk:
[bcm43xx] Syncbcm43xx_phy_initb6()with specsDanny, _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
Signature · 2 lines
Danny van Dyk <[email protected]> Gentoo/AMD64 Project, Gentoo Scientific Project
Quoted 2 lines · you
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")
Signature · 1 line
Greetings Michael.
In the future, please include a Signed-off-by: line in your patches or git commits...thanks!
John
Quoted 76 lines · Danny van Dyk
John, please
git pull rsync://pitr.amd64.dev.gentoo.org/kugelfang/wireless-2.6.git
which will provide this changeset:
Danny van Dyk:
[bcm43xx] Syncbcm43xx_phy_initb6()with specsdrivers/net/wireless/bcm43xx/bcm43xx_phy.c +10
-5@@ -947,7 +947,7 @@ static void bcm43xx_phy_initb6(struct bcbcm43xx_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 bcbcm43xx_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 );drivers/net/wireless/bcm43xx/bcm43xx_radio.c +1
-1@@ -1184,7 +1184,7 @@ int bcm43xx_radio_set_interference_mitigreturn 0 ; } -static u16 bcm43xx_radio_calibrationvalue (struct bcm43xx_private *bcm) +u16 bcm43xx_radio_calibrationvalue (struct bcm43xx_private *bcm) {u16 reg, index, ret;drivers/net/wireless/bcm43xx/bcm43xx_radio.h +1
-0@@ -89,5 +89,6 @@ void bcm43xx_nrssi_hw_update(struct bcm4void 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_ */ Signature · 6 lines
Danny van Dyk <[email protected]> Gentoo/AMD64 Project, Gentoo Scientific Project -- Danny van Dyk <[email protected]> Gentoo/AMD64 Project, Gentoo Scientific Project
Signature · 2 lines
John W. Linville [email protected]