platform/x86: Rework intel_scu_ipc and intel_pmc_ipc drivers
Subsystems (12)
Mika Westerberg
maintainerv9 cover platform/x86: Rework intel_scu_ipc and intel_pmc_ipc drivers
Hi all,
Currently both intel_scu_ipc.c and intel_pmc_ipc.c implement the same SCU IPC communications with minor differences. This duplication does not make much sense so this series reworks the two drivers so that there is only a single implementation of the SCU IPC. In addition to that the API will be updated to take SCU instance pointer as an argument, and most of the callers will be converted to this new API. The old API is left there but the plan is to get rid the callers and then the old API as well.
The intel_pmc_ipc.c is then moved under MFD which suits better for this kind of a driver that pretty much sets up the SCU IPC and then creates a bunch of platform devices for the things sitting behind the PMC. The driver is renamed to intel_pmc_bxt.c which should follow the existing conventions under drivers/mfd (and it is only meant for Intel Broxton derivatives).
Changes from v8:
* Rebased on top of v5.7-rc1.
* Added Lee's Acked-for-MFD-by to patch 1.
* There is a new patch (14/20) from Heikki to convert the newly introduced Intel PMC Mux driver over to this new SCU IPC API.
* Call PMC API directly from iTCO_wdt and drop the ->update_no_reboot_bit
callback and the ->no_reboot_priv from the iTCO_wdt platform data
* Fill the MFD cells directly, do not take copies.
Changes from v7:
* Added Lee's Acked-for-MFD-by to patches 10, 11 and 12.
* In patch 18 use same four-digit value for SMI_EN_OFFSET and TCO_BASE_OFFSET to be consistent with others.
* Drop comma after PMC_DEVICE_MAX in patch 18.
Changes from v6:
* Added Reviewed-by tag from Andy
* Expanded PMC, IPC and IA acronyms
* Drop TCO_DEVICE_NAME, PUNIT_DEVICE_NAME and TELEMETRY_DEVICE_NAME
* Move struct intel_pmc_dev into include/linux/mfd/intel_pmc_bxt.h
* Add PMC_DEVICE_MAX to the enum and use it
* Add kernel-docs for simplecmd_store() and northpeak_store()
* Use if (ret) return ret; over the ternary operator
* Drop "This is index X" from comments
* Use acpi_has_watchdog() to determine whether iTCO_wdt is added or not.
* Rename intel_scu_ipc_pdata -> intel_scu_ipc_data to make it less confusing wrt. platform data for platform drivers.
Previous versions can be found:
v8: https://www.spinics.net/lists/platform-driver-x86/msg21062.html
v7: https://www.spinics.net/lists/platform-driver-x86/msg21020.html
v6: https://www.spinics.net/lists/platform-driver-x86/msg20896.html
v5: https://www.spinics.net/lists/platform-driver-x86/msg20841.html
v4: https://www.spinics.net/lists/platform-driver-x86/msg20658.html
v3: https://www.spinics.net/lists/platform-driver-x86/msg20583.html
v2: https://www.spinics.net/lists/platform-driver-x86/msg20446.html
v1: https://www.spinics.net/lists/platform-driver-x86/msg20359.html
Heikki Krogerus (1):
usb: typec: mux: Convert the Intel PMC Mux driver to use new SCU IPC API
Mika Westerberg (19):
platform/x86: intel_scu_ipc: Split out SCU IPC functionality from the SCU driver platform/x86: intel_scu_ipc: Log more information if SCU IPC command fails platform/x86: intel_scu_ipc: Move legacy SCU IPC API to a separate header platform/x86: intel_scu_ipc: Introduce new SCU IPC API platform/x86: intel_mid_powerbtn: Convert to use new SCU IPC API
watchdog: intel-mid_wdt: Convert to use new SCU IPC API platform/x86: intel_scu_ipcutil: Convert to use new SCU IPC API platform/x86: intel_scu_ipc: Add managed function to register SCU IPC platform/x86: intel_pmc_ipc: Start using SCU IPC
mfd: intel_soc_pmic: Add SCU IPC member to struct intel_soc_pmic
mfd: intel_soc_pmic_bxtwc: Convert to use new SCU IPC API
mfd: intel_soc_pmic_mrfld: Convert to use new SCU IPC API platform/x86: intel_telemetry: Convert to use new SCU IPC API platform/x86: intel_pmc_ipc: Drop intel_pmc_ipc_command() x86/platform/intel-mid: Add empty stubs for intel_scu_devices_[create|destroy]() platform/x86: intel_pmc_ipc: Move PCI IDs to intel_scu_pcidrv.c platform/x86: intel_telemetry: Add telemetry_get_pltdata() platform/x86: intel_pmc_ipc: Convert to MFD
MAINTAINERS: Update entry for Intel Broxton PMC driver
.../ABI/obsolete/sysfs-driver-intel_pmc_bxt | 22 + MAINTAINERS | 23 +- arch/x86/Kconfig | 2 +- arch/x86/include/asm/intel-mid.h | 9 +- arch/x86/include/asm/intel_pmc_ipc.h | 59 -- arch/x86/include/asm/intel_scu_ipc.h | 114 ++- arch/x86/include/asm/intel_scu_ipc_legacy.h | 91 ++ arch/x86/include/asm/intel_telemetry.h | 6 +- drivers/mfd/Kconfig | 20 +- drivers/mfd/Makefile | 1 + drivers/mfd/intel_pmc_bxt.c | 468 +++++++++ drivers/mfd/intel_soc_pmic_bxtwc.c | 34 +- drivers/mfd/intel_soc_pmic_mrfld.c | 10 +- drivers/platform/x86/Kconfig | 46 +- drivers/platform/x86/Makefile | 2 +- drivers/platform/x86/intel_mid_powerbtn.c | 15 +- drivers/platform/x86/intel_pmc_ipc.c | 949 ------------------ drivers/platform/x86/intel_scu_ipc.c | 447 +++++++-- drivers/platform/x86/intel_scu_ipcutil.c | 43 +- drivers/platform/x86/intel_scu_pcidrv.c | 68 ++ drivers/platform/x86/intel_telemetry_core.c | 17 +- .../platform/x86/intel_telemetry_debugfs.c | 15 +- drivers/platform/x86/intel_telemetry_pltdrv.c | 97 +- drivers/usb/typec/mux/Kconfig | 2 +- drivers/usb/typec/mux/intel_pmc_mux.c | 12 +- drivers/usb/typec/tcpm/Kconfig | 2 +- drivers/watchdog/iTCO_wdt.c | 25 +- drivers/watchdog/intel-mid_wdt.c | 53 +- include/linux/mfd/intel_pmc_bxt.h | 53 + include/linux/mfd/intel_soc_pmic.h | 15 + include/linux/platform_data/itco_wdt.h | 11 +- 31 files changed, 1411 insertions(+), 1320 deletions(-) create mode 100644 Documentation/ABI/obsolete/sysfs-driver-intel_pmc_bxt delete mode 100644 arch/x86/include/asm/intel_pmc_ipc.h create mode 100644 arch/x86/include/asm/intel_scu_ipc_legacy.h create mode 100644 drivers/mfd/intel_pmc_bxt.c delete mode 100644 drivers/platform/x86/intel_pmc_ipc.c create mode 100644 drivers/platform/x86/intel_scu_pcidrv.c create mode 100644 include/linux/mfd/intel_pmc_bxt.h
Signature · 1 line
2.25.1
Mika Westerberg
maintainerPATCH v9 1/20 platform/x86: intel_scu_ipc: Split out SCU IPC functionality from the SCU driver
The SCU IPC functionality is usable outside of Intel MID devices. For example modern Intel CPUs include the same thing but now it is called PMC (Power Management Controller) instead of SCU. To make the IPC available for those split the driver into core part (intel_scu_ipc.c) and the SCU PCI driver part (intel_scu_pcidrv.c) which then calls the former before it goes and creates rest of the SCU devices. The SCU IPC will also register a new class that gets assigned to the device that is created under the parent PCI device.
We also split the Kconfig symbols so that INTEL_SCU_IPC enables the SCU IPC library and INTEL_SCU_PCI the SCU driver and convert the users accordingly. While there remove default y from the INTEL_SCU_PCI symbol as it is already selected by X86_INTEL_MID.
--- arch/x86/Kconfig | 2 +- arch/x86/include/asm/intel_scu_ipc.h | 18 +++ drivers/mfd/Kconfig | 4 +- drivers/platform/x86/Kconfig | 24 ++-- drivers/platform/x86/Makefile | 1 + drivers/platform/x86/intel_scu_ipc.c | 172 ++++++++++++++++-------- drivers/platform/x86/intel_scu_pcidrv.c | 55 ++++++++ 7 files changed, 208 insertions(+), 68 deletions(-) create mode 100644 drivers/platform/x86/intel_scu_pcidrv.c
arch/x86/Kconfig +1 -1
@@ -595,7 +595,7 @@ config X86_INTEL_MID select I2C select DW_APB_TIMER select APB_TIMER - select INTEL_SCU_IPC + select INTEL_SCU_PCI select MFD_INTEL_MSIC ---help--- Select to build a kernel capable of supporting Intel MID (Mobile
arch/x86/include/asm/intel_scu_ipc.h +18 -0
@@ -2,6 +2,7 @@#ifndef _ASM_X86_INTEL_SCU_IPC_H_#define _ASM_X86_INTEL_SCU_IPC_H_ +#include <linux/ioport.h> #include <linux/notifier.h> #define IPCMSG_INDIRECT_READ 0x02
@@ -19,6 +20,23 @@#define IPC_CMD_VRTC_SETTIME 1/* Set time */ #define IPC_CMD_VRTC_SETALARM 2/* Set alarm */ +struct device ; +struct intel_scu_ipc_dev ; + +/** +* struct intel_scu_ipc_data - Data used to configure SCU IPC +* @mem: Base address of SCU IPC MMIO registers +* @irq: The IRQ number used for SCU (optional) +*/ +struct intel_scu_ipc_data { +struct resource mem; +int irq; +}; + +struct intel_scu_ipc_dev * +intel_scu_ipc_register (struct device *parent, +const struct intel_scu_ipc_data *scu_data); +/* Read single register */ int intel_scu_ipc_ioread8 (u16 addr,u8 *data);
drivers/mfd/Kconfig +2 -2
@@ -593,7 +593,7 @@ config INTEL_SOC_PMIC_MRFLD tristate "Support for Intel Merrifield Basin Cove PMIC" depends on GPIOLIB depends on ACPI - depends on INTEL_SCU_IPC + depends on INTEL_SCU select MFD_CORE select REGMAP_IRQ help
@@ -625,7 +625,7 @@ config MFD_INTEL_LPSS_PCI config MFD_INTEL_MSIC bool "Intel MSIC" - depends on INTEL_SCU_IPC + depends on INTEL_SCU select MFD_CORE help Select this option to enable access to Intel MSIC (Avatele
drivers/platform/x86/Kconfig +16 -8
@@ -1295,7 +1295,7 @@ config INTEL_MFLD_THERMAL config INTEL_MID_POWER_BUTTON tristate "power button driver for Intel MID platforms" - depends on INTEL_SCU_IPC && INPUT + depends on INTEL_SCU && INPUT help This driver handles the power button on the Intel MID platforms.
@@ -1342,17 +1342,25 @@ config INTEL_PUNIT_IPC which is used to bridge the communications between kernel and P-Unit. config INTEL_SCU_IPC - bool "Intel SCU IPC Support" + bool + +config INTEL_SCU + bool + select INTEL_SCU_IPC + +config INTEL_SCU_PCI + bool "Intel SCU PCI driver" depends on X86_INTEL_MID - default y - ---help--- - IPC is used to bridge the communications between kernel and SCU on - some embedded Intel x86 platforms. This is not needed for PC-type - machines. + select INTEL_SCU + help + This driver 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. config INTEL_SCU_IPC_UTIL tristate "Intel SCU IPC utility driver" - depends on INTEL_SCU_IPC + depends on INTEL_SCU ---help--- The IPC Util driver provides an interface with the SCU enabling low level access for debug work and updating the firmware. Say
drivers/platform/x86/Makefile +1 -0
@@ -141,6 +141,7 @@ obj-$(CONFIG_INTEL_PMC_CORE) += intel_pmc_core.o intel_pmc_core_pltdrv.o obj-$(CONFIG_INTEL_PMC_IPC) += intel_pmc_ipc.o obj-$(CONFIG_INTEL_PUNIT_IPC) += intel_punit_ipc.o obj-$(CONFIG_INTEL_SCU_IPC) += intel_scu_ipc.o +obj-$(CONFIG_INTEL_SCU_PCI) += intel_scu_pcidrv.o obj-$(CONFIG_INTEL_SCU_IPC_UTIL) += intel_scu_ipcutil.o obj-$(CONFIG_INTEL_TELEMETRY) += intel_telemetry_core.o \ intel_telemetry_pltdrv.o \
drivers/platform/x86/intel_scu_ipc.c +115 -57
275 lines not on this page · raw message
drivers/platform/x86/intel_scu_pcidrv.c new file +55 -0
55 lines not on this page · raw message
Signature · 1 line
2.25.1
Mika Westerberg
maintainerPATCH v9 2/20 platform/x86: intel_scu_ipc: Log more information if SCU IPC command fails
In reply to Mika WesterbergCurrently we only log an error if the command times out which makes it hard to figure out the failing command. This changes the driver to log command and subcommand with the error code which should make debugging easier. This also allows us to simplify the callers as they don't need to log these errors themselves.
--- drivers/platform/x86/intel_scu_ipc.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
drivers/platform/x86/intel_scu_ipc.c +11 -6
@@ -147,7 +147,6 @@ static inline int busy_loop(struct intel_scu_ipc_dev *scu)usleep_range (50 ,100 ); }while (time_before (jiffies, end)); -dev_err (&scu->dev,"IPC timed out" );return -ETIMEDOUT ; }
@@ -156,10 +155,8 @@ static inline int ipc_wait_for_interrupt(struct intel_scu_ipc_dev *scu) {int status; -if (!wait_for_completion_timeout (&scu->cmd_complete,IPC_TIMEOUT )) { -dev_err (&scu->dev,"IPC timed out\n" ); +if (!wait_for_completion_timeout (&scu->cmd_complete,IPC_TIMEOUT ))return -ETIMEDOUT ; - } status =ipc_read_status (scu);if (status &IPC_STATUS_ERR )
@@ -331,6 +328,7 @@ EXPORT_SYMBOL(intel_scu_ipc_update_register);int intel_scu_ipc_simple_command (int cmd,int sub) {struct intel_scu_ipc_dev *scu; +u32 cmdval;int err;mutex_lock (&ipclock);
@@ -339,9 +337,12 @@ int intel_scu_ipc_simple_command(int cmd, int sub)return -ENODEV ; } scu = ipcdev; -ipc_command (scu, sub <<12 | cmd); + cmdval = sub <<12 | cmd; +ipc_command (scu, cmdval); err =intel_scu_ipc_check_status (scu);mutex_unlock (&ipclock); +if (err) +dev_err (&scu->dev,"IPC command %#x failed with %d\n" , cmdval, err);return err; }EXPORT_SYMBOL (intel_scu_ipc_simple_command);
@@ -362,6 +363,7 @@ int intel_scu_ipc_command(int cmd, int sub, u32 *in, int inlen, u32 *out, int outlen) {struct intel_scu_ipc_dev *scu; +u32 cmdval;int i, err;mutex_lock (&ipclock);
@@ -374,7 +376,8 @@ int intel_scu_ipc_command(int cmd, int sub, u32 *in, int inlen,for (i =0 ; i < inlen; i++)ipc_data_writel (scu, *in++,4 * i); -ipc_command (scu, (inlen <<16 ) | (sub <<12 ) | cmd); + cmdval = (inlen <<16 ) | (sub <<12 ) | cmd; +ipc_command (scu, cmdval); err =intel_scu_ipc_check_status (scu);if (!err) {
@@ -383,6 +386,8 @@ int intel_scu_ipc_command(int cmd, int sub, u32 *in, int inlen, }mutex_unlock (&ipclock); +if (err) +dev_err (&scu->dev,"IPC command %#x failed with %d\n" , cmdval, err);return err; }EXPORT_SYMBOL (intel_scu_ipc_command);
Signature · 1 line
2.25.1
Mika Westerberg
maintainerPATCH v9 3/20 platform/x86: intel_scu_ipc: Move legacy SCU IPC API to a separate header
In reply to Mika WesterbergIn preparation for introducing a new API for SCU IPC, move the legacy API and constants to a separate header that is is subject to be removed eventually.
--- arch/x86/include/asm/intel_scu_ipc.h | 56 +------------------ arch/x86/include/asm/intel_scu_ipc_legacy.h | 62 +++++++++++++++++++++ 2 files changed, 63 insertions(+), 55 deletions(-) create mode 100644 arch/x86/include/asm/intel_scu_ipc_legacy.h
arch/x86/include/asm/intel_scu_ipc.h +1 -55
@@ -3,22 +3,6 @@#define _ASM_X86_INTEL_SCU_IPC_H_#include <linux/ioport.h> -#include <linux/notifier.h> - -#define IPCMSG_INDIRECT_READ 0x02 -#define IPCMSG_INDIRECT_WRITE 0x05 - -#define IPCMSG_COLD_OFF 0x80/* Only for Tangier */ - -#define IPCMSG_WARM_RESET 0xF0 -#define IPCMSG_COLD_RESET 0xF1 -#define IPCMSG_SOFT_RESET 0xF2 -#define IPCMSG_COLD_BOOT 0xF3 - -#define IPCMSG_VRTC 0xFA/* Set vRTC device */ -/* Command id associated with message IPCMSG_VRTC */ -#define IPC_CMD_VRTC_SETTIME 1/* Set time */ -#define IPC_CMD_VRTC_SETALARM 2/* Set alarm */ struct device ;struct intel_scu_ipc_dev ;
@@ -37,44 +21,6 @@ struct intel_scu_ipc_dev * intel_scu_ipc_register(struct device *parent, const struct intel_scu_ipc_data *scu_data); -/* Read single register */ -int intel_scu_ipc_ioread8 (u16 addr,u8 *data); - -/* Read a vector */ -int intel_scu_ipc_readv (u16 *addr,u8 *data,int len); - -/* Write single register */ -int intel_scu_ipc_iowrite8 (u16 addr,u8 data); - -/* Write a vector */ -int intel_scu_ipc_writev (u16 *addr,u8 *data,int len); - -/* Update single register based on the mask */ -int intel_scu_ipc_update_register (u16 addr,u8 data,u8 mask); - -/* Issue commands to the SCU with or without data */ -int intel_scu_ipc_simple_command (int cmd,int sub); -int intel_scu_ipc_command (int cmd,int sub,u32 *in,int inlen, -u32 *out,int outlen); - -extern struct blocking_notifier_head intel_scu_notifier; - -static inline void intel_scu_notifier_add (struct notifier_block *nb) -{ -blocking_notifier_chain_register (&intel_scu_notifier, nb); -} - -static inline void intel_scu_notifier_remove (struct notifier_block *nb) -{ -blocking_notifier_chain_unregister (&intel_scu_notifier, nb); -} - -static inline int intel_scu_notifier_post (unsigned long v,void *p) -{ -return blocking_notifier_call_chain (&intel_scu_notifier, v, p); -} - -#define SCU_AVAILABLE 1 -#define SCU_DOWN 2 +#include <asm/intel_scu_ipc_legacy.h> #endif
arch/x86/include/asm/intel_scu_ipc_legacy.h new file +62 -0
62 lines not on this page · raw message
Signature · 1 line
2.25.1
Mika Westerberg
maintainerPATCH v9 4/20 platform/x86: intel_scu_ipc: Introduce new SCU IPC API
In reply to Mika WesterbergThe current SCU IPC API has been operating on a single instance and there has been no way to pin the providing module in place when the SCU IPC is in use.
This implements a new API that takes the SCU IPC instance as first parameter (NULL means the single instance is being used). The SCU IPC instance can be retrieved by calling new function intel_scu_ipc_dev_get() that take care of pinning the providing module in place as long as intel_scu_ipc_dev_put() is not called.
The old API is updated to call the new API and is is left there in the legacy API header to support the existing users that cannot be converted easily.
Subsequent patches will convert most of the users over to the new API.
--- arch/x86/include/asm/intel_scu_ipc.h | 38 +++- arch/x86/include/asm/intel_scu_ipc_legacy.h | 45 +++- drivers/platform/x86/intel_scu_ipc.c | 230 +++++++++++++++----- 3 files changed, 252 insertions(+), 61 deletions(-)
arch/x86/include/asm/intel_scu_ipc.h +36 -2
@@ -18,8 +18,42 @@ struct intel_scu_ipc_data { };struct intel_scu_ipc_dev * -intel_scu_ipc_register (struct device *parent, -const struct intel_scu_ipc_data *scu_data); +__intel_scu_ipc_register (struct device *parent, +const struct intel_scu_ipc_data *scu_data, +struct module *owner); + +#define intel_scu_ipc_register (parent, scu_data) \ + __intel_scu_ipc_register(parent, scu_data, THIS_MODULE) + +struct intel_scu_ipc_dev *intel_scu_ipc_dev_get (void ); +void intel_scu_ipc_dev_put (struct intel_scu_ipc_dev *scu); +struct intel_scu_ipc_dev *devm_intel_scu_ipc_dev_get (struct device *dev); + +int intel_scu_ipc_dev_ioread8 (struct intel_scu_ipc_dev *scu,u16 addr, +u8 *data); +int intel_scu_ipc_dev_iowrite8 (struct intel_scu_ipc_dev *scu,u16 addr, +u8 data); +int intel_scu_ipc_dev_readv (struct intel_scu_ipc_dev *scu,u16 *addr, +u8 *data,size_t len); +int intel_scu_ipc_dev_writev (struct intel_scu_ipc_dev *scu,u16 *addr, +u8 *data,size_t len); + +int intel_scu_ipc_dev_update (struct intel_scu_ipc_dev *scu,u16 addr, +u8 data,u8 mask); + +int intel_scu_ipc_dev_simple_command (struct intel_scu_ipc_dev *scu,int cmd, +int sub); +int intel_scu_ipc_dev_command_with_size (struct intel_scu_ipc_dev *scu,int cmd, +int sub,const void *in,size_t inlen, +size_t size,void *out,size_t outlen); + +static inline int intel_scu_ipc_dev_command (struct intel_scu_ipc_dev *scu,int cmd, +int sub,const void *in,size_t inlen, +void *out,size_t outlen) +{ +return intel_scu_ipc_dev_command_with_size (scu, cmd, sub, in, inlen, + inlen, out, outlen); +}#include <asm/intel_scu_ipc_legacy.h>
arch/x86/include/asm/intel_scu_ipc_legacy.h +37 -8
62 lines not on this page · raw message
drivers/platform/x86/intel_scu_ipc.c +179 -51
386 lines not on this page · raw message
Signature · 1 line
2.25.1
Mika Westerberg
maintainerPATCH v9 5/20 platform/x86: intel_mid_powerbtn: Convert to use new SCU IPC API
In reply to Mika WesterbergThis converts the power button driver to use the new SCU IPC API where the SCU IPC instance is passed to the functions.
--- drivers/platform/x86/intel_mid_powerbtn.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
drivers/platform/x86/intel_mid_powerbtn.c +11 -4
@@ -46,6 +46,7 @@ struct mid_pb_ddata {unsigned short mirqlvl1_addr;unsigned short pbstat_addr;u8 pbstat_mask; +struct intel_scu_ipc_dev *scu;int (*setup)(struct mid_pb_ddata *ddata); };
@@ -55,7 +56,8 @@ static int mid_pbstat(struct mid_pb_ddata *ddata, int *value)int ret;u8 pbstat; - ret =intel_scu_ipc_ioread8 (ddata->pbstat_addr, &pbstat); + ret =intel_scu_ipc_dev_ioread8 (ddata->scu, ddata->pbstat_addr, + &pbstat);if (ret)return ret;
@@ -67,14 +69,15 @@ static int mid_pbstat(struct mid_pb_ddata *ddata, int *value)static int mid_irq_ack (struct mid_pb_ddata *ddata) { -return intel_scu_ipc_update_register (ddata->mirqlvl1_addr,0 ,MSIC_PWRBTNM ); +return intel_scu_ipc_dev_update (ddata->scu, ddata->mirqlvl1_addr,0 , +MSIC_PWRBTNM ); }static int mrfld_setup (struct mid_pb_ddata *ddata) {/* Unmask the PBIRQ and MPBIRQ on Tangier */ -intel_scu_ipc_update_register (BCOVE_PBIRQ ,0 ,MSIC_PWRBTNM ); -intel_scu_ipc_update_register (BCOVE_PBIRQMASK ,0 ,MSIC_PWRBTNM ); +intel_scu_ipc_dev_update (ddata->scu,BCOVE_PBIRQ ,0 ,MSIC_PWRBTNM ); +intel_scu_ipc_dev_update (ddata->scu,BCOVE_PBIRQMASK ,0 ,MSIC_PWRBTNM );return 0 ; }
@@ -161,6 +164,10 @@ static int mid_pb_probe(struct platform_device *pdev)return error; } + ddata->scu =devm_intel_scu_ipc_dev_get (&pdev->dev); +if (!ddata->scu) +return -EPROBE_DEFER ; + error =devm_request_threaded_irq (&pdev->dev, irq,NULL , mid_pb_isr,IRQF_ONESHOT ,DRIVER_NAME , ddata);if (error) {
Signature · 1 line
2.25.1
Mika Westerberg
maintainerPATCH v9 6/20 watchdog: intel-mid_wdt: Convert to use new SCU IPC API
In reply to Mika WesterbergThis converts the Intel MID watchdog driver over the new SCU IPC API where the SCU IPC instance is passed to the functions.
--- drivers/watchdog/intel-mid_wdt.c | 53 ++++++++++++++++++++++---------- 1 file changed, 37 insertions(+), 16 deletions(-)
drivers/watchdog/intel-mid_wdt.c +37 -16
@@ -33,14 +33,24 @@ enum { SCU_WATCHDOG_KEEPALIVE, }; -static inline int wdt_command (int sub,u32 *in,int inlen) +struct mid_wdt { +struct watchdog_device wd; +struct device *dev; +struct intel_scu_ipc_dev *scu; +}; + +static inline int +wdt_command (struct mid_wdt *mid,int sub,const void *in,size_t inlen,size_t size) { -return intel_scu_ipc_command (IPC_WATCHDOG , sub, in, inlen,NULL ,0 ); +struct intel_scu_ipc_dev *scu = mid->scu; + +return intel_scu_ipc_dev_command_with_size (scu,IPC_WATCHDOG , sub, in, + inlen, size,NULL ,0 ); }static int wdt_start (struct watchdog_device *wd) { -struct device *dev =watchdog_get_drvdata (wd); +struct mid_wdt *mid =watchdog_get_drvdata (wd);int ret, in_size;int timeout = wd->timeout; struct ipc_wd_start {
@@ -49,38 +59,41 @@ static int wdt_start(struct watchdog_device *wd) } ipc_wd_start = { timeout - MID_WDT_PRETIMEOUT, timeout };/* -* SCU expects the input size for watchdog IPC to -* be based on 4 bytes +* SCU expects the input size for watchdog IPC to be 2 which is the +* size of the structure in dwords. SCU IPC normally takes bytes +* but this is a special case where we specify size to be different +* than inlen. */ in_size =DIV_ROUND_UP (sizeof (ipc_wd_start),4 ); - ret =wdt_command (SCU_WATCHDOG_START , (u32 *)&ipc_wd_start, in_size); + ret =wdt_command (mid,SCU_WATCHDOG_START , &ipc_wd_start, +sizeof (ipc_wd_start), in_size);if (ret) -dev_crit (dev,"error starting watchdog: %d\n" , ret); +dev_crit (mid->dev,"error starting watchdog: %d\n" , ret);return ret; }static int wdt_ping (struct watchdog_device *wd) { -struct device *dev =watchdog_get_drvdata (wd); +struct mid_wdt *mid =watchdog_get_drvdata (wd);int ret; - ret =wdt_command (SCU_WATCHDOG_KEEPALIVE ,NULL ,0 ); + ret =wdt_command (mid,SCU_WATCHDOG_KEEPALIVE ,NULL ,0 ,0 );if (ret) -dev_crit (dev,"Error executing keepalive: %d\n" , ret); +dev_crit (mid->dev,"Error executing keepalive: %d\n" , ret);return ret; }static int wdt_stop (struct watchdog_device *wd) { -struct device *dev =watchdog_get_drvdata (wd); +struct mid_wdt *mid =watchdog_get_drvdata (wd);int ret; - ret =wdt_command (SCU_WATCHDOG_STOP ,NULL ,0 ); + ret =wdt_command (mid,SCU_WATCHDOG_STOP ,NULL ,0 ,0 );if (ret) -dev_crit (dev,"Error stopping watchdog: %d\n" , ret); +dev_crit (mid->dev,"Error stopping watchdog: %d\n" , ret);return ret; }
@@ -110,6 +123,7 @@ static int mid_wdt_probe(struct platform_device *pdev)struct device *dev = &pdev->dev;struct watchdog_device *wdt_dev;struct intel_mid_wdt_pdata *pdata = dev->platform_data; +struct mid_wdt *mid;int ret;if (!pdata) {
@@ -123,10 +137,13 @@ static int mid_wdt_probe(struct platform_device *pdev)return ret; } - wdt_dev =devm_kzalloc (dev,sizeof (*wdt_dev),GFP_KERNEL ); -if (!wdt_dev) + mid =devm_kzalloc (dev,sizeof (*mid),GFP_KERNEL ); +if (!mid)return -ENOMEM ; + mid->dev = dev; + wdt_dev = &mid->wd; + wdt_dev->info = &mid_wdt_info; wdt_dev->ops = &mid_wdt_ops; wdt_dev->min_timeout =MID_WDT_TIMEOUT_MIN ;
@@ -135,7 +152,7 @@ static int mid_wdt_probe(struct platform_device *pdev) wdt_dev->parent = dev;watchdog_set_nowayout (wdt_dev,WATCHDOG_NOWAYOUT ); -watchdog_set_drvdata (wdt_dev, dev); +watchdog_set_drvdata (wdt_dev, mid); ret = devm_request_irq(dev, pdata->irq, mid_wdt_irq, IRQF_SHARED | IRQF_NO_SUSPEND, "watchdog",
@@ -145,6 +162,10 @@ static int mid_wdt_probe(struct platform_device *pdev)return ret; } + mid->scu =devm_intel_scu_ipc_dev_get (dev); +if (!mid->scu) +return -EPROBE_DEFER ; +/* * The firmware followed by U-Boot leaves the watchdog running * with the default threshold which may vary. When we get here
Signature · 1 line
2.25.1
Mika Westerberg
maintainerPATCH v9 7/20 platform/x86: intel_scu_ipcutil: Convert to use new SCU IPC API
In reply to Mika WesterbergConvert the IPC util to use the new SCU IPC API where the SCU IPC instance is passed to the functions.
--- drivers/platform/x86/intel_scu_ipcutil.c | 43 +++++++++++++++++++++--- 1 file changed, 39 insertions(+), 4 deletions(-)
drivers/platform/x86/intel_scu_ipcutil.c +39 -4
@@ -22,6 +22,9 @@static int major; +struct intel_scu_ipc_dev *scu; +static DEFINE_MUTEX (scu_lock); +/* IOCTL commands */ #define INTE_SCU_IPC_REGISTER_READ 0#define INTE_SCU_IPC_REGISTER_WRITE 1
@@ -52,12 +55,12 @@ static int scu_reg_access(u32 cmd, struct scu_ipc_data *data)switch (cmd) {case INTE_SCU_IPC_REGISTER_READ : -return intel_scu_ipc_readv (data->addr, data->data, count); +return intel_scu_ipc_dev_readv (scu, data->addr, data->data, count);case INTE_SCU_IPC_REGISTER_WRITE : -return intel_scu_ipc_writev (data->addr, data->data, count); +return intel_scu_ipc_dev_writev (scu, data->addr, data->data, count);case INTE_SCU_IPC_REGISTER_UPDATE : -return intel_scu_ipc_update_register (data->addr[0 ], - data->data[0 ], data->mask); +return intel_scu_ipc_dev_update (scu, data->addr[0 ], data->data[0 ], + data->mask);default :return -ENOTTY ; }
@@ -91,8 +94,40 @@ static long scu_ipc_ioctl(struct file *fp, unsigned int cmd,return 0 ; } +static int scu_ipc_open (struct inode *inode,struct file *file) +{ +int ret =0 ; + +/* Only single open at the time */ +mutex_lock (&scu_lock); +if (scu) { + ret = -EBUSY ; + goto unlock; + } + + scu =intel_scu_ipc_dev_get (); +if (!scu) + ret = -ENODEV ; + +unlock: +mutex_unlock (&scu_lock); +return ret; +} + +static int scu_ipc_release (struct inode *inode,struct file *file) +{ +mutex_lock (&scu_lock); +intel_scu_ipc_dev_put (scu); + scu =NULL ; +mutex_unlock (&scu_lock); + +return 0 ; +} +static const struct file_operations scu_ipc_fops = { .unlocked_ioctl = scu_ipc_ioctl, + .open = scu_ipc_open, + .release = scu_ipc_release, };static int __init ipc_module_init (void )
Signature · 1 line
2.25.1
Mika Westerberg
maintainerPATCH v9 8/20 platform/x86: intel_scu_ipc: Add managed function to register SCU IPC
In reply to Mika WesterbergDrivers such as intel_pmc_ipc.c can be unloaded as well so in order to support those in this driver add a new function that can be called to unregister the SCU IPC when it is not needed anymore.
We also add a managed version of the intel_scu_ipc_register() that takes care of calling intel_scu_ipc_unregister() automatically when the driver is unbound.
--- arch/x86/include/asm/intel_scu_ipc.h | 10 +++++ drivers/platform/x86/intel_scu_ipc.c | 62 ++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+)
arch/x86/include/asm/intel_scu_ipc.h +10 -0
@@ -25,6 +25,16 @@ __intel_scu_ipc_register(struct device *parent,#define intel_scu_ipc_register (parent, scu_data) \ __intel_scu_ipc_register(parent, scu_data, THIS_MODULE) +void intel_scu_ipc_unregister (struct intel_scu_ipc_dev *scu); + +struct intel_scu_ipc_dev * +__devm_intel_scu_ipc_register (struct device *parent, +const struct intel_scu_ipc_data *scu_data, +struct module *owner); + +#define devm_intel_scu_ipc_register (parent, scu_data) \ + __devm_intel_scu_ipc_register(parent, scu_data, THIS_MODULE) +struct intel_scu_ipc_dev *intel_scu_ipc_dev_get (void );void intel_scu_ipc_dev_put (struct intel_scu_ipc_dev *scu);struct intel_scu_ipc_dev *devm_intel_scu_ipc_dev_get (struct device *dev);
drivers/platform/x86/intel_scu_ipc.c +62 -0
68 lines not on this page · raw message
Signature · 1 line
2.25.1
Mika Westerberg
maintainerPATCH v9 9/20 platform/x86: intel_pmc_ipc: Start using SCU IPC
In reply to Mika WesterbergSCU IPC is pretty much the same IPC implemented in the intel_pmc_ipc driver so drop the duplicate implementation and call directly the SCU IPC.
--- drivers/platform/x86/Kconfig | 1 + drivers/platform/x86/intel_pmc_ipc.c | 303 ++++----------------------- 2 files changed, 40 insertions(+), 264 deletions(-)
drivers/platform/x86/Kconfig +1 -0
@@ -1330,6 +1330,7 @@ config INTEL_PMC_CORE config INTEL_PMC_IPC tristate "Intel PMC IPC Driver" depends on ACPI && PCI + select INTEL_SCU_IPC ---help--- This driver provides support for PMC control on some Intel platforms. The PMC is an ARC processor which defines IPC commands for communication
drivers/platform/x86/intel_pmc_ipc.c +39 -264
437 lines not on this page · raw message
Signature · 1 line
2.25.1
Mika Westerberg
maintainerPATCH v9 10/20 mfd: intel_soc_pmic: Add SCU IPC member to struct intel_soc_pmic
In reply to Mika WesterbergBoth PMIC drivers (intel_soc_pmic_mrfld and intel_soc_pmic_bxtwc) will be using this field going forward to access the SCU IPC instance.
While there add kernel-doc for the intel_soc_pmic structure.
--- include/linux/mfd/intel_soc_pmic.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
include/linux/mfd/intel_soc_pmic.h +15 -0
@@ -13,6 +13,20 @@#include <linux/regmap.h> +/** +* struct intel_soc_pmic - Intel SoC PMIC data +* @irq: Master interrupt number of the parent PMIC device +* @regmap: Pointer to the parent PMIC device regmap structure +* @irq_chip_data: IRQ chip data for the PMIC itself +* @irq_chip_data_pwrbtn: Chained IRQ chip data for the Power Button +* @irq_chip_data_tmu: Chained IRQ chip data for the Time Management Unit +* @irq_chip_data_bcu: Chained IRQ chip data for the Burst Control Unit +* @irq_chip_data_adc: Chained IRQ chip data for the General Purpose ADC +* @irq_chip_data_chgr: Chained IRQ chip data for the External Charger +* @irq_chip_data_crit: Chained IRQ chip data for the Critical Event Handler +* @dev: Pointer to the parent PMIC device +* @scu: Pointer to the SCU IPC device data structure +*/ struct intel_soc_pmic {int irq;struct regmap *regmap;
@@ -24,6 +38,7 @@ struct intel_soc_pmic {struct regmap_irq_chip_data *irq_chip_data_chgr;struct regmap_irq_chip_data *irq_chip_data_crit;struct device *dev; +struct intel_scu_ipc_dev *scu; }; int intel_soc_pmic_exec_mipi_pmic_seq_element(u16 i2c_address, u32 reg_address,
Signature · 1 line
2.25.1
Mika Westerberg
maintainerPATCH v9 11/20 mfd: intel_soc_pmic_bxtwc: Convert to use new SCU IPC API
In reply to Mika WesterbergConvert the Intel Broxton Whiskey Cover PMIC driver to use the new SCU IPC API. This allows us to get rid of the PMC IPC implementation which is now covered in SCU IPC driver. We drop the error log if the IPC command fails because intel_scu_ipc_dev_command() does that already.
Also move PMIC specific IPC message constants to the PMIC driver from the intel_pmc_ipc.h header.
--- arch/x86/include/asm/intel_pmc_ipc.h | 3 --- drivers/mfd/intel_soc_pmic_bxtwc.c | 34 ++++++++++++++-------------- 2 files changed, 17 insertions(+), 20 deletions(-)
arch/x86/include/asm/intel_pmc_ipc.h +0 -3
@@ -3,9 +3,6 @@#define _ASM_X86_INTEL_PMC_IPC_H_/* Commands */ -#define PMC_IPC_PMIC_ACCESS 0xFF -#define PMC_IPC_PMIC_ACCESS_READ 0x0 -#define PMC_IPC_PMIC_ACCESS_WRITE 0x1#define PMC_IPC_USB_PWR_CTRL 0xF0#define PMC_IPC_PMIC_BLACKLIST_SEL 0xEF#define PMC_IPC_PHY_CONFIG 0xEE
drivers/mfd/intel_soc_pmic_bxtwc.c +17 -17
@@ -15,7 +15,7 @@#include <linux/mfd/intel_soc_pmic_bxtwc.h> #include <linux/module.h> -#include <asm/intel_pmc_ipc.h> +#include <asm/intel_scu_ipc.h> /* PMIC device registers */ #define REG_ADDR_MASK 0xFF00
@@ -58,6 +58,10 @@/* Whiskey Cove PMIC share same ACPI ID between different platforms */ #define BROXTON_PMIC_WC_HRV 4 +#define PMC_PMIC_ACCESS 0xFF +#define PMC_PMIC_READ 0x0 +#define PMC_PMIC_WRITE 0x1 +enum bxtwc_irqs {BXTWC_PWRBTN_LVL1_IRQ =0 ,BXTWC_TMU_LVL1_IRQ ,
@@ -288,13 +292,12 @@ static int regmap_ipc_byte_reg_read(void *context, unsigned int reg, ipc_in[0 ] = reg; ipc_in[1 ] = i2c_addr; - ret =intel_pmc_ipc_command (PMC_IPC_PMIC_ACCESS , -PMC_IPC_PMIC_ACCESS_READ , - ipc_in,sizeof (ipc_in), (u32 *)ipc_out,1 ); -if (ret) { -dev_err (pmic->dev,"Failed to read from PMIC\n" ); + ret =intel_scu_ipc_dev_command (pmic->scu,PMC_PMIC_ACCESS , +PMC_PMIC_READ , ipc_in,sizeof (ipc_in), + ipc_out,sizeof (ipc_out)); +if (ret)return ret; - } + *val = ipc_out[0 ];return 0 ;
@@ -303,7 +306,6 @@ static int regmap_ipc_byte_reg_read(void *context, unsigned int reg,static int regmap_ipc_byte_reg_write (void *context,unsigned int reg,unsigned int val) { -int ret;int i2c_addr;u8 ipc_in[3 ];struct intel_soc_pmic *pmic = context;
@@ -321,15 +323,9 @@ static int regmap_ipc_byte_reg_write(void *context, unsigned int reg, ipc_in[0 ] = reg; ipc_in[1 ] = i2c_addr; ipc_in[2 ] = val; - ret =intel_pmc_ipc_command (PMC_IPC_PMIC_ACCESS , -PMC_IPC_PMIC_ACCESS_WRITE , - ipc_in,sizeof (ipc_in),NULL ,0 ); -if (ret) { -dev_err (pmic->dev,"Failed to write to PMIC\n" ); -return ret; - } - -return 0 ; +return intel_scu_ipc_dev_command (pmic->scu,PMC_PMIC_ACCESS , +PMC_PMIC_WRITE , ipc_in,sizeof (ipc_in), +NULL ,0 ); }/* sysfs interfaces to r/w PMIC registers, required by initial script */
@@ -457,6 +453,10 @@ static int bxtwc_probe(struct platform_device *pdev)dev_set_drvdata (&pdev->dev, pmic); pmic->dev = &pdev->dev; + pmic->scu =devm_intel_scu_ipc_dev_get (&pdev->dev); +if (!pmic->scu) +return -EPROBE_DEFER ; + pmic->regmap =devm_regmap_init (&pdev->dev,NULL , pmic, &bxtwc_regmap_config);if (IS_ERR (pmic->regmap)) {
Signature · 1 line
2.25.1
Mika Westerberg
maintainerPATCH v9 12/20 mfd: intel_soc_pmic_mrfld: Convert to use new SCU IPC API
In reply to Mika WesterbergThis converts the Intel Merrifield PMIC driver over the new SCU IPC API where the SCU IPC instance is passed to the functions.
--- drivers/mfd/intel_soc_pmic_mrfld.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/mfd/intel_soc_pmic_mrfld.c +8 -2
@@ -74,10 +74,11 @@ static const struct mfd_cell bcove_dev[] = {static int bcove_ipc_byte_reg_read (void *context,unsigned int reg,unsigned int *val) { +struct intel_soc_pmic *pmic = context;u8 ipc_out;int ret; - ret =intel_scu_ipc_ioread8 (reg, &ipc_out); + ret =intel_scu_ipc_dev_ioread8 (pmic->scu, reg, &ipc_out);if (ret)return ret;
@@ -88,10 +89,11 @@ static int bcove_ipc_byte_reg_read(void *context, unsigned int reg,static int bcove_ipc_byte_reg_write (void *context,unsigned int reg,unsigned int val) { +struct intel_soc_pmic *pmic = context;u8 ipc_in = val;int ret; - ret =intel_scu_ipc_iowrite8 (reg, ipc_in); + ret =intel_scu_ipc_dev_iowrite8 (pmic->scu, reg, ipc_in);if (ret)return ret;
@@ -117,6 +119,10 @@ static int bcove_probe(struct platform_device *pdev)if (!pmic)return -ENOMEM ; + pmic->scu =devm_intel_scu_ipc_dev_get (dev); +if (!pmic->scu) +return -ENOMEM ; +platform_set_drvdata (pdev, pmic); pmic->dev = &pdev->dev;
Signature · 1 line
2.25.1
Mika Westerberg
maintainerPATCH v9 13/20 platform/x86: intel_telemetry: Convert to use new SCU IPC API
In reply to Mika WesterbergConvert the Intel Apollo Lake telemetry driver to use the new SCU IPC API. This allows us to get rid of the duplicate PMC IPC implementation which is now covered in SCU IPC driver.
Also move telemetry specific IPC message constant to the telemetry driver where it belongs.
--- arch/x86/include/asm/intel_pmc_ipc.h | 1 - arch/x86/include/asm/intel_telemetry.h | 3 + drivers/platform/x86/intel_telemetry_pltdrv.c | 95 +++++++++---------- 3 files changed, 49 insertions(+), 50 deletions(-)
arch/x86/include/asm/intel_pmc_ipc.h +0 -1
@@ -8,7 +8,6 @@#define PMC_IPC_PHY_CONFIG 0xEE#define PMC_IPC_NORTHPEAK_CTRL 0xED#define PMC_IPC_PM_DEBUG 0xEC -#define PMC_IPC_PMC_TELEMTRY 0xEB#define PMC_IPC_PMC_FW_MSG_CTRL 0xEA/* IPC return code */
arch/x86/include/asm/intel_telemetry.h +3 -0
@@ -10,6 +10,8 @@#define TELEM_MAX_EVENTS_SRAM 28#define TELEM_MAX_OS_ALLOCATED_EVENTS 20 +#include <asm/intel_scu_ipc.h> +enum telemetry_unit {TELEM_PSS =0 ,TELEM_IOSS ,
@@ -51,6 +53,7 @@ struct telemetry_plt_config {struct telemetry_unit_config ioss_config;struct mutex telem_trace_lock;struct mutex telem_lock; +struct intel_scu_ipc_dev *scu;bool telem_in_use; };
drivers/platform/x86/intel_telemetry_pltdrv.c +46 -49
219 lines not on this page · raw message
Signature · 1 line
2.25.1
Mika Westerberg
maintainerPATCH v9 14/20 usb: typec: mux: Convert the Intel PMC Mux driver to use new SCU IPC API
In reply to Mika WesterbergFrom: Heikki Krogerus <[email protected]>
Convert the driver to use the new SCU IPC API. This allows us to get rid of the duplicate PMC IPC implementation which is now covered in SCU IPC driver.
--- drivers/usb/typec/mux/Kconfig | 2 +- drivers/usb/typec/mux/intel_pmc_mux.c | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-)
drivers/usb/typec/mux/Kconfig +1 -1
@@ -11,7 +11,7 @@ config TYPEC_MUX_PI3USB30532 config TYPEC_MUX_INTEL_PMC tristate "Intel PMC mux control" - depends on INTEL_PMC_IPC + depends on INTEL_SCU_IPC select USB_ROLE_SWITCH help Driver for USB muxes controlled by Intel PMC FW. Intel PMC FW can
drivers/usb/typec/mux/intel_pmc_mux.c +8 -4
@@ -15,7 +15,7 @@#include <linux/usb/typec_dp.h> #include <linux/usb/typec_tbt.h> -#include <asm/intel_pmc_ipc.h> +#include <asm/intel_scu_ipc.h> #define PMC_USBC_CMD 0xa7
@@ -96,6 +96,7 @@ struct pmc_usb_port {struct pmc_usb {u8 num_ports;struct device *dev; +struct intel_scu_ipc_dev *ipc;struct pmc_usb_port *port; };
@@ -107,9 +108,8 @@ static int pmc_usb_command(struct pmc_usb_port *port, u8 *msg, u32 len)* Error bit will always be 0 with the USBC command. * Status can be checked from the response message. */ -intel_pmc_ipc_command (PMC_USBC_CMD ,0 , msg, len, - (void *)response,1 ); - +intel_scu_ipc_dev_command (port->pmc->ipc,PMC_USBC_CMD ,0 , msg, len, + response,sizeof (response));if (response[2 ]) {if (response[2 ] &BIT (1 ))return -EIO ;
@@ -370,6 +370,10 @@ static int pmc_usb_probe(struct platform_device *pdev)if (!pmc->port)return -ENOMEM ; + pmc->ipc =devm_intel_scu_ipc_dev_get (&pdev->dev); +if (!pmc->ipc) +return -ENODEV ; + pmc->dev = &pdev->dev;/*
Signature · 1 line
2.25.1
Mika Westerberg
maintainerPATCH v9 15/20 platform/x86: intel_pmc_ipc: Drop intel_pmc_ipc_command()
In reply to Mika WesterbergNow that all callers have been converted over to the SCU IPC API we can drop intel_pmc_ipc_command().
--- arch/x86/include/asm/intel_pmc_ipc.h | 8 -------- drivers/platform/x86/intel_pmc_ipc.c | 20 -------------------- 2 files changed, 28 deletions(-)
arch/x86/include/asm/intel_pmc_ipc.h +0 -8
@@ -27,19 +27,11 @@#if IS_ENABLED (CONFIG_INTEL_PMC_IPC ) -int intel_pmc_ipc_command (u32 cmd,u32 sub,u8 *in,u32 inlen, -u32 *out,u32 outlen);int intel_pmc_s0ix_counter_read (u64 *data);int intel_pmc_gcr_read64 (u32 offset,u64 *data);#else -static inline int intel_pmc_ipc_command (u32 cmd,u32 sub,u8 *in,u32 inlen, -u32 *out,u32 outlen) -{ -return -EINVAL ; -} -static inline int intel_pmc_s0ix_counter_read (u64 *data) {return -EINVAL ;
drivers/platform/x86/intel_pmc_ipc.c +0 -20
@@ -194,26 +194,6 @@ static int update_no_reboot_bit(void *priv, bool set) PMC_CFG_NO_REBOOT_MASK, value); } -/** -* intel_pmc_ipc_command() - IPC command with input/output data -* @cmd: IPC command code. -* @sub: IPC command sub type. -* @in: input data of this IPC command. -* @inlen: input data length in bytes. -* @out: output data of this IPC command. -* @outlen: output data length in dwords. -* -* Send an IPC command to PMC with input/output data. -* -* Return: an IPC error code or 0 on success. -*/ -int intel_pmc_ipc_command (u32 cmd,u32 sub,u8 *in,u32 inlen, -u32 *out,u32 outlen) -{ -return intel_scu_ipc_dev_command (NULL , cmd, sub, in, inlen, out, outlen); -} -EXPORT_SYMBOL_GPL (intel_pmc_ipc_command); -static int ipc_pci_probe (struct pci_dev *pdev,const struct pci_device_id *id) {struct intel_pmc_ipc_dev *pmc = &ipcdev;
Signature · 1 line
2.25.1
Mika Westerberg
maintainerPATCH v9 16/20 x86/platform/intel-mid: Add empty stubs for intel_scu_devices_[create|destroy]()
In reply to Mika WesterbergThis allows to call the functions even when CONFIG_X86_INTEL_MID is not enabled.
--- arch/x86/include/asm/intel-mid.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
arch/x86/include/asm/intel-mid.h +6 -3
@@ -88,11 +88,17 @@ static inline bool intel_mid_has_msic(void)return (intel_mid_identify_cpu () ==INTEL_MID_CPU_CHIP_PENWELL ); } +extern void intel_scu_devices_create (void ); +extern void intel_scu_devices_destroy (void ); +#else /* !CONFIG_X86_INTEL_MID */ #define intel_mid_identify_cpu () 0#define intel_mid_has_msic () 0 +static inline void intel_scu_devices_create (void ) { } +static inline void intel_scu_devices_destroy (void ) { } +#endif /* !CONFIG_X86_INTEL_MID */ enum intel_mid_timer_options {
@@ -115,9 +121,6 @@ extern enum intel_mid_timer_options intel_mid_timer_options;#define SFI_MTMR_MAX_NUM 8#define SFI_MRTC_MAX 8 -extern void intel_scu_devices_create (void ); -extern void intel_scu_devices_destroy (void ); -/* VRTC timer */ #define MRST_VRTC_MAP_SZ 1024/* #define MRST_VRTC_PGOFFSET 0xc00 */
Signature · 1 line
2.25.1
Mika Westerberg
maintainerPATCH v9 17/20 platform/x86: intel_pmc_ipc: Move PCI IDs to intel_scu_pcidrv.c
In reply to Mika WesterbergThe 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.
--- drivers/platform/x86/Kconfig | 13 ++++-- drivers/platform/x86/intel_pmc_ipc.c | 61 +------------------------ drivers/platform/x86/intel_scu_pcidrv.c | 21 +++++++-- 3 files changed, 27 insertions(+), 68 deletions(-)
drivers/platform/x86/Kconfig +9 -4
@@ -1329,7 +1329,7 @@ config INTEL_PMC_CORE 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.
@@ -1351,13 +1351,18 @@ config INTEL_SCU config INTEL_SCU_PCI bool "Intel SCU PCI driver" - depends on X86_INTEL_MID + depends on PCI select INTEL_SCU help This driver 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"
drivers/platform/x86/intel_pmc_ipc.c +1 -60
83 lines not on this page · raw message
drivers/platform/x86/intel_scu_pcidrv.c +17 -4
@@ -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_data scu_data = {};struct intel_scu_ipc_dev *scu;int ret;
@@ -32,14 +33,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 ) }, {} };
Signature · 1 line
2.25.1
Mika Westerberg
maintainerPATCH v9 18/20 platform/x86: intel_telemetry: Add telemetry_get_pltdata()
In reply to Mika WesterbergAdd new function that allows telemetry modules to get pointer to the platform specific configuration. This is needed to allow the telemetry debugfs module to fetch PMC IPC instance in the subsequent patch.
This also allows us to replace telemetry_pltconfig_valid() with telemetry_get_pltdata() as well.
--- arch/x86/include/asm/intel_telemetry.h | 2 +- drivers/platform/x86/intel_telemetry_core.c | 17 ++++++----------- drivers/platform/x86/intel_telemetry_debugfs.c | 3 +-- 3 files changed, 8 insertions(+), 14 deletions(-)
arch/x86/include/asm/intel_telemetry.h +1 -1
@@ -95,7 +95,7 @@ int telemetry_set_pltdata(const struct telemetry_core_ops *ops,int telemetry_clear_pltdata (void ); -int telemetry_pltconfig_valid (void ); +struct telemetry_plt_config *telemetry_get_pltdata (void );int telemetry_get_evtname (enum telemetry_unit telem_unit,const char **name,int len);
drivers/platform/x86/intel_telemetry_core.c +6 -11
@@ -353,21 +353,16 @@ int telemetry_clear_pltdata(void)EXPORT_SYMBOL_GPL (telemetry_clear_pltdata);/** -* telemetry_pltconfig_valid() - Checkif platform config is valid +* telemetry_get_pltdata() - Return telemetry platform config * -* Usage by other than telemetry module is invalid -* -* Return: 0 success, < 0 for failure +* May be used by other telemetry modules to get platform specific +* configuration. */ -int telemetry_pltconfig_valid (void ) +struct telemetry_plt_config *telemetry_get_pltdata (void ) { -if (telm_core_conf.plt_config) -return 0 ; - -else -return -EINVAL ; +return telm_core_conf.plt_config; } -EXPORT_SYMBOL_GPL (telemetry_pltconfig_valid); +EXPORT_SYMBOL_GPL (telemetry_get_pltdata);static inline int telemetry_get_pssevtname (enum telemetry_unit telem_unit,const char **name,int len)
drivers/platform/x86/intel_telemetry_debugfs.c +1 -2
@@ -910,8 +910,7 @@ static int __init telemetry_debugfs_init(void) debugfs_conf = (struct telemetry_debugfs_conf *)id->driver_data; - err =telemetry_pltconfig_valid (); -if (err <0 ) { +if (!telemetry_get_pltdata ()) {pr_info ("Invalid pltconfig, ensure IPC1 device is enabled in BIOS\n" );return -ENODEV ; }
Signature · 1 line
2.25.1
Mika Westerberg
maintainerPATCH v9 19/20 platform/x86: intel_pmc_ipc: Convert to MFD
In reply to Mika WesterbergThis driver only creates a bunch of platform devices sharing resources belonging to the PMC device. This is pretty much what MFD subsystem is for so move the driver there, renaming it to intel_pmc_bxt.c which should be more clear what it is.
MFD subsystem provides nice helper APIs for subdevice creation so convert the driver to use those. Unfortunately the ACPI device includes separate resources for most of the subdevices so we cannot simply call mfd_add_devices() to create all of them but instead we need to call it separately for each device.
The new MFD driver continues to expose two sysfs attributes that allow userspace to send IPC commands to the PMC/SCU to avoid breaking any existing applications that may use these. Generally this is bad idea so document this in the ABI documentation.
--- .../ABI/obsolete/sysfs-driver-intel_pmc_bxt | 22 + arch/x86/include/asm/intel_pmc_ipc.h | 47 -- arch/x86/include/asm/intel_telemetry.h | 1 + drivers/mfd/Kconfig | 16 +- drivers/mfd/Makefile | 1 + drivers/mfd/intel_pmc_bxt.c | 468 +++++++++++++ drivers/platform/x86/Kconfig | 16 +- drivers/platform/x86/Makefile | 1 - drivers/platform/x86/intel_pmc_ipc.c | 645 ------------------ .../platform/x86/intel_telemetry_debugfs.c | 12 +- drivers/platform/x86/intel_telemetry_pltdrv.c | 2 + drivers/usb/typec/tcpm/Kconfig | 2 +- drivers/watchdog/iTCO_wdt.c | 25 +- include/linux/mfd/intel_pmc_bxt.h | 53 ++ include/linux/platform_data/itco_wdt.h | 11 +- 15 files changed, 602 insertions(+), 720 deletions(-) create mode 100644 Documentation/ABI/obsolete/sysfs-driver-intel_pmc_bxt delete mode 100644 arch/x86/include/asm/intel_pmc_ipc.h create mode 100644 drivers/mfd/intel_pmc_bxt.c delete mode 100644 drivers/platform/x86/intel_pmc_ipc.c create mode 100644 include/linux/mfd/intel_pmc_bxt.h
Documentation/ABI/obsolete/sysfs-driver-intel_pmc_bxt new file +22 -0
@@ -0,0 +1,22 @@ +These files allow sending arbitrary IPC commands to the PMC/SCU which +may be dangerous. These will be removed eventually and should not be +used in any new applications. + +What: /sys/bus/platform/devices/INT34D2:00/simplecmd +Date: Jun 2015 +KernelVersion: 4.1 +Contact: Mika Westerberg <[email protected]> +Description: This interface allows userspace to send an arbitrary + IPC command to the PMC/SCU. + + Format: %d %d where first number is command and + second number is subcommand. + +What: /sys/bus/platform/devices/INT34D2:00/northpeak +Date: Jun 2015 +KernelVersion: 4.1 +Contact: Mika Westerberg <[email protected]> +Description: This interface allows userspace to enable and disable + Northpeak through the PMC/SCU. + + Format: %u.
arch/x86/include/asm/intel_pmc_ipc.h deleted +0 -47
47 lines not on this page · raw message
arch/x86/include/asm/intel_telemetry.h +1 -0
@@ -53,6 +53,7 @@ struct telemetry_plt_config {struct telemetry_unit_config ioss_config;struct mutex telem_trace_lock;struct mutex telem_lock; +struct intel_pmc_dev *pmc;struct intel_scu_ipc_dev *scu;bool telem_in_use; };
drivers/mfd/Kconfig +15 -1
@@ -551,7 +551,7 @@ config INTEL_SOC_PMIC config INTEL_SOC_PMIC_BXTWC tristate "Support for Intel Broxton Whiskey Cove PMIC" - depends on INTEL_PMC_IPC + depends on MFD_INTEL_PMC_BXT select MFD_CORE select REGMAP_IRQ help
@@ -632,6 +632,20 @@ config MFD_INTEL_MSIC Passage) chip. This chip embeds audio, battery, GPIO, etc. devices used in Intel Medfield platforms. +config MFD_INTEL_PMC_BXT + tristate "Intel PMC Driver for Broxton" + depends on X86 + depends on X86_PLATFORM_DEVICES + depends on ACPI + select INTEL_SCU_IPC + select MFD_CORE + help + This driver provides support for the PMC (Power Management + Controller) on Intel Broxton and Apollo Lake. The PMC is a + multi-function device that exposes IPC, General Control + Register and P-unit access. In addition this creates devices + for iTCO watchdog and telemetry that are part of the PMC. + config MFD_IPAQ_MICRO bool "Atmel Micro ASIC (iPAQ h3100/h3600/h3700) Support" depends on SA1100_H3100 || SA1100_H3600
drivers/mfd/Makefile +1 -0
@@ -212,6 +212,7 @@ obj-$(CONFIG_MFD_INTEL_LPSS) += intel-lpss.o obj-$(CONFIG_MFD_INTEL_LPSS_PCI) += intel-lpss-pci.o obj-$(CONFIG_MFD_INTEL_LPSS_ACPI) += intel-lpss-acpi.o obj-$(CONFIG_MFD_INTEL_MSIC) += intel_msic.o +obj-$(CONFIG_MFD_INTEL_PMC_BXT) += intel_pmc_bxt.o obj-$(CONFIG_MFD_PALMAS) += palmas.o obj-$(CONFIG_MFD_VIPERBOARD) += viperboard.o obj-$(CONFIG_MFD_RC5T583) += rc5t583.o rc5t583-irq.o
drivers/mfd/intel_pmc_bxt.c new file +468 -0
468 lines not on this page · raw message
drivers/platform/x86/Kconfig +5 -11
@@ -1269,7 +1269,8 @@ config INTEL_UNCORE_FREQ_CONTROL config INTEL_BXTWC_PMIC_TMU tristate "Intel BXT Whiskey Cove TMU Driver" depends on REGMAP - depends on INTEL_SOC_PMIC_BXTWC && INTEL_PMC_IPC + depends on MFD_INTEL_PMC_BXT + depends on INTEL_SOC_PMIC_BXTWC ---help--- Select this driver to use Intel BXT Whiskey Cove PMIC TMU feature. This driver enables the alarm wakeup functionality in the TMU unit
@@ -1327,15 +1328,6 @@ config INTEL_PMC_CORE - LTR Ignore - MPHY/PLL gating status (Sunrisepoint PCH only) -config INTEL_PMC_IPC - tristate "Intel PMC IPC Driver" - depends on ACPI - select INTEL_SCU_IPC - ---help--- - This driver provides support for PMC control on some Intel platforms. - The PMC is an ARC processor which defines IPC commands for communication - with other entities in the CPU. - config INTEL_PUNIT_IPC tristate "Intel P-Unit IPC Driver" ---help---
@@ -1374,7 +1366,9 @@ config INTEL_SCU_IPC_UTIL config INTEL_TELEMETRY tristate "Intel SoC Telemetry Driver" - depends on INTEL_PMC_IPC && INTEL_PUNIT_IPC && X86_64 + depends on X86_64 + depends on MFD_INTEL_PMC_BXT + depends on INTEL_PUNIT_IPC ---help--- This driver provides interfaces to configure and use telemetry for INTEL SoC from APL onwards. It is also
drivers/platform/x86/Makefile +0 -1
@@ -138,7 +138,6 @@ obj-$(CONFIG_INTEL_MFLD_THERMAL) += intel_mid_thermal.o obj-$(CONFIG_INTEL_MID_POWER_BUTTON) += intel_mid_powerbtn.o obj-$(CONFIG_INTEL_MRFLD_PWRBTN) += intel_mrfld_pwrbtn.o obj-$(CONFIG_INTEL_PMC_CORE) += intel_pmc_core.o intel_pmc_core_pltdrv.o -obj-$(CONFIG_INTEL_PMC_IPC) += intel_pmc_ipc.o obj-$(CONFIG_INTEL_PUNIT_IPC) += intel_punit_ipc.o obj-$(CONFIG_INTEL_SCU_IPC) += intel_scu_ipc.o obj-$(CONFIG_INTEL_SCU_PCI) += intel_scu_pcidrv.o
drivers/platform/x86/intel_pmc_ipc.c deleted +0 -645
645 lines not on this page · raw message
drivers/platform/x86/intel_telemetry_debugfs.c +8 -4
@@ -15,6 +15,7 @@*/ #include <linux/debugfs.h> #include <linux/device.h> +#include <linux/mfd/intel_pmc_bxt.h> #include <linux/module.h> #include <linux/pci.h> #include <linux/seq_file.h>
@@ -22,7 +23,6 @@#include <asm/cpu_device_id.h> #include <asm/intel-family.h> -#include <asm/intel_pmc_ipc.h> #include <asm/intel_telemetry.h> #define DRIVER_NAME "telemetry_soc_debugfs"
@@ -647,10 +647,11 @@ DEFINE_SHOW_ATTRIBUTE(telem_soc_states);static int telem_s0ix_res_get (void *data,u64 *val) { +struct telemetry_plt_config *plt_config =telemetry_get_pltdata ();u64 s0ix_total_res;int ret; - ret =intel_pmc_s0ix_counter_read (&s0ix_total_res); + ret =intel_pmc_s0ix_counter_read (plt_config->pmc, &s0ix_total_res);if (ret) {pr_err ("Failed to read S0ix residency" );return ret;
@@ -837,12 +838,15 @@ static int pm_suspend_exit_cb(void)*/ if (suspend_shlw_ctr_exit == suspend_shlw_ctr_temp && suspend_deep_ctr_exit == suspend_deep_ctr_temp) { - ret =intel_pmc_gcr_read64 (PMC_GCR_TELEM_SHLW_S0IX_REG , +struct telemetry_plt_config *plt_config =telemetry_get_pltdata (); +struct intel_pmc_dev *pmc = plt_config->pmc; + + ret =intel_pmc_gcr_read64 (pmc,PMC_GCR_TELEM_SHLW_S0IX_REG , &suspend_shlw_res_exit);if (ret <0 ) goto out; - ret =intel_pmc_gcr_read64 (PMC_GCR_TELEM_DEEP_S0IX_REG , + ret =intel_pmc_gcr_read64 (pmc,PMC_GCR_TELEM_DEEP_S0IX_REG , &suspend_deep_res_exit);if (ret <0 ) goto out;
drivers/platform/x86/intel_telemetry_pltdrv.c +2 -0
@@ -1115,6 +1115,8 @@ static int telemetry_pltdrv_probe(struct platform_device *pdev) telm_conf = (struct telemetry_plt_config *)id->driver_data; + telm_conf->pmc =dev_get_drvdata (pdev->dev.parent); + mem =devm_platform_ioremap_resource (pdev,0 );if (IS_ERR (mem))return PTR_ERR (mem);
drivers/usb/typec/tcpm/Kconfig +1 -1
@@ -41,8 +41,8 @@ config TYPEC_FUSB302 config TYPEC_WCOVE tristate "Intel WhiskeyCove PMIC USB Type-C PHY driver" depends on ACPI + depends on MFD_INTEL_PMC_BXT depends on INTEL_SOC_PMIC - depends on INTEL_PMC_IPC depends on BXT_WC_PMIC_OPREGION help This driver adds support for USB Type-C on Intel Broxton platforms
drivers/watchdog/iTCO_wdt.c +19 -6
@@ -64,6 +64,7 @@#include <linux/uaccess.h> /* For copy_to_user/put_user/... */ #include <linux/io.h> /* For inb/outb/... */ #include <linux/platform_data/itco_wdt.h> +#include <linux/mfd/intel_pmc_bxt.h> #include "iTCO_vendor.h"
@@ -233,12 +234,24 @@ static int update_no_reboot_bit_cnt(void *priv, bool set)return val != newval ? -EIO :0 ; } +static int update_no_reboot_bit_pmc (void *priv,bool set) +{ +struct intel_pmc_dev *pmc = priv; +u32 bits =PMC_CFG_NO_REBOOT_EN ; +u32 value = set ? bits :0 ; + +return intel_pmc_gcr_update (pmc,PMC_GCR_PMC_CFG_REG , bits, value); +} +static void iTCO_wdt_no_reboot_bit_setup (struct iTCO_wdt_private *p, -struct itco_wdt_platform_data *pdata) +struct platform_device *pdev, +struct itco_wdt_platform_data *pdata) { -if (pdata->update_no_reboot_bit) { - p->update_no_reboot_bit = pdata->update_no_reboot_bit; - p->no_reboot_priv = pdata->no_reboot_priv; +if (pdata->no_reboot_use_pmc) { +struct intel_pmc_dev *pmc =dev_get_drvdata (pdev->dev.parent); + + p->update_no_reboot_bit = update_no_reboot_bit_pmc; + p->no_reboot_priv = pmc;return ; }
@@ -478,14 +491,14 @@ static int iTCO_wdt_probe(struct platform_device *pdev)return -ENODEV ; } -iTCO_wdt_no_reboot_bit_setup (p, pdata); +iTCO_wdt_no_reboot_bit_setup (p, pdev, pdata);/* * Get the Memory-Mapped GCS or PMC register, we need it for the * NO_REBOOT flag (TCO v2 and v3). */ if (p->iTCO_version >=2 && p->iTCO_version <6 && - !pdata->update_no_reboot_bit) { + !pdata->no_reboot_use_pmc) { p->gcs_pmc_res =platform_get_resource (pdev,IORESOURCE_MEM ,ICH_RES_MEM_GCS_PMC );
include/linux/mfd/intel_pmc_bxt.h new file +53 -0
53 lines not on this page · raw message
include/linux/platform_data/itco_wdt.h +7 -4
@@ -12,13 +12,16 @@#define ICH_RES_MEM_OFF 2#define ICH_RES_MEM_GCS_PMC 0 +/** +* struct itco_wdt_platform_data - iTCO_wdt platform data +* @name: Name of the platform +* @version: iTCO version +* @no_reboot_use_pmc: Use PMC BXT API to set and clear NO_REBOOT bit +*/ struct itco_wdt_platform_data {char name[32 ];unsigned int version; -/* private data to be passed to update_no_reboot_bit API */ -void *no_reboot_priv; -/* pointer for platform specific no reboot update function */ -int (*update_no_reboot_bit)(void *priv,bool set); +bool no_reboot_use_pmc; };#endif /* _ITCO_WDT_H_ */
Signature · 1 line
2.25.1
Mika Westerberg
maintainerPATCH v9 20/20 MAINTAINERS: Update entry for Intel Broxton PMC driver
In reply to Mika WesterbergThe driver lives now under MFD so split the current entry into two parts and add me as co-maintainer of the Intel Broxton PMC driver. While there correct formatting of Zha Qipeng's email address.
--- MAINTAINERS | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-)
MAINTAINERS +14 -9
@@ -8495,6 +8495,13 @@ L: [email protected] S: Maintained F: drivers/platform/x86/intel_atomisp2_pm.c +INTEL BROXTON PMC DRIVER +M: Mika Westerberg <[email protected]> +M: Zha Qipeng <[email protected]> +S: Maintained +F: drivers/mfd/intel_pmc_bxt.c +F: include/linux/mfd/intel_pmc_bxt.h + INTEL C600 SERIES SAS CONTROLLER DRIVER M: Intel SCU Linux support <[email protected]> M: Artur Paszkiewicz <[email protected]>
@@ -8702,6 +8709,13 @@ F: include/uapi/linux/mic_common.h F: include/uapi/linux/mic_ioctl.h F: include/uapi/linux/scif_ioctl.h +INTEL P-Unit IPC DRIVER +M: Zha Qipeng <[email protected]> +L: [email protected] +S: Maintained +F: arch/x86/include/asm/intel_punit_ipc.h +F: drivers/platform/x86/intel_punit_ipc.c + INTEL PMC CORE DRIVER M: Rajneesh Bhardwaj <[email protected]> M: Vishwanath Somayaji <[email protected]>
@@ -8709,15 +8723,6 @@ L: [email protected] S: Maintained F: drivers/platform/x86/intel_pmc_core* -INTEL PMC/P-Unit IPC DRIVER -M: Zha Qipeng<[email protected]> -L: [email protected] -S: Maintained -F: arch/x86/include/asm/intel_pmc_ipc.h -F: arch/x86/include/asm/intel_punit_ipc.h -F: drivers/platform/x86/intel_pmc_ipc.c -F: drivers/platform/x86/intel_punit_ipc.c - INTEL PMIC GPIO DRIVERS M: Andy Shevchenko <[email protected]> S: Maintained
Signature · 1 line
2.25.1
Re: [PATCH v9 19/20] platform/x86: intel_pmc_ipc: Convert to MFD
In reply to Mika WesterbergQuoted 32 lines · Mika Westerberg
This driver only creates a bunch of platform devices sharing resources belonging to the PMC device. This is pretty much what MFD subsystem is for so move the driver there, renaming it to
intel_pmc_bxt.cwhich should be more clear what it is.MFD subsystem provides nice helper APIs for subdevice creation so convert the driver to use those. Unfortunately the ACPI device includes separate resources for most of the subdevices so we cannot simply call
mfd_add_devices()to create all of them but instead we need to call it separately for each device.The new MFD driver continues to expose two sysfs attributes that allow userspace to send IPC commands to the PMC/SCU to avoid breaking any existing applications that may use these. Generally this is bad idea so document this in the ABI documentation.
Signed-off-by Mika Westerberg <[email protected]>Reviewed-by Andy Shevchenko <[email protected]>--- .../ABI/obsolete/sysfs-driver-intel_pmc_bxt | 22 + arch/x86/include/asm/intel_pmc_ipc.h | 47 -- arch/x86/include/asm/intel_telemetry.h | 1 + drivers/mfd/Kconfig | 16 +- drivers/mfd/Makefile | 1 + drivers/mfd/intel_pmc_bxt.c | 468 +++++++++++++ drivers/platform/x86/Kconfig | 16 +- drivers/platform/x86/Makefile | 1 - drivers/platform/x86/intel_pmc_ipc.c | 645 ------------------ .../platform/x86/intel_telemetry_debugfs.c | 12 +- drivers/platform/x86/intel_telemetry_pltdrv.c | 2 + drivers/usb/typec/tcpm/Kconfig | 2 +- drivers/watchdog/iTCO_wdt.c | 25 +-
Quoted 8 lines
include/linux/mfd/intel_pmc_bxt.h | 53 ++ include/linux/platform_data/itco_wdt.h | 11 +- 15 files changed, 602 insertions(+), 720 deletions(-) create mode 100644 Documentation/ABI/obsolete/sysfs-driver-intel_pmc_bxt delete mode 100644 arch/x86/include/asm/intel_pmc_ipc.h create mode 100644 drivers/mfd/intel_pmc_bxt.c delete mode 100644 drivers/platform/x86/intel_pmc_ipc.c create mode 100644 include/linux/mfd/intel_pmc_bxt.h
Looks good to me know.
Thanks for taking the time to realise my review comments.
For my own reference (apply this as-is to your sign-off block):
Signature · 4 lines
Lee Jones [李琼斯] Linaro Services Technical Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
Re: [PATCH v9 19/20] platform/x86: intel_pmc_ipc: Convert to MFD
Quoted 44 lines · Lee Jones
Quoted 32 lines · Mika Westerberg
This driver only creates a bunch of platform devices sharing resources belonging to the PMC device. This is pretty much what MFD subsystem is for so move the driver there, renaming it to
intel_pmc_bxt.cwhich should be more clear what it is.MFD subsystem provides nice helper APIs for subdevice creation so convert the driver to use those. Unfortunately the ACPI device includes separate resources for most of the subdevices so we cannot simply call
mfd_add_devices()to create all of them but instead we need to call it separately for each device.The new MFD driver continues to expose two sysfs attributes that allow userspace to send IPC commands to the PMC/SCU to avoid breaking any existing applications that may use these. Generally this is bad idea so document this in the ABI documentation.
Signed-off-by Mika Westerberg <[email protected]>Reviewed-by Andy Shevchenko <[email protected]>--- .../ABI/obsolete/sysfs-driver-intel_pmc_bxt | 22 + arch/x86/include/asm/intel_pmc_ipc.h | 47 -- arch/x86/include/asm/intel_telemetry.h | 1 + drivers/mfd/Kconfig | 16 +- drivers/mfd/Makefile | 1 + drivers/mfd/intel_pmc_bxt.c | 468 +++++++++++++ drivers/platform/x86/Kconfig | 16 +- drivers/platform/x86/Makefile | 1 - drivers/platform/x86/intel_pmc_ipc.c | 645 ------------------ .../platform/x86/intel_telemetry_debugfs.c | 12 +- drivers/platform/x86/intel_telemetry_pltdrv.c | 2 + drivers/usb/typec/tcpm/Kconfig | 2 +- drivers/watchdog/iTCO_wdt.c | 25 +-Quoted 8 lines
include/linux/mfd/intel_pmc_bxt.h | 53 ++ include/linux/platform_data/itco_wdt.h | 11 +- 15 files changed, 602 insertions(+), 720 deletions(-) create mode 100644 Documentation/ABI/obsolete/sysfs-driver-intel_pmc_bxt delete mode 100644 arch/x86/include/asm/intel_pmc_ipc.h create mode 100644 drivers/mfd/intel_pmc_bxt.c delete mode 100644 drivers/platform/x86/intel_pmc_ipc.c create mode 100644 include/linux/mfd/intel_pmc_bxt.h
Quoted 7 lines
Looks good to me know.
Thanks for taking the time to realise my review comments.
For my own reference (apply this as-is to your sign-off block):
Acked-for-MFD-by Lee Jones <[email protected]>
Can you prepare ib for ii that I can pull from?
Or do you want me to do the same for you?
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH v9 19/20] platform/x86: intel_pmc_ipc: Convert to MFD
Quoted 47 lines · Andy Shevchenko
Quoted 46 lines · Lee Jones
Quoted 32 lines · Mika Westerberg
This driver only creates a bunch of platform devices sharing resources belonging to the PMC device. This is pretty much what MFD subsystem is for so move the driver there, renaming it to
intel_pmc_bxt.cwhich should be more clear what it is.MFD subsystem provides nice helper APIs for subdevice creation so convert the driver to use those. Unfortunately the ACPI device includes separate resources for most of the subdevices so we cannot simply call
mfd_add_devices()to create all of them but instead we need to call it separately for each device.The new MFD driver continues to expose two sysfs attributes that allow userspace to send IPC commands to the PMC/SCU to avoid breaking any existing applications that may use these. Generally this is bad idea so document this in the ABI documentation.
Signed-off-by Mika Westerberg <[email protected]>Reviewed-by Andy Shevchenko <[email protected]>--- .../ABI/obsolete/sysfs-driver-intel_pmc_bxt | 22 + arch/x86/include/asm/intel_pmc_ipc.h | 47 -- arch/x86/include/asm/intel_telemetry.h | 1 + drivers/mfd/Kconfig | 16 +- drivers/mfd/Makefile | 1 + drivers/mfd/intel_pmc_bxt.c | 468 +++++++++++++ drivers/platform/x86/Kconfig | 16 +- drivers/platform/x86/Makefile | 1 - drivers/platform/x86/intel_pmc_ipc.c | 645 ------------------ .../platform/x86/intel_telemetry_debugfs.c | 12 +- drivers/platform/x86/intel_telemetry_pltdrv.c | 2 + drivers/usb/typec/tcpm/Kconfig | 2 +- drivers/watchdog/iTCO_wdt.c | 25 +-Quoted 8 lines
include/linux/mfd/intel_pmc_bxt.h | 53 ++ include/linux/platform_data/itco_wdt.h | 11 +- 15 files changed, 602 insertions(+), 720 deletions(-) create mode 100644 Documentation/ABI/obsolete/sysfs-driver-intel_pmc_bxt delete mode 100644 arch/x86/include/asm/intel_pmc_ipc.h create mode 100644 drivers/mfd/intel_pmc_bxt.c delete mode 100644 drivers/platform/x86/intel_pmc_ipc.c create mode 100644 include/linux/mfd/intel_pmc_bxt.hLooks good to me know.
Quoted 8 lines
Quoted 5 lines
Thanks for taking the time to realise my review comments.
For my own reference (apply this as-is to your sign-off block):
Acked-for-MFD-by Lee Jones <[email protected]>Can you prepare ib for ii that I can pull from?
Or do you want me to do the same for you?
It would probably be easier for me to do it, as I already have the infra. to deal with it. I have some more reviews to conduct, then I'll get around to it.
Signature · 4 lines
Lee Jones [李琼斯] Linaro Services Technical Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
[GIT PULL] Immutable branch between MFD, X86, USB and Watchdog due for the v5.7 merge window
In reply to Mika WesterbergEnjoy!
The following changes since commit 8f3d9f354286745c751374f5f1fcafee6b3f3136:
Linux 5.7-rc1 (2020-04-12 12:35:55 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git ib-mfd-x86-usb-watchdog-v5.7
for you to fetch changes up to 2f72d35ea75ee8bf8c9e63fb43d43d5bfb4ac8fd:
MAINTAINERS: Update entry for Intel Broxton PMC driver (2020-04-24 11:18:51 +0100)
----------------------------------------------------------------
Immutable branch between MFD, X86, USB and Watchdog due for the v5.7 merge window
----------------------------------------------------------------
Heikki Krogerus (1):
usb: typec: mux: Convert the Intel PMC Mux driver to use new SCU IPC API
Mika Westerberg (19):
platform/x86: intel_scu_ipc: Split out SCU IPC functionality from the SCU driver platform/x86: intel_scu_ipc: Log more information if SCU IPC command fails platform/x86: intel_scu_ipc: Move legacy SCU IPC API to a separate header platform/x86: intel_scu_ipc: Introduce new SCU IPC API platform/x86: intel_mid_powerbtn: Convert to use new SCU IPC API
watchdog: intel-mid_wdt: Convert to use new SCU IPC API platform/x86: intel_scu_ipcutil: Convert to use new SCU IPC API platform/x86: intel_scu_ipc: Add managed function to register SCU IPC platform/x86: intel_pmc_ipc: Start using SCU IPC
mfd: intel_soc_pmic: Add SCU IPC member to struct intel_soc_pmic
mfd: intel_soc_pmic_bxtwc: Convert to use new SCU IPC API
mfd: intel_soc_pmic_mrfld: Convert to use new SCU IPC API platform/x86: intel_telemetry: Convert to use new SCU IPC API platform/x86: intel_pmc_ipc: Drop intel_pmc_ipc_command() x86/platform/intel-mid: Add empty stubs for intel_scu_devices_[create|destroy]() platform/x86: intel_pmc_ipc: Move PCI IDs to intel_scu_pcidrv.c platform/x86: intel_telemetry: Add telemetry_get_pltdata() platform/x86: intel_pmc_ipc: Convert to MFD
MAINTAINERS: Update entry for Intel Broxton PMC driver
.../ABI/obsolete/sysfs-driver-intel_pmc_bxt | 22 + MAINTAINERS | 23 +- arch/x86/Kconfig | 2 +- arch/x86/include/asm/intel-mid.h | 9 +- arch/x86/include/asm/intel_pmc_ipc.h | 59 -- arch/x86/include/asm/intel_scu_ipc.h | 114 +-- arch/x86/include/asm/intel_scu_ipc_legacy.h | 91 ++ arch/x86/include/asm/intel_telemetry.h | 6 +- drivers/mfd/Kconfig | 20 +- drivers/mfd/Makefile | 1 + drivers/mfd/intel_pmc_bxt.c | 468 ++++++++++ drivers/mfd/intel_soc_pmic_bxtwc.c | 34 +- drivers/mfd/intel_soc_pmic_mrfld.c | 10 +- drivers/platform/x86/Kconfig | 46 +- drivers/platform/x86/Makefile | 2 +- drivers/platform/x86/intel_mid_powerbtn.c | 15 +- drivers/platform/x86/intel_pmc_ipc.c | 949 --------------------- drivers/platform/x86/intel_scu_ipc.c | 447 +++++++--- drivers/platform/x86/intel_scu_ipcutil.c | 43 +- drivers/platform/x86/intel_scu_pcidrv.c | 68 ++ drivers/platform/x86/intel_telemetry_core.c | 17 +- drivers/platform/x86/intel_telemetry_debugfs.c | 15 +- drivers/platform/x86/intel_telemetry_pltdrv.c | 97 ++- drivers/usb/typec/mux/Kconfig | 2 +- drivers/usb/typec/mux/intel_pmc_mux.c | 12 +- drivers/usb/typec/tcpm/Kconfig | 2 +- drivers/watchdog/iTCO_wdt.c | 25 +- drivers/watchdog/intel-mid_wdt.c | 53 +- include/linux/mfd/intel_pmc_bxt.h | 53 ++ include/linux/mfd/intel_soc_pmic.h | 15 + include/linux/platform_data/itco_wdt.h | 11 +- 31 files changed, 1411 insertions(+), 1320 deletions(-) create mode 100644 Documentation/ABI/obsolete/sysfs-driver-intel_pmc_bxt delete mode 100644 arch/x86/include/asm/intel_pmc_ipc.h create mode 100644 arch/x86/include/asm/intel_scu_ipc_legacy.h create mode 100644 drivers/mfd/intel_pmc_bxt.c delete mode 100644 drivers/platform/x86/intel_pmc_ipc.c create mode 100644 drivers/platform/x86/intel_scu_pcidrv.c create mode 100644 include/linux/mfd/intel_pmc_bxt.h
Signature · 4 lines
Lee Jones [李琼斯] Linaro Services Technical Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog