diff mbox series

platform/x86/intel/pmc/mtl: Put GNA/IPU/VPU devices in D3

Message ID 20230408022629.727721-1-david.e.box@linux.intel.com
State New
Headers
Series platform/x86/intel/pmc/mtl: Put GNA/IPU/VPU devices in D3 |

Commit Message

David E. Box April 8, 2023, 2:26 a.m. UTC 
  On Meteor Lake, the GNA, IPU, and VPU devices are booted in D0 power state
and will block the SoC from going into the deepest Package C-state if a
driver is not present. Put each device in D3hot if no driver is found.

Signed-off-by: David E. Box <david.e.box@linux.intel.com>
---
 drivers/platform/x86/intel/pmc/mtl.c | 31 ++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)


base-commit: 4f59630a5ed0a4e7d275bd7e5d253a8f5a425c5a

Comments

kernel test robot April 8, 2023, 4:19 a.m. UTC | #1 
Hi David,

kernel test robot noticed the following build warnings:

[auto build test WARNING on 4f59630a5ed0a4e7d275bd7e5d253a8f5a425c5a]

url:    https://github.com/intel-lab-lkp/linux/commits/David-E-Box/platform-x86-intel-pmc-mtl-Put-GNA-IPU-VPU-devices-in-D3/20230408-102651
base:   4f59630a5ed0a4e7d275bd7e5d253a8f5a425c5a
patch link:    https://lore.kernel.org/r/20230408022629.727721-1-david.e.box%40linux.intel.com
patch subject: [PATCH] platform/x86/intel/pmc/mtl: Put GNA/IPU/VPU devices in D3
config: x86_64-allmodconfig (https://download.01.org/0day-ci/archive/20230408/202304081211.S3RRROve-lkp@intel.com/config)
compiler: gcc-11 (Debian 11.3.0-8) 11.3.0
reproduce (this is a W=1 build):
        # https://github.com/intel-lab-lkp/linux/commit/04453d42ee1b0c97f9fa68644c6234f7b9e2d14a
        git remote add linux-review https://github.com/intel-lab-lkp/linux
        git fetch --no-tags linux-review David-E-Box/platform-x86-intel-pmc-mtl-Put-GNA-IPU-VPU-devices-in-D3/20230408-102651
        git checkout 04453d42ee1b0c97f9fa68644c6234f7b9e2d14a
        # save the config file
        mkdir build_dir && cp config build_dir/.config
        make W=1 O=build_dir ARCH=x86_64 olddefconfig
        make W=1 O=build_dir ARCH=x86_64 SHELL=/bin/bash drivers/platform/

If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <lkp@intel.com>
| Link: https://lore.kernel.org/oe-kbuild-all/202304081211.S3RRROve-lkp@intel.com/

All warnings (new ones prefixed by >>):

>> drivers/platform/x86/intel/pmc/mtl.c:52:6: warning: no previous prototype for 'mtl_set_device_d3' [-Wmissing-prototypes]
      52 | void mtl_set_device_d3(unsigned int device)
         |      ^~~~~~~~~~~~~~~~~


vim +/mtl_set_device_d3 +52 drivers/platform/x86/intel/pmc/mtl.c

    48	
    49	#define MTL_GNA_PCI_DEV	0x7e4c
    50	#define MTL_IPU_PCI_DEV	0x7d19
    51	#define MTL_VPU_PCI_DEV	0x7d1d
  > 52	void mtl_set_device_d3(unsigned int device)
    53	{
    54		struct pci_dev *pcidev;
    55	
    56		pcidev = pci_get_device(PCI_VENDOR_ID_INTEL, device, NULL);
    57		if (pcidev) {
    58			if (!device_trylock(&pcidev->dev)) {
    59				pci_dev_put(pcidev);
    60				return;
    61			}
    62			if (!pcidev->dev.driver) {
    63				dev_info(&pcidev->dev, "Setting to D3hot\n");
    64				pci_set_power_state(pcidev, PCI_D3hot);
    65			}
    66			device_unlock(&pcidev->dev);
    67			pci_dev_put(pcidev);
    68		}
    69	}
    70
kernel test robot April 8, 2023, 5:31 a.m. UTC | #2 
Hi David,

kernel test robot noticed the following build warnings:

[auto build test WARNING on 4f59630a5ed0a4e7d275bd7e5d253a8f5a425c5a]

url:    https://github.com/intel-lab-lkp/linux/commits/David-E-Box/platform-x86-intel-pmc-mtl-Put-GNA-IPU-VPU-devices-in-D3/20230408-102651
base:   4f59630a5ed0a4e7d275bd7e5d253a8f5a425c5a
patch link:    https://lore.kernel.org/r/20230408022629.727721-1-david.e.box%40linux.intel.com
patch subject: [PATCH] platform/x86/intel/pmc/mtl: Put GNA/IPU/VPU devices in D3
config: i386-randconfig-a003-20230403 (https://download.01.org/0day-ci/archive/20230408/202304081356.jXr7C3fH-lkp@intel.com/config)
compiler: clang version 14.0.6 (https://github.com/llvm/llvm-project f28c006a5895fc0e329fe15fead81e37457cb1d1)
reproduce (this is a W=1 build):
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # https://github.com/intel-lab-lkp/linux/commit/04453d42ee1b0c97f9fa68644c6234f7b9e2d14a
        git remote add linux-review https://github.com/intel-lab-lkp/linux
        git fetch --no-tags linux-review David-E-Box/platform-x86-intel-pmc-mtl-Put-GNA-IPU-VPU-devices-in-D3/20230408-102651
        git checkout 04453d42ee1b0c97f9fa68644c6234f7b9e2d14a
        # save the config file
        mkdir build_dir && cp config build_dir/.config
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=i386 olddefconfig
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=i386 SHELL=/bin/bash drivers/platform/x86/intel/pmc/

If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <lkp@intel.com>
| Link: https://lore.kernel.org/oe-kbuild-all/202304081356.jXr7C3fH-lkp@intel.com/

All warnings (new ones prefixed by >>):

>> drivers/platform/x86/intel/pmc/mtl.c:52:6: warning: no previous prototype for function 'mtl_set_device_d3' [-Wmissing-prototypes]
   void mtl_set_device_d3(unsigned int device)
        ^
   drivers/platform/x86/intel/pmc/mtl.c:52:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
   void mtl_set_device_d3(unsigned int device)
   ^
   static 
   1 warning generated.


vim +/mtl_set_device_d3 +52 drivers/platform/x86/intel/pmc/mtl.c

    48	
    49	#define MTL_GNA_PCI_DEV	0x7e4c
    50	#define MTL_IPU_PCI_DEV	0x7d19
    51	#define MTL_VPU_PCI_DEV	0x7d1d
  > 52	void mtl_set_device_d3(unsigned int device)
    53	{
    54		struct pci_dev *pcidev;
    55	
    56		pcidev = pci_get_device(PCI_VENDOR_ID_INTEL, device, NULL);
    57		if (pcidev) {
    58			if (!device_trylock(&pcidev->dev)) {
    59				pci_dev_put(pcidev);
    60				return;
    61			}
    62			if (!pcidev->dev.driver) {
    63				dev_info(&pcidev->dev, "Setting to D3hot\n");
    64				pci_set_power_state(pcidev, PCI_D3hot);
    65			}
    66			device_unlock(&pcidev->dev);
    67			pci_dev_put(pcidev);
    68		}
    69	}
    70
Hans de Goede April 8, 2023, 8:57 a.m. UTC | #3 
Hi David,

On 4/8/23 04:26, David E. Box wrote:
> On Meteor Lake, the GNA, IPU, and VPU devices are booted in D0 power state
> and will block the SoC from going into the deepest Package C-state if a
> driver is not present. Put each device in D3hot if no driver is found.
> 
> Signed-off-by: David E. Box <david.e.box@linux.intel.com>
> ---
>  drivers/platform/x86/intel/pmc/mtl.c | 31 ++++++++++++++++++++++++++++
>  1 file changed, 31 insertions(+)
> 
> diff --git a/drivers/platform/x86/intel/pmc/mtl.c b/drivers/platform/x86/intel/pmc/mtl.c
> index eeb3bd8c2502..33aa98b54049 100644
> --- a/drivers/platform/x86/intel/pmc/mtl.c
> +++ b/drivers/platform/x86/intel/pmc/mtl.c
> @@ -8,6 +8,7 @@
>   *
>   */
>  
> +#include <linux/pci.h>
>  #include "core.h"
>  
>  const struct pmc_reg_map mtl_reg_map = {
> @@ -45,8 +46,38 @@ void mtl_core_configure(struct pmc_dev *pmcdev)
>  	pmc_core_send_ltr_ignore(pmcdev, 3);
>  }
>  
> +#define MTL_GNA_PCI_DEV	0x7e4c
> +#define MTL_IPU_PCI_DEV	0x7d19
> +#define MTL_VPU_PCI_DEV	0x7d1d
> +void mtl_set_device_d3(unsigned int device)

As pointed out by "kernel test robot <lkp@intel.com>" this needs to
be static. Otherwise this LGTM. With this fixed please add my:

Reviewed-by: Hans de Goede <hdegoede@redhat.com>

to version 2 of the patch.

Regards,

Hans




> +{
> +	struct pci_dev *pcidev;
> +
> +	pcidev = pci_get_device(PCI_VENDOR_ID_INTEL, device, NULL);
> +	if (pcidev) {
> +		if (!device_trylock(&pcidev->dev)) {
> +			pci_dev_put(pcidev);
> +			return;
> +		}
> +		if (!pcidev->dev.driver) {
> +			dev_info(&pcidev->dev, "Setting to D3hot\n");
> +			pci_set_power_state(pcidev, PCI_D3hot);
> +		}
> +		device_unlock(&pcidev->dev);
> +		pci_dev_put(pcidev);
> +	}
> +}
> +
>  void mtl_core_init(struct pmc_dev *pmcdev)
>  {
>  	pmcdev->map = &mtl_reg_map;
>  	pmcdev->core_configure = mtl_core_configure;
> +
> +	/*
> +	 * Set power state of select devices that do not have drivers to D3
> +	 * so that they do not block Package C entry.
> +	 */
> +	mtl_set_device_d3(MTL_GNA_PCI_DEV);
> +	mtl_set_device_d3(MTL_IPU_PCI_DEV);
> +	mtl_set_device_d3(MTL_VPU_PCI_DEV);
>  }
> 
> base-commit: 4f59630a5ed0a4e7d275bd7e5d253a8f5a425c5a
kernel test robot April 8, 2023, 11:50 a.m. UTC | #4 
Hi David,

kernel test robot noticed the following build warnings:

[auto build test WARNING on 4f59630a5ed0a4e7d275bd7e5d253a8f5a425c5a]

url:    https://github.com/intel-lab-lkp/linux/commits/David-E-Box/platform-x86-intel-pmc-mtl-Put-GNA-IPU-VPU-devices-in-D3/20230408-102651
base:   4f59630a5ed0a4e7d275bd7e5d253a8f5a425c5a
patch link:    https://lore.kernel.org/r/20230408022629.727721-1-david.e.box%40linux.intel.com
patch subject: [PATCH] platform/x86/intel/pmc/mtl: Put GNA/IPU/VPU devices in D3
config: x86_64-randconfig-s023-20230403 (https://download.01.org/0day-ci/archive/20230408/202304081931.gFShEdFu-lkp@intel.com/config)
compiler: gcc-11 (Debian 11.3.0-8) 11.3.0
reproduce:
        # apt-get install sparse
        # sparse version: v0.6.4-39-gce1a6720-dirty
        # https://github.com/intel-lab-lkp/linux/commit/04453d42ee1b0c97f9fa68644c6234f7b9e2d14a
        git remote add linux-review https://github.com/intel-lab-lkp/linux
        git fetch --no-tags linux-review David-E-Box/platform-x86-intel-pmc-mtl-Put-GNA-IPU-VPU-devices-in-D3/20230408-102651
        git checkout 04453d42ee1b0c97f9fa68644c6234f7b9e2d14a
        # save the config file
        mkdir build_dir && cp config build_dir/.config
        make W=1 C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' O=build_dir ARCH=x86_64 olddefconfig
        make W=1 C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' O=build_dir ARCH=x86_64 SHELL=/bin/bash drivers/platform/x86/intel/pmc/

If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <lkp@intel.com>
| Link: https://lore.kernel.org/oe-kbuild-all/202304081931.gFShEdFu-lkp@intel.com/

sparse warnings: (new ones prefixed by >>)
>> drivers/platform/x86/intel/pmc/mtl.c:52:6: sparse: sparse: symbol 'mtl_set_device_d3' was not declared. Should it be static?
David E. Box April 9, 2023, 7:14 p.m. UTC | #5 
On Sat, 2023-04-08 at 10:57 +0200, Hans de Goede wrote:
> Hi David,
> 
> On 4/8/23 04:26, David E. Box wrote:
> > On Meteor Lake, the GNA, IPU, and VPU devices are booted in D0 power state
> > and will block the SoC from going into the deepest Package C-state if a
> > driver is not present. Put each device in D3hot if no driver is found.
> > 
> > Signed-off-by: David E. Box <david.e.box@linux.intel.com>
> > ---
> >  drivers/platform/x86/intel/pmc/mtl.c | 31 ++++++++++++++++++++++++++++
> >  1 file changed, 31 insertions(+)
> > 
> > diff --git a/drivers/platform/x86/intel/pmc/mtl.c
> > b/drivers/platform/x86/intel/pmc/mtl.c
> > index eeb3bd8c2502..33aa98b54049 100644
> > --- a/drivers/platform/x86/intel/pmc/mtl.c
> > +++ b/drivers/platform/x86/intel/pmc/mtl.c
> > @@ -8,6 +8,7 @@
> >   *
> >   */
> >  
> > +#include <linux/pci.h>
> >  #include "core.h"
> >  
> >  const struct pmc_reg_map mtl_reg_map = {
> > @@ -45,8 +46,38 @@ void mtl_core_configure(struct pmc_dev *pmcdev)
> >         pmc_core_send_ltr_ignore(pmcdev, 3);
> >  }
> >  
> > +#define MTL_GNA_PCI_DEV        0x7e4c
> > +#define MTL_IPU_PCI_DEV        0x7d19
> > +#define MTL_VPU_PCI_DEV        0x7d1d
> > +void mtl_set_device_d3(unsigned int device)
> 
> As pointed out by "kernel test robot <lkp@intel.com>" this needs to
> be static. Otherwise this LGTM. With this fixed please add my:
> 
> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
> 
> to version 2 of the patch.
> 
> Regards,
> 
> Hans

Thanks Hans

> 
> 
> 
> 
> > +{
> > +       struct pci_dev *pcidev;
> > +
> > +       pcidev = pci_get_device(PCI_VENDOR_ID_INTEL, device, NULL);
> > +       if (pcidev) {
> > +               if (!device_trylock(&pcidev->dev)) {
> > +                       pci_dev_put(pcidev);
> > +                       return;
> > +               }
> > +               if (!pcidev->dev.driver) {
> > +                       dev_info(&pcidev->dev, "Setting to D3hot\n");
> > +                       pci_set_power_state(pcidev, PCI_D3hot);
> > +               }
> > +               device_unlock(&pcidev->dev);
> > +               pci_dev_put(pcidev);
> > +       }
> > +}
> > +
> >  void mtl_core_init(struct pmc_dev *pmcdev)
> >  {
> >         pmcdev->map = &mtl_reg_map;
> >         pmcdev->core_configure = mtl_core_configure;
> > +
> > +       /*
> > +        * Set power state of select devices that do not have drivers to D3
> > +        * so that they do not block Package C entry.
> > +        */
> > +       mtl_set_device_d3(MTL_GNA_PCI_DEV);
> > +       mtl_set_device_d3(MTL_IPU_PCI_DEV);
> > +       mtl_set_device_d3(MTL_VPU_PCI_DEV);
> >  }
> > 
> > base-commit: 4f59630a5ed0a4e7d275bd7e5d253a8f5a425c5a
>
diff mbox series

Patch

diff --git a/drivers/platform/x86/intel/pmc/mtl.c b/drivers/platform/x86/intel/pmc/mtl.c
index eeb3bd8c2502..33aa98b54049 100644
--- a/drivers/platform/x86/intel/pmc/mtl.c
+++ b/drivers/platform/x86/intel/pmc/mtl.c
@@ -8,6 +8,7 @@ 
  *
  */
 
+#include <linux/pci.h>
 #include "core.h"
 
 const struct pmc_reg_map mtl_reg_map = {
@@ -45,8 +46,38 @@  void mtl_core_configure(struct pmc_dev *pmcdev)
 	pmc_core_send_ltr_ignore(pmcdev, 3);
 }
 
+#define MTL_GNA_PCI_DEV	0x7e4c
+#define MTL_IPU_PCI_DEV	0x7d19
+#define MTL_VPU_PCI_DEV	0x7d1d
+void mtl_set_device_d3(unsigned int device)
+{
+	struct pci_dev *pcidev;
+
+	pcidev = pci_get_device(PCI_VENDOR_ID_INTEL, device, NULL);
+	if (pcidev) {
+		if (!device_trylock(&pcidev->dev)) {
+			pci_dev_put(pcidev);
+			return;
+		}
+		if (!pcidev->dev.driver) {
+			dev_info(&pcidev->dev, "Setting to D3hot\n");
+			pci_set_power_state(pcidev, PCI_D3hot);
+		}
+		device_unlock(&pcidev->dev);
+		pci_dev_put(pcidev);
+	}
+}
+
 void mtl_core_init(struct pmc_dev *pmcdev)
 {
 	pmcdev->map = &mtl_reg_map;
 	pmcdev->core_configure = mtl_core_configure;
+
+	/*
+	 * Set power state of select devices that do not have drivers to D3
+	 * so that they do not block Package C entry.
+	 */
+	mtl_set_device_d3(MTL_GNA_PCI_DEV);
+	mtl_set_device_d3(MTL_IPU_PCI_DEV);
+	mtl_set_device_d3(MTL_VPU_PCI_DEV);
 }