From: Sanjay R Mehta <Sanju.Mehta@amd.com>
To: <mika.westerberg@linux.intel.com>, <andreas.noever@gmail.com>,
<michael.jamet@intel.com>, <YehezkelShB@gmail.com>
Cc: <Basavaraj.Natikar@amd.com>, <Nehal-bakulchandra.Shah@amd.com>,
<Shyam-sundar.S-k@amd.com>, <linux-usb@vger.kernel.org>,
Sanjay R Mehta <sanju.mehta@amd.com>
Subject: [PATCH v3 1/4] thunderbolt: Add quirk to support vendor specific implementation
Date: Fri, 6 Aug 2021 11:59:05 -0500 [thread overview]
Message-ID: <1628269148-51355-2-git-send-email-Sanju.Mehta@amd.com> (raw)
In-Reply-To: <1628269148-51355-1-git-send-email-Sanju.Mehta@amd.com>
From: Sanjay R Mehta <sanju.mehta@amd.com>
Introduce nhi_check_quirks() routine to handle any vendor specific quirks
to manage a hardware specific implementation.
On Intel system, the USB4 controller requires the
REG_DMA_MISC_INT_AUTO_CLEAR to be set. Hence handle it accordingly as
per the USB4 specification via a quirk.
Fixes: 046bee1f9ab8 ("thunderbolt: Add MSI-X support")
Suggested-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Basavaraj Natikar <Basavaraj.Natikar@amd.com>
Signed-off-by: Sanjay R Mehta <sanju.mehta@amd.com>
---
drivers/thunderbolt/nhi.c | 18 ++++++++++++++----
include/linux/thunderbolt.h | 1 +
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/drivers/thunderbolt/nhi.c b/drivers/thunderbolt/nhi.c
index fa44332..7979638 100644
--- a/drivers/thunderbolt/nhi.c
+++ b/drivers/thunderbolt/nhi.c
@@ -43,6 +43,12 @@ static int ring_interrupt_index(struct tb_ring *ring)
return bit;
}
+static void nhi_check_quirks(struct tb_nhi *nhi)
+{
+ if (nhi->pdev->vendor == PCI_VENDOR_ID_INTEL)
+ nhi->quirks |= REG_DMA_MISC_INT_AUTO_CLEAR;
+}
+
/*
* ring_interrupt_active() - activate/deactivate interrupts for a single ring
*
@@ -70,10 +76,12 @@ static void ring_interrupt_active(struct tb_ring *ring, bool active)
* Ask the hardware to clear interrupt status bits automatically
* since we already know which interrupt was triggered.
*/
- misc = ioread32(ring->nhi->iobase + REG_DMA_MISC);
- if (!(misc & REG_DMA_MISC_INT_AUTO_CLEAR)) {
- misc |= REG_DMA_MISC_INT_AUTO_CLEAR;
- iowrite32(misc, ring->nhi->iobase + REG_DMA_MISC);
+ if (ring->nhi->quirks & REG_DMA_MISC_INT_AUTO_CLEAR) {
+ misc = ioread32(ring->nhi->iobase + REG_DMA_MISC);
+ if (!(misc & REG_DMA_MISC_INT_AUTO_CLEAR)) {
+ misc |= REG_DMA_MISC_INT_AUTO_CLEAR;
+ iowrite32(misc, ring->nhi->iobase + REG_DMA_MISC);
+ }
}
ivr_base = ring->nhi->iobase + REG_INT_VEC_ALLOC_BASE;
@@ -1190,6 +1198,8 @@ static int nhi_probe(struct pci_dev *pdev, const struct pci_device_id *id)
if (!nhi->tx_rings || !nhi->rx_rings)
return -ENOMEM;
+ nhi_check_quirks(nhi);
+
res = nhi_init_msi(nhi);
if (res) {
dev_err(&pdev->dev, "cannot enable MSI, aborting\n");
diff --git a/include/linux/thunderbolt.h b/include/linux/thunderbolt.h
index e7c96c3..2144123 100644
--- a/include/linux/thunderbolt.h
+++ b/include/linux/thunderbolt.h
@@ -480,6 +480,7 @@ struct tb_nhi {
bool going_away;
struct work_struct interrupt_work;
u32 hop_count;
+ u32 quirks;
};
/**
--
2.7.4
next prev parent reply other threads:[~2021-08-06 16:59 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-06 16:59 [PATCH v3 0/4] Added some bug fixes for USB4 Sanjay R Mehta
2021-08-06 16:59 ` Sanjay R Mehta [this message]
2021-08-06 16:59 ` [PATCH v3 2/4] thunderbolt: Handle ring interrupt by reading intr status Sanjay R Mehta
2021-08-06 16:59 ` [PATCH v3 3/4] thunderbolt: Skip port init for control adapter(0) Sanjay R Mehta
2021-08-06 16:59 ` [PATCH v3 4/4] thunderbolt: Fix port linking by checking all adapters Sanjay R Mehta
2021-08-09 12:06 ` [PATCH v3 0/4] Added some bug fixes for USB4 Mika Westerberg
2021-08-09 12:28 ` Sanjay R Mehta
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=1628269148-51355-2-git-send-email-Sanju.Mehta@amd.com \
--to=sanju.mehta@amd.com \
--cc=Basavaraj.Natikar@amd.com \
--cc=Nehal-bakulchandra.Shah@amd.com \
--cc=Shyam-sundar.S-k@amd.com \
--cc=YehezkelShB@gmail.com \
--cc=andreas.noever@gmail.com \
--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).