[PATCH] b43: treat LCNXN-PHY as extra N-PHY devices

[PATCH] b43: treat LCNXN-PHY as extra N-PHY devices

[Rafał Miłecki]

LCNXN is simply a continuation of N, e.g. code handling LCNXN revs 0 and
1 is mostly the same as for N-PHY revs 7+.

Signed-off-by: Rafa? Mi?ecki <zajec5@gmail.com>
---
 drivers/net/wireless/b43/main.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 3e4333c..0b1aac4 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -4331,6 +4331,13 @@ static int b43_phy_versioning(struct b43_wldev *dev)
 	analog_type = (tmp & B43_PHYVER_ANALOG) >> B43_PHYVER_ANALOG_SHIFT;
 	phy_type = (tmp & B43_PHYVER_TYPE) >> B43_PHYVER_TYPE_SHIFT;
 	phy_rev = (tmp & B43_PHYVER_VERSION);
+
+	/* LCNXN is continuation of N which run out of revisions */
+	if (phy_type == B43_PHYTYPE_LCNXN) {
+		phy_type = B43_PHYTYPE_N;
+		phy_rev += 16;
+	}
+
 	switch (phy_type) {
 #ifdef CONFIG_B43_PHY_G
 	case B43_PHYTYPE_G:
-- 
1.8.4.5

[PATCH] b43: treat LCNXN-PHY as extra N-PHY devices

[Arend van Spriel]

On 29-06-14 21:46, Rafa? Mi?ecki wrote:
> LCNXN is simply a continuation of N, e.g. code handling LCNXN revs 0 and
> 1 is mostly the same as for N-PHY revs 7+.

Hi Rafa?,

LCNXN is actually a LCN phy with 2 streams (mimo).

Regards,
Arend

> Signed-off-by: Rafa? Mi?ecki <zajec5@gmail.com>
> ---
>  drivers/net/wireless/b43/main.c | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
> index 3e4333c..0b1aac4 100644
> --- a/drivers/net/wireless/b43/main.c
> +++ b/drivers/net/wireless/b43/main.c
> @@ -4331,6 +4331,13 @@ static int b43_phy_versioning(struct b43_wldev *dev)
>  	analog_type = (tmp & B43_PHYVER_ANALOG) >> B43_PHYVER_ANALOG_SHIFT;
>  	phy_type = (tmp & B43_PHYVER_TYPE) >> B43_PHYVER_TYPE_SHIFT;
>  	phy_rev = (tmp & B43_PHYVER_VERSION);
> +
> +	/* LCNXN is continuation of N which run out of revisions */
> +	if (phy_type == B43_PHYTYPE_LCNXN) {
> +		phy_type = B43_PHYTYPE_N;
> +		phy_rev += 16;
> +	}
> +
>  	switch (phy_type) {
>  #ifdef CONFIG_B43_PHY_G
>  	case B43_PHYTYPE_G:
> 

[PATCH] b43: treat LCNXN-PHY as extra N-PHY devices

[Rafał Miłecki]

On 30 June 2014 12:54, Arend van Spriel <arend@broadcom.com> wrote:
> On 29-06-14 21:46, Rafa? Mi?ecki wrote:
>> LCNXN is simply a continuation of N, e.g. code handling LCNXN revs 0 and
>> 1 is mostly the same as for N-PHY revs 7+.
>
> Hi Rafa?,
>
> LCNXN is actually a LCN phy with 2 streams (mimo).

Err, I don't think so. Could you take a closer look at this? I'm
pretty sure LCNXN is continuation of N.

Maybe you were thinking about LCN40? I don't know much about LCN40,
maybe it's a variation of LCN?

[PATCH] b43: treat LCNXN-PHY as extra N-PHY devices

[Arend van Spriel]

On 30-06-14 13:04, Rafa? Mi?ecki wrote:
> On 30 June 2014 12:54, Arend van Spriel <arend@broadcom.com> wrote:
>> On 29-06-14 21:46, Rafa? Mi?ecki wrote:
>>> LCNXN is simply a continuation of N, e.g. code handling LCNXN revs 0 and
>>> 1 is mostly the same as for N-PHY revs 7+.
>>
>> Hi Rafa?,
>>
>> LCNXN is actually a LCN phy with 2 streams (mimo).
> 
> Err, I don't think so. Could you take a closer look at this? I'm
> pretty sure LCNXN is continuation of N.

You got me. I taken a closer look. It seems to stand for e'x'tended n.
There was separate phy code for it, but in recent code it seems to be
handled by n phy code. So you are right.

> Maybe you were thinking about LCN40? I don't know much about LCN40,
> maybe it's a variation of LCN?

Probably.

Gr. AvS