* [RFC 1/4] mt76x0: print BBP version only for debug
2018-09-27 8:37 [RFC 0/4] mt76x0: phy/rf fixups for PCIe Stanislaw Gruszka
@ 2018-09-27 8:37 ` Stanislaw Gruszka
2018-09-27 9:26 ` Lorenzo Bianconi
2018-09-27 8:37 ` [RFC 2/4] mt76x0: correct RF access via RF_CSR regiser Stanislaw Gruszka
` (3 subsequent siblings)
4 siblings, 1 reply; 11+ messages in thread
From: Stanislaw Gruszka @ 2018-09-27 8:37 UTC (permalink / raw)
To: Felix Fietkau; +Cc: linux-wireless, Lorenzo Bianconi
Use dev_dbg to print BBP version.
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
---
drivers/net/wireless/mediatek/mt76/mt76x0/phy.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c b/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c
index 4fd2c65e196a..ca0a693654a3 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c
@@ -187,7 +187,6 @@ int mt76x0_wait_bbp_ready(struct mt76x0_dev *dev)
do {
val = mt76_rr(dev, MT_BBP(CORE, 0));
- printk("BBP version %08x\n", val);
if (val && ~val)
break;
} while (--i);
@@ -197,6 +196,7 @@ int mt76x0_wait_bbp_ready(struct mt76x0_dev *dev)
return -EIO;
}
+ dev_dbg(dev->mt76.dev, "BBP version %08x\n", val);
return 0;
}
--
1.9.3
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [RFC 1/4] mt76x0: print BBP version only for debug
2018-09-27 8:37 ` [RFC 1/4] mt76x0: print BBP version only for debug Stanislaw Gruszka
@ 2018-09-27 9:26 ` Lorenzo Bianconi
2018-09-27 9:34 ` Lorenzo Bianconi
2018-09-27 9:37 ` Stanislaw Gruszka
0 siblings, 2 replies; 11+ messages in thread
From: Lorenzo Bianconi @ 2018-09-27 9:26 UTC (permalink / raw)
To: Stanislaw Gruszka; +Cc: Felix Fietkau, linux-wireless
> Use dev_dbg to print BBP version.
>
> Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
> ---
> drivers/net/wireless/mediatek/mt76/mt76x0/phy.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c b/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c
> index 4fd2c65e196a..ca0a693654a3 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c
> @@ -187,7 +187,6 @@ int mt76x0_wait_bbp_ready(struct mt76x0_dev *dev)
>
> do {
> val = mt76_rr(dev, MT_BBP(CORE, 0));
> - printk("BBP version %08x\n", val);
> if (val && ~val)
> break;
> } while (--i);
> @@ -197,6 +196,7 @@ int mt76x0_wait_bbp_ready(struct mt76x0_dev *dev)
> return -EIO;
> }
>
> + dev_dbg(dev->mt76.dev, "BBP version %08x\n", val);
> return 0;
> }
I guess we can drop mt76x0_wait_bbp_ready and use mt76x02_wait_for_mac instead
Regards,
Lorenzo
>
> --
> 1.9.3
>
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [RFC 1/4] mt76x0: print BBP version only for debug
2018-09-27 9:26 ` Lorenzo Bianconi
@ 2018-09-27 9:34 ` Lorenzo Bianconi
2018-09-27 9:41 ` Stanislaw Gruszka
2018-09-27 9:37 ` Stanislaw Gruszka
1 sibling, 1 reply; 11+ messages in thread
From: Lorenzo Bianconi @ 2018-09-27 9:34 UTC (permalink / raw)
To: Stanislaw Gruszka; +Cc: Felix Fietkau, linux-wireless
>
> > Use dev_dbg to print BBP version.
> >
> > Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
> > ---
> > drivers/net/wireless/mediatek/mt76/mt76x0/phy.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c b/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c
> > index 4fd2c65e196a..ca0a693654a3 100644
> > --- a/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c
> > +++ b/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c
> > @@ -187,7 +187,6 @@ int mt76x0_wait_bbp_ready(struct mt76x0_dev *dev)
> >
> > do {
> > val = mt76_rr(dev, MT_BBP(CORE, 0));
> > - printk("BBP version %08x\n", val);
> > if (val && ~val)
> > break;
> > } while (--i);
> > @@ -197,6 +196,7 @@ int mt76x0_wait_bbp_ready(struct mt76x0_dev *dev)
> > return -EIO;
> > }
> >
> > + dev_dbg(dev->mt76.dev, "BBP version %08x\n", val);
> > return 0;
> > }
>
> I guess we can drop mt76x0_wait_bbp_ready and use mt76x02_wait_for_mac instead
>
> Regards,
> Lorenzo
Please drop the comment, it is a different register. Maybe we can
generalize mt76x02_wait_for_mac instead?
Regards,
Lorenzo
>
> >
> > --
> > 1.9.3
> >
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [RFC 1/4] mt76x0: print BBP version only for debug
2018-09-27 9:26 ` Lorenzo Bianconi
2018-09-27 9:34 ` Lorenzo Bianconi
@ 2018-09-27 9:37 ` Stanislaw Gruszka
1 sibling, 0 replies; 11+ messages in thread
From: Stanislaw Gruszka @ 2018-09-27 9:37 UTC (permalink / raw)
To: Lorenzo Bianconi; +Cc: Felix Fietkau, linux-wireless
On Thu, Sep 27, 2018 at 11:26:30AM +0200, Lorenzo Bianconi wrote:
> > Use dev_dbg to print BBP version.
> >
> > Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
> > ---
> > drivers/net/wireless/mediatek/mt76/mt76x0/phy.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c b/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c
> > index 4fd2c65e196a..ca0a693654a3 100644
> > --- a/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c
> > +++ b/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c
> > @@ -187,7 +187,6 @@ int mt76x0_wait_bbp_ready(struct mt76x0_dev *dev)
> >
> > do {
> > val = mt76_rr(dev, MT_BBP(CORE, 0));
> > - printk("BBP version %08x\n", val);
> > if (val && ~val)
> > break;
> > } while (--i);
> > @@ -197,6 +196,7 @@ int mt76x0_wait_bbp_ready(struct mt76x0_dev *dev)
> > return -EIO;
> > }
> >
> > + dev_dbg(dev->mt76.dev, "BBP version %08x\n", val);
> > return 0;
> > }
>
> I guess we can drop mt76x0_wait_bbp_ready and use mt76x02_wait_for_mac instead
Why? Wait for BBP is diffrent, we read MT_BBP(CORE, 0)=0x2000 register,
wait for MAC we read MT_MAC_CSR0=0x1000 ?
Baside this patch is about replacing printk by dev_dbg.
Thanks
Stanislaw
^ permalink raw reply [flat|nested] 11+ messages in thread
* [RFC 2/4] mt76x0: correct RF access via RF_CSR regiser.
2018-09-27 8:37 [RFC 0/4] mt76x0: phy/rf fixups for PCIe Stanislaw Gruszka
2018-09-27 8:37 ` [RFC 1/4] mt76x0: print BBP version only for debug Stanislaw Gruszka
@ 2018-09-27 8:37 ` Stanislaw Gruszka
2018-09-27 8:37 ` [RFC 3/4] mt76: allow to identify bus Stanislaw Gruszka
` (2 subsequent siblings)
4 siblings, 0 replies; 11+ messages in thread
From: Stanislaw Gruszka @ 2018-09-27 8:37 UTC (permalink / raw)
To: Felix Fietkau; +Cc: linux-wireless, Lorenzo Bianconi
PCIe version don't use MCU for RF regsisters access. We need
to correct RF CSR method to support up to 127 RF registers.
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
---
drivers/net/wireless/mediatek/mt76/mt76x0/phy.c | 6 ++----
drivers/net/wireless/mediatek/mt76/mt76x02_regs.h | 4 ++--
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c b/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c
index ca0a693654a3..33e0ea9707e3 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c
@@ -37,7 +37,7 @@
bank = MT_RF_BANK(offset);
reg = MT_RF_REG(offset);
- if (WARN_ON_ONCE(reg > 64) || WARN_ON_ONCE(bank) > 8)
+ if (WARN_ON_ONCE(reg > 127) || WARN_ON_ONCE(bank) > 8)
return -EINVAL;
mutex_lock(&dev->reg_atomic_mutex);
@@ -77,7 +77,7 @@
bank = MT_RF_BANK(offset);
reg = MT_RF_REG(offset);
- if (WARN_ON_ONCE(reg > 64) || WARN_ON_ONCE(bank) > 8)
+ if (WARN_ON_ONCE(reg > 127) || WARN_ON_ONCE(bank) > 8)
return -EINVAL;
mutex_lock(&dev->reg_atomic_mutex);
@@ -120,7 +120,6 @@
return mt76_wr_rp(dev, MT_MCU_MEMMAP_RF, &pair, 1);
} else {
- WARN_ON_ONCE(1);
return mt76x0_rf_csr_wr(dev, offset, val);
}
}
@@ -139,7 +138,6 @@
ret = mt76_rd_rp(dev, MT_MCU_MEMMAP_RF, &pair, 1);
val = pair.value;
} else {
- WARN_ON_ONCE(1);
ret = val = mt76x0_rf_csr_rr(dev, offset);
}
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_regs.h b/drivers/net/wireless/mediatek/mt76/mt76x02_regs.h
index 24d1e6d747dd..f7de77d09d28 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_regs.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_regs.h
@@ -205,8 +205,8 @@
#define MT_TXQ_STA 0x0434
#define MT_RF_CSR_CFG 0x0500
#define MT_RF_CSR_CFG_DATA GENMASK(7, 0)
-#define MT_RF_CSR_CFG_REG_ID GENMASK(13, 8)
-#define MT_RF_CSR_CFG_REG_BANK GENMASK(17, 14)
+#define MT_RF_CSR_CFG_REG_ID GENMASK(14, 8)
+#define MT_RF_CSR_CFG_REG_BANK GENMASK(17, 15)
#define MT_RF_CSR_CFG_WR BIT(30)
#define MT_RF_CSR_CFG_KICK BIT(31)
--
1.9.3
^ permalink raw reply related [flat|nested] 11+ messages in thread* [RFC 3/4] mt76: allow to identify bus
2018-09-27 8:37 [RFC 0/4] mt76x0: phy/rf fixups for PCIe Stanislaw Gruszka
2018-09-27 8:37 ` [RFC 1/4] mt76x0: print BBP version only for debug Stanislaw Gruszka
2018-09-27 8:37 ` [RFC 2/4] mt76x0: correct RF access via RF_CSR regiser Stanislaw Gruszka
@ 2018-09-27 8:37 ` Stanislaw Gruszka
2018-09-27 8:37 ` [RFC 4/4] mt76x0: correct RF reg pairs write for PCIe Stanislaw Gruszka
2018-09-27 11:47 ` [RFC 0/4] mt76x0: phy/rf fixups " Felix Fietkau
4 siblings, 0 replies; 11+ messages in thread
From: Stanislaw Gruszka @ 2018-09-27 8:37 UTC (permalink / raw)
To: Felix Fietkau; +Cc: linux-wireless, Lorenzo Bianconi
Add helpers to identify bus type.
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
---
drivers/net/wireless/mediatek/mt76/mmio.c | 1 +
drivers/net/wireless/mediatek/mt76/mt76.h | 9 +++++++++
drivers/net/wireless/mediatek/mt76/usb.c | 1 +
3 files changed, 11 insertions(+)
diff --git a/drivers/net/wireless/mediatek/mt76/mmio.c b/drivers/net/wireless/mediatek/mt76/mmio.c
index 30a5d928e655..1d6bbce76041 100644
--- a/drivers/net/wireless/mediatek/mt76/mmio.c
+++ b/drivers/net/wireless/mediatek/mt76/mmio.c
@@ -79,6 +79,7 @@ void mt76_mmio_init(struct mt76_dev *dev, void __iomem *regs)
.copy = mt76_mmio_copy,
.wr_rp = mt76_mmio_wr_rp,
.rd_rp = mt76_mmio_rd_rp,
+ .type = MT76_BUS_MMIO,
};
dev->bus = &mt76_mmio_ops;
diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index f2dd4d87e355..b0e6215c67ec 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -38,6 +38,11 @@ struct mt76_reg_pair {
u32 value;
};
+enum mt76_bus_type {
+ MT76_BUS_MMIO,
+ MT76_BUS_USB,
+};
+
struct mt76_bus_ops {
u32 (*rr)(struct mt76_dev *dev, u32 offset);
void (*wr)(struct mt76_dev *dev, u32 offset, u32 val);
@@ -48,8 +53,12 @@ struct mt76_bus_ops {
const struct mt76_reg_pair *rp, int len);
int (*rd_rp)(struct mt76_dev *dev, u32 base,
struct mt76_reg_pair *rp, int len);
+ enum mt76_bus_type type;
};
+#define mt76_is_usb(dev) ((dev)->mt76.bus->type == MT76_BUS_USB)
+#define mt76_is_mmio(dev) ((dev)->mt76.bus->type == MT76_BUS_MMIO)
+
enum mt76_txq_id {
MT_TXQ_VO = IEEE80211_AC_VO,
MT_TXQ_VI = IEEE80211_AC_VI,
diff --git a/drivers/net/wireless/mediatek/mt76/usb.c b/drivers/net/wireless/mediatek/mt76/usb.c
index de7785c4f6af..a7fc5db39b31 100644
--- a/drivers/net/wireless/mediatek/mt76/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/usb.c
@@ -862,6 +862,7 @@ int mt76u_init(struct mt76_dev *dev,
.copy = mt76u_copy,
.wr_rp = mt76u_wr_rp,
.rd_rp = mt76u_rd_rp,
+ .type = MT76_BUS_USB,
};
struct mt76_usb *usb = &dev->usb;
--
1.9.3
^ permalink raw reply related [flat|nested] 11+ messages in thread* [RFC 4/4] mt76x0: correct RF reg pairs write for PCIe
2018-09-27 8:37 [RFC 0/4] mt76x0: phy/rf fixups for PCIe Stanislaw Gruszka
` (2 preceding siblings ...)
2018-09-27 8:37 ` [RFC 3/4] mt76: allow to identify bus Stanislaw Gruszka
@ 2018-09-27 8:37 ` Stanislaw Gruszka
2018-09-27 11:47 ` [RFC 0/4] mt76x0: phy/rf fixups " Felix Fietkau
4 siblings, 0 replies; 11+ messages in thread
From: Stanislaw Gruszka @ 2018-09-27 8:37 UTC (permalink / raw)
To: Felix Fietkau; +Cc: linux-wireless, Lorenzo Bianconi
We have to use RF CSR method for PCIe.
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
---
drivers/net/wireless/mediatek/mt76/mt76x0/phy.c | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c b/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c
index 33e0ea9707e3..4d4f8e7e5fe5 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c
@@ -174,9 +174,22 @@
}
#endif
-#define RF_RANDOM_WRITE(dev, tab) \
- mt76_wr_rp(dev, MT_MCU_MEMMAP_RF, \
- tab, ARRAY_SIZE(tab))
+static void
+mt76x0_rf_csr_wr_rp(struct mt76x0_dev *dev, const struct mt76_reg_pair *data,
+ int n)
+{
+ while (n-- > 0) {
+ mt76x0_rf_csr_wr(dev, data->reg, data->value);
+ data++;
+ }
+}
+
+#define RF_RANDOM_WRITE(dev, tab) do { \
+ if (mt76_is_mmio(dev)) \
+ mt76x0_rf_csr_wr_rp(dev, tab, ARRAY_SIZE(tab)); \
+ else \
+ mt76_wr_rp(dev, MT_MCU_MEMMAP_RF, tab, ARRAY_SIZE(tab));\
+} while (0)
int mt76x0_wait_bbp_ready(struct mt76x0_dev *dev)
{
--
1.9.3
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [RFC 0/4] mt76x0: phy/rf fixups for PCIe
2018-09-27 8:37 [RFC 0/4] mt76x0: phy/rf fixups for PCIe Stanislaw Gruszka
` (3 preceding siblings ...)
2018-09-27 8:37 ` [RFC 4/4] mt76x0: correct RF reg pairs write for PCIe Stanislaw Gruszka
@ 2018-09-27 11:47 ` Felix Fietkau
2018-09-30 19:11 ` Lorenzo Bianconi
4 siblings, 1 reply; 11+ messages in thread
From: Felix Fietkau @ 2018-09-27 11:47 UTC (permalink / raw)
To: Stanislaw Gruszka; +Cc: linux-wireless, Lorenzo Bianconi
On 2018-09-27 10:37, Stanislaw Gruszka wrote:
> This is RFC for now, especially I'm interesting if patch 3 and 4
> is direction we should go.
>
> This is on top of Lorenzo github mt7610ev5 branch.
Looks good to me.
Thanks,
- Felix
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [RFC 0/4] mt76x0: phy/rf fixups for PCIe
2018-09-27 11:47 ` [RFC 0/4] mt76x0: phy/rf fixups " Felix Fietkau
@ 2018-09-30 19:11 ` Lorenzo Bianconi
0 siblings, 0 replies; 11+ messages in thread
From: Lorenzo Bianconi @ 2018-09-30 19:11 UTC (permalink / raw)
To: Felix Fietkau; +Cc: Stanislaw Gruszka, linux-wireless
>
> On 2018-09-27 10:37, Stanislaw Gruszka wrote:
> > This is RFC for now, especially I'm interesting if patch 3 and 4
> > is direction we should go.
> >
> > This is on top of Lorenzo github mt7610ev5 branch.
> Looks good to me.
>
> Thanks,
>
> - Felix
Hi Stanislaw,
I tested this series and it works fine, so feel free to add my
'tested-by' when you submit the patchset.
I guess we should add a 'mt76_is_usb()' check in rf_rr()/rf_wr(),
agree? Something like:
@@ -111,7 +111,8 @@
static int
rf_wr(struct mt76x02_dev *dev, u32 offset, u8 val)
{
- if (test_bit(MT76_STATE_MCU_RUNNING, &dev->mt76.state)) {
+ if (test_bit(MT76_STATE_MCU_RUNNING, &dev->mt76.state) &&
+ mt76_is_usb(dev)) {
struct mt76_reg_pair pair = {
.reg = offset,
.value = val,
@@ -129,7 +130,8 @@
int ret;
u32 val;
- if (test_bit(MT76_STATE_MCU_RUNNING, &dev->mt76.state)) {
+ if (test_bit(MT76_STATE_MCU_RUNNING, &dev->mt76.state) &&
+ mt76_is_usb(dev)) {
struct mt76_reg_pair pair = {
.reg = offset,
};
Regards,
Lorenzo
^ permalink raw reply [flat|nested] 11+ messages in thread