gitops/mt76
1
0
Fork 0
mirror of https://github.com/outbackdingo/mt76.git synced 2026-10-24 13:26:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

mt76: move __iomem regs in mt76_mmio

Browse Source 
Move __iomem regs pointer in mt76_mmio data structure

Signed-off-by: Lorenzo Bianconi <[email protected]>
This commit is contained in:
Lorenzo Bianconi
2018-09-12 13:16:50 +02:00
committed by Felix Fietkau
parent 26909cdcb4
commit 425e7e0032
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mmio.c
+4 -4
View File
@@ -21,7 +21,7 @@ static u32 mt76_mmio_rr(struct mt76_dev *dev, u32 offset)
{ {
u32 val; u32 val;
val = ioread32(dev->regs + offset); val = ioread32(dev->mmio.regs + offset);
trace_reg_rr(dev, offset, val); trace_reg_rr(dev, offset, val);
return val; return val;
@@ -30,7 +30,7 @@ static u32 mt76_mmio_rr(struct mt76_dev *dev, u32 offset)
static void mt76_mmio_wr(struct mt76_dev *dev, u32 offset, u32 val) static void mt76_mmio_wr(struct mt76_dev *dev, u32 offset, u32 val)
{ {
trace_reg_wr(dev, offset, val); trace_reg_wr(dev, offset, val);
iowrite32(val, dev->regs + offset); iowrite32(val, dev->mmio.regs + offset);
} }
static u32 mt76_mmio_rmw(struct mt76_dev *dev, u32 offset, u32 mask, u32 val) static u32 mt76_mmio_rmw(struct mt76_dev *dev, u32 offset, u32 mask, u32 val)
@@ -43,7 +43,7 @@ static u32 mt76_mmio_rmw(struct mt76_dev *dev, u32 offset, u32 mask, u32 val)
static void mt76_mmio_copy(struct mt76_dev *dev, u32 offset, const void *data, static void mt76_mmio_copy(struct mt76_dev *dev, u32 offset, const void *data,
int len) int len)
{ {
__iowrite32_copy(dev->regs + offset, data, len >> 2); __iowrite32_copy(dev->mmio.regs + offset, data, len >> 2);
} }
void mt76_mmio_init(struct mt76_dev *dev, void __iomem *regs) void mt76_mmio_init(struct mt76_dev *dev, void __iomem *regs)
@@ -56,7 +56,7 @@ void mt76_mmio_init(struct mt76_dev *dev, void __iomem *regs)
}; };
dev->bus = &mt76_mmio_ops; dev->bus = &mt76_mmio_ops;
dev->regs = regs; dev->mmio.regs = regs;
skb_queue_head_init(&dev->mmio.mcu.res_q); skb_queue_head_init(&dev->mmio.mcu.res_q);
init_waitqueue_head(&dev->mmio.mcu.wait); init_waitqueue_head(&dev->mmio.mcu.wait);
mt76.h
+1 -1
View File
@@ -347,6 +347,7 @@ struct mt76_mmio {
u32 msg_seq; u32 msg_seq;
} mcu; } mcu;
void __iomem *regs;
}; };
struct mt76_dev { struct mt76_dev {
@@ -362,7 +363,6 @@ struct mt76_dev {
const struct mt76_bus_ops *bus; const struct mt76_bus_ops *bus;
const struct mt76_driver_ops *drv; const struct mt76_driver_ops *drv;
const struct mt76_mcu_ops *mcu_ops; const struct mt76_mcu_ops *mcu_ops;
void __iomem *regs;
struct device *dev; struct device *dev;
struct net_device napi_dev; struct net_device napi_dev;
mt7603_dma.c
+2 -2
View File
@@ -47,7 +47,7 @@ mt7603_init_tx_queue(struct mt7603_dev *dev, struct mt76_queue *q,
int ret; int ret;
q->hw_idx = idx; q->hw_idx = idx;
q->regs = dev->mt76.regs + MT_TX_RING_BASE + idx * MT_RING_SIZE; q->regs = dev->mt76.mmio.regs + MT_TX_RING_BASE + idx * MT_RING_SIZE;
q->ndesc = n_desc; q->ndesc = n_desc;
ret = mt76_queue_alloc(dev, q); ret = mt76_queue_alloc(dev, q);
@@ -96,7 +96,7 @@ mt7603_init_rx_queue(struct mt7603_dev *dev, struct mt76_queue *q,
{ {
int ret; int ret;
q->regs = dev->mt76.regs + MT_RX_RING_BASE + idx * MT_RING_SIZE; q->regs = dev->mt76.mmio.regs + MT_RX_RING_BASE + idx * MT_RING_SIZE;
q->ndesc = n_desc; q->ndesc = n_desc;
q->buf_size = bufsize; q->buf_size = bufsize;
mt76x2_dma.c
+2 -2
View File
@@ -53,7 +53,7 @@ mt76x2_init_tx_queue(struct mt76x2_dev *dev, struct mt76_queue *q,
{ {
int ret; int ret;
q->regs = dev->mt76.regs + MT_TX_RING_BASE + idx * MT_RING_SIZE; q->regs = dev->mt76.mmio.regs + MT_TX_RING_BASE + idx * MT_RING_SIZE;
q->ndesc = n_desc; q->ndesc = n_desc;
q->hw_idx = idx; q->hw_idx = idx;
@@ -72,7 +72,7 @@ mt76x2_init_rx_queue(struct mt76x2_dev *dev, struct mt76_queue *q,
{ {
int ret; int ret;
q->regs = dev->mt76.regs + MT_RX_RING_BASE + idx * MT_RING_SIZE; q->regs = dev->mt76.mmio.regs + MT_RX_RING_BASE + idx * MT_RING_SIZE;
q->ndesc = n_desc; q->ndesc = n_desc;
q->buf_size = bufsize; q->buf_size = bufsize;