From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161121AbcE3FxZ (ORCPT ); Mon, 30 May 2016 01:53:25 -0400 Received: from mga09.intel.com ([134.134.136.24]:51707 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753826AbcE3FxV (ORCPT ); Mon, 30 May 2016 01:53:21 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,388,1459839600"; d="scan'208";a="964918102" From: Lu Baolu To: Greg Kroah-Hartman , felipe.balbi@linux.intel.com, Mathias Nyman , Lee Jones , Heikki Krogerus , Liam Girdwood , Mark Brown Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Lu Baolu Subject: [PATCH v9 6/7] usb: pci-quirks: add Intel USB drcfg mux device Date: Mon, 30 May 2016 13:51:43 +0800 Message-Id: <1464587504-8139-7-git-send-email-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1464587504-8139-1-git-send-email-baolu.lu@linux.intel.com> References: <1464587504-8139-1-git-send-email-baolu.lu@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In some Intel platforms, a single usb port is shared between USB host and device controllers. The shared port is under control of a switch which is defined in the Intel vendor defined extended capability for xHCI. This patch adds the support to detect and create the platform device for the port mux switch. Signed-off-by: Lu Baolu Reviewed-by: Felipe Balbi --- drivers/usb/host/pci-quirks.c | 42 +++++++++++++++++++++++++++++++++++++++- drivers/usb/host/xhci-ext-caps.h | 2 ++ 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c index 35af362..7e3194f 100644 --- a/drivers/usb/host/pci-quirks.c +++ b/drivers/usb/host/pci-quirks.c @@ -16,6 +16,8 @@ #include #include #include +#include + #include "pci-quirks.h" #include "xhci-ext-caps.h" @@ -78,6 +80,9 @@ #define USB_INTEL_USB3_PSSEN 0xD8 #define USB_INTEL_USB3PRM 0xDC +#define DEVICE_ID_INTEL_BROXTON_P_XHCI 0x5aa8 +#define DEVICE_ID_INTEL_CHERRYVIEW_XHCI 0x22b5 + /* * amd_chipset_gen values represent AMD different chipset generations */ @@ -956,6 +961,36 @@ void usb_disable_xhci_ports(struct pci_dev *xhci_pdev) } EXPORT_SYMBOL_GPL(usb_disable_xhci_ports); +static void create_intel_usb_mux_device(struct pci_dev *xhci_pdev, + void __iomem *base) +{ + int ret; + struct platform_device *plat_dev; + struct property_entry pentry[] = { + PROPERTY_ENTRY_U64("reg-start", + pci_resource_start(xhci_pdev, 0) + 0x80d8), + PROPERTY_ENTRY_U64("reg-size", 8), + { }, + }; + + if (!xhci_find_next_ext_cap(base, 0, XHCI_EXT_CAPS_INTEL_USB_MUX)) + return; + + plat_dev = platform_device_alloc("intel-mux-drcfg", + PLATFORM_DEVID_NONE); + if (!plat_dev) + return; + + plat_dev->dev.parent = &xhci_pdev->dev; + platform_device_add_properties(plat_dev, pentry); + ret = platform_device_add(plat_dev); + if (ret) { + dev_warn(&xhci_pdev->dev, + "failed to create mux device with error %d", ret); + platform_device_put(plat_dev); + } +} + /** * PCI Quirks for xHCI. * @@ -1022,9 +1057,14 @@ static void quirk_usb_handoff_xhci(struct pci_dev *pdev) writel(val, base + ext_cap_offset + XHCI_LEGACY_CONTROL_OFFSET); hc_init: - if (pdev->vendor == PCI_VENDOR_ID_INTEL) + if (pdev->vendor == PCI_VENDOR_ID_INTEL) { usb_enable_intel_xhci_ports(pdev); + if (pdev->device == DEVICE_ID_INTEL_BROXTON_P_XHCI || + pdev->device == DEVICE_ID_INTEL_CHERRYVIEW_XHCI) + create_intel_usb_mux_device(pdev, base); + } + op_reg_base = base + XHCI_HC_LENGTH(readl(base)); /* Wait for the host controller to be ready before writing any diff --git a/drivers/usb/host/xhci-ext-caps.h b/drivers/usb/host/xhci-ext-caps.h index e0244fb..e368ccb 100644 --- a/drivers/usb/host/xhci-ext-caps.h +++ b/drivers/usb/host/xhci-ext-caps.h @@ -51,6 +51,8 @@ #define XHCI_EXT_CAPS_ROUTE 5 /* IDs 6-9 reserved */ #define XHCI_EXT_CAPS_DEBUG 10 +/* Vendor defined 192-255 */ +#define XHCI_EXT_CAPS_INTEL_USB_MUX 192 /* USB Legacy Support Capability - section 7.1.1 */ #define XHCI_HC_BIOS_OWNED (1 << 16) #define XHCI_HC_OS_OWNED (1 << 24) -- 2.1.4