From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [v2,RESEND,3/3] usb: typec: pci: Enable Intel USB role mux on Apollo Lake platforms From: Heikki Krogerus Message-Id: <20181001154451.GD15780@kuha.fi.intel.com> Date: Mon, 1 Oct 2018 18:44:51 +0300 To: Mathias Nyman Cc: gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, stable@vger.kernel.org List-ID: SGksCgpOb3QgYSBiaWdnaWUsIGJ1dCB3aHkgd2FzIHRoZSB0b3BpYyBmb3IgdGhpcyBwYXRjaCBj aGFuZ2VkPwoKSSdtIG5vdCBzdXJlIEFwb2xsbyBsYWtlcyBldmVuIGhhdmUgVHlwZS1DIGNvbm5l Y3RvcnMuIFRoZSBtdXggaXMKbmVlZGVkIHdpdGggdGhlIHVBQiBjb25uZWN0b3JzLgoKT24gTW9u LCBPY3QgMDEsIDIwMTggYXQgMDY6MzY6MDlQTSArMDMwMCwgTWF0aGlhcyBOeW1hbiB3cm90ZToK PiBGcm9tOiBIZWlra2kgS3JvZ2VydXMgPGhlaWtraS5rcm9nZXJ1c0BsaW51eC5pbnRlbC5jb20+ Cj4gCj4gSW50ZWwgQXBvbGxvIExha2UgaGFzIHRoZSBzYW1lIGludGVybmFsIFVTQiByb2xlIG11 eCBhcwo+IEludGVsIENoZXJyeSBUcmFpbC4KPiAKPiBDYzogPHN0YWJsZUB2Z2VyLmtlcm5lbC5v cmc+Cj4gU2lnbmVkLW9mZi1ieTogSGVpa2tpIEtyb2dlcnVzIDxoZWlra2kua3JvZ2VydXNAbGlu dXguaW50ZWwuY29tPgo+IFNpZ25lZC1vZmYtYnk6IE1hdGhpYXMgTnltYW4gPG1hdGhpYXMubnlt YW5AbGludXguaW50ZWwuY29tPgo+IC0tLQo+ICBkcml2ZXJzL3VzYi9ob3N0L3hoY2ktcGNpLmMg fCA2ICsrKystLQo+ICAxIGZpbGUgY2hhbmdlZCwgNCBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9u cygtKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL3VzYi9ob3N0L3hoY2ktcGNpLmMgYi9kcml2 ZXJzL3VzYi9ob3N0L3hoY2ktcGNpLmMKPiBpbmRleCA3MjI4NjBlLi41MWRkOGUwIDEwMDY0NAo+ IC0tLSBhL2RyaXZlcnMvdXNiL2hvc3QveGhjaS1wY2kuYwo+ICsrKyBiL2RyaXZlcnMvdXNiL2hv c3QveGhjaS1wY2kuYwo+IEBAIC0xNzksMTAgKzE3OSwxMiBAQCBzdGF0aWMgdm9pZCB4aGNpX3Bj aV9xdWlya3Moc3RydWN0IGRldmljZSAqZGV2LCBzdHJ1Y3QgeGhjaV9oY2QgKnhoY2kpCj4gIAkJ eGhjaS0+cXVpcmtzIHw9IFhIQ0lfUE1FX1NUVUNLX1FVSVJLOwo+ICAJfQo+ICAJaWYgKHBkZXYt PnZlbmRvciA9PSBQQ0lfVkVORE9SX0lEX0lOVEVMICYmCj4gLQkJIHBkZXYtPmRldmljZSA9PSBQ Q0lfREVWSUNFX0lEX0lOVEVMX0NIRVJSWVZJRVdfWEhDSSkgewo+ICsJICAgIHBkZXYtPmRldmlj ZSA9PSBQQ0lfREVWSUNFX0lEX0lOVEVMX0NIRVJSWVZJRVdfWEhDSSkKPiAgCQl4aGNpLT5xdWly a3MgfD0gWEhDSV9TU0lDX1BPUlRfVU5VU0VEOwo+ICsJaWYgKHBkZXYtPnZlbmRvciA9PSBQQ0lf VkVORE9SX0lEX0lOVEVMICYmCj4gKwkgICAgKHBkZXYtPmRldmljZSA9PSBQQ0lfREVWSUNFX0lE X0lOVEVMX0NIRVJSWVZJRVdfWEhDSSB8fAo+ICsJICAgICBwZGV2LT5kZXZpY2UgPT0gUENJX0RF VklDRV9JRF9JTlRFTF9BUExfWEhDSSkpCj4gIAkJeGhjaS0+cXVpcmtzIHw9IFhIQ0lfSU5URUxf VVNCX1JPTEVfU1c7Cj4gLQl9Cj4gIAlpZiAocGRldi0+dmVuZG9yID09IFBDSV9WRU5ET1JfSURf SU5URUwgJiYKPiAgCSAgICAocGRldi0+ZGV2aWNlID09IFBDSV9ERVZJQ0VfSURfSU5URUxfQ0hF UlJZVklFV19YSENJIHx8Cj4gIAkgICAgIHBkZXYtPmRldmljZSA9PSBQQ0lfREVWSUNFX0lEX0lO VEVMX1NVTlJJU0VQT0lOVF9MUF9YSENJIHx8Cj4gLS0gCj4gMi43LjQK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga05.intel.com ([192.55.52.43]:51855 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725266AbeJAWYo (ORCPT ); Mon, 1 Oct 2018 18:24:44 -0400 Date: Mon, 1 Oct 2018 18:44:51 +0300 From: Heikki Krogerus To: Mathias Nyman Cc: gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, stable@vger.kernel.org Subject: Re: [PATCH v2 RESEND 3/3] usb: typec: pci: Enable Intel USB role mux on Apollo Lake platforms Message-ID: <20181001154451.GD15780@kuha.fi.intel.com> References: <1538408169-26903-1-git-send-email-mathias.nyman@linux.intel.com> <1538408169-26903-4-git-send-email-mathias.nyman@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1538408169-26903-4-git-send-email-mathias.nyman@linux.intel.com> Sender: stable-owner@vger.kernel.org List-ID: Hi, Not a biggie, but why was the topic for this patch changed? I'm not sure Apollo lakes even have Type-C connectors. The mux is needed with the uAB connectors. On Mon, Oct 01, 2018 at 06:36:09PM +0300, Mathias Nyman wrote: > From: Heikki Krogerus > > Intel Apollo Lake has the same internal USB role mux as > Intel Cherry Trail. > > Cc: > Signed-off-by: Heikki Krogerus > Signed-off-by: Mathias Nyman > --- > drivers/usb/host/xhci-pci.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c > index 722860e..51dd8e0 100644 > --- a/drivers/usb/host/xhci-pci.c > +++ b/drivers/usb/host/xhci-pci.c > @@ -179,10 +179,12 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) > xhci->quirks |= XHCI_PME_STUCK_QUIRK; > } > if (pdev->vendor == PCI_VENDOR_ID_INTEL && > - pdev->device == PCI_DEVICE_ID_INTEL_CHERRYVIEW_XHCI) { > + pdev->device == PCI_DEVICE_ID_INTEL_CHERRYVIEW_XHCI) > xhci->quirks |= XHCI_SSIC_PORT_UNUSED; > + if (pdev->vendor == PCI_VENDOR_ID_INTEL && > + (pdev->device == PCI_DEVICE_ID_INTEL_CHERRYVIEW_XHCI || > + pdev->device == PCI_DEVICE_ID_INTEL_APL_XHCI)) > xhci->quirks |= XHCI_INTEL_USB_ROLE_SW; > - } > if (pdev->vendor == PCI_VENDOR_ID_INTEL && > (pdev->device == PCI_DEVICE_ID_INTEL_CHERRYVIEW_XHCI || > pdev->device == PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_XHCI || > -- > 2.7.4 -- heikki