| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20221017122531.9923-1-jilin@nvidia.com>
Date: Mon, 17 Oct 2022 20:25:31 +0800
From: Jim Lin <jilin@...dia.com>
To: <gregkh@...uxfoundation.org>, <jonathanh@...dia.com>,
<thierry.reding@...il.com>
CC: <mathias.nyman@...el.com>, <linux-usb@...r.kernel.org>,
<linux-tegra@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
<jilin@...dia.com>
Subject: [PATCH v4] xhci: tegra: USB2 pad power controls
Program USB2 pad PD controls during port connect/disconnect, port
suspend/resume, and test mode, to reduce power consumption on
disconnect or suspend.
Signed-off-by: Jim Lin <jilin@...dia.com>
---
v2: Fix issue that wrong tegra->phys[] may be accessed on tegra124
v3: No change on copyright
v4: Remove hcd_to_tegra_xusb() function which is used only once.
drivers/usb/host/xhci-tegra.c | 134 +++++++++++++++++++++++++++++++++-
1 file changed, 133 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/host/xhci-tegra.c b/drivers/usb/host/xhci-tegra.c
index c8af2cd2216d..a47454503d9e 100644
--- a/drivers/usb/host/xhci-tegra.c
+++ b/drivers/usb/host/xhci-tegra.c
@@ -189,6 +189,13 @@ struct tegra_xusb_context_soc {
} fpci;
};
+enum tegra_xhci_phy_type {
+ USB3_PHY,
+ USB2_PHY,
+ HSIC_PHY,
+ MAX_PHY_TYPES,
+};
+
struct tegra_xusb_soc {
const char *firmware;
const char * const *supply_names;
@@ -274,9 +281,12 @@ struct tegra_xusb {
bool suspended;
struct tegra_xusb_context context;
+ u32 enable_utmi_pad_after_lp0_exit;
};
static struct hc_driver __read_mostly tegra_xhci_hc_driver;
+static int (*original_xhci_hub_control)(struct usb_hcd *hcd, u16 typeReq, u16 wValue, u16 wIndex,
+ char *buf, u16 wLength);
static inline u32 fpci_readl(struct tegra_xusb *tegra, unsigned int offset)
{
@@ -1949,12 +1959,30 @@ static void tegra_xhci_enable_phy_sleepwalk_wake(struct tegra_xusb *tegra)
static void tegra_xhci_disable_phy_wake(struct tegra_xusb *tegra)
{
struct tegra_xusb_padctl *padctl = tegra->padctl;
- unsigned int i;
+ unsigned int i, j;
for (i = 0; i < tegra->num_phys; i++) {
if (!tegra->phys[i])
continue;
+ if (tegra_xusb_padctl_remote_wake_detected(padctl, tegra->phys[i])) {
+ if (i < tegra->soc->phy_types[USB3_PHY].num) {
+ /* USB3 */
+ j = i;
+ } else if (i < (tegra->soc->phy_types[USB3_PHY].num +
+ tegra->soc->phy_types[USB2_PHY].num)) {
+ /* USB2 */
+ j = i - tegra->soc->phy_types[USB3_PHY].num;
+ tegra_phy_xusb_utmi_pad_power_on(tegra->phys[i]);
+ } else {
+ /* HSIC */
+ j = i - (tegra->soc->phy_types[USB3_PHY].num +
+ tegra->soc->phy_types[USB2_PHY].num);
+ }
+ dev_dbg(tegra->dev,
+ "%s port %u (0 based) remote wake detected\n",
+ dev_name(&tegra->phys[i]->dev), j);
+ }
tegra_xusb_padctl_disable_phy_wake(padctl, tegra->phys[i]);
}
}
@@ -1972,6 +2000,23 @@ static void tegra_xhci_disable_phy_sleepwalk(struct tegra_xusb *tegra)
}
}
+static void tegra_xhci_program_utmi_power_lp0_exit(struct tegra_xusb *tegra)
+{
+ unsigned int i;
+
+ for (i = 0; i < tegra->soc->phy_types[USB2_PHY].num; i++) {
+ if (!is_host_mode_phy(tegra, USB2_PHY, i))
+ continue;
+ /* USB2 */
+ if (tegra->enable_utmi_pad_after_lp0_exit & BIT(i))
+ tegra_phy_xusb_utmi_pad_power_on(
+ tegra->phys[tegra->soc->phy_types[USB3_PHY].num + i]);
+ else
+ tegra_phy_xusb_utmi_pad_power_down(
+ tegra->phys[tegra->soc->phy_types[USB3_PHY].num + i]);
+ }
+}
+
static int tegra_xusb_enter_elpg(struct tegra_xusb *tegra, bool runtime)
{
struct xhci_hcd *xhci = hcd_to_xhci(tegra->hcd);
@@ -1980,6 +2025,7 @@ static int tegra_xusb_enter_elpg(struct tegra_xusb *tegra, bool runtime)
unsigned int i;
int err;
u32 usbcmd;
+ u32 portsc;
dev_dbg(dev, "entering ELPG\n");
@@ -1993,6 +2039,15 @@ static int tegra_xusb_enter_elpg(struct tegra_xusb *tegra, bool runtime)
goto out;
}
+ for (i = 0; i < tegra->soc->phy_types[USB2_PHY].num; i++) {
+ if (!xhci->usb2_rhub.ports[i])
+ continue;
+ portsc = readl(xhci->usb2_rhub.ports[i]->addr);
+ tegra->enable_utmi_pad_after_lp0_exit &= ~BIT(i);
+ if (((portsc & PORT_PLS_MASK) == XDEV_U3) || ((portsc & DEV_SPEED_MASK) == XDEV_FS))
+ tegra->enable_utmi_pad_after_lp0_exit |= BIT(i);
+ }
+
err = xhci_suspend(xhci, wakeup);
if (err < 0) {
dev_err(tegra->dev, "failed to suspend XHCI: %d\n", err);
@@ -2066,6 +2121,8 @@ static int tegra_xusb_exit_elpg(struct tegra_xusb *tegra, bool runtime)
phy_power_on(tegra->phys[i]);
}
+ if (tegra->suspended)
+ tegra_xhci_program_utmi_power_lp0_exit(tegra);
tegra_xusb_config(tegra);
tegra_xusb_restore_context(tegra);
@@ -2437,6 +2494,79 @@ static int tegra_xhci_setup(struct usb_hcd *hcd)
return xhci_gen_setup(hcd, tegra_xhci_quirks);
}
+static int tegra_xhci_hub_control(struct usb_hcd *hcd, u16 type_req, u16 value, u16 index,
+ char *buf, u16 length)
+{
+ struct tegra_xusb *tegra = dev_get_drvdata(hcd->self.controller);
+ struct xhci_hcd *xhci = hcd_to_xhci(hcd);
+ struct xhci_hub *rhub;
+ struct xhci_bus_state *bus_state;
+ int port = (index & 0xff) - 1;
+ int i;
+ struct xhci_port **ports;
+ u32 portsc;
+ int ret;
+
+ rhub = &xhci->usb2_rhub;
+ bus_state = &rhub->bus_state;
+ if (bus_state->resuming_ports && hcd->speed == HCD_USB2) {
+ ports = rhub->ports;
+ i = rhub->num_ports;
+ while (i--) {
+ if (!test_bit(i, &bus_state->resuming_ports))
+ continue;
+ portsc = readl(ports[i]->addr);
+ if ((portsc & PORT_PLS_MASK) == XDEV_RESUME)
+ tegra_phy_xusb_utmi_pad_power_on(
+ tegra->phys[tegra->soc->phy_types[USB3_PHY].num + i]);
+ }
+ }
+
+ if (hcd->speed == HCD_USB2) {
+ i = tegra->soc->phy_types[USB3_PHY].num + port;
+ if ((type_req == ClearPortFeature) && (value == USB_PORT_FEAT_SUSPEND)) {
+ if (!index || index > rhub->num_ports)
+ return -EPIPE;
+ tegra_phy_xusb_utmi_pad_power_on(tegra->phys[i]);
+ }
+ if ((type_req == SetPortFeature) && (value == USB_PORT_FEAT_RESET)) {
+ if (!index || index > rhub->num_ports)
+ return -EPIPE;
+ ports = rhub->ports;
+ portsc = readl(ports[port]->addr);
+ if (portsc & PORT_CONNECT)
+ tegra_phy_xusb_utmi_pad_power_on(tegra->phys[i]);
+ }
+ }
+
+ ret = (*original_xhci_hub_control)(hcd, type_req, value, index, buf, length);
+ if (ret < 0)
+ return ret;
+
+ if (hcd->speed == HCD_USB2) {
+ if ((type_req == SetPortFeature) && (value == USB_PORT_FEAT_SUSPEND))
+ /* We don't suspend the PAD while HNP role swap happens on the OTG port */
+ if (!((hcd->self.otg_port == (port + 1)) && hcd->self.b_hnp_enable))
+ tegra_phy_xusb_utmi_pad_power_down(tegra->phys[i]);
+
+ if ((type_req == ClearPortFeature) && (value == USB_PORT_FEAT_C_CONNECTION)) {
+ ports = rhub->ports;
+ portsc = readl(ports[port]->addr);
+ if (!(portsc & PORT_CONNECT)) {
+ /* We don't suspend the PAD while HNP role swap happens on the OTG
+ * port
+ */
+ if (!((hcd->self.otg_port == (port + 1)) && hcd->self.b_hnp_enable))
+ tegra_phy_xusb_utmi_pad_power_down(tegra->phys[i]);
+ }
+ }
+ if ((type_req == SetPortFeature) && (value == USB_PORT_FEAT_TEST))
+ tegra_phy_xusb_utmi_pad_power_on(tegra->phys[i]);
+ }
+
+ return ret;
+}
+
static const struct xhci_driver_overrides tegra_xhci_overrides __initconst = {
.reset = tegra_xhci_setup,
};
@@ -2444,6 +2574,8 @@ static const struct xhci_driver_overrides tegra_xhci_overrides __initconst = {
static int __init tegra_xusb_init(void)
{
xhci_init_driver(&tegra_xhci_hc_driver, &tegra_xhci_overrides);
+ original_xhci_hub_control = tegra_xhci_hc_driver.hub_control;
+ tegra_xhci_hc_driver.hub_control = tegra_xhci_hub_control;
return platform_driver_register(&tegra_xusb_driver);
}
--
2.17.1
Powered by blists - more mailing lists