Commit b8da68f4 authored by Mika Westerberg's avatar Mika Westerberg Committed by Lee Jones

platform/x86: intel_pmc_ipc: Move PCI IDs to intel_scu_pcidrv.c

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 and change dependency from X86_INTEL_MID to PCI
which is more generic.
Signed-off-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 781adff2
...@@ -1329,7 +1329,7 @@ config INTEL_PMC_CORE ...@@ -1329,7 +1329,7 @@ config INTEL_PMC_CORE
config INTEL_PMC_IPC config INTEL_PMC_IPC
tristate "Intel PMC IPC Driver" tristate "Intel PMC IPC Driver"
depends on ACPI && PCI depends on ACPI
select INTEL_SCU_IPC select INTEL_SCU_IPC
---help--- ---help---
This driver provides support for PMC control on some Intel platforms. This driver provides support for PMC control on some Intel platforms.
...@@ -1351,13 +1351,18 @@ config INTEL_SCU ...@@ -1351,13 +1351,18 @@ config INTEL_SCU
config INTEL_SCU_PCI config INTEL_SCU_PCI
bool "Intel SCU PCI driver" bool "Intel SCU PCI driver"
depends on X86_INTEL_MID depends on PCI
select INTEL_SCU select INTEL_SCU
help help
This driver is used to bridge the communications between kernel This driver is used to bridge the communications between kernel
and SCU on some embedded Intel x86 platforms. It also creates and SCU on some embedded Intel x86 platforms. It also creates
devices that are connected to the SoC through the SCU. This is devices that are connected to the SoC through the SCU.
not needed for PC-type machines. Platforms supported:
Medfield
Clovertrail
Merrifield
Broxton
Apollo Lake
config INTEL_SCU_IPC_UTIL config INTEL_SCU_IPC_UTIL
tristate "Intel SCU IPC utility driver" tristate "Intel SCU IPC utility driver"
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/io-64-nonatomic-lo-hi.h> #include <linux/io-64-nonatomic-lo-hi.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/pci.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <asm/intel_pmc_ipc.h> #include <asm/intel_pmc_ipc.h>
...@@ -194,50 +193,6 @@ static int update_no_reboot_bit(void *priv, bool set) ...@@ -194,50 +193,6 @@ static int update_no_reboot_bit(void *priv, bool set)
PMC_CFG_NO_REBOOT_MASK, value); 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_data scu_data = {};
struct intel_scu_ipc_dev *scu;
int ret;
/* Only one PMC is supported */
if (pmc->dev)
return -EBUSY;
spin_lock_init(&ipcdev.gcr_lock);
ret = pcim_enable_device(pdev);
if (ret)
return ret;
scu_data.mem = pdev->resource[0];
scu = devm_intel_scu_ipc_register(&pdev->dev, &scu_data);
if (IS_ERR(scu))
return PTR_ERR(scu);
pmc->dev = &pdev->dev;
pci_set_drvdata(pdev, pmc);
return 0;
}
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,
};
static ssize_t intel_pmc_ipc_simple_cmd_store(struct device *dev, static ssize_t intel_pmc_ipc_simple_cmd_store(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
...@@ -673,25 +628,11 @@ static struct platform_driver ipc_plat_driver = { ...@@ -673,25 +628,11 @@ static struct platform_driver ipc_plat_driver = {
static int __init intel_pmc_ipc_init(void) static int __init intel_pmc_ipc_init(void)
{ {
int ret; return platform_driver_register(&ipc_plat_driver);
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;
} }
static void __exit intel_pmc_ipc_exit(void) static void __exit intel_pmc_ipc_exit(void)
{ {
pci_unregister_driver(&ipc_pci_driver);
platform_driver_unregister(&ipc_plat_driver); platform_driver_unregister(&ipc_plat_driver);
} }
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
static int intel_scu_pci_probe(struct pci_dev *pdev, static int intel_scu_pci_probe(struct pci_dev *pdev,
const struct pci_device_id *id) const struct pci_device_id *id)
{ {
void (*setup_fn)(void) = (void (*)(void))id->driver_data;
struct intel_scu_ipc_data scu_data = {}; struct intel_scu_ipc_data scu_data = {};
struct intel_scu_ipc_dev *scu; struct intel_scu_ipc_dev *scu;
int ret; int ret;
...@@ -32,14 +33,26 @@ static int intel_scu_pci_probe(struct pci_dev *pdev, ...@@ -32,14 +33,26 @@ static int intel_scu_pci_probe(struct pci_dev *pdev,
if (IS_ERR(scu)) if (IS_ERR(scu))
return PTR_ERR(scu); return PTR_ERR(scu);
intel_scu_devices_create(); if (setup_fn)
setup_fn();
return 0; return 0;
} }
static void intel_mid_scu_setup(void)
{
intel_scu_devices_create();
}
static const struct pci_device_id pci_ids[] = { static const struct pci_device_id pci_ids[] = {
{ PCI_VDEVICE(INTEL, 0x080e) }, { PCI_VDEVICE(INTEL, 0x080e),
{ PCI_VDEVICE(INTEL, 0x08ea) }, .driver_data = (kernel_ulong_t)intel_mid_scu_setup },
{ PCI_VDEVICE(INTEL, 0x11a0) }, { 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) },
{} {}
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment