[PATCH 0/2] usb: dwc3: pci: Allow Elkhart Lake to utilize DSM method for PM functionality

[PATCH 0/2] usb: dwc3: pci: Allow Elkhart Lake to utilize DSM method for PM functionality

[Raymond Tan]

Elkhart Lake adopted the DWC3 IP from other platforms, thus require same
DSM method to put the controller into D0/D3 state through PMU register.

Raymond Tan (2):
  usb: dwc3: pci: Fix DEFINE for Intel Elkhart Lake
  usb: dwc3: pci: Allow Elkhart Lake to utilize DSM method for PM
    functionality

 drivers/usb/dwc3/dwc3-pci.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

-- 
2.7.4

[PATCH 1/2] usb: dwc3: pci: Fix DEFINE for Intel Elkhart Lake

[Raymond Tan]

There's no separate low power (LP) version of Elkhart Lake, thus
this patch updates the PCI Device ID DEFINE to indicate this.

Signed-off-by: Raymond Tan <raymond.tan@intel.com>
---
 drivers/usb/dwc3/dwc3-pci.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c
index f420d7d..4f436b3 100644
--- a/drivers/usb/dwc3/dwc3-pci.c
+++ b/drivers/usb/dwc3/dwc3-pci.c
@@ -36,7 +36,7 @@
 #define PCI_DEVICE_ID_INTEL_CNPH		0xa36e
 #define PCI_DEVICE_ID_INTEL_CNPV		0xa3b0
 #define PCI_DEVICE_ID_INTEL_ICLLP		0x34ee
-#define PCI_DEVICE_ID_INTEL_EHLLP		0x4b7e
+#define PCI_DEVICE_ID_INTEL_EHL			0x4b7e
 #define PCI_DEVICE_ID_INTEL_TGPLP		0xa0ee
 #define PCI_DEVICE_ID_INTEL_TGPH		0x43ee
 #define PCI_DEVICE_ID_INTEL_JSP			0x4dee
@@ -356,7 +356,7 @@ static const struct pci_device_id dwc3_pci_id_table[] = {
 	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ICLLP),
 	  (kernel_ulong_t) &dwc3_pci_intel_properties, },
 
-	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_EHLLP),
+	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_EHL),
 	  (kernel_ulong_t) &dwc3_pci_intel_properties, },
 
 	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_TGPLP),
-- 
2.7.4

[PATCH 2/2] usb: dwc3: pci: Allow Elkhart Lake to utilize DSM method for PM functionality

[Raymond Tan]

Similar to some other IA platforms, Elkhart Lake too depends on the PMU
register write to request transition of Dx power state.

Thus, we add the PCI_DEVICE_ID_INTEL_EHL to the list of devices that shall
execute the ACPI _DSM method during D0/D3 sequence.

Signed-off-by: Raymond Tan <raymond.tan@intel.com>
---
 drivers/usb/dwc3/dwc3-pci.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c
index 4f436b3..4d50187 100644
--- a/drivers/usb/dwc3/dwc3-pci.c
+++ b/drivers/usb/dwc3/dwc3-pci.c
@@ -149,7 +149,8 @@ static int dwc3_pci_quirks(struct dwc3_pci *dwc)
 
 	if (pdev->vendor == PCI_VENDOR_ID_INTEL) {
 		if (pdev->device == PCI_DEVICE_ID_INTEL_BXT ||
-				pdev->device == PCI_DEVICE_ID_INTEL_BXT_M) {
+		    pdev->device == PCI_DEVICE_ID_INTEL_BXT_M ||
+		    pdev->device == PCI_DEVICE_ID_INTEL_EHL) {
 			guid_parse(PCI_INTEL_BXT_DSM_GUID, &dwc->guid);
 			dwc->has_dsm_for_pm = true;
 		}
-- 
2.7.4

Re: [PATCH 2/2] usb: dwc3: pci: Allow Elkhart Lake to utilize DSM method for PM functionality

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 1306 bytes --]

Raymond Tan <raymond.tan@intel.com> writes:

> Similar to some other IA platforms, Elkhart Lake too depends on the PMU
> register write to request transition of Dx power state.
>
> Thus, we add the PCI_DEVICE_ID_INTEL_EHL to the list of devices that shall
> execute the ACPI _DSM method during D0/D3 sequence.
>
> Signed-off-by: Raymond Tan <raymond.tan@intel.com>
> ---
>  drivers/usb/dwc3/dwc3-pci.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c
> index 4f436b3..4d50187 100644
> --- a/drivers/usb/dwc3/dwc3-pci.c
> +++ b/drivers/usb/dwc3/dwc3-pci.c
> @@ -149,7 +149,8 @@ static int dwc3_pci_quirks(struct dwc3_pci *dwc)
>  
>  	if (pdev->vendor == PCI_VENDOR_ID_INTEL) {
>  		if (pdev->device == PCI_DEVICE_ID_INTEL_BXT ||
> -				pdev->device == PCI_DEVICE_ID_INTEL_BXT_M) {
> +		    pdev->device == PCI_DEVICE_ID_INTEL_BXT_M ||
> +		    pdev->device == PCI_DEVICE_ID_INTEL_EHL) {

this looks like a bug fix which could be added during -rc cycle. As
such, it should be patch 1 in this series. Renaming the macro is less
critical. Can you update your series so I can take patch 1 during -rc
and patch 2 for next merge window? Please, don't forget to add the
Fixes: tag ;-)

-- 
balbi

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 857 bytes --]

Re: [PATCH 2/2] usb: dwc3: pci: Allow Elkhart Lake to utilize DSM method for PM functionality

[Heikki Krogerus]

On Mon, Aug 17, 2020 at 04:09:26PM +0300, Felipe Balbi wrote:
> Raymond Tan <raymond.tan@intel.com> writes:
> 
> > Similar to some other IA platforms, Elkhart Lake too depends on the PMU
> > register write to request transition of Dx power state.
> >
> > Thus, we add the PCI_DEVICE_ID_INTEL_EHL to the list of devices that shall
> > execute the ACPI _DSM method during D0/D3 sequence.
> >
> > Signed-off-by: Raymond Tan <raymond.tan@intel.com>
> > ---
> >  drivers/usb/dwc3/dwc3-pci.c | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c
> > index 4f436b3..4d50187 100644
> > --- a/drivers/usb/dwc3/dwc3-pci.c
> > +++ b/drivers/usb/dwc3/dwc3-pci.c
> > @@ -149,7 +149,8 @@ static int dwc3_pci_quirks(struct dwc3_pci *dwc)
> >  
> >  	if (pdev->vendor == PCI_VENDOR_ID_INTEL) {
> >  		if (pdev->device == PCI_DEVICE_ID_INTEL_BXT ||
> > -				pdev->device == PCI_DEVICE_ID_INTEL_BXT_M) {
> > +		    pdev->device == PCI_DEVICE_ID_INTEL_BXT_M ||
> > +		    pdev->device == PCI_DEVICE_ID_INTEL_EHL) {
> 
> this looks like a bug fix which could be added during -rc cycle. As
> such, it should be patch 1 in this series. Renaming the macro is less
> critical. Can you update your series so I can take patch 1 during -rc
> and patch 2 for next merge window? Please, don't forget to add the
> Fixes: tag ;-)

Raymond, I'll take care of this patch (and the other one too). I have
now some changes that need to be made on top of this patch, and I
don't want to wait with them anymore, so I'll include these in my
series.


thanks,

-- 
heikki