Skip to content

Commit

Permalink
mt76x0: inital split between pci and usb
Browse files Browse the repository at this point in the history
For now pci driver can read ASIC version from the device :-)

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
  • Loading branch information
Stanislaw Gruszka authored and Felix Fietkau committed Sep 19, 2018
1 parent 1bee323 commit c2a4d9f
Show file tree
Hide file tree
Showing 9 changed files with 121 additions and 18 deletions.
23 changes: 16 additions & 7 deletions drivers/net/wireless/mediatek/mt76/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,35 @@ config MT76_USB

config MT76x02_LIB
tristate
depends on MT76_CORE
select MT76_CORE

config MT76x0_COMMON
tristate
select MT76x02_LIB

config MT76x2_COMMON
tristate
select MT76x02_LIB
depends on MT76_CORE

config MT76x0U
tristate "MediaTek MT76x0U (USB) support"
select MT76_CORE
select MT76x0_COMMON
select MT76_USB
depends on MAC80211
depends on USB
select MT76x02_LIB
help
This adds support for MT7610U-based wireless USB dongles.

config MT76x0E
tristate "MediaTek MT76x0E (PCIe) support"
select MT76x0_COMMON
depends on MAC80211
depends on PCI
help
This adds support for MT7610/MT7630-based wireless PCIe devices.

config MT76x2E
tristate "MediaTek MT76x2E (PCIe) support"
select MT76_CORE
select MT76x2_COMMON
depends on MAC80211
depends on PCI
Expand All @@ -34,9 +44,8 @@ config MT76x2E

config MT76x2U
tristate "MediaTek MT76x2U (USB) support"
select MT76_CORE
select MT76_USB
select MT76x2_COMMON
select MT76_USB
depends on MAC80211
depends on USB
help
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/wireless/mediatek/mt76/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
obj-$(CONFIG_MT76_CORE) += mt76.o
obj-$(CONFIG_MT76_USB) += mt76-usb.o
obj-$(CONFIG_MT76x0U) += mt76x0/
obj-$(CONFIG_MT76x0_COMMON) += mt76x0/
obj-$(CONFIG_MT76x02_LIB) += mt76x02-lib.o
obj-$(CONFIG_MT76x2_COMMON) += mt76x2-common.o
obj-$(CONFIG_MT76x2E) += mt76x2e.o
Expand Down
11 changes: 8 additions & 3 deletions drivers/net/wireless/mediatek/mt76/mt76x0/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
obj-$(CONFIG_MT76x0U) += mt76x0.o
obj-$(CONFIG_MT76x0U) += mt76x0u.o
obj-$(CONFIG_MT76x0E) += mt76x0e.o
obj-$(CONFIG_MT76x0_COMMON) += mt76x0-common.o

mt76x0-objs = \
usb.o init.o main.o mcu.o trace.o eeprom.o phy.o \
mt76x0-common-y := \
init.o main.o mcu.o trace.o eeprom.o phy.o \
mac.o debugfs.o tx.o
mt76x0u-y := usb.o
mt76x0e-y := pci.o

# ccflags-y := -DDEBUG
CFLAGS_trace.o := -I$(src)
2 changes: 2 additions & 0 deletions drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c
Original file line number Diff line number Diff line change
Expand Up @@ -445,3 +445,5 @@ mt76x0_eeprom_init(struct mt76x0_dev *dev)
kfree(eeprom);
return ret;
}

MODULE_LICENSE("Dual BSD/GPL");
6 changes: 6 additions & 0 deletions drivers/net/wireless/mediatek/mt76/mt76x0/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ void mt76x0_chip_onoff(struct mt76x0_dev *dev, bool enable, bool reset)

mutex_unlock(&dev->hw_atomic_mutex);
}
EXPORT_SYMBOL_GPL(mt76x0_chip_onoff);

static void mt76x0_reset_csr_bbp(struct mt76x0_dev *dev)
{
Expand Down Expand Up @@ -384,6 +385,7 @@ void mt76x0_mac_stop(struct mt76x0_dev *dev)
mt76u_stop_stat_wk(&dev->mt76);
mt76x0_mac_stop_hw(dev);
}
EXPORT_SYMBOL_GPL(mt76x0_mac_stop);

int mt76x0_init_hardware(struct mt76x0_dev *dev)
{
Expand Down Expand Up @@ -469,6 +471,7 @@ int mt76x0_init_hardware(struct mt76x0_dev *dev)

return 0;
}
EXPORT_SYMBOL_GPL(mt76x0_init_hardware);

