Commit 34b85e35 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'powerpc-3.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux 

Pull second batch of powerpc updates from Michael Ellerman:
 "The highlight is the series that reworks the idle management on
  powernv, which allows us to use deeper idle states on those machines.

  There's the fix from Anton for the "BUG at kernel/smpboot.c:134!"
  problem.

  An i2c driver for powernv.  This is acked by Wolfram Sang, and he
  asked that we take it through the powerpc tree.

  A fix for audit from rgb at Red Hat, acked by Paul Moore who is one of
  the audit maintainers.

  A patch from Ben to export the symbol map of our OPAL firmware as a
  sysfs file, so that tools can use it.

  Also some CXL fixes, a couple of powerpc perf fixes, a fix for
  smt-enabled, and the patch to add __force to get_user() so we can use
  bitwise types"

* tag 'powerpc-3.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux:
  powerpc/powernv: Ignore smt-enabled on Power8 and later
  powerpc/uaccess: Allow get_user() with bitwise types
  powerpc/powernv: Expose OPAL firmware symbol map
  powernv/powerpc: Add winkle support for offline cpus
  powernv/cpuidle: Redesign idle states management
  powerpc/powernv: Enable Offline CPUs to enter deep idle states
  powerpc/powernv: Switch off MMU before entering nap/sleep/rvwinkle mode
  i2c: Driver to expose PowerNV platform i2c busses
  powerpc: add little endian flag to syscall_get_arch()
  power/perf/hv-24x7: Use kmem_cache_free() instead of kfree
  powerpc/perf/hv-24x7: Use per-cpu page buffer
  cxl: Unmap MMIO regions when detaching a context
  cxl: Add timeout to process element commands
  cxl: Change contexts_lock to a mutex to fix sleep while atomic bug
  powerpc: Secondary CPUs must set cpu_callin_map after setting active and online
parents d5e80b4b d70a54e2

Documentation/devicetree/bindings/i2c/i2c-opal.txt

0 → 100644
+37 −0
Original line number Diff line number Diff line 
Device-tree bindings for I2C OPAL driver

----------------------------------------



Most of the device node and properties layout is specific to the firmware and

used by the firmware itself for configuring the port. From the linux

perspective, the properties of use are "ibm,port-name" and "ibm,opal-id".



Required properties:



- reg: Port-id within a given master

- compatible: must be "ibm,opal-i2c"

- ibm,opal-id: Refers to a specific bus and used to identify it when calling

	       the relevant OPAL functions.

- bus-frequency: Operating frequency of the i2c bus (in HZ). Informational for

		 linux, used by the FW though.



Optional properties:

- ibm,port-name: Firmware provides this name that uniquely identifies the i2c

		 port.



The node contains a number of other properties that are used by the FW itself

and depend on the specific hardware implementation. The example below depicts

a P8 on-chip bus.



Example:



i2c-bus@0 {

	reg = <0x0>;

	bus-frequency = <0x61a80>;

	compatible = "ibm,power8-i2c-port", "ibm,opal-i2c";

	ibm,opal-id = <0x1>;

	ibm,port-name = "p8_00000000_e1p0";

	#address-cells = <0x1>;

	phandle = <0x10000006>;

	#size-cells = <0x0>;

	linux,phandle = <0x10000006>;

};

arch/powerpc/include/asm/cpuidle.h

0 → 100644
+20 −0
Original line number Diff line number Diff line 
#ifndef _ASM_POWERPC_CPUIDLE_H

#define _ASM_POWERPC_CPUIDLE_H



#ifdef CONFIG_PPC_POWERNV

/* Used in powernv idle state management */

#define PNV_THREAD_RUNNING              0

#define PNV_THREAD_NAP                  1

#define PNV_THREAD_SLEEP                2

#define PNV_THREAD_WINKLE               3

#define PNV_CORE_IDLE_LOCK_BIT          0x100

#define PNV_CORE_IDLE_THREAD_BITS       0x0FF



#ifndef __ASSEMBLY__

extern u32 pnv_fastsleep_workaround_at_entry[];

extern u32 pnv_fastsleep_workaround_at_exit[];

#endif



#endif



#endif

arch/powerpc/include/asm/opal.h

+42 −0
Original line number Diff line number Diff line
@@ -56,6 +56,14 @@ struct opal_sg_list { 
#define OPAL_HARDWARE_FROZEN	-13

#define OPAL_WRONG_STATE	-14

#define OPAL_ASYNC_COMPLETION	-15

#define OPAL_I2C_TIMEOUT	-17

#define OPAL_I2C_INVALID_CMD	-18

#define OPAL_I2C_LBUS_PARITY	-19

#define OPAL_I2C_BKEND_OVERRUN	-20

#define OPAL_I2C_BKEND_ACCESS	-21

#define OPAL_I2C_ARBT_LOST	-22

#define OPAL_I2C_NACK_RCVD	-23

#define OPAL_I2C_STOP_ERR	-24



/* API Tokens (in r0) */

#define OPAL_INVALID_CALL			-1
@@ -152,12 +160,25 @@ struct opal_sg_list { 
#define OPAL_PCI_ERR_INJECT			96

#define OPAL_PCI_EEH_FREEZE_SET			97

#define OPAL_HANDLE_HMI				98

#define OPAL_CONFIG_CPU_IDLE_STATE		99

#define OPAL_SLW_SET_REG			100

#define OPAL_REGISTER_DUMP_REGION		101

#define OPAL_UNREGISTER_DUMP_REGION		102

#define OPAL_WRITE_TPO				103

#define OPAL_READ_TPO				104

#define OPAL_IPMI_SEND				107

#define OPAL_IPMI_RECV				108

#define OPAL_I2C_REQUEST			109



/* Device tree flags */



/* Flags set in power-mgmt nodes in device tree if

 * respective idle states are supported in the platform.

 */

#define OPAL_PM_NAP_ENABLED	0x00010000

#define OPAL_PM_SLEEP_ENABLED	0x00020000

#define OPAL_PM_WINKLE_ENABLED	0x00040000

#define OPAL_PM_SLEEP_ENABLED_ER1	0x00080000



#ifndef __ASSEMBLY__
@@ -712,6 +733,24 @@ typedef struct oppanel_line { 
	uint64_t 	line_len;

} oppanel_line_t;



/* OPAL I2C request */

struct opal_i2c_request {

	uint8_t	type;

#define OPAL_I2C_RAW_READ	0

#define OPAL_I2C_RAW_WRITE	1

#define OPAL_I2C_SM_READ	2

#define OPAL_I2C_SM_WRITE	3

	uint8_t flags;

#define OPAL_I2C_ADDR_10	0x01	/* Not supported yet */

	uint8_t	subaddr_sz;		/* Max 4 */

	uint8_t reserved;

	__be16 addr;			/* 7 or 10 bit address */

	__be16 reserved2;

	__be32 subaddr;		/* Sub-address if any */

	__be32 size;			/* Data size */

	__be64 buffer_ra;		/* Buffer real address */

};



/* /sys/firmware/opal */

extern struct kobject *opal_kobj;
@@ -876,11 +915,14 @@ int64_t opal_sensor_read(uint32_t sensor_hndl, int token, __be32 *sensor_data); 
int64_t opal_handle_hmi(void);

int64_t opal_register_dump_region(uint32_t id, uint64_t start, uint64_t end);

int64_t opal_unregister_dump_region(uint32_t id);

int64_t opal_slw_set_reg(uint64_t cpu_pir, uint64_t sprn, uint64_t val);

int64_t opal_pci_set_phb_cxl_mode(uint64_t phb_id, uint64_t mode, uint64_t pe_number);

int64_t opal_ipmi_send(uint64_t interface, struct opal_ipmi_msg *msg,

		uint64_t msg_len);

int64_t opal_ipmi_recv(uint64_t interface, struct opal_ipmi_msg *msg,

		uint64_t *msg_len);

int64_t opal_i2c_request(uint64_t async_token, uint32_t bus_id,

			 struct opal_i2c_request *oreq);



/* Internal functions */

extern int early_init_dt_scan_opal(unsigned long node, const char *uname,

arch/powerpc/include/asm/paca.h

+10 −0
Original line number Diff line number Diff line
@@ -152,6 +152,16 @@ struct paca_struct { 
	u64 tm_scratch;                 /* TM scratch area for reclaim */

#endif



#ifdef CONFIG_PPC_POWERNV

	/* Per-core mask tracking idle threads and a lock bit-[L][TTTTTTTT] */

	u32 *core_idle_state_ptr;

	u8 thread_idle_state;		/* PNV_THREAD_RUNNING/NAP/SLEEP	*/

	/* Mask to indicate thread id in core */

	u8 thread_mask;

	/* Mask to denote subcore sibling threads */

	u8 subcore_sibling_mask;

#endif



#ifdef CONFIG_PPC_BOOK3S_64

	/* Exclusive emergency stack pointer for machine check exception. */

	void *mc_emergency_sp;

arch/powerpc/include/asm/ppc-opcode.h

+2 −0
Original line number Diff line number Diff line
@@ -194,6 +194,7 @@ 


#define PPC_INST_NAP			0x4c000364

#define PPC_INST_SLEEP			0x4c0003a4

#define PPC_INST_WINKLE			0x4c0003e4



/* A2 specific instructions */

#define PPC_INST_ERATWE			0x7c0001a6
@@ -375,6 +376,7 @@ 


#define PPC_NAP			stringify_in_c(.long PPC_INST_NAP)

#define PPC_SLEEP		stringify_in_c(.long PPC_INST_SLEEP)

#define PPC_WINKLE		stringify_in_c(.long PPC_INST_WINKLE)



/* BHRB instructions */

#define PPC_CLRBHRB		stringify_in_c(.long PPC_INST_CLRBHRB)

CRA Git | Maintained and supported by SUSTech CRA and CCSE