| Message ID | 42112d6b7b1c09bcdfa37d4417e55ef45c09ceff.1631918993.git.objelf@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Felix Fietkau |
| Headers | show |
| Series | Add MT7921 SDIO support | expand |
> From: Sean Wang <sean.wang@mediatek.com> > > Move mcu reg access shared between mt7663s and mt7921s in mt76_connac_lib > module. > > Tested-by: Deren Wu <deren.wu@mediatek.com> > Signed-off-by: Sean Wang <sean.wang@mediatek.com> > --- > .../wireless/mediatek/mt76/mt76_connac_mcu.c | 27 +++++++++++++++++++ > .../wireless/mediatek/mt76/mt76_connac_mcu.h | 2 ++ > 2 files changed, 29 insertions(+) > > diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c > index ae692052de97..a53f6344a184 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c > +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c > @@ -2406,6 +2406,33 @@ void mt76_connac_mcu_set_suspend_iter(void *priv, u8 *mac, > } > EXPORT_SYMBOL_GPL(mt76_connac_mcu_set_suspend_iter); > > +u32 mt76_connac_mcu_reg_rr(struct mt76_dev *dev, u32 offset) > +{ > + struct { > + __le32 addr; > + __le32 val; > + } __packed req = { > + .addr = cpu_to_le32(offset), > + }; > + > + return mt76_mcu_send_msg(dev, MCU_CMD_REG_READ, &req, sizeof(req), > + true); > +} > +EXPORT_SYMBOL_GPL(mt76_connac_mcu_reg_rr); It seems quite a common code, does it worth to move them in mcu.c? (mt76 module) Regards, Lorenzo > + > +void mt76_connac_mcu_reg_wr(struct mt76_dev *dev, u32 offset, u32 val) > +{ > + struct { > + __le32 addr; > + __le32 val; > + } __packed req = { > + .addr = cpu_to_le32(offset), > + .val = cpu_to_le32(val), > + }; > + > + mt76_mcu_send_msg(dev, MCU_CMD_REG_WRITE, &req, sizeof(req), false); > +} > +EXPORT_SYMBOL_GPL(mt76_connac_mcu_reg_wr); > #endif /* CONFIG_PM */ > > MODULE_AUTHOR("Lorenzo Bianconi <lorenzo@kernel.org>"); > diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h > index ea46dde364e1..6c410c4a8d6e 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h > +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h > @@ -1111,4 +1111,6 @@ void mt76_connac_mcu_coredump_event(struct mt76_dev *dev, struct sk_buff *skb, > int mt76_connac_mcu_set_rate_txpower(struct mt76_phy *phy); > int mt76_connac_mcu_set_p2p_oppps(struct ieee80211_hw *hw, > struct ieee80211_vif *vif); > +u32 mt76_connac_mcu_reg_rr(struct mt76_dev *dev, u32 offset); > +void mt76_connac_mcu_reg_wr(struct mt76_dev *dev, u32 offset, u32 val); > #endif /* __MT76_CONNAC_MCU_H */ > -- > 2.25.1 >
diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c index ae692052de97..a53f6344a184 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c @@ -2406,6 +2406,33 @@ void mt76_connac_mcu_set_suspend_iter(void *priv, u8 *mac, } EXPORT_SYMBOL_GPL(mt76_connac_mcu_set_suspend_iter); +u32 mt76_connac_mcu_reg_rr(struct mt76_dev *dev, u32 offset) +{ + struct { + __le32 addr; + __le32 val; + } __packed req = { + .addr = cpu_to_le32(offset), + }; + + return mt76_mcu_send_msg(dev, MCU_CMD_REG_READ, &req, sizeof(req), + true); +} +EXPORT_SYMBOL_GPL(mt76_connac_mcu_reg_rr); + +void mt76_connac_mcu_reg_wr(struct mt76_dev *dev, u32 offset, u32 val) +{ + struct { + __le32 addr; + __le32 val; + } __packed req = { + .addr = cpu_to_le32(offset), + .val = cpu_to_le32(val), + }; + + mt76_mcu_send_msg(dev, MCU_CMD_REG_WRITE, &req, sizeof(req), false); +} +EXPORT_SYMBOL_GPL(mt76_connac_mcu_reg_wr); #endif /* CONFIG_PM */ MODULE_AUTHOR("Lorenzo Bianconi <lorenzo@kernel.org>"); diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h index ea46dde364e1..6c410c4a8d6e 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h @@ -1111,4 +1111,6 @@ void mt76_connac_mcu_coredump_event(struct mt76_dev *dev, struct sk_buff *skb, int mt76_connac_mcu_set_rate_txpower(struct mt76_phy *phy); int mt76_connac_mcu_set_p2p_oppps(struct ieee80211_hw *hw, struct ieee80211_vif *vif); +u32 mt76_connac_mcu_reg_rr(struct mt76_dev *dev, u32 offset); +void mt76_connac_mcu_reg_wr(struct mt76_dev *dev, u32 offset, u32 val); #endif /* __MT76_CONNAC_MCU_H */