Commit 764dee47 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files

mt76: sdio: move common code in mt76_sdio module 



Move sdio common code in mt76_sdio module.
This is a preliminary patch to support mt7921s devices.

Co-developed-by: default avatarSean Wang <sean.wang@mediatek.com>
Signed-off-by: default avatarSean Wang <sean.wang@mediatek.com>
Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent f1e2eef1

drivers/net/wireless/mediatek/mt76/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ mt76-$(CONFIG_PCI) += pci.o 
mt76-$(CONFIG_NL80211_TESTMODE) += testmode.o



mt76-usb-y := usb.o usb_trace.o

mt76-sdio-y := sdio.o

mt76-sdio-y := sdio.o sdio_txrx.o



CFLAGS_trace.o := -I$(src)

CFLAGS_usb_trace.o := -I$(src)

drivers/net/wireless/mediatek/mt76/mt76.h

+16 −0
Original line number Diff line number Diff line
@@ -1248,6 +1248,22 @@ int mt76s_init(struct mt76_dev *dev, struct sdio_func *func, 
int mt76s_alloc_rx_queue(struct mt76_dev *dev, enum mt76_rxq_id qid);

int mt76s_alloc_tx(struct mt76_dev *dev);

void mt76s_deinit(struct mt76_dev *dev);

void mt76s_sdio_irq(struct sdio_func *func);

void mt76s_txrx_worker(struct mt76_sdio *sdio);

int mt76s_hw_init(struct mt76_dev *dev, struct sdio_func *func);

u32 mt76s_rr(struct mt76_dev *dev, u32 offset);

void mt76s_wr(struct mt76_dev *dev, u32 offset, u32 val);

u32 mt76s_rmw(struct mt76_dev *dev, u32 offset, u32 mask, u32 val);

u32 mt76s_read_pcr(struct mt76_dev *dev);

void mt76s_write_copy(struct mt76_dev *dev, u32 offset,

		      const void *data, int len);

void mt76s_read_copy(struct mt76_dev *dev, u32 offset,

		     void *data, int len);

int mt76s_wr_rp(struct mt76_dev *dev, u32 base,

		const struct mt76_reg_pair *data,

		int len);

int mt76s_rd_rp(struct mt76_dev *dev, u32 base,

		struct mt76_reg_pair *data, int len);



struct sk_buff *

mt76_mcu_msg_alloc(struct mt76_dev *dev, const void *data,

drivers/net/wireless/mediatek/mt76/mt7615/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -17,4 +17,4 @@ mt7615e-$(CONFIG_MT7622_WMAC) += soc.o 


mt7663-usb-sdio-common-y := usb_sdio.o

mt7663u-y := usb.o usb_mcu.o

mt7663s-y := sdio.o sdio_mcu.o sdio_txrx.o
 
mt7663s-y := sdio.o sdio_mcu.o

drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h

+0 −4
Original line number Diff line number Diff line
@@ -569,10 +569,6 @@ int mt7663_usb_sdio_register_device(struct mt7615_dev *dev); 
int mt7663u_mcu_init(struct mt7615_dev *dev);



/* sdio */

u32 mt7663s_read_pcr(struct mt7615_dev *dev);

int mt7663s_mcu_init(struct mt7615_dev *dev);

void mt7663s_txrx_worker(struct mt76_worker *w);

void mt7663s_rx_work(struct work_struct *work);

void mt7663s_sdio_irq(struct sdio_func *func);



#endif

drivers/net/wireless/mediatek/mt76/mt7615/sdio.c

+19 −260
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
#include <linux/mmc/sdio_ids.h>

#include <linux/mmc/sdio_func.h>



#include "../sdio.h"

#include "mt7615.h"

#include "sdio.h"

#include "mac.h"

#include "mcu.h"
@@ -24,200 +24,19 @@ static const struct sdio_device_id mt7663s_table[] = { 
	{ }	/* Terminating entry */

};



static u32 mt7663s_read_whisr(struct mt76_dev *dev)

static void mt7663s_txrx_worker(struct mt76_worker *w)

{

	return sdio_readl(dev->sdio.func, MCR_WHISR, NULL);

}



u32 mt7663s_read_pcr(struct mt7615_dev *dev)

{

	struct mt76_sdio *sdio = &dev->mt76.sdio;



	return sdio_readl(sdio->func, MCR_WHLPCR, NULL);

}



static u32 mt7663s_read_mailbox(struct mt76_dev *dev, u32 offset)

{

	struct sdio_func *func = dev->sdio.func;

	u32 val = ~0, status;

	int err;



	sdio_claim_host(func);



	sdio_writel(func, offset, MCR_H2DSM0R, &err);

	if (err < 0) {

		dev_err(dev->dev, "failed setting address [err=%d]\n", err);

		goto out;

	}



	sdio_writel(func, H2D_SW_INT_READ, MCR_WSICR, &err);

	if (err < 0) {

		dev_err(dev->dev, "failed setting read mode [err=%d]\n", err);

		goto out;

	}



	err = readx_poll_timeout(mt7663s_read_whisr, dev, status,

				 status & H2D_SW_INT_READ, 0, 1000000);

	if (err < 0) {

		dev_err(dev->dev, "query whisr timeout\n");

		goto out;

	}



	sdio_writel(func, H2D_SW_INT_READ, MCR_WHISR, &err);

	if (err < 0) {

		dev_err(dev->dev, "failed setting read mode [err=%d]\n", err);

		goto out;

	}



	val = sdio_readl(func, MCR_H2DSM0R, &err);

	if (err < 0) {

		dev_err(dev->dev, "failed reading h2dsm0r [err=%d]\n", err);

		goto out;

	}



	if (val != offset) {

		dev_err(dev->dev, "register mismatch\n");

		val = ~0;

		goto out;

	}



	val = sdio_readl(func, MCR_D2HRM1R, &err);

	if (err < 0)

		dev_err(dev->dev, "failed reading d2hrm1r [err=%d]\n", err);



out:

	sdio_release_host(func);



	return val;

}

	struct mt76_sdio *sdio = container_of(w, struct mt76_sdio,

					      txrx_worker);

	struct mt76_dev *mdev = container_of(sdio, struct mt76_dev, sdio);

	struct mt7615_dev *dev = container_of(mdev, struct mt7615_dev, mt76);



static void mt7663s_write_mailbox(struct mt76_dev *dev, u32 offset, u32 val)

{

	struct sdio_func *func = dev->sdio.func;

	u32 status;

	int err;



	sdio_claim_host(func);



	sdio_writel(func, offset, MCR_H2DSM0R, &err);

	if (err < 0) {

		dev_err(dev->dev, "failed setting address [err=%d]\n", err);

		goto out;

	}



	sdio_writel(func, val, MCR_H2DSM1R, &err);

	if (err < 0) {

		dev_err(dev->dev,

			"failed setting write value [err=%d]\n", err);

		goto out;

	}



	sdio_writel(func, H2D_SW_INT_WRITE, MCR_WSICR, &err);

	if (err < 0) {

		dev_err(dev->dev, "failed setting write mode [err=%d]\n", err);

		goto out;

	}



	err = readx_poll_timeout(mt7663s_read_whisr, dev, status,

				 status & H2D_SW_INT_WRITE, 0, 1000000);

	if (err < 0) {

		dev_err(dev->dev, "query whisr timeout\n");

		goto out;

	}



	sdio_writel(func, H2D_SW_INT_WRITE, MCR_WHISR, &err);

	if (err < 0) {

		dev_err(dev->dev, "failed setting write mode [err=%d]\n", err);

		goto out;

	}



	val = sdio_readl(func, MCR_H2DSM0R, &err);

	if (err < 0) {

		dev_err(dev->dev, "failed reading h2dsm0r [err=%d]\n", err);

		goto out;

	}



	if (val != offset)

		dev_err(dev->dev, "register mismatch\n");



out:

	sdio_release_host(func);

}



static u32 mt7663s_rr(struct mt76_dev *dev, u32 offset)

{

	if (test_bit(MT76_STATE_MCU_RUNNING, &dev->phy.state))

		return dev->mcu_ops->mcu_rr(dev, offset);

	else

		return mt7663s_read_mailbox(dev, offset);

}



static void mt7663s_wr(struct mt76_dev *dev, u32 offset, u32 val)

{

	if (test_bit(MT76_STATE_MCU_RUNNING, &dev->phy.state))

		dev->mcu_ops->mcu_wr(dev, offset, val);

	else

		mt7663s_write_mailbox(dev, offset, val);

}



static u32 mt7663s_rmw(struct mt76_dev *dev, u32 offset, u32 mask, u32 val)

{

	val |= mt7663s_rr(dev, offset) & ~mask;

	mt7663s_wr(dev, offset, val);



	return val;

}



static void mt7663s_write_copy(struct mt76_dev *dev, u32 offset,

			       const void *data, int len)

{

	const u32 *val = data;

	int i;



	for (i = 0; i < len / sizeof(u32); i++) {

		mt7663s_wr(dev, offset, val[i]);

		offset += sizeof(u32);

	}

}



static void mt7663s_read_copy(struct mt76_dev *dev, u32 offset,

			      void *data, int len)

{

	u32 *val = data;

	int i;



	for (i = 0; i < len / sizeof(u32); i++) {

		val[i] = mt7663s_rr(dev, offset);

		offset += sizeof(u32);

	}

}



static int mt7663s_wr_rp(struct mt76_dev *dev, u32 base,

			 const struct mt76_reg_pair *data,

			 int len)

{

	int i;



	for (i = 0; i < len; i++) {

		mt7663s_wr(dev, data->reg, data->value);

		data++;

	}



	return 0;

}



static int mt7663s_rd_rp(struct mt76_dev *dev, u32 base,

			 struct mt76_reg_pair *data,

			 int len)

{

	int i;



	for (i = 0; i < len; i++) {

		data->value = mt7663s_rr(dev, data->reg);

		data++;

	if (!mt76_connac_pm_ref(&dev->mphy, &dev->pm)) {

		queue_work(mdev->wq, &dev->pm.wake_work);

		return;

	}



	return 0;

	mt76s_txrx_worker(sdio);

	mt76_connac_pm_unref(&dev->mphy, &dev->pm);

}



static void mt7663s_init_work(struct work_struct *work)
@@ -231,66 +50,6 @@ static void mt7663s_init_work(struct work_struct *work) 
	mt7615_init_work(dev);

}



static int mt7663s_hw_init(struct mt7615_dev *dev, struct sdio_func *func)

{

	u32 status, ctrl;

	int ret;



	sdio_claim_host(func);



	ret = sdio_enable_func(func);

	if (ret < 0)

		goto release;



	/* Get ownership from the device */

	sdio_writel(func, WHLPCR_INT_EN_CLR | WHLPCR_FW_OWN_REQ_CLR,

		    MCR_WHLPCR, &ret);

	if (ret < 0)

		goto disable_func;



	ret = readx_poll_timeout(mt7663s_read_pcr, dev, status,

				 status & WHLPCR_IS_DRIVER_OWN, 2000, 1000000);

	if (ret < 0) {

		dev_err(dev->mt76.dev, "Cannot get ownership from device");

		goto disable_func;

	}



	ret = sdio_set_block_size(func, 512);

	if (ret < 0)

		goto disable_func;



	/* Enable interrupt */

	sdio_writel(func, WHLPCR_INT_EN_SET, MCR_WHLPCR, &ret);

	if (ret < 0)

		goto disable_func;



	ctrl = WHIER_RX0_DONE_INT_EN | WHIER_TX_DONE_INT_EN;

	sdio_writel(func, ctrl, MCR_WHIER, &ret);

	if (ret < 0)

		goto disable_func;



	/* set WHISR as read clear and Rx aggregation number as 16 */

	ctrl = FIELD_PREP(MAX_HIF_RX_LEN_NUM, 16);

	sdio_writel(func, ctrl, MCR_WHCR, &ret);

	if (ret < 0)

		goto disable_func;



	ret = sdio_claim_irq(func, mt7663s_sdio_irq);

	if (ret < 0)

		goto disable_func;



	sdio_release_host(func);



	return 0;



disable_func:

	sdio_disable_func(func);

release:

	sdio_release_host(func);



	return ret;

}



static int mt7663s_probe(struct sdio_func *func,

			 const struct sdio_device_id *id)

{
@@ -307,13 +66,13 @@ static int mt7663s_probe(struct sdio_func *func, 
		.update_survey = mt7615_update_channel,

	};

	static const struct mt76_bus_ops mt7663s_ops = {

		.rr = mt7663s_rr,

		.rmw = mt7663s_rmw,

		.wr = mt7663s_wr,

		.write_copy = mt7663s_write_copy,

		.read_copy = mt7663s_read_copy,

		.wr_rp = mt7663s_wr_rp,

		.rd_rp = mt7663s_rd_rp,

		.rr = mt76s_rr,

		.rmw = mt76s_rmw,

		.wr = mt76s_wr,

		.write_copy = mt76s_write_copy,

		.read_copy = mt76s_read_copy,

		.wr_rp = mt76s_wr_rp,

		.rd_rp = mt76s_rd_rp,

		.type = MT76_BUS_SDIO,

	};

	struct ieee80211_ops *ops;
@@ -341,7 +100,7 @@ static int mt7663s_probe(struct sdio_func *func, 
	if (ret < 0)

		goto error;



	ret = mt7663s_hw_init(dev, func);

	ret = mt76s_hw_init(mdev, func);

	if (ret)

		goto error;