From: Sanjay R Mehta <sanmehta@amd.com>
To: Mika Westerberg <mika.westerberg@linux.intel.com>,
Sanjay R Mehta <Sanju.Mehta@amd.com>
Cc: andreas.noever@gmail.com, michael.jamet@intel.com,
bhelgaas@google.com, YehezkelShB@gmail.com,
Basavaraj.Natikar@amd.com, linux-usb@vger.kernel.org,
linux-pci@vger.kernel.org
Subject: Re: [PATCH 2/4] thunderbolt: Handle INTR when Disable ISR auto clear bit set
Date: Mon, 2 Aug 2021 23:45:07 +0530 [thread overview]
Message-ID: <ffe7a358-a3a8-5b6b-55da-f088316deff1@amd.com> (raw)
In-Reply-To: <YQgNx/YiPVFEZrDb@lahna>
On 8/2/2021 8:52 PM, Mika Westerberg wrote:
> [CAUTION: External Email]
>
> Hi,
>
> On Mon, Aug 02, 2021 at 07:58:18AM -0500, Sanjay R Mehta wrote:
>> From: Sanjay R Mehta <sanju.mehta@amd.com>
>>
>> when the "Disable ISR Auto-Clear" bit is set, the Tx/Rx ring
>> interrupt status is not cleared. Hence handling it by setting
>> the "Interrupt status clear" register to clear the
>> corresponding Tx/Rx ring interrupt.
>
> I think REG_DMA_MISC_INT_AUTO_CLEAR which is bit 2 in that register is
> actually Intel specific and not the same as in the USB4 spec bit 17. I
> guess the AMD controller works fine as is if this bit (2) is not set? If
> that's the case we can simply limit this behavior for Intel controllers.
>
Yes, you are right Mika. With bit 17 it's working for us and we didn't
wanted to break Intel's functionality , hence we added this change which
works for both :).
Yes, as you suggested, we can limit this to Intel controllers.
Will send the changes accordingly.
Thanks,
Sanjay
>>
>> Signed-off-by: Basavaraj Natikar <Basavaraj.Natikar@amd.com>
>> Signed-off-by: Sanjay R Mehta <sanju.mehta@amd.com>
>> ---
>> drivers/thunderbolt/nhi.c | 26 +++++++++++++++++++++++++-
>> include/linux/thunderbolt.h | 1 +
>> 2 files changed, 26 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/thunderbolt/nhi.c b/drivers/thunderbolt/nhi.c
>> index d7d9c4b..63bbabf 100644
>> --- a/drivers/thunderbolt/nhi.c
>> +++ b/drivers/thunderbolt/nhi.c
>> @@ -74,7 +74,11 @@ static void ring_interrupt_active(struct tb_ring *ring, bool active)
>> if (!(misc & REG_DMA_MISC_INT_AUTO_CLEAR)) {
>> misc |= REG_DMA_MISC_INT_AUTO_CLEAR;
>> iowrite32(misc, ring->nhi->iobase + REG_DMA_MISC);
>> - }
>> + misc = ioread32(ring->nhi->iobase + REG_DMA_MISC);
>> + if (misc & REG_DMA_MISC_INT_AUTO_CLEAR)
>> + ring->nhi->is_intr_autoclr = true;
>> + } else
>> + ring->nhi->is_intr_autoclr = true;
>>
>> ivr_base = ring->nhi->iobase + REG_INT_VEC_ALLOC_BASE;
>> step = index / REG_INT_VEC_ALLOC_REGS * REG_INT_VEC_ALLOC_BITS;
>> @@ -377,11 +381,31 @@ void tb_ring_poll_complete(struct tb_ring *ring)
>> }
>> EXPORT_SYMBOL_GPL(tb_ring_poll_complete);
>>
>> +static void check_and_clear_intr_status(struct tb_ring *ring, int int_pos)
>> +{
>> + u32 value;
>> +
>> + if (!ring->nhi->is_intr_autoclr) {
>> + value = ioread32(ring->nhi->iobase
>> + + REG_RING_NOTIFY_BASE
>> + + 4 * (int_pos / 32));
>> + iowrite32(value, ring->nhi->iobase
>> + + (REG_RING_NOTIFY_BASE + 8)
>> + + 4 * (int_pos / 32));
>> + }
>> +}
>> +
>> static irqreturn_t ring_msix(int irq, void *data)
>> {
>> struct tb_ring *ring = data;
>>
>> spin_lock(&ring->nhi->lock);
>> +
>> + if (ring->is_tx)
>> + check_and_clear_intr_status(ring, 0);
>> + else
>> + check_and_clear_intr_status(ring, ring->nhi->hop_count);
>> +
>> spin_lock(&ring->lock);
>> __ring_interrupt(ring);
>> spin_unlock(&ring->lock);
>> diff --git a/include/linux/thunderbolt.h b/include/linux/thunderbolt.h
>> index e7c96c3..bbe7c7e 100644
>> --- a/include/linux/thunderbolt.h
>> +++ b/include/linux/thunderbolt.h
>> @@ -478,6 +478,7 @@ struct tb_nhi {
>> struct tb_ring **rx_rings;
>> struct ida msix_ida;
>> bool going_away;
>> + bool is_intr_autoclr;
>> struct work_struct interrupt_work;
>> u32 hop_count;
>> };
>> --
>> 2.7.4
next prev parent reply other threads:[~2021-08-02 18:15 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-02 12:58 [PATCH 0/4] Add support for AMD USB4 and bug fixes Sanjay R Mehta
2021-08-02 12:58 ` [PATCH 1/4] PCI: Add AMD USB4 host router device IDs Sanjay R Mehta
2021-08-02 15:12 ` Mika Westerberg
2021-08-02 18:09 ` Sanjay R Mehta
2021-08-03 9:45 ` Mika Westerberg
2021-08-03 12:26 ` Sanjay R Mehta
2021-08-02 12:58 ` [PATCH 2/4] thunderbolt: Handle INTR when Disable ISR auto clear bit set Sanjay R Mehta
2021-08-02 15:22 ` Mika Westerberg
2021-08-02 18:15 ` Sanjay R Mehta [this message]
2021-08-02 12:58 ` [PATCH 3/4] thunderbolt: Fix adapter init handling during switch add Sanjay R Mehta
2021-08-02 15:26 ` Mika Westerberg
2021-08-02 18:53 ` Sanjay R Mehta
2021-08-03 9:05 ` Mika Westerberg
2021-08-03 12:29 ` Sanjay R Mehta
2021-08-02 12:58 ` [PATCH 4/4] thunderbolt: Fix port linking by checking all adapters Sanjay R Mehta
2021-08-02 15:10 ` [PATCH 0/4] Add support for AMD USB4 and bug fixes Mika Westerberg
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=ffe7a358-a3a8-5b6b-55da-f088316deff1@amd.com \
--to=sanmehta@amd.com \
--cc=Basavaraj.Natikar@amd.com \
--cc=Sanju.Mehta@amd.com \
--cc=YehezkelShB@gmail.com \
--cc=andreas.noever@gmail.com \
--cc=bhelgaas@google.com \
--cc=linux-pci@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=michael.jamet@intel.com \
--cc=mika.westerberg@linux.intel.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).