From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5118FC282DD for ; Wed, 8 Jan 2020 17:03:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2346A20692 for ; Wed, 8 Jan 2020 17:03:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729615AbgAHRDe (ORCPT ); Wed, 8 Jan 2020 12:03:34 -0500 Received: from mga01.intel.com ([192.55.52.88]:38801 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729516AbgAHRDd (ORCPT ); Wed, 8 Jan 2020 12:03:33 -0500 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Jan 2020 09:03:33 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,410,1571727600"; d="scan'208";a="422976068" Received: from smile.fi.intel.com (HELO smile) ([10.237.68.40]) by fmsmga006.fm.intel.com with ESMTP; 08 Jan 2020 09:03:29 -0800 Received: from andy by smile with local (Exim 4.93) (envelope-from ) id 1ipEjx-0005kR-9r; Wed, 08 Jan 2020 19:03:29 +0200 Date: Wed, 8 Jan 2020 19:03:29 +0200 From: Andy Shevchenko To: Mika Westerberg Cc: Darren Hart , Lee Jones , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H . Peter Anvin" , x86@kernel.org, Zha Qipeng , Rajneesh Bhardwaj , "David E . Box" , Guenter Roeck , Heikki Krogerus , Greg Kroah-Hartman , Wim Van Sebroeck , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 32/36] platform/x86: intel_pmc_ipc: Move PCI IDs to intel_scu_pcidrv.c Message-ID: <20200108170329.GR32742@smile.fi.intel.com> References: <20200108114201.27908-1-mika.westerberg@linux.intel.com> <20200108114201.27908-33-mika.westerberg@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200108114201.27908-33-mika.westerberg@linux.intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Jan 08, 2020 at 02:41:57PM +0300, Mika Westerberg wrote: > The PCI probe driver in intel_pmc_ipc.c is a duplicate of what we > already have in intel_scu_pcidrv.c with the exception that the later also > creates SCU specific devices. Move the PCI IDs from the intel_pmc_ipc.c > to intel_scu.c and use driver_data to detect whether SCU devices need to > be created or not. > > Also update Kconfig entry to mention all platforms supported by the > Intel SCU PCI driver. One comment below. After addressing, Reviewed-by: Andy Shevchenko > > Signed-off-by: Mika Westerberg > --- > drivers/platform/x86/Kconfig | 13 +++-- > drivers/platform/x86/intel_pmc_ipc.c | 73 +------------------------ > drivers/platform/x86/intel_scu_pcidrv.c | 21 +++++-- > 3 files changed, 27 insertions(+), 80 deletions(-) > > diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig > index 797683c5d005..1c5afb9e4965 100644 > --- a/drivers/platform/x86/Kconfig > +++ b/drivers/platform/x86/Kconfig > @@ -994,13 +994,18 @@ config INTEL_SCU > > config INTEL_SCU_PCI > bool "Intel SCU PCI driver" > - depends on X86_INTEL_MID > + depends on X86_INTEL_MID || PCI Dependency on PCI is much more generic than Intel MID one. I think we may drop X86_INTEL_MID here completely -- less users of it better. > select INTEL_SCU > help > SCU is used to bridge the communications between kernel and > SCU on some embedded Intel x86 platforms. It also creates > - devices that are connected to the SoC through the SCU. This is > - not needed for PC-type machines. > + devices that are connected to the SoC through the SCU. > + Platforms supported: > + Medfield > + Clovertrail > + Merrifield > + Broxton > + Apollo Lake > > config INTEL_SCU_IPC_UTIL > tristate "Intel SCU IPC utility driver" > @@ -1192,7 +1197,7 @@ config INTEL_SMARTCONNECT > > config INTEL_PMC_IPC > tristate "Intel PMC IPC Driver" > - depends on ACPI && PCI > + depends on ACPI > select INTEL_SCU_IPC > ---help--- > This driver provides support for PMC control on some Intel platforms. > diff --git a/drivers/platform/x86/intel_pmc_ipc.c b/drivers/platform/x86/intel_pmc_ipc.c > index 241bce603183..acec1c6d2069 100644 > --- a/drivers/platform/x86/intel_pmc_ipc.c > +++ b/drivers/platform/x86/intel_pmc_ipc.c > @@ -17,7 +17,6 @@ > #include > #include > #include > -#include > #include > > #include > @@ -194,62 +193,6 @@ static int update_no_reboot_bit(void *priv, bool set) > PMC_CFG_NO_REBOOT_MASK, value); > } > > -static int ipc_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) > -{ > - struct intel_pmc_ipc_dev *pmc = &ipcdev; > - struct intel_scu_ipc_pdata pdata; > - struct intel_scu_ipc_dev *scu; > - int ret; > - > - /* Only one PMC is supported */ > - if (pmc->dev) > - return -EBUSY; > - > - memset(&pdata, 0, sizeof(pdata)); > - spin_lock_init(&ipcdev.gcr_lock); > - > - ret = pcim_enable_device(pdev); > - if (ret) > - return ret; > - > - ret = pcim_iomap_regions(pdev, 1 << 0, pci_name(pdev)); > - if (ret) > - return ret; > - > - pdata.ipc_regs = pcim_iomap_table(pdev)[0]; > - > - scu = intel_scu_ipc_probe(&pdev->dev, &pdata); > - if (IS_ERR(scu)) > - return PTR_ERR(scu); > - > - pmc->dev = &pdev->dev; > - > - pci_set_drvdata(pdev, scu); > - > - return 0; > -} > - > -static void ipc_pci_remove(struct pci_dev *pdev) > -{ > - intel_scu_ipc_remove(pci_get_drvdata(pdev)); > - ipcdev.dev = NULL; > -} > - > -static const struct pci_device_id ipc_pci_ids[] = { > - {PCI_VDEVICE(INTEL, 0x0a94), 0}, > - {PCI_VDEVICE(INTEL, 0x1a94), 0}, > - {PCI_VDEVICE(INTEL, 0x5a94), 0}, > - { 0,} > -}; > -MODULE_DEVICE_TABLE(pci, ipc_pci_ids); > - > -static struct pci_driver ipc_pci_driver = { > - .name = "intel_pmc_ipc", > - .id_table = ipc_pci_ids, > - .probe = ipc_pci_probe, > - .remove = ipc_pci_remove, > -}; > - > static ssize_t intel_pmc_ipc_simple_cmd_store(struct device *dev, > struct device_attribute *attr, > const char *buf, size_t count) > @@ -697,25 +640,11 @@ static struct platform_driver ipc_plat_driver = { > > static int __init intel_pmc_ipc_init(void) > { > - int ret; > - > - ret = platform_driver_register(&ipc_plat_driver); > - if (ret) { > - pr_err("Failed to register PMC ipc platform driver\n"); > - return ret; > - } > - ret = pci_register_driver(&ipc_pci_driver); > - if (ret) { > - pr_err("Failed to register PMC ipc pci driver\n"); > - platform_driver_unregister(&ipc_plat_driver); > - return ret; > - } > - return ret; > + return platform_driver_register(&ipc_plat_driver); > } > > static void __exit intel_pmc_ipc_exit(void) > { > - pci_unregister_driver(&ipc_pci_driver); > platform_driver_unregister(&ipc_plat_driver); > } > > diff --git a/drivers/platform/x86/intel_scu_pcidrv.c b/drivers/platform/x86/intel_scu_pcidrv.c > index 42030bdb3e08..4f2a7ca5c5f7 100644 > --- a/drivers/platform/x86/intel_scu_pcidrv.c > +++ b/drivers/platform/x86/intel_scu_pcidrv.c > @@ -17,6 +17,7 @@ > static int intel_scu_pci_probe(struct pci_dev *pdev, > const struct pci_device_id *id) > { > + void (*setup_fn)(void) = (void (*)(void))id->driver_data; > struct intel_scu_ipc_pdata *pdata; > struct intel_scu_ipc_dev *scu; > int ret; > @@ -40,14 +41,26 @@ static int intel_scu_pci_probe(struct pci_dev *pdev, > if (IS_ERR(scu)) > return PTR_ERR(scu); > > - intel_scu_devices_create(); > + if (setup_fn) > + setup_fn(); > return 0; > } > > +static void intel_mid_scu_setup(void) > +{ > + intel_scu_devices_create(); > +} > + > static const struct pci_device_id pci_ids[] = { > - { PCI_VDEVICE(INTEL, 0x080e) }, > - { PCI_VDEVICE(INTEL, 0x08ea) }, > - { PCI_VDEVICE(INTEL, 0x11a0) }, > + { PCI_VDEVICE(INTEL, 0x080e), > + .driver_data = (kernel_ulong_t)intel_mid_scu_setup }, > + { PCI_VDEVICE(INTEL, 0x08ea), > + .driver_data = (kernel_ulong_t)intel_mid_scu_setup }, > + { PCI_VDEVICE(INTEL, 0x0a94) }, > + { PCI_VDEVICE(INTEL, 0x11a0), > + .driver_data = (kernel_ulong_t)intel_mid_scu_setup }, > + { PCI_VDEVICE(INTEL, 0x1a94) }, > + { PCI_VDEVICE(INTEL, 0x5a94) }, > {} > }; > > -- > 2.24.1 > -- With Best Regards, Andy Shevchenko