Commit c4fbde84 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sfi-removal-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull Simple Firmware Interface (SFI) support removal from Rafael Wysocki:
 "Drop support for depercated platforms using SFI, drop the entire
  support for SFI that has been long deprecated too and make some
  janitorial changes on top of that (Andy Shevchenko)"

* tag 'sfi-removal-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  x86/platform/intel-mid: Update Copyright year and drop file names
  x86/platform/intel-mid: Remove unused header inclusion in intel-mid.h
  x86/platform/intel-mid: Drop unused __intel_mid_cpu_chip and Co.
  x86/platform/intel-mid: Get rid of intel_scu_ipc_legacy.h
  x86/PCI: Describe @reg for type1_access_ok()
  x86/PCI: Get rid of custom x86 model comparison
  sfi: Remove framework for deprecated firmware
  cpufreq: sfi-cpufreq: Remove driver for deprecated firmware
  media: atomisp: Remove unused header
  mfd: intel_msic: Remove driver for deprecated platform
  x86/apb_timer: Remove driver for deprecated platform
  x86/platform/intel-mid: Remove unused leftovers (vRTC)
  x86/platform/intel-mid: Remove unused leftovers (msic)
  x86/platform/intel-mid: Remove unused leftovers (msic_thermal)
  x86/platform/intel-mid: Remove unused leftovers (msic_power_btn)
  x86/platform/intel-mid: Remove unused leftovers (msic_gpio)
  x86/platform/intel-mid: Remove unused leftovers (msic_battery)
  x86/platform/intel-mid: Remove unused leftovers (msic_ocd)
  x86/platform/intel-mid: Remove unused leftovers (msic_audio)
  platform/x86: intel_scu_wdt: Drop mistakenly added const
parents e229b429 c9c26882

Documentation/ABI/testing/sysfs-firmware-sfi

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
What:		/sys/firmware/sfi/tables/

Date:		May 2010

Contact:	Len Brown <lenb@kernel.org>

Description:

		SFI defines a number of small static memory tables

		so the kernel can get platform information from firmware.



		The tables are defined in the latest SFI specification:

		http://simplefirmware.org/documentation



		While the tables are used by the kernel, user-space

		can observe them this way::



		  # cd /sys/firmware/sfi/tables

		  # cat $TABLENAME > $TABLENAME.bin

Documentation/ABI/testing/sysfs-platform-kim

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ Description: 
		is connected. example: "/dev/ttyS0".



		The device name flows down to architecture specific board

		initialization file from the SFI/ATAGS bootloader

		initialization file from the ATAGS bootloader

		firmware. The name exposed is read from the user-space

		dameon and opens the device when install is requested.

Documentation/admin-guide/kernel-parameters.txt

+0 −6
Original line number Diff line number Diff line
@@ -5990,12 +5990,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

MAINTAINERS

+0 −9
Original line number Diff line number Diff line
@@ -9122,9 +9122,7 @@ F: drivers/gpio/gpio-*cove.c 
INTEL PMIC MULTIFUNCTION DEVICE DRIVERS

M:	Andy Shevchenko <andy@kernel.org>

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








@@ -16322,13 +16320,6 @@ S:	Maintained







F:	Documentation/devicetree/bindings/i3c/silvaco,i3c-master.yaml









F:	drivers/i3c/master/svc-i3c-master.c

















SIMPLE FIRMWARE INTERFACE (SFI)









S:	Obsolete









W:	http://simplefirmware.org/









F:	arch/x86/platform/sfi/









F:	drivers/sfi/









F:	include/linux/sfi*.h

















SIMPLEFB FB DRIVER









M:	Hans de Goede <hdegoede@redhat.com>









L:	linux-fbdev@vger.kernel.org
































arch/x86/Kconfig



+2
−17






























Original line number
Diff line number
Diff line







@@ -448,7 +448,7 @@ config X86_X2APIC







	  If you don't know what to do here, say N.



















config X86_MPPARSE









	bool "Enable MPS table" if ACPI || SFI









	bool "Enable MPS table" if ACPI









	default y









	depends on X86_LOCAL_APIC









	help








@@ -607,7 +607,6 @@ config X86_INTEL_MID







	depends on PCI









	depends on X86_64 || (PCI_GOANY && X86_32)









	depends on X86_IO_APIC









	select SFI









	select I2C









	select DW_APB_TIMER









	select APB_TIMER








@@ -896,18 +895,6 @@ config HPET_EMULATE_RTC







	def_bool y









	depends on HPET_TIMER && (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








@@ -2469,8 +2456,6 @@ source "kernel/power/Kconfig"

















source "drivers/acpi/Kconfig"



















source "drivers/sfi/Kconfig"



















config X86_APM_BOOT









	def_bool y









	depends on APM








@@ -2657,7 +2642,7 @@ config PCI_DIRECT







config PCI_MMCONFIG









	bool "Support mmconfig PCI config space access" if X86_64









	default y









	depends on PCI && (ACPI || SFI || JAILHOUSE_GUEST)









	depends on PCI && (ACPI || JAILHOUSE_GUEST)









	depends on X86_64 || (PCI_GOANY || PCI_GOMMCONFIG)



















config PCI_OLPC