void mt76x0_cleanup(struct mt76x0_dev *dev)
{
Expand All @@ -477,6 +480,7 @@ void mt76x0_cleanup(struct mt76x0_dev *dev)
mt76u_queues_deinit(&dev->mt76);
mt76u_mcu_deinit(&dev->mt76);
}
EXPORT_SYMBOL_GPL(mt76x0_cleanup);

struct mt76x0_dev *mt76x0_alloc_device(struct device *pdev)
{
Expand Down Expand Up @@ -505,6 +509,7 @@ struct mt76x0_dev *mt76x0_alloc_device(struct device *pdev)

return dev;
}
EXPORT_SYMBOL_GPL(mt76x0_alloc_device);

int mt76x0_register_device(struct mt76x0_dev *dev)
{
Expand Down Expand Up @@ -569,3 +574,4 @@ int mt76x0_register_device(struct mt76x0_dev *dev)

return 0;
}
EXPORT_SYMBOL_GPL(mt76x0_register_device);
7 changes: 7 additions & 0 deletions drivers/net/wireless/mediatek/mt76/mt76x0/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,13 @@ static int mt76x0_config(struct ieee80211_hw *hw, u32 changed)
return ret;
}

static void
mt76x0_addr_wr(struct mt76x0_dev *dev, const u32 offset, const u8 *addr)
{
mt76_wr(dev, offset, get_unaligned_le32(addr));
mt76_wr(dev, offset + 4, addr[4] | addr[5] << 8);
}

static void
mt76x0_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
struct ieee80211_bss_conf *info, u32 changed)
Expand Down
1 change: 0 additions & 1 deletion drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@ int mt76x0_read_reg_pairs(struct mt76x0_dev *dev, u32 base,
struct mt76_reg_pair *data, int len);
int mt76x0_burst_write_regs(struct mt76x0_dev *dev, u32 offset,
const u32 *data, int n);
void mt76x0_addr_wr(struct mt76x0_dev *dev, const u32 offset, const u8 *addr);

/* Init */
struct mt76x0_dev *mt76x0_alloc_device(struct device *dev);
Expand Down
81 changes: 81 additions & 0 deletions drivers/net/wireless/mediatek/mt76/mt76x0/pci.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
/*
* Copyright (C) 2016 Felix Fietkau <nbd@nbd.name>
*
* 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.
*/

#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>

#include "mt76x0.h"

static int
mt76x0e_probe(struct pci_dev *pdev, const struct pci_device_id *id)
{
struct mt76x0_dev *dev;
int ret = -ENODEV;

ret = pcim_enable_device(pdev);
if (ret)
return ret;

ret = pcim_iomap_regions(pdev, BIT(0), pci_name(pdev));
if (ret)
return ret;

pci_set_master(pdev);

ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
if (ret)
return ret;

dev = mt76x0_alloc_device(&pdev->dev);
if (!dev)
return -ENOMEM;

mt76_mmio_init(&dev->mt76, pcim_iomap_table(pdev)[0]);

dev->mt76.rev = mt76_rr(dev, MT_ASIC_VERSION);
dev_info(dev->mt76.dev, "ASIC revision: %08x\n", dev->mt76.rev);

/* error: */
ieee80211_free_hw(mt76_hw(dev));
return ret;
}

static void
mt76x0e_remove(struct pci_dev *pdev)
{
struct mt76_dev *mdev = pci_get_drvdata(pdev);

mt76_unregister_device(mdev);
ieee80211_free_hw(mdev->hw);
}

static const struct pci_device_id mt76x0e_device_table[] = {
{ PCI_DEVICE(0x14c3, 0x7630) },
{ },
};

MODULE_DEVICE_TABLE(pci, mt76x0e_device_table);
MODULE_LICENSE("Dual BSD/GPL");

static struct pci_driver mt76x0e_driver = {
.name = KBUILD_MODNAME,
.id_table = mt76x0e_device_table,
.probe = mt76x0e_probe,
.remove = mt76x0e_remove,
};

module_pci_driver(mt76x0e_driver);
6 changes: 0 additions & 6 deletions drivers/net/wireless/mediatek/mt76/mt76x0/usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,6 @@ static struct usb_device_id mt76x0_device_table[] = {
{ 0, }
};

void mt76x0_addr_wr(struct mt76x0_dev *dev, const u32 offset, const u8 *addr)
{
mt76_wr(dev, offset, get_unaligned_le32(addr));
mt76_wr(dev, offset + 4, addr[4] | addr[5] << 8);
}

static int mt76x0_probe(struct usb_interface *usb_intf,
const struct usb_device_id *id)
{
Expand Down

0 comments on commit c2a4d9f

Please sign in to comment.