Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5766e9d2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-4.9-2' of git://git.code.sf.net/p/openipmi/linux-ipmi 

Pull IPMI updates from Corey Minyard:
 "A small bug fix and a new driver for acting as an IPMI device.

  I was on vacation during the merge window (a long vacation) but this
  is a bug fix that should go in and a new driver that shouldn't hurt
  anything.

  This has been in linux-next for a month or so"

* tag 'for-linus-4.9-2' of git://git.code.sf.net/p/openipmi/linux-ipmi:
  ipmi: fix crash on reading version from proc after unregisted bmc
  ipmi/bt-bmc: remove redundant return value check of platform_get_resource()
  ipmi/bt-bmc: add a dependency on ARCH_ASPEED
  ipmi: Fix ioremap error handling in bt-bmc
  ipmi: add an Aspeed BT IPMI BMC driver
parents 0c2b6dc4 bd85f4b3

Documentation/devicetree/bindings/ipmi/aspeed,ast2400-bt-bmc.txt

0 → 100644
+23 −0
Original line number Original line Diff line number Diff line 
* Aspeed BT (Block Transfer) IPMI interface



The Aspeed SOCs (AST2400 and AST2500) are commonly used as BMCs

(BaseBoard Management Controllers) and the BT interface can be used to

perform in-band IPMI communication with their host.



Required properties:



- compatible : should be "aspeed,ast2400-bt-bmc"

- reg: physical address and size of the registers



Optional properties:



- interrupts: interrupt generated by the BT interface. without an

  interrupt, the driver will operate in poll mode.



Example:



	ibt@1e789140 {

		compatible = "aspeed,ast2400-bt-bmc";

		reg = <0x1e789140 0x18>;

		interrupts = <8>;

	};

drivers/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -21,7 +21,7 @@ obj-y += video/ 
obj-y				+= idle/

obj-y				+= idle/





# IPMI must come before ACPI in order to provide IPMI opregion support

# IPMI must come before ACPI in order to provide IPMI opregion support

obj-$(CONFIG_IPMI_HANDLER)	+= char/ipmi/

obj-y				+= char/ipmi/





obj-$(CONFIG_ACPI)		+= acpi/

obj-$(CONFIG_ACPI)		+= acpi/

obj-$(CONFIG_SFI)		+= sfi/

obj-$(CONFIG_SFI)		+= sfi/

drivers/char/ipmi/Kconfig

+8 −0
Original line number Original line Diff line number Diff line
@@ -76,3 +76,11 @@ config IPMI_POWEROFF 
	 the IPMI management controller is capable of this.

	 the IPMI management controller is capable of this.





endif # IPMI_HANDLER

endif # IPMI_HANDLER



config ASPEED_BT_IPMI_BMC

	depends on ARCH_ASPEED

	tristate "BT IPMI bmc driver"

	help

	  Provides a driver for the BT (Block Transfer) IPMI interface

	  found on Aspeed SOCs (AST2400 and AST2500). The driver

	  implements the BMC side of the BT interface.

drivers/char/ipmi/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -11,3 +11,4 @@ obj-$(CONFIG_IPMI_SSIF) += ipmi_ssif.o 
obj-$(CONFIG_IPMI_POWERNV) += ipmi_powernv.o

obj-$(CONFIG_IPMI_POWERNV) += ipmi_powernv.o

obj-$(CONFIG_IPMI_WATCHDOG) += ipmi_watchdog.o

obj-$(CONFIG_IPMI_WATCHDOG) += ipmi_watchdog.o

obj-$(CONFIG_IPMI_POWEROFF) += ipmi_poweroff.o

obj-$(CONFIG_IPMI_POWEROFF) += ipmi_poweroff.o

obj-$(CONFIG_ASPEED_BT_IPMI_BMC) += bt-bmc.o