Skip to contentSkip to conversation

mfd, x86: remove msic driver and leftovers

PATCH In review Andy Shevchenko 4 participants 20 messages Jan 25, 2021 – Feb 3, 2021

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

cover mfd, x86: remove msic driver and leftovers

This is a second part of the Intel MID outdated platforms removal. First part is available as immutable branch [1]. The series has functional and build dependencies, so the mentioned branch should be used as a base for these changes.

Note, that some of the drivers, that arch/x86 covers, seems never appeared in the upstream (like msic_ocd).

There few ways are possible to proceed with this:
- extend existing immutable branch
- create another one based on MFD
- merge everything thru tip tree

I'm also all ears for alternatives.

The entire branch with all patches is available here [2].

Rafael, can you please help reviewing arch/x86 related code?

[1]: https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=intel-mid-removal
[2]: https://gitlab.com/andy-shev/next/-/tree/topic/mid-removal-next

Andy Shevchenko (10):
x86/platform/intel-mid: Remove unused leftovers (msic_audio) x86/platform/intel-mid: Remove unused leftovers (msic_ocd) x86/platform/intel-mid: Remove unused leftovers (msic_battery) x86/platform/intel-mid: Remove unused leftovers (msic_gpio) x86/platform/intel-mid: Remove unused leftovers (msic_power_btn) x86/platform/intel-mid: Remove unused leftovers (msic_thermal) x86/platform/intel-mid: Remove unused leftovers (msic) x86/platform/intel-mid: Remove unused leftovers (vRTC) x86/apb_timer: Remove driver for deprecated platform
mfd: intel_msic: Remove driver for deprecated platform

 .../admin-guide/kernel-parameters.txt         |   6 -
 MAINTAINERS                                   |   2 -
 arch/x86/Kconfig                              |  12 -
 arch/x86/include/asm/apb_timer.h              |  40 --
 arch/x86/include/asm/fixmap.h                 |   3 -
 arch/x86/include/asm/intel-mid.h              |  28 --
 arch/x86/include/asm/intel_mid_vrtc.h         |  10 -
 arch/x86/include/asm/intel_scu_ipc_legacy.h   |  17 -
 arch/x86/kernel/Makefile                      |   1 -
 arch/x86/kernel/apb_timer.c                   | 347 --------------
 arch/x86/platform/intel-mid/Makefile          |   2 +-
 .../platform/intel-mid/device_libs/Makefile   |   9 -
 .../device_libs/platform_mrfld_power_btn.c    |  78 ---
 .../intel-mid/device_libs/platform_msic.c     |  83 ----
 .../intel-mid/device_libs/platform_msic.h     |  15 -
 .../device_libs/platform_msic_audio.c         |  42 --
 .../device_libs/platform_msic_battery.c       |  32 --
 .../device_libs/platform_msic_gpio.c          |  43 --
 .../intel-mid/device_libs/platform_msic_ocd.c |  44 --
 .../device_libs/platform_msic_power_btn.c     |  31 --
 .../device_libs/platform_msic_thermal.c       |  32 --
 arch/x86/platform/intel-mid/intel-mid.c       |  79 +--
 arch/x86/platform/intel-mid/intel_mid_vrtc.c  | 173 -------
 arch/x86/platform/intel-mid/sfi.c             | 124 -----
 drivers/mfd/Kconfig                           |   9 -
 drivers/mfd/Makefile                          |   1 -
 drivers/mfd/intel_msic.c                      | 425 ----------------
 include/linux/mfd/intel_msic.h                | 453 ------------------
 28 files changed, 4 insertions(+), 2137 deletions(-)
 delete mode 100644 arch/x86/include/asm/apb_timer.h
 delete mode 100644 arch/x86/include/asm/intel_mid_vrtc.h
 delete mode 100644 arch/x86/kernel/apb_timer.c
 delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_mrfld_power_btn.c
 delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_msic.c
 delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_msic.h
 delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_msic_audio.c
 delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_msic_battery.c
 delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_msic_gpio.c
 delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_msic_ocd.c
 delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_msic_power_btn.c
 delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_msic_thermal.c
 delete mode 100644 arch/x86/platform/intel-mid/intel_mid_vrtc.c
 delete mode 100644 drivers/mfd/intel_msic.c
 delete mode 100644 include/linux/mfd/intel_msic.h
Signature · 1 line
2.29.2
#1 lore raw

PATCH 1/10 x86/platform/intel-mid: Remove unused leftovers (msic_audio)

The commit 05f4434bc130 ("ASoC: Intel: remove mfld_machine") removed the driver, no need to have support files for it.

---
 .../platform/intel-mid/device_libs/Makefile   |  1 -
 .../device_libs/platform_msic_audio.c         | 42 -------------------
 2 files changed, 43 deletions(-)
 delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_msic_audio.c
arch/x86/platform/intel-mid/device_libs/Makefile +0 -1
index 918edac9ab9a..e926577fe665 100644
@@ -8,7 +8,6 @@ obj-$(subst m,y,$(CONFIG_BRCMFMAC_SDIO)) += platform_bcm43xx.o
 obj-$(subst m,y,$(CONFIG_BT_HCIUART_BCM)) += platform_bt.o
 # IPC Devices
 obj-$(subst m,y,$(CONFIG_MFD_INTEL_MSIC)) += platform_msic.o
-obj-$(subst m,y,$(CONFIG_SND_MFLD_MACHINE)) += platform_msic_audio.o
 obj-$(subst m,y,$(CONFIG_GPIO_MSIC)) += platform_msic_gpio.o
 obj-$(subst m,y,$(CONFIG_MFD_INTEL_MSIC)) += platform_msic_ocd.o
 obj-$(subst m,y,$(CONFIG_MFD_INTEL_MSIC)) += platform_msic_battery.o
arch/x86/platform/intel-mid/device_libs/platform_msic_audio.c deleted +0 -42

42 lines not on this page · raw message

Signature · 1 line
2.29.2
#2 lore raw

PATCH 2/10 x86/platform/intel-mid: Remove unused leftovers (msic_ocd)

In reply to Andy Shevchenko

It seems msic_ocd driver was never upstreamed.
Why should we have dead code in the kernel?

---
 .../platform/intel-mid/device_libs/Makefile   |  1 -
 .../intel-mid/device_libs/platform_msic_ocd.c | 44 -------------------
 2 files changed, 45 deletions(-)
 delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_msic_ocd.c
arch/x86/platform/intel-mid/device_libs/Makefile +0 -1
index e926577fe665..1ab7813cd627 100644
@@ -9,7 +9,6 @@ obj-$(subst m,y,$(CONFIG_BT_HCIUART_BCM)) += platform_bt.o
 # IPC Devices
 obj-$(subst m,y,$(CONFIG_MFD_INTEL_MSIC)) += platform_msic.o
 obj-$(subst m,y,$(CONFIG_GPIO_MSIC)) += platform_msic_gpio.o
-obj-$(subst m,y,$(CONFIG_MFD_INTEL_MSIC)) += platform_msic_ocd.o
 obj-$(subst m,y,$(CONFIG_MFD_INTEL_MSIC)) += platform_msic_battery.o
 obj-$(subst m,y,$(CONFIG_INTEL_MID_POWER_BUTTON)) += platform_msic_power_btn.o
 obj-$(subst m,y,$(CONFIG_INTEL_MFLD_THERMAL)) += platform_msic_thermal.o
arch/x86/platform/intel-mid/device_libs/platform_msic_ocd.c deleted +0 -44

44 lines not on this page · raw message

Signature · 1 line
2.29.2
#3 lore raw

PATCH 3/10 x86/platform/intel-mid: Remove unused leftovers (msic_battery)

In reply to Andy Shevchenko

It seems msic_battery driver was never upstreamed. Why should we have dead code in the kernel?

---
 .../platform/intel-mid/device_libs/Makefile   |  1 -
 .../device_libs/platform_msic_battery.c       | 32 -------------------
 2 files changed, 33 deletions(-)
 delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_msic_battery.c
arch/x86/platform/intel-mid/device_libs/Makefile +0 -1
index 1ab7813cd627..cf041a9882c0 100644
@@ -9,7 +9,6 @@ obj-$(subst m,y,$(CONFIG_BT_HCIUART_BCM)) += platform_bt.o
 # IPC Devices
 obj-$(subst m,y,$(CONFIG_MFD_INTEL_MSIC)) += platform_msic.o
 obj-$(subst m,y,$(CONFIG_GPIO_MSIC)) += platform_msic_gpio.o
-obj-$(subst m,y,$(CONFIG_MFD_INTEL_MSIC)) += platform_msic_battery.o
 obj-$(subst m,y,$(CONFIG_INTEL_MID_POWER_BUTTON)) += platform_msic_power_btn.o
 obj-$(subst m,y,$(CONFIG_INTEL_MFLD_THERMAL)) += platform_msic_thermal.o
 # SPI Devices
arch/x86/platform/intel-mid/device_libs/platform_msic_battery.c deleted +0 -32
deleted file mode 100644
index f461f84903f8..000000000000
@@ -1,32 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * platform_msic_battery.c: MSIC battery platform data initialization file
- *
- * (C) Copyright 2013 Intel Corporation
- * Author: Sathyanarayanan Kuppuswamy <[email protected]>
- */
-
-#include <linux/kernel.h>
-#include <linux/interrupt.h>
-#include <linux/scatterlist.h>
-#include <linux/init.h>
-#include <linux/sfi.h>
-#include <linux/mfd/intel_msic.h>
-#include <asm/intel-mid.h>
-
-#include "platform_msic.h"
-
-static void __init *msic_battery_platform_data(void *info)
-{
-	return msic_generic_platform_data(info, INTEL_MSIC_BLOCK_BATTERY);
-}
-
-static const struct devs_id msic_battery_dev_id __initconst = {
-	.name = "msic_battery",
-	.type = SFI_DEV_TYPE_IPC,
-	.delay = 1,
-	.msic = 1,
-	.get_platform_data = &msic_battery_platform_data,
-};
-
-sfi_device(msic_battery_dev_id);
Signature · 1 line
2.29.2
#4 lore raw

PATCH 4/10 x86/platform/intel-mid: Remove unused leftovers (msic_gpio)

In reply to Andy Shevchenko

There is no driver present, remove the device creation and other leftovers.

---
 .../platform/intel-mid/device_libs/Makefile   |  1 -
 .../device_libs/platform_msic_gpio.c          | 43 -------------------
 2 files changed, 44 deletions(-)
 delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_msic_gpio.c
arch/x86/platform/intel-mid/device_libs/Makefile +0 -1
index cf041a9882c0..3688e62ccf80 100644
@@ -8,7 +8,6 @@ obj-$(subst m,y,$(CONFIG_BRCMFMAC_SDIO)) += platform_bcm43xx.o
 obj-$(subst m,y,$(CONFIG_BT_HCIUART_BCM)) += platform_bt.o
 # IPC Devices
 obj-$(subst m,y,$(CONFIG_MFD_INTEL_MSIC)) += platform_msic.o
-obj-$(subst m,y,$(CONFIG_GPIO_MSIC)) += platform_msic_gpio.o
 obj-$(subst m,y,$(CONFIG_INTEL_MID_POWER_BUTTON)) += platform_msic_power_btn.o
 obj-$(subst m,y,$(CONFIG_INTEL_MFLD_THERMAL)) += platform_msic_thermal.o
 # SPI Devices
arch/x86/platform/intel-mid/device_libs/platform_msic_gpio.c deleted +0 -43

43 lines not on this page · raw message

Signature · 1 line
2.29.2
#5 lore raw

PATCH 5/10 x86/platform/intel-mid: Remove unused leftovers (msic_power_btn)

In reply to Andy Shevchenko

There is no driver present, remove the device creation and other leftovers.

Note, for Intel Merrifield there is another driver which is instantiated by a certain MFD one and does not need any support from device_libs.

---
 .../platform/intel-mid/device_libs/Makefile   |  2 -
 .../device_libs/platform_mrfld_power_btn.c    | 78 -------------------
 .../device_libs/platform_msic_power_btn.c     | 31 --------
 3 files changed, 111 deletions(-)
 delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_mrfld_power_btn.c
 delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_msic_power_btn.c
arch/x86/platform/intel-mid/device_libs/Makefile +0 -2
index 3688e62ccf80..177e91d565ca 100644
@@ -8,7 +8,6 @@ obj-$(subst m,y,$(CONFIG_BRCMFMAC_SDIO)) += platform_bcm43xx.o
 obj-$(subst m,y,$(CONFIG_BT_HCIUART_BCM)) += platform_bt.o
 # IPC Devices
 obj-$(subst m,y,$(CONFIG_MFD_INTEL_MSIC)) += platform_msic.o
-obj-$(subst m,y,$(CONFIG_INTEL_MID_POWER_BUTTON)) += platform_msic_power_btn.o
 obj-$(subst m,y,$(CONFIG_INTEL_MFLD_THERMAL)) += platform_msic_thermal.o
 # SPI Devices
 obj-$(subst m,y,$(CONFIG_SPI_SPIDEV)) += platform_mrfld_spidev.o
@@ -24,5 +23,4 @@ obj-$(subst m,y,$(CONFIG_GPIO_PCA953X)) += platform_pcal9555a.o
 obj-$(subst m,y,$(CONFIG_GPIO_PCA953X)) += platform_tca6416.o
 # MISC Devices
 obj-$(subst m,y,$(CONFIG_KEYBOARD_GPIO)) += platform_gpio_keys.o
-obj-$(subst m,y,$(CONFIG_INTEL_MID_POWER_BUTTON)) += platform_mrfld_power_btn.o
 obj-$(subst m,y,$(CONFIG_RTC_DRV_CMOS)) += platform_mrfld_rtc.o
arch/x86/platform/intel-mid/device_libs/platform_mrfld_power_btn.c deleted +0 -78

78 lines not on this page · raw message

arch/x86/platform/intel-mid/device_libs/platform_msic_power_btn.c deleted +0 -31
deleted file mode 100644
index 3d3de2d59726..000000000000
@@ -1,31 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * platform_msic_power_btn.c: MSIC power btn platform data initialization file
- *
- * (C) Copyright 2013 Intel Corporation
- * Author: Sathyanarayanan Kuppuswamy <[email protected]>
- */
-#include <linux/kernel.h>
-#include <linux/interrupt.h>
-#include <linux/scatterlist.h>
-#include <linux/sfi.h>
-#include <linux/init.h>
-#include <linux/mfd/intel_msic.h>
-#include <asm/intel-mid.h>
-
-#include "platform_msic.h"
-
-static void __init *msic_power_btn_platform_data(void *info)
-{
-	return msic_generic_platform_data(info, INTEL_MSIC_BLOCK_POWER_BTN);
-}
-
-static const struct devs_id msic_power_btn_dev_id __initconst = {
-	.name = "msic_power_btn",
-	.type = SFI_DEV_TYPE_IPC,
-	.delay = 1,
-	.msic = 1,
-	.get_platform_data = &msic_power_btn_platform_data,
-};
-
-sfi_device(msic_power_btn_dev_id);
Signature · 1 line
2.29.2
#6 lore raw

PATCH 6/10 x86/platform/intel-mid: Remove unused leftovers (msic_thermal)

In reply to Andy Shevchenko

There is no driver present, remove the device creation and other leftovers.

---
 .../platform/intel-mid/device_libs/Makefile   |  1 -
 .../device_libs/platform_msic_thermal.c       | 32 -------------------
 2 files changed, 33 deletions(-)
 delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_msic_thermal.c
arch/x86/platform/intel-mid/device_libs/Makefile +0 -1
index 177e91d565ca..4e4db0c2b225 100644
@@ -8,7 +8,6 @@ obj-$(subst m,y,$(CONFIG_BRCMFMAC_SDIO)) += platform_bcm43xx.o
 obj-$(subst m,y,$(CONFIG_BT_HCIUART_BCM)) += platform_bt.o
 # IPC Devices
 obj-$(subst m,y,$(CONFIG_MFD_INTEL_MSIC)) += platform_msic.o
-obj-$(subst m,y,$(CONFIG_INTEL_MFLD_THERMAL)) += platform_msic_thermal.o
 # SPI Devices
 obj-$(subst m,y,$(CONFIG_SPI_SPIDEV)) += platform_mrfld_spidev.o
 # I2C Devices
arch/x86/platform/intel-mid/device_libs/platform_msic_thermal.c deleted +0 -32
deleted file mode 100644
index 4858da1d78c6..000000000000
@@ -1,32 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * platform_msic_thermal.c: msic_thermal platform data initialization file
- *
- * (C) Copyright 2013 Intel Corporation
- * Author: Sathyanarayanan Kuppuswamy <[email protected]>
- */
-
-#include <linux/input.h>
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/gpio.h>
-#include <linux/platform_device.h>
-#include <linux/mfd/intel_msic.h>
-#include <asm/intel-mid.h>
-
-#include "platform_msic.h"
-
-static void __init *msic_thermal_platform_data(void *info)
-{
-	return msic_generic_platform_data(info, INTEL_MSIC_BLOCK_THERMAL);
-}
-
-static const struct devs_id msic_thermal_dev_id __initconst = {
-	.name = "msic_thermal",
-	.type = SFI_DEV_TYPE_IPC,
-	.delay = 1,
-	.msic = 1,
-	.get_platform_data = &msic_thermal_platform_data,
-};
-
-sfi_device(msic_thermal_dev_id);
Signature · 1 line
2.29.2
#7 lore raw

PATCH 7/10 x86/platform/intel-mid: Remove unused leftovers (msic)

In reply to Andy Shevchenko

There is no driver present, remove the device creation and other leftovers.

---
 arch/x86/include/asm/intel-mid.h              |  7 --
 .../platform/intel-mid/device_libs/Makefile   |  2 -
 .../intel-mid/device_libs/platform_msic.c     | 83 -------------------
 .../intel-mid/device_libs/platform_msic.h     | 15 ----
 arch/x86/platform/intel-mid/sfi.c             |  7 --
 5 files changed, 114 deletions(-)
 delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_msic.c
 delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_msic.h
arch/x86/include/asm/intel-mid.h +0 -7
index cf0e25f45422..e68ae2155db3 100644
@@ -37,7 +37,6 @@ struct devs_id {
 	char name[SFI_NAME_LEN + 1];
 	u8 type;
 	u8 delay;
-	u8 msic;
 	void *(*get_platform_data)(void *info);
 };
 
@@ -83,18 +82,12 @@ static inline enum intel_mid_cpu_type intel_mid_identify_cpu(void)
 	return __intel_mid_cpu_chip;
 }
 
-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) { }
arch/x86/platform/intel-mid/device_libs/Makefile +0 -2
index 4e4db0c2b225..4d008b053ac8 100644
@@ -6,8 +6,6 @@ obj-$(subst m,y,$(CONFIG_MMC_SDHCI_PCI)) += platform_mrfld_sd.o
 # WiFi + BT
 obj-$(subst m,y,$(CONFIG_BRCMFMAC_SDIO)) += platform_bcm43xx.o
 obj-$(subst m,y,$(CONFIG_BT_HCIUART_BCM)) += platform_bt.o
-# IPC Devices
-obj-$(subst m,y,$(CONFIG_MFD_INTEL_MSIC)) += platform_msic.o
 # SPI Devices
 obj-$(subst m,y,$(CONFIG_SPI_SPIDEV)) += platform_mrfld_spidev.o
 # I2C Devices
arch/x86/platform/intel-mid/device_libs/platform_msic.c deleted +0 -83

83 lines not on this page · raw message

