diff options
Diffstat (limited to 'sys/contrib/dev/mediatek/mt76/mt7996/mmio.c')
| -rw-r--r-- | sys/contrib/dev/mediatek/mt76/mt7996/mmio.c | 200 | 
1 files changed, 180 insertions, 20 deletions
diff --git a/sys/contrib/dev/mediatek/mt76/mt7996/mmio.c b/sys/contrib/dev/mediatek/mt76/mt7996/mmio.c index bf21780427b2..bb82f5807ff8 100644 --- a/sys/contrib/dev/mediatek/mt76/mt7996/mmio.c +++ b/sys/contrib/dev/mediatek/mt76/mt7996/mmio.c @@ -57,6 +57,17 @@ static const u32 mt7996_offs[] = {  	[MIB_BSCR7]		= 0x9e8,  	[MIB_BSCR17]		= 0xa10,  	[MIB_TRDR1]		= 0xa28, +	[HIF_REMAP_L1]		= 0x24, +	[HIF_REMAP_BASE_L1]	= 0x130000, +	[HIF_REMAP_L2]		= 0x1b4, +	[HIF_REMAP_BASE_L2]	= 0x1000, +	[CBTOP1_PHY_END]	= 0x77ffffff, +	[INFRA_MCU_END]		= 0x7c3fffff, +	[WTBLON_WDUCR]		= 0x370, +	[WTBL_UPDATE]		= 0x380, +	[WTBL_ITCR]		= 0x3b0, +	[WTBL_ITCR0]		= 0x3b8, +	[WTBL_ITCR1]		= 0x3bc,  };  static const u32 mt7992_offs[] = { @@ -83,6 +94,54 @@ static const u32 mt7992_offs[] = {  	[MIB_BSCR7]		= 0xae4,  	[MIB_BSCR17]		= 0xb0c,  	[MIB_TRDR1]		= 0xb24, +	[HIF_REMAP_L1]		= 0x8, +	[HIF_REMAP_BASE_L1]	= 0x40000, +	[HIF_REMAP_L2]		= 0x1b4, +	[HIF_REMAP_BASE_L2]	= 0x1000, +	[CBTOP1_PHY_END]	= 0x77ffffff, +	[INFRA_MCU_END]		= 0x7c3fffff, +	[WTBLON_WDUCR]		= 0x370, +	[WTBL_UPDATE]		= 0x380, +	[WTBL_ITCR]		= 0x3b0, +	[WTBL_ITCR0]		= 0x3b8, +	[WTBL_ITCR1]		= 0x3bc, +}; + +static const u32 mt7990_offs[] = { +	[MIB_RVSR0]		= 0x800, +	[MIB_RVSR1]		= 0x804, +	[MIB_BTSCR5]		= 0x868, +	[MIB_BTSCR6]		= 0x878, +	[MIB_RSCR1]		= 0x890, +	[MIB_RSCR27]		= 0xa38, +	[MIB_RSCR28]		= 0xa3c, +	[MIB_RSCR29]		= 0xa40, +	[MIB_RSCR30]		= 0xa44, +	[MIB_RSCR31]		= 0xa48, +	[MIB_RSCR33]		= 0xa50, +	[MIB_RSCR35]		= 0xa58, +	[MIB_RSCR36]		= 0xa5c, +	[MIB_BSCR0]		= 0xbb8, +	[MIB_BSCR1]		= 0xbbc, +	[MIB_BSCR2]		= 0xbc0, +	[MIB_BSCR3]		= 0xbc4, +	[MIB_BSCR4]		= 0xbc8, +	[MIB_BSCR5]		= 0xbcc, +	[MIB_BSCR6]		= 0xbd0, +	[MIB_BSCR7]		= 0xbd4, +	[MIB_BSCR17]		= 0xbfc, +	[MIB_TRDR1]		= 0xc14, +	[HIF_REMAP_L1]		= 0x8, +	[HIF_REMAP_BASE_L1]	= 0x40000, +	[HIF_REMAP_L2]		= 0x1b8, +	[HIF_REMAP_BASE_L2]	= 0x110000, +	[CBTOP1_PHY_END]	= 0x7fffffff, +	[INFRA_MCU_END]		= 0x7cffffff, +	[WTBLON_WDUCR]		= 0x400, +	[WTBL_UPDATE]		= 0x410, +	[WTBL_ITCR]		= 0x440, +	[WTBL_ITCR0]		= 0x448, +	[WTBL_ITCR1]		= 0x44c,  };  static const struct __map mt7996_reg_map[] = { @@ -138,14 +197,83 @@ static const struct __map mt7996_reg_map[] = {  	{ 0x0, 0x0, 0x0 }, /* imply end of search */  }; +static const struct __map mt7990_reg_map[] = { +	{0x54000000, 0x02000, 0x1000}, /* WFDMA_0 (PCIE0 MCU DMA0) */ +	{0x55000000, 0x03000, 0x1000}, /* WFDMA_1 (PCIE0 MCU DMA1) */ +	{0x56000000, 0x04000, 0x1000}, /* WFDMA_2 (Reserved) */ +	{0x57000000, 0x05000, 0x1000}, /* WFDMA_3 (MCU wrap CR) */ +	{0x58000000, 0x06000, 0x1000}, /* WFDMA_4 (PCIE1 MCU DMA0 (MEM_DMA)) */ +	{0x59000000, 0x07000, 0x1000}, /* WFDMA_5 (PCIE1 MCU DMA1) */ +	{0x820c0000, 0x08000, 0x4000}, /* WF_UMAC_TOP (PLE) */ +	{0x820c8000, 0x0c000, 0x2000}, /* WF_UMAC_TOP (PSE) */ +	{0x820cc000, 0x0e000, 0x2000}, /* WF_UMAC_TOP (PP) */ +	{0x820e0000, 0x20000, 0x0400}, /* WF_LMAC_TOP BN0 (WF_CFG) */ +	{0x820e1000, 0x20400, 0x0200}, /* WF_LMAC_TOP BN0 (WF_TRB) */ +	{0x820e2000, 0x20800, 0x0400}, /* WF_LMAC_TOP BN0 (WF_AGG) */ +	{0x820e3000, 0x20c00, 0x0400}, /* WF_LMAC_TOP BN0 (WF_ARB) */ +	{0x820e4000, 0x21000, 0x0400}, /* WF_LMAC_TOP BN0 (WF_TMAC) */ +	{0x820e5000, 0x21400, 0x0800}, /* WF_LMAC_TOP BN0 (WF_RMAC) */ +	{0x820ce000, 0x21c00, 0x0200}, /* WF_LMAC_TOP (WF_SEC) */ +	{0x820e7000, 0x21e00, 0x0200}, /* WF_LMAC_TOP BN0 (WF_DMA) */ +	{0x820cf000, 0x22000, 0x1000}, /* WF_LMAC_TOP (WF_PF) */ +	{0x820e9000, 0x23400, 0x0200}, /* WF_LMAC_TOP BN0 (WF_WTBLOFF) */ +	{0x820ea000, 0x24000, 0x0200}, /* WF_LMAC_TOP BN0 (WF_ETBF) */ +	{0x820eb000, 0x24200, 0x0400}, /* WF_LMAC_TOP BN0 (WF_LPON) */ +	{0x820ec000, 0x24600, 0x0200}, /* WF_LMAC_TOP BN0 (WF_INT) */ +	{0x820ed000, 0x24800, 0x0800}, /* WF_LMAC_TOP BN0 (WF_MIB) */ +	{0x820ca000, 0x26000, 0x2000}, /* WF_LMAC_TOP BN0 (WF_MUCOP) */ +	{0x820d0000, 0x30000, 0x10000}, /* WF_LMAC_TOP (WF_WTBLON) */ +	{0x00400000, 0x80000, 0x10000}, /* WF_MCU_SYSRAM */ +	{0x820f0000, 0xa0000, 0x0400}, /* WF_LMAC_TOP BN1 (WF_CFG) */ +	{0x820f1000, 0xa0600, 0x0200}, /* WF_LMAC_TOP BN1 (WF_TRB) */ +	{0x820f2000, 0xa0800, 0x0400}, /* WF_LMAC_TOP BN1 (WF_AGG) */ +	{0x820f3000, 0xa0c00, 0x0400}, /* WF_LMAC_TOP BN1 (WF_ARB) */ +	{0x820f4000, 0xa1000, 0x0400}, /* WF_LMAC_TOP BN1 (WF_TMAC) */ +	{0x820f5000, 0xa1400, 0x0800}, /* WF_LMAC_TOP BN1 (WF_RMAC) */ +	{0x820f7000, 0xa1e00, 0x0200}, /* WF_LMAC_TOP BN1 (WF_DMA) */ +	{0x820f9000, 0xa3400, 0x0200}, /* WF_LMAC_TOP BN1 (WF_WTBLOFF) */ +	{0x820fa000, 0xa4000, 0x0200}, /* WF_LMAC_TOP BN1 (WF_ETBF) */ +	{0x820fb000, 0xa4200, 0x0400}, /* WF_LMAC_TOP BN1 (WF_LPON) */ +	{0x820fc000, 0xa4600, 0x0200}, /* WF_LMAC_TOP BN1 (WF_INT) */ +	{0x820fd000, 0xa4800, 0x0800}, /* WF_LMAC_TOP BN1 (WF_MIB) */ +	{0x820cc000, 0xa5000, 0x2000}, /* WF_LMAC_TOP BN1 (WF_MUCOP) */ +	{0x820c4000, 0xa8000, 0x4000}, /* WF_LMAC_TOP (WF_UWTBL) */ +	{0x81030000, 0xae000, 0x100}, /* WFSYS_AON part 1 */ +	{0x81031000, 0xae100, 0x100}, /* WFSYS_AON part 2 */ +	{0x81032000, 0xae200, 0x100}, /* WFSYS_AON part 3 */ +	{0x81033000, 0xae300, 0x100}, /* WFSYS_AON part 4 */ +	{0x81034000, 0xae400, 0x100}, /* WFSYS_AON part 5 */ +	{0x80020000, 0xb0000, 0x10000}, /* WF_TOP_MISC_OFF */ +	{0x81020000, 0xc0000, 0x10000}, /* WF_TOP_MISC_ON */ +	{0x81040000, 0x120000, 0x1000}, /* WF_MCU_CFG_ON */ +	{0x81050000, 0x121000, 0x1000}, /* WF_MCU_EINT */ +	{0x81060000, 0x122000, 0x1000}, /* WF_MCU_GPT */ +	{0x81070000, 0x123000, 0x1000}, /* WF_MCU_WDT */ +	{0x80010000, 0x124000, 0x1000}, /* WF_AXIDMA */ +	{0x7c020000, 0xd0000, 0x10000}, /* CONN_INFRA, wfdma for from CODA flow use */ +	{0x7c060000, 0xe0000, 0x10000}, /* CONN_INFRA, conn_host_csr_top for from CODA flow use */ +	{0x20020000, 0xd0000, 0x10000}, /* CONN_INFRA, wfdma */ +	{0x20060000, 0xe0000, 0x10000}, /* CONN_INFRA, conn_host_csr_top */ +	{0x7c000000, 0xf0000, 0x10000}, /* CONN_INFRA */ +	{0x70020000, 0x1f0000, 0x9000}, /* PCIE remapping (AP2CONN) */ +	{0x0, 0x0, 0x0}, /* imply end of search */ +}; +  static u32 mt7996_reg_map_l1(struct mt7996_dev *dev, u32 addr)  {  	u32 offset = FIELD_GET(MT_HIF_REMAP_L1_OFFSET, addr);  	u32 base = FIELD_GET(MT_HIF_REMAP_L1_BASE, addr); +	u32 l1_mask, val; -	dev->bus_ops->rmw(&dev->mt76, MT_HIF_REMAP_L1, -			  MT_HIF_REMAP_L1_MASK, -			  FIELD_PREP(MT_HIF_REMAP_L1_MASK, base)); +	if (is_mt7996(&dev->mt76)) { +		l1_mask = MT_HIF_REMAP_L1_MASK_7996; +		val = FIELD_PREP(MT_HIF_REMAP_L1_MASK_7996, base); +	} else { +		l1_mask = MT_HIF_REMAP_L1_MASK; +		val = FIELD_PREP(MT_HIF_REMAP_L1_MASK, base); +	} + +	dev->bus_ops->rmw(&dev->mt76, MT_HIF_REMAP_L1, l1_mask, val);  	/* use read to push write */  	dev->bus_ops->rr(&dev->mt76, MT_HIF_REMAP_L1); @@ -154,18 +282,41 @@ static u32 mt7996_reg_map_l1(struct mt7996_dev *dev, u32 addr)  static u32 mt7996_reg_map_l2(struct mt7996_dev *dev, u32 addr)  { -	u32 offset = FIELD_GET(MT_HIF_REMAP_L2_OFFSET, addr); -	u32 base = FIELD_GET(MT_HIF_REMAP_L2_BASE, addr); +	u32 offset, base, l2_mask, val; -	dev->bus_ops->rmw(&dev->mt76, MT_HIF_REMAP_L2, -			  MT_HIF_REMAP_L2_MASK, -			  FIELD_PREP(MT_HIF_REMAP_L2_MASK, base)); +	if (is_mt7990(&dev->mt76)) { +		offset = FIELD_GET(MT_HIF_REMAP_L2_OFFSET_7990, addr); +		base = FIELD_GET(MT_HIF_REMAP_L2_BASE_7990, addr); +		l2_mask = MT_HIF_REMAP_L2_MASK_7990; +		val = FIELD_PREP(MT_HIF_REMAP_L2_MASK_7990, base); +	} else { +		offset = FIELD_GET(MT_HIF_REMAP_L2_OFFSET, addr); +		base = FIELD_GET(MT_HIF_REMAP_L2_BASE, addr); +		l2_mask = MT_HIF_REMAP_L2_MASK; +		val = FIELD_PREP(MT_HIF_REMAP_L2_MASK, base); +	} + +	dev->bus_ops->rmw(&dev->mt76, MT_HIF_REMAP_L2, l2_mask, val);  	/* use read to push write */  	dev->bus_ops->rr(&dev->mt76, MT_HIF_REMAP_L2);  	return MT_HIF_REMAP_BASE_L2 + offset;  } +static u32 mt7996_reg_map_cbtop(struct mt7996_dev *dev, u32 addr) +{ +	u32 offset = FIELD_GET(MT_HIF_REMAP_CBTOP_OFFSET, addr); +	u32 base = FIELD_GET(MT_HIF_REMAP_CBTOP_BASE, addr); + +	dev->bus_ops->rmw(&dev->mt76, MT_HIF_REMAP_CBTOP, +			  MT_HIF_REMAP_CBTOP_MASK, +			  FIELD_PREP(MT_HIF_REMAP_CBTOP_MASK, base)); +	/* use read to push write */ +	dev->bus_ops->rr(&dev->mt76, MT_HIF_REMAP_CBTOP); + +	return MT_HIF_REMAP_BASE_CBTOP + offset; +} +  static u32 __mt7996_reg_addr(struct mt7996_dev *dev, u32 addr)  {  	int i; @@ -196,17 +347,20 @@ static u32 __mt7996_reg_remap_addr(struct mt7996_dev *dev, u32 addr)  	    (addr >= MT_WFSYS1_PHY_START && addr <= MT_WFSYS1_PHY_END))  		return mt7996_reg_map_l1(dev, addr); -	if (dev_is_pci(dev->mt76.dev) && -	    ((addr >= MT_CBTOP1_PHY_START && addr <= MT_CBTOP1_PHY_END) || -	    addr >= MT_CBTOP2_PHY_START)) -		return mt7996_reg_map_l1(dev, addr); -  	/* CONN_INFRA: covert to phyiscal addr and use layer 1 remap */  	if (addr >= MT_INFRA_MCU_START && addr <= MT_INFRA_MCU_END) {  		addr = addr - MT_INFRA_MCU_START + MT_INFRA_BASE;  		return mt7996_reg_map_l1(dev, addr);  	} +	if (dev_is_pci(dev->mt76.dev) && +	    ((addr >= MT_CBTOP1_PHY_START && addr <= MT_CBTOP1_PHY_END) || +	    addr >= MT_CBTOP2_PHY_START)) { +		if (is_mt7990(&dev->mt76)) +			return mt7996_reg_map_cbtop(dev, addr); +		return mt7996_reg_map_l1(dev, addr); +	} +  	return mt7996_reg_map_l2(dev, addr);  } @@ -292,7 +446,7 @@ static int mt7996_mmio_wed_reset(struct mtk_wed_device *wed)  	if (test_and_set_bit(MT76_STATE_WED_RESET, &mphy->state))  		return -EBUSY; -	ret = mt7996_mcu_set_ser(dev, UNI_CMD_SER_TRIGGER, UNI_CMD_SER_SET_RECOVER_L1, +	ret = mt7996_mcu_set_ser(dev, UNI_CMD_SER_TRIGGER, UNI_CMD_SER_SET_RECOVER_FROM_ETH,  				 mphy->band_idx);  	if (ret)  		goto out; @@ -334,6 +488,9 @@ int mt7996_mmio_wed_init(struct mt7996_dev *dev, void *pdev_ptr,  	wed->wlan.base = devm_ioremap(dev->mt76.dev,  				      pci_resource_start(pci_dev, 0),  				      pci_resource_len(pci_dev, 0)); +	if (!wed->wlan.base) +		return -ENOMEM; +  	wed->wlan.phy_base = pci_resource_start(pci_dev, 0);  	if (hif2) { @@ -361,7 +518,7 @@ int mt7996_mmio_wed_init(struct mt7996_dev *dev, void *pdev_ptr,  				     MT_RXQ_RING_BASE(MT7996_RXQ_BAND0) +  				     MT7996_RXQ_BAND0 * MT_RING_SIZE; -		wed->wlan.id = 0x7991; +		wed->wlan.id = MT7996_DEVICE_ID_2;  		wed->wlan.tx_tbit[0] = ffs(MT_INT_TX_DONE_BAND2) - 1;  	} else {  		wed->wlan.hw_rro = dev->has_rro; /* default on */ @@ -454,18 +611,24 @@ static int mt7996_mmio_init(struct mt76_dev *mdev,  	spin_lock_init(&dev->reg_lock);  	switch (device_id) { -	case 0x7990: +	case MT7996_DEVICE_ID:  		dev->reg.base = mt7996_reg_base;  		dev->reg.offs_rev = mt7996_offs;  		dev->reg.map = mt7996_reg_map;  		dev->reg.map_size = ARRAY_SIZE(mt7996_reg_map);  		break; -	case 0x7992: +	case MT7992_DEVICE_ID:  		dev->reg.base = mt7996_reg_base;  		dev->reg.offs_rev = mt7992_offs;  		dev->reg.map = mt7996_reg_map;  		dev->reg.map_size = ARRAY_SIZE(mt7996_reg_map);  		break; +	case MT7990_DEVICE_ID: +		dev->reg.base = mt7996_reg_base; +		dev->reg.offs_rev = mt7990_offs; +		dev->reg.map = mt7990_reg_map; +		dev->reg.map_size = ARRAY_SIZE(mt7990_reg_map); +		break;  	default:  		return -EINVAL;  	} @@ -629,9 +792,6 @@ struct mt7996_dev *mt7996_mmio_probe(struct device *pdev,  		.rx_skb = mt7996_queue_rx_skb,  		.rx_check = mt7996_rx_check,  		.rx_poll_complete = mt7996_rx_poll_complete, -		.sta_add = mt7996_mac_sta_add, -		.sta_event = mt7996_mac_sta_event, -		.sta_remove = mt7996_mac_sta_remove,  		.update_survey = mt7996_update_channel,  		.set_channel = mt7996_set_channel,  		.vif_link_add = mt7996_vif_link_add,  | 
