From: Lorenzo Bianconi <lorenzo@kernel.org>
To: Nathan Chancellor <natechancellor@gmail.com>
Cc: Felix Fietkau <nbd@nbd.name>,
Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>,
Ryder Lee <ryder.lee@mediatek.com>,
Kalle Valo <kvalo@codeaurora.org>,
linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org,
clang-built-linux@googlegroups.com
Subject: Re: [PATCH] mt76: Fix queue ID variable types after mcu queue split
Date: Thu, 31 Dec 2020 11:09:18 +0100 [thread overview]
Message-ID: <20201231100918.GA1819773@computer-5.station> (raw)
In-Reply-To: <20201229211548.1348077-1-natechancellor@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 4399 bytes --]
> Clang warns in both mt7615 and mt7915:
>
> drivers/net/wireless/mediatek/mt76/mt7915/mcu.c:271:9: warning: implicit
> conversion from enumeration type 'enum mt76_mcuq_id' to different
> enumeration type 'enum mt76_txq_id' [-Wenum-conversion]
> txq = MT_MCUQ_FWDL;
> ~ ^~~~~~~~~~~~
> drivers/net/wireless/mediatek/mt76/mt7915/mcu.c:278:9: warning: implicit
> conversion from enumeration type 'enum mt76_mcuq_id' to different
> enumeration type 'enum mt76_txq_id' [-Wenum-conversion]
> txq = MT_MCUQ_WA;
> ~ ^~~~~~~~~~
> drivers/net/wireless/mediatek/mt76/mt7915/mcu.c:282:9: warning: implicit
> conversion from enumeration type 'enum mt76_mcuq_id' to different
> enumeration type 'enum mt76_txq_id' [-Wenum-conversion]
> txq = MT_MCUQ_WM;
> ~ ^~~~~~~~~~
> 3 warnings generated.
>
> drivers/net/wireless/mediatek/mt76/mt7615/mcu.c:238:9: warning: implicit
> conversion from enumeration type 'enum mt76_mcuq_id' to different
> enumeration type 'enum mt76_txq_id' [-Wenum-conversion]
> qid = MT_MCUQ_WM;
> ~ ^~~~~~~~~~
> drivers/net/wireless/mediatek/mt76/mt7615/mcu.c:240:9: warning: implicit
> conversion from enumeration type 'enum mt76_mcuq_id' to different
> enumeration type 'enum mt76_txq_id' [-Wenum-conversion]
> qid = MT_MCUQ_FWDL;
> ~ ^~~~~~~~~~~~
> 2 warnings generated.
>
> Use the proper type for the queue ID variables to fix these warnings.
> Additionally, rename the txq variable in mt7915_mcu_send_message to be
> more neutral like mt7615_mcu_send_message.
>
> Fixes: e637763b606b ("mt76: move mcu queues to mt76_dev q_mcu array")
> Link: https://github.com/ClangBuiltLinux/linux/issues/1229
> Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Acked-by: Lorenzo Bianconi <lorenzo@kernel.org>
> ---
> drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 2 +-
> drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 10 +++++-----
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
> index a44b7766dec6..c13547841a4e 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
> @@ -231,7 +231,7 @@ mt7615_mcu_send_message(struct mt76_dev *mdev, struct sk_buff *skb,
> int cmd, int *seq)
> {
> struct mt7615_dev *dev = container_of(mdev, struct mt7615_dev, mt76);
> - enum mt76_txq_id qid;
> + enum mt76_mcuq_id qid;
>
> mt7615_mcu_fill_msg(dev, skb, cmd, seq);
> if (test_bit(MT76_STATE_MCU_RUNNING, &dev->mphy.state))
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
> index 5fdd1a6d32ee..e211a2bd4d3c 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
> @@ -256,7 +256,7 @@ mt7915_mcu_send_message(struct mt76_dev *mdev, struct sk_buff *skb,
> struct mt7915_dev *dev = container_of(mdev, struct mt7915_dev, mt76);
> struct mt7915_mcu_txd *mcu_txd;
> u8 seq, pkt_fmt, qidx;
> - enum mt76_txq_id txq;
> + enum mt76_mcuq_id qid;
> __le32 *txd;
> u32 val;
>
> @@ -268,18 +268,18 @@ mt7915_mcu_send_message(struct mt76_dev *mdev, struct sk_buff *skb,
> seq = ++dev->mt76.mcu.msg_seq & 0xf;
>
> if (cmd == -MCU_CMD_FW_SCATTER) {
> - txq = MT_MCUQ_FWDL;
> + qid = MT_MCUQ_FWDL;
> goto exit;
> }
>
> mcu_txd = (struct mt7915_mcu_txd *)skb_push(skb, sizeof(*mcu_txd));
>
> if (test_bit(MT76_STATE_MCU_RUNNING, &dev->mphy.state)) {
> - txq = MT_MCUQ_WA;
> + qid = MT_MCUQ_WA;
> qidx = MT_TX_MCU_PORT_RX_Q0;
> pkt_fmt = MT_TX_TYPE_CMD;
> } else {
> - txq = MT_MCUQ_WM;
> + qid = MT_MCUQ_WM;
> qidx = MT_TX_MCU_PORT_RX_Q0;
> pkt_fmt = MT_TX_TYPE_CMD;
> }
> @@ -326,7 +326,7 @@ mt7915_mcu_send_message(struct mt76_dev *mdev, struct sk_buff *skb,
> if (wait_seq)
> *wait_seq = seq;
>
> - return mt76_tx_queue_skb_raw(dev, mdev->q_mcu[txq], skb, 0);
> + return mt76_tx_queue_skb_raw(dev, mdev->q_mcu[qid], skb, 0);
> }
>
> static void
>
> base-commit: 5c8fe583cce542aa0b84adc939ce85293de36e5e
> --
> 2.30.0
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
next prev parent reply other threads:[~2020-12-31 10:10 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-29 21:15 [PATCH] mt76: Fix queue ID variable types after mcu queue split Nathan Chancellor
2020-12-31 10:09 ` Lorenzo Bianconi [this message]
2021-01-11 8:06 ` Kalle Valo
2021-01-14 9:24 ` Felix Fietkau
2021-01-14 10:41 ` Kalle Valo
2021-01-14 16:48 ` Kalle Valo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201231100918.GA1819773@computer-5.station \
--to=lorenzo@kernel.org \
--cc=clang-built-linux@googlegroups.com \
--cc=kvalo@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-wireless@vger.kernel.org \
--cc=lorenzo.bianconi83@gmail.com \
--cc=natechancellor@gmail.com \
--cc=nbd@nbd.name \
--cc=netdev@vger.kernel.org \
--cc=ryder.lee@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).