arch/x86/platform/intel-mid/device_libs/platform_msic.h deleted +0 -15
deleted file mode 100644
index 91deb2e65b0e..000000000000
@@ -1,15 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * platform_msic.h: MSIC platform data header file
- *
- * (C) Copyright 2013 Intel Corporation
- * Author: Sathyanarayanan Kuppuswamy <[email protected]>
- */
-#ifndef _PLATFORM_MSIC_H_
-#define _PLATFORM_MSIC_H_
-
-extern struct intel_msic_platform_data msic_pdata;
-
-void *msic_generic_platform_data(void *info, enum intel_msic_block block);
-
-#endif
arch/x86/platform/intel-mid/sfi.c +0 -7
index 30bd5714a3d4..2b22587bfd3d 100644
@@ -338,13 +338,6 @@ static void __init sfi_handle_ipc_dev(struct sfi_device_table_entry *pentry,
 	if (IS_ERR(pdata))
 		return;
 
-	/*
-	 * On Medfield the platform device creation is handled by the MSIC
-	 * MFD driver so we don't need to do it here.
-	 */
-	if (dev->msic && intel_mid_has_msic())
-		return;
-
 	pdev = platform_device_alloc(pentry->name, 0);
 	if (pdev == NULL) {
 		pr_err("out of memory for SFI platform device '%s'.\n",
Signature · 1 line
2.29.2
#8 lore raw

PATCH 8/10 x86/platform/intel-mid: Remove unused leftovers (vRTC)

In reply to Andy Shevchenko

There is no driver present, remove the device creation and other leftovers.

---
 arch/x86/include/asm/fixmap.h                |   3 -
 arch/x86/include/asm/intel-mid.h             |  10 --
 arch/x86/include/asm/intel_mid_vrtc.h        |  10 --
 arch/x86/include/asm/intel_scu_ipc_legacy.h  |   5 -
 arch/x86/platform/intel-mid/Makefile         |   2 +-
 arch/x86/platform/intel-mid/intel-mid.c      |   2 -
 arch/x86/platform/intel-mid/intel_mid_vrtc.c | 173 -------------------
 arch/x86/platform/intel-mid/sfi.c            |  42 -----
 8 files changed, 1 insertion(+), 246 deletions(-)
 delete mode 100644 arch/x86/include/asm/intel_mid_vrtc.h
 delete mode 100644 arch/x86/platform/intel-mid/intel_mid_vrtc.c
arch/x86/include/asm/fixmap.h +0 -3
index 9f1a0a987e5e..d0dcefb5cc59 100644
@@ -108,9 +108,6 @@ enum fixed_addresses {
 #ifdef CONFIG_PARAVIRT_XXL
 	FIX_PARAVIRT_BOOTMAP,
 #endif
-#ifdef	CONFIG_X86_INTEL_MID
-	FIX_LNW_VRTC,
-#endif
 
 #ifdef CONFIG_ACPI_APEI_GHES
 	/* Used for GHES mapping from assorted contexts */
arch/x86/include/asm/intel-mid.h +0 -10
index e68ae2155db3..9a6f8b1bebcd 100644
@@ -23,10 +23,7 @@ extern void intel_mid_pwr_power_off(void);
 extern int intel_mid_pwr_get_lss_id(struct pci_dev *pdev);
 
 extern int get_gpio_by_name(const char *name);
-extern int __init sfi_parse_mrtc(struct sfi_table_header *table);
 extern int __init sfi_parse_mtmr(struct sfi_table_header *table);
-extern int sfi_mrtc_num;
-extern struct sfi_rtc_table_entry sfi_mrtc_array[];
 
 /*
  * Here defines the array of devices platform data that IAFW would export
@@ -112,13 +109,6 @@ extern enum intel_mid_timer_options intel_mid_timer_options;
 #define BSEL_SOC_FUSE_111		0x7
 
 #define SFI_MTMR_MAX_NUM		8
-#define SFI_MRTC_MAX			8
-
-/* VRTC timer */
-#define MRST_VRTC_MAP_SZ		1024
-/* #define MRST_VRTC_PGOFFSET		0xc00 */
-
-extern void intel_mid_rtc_init(void);
 
 /* The offset for the mapping of global gpio pin to irq */
 #define INTEL_MID_IRQ_OFFSET		0x100
arch/x86/include/asm/intel_mid_vrtc.h deleted +0 -10
deleted file mode 100644
index 0b44b1abe4d9..000000000000
@@ -1,10 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef _INTEL_MID_VRTC_H
-#define _INTEL_MID_VRTC_H
-
-extern unsigned char vrtc_cmos_read(unsigned char reg);
-extern void vrtc_cmos_write(unsigned char val, unsigned char reg);
-extern void vrtc_get_time(struct timespec64 *now);
-extern int vrtc_set_mmss(const struct timespec64 *now);
-
-#endif
arch/x86/include/asm/intel_scu_ipc_legacy.h +0 -5
index 4cf13fecb673..2232197c24f8 100644
@@ -14,11 +14,6 @@
 #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 */
-
 /* Don't call these in new code - they will be removed eventually */
 
 /* Read single register */
arch/x86/platform/intel-mid/Makefile +1 -1
index cc2549f0ccb1..5794e661050c 100644
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-only
-obj-$(CONFIG_X86_INTEL_MID) += intel-mid.o intel_mid_vrtc.o pwr.o
+obj-$(CONFIG_X86_INTEL_MID) += intel-mid.o pwr.o
 
 # SFI specific code
 ifdef CONFIG_X86_INTEL_MID
arch/x86/platform/intel-mid/intel-mid.c +0 -2
index 780728161f7d..ada39fb426dd 100644
@@ -25,7 +25,6 @@
 #include <asm/apic.h>
 #include <asm/io_apic.h>
 #include <asm/intel-mid.h>
-#include <asm/intel_mid_vrtc.h>
 #include <asm/io.h>
 #include <asm/i8259.h>
 #include <asm/intel_scu_ipc.h>
@@ -159,7 +158,6 @@ void __init x86_intel_mid_early_setup(void)
 
 	x86_init.timers.timer_init = intel_mid_time_init;
 	x86_init.timers.setup_percpu_clockev = x86_init_noop;
-	x86_init.timers.wallclock_init = intel_mid_rtc_init;
 
 	x86_init.irqs.pre_vector_init = x86_init_noop;
 
arch/x86/platform/intel-mid/intel_mid_vrtc.c deleted +0 -173

173 lines not on this page · raw message

arch/x86/platform/intel-mid/sfi.c +0 -42

62 lines not on this page · raw message

Signature · 1 line
2.29.2
#9 lore raw

PATCH 9/10 x86/apb_timer: Remove driver for deprecated platform

In reply to Andy Shevchenko

Intel Moorestown and Medfield are quite old Intel Atom based 32-bit platforms, which were in limited use in some Android phones, tablets and consumer electronics more than eight years ago.

There are no bugs or problems ever reported outside from Intel for breaking any of that platforms for years. It seems no real users exists who run more or less fresh kernel on it. The commit 05f4434bc130 ("ASoC: Intel: remove mfld_machine") also in align with this theory.

Due to above and to reduce a burden of supporting outdated drivers we remove the support of outdated platforms completely.

---
 .../admin-guide/kernel-parameters.txt         |   6 -
 arch/x86/Kconfig                              |  12 -
 arch/x86/include/asm/apb_timer.h              |  40 --
 arch/x86/include/asm/intel-mid.h              |  11 -
 arch/x86/kernel/Makefile                      |   1 -
 arch/x86/kernel/apb_timer.c                   | 347 ------------------
 arch/x86/platform/intel-mid/intel-mid.c       |  77 +---
 arch/x86/platform/intel-mid/sfi.c             |  75 ----
 8 files changed, 3 insertions(+), 566 deletions(-)
 delete mode 100644 arch/x86/include/asm/apb_timer.h
 delete mode 100644 arch/x86/kernel/apb_timer.c
Documentation/admin-guide/kernel-parameters.txt +0 -6
index c722ec19cd00..87a76a04189f 100644
@@ -5932,12 +5932,6 @@
 			default x2apic cluster mode on platforms
 			supporting x2apic.
 
-	x86_intel_mid_timer= [X86-32,APBT]
-			Choose timer option for x86 Intel MID platform.
-			Two valid options are apbt timer only and lapic timer
-			plus one apbt timer for broadcast timer.
-			x86_intel_mid_timer=apbt_only | lapic_and_apbt
-
 	xen_512gb_limit		[KNL,X86-64,XEN]
 			Restricts the kernel running paravirtualized under Xen
 			to use only up to 512 GB of RAM. The reason to do so is
arch/x86/Kconfig +0 -12
index 7b6dd10b162a..66539749ff43 100644
@@ -891,18 +891,6 @@ config HPET_EMULATE_RTC
 	def_bool y
 	depends on HPET_TIMER && (RTC=y || RTC=m || RTC_DRV_CMOS=m || RTC_DRV_CMOS=y)
 
-config APB_TIMER
-	def_bool y if X86_INTEL_MID
-	prompt "Intel MID APB Timer Support" if X86_INTEL_MID
-	select DW_APB_TIMER
-	depends on X86_INTEL_MID && SFI
-	help
-	 APB timer is the replacement for 8254, HPET on X86 MID platforms.
-	 The APBT provides a stable time base on SMP
-	 systems, unlike the TSC, but it is more expensive to access,
-	 as it is off-chip. APB timers are always running regardless of CPU
-	 C states, they are used as per CPU clockevent device when possible.
-
 # Mark as expert because too many people got it wrong.
 # The code disables itself when not needed.
 config DMI
arch/x86/include/asm/apb_timer.h deleted +0 -40
deleted file mode 100644
index 87ce8e963215..000000000000
@@ -1,40 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * apb_timer.h: Driver for Langwell APB timer based on Synopsis DesignWare
- *
- * (C) Copyright 2009 Intel Corporation
- * Author: Jacob Pan ([email protected])
- *
- * Note:
- */
-
-#ifndef ASM_X86_APBT_H
-#define ASM_X86_APBT_H
-#include <linux/sfi.h>
-
-#ifdef CONFIG_APB_TIMER
-
-/* default memory mapped register base */
-#define LNW_SCU_ADDR           0xFF100000
-#define LNW_EXT_TIMER_OFFSET   0x1B800
-#define APBT_DEFAULT_BASE      (LNW_SCU_ADDR+LNW_EXT_TIMER_OFFSET)
-#define LNW_EXT_TIMER_PGOFFSET         0x800
-
-/* APBT clock speed range from PCLK to fabric base, 25-100MHz */
-#define APBT_MAX_FREQ          50000000
-#define APBT_MIN_FREQ          1000000
-#define APBT_MMAP_SIZE         1024
-
-extern void apbt_time_init(void);
-extern void apbt_setup_secondary_clock(void);
-
-extern struct sfi_timer_table_entry *sfi_get_mtmr(int hint);
-extern void sfi_free_mtmr(struct sfi_timer_table_entry *mtmr);
-extern int sfi_mtimer_num;
-
-#else /* CONFIG_APB_TIMER */
-
-static inline void apbt_time_init(void) { }
-
-#endif
-#endif /* ASM_X86_APBT_H */
arch/x86/include/asm/intel-mid.h +0 -11
index 9a6f8b1bebcd..7bda0587cf70 100644
@@ -23,7 +23,6 @@ extern void intel_mid_pwr_power_off(void);
 extern int intel_mid_pwr_get_lss_id(struct pci_dev *pdev);
 
 extern int get_gpio_by_name(const char *name);
-extern int __init sfi_parse_mtmr(struct sfi_table_header *table);
 
 /*
  * Here defines the array of devices platform data that IAFW would export
@@ -91,14 +90,6 @@ static inline void intel_scu_devices_destroy(void) { }
 
 #endif /* !CONFIG_X86_INTEL_MID */
 
-enum intel_mid_timer_options {
-	INTEL_MID_TIMER_DEFAULT,
-	INTEL_MID_TIMER_APBT_ONLY,
-	INTEL_MID_TIMER_LAPIC_APBT,
-};
-
-extern enum intel_mid_timer_options intel_mid_timer_options;
-
 /* Bus Select SoC Fuse value */
 #define BSEL_SOC_FUSE_MASK		0x7
 /* FSB 133MHz */
@@ -108,8 +99,6 @@ extern enum intel_mid_timer_options intel_mid_timer_options;
 /* FSB 83MHz */
 #define BSEL_SOC_FUSE_111		0x7
 
-#define SFI_MTMR_MAX_NUM		8
-
 /* The offset for the mapping of global gpio pin to irq */
 #define INTEL_MID_IRQ_OFFSET		0x100
 
arch/x86/kernel/Makefile +0 -1
index 5eeb808eb024..2ddf08351f0b 100644
@@ -116,7 +116,6 @@ obj-$(CONFIG_VM86)		+= vm86_32.o
 obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
 
 obj-$(CONFIG_HPET_TIMER) 	+= hpet.o
-obj-$(CONFIG_APB_TIMER)		+= apb_timer.o
 
 obj-$(CONFIG_AMD_NB)		+= amd_nb.o
 obj-$(CONFIG_DEBUG_NMI_SELFTEST) += nmi_selftest.o
arch/x86/kernel/apb_timer.c deleted +0 -347

347 lines not on this page · raw message

arch/x86/platform/intel-mid/intel-mid.c +3 -74

102 lines not on this page · raw message

arch/x86/platform/intel-mid/sfi.c +0 -75

98 lines not on this page · raw message

Signature · 1 line
2.29.2
#10 lore raw

PATCH 10/10 mfd: intel_msic: Remove driver for deprecated platform

In reply to Andy Shevchenko

Intel Moorestown and Medfield are quite old Intel Atom based 32-bit platforms, which were in limited use in some Android phones, tablets and consumer electronics more than eight years ago.

There are no bugs or problems ever reported outside from Intel for breaking any of that platforms for years. It seems no real users exists who run more or less fresh kernel on it. The commit 05f4434bc130 ("ASoC: Intel: remove mfld_machine") also in align with this theory.

Due to above and to reduce a burden of supporting outdated drivers we remove the support of outdated platforms completely.

---
 MAINTAINERS                                 |   2 -
 arch/x86/include/asm/intel_scu_ipc_legacy.h |  12 -
 drivers/mfd/Kconfig                         |   9 -
 drivers/mfd/Makefile                        |   1 -
 drivers/mfd/intel_msic.c                    | 425 ------------------
 include/linux/mfd/intel_msic.h              | 453 --------------------
 6 files changed, 902 deletions(-)
 delete mode 100644 drivers/mfd/intel_msic.c
 delete mode 100644 include/linux/mfd/intel_msic.h
MAINTAINERS +0 -2
index a5f161c9a059..420693499bd9 100644
@@ -9102,9 +9102,7 @@ F:	drivers/gpio/gpio-*cove.c
 INTEL PMIC MULTIFUNCTION DEVICE DRIVERS
 M:	Andy Shevchenko <[email protected]>
 S:	Maintained
-F:	drivers/mfd/intel_msic.c
 F:	drivers/mfd/intel_soc_pmic*
-F:	include/linux/mfd/intel_msic.h
 F:	include/linux/mfd/intel_soc_pmic*
 
 INTEL PMT DRIVER
arch/x86/include/asm/intel_scu_ipc_legacy.h +0 -12
index 2232197c24f8..f8b87d8face7 100644
@@ -16,24 +16,12 @@
 
 /* Don't call these in new code - they will be removed eventually */
 
-/* Read single register */
-static inline int intel_scu_ipc_ioread8(u16 addr, u8 *data)
-{
-	return intel_scu_ipc_dev_ioread8(NULL, addr, data);
-}
-
 /* Read a vector */
 static inline int intel_scu_ipc_readv(u16 *addr, u8 *data, int len)
 {
 	return intel_scu_ipc_dev_readv(NULL, addr, data, len);
 }
 
-/* Write single register */
-static inline int intel_scu_ipc_iowrite8(u16 addr, u8 data)
-{
-	return intel_scu_ipc_dev_iowrite8(NULL, addr, data);
-}
-
 /* Write a vector */
 static inline int intel_scu_ipc_writev(u16 *addr, u8 *data, int len)
 {
drivers/mfd/Kconfig +0 -9
index bdfce7b15621..2dc58a92251b 100644
@@ -659,15 +659,6 @@ config MFD_INTEL_LPSS_PCI
 	  I2C, SPI and HS-UART starting from Intel Sunrisepoint (Intel Skylake
 	  PCH) in PCI mode.
 
-config MFD_INTEL_MSIC
-	bool "Intel MSIC"
-	depends on INTEL_SCU
-	select MFD_CORE
-	help
-	  Select this option to enable access to Intel MSIC (Avatele
-	  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
drivers/mfd/Makefile +0 -1
index 14fdb188af02..be19bc799073 100644
@@ -214,7 +214,6 @@ obj-$(CONFIG_MFD_ATMEL_SMC)	+= atmel-smc.o
 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_INTEL_PMT)	+= intel_pmt.o
 obj-$(CONFIG_MFD_PALMAS)	+= palmas.o
drivers/mfd/intel_msic.c deleted +0 -425

425 lines not on this page · raw message

include/linux/mfd/intel_msic.h deleted +0 -453

453 lines not on this page · raw message

Signature · 1 line
2.29.2
Acked-by on v1 10/10
#11 lore raw

Re: [PATCH v1 10/10] mfd: intel_msic: Remove driver for deprecated platform

Quoted 16 lines · Andy Shevchenko

Intel Moorestown and Medfield are quite old Intel Atom based 32-bit platforms, which were in limited use in some Android phones, tablets and consumer electronics more than eight years ago.

There are no bugs or problems ever reported outside from Intel for breaking any of that platforms for years. It seems no real users exists who run more or less fresh kernel on it. The commit 05f4434bc130 ("ASoC: Intel: remove mfld_machine") also in align with this theory.

Due to above and to reduce a burden of supporting outdated drivers we remove the support of outdated platforms completely.

Quoted 10 lines
---
 MAINTAINERS                                 |   2 -
 arch/x86/include/asm/intel_scu_ipc_legacy.h |  12 -
 drivers/mfd/Kconfig                         |   9 -
 drivers/mfd/Makefile                        |   1 -
 drivers/mfd/intel_msic.c                    | 425 ------------------
 include/linux/mfd/intel_msic.h              | 453 --------------------
 6 files changed, 902 deletions(-)
 delete mode 100644 drivers/mfd/intel_msic.c
 delete mode 100644 include/linux/mfd/intel_msic.h
Signature · 4 lines
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog
#12 lore raw
In reply to Andy Shevchenko
Quoted 7 lines · Andy Shevchenko

This is a second part of the Intel MID outdated platforms removal. First part is available as immutable branch [1]. The series has functional and build dependencies, so the mentioned branch should be used as a base for these changes.

Note, that some of the drivers, that arch/x86 covers, seems never appeared in the upstream (like msic_ocd).

What platforms stop working after this removal?

Are you sure no-one is using them?

I wouldn't be keen on breaking Janet's PC that she's been using daily and keeping up-to-date since the 90's.

Signature · 4 lines
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog
#13 lore raw
Quoted 11 lines · Lee Jones
Quoted 7 lines · Andy Shevchenko

This is a second part of the Intel MID outdated platforms removal. First part is available as immutable branch [1]. The series has functional and build dependencies, so the mentioned branch should be used as a base for these changes.

Note, that some of the drivers, that arch/x86 covers, seems never appeared in the upstream (like msic_ocd).

What platforms stop working after this removal?

Intel Moorstown, Medfield, Clovertrail.

Quoted 1 line

Are you sure no-one is using them?

Definitely.

Quoted 2 lines

I wouldn't be keen on breaking Janet's PC that she's been using daily and keeping up-to-date since the 90's.

They never were in PCs.

All of them were supported by Android and Janet won't update her phone or even Android tablet for sure they never ever run any kind of Linux than Android.

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#14 lore raw
Quoted 19 lines · Andy Shevchenko
Quoted 11 lines · Lee Jones
Quoted 7 lines · Andy Shevchenko

This is a second part of the Intel MID outdated platforms removal. First part is available as immutable branch [1]. The series has functional and build dependencies, so the mentioned branch should be used as a base for these changes.

Note, that some of the drivers, that arch/x86 covers, seems never appeared in the upstream (like msic_ocd).

What platforms stop working after this removal?

Intel Moorstown, Medfield, Clovertrail.

Quoted 1 line

Are you sure no-one is using them?

Definitely.

Quoted 7 lines
Quoted 2 lines

I wouldn't be keen on breaking Janet's PC that she's been using daily and keeping up-to-date since the 90's.

They never were in PCs.

All of them were supported by Android and Janet won't update her phone or even Android tablet for sure they never ever run any kind of Linux than Android.

So, I hope you are satisfied and we may proceed with removal.

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#15 lore raw
Quoted 24 lines · Andy Shevchenko
Quoted 22 lines · Andy Shevchenko
Quoted 11 lines · Lee Jones
Quoted 7 lines · Andy Shevchenko

This is a second part of the Intel MID outdated platforms removal. First part is available as immutable branch [1]. The series has functional and build dependencies, so the mentioned branch should be used as a base for these changes.

Note, that some of the drivers, that arch/x86 covers, seems never appeared in the upstream (like msic_ocd).

What platforms stop working after this removal?

Intel Moorstown, Medfield, Clovertrail.

Quoted 1 line

Are you sure no-one is using them?

Definitely.

Quoted 2 lines

I wouldn't be keen on breaking Janet's PC that she's been using daily and keeping up-to-date since the 90's.

Quoted 6 lines
Quoted 4 lines

They never were in PCs.

All of them were supported by Android and Janet won't update her phone or even Android tablet for sure they never ever run any kind of Linux than Android.

So, I hope you are satisfied and we may proceed with removal.

Speaking of which, the patches here are requisite for SFI support removal, so I'd like to route them through the ACPI tree if that's fine by all of the interested parties.

Thanks!

#16 lore raw
Quoted 2 lines · Rafael J. Wysocki

On Mon, Feb 1, 2021 at 7:45 PM Andy Shevchenko
<[email protected]> wrote:

...

Quoted 3 lines

Speaking of which, the patches here are requisite for SFI support removal, so I'd like to route them through the ACPI tree if that's fine by all of the interested parties.

Fine with me!

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#17 lore raw
In reply to Rafael J. Wysocki
Quoted 28 lines · Rafael J. Wysocki
Quoted 26 lines · Andy Shevchenko
Quoted 24 lines · Andy Shevchenko
Quoted 11 lines · Lee Jones
Quoted 7 lines · Andy Shevchenko

This is a second part of the Intel MID outdated platforms removal. First part is available as immutable branch [1]. The series has functional and build dependencies, so the mentioned branch should be used as a base for these changes.

Note, that some of the drivers, that arch/x86 covers, seems never appeared in the upstream (like msic_ocd).

What platforms stop working after this removal?

Intel Moorstown, Medfield, Clovertrail.

Quoted 1 line

Are you sure no-one is using them?

Definitely.

Quoted 2 lines

I wouldn't be keen on breaking Janet's PC that she's been using daily and keeping up-to-date since the 90's.

They never were in PCs.

Quoted 8 lines
Quoted 4 lines
Quoted 2 lines

All of them were supported by Android and Janet won't update her phone or even Android tablet for sure they never ever run any kind of Linux than Android.

So, I hope you are satisfied and we may proceed with removal.

Speaking of which, the patches here are requisite for SFI support removal, so I'd like to route them through the ACPI tree if that's fine by all of the interested parties.

Shouldn't cause too much disruption.

Ack provided.

Signature · 4 lines
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog
#18 lore raw
Quoted 36 lines · Lee Jones
Quoted 33 lines · Rafael J. Wysocki
Quoted 30 lines · Andy Shevchenko
Quoted 19 lines · Andy Shevchenko
Quoted 11 lines · Lee Jones
Quoted 7 lines · Andy Shevchenko

This is a second part of the Intel MID outdated platforms removal. First part is available as immutable branch [1]. The series has functional and build dependencies, so the mentioned branch should be used as a base for these changes.

Note, that some of the drivers, that arch/x86 covers, seems never appeared in the upstream (like msic_ocd).

What platforms stop working after this removal?

Intel Moorstown, Medfield, Clovertrail.

Quoted 1 line

Are you sure no-one is using them?

Definitely.

Quoted 7 lines
Quoted 2 lines

I wouldn't be keen on breaking Janet's PC that she's been using daily and keeping up-to-date since the 90's.

They never were in PCs.

All of them were supported by Android and Janet won't update her phone or even Android tablet for sure they never ever run any kind of Linux than Android.

So, I hope you are satisfied and we may proceed with removal.

Quoted 7 lines
Quoted 3 lines

Speaking of which, the patches here are requisite for SFI support removal, so I'd like to route them through the ACPI tree if that's fine by all of the interested parties.

Shouldn't cause too much disruption.

Ack provided.

Thanks!

This series has been applied as 5.12 material and will show up in linux-next on Friday if all goes well.

I can export an immutable branch with these commits if need be, in which case please let me know.

Andy, please proceed with the SFI support removal submission.

#19 lore raw
Quoted 1 line · Rafael J. Wysocki

On Tue, Feb 2, 2021 at 9:15 AM Lee Jones <[email protected]> wrote:

...

Quoted 5 lines

This series has been applied as 5.12 material and will show up in linux-next on Friday if all goes well.

I can export an immutable branch with these commits if need be, in which case please let me know.

I guess it makes sense just in case of a formal pinning, but if SFI will go through your tree, the only potential consumer will be that tree.

Quoted 1 line

Andy, please proceed with the SFI support removal submission.

Will do, thanks all!

Signature · 2 lines
With Best Regards,
Andy Shevchenko