From: Connor Davis <connojdavis@gmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Connor Davis <connojdavis@gmail.com>,
Lee Jones <lee.jones@linaro.org>, Jann Horn <jannh@google.com>,
Chunfeng Yun <chunfeng.yun@mediatek.com>,
xen-devel@lists.xenproject.org, linux-usb@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 1/3] usb: early: Avoid using DbC if already enabled
Date: Tue, 11 May 2021 18:18:19 -0600 [thread overview]
Message-ID: <d160cee9b61c0ec41c2cd5ff9b4e107011d39d8c.1620776161.git.connojdavis@gmail.com> (raw)
In-Reply-To: <cover.1620776161.git.connojdavis@gmail.com>
Check if the debug capability is enabled in early_xdbc_parse_parameter,
and if it is, return with an error. This avoids collisions with whatever
enabled the DbC prior to linux starting.
Signed-off-by: Connor Davis <connojdavis@gmail.com>
---
drivers/usb/early/xhci-dbc.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/usb/early/xhci-dbc.c b/drivers/usb/early/xhci-dbc.c
index be4ecbabdd58..ca67fddc2d36 100644
--- a/drivers/usb/early/xhci-dbc.c
+++ b/drivers/usb/early/xhci-dbc.c
@@ -642,6 +642,16 @@ int __init early_xdbc_parse_parameter(char *s)
}
xdbc.xdbc_reg = (struct xdbc_regs __iomem *)(xdbc.xhci_base + offset);
+ if (readl(&xdbc.xdbc_reg->control) & CTRL_DBC_ENABLE) {
+ pr_notice("xhci debug capability already in use\n");
+ early_iounmap(xdbc.xhci_base, xdbc.xhci_length);
+ xdbc.xdbc_reg = NULL;
+ xdbc.xhci_base = NULL;
+ xdbc.xhci_length = 0;
+
+ return -ENODEV;
+ }
+
return 0;
}
--
2.31.1
next prev parent reply other threads:[~2021-05-12 0:18 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-12 0:18 [PATCH 0/3] Support xen-driven USB3 debug capability Connor Davis
2021-05-12 0:18 ` Connor Davis [this message]
2021-05-12 0:18 ` [PATCH 2/3] xen: Export dbgp functions when CONFIG_XEN_DOM0 is enabled Connor Davis
2021-05-12 5:41 ` Juergen Gross
2021-05-12 15:01 ` Connor Davis
2021-05-12 13:54 ` Boris Ostrovsky
2021-05-12 14:58 ` Connor Davis
2021-05-12 15:18 ` Boris Ostrovsky
2021-05-12 0:18 ` [PATCH 3/3] usb: xhci: Notify xen when DbC is unsafe to use Connor Davis
2021-05-12 7:03 ` Greg Kroah-Hartman
2021-05-12 14:59 ` Connor Davis
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=d160cee9b61c0ec41c2cd5ff9b4e107011d39d8c.1620776161.git.connojdavis@gmail.com \
--to=connojdavis@gmail.com \
--cc=chunfeng.yun@mediatek.com \
--cc=gregkh@linuxfoundation.org \
--cc=jannh@google.com \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=xen-devel@lists.xenproject.org \
/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).