Commit 2735a6dd authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by Kalle Valo

mt76: unify wait_for_mac

Create new mt76x02_mac.h for common mac functions of mt76x0 and mt76x2
and unity wait_for_mac for both drivers.
Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent ac5d5b3f
...@@ -384,9 +384,11 @@ int mt76x0_init_hardware(struct mt76x0_dev *dev) ...@@ -384,9 +384,11 @@ int mt76x0_init_hardware(struct mt76x0_dev *dev)
mt76x0_chip_onoff(dev, true, true); mt76x0_chip_onoff(dev, true, true);
ret = mt76x0_wait_asic_ready(dev); if (!mt76x02_wait_for_mac(&dev->mt76)) {
if (ret) ret = -ETIMEDOUT;
goto err; goto err;
}
ret = mt76x0_mcu_init(dev); ret = mt76x0_mcu_init(dev);
if (ret) if (ret)
goto err; goto err;
...@@ -399,9 +401,10 @@ int mt76x0_init_hardware(struct mt76x0_dev *dev) ...@@ -399,9 +401,10 @@ int mt76x0_init_hardware(struct mt76x0_dev *dev)
} }
/* Wait for ASIC ready after FW load. */ /* Wait for ASIC ready after FW load. */
ret = mt76x0_wait_asic_ready(dev); if (!mt76x02_wait_for_mac(&dev->mt76)) {
if (ret) ret = -ETIMEDOUT;
goto err; goto err;
}
mt76x0_reset_csr_bbp(dev); mt76x0_reset_csr_bbp(dev);
mt76x0_init_usb_dma(dev); mt76x0_init_usb_dma(dev);
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include <linux/debugfs.h> #include <linux/debugfs.h>
#include "../mt76.h" #include "../mt76.h"
#include "../mt76x02_mac.h"
#include "regs.h" #include "regs.h"
#define MT_CALIBRATE_INTERVAL (4 * HZ) #define MT_CALIBRATE_INTERVAL (4 * HZ)
...@@ -263,8 +264,6 @@ static inline bool is_mt7610e(struct mt76x0_dev *dev) ...@@ -263,8 +264,6 @@ static inline bool is_mt7610e(struct mt76x0_dev *dev)
void mt76x0_init_debugfs(struct mt76x0_dev *dev); void mt76x0_init_debugfs(struct mt76x0_dev *dev);
int mt76x0_wait_asic_ready(struct mt76x0_dev *dev);
/* Compatibility with mt76 */ /* Compatibility with mt76 */
#define mt76_rmw_field(_dev, _reg, _field, _val) \ #define mt76_rmw_field(_dev, _reg, _field, _val) \
mt76_rmw(_dev, _reg, _field, FIELD_PREP(_field, _val)) mt76_rmw(_dev, _reg, _field, FIELD_PREP(_field, _val))
......
...@@ -287,9 +287,10 @@ static int mt76x0_probe(struct usb_interface *usb_intf, ...@@ -287,9 +287,10 @@ static int mt76x0_probe(struct usb_interface *usb_intf,
/* Disable the HW, otherwise MCU fail to initalize on hot reboot */ /* Disable the HW, otherwise MCU fail to initalize on hot reboot */
mt76x0_chip_onoff(dev, false, false); mt76x0_chip_onoff(dev, false, false);
ret = mt76x0_wait_asic_ready(dev); if (!mt76x02_wait_for_mac(&dev->mt76)) {
if (ret) ret = -ETIMEDOUT;
goto err; goto err;
}
asic_rev = mt76_rr(dev, MT_ASIC_VERSION); asic_rev = mt76_rr(dev, MT_ASIC_VERSION);
mac_rev = mt76_rr(dev, MT_MAC_CSR0); mac_rev = mt76_rr(dev, MT_MAC_CSR0);
......
/*
* Copyright (C) 2016 Felix Fietkau <nbd@nbd.name>
* Copyright (C) 2018 Stanislaw Gruszka <stf_xl@wp.pl>
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#ifndef __MT76X02_MAC_H
#define __MT76X02_MAC_H
static inline bool mt76x02_wait_for_mac(struct mt76_dev *dev)
{
const u32 MAC_CSR0 = 0x1000;
int i;
for (i = 0; i < 500; i++) {
if (test_bit(MT76_REMOVED, &dev->state))
return -EIO;
switch (dev->bus->rr(dev, MAC_CSR0)) {
case 0:
case ~0:
break;
default:
return true;
}
usleep_range(5000, 10000);
}
return false;
}
#endif
...@@ -163,23 +163,6 @@ struct mt76x2_sta { ...@@ -163,23 +163,6 @@ struct mt76x2_sta {
int inactive_count; int inactive_count;
}; };
static inline bool mt76x2_wait_for_mac(struct mt76x2_dev *dev)
{
int i;
for (i = 0; i < 500; i++) {
switch (mt76_rr(dev, MT_MAC_CSR0)) {
case 0:
case ~0:
break;
default:
return true;
}
usleep_range(5000, 10000);
}
return false;
}
static inline bool is_mt7612(struct mt76x2_dev *dev) static inline bool is_mt7612(struct mt76x2_dev *dev)
{ {
return mt76_chip(&dev->mt76) == 0x7612; return mt76_chip(&dev->mt76) == 0x7612;
......
...@@ -101,7 +101,7 @@ static int mt76x2_mac_reset(struct mt76x2_dev *dev, bool hard) ...@@ -101,7 +101,7 @@ static int mt76x2_mac_reset(struct mt76x2_dev *dev, bool hard)
u32 val; u32 val;
int i, k; int i, k;
if (!mt76x2_wait_for_mac(dev)) if (!mt76x02_wait_for_mac(&dev->mt76))
return -ETIMEDOUT; return -ETIMEDOUT;
val = mt76_rr(dev, MT_WPDMA_GLO_CFG); val = mt76_rr(dev, MT_WPDMA_GLO_CFG);
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#define __MT76x2_MAC_H #define __MT76x2_MAC_H
#include "mt76.h" #include "mt76.h"
#include "mt76x02_mac.h"
struct mt76x2_dev; struct mt76x2_dev;
struct mt76x2_sta; struct mt76x2_sta;
......
...@@ -184,7 +184,7 @@ int mt76x2u_init_hardware(struct mt76x2_dev *dev) ...@@ -184,7 +184,7 @@ int mt76x2u_init_hardware(struct mt76x2_dev *dev)
mt76x2_reset_wlan(dev, true); mt76x2_reset_wlan(dev, true);
mt76x2u_power_on(dev); mt76x2u_power_on(dev);
if (!mt76x2_wait_for_mac(dev)) if (!mt76x02_wait_for_mac(&dev->mt76))
return -ETIMEDOUT; return -ETIMEDOUT;
err = mt76x2u_mcu_fw_init(dev); err = mt76x2u_mcu_fw_init(dev);
...@@ -197,7 +197,7 @@ int mt76x2u_init_hardware(struct mt76x2_dev *dev) ...@@ -197,7 +197,7 @@ int mt76x2u_init_hardware(struct mt76x2_dev *dev)
return -EIO; return -EIO;
/* wait for asic ready after fw load. */ /* wait for asic ready after fw load. */
if (!mt76x2_wait_for_mac(dev)) if (!mt76x02_wait_for_mac(&dev->mt76))
return -ETIMEDOUT; return -ETIMEDOUT;
mt76_wr(dev, MT_HEADER_TRANS_CTRL_REG, 0); mt76_wr(dev, MT_HEADER_TRANS_CTRL_REG, 0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment