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

Commit 838b4c02 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 

Pull powerpc fixes from Ben Herrenschmidt:
 "Here is a bunch of post-merge window fixes that have been accumulating
  in patchwork while I was on vacation or buried under other stuff last
  week.

  We have the now usual batch of LE fixes from Anton (sadly some new
  stuff that went into this merge window had endian issues, we'll try to
  make sure we do better next time)

  Some fixes and cleanups to the new 24x7 performance monitoring stuff
  (mostly typos and cleaning up printk's)

  A series of fixes for an issue with our runlatch bit, which wasn't set
  properly for offlined threads/cores and under KVM, causing potentially
  some counters to misbehave along with possible power management
  issues.

  A fix for kexec nasty race where the new kernel wouldn't "see" the
  secondary processors having reached back into firmware in time.

  And finally a few other misc (and pretty simple) bug fixes"

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (33 commits)
  powerpc/4xx: Fix section mismatch in ppc4xx_pci.c
  ppc/kvm: Clear the runlatch bit of a vcpu before napping
  ppc/kvm: Set the runlatch bit of a CPU just before starting guest
  ppc/powernv: Set the runlatch bits correctly for offline cpus
  powerpc/pseries: Protect remove_memory() with device hotplug lock
  powerpc: Fix error return in rtas_flash module init
  powerpc: Bump BOOT_COMMAND_LINE_SIZE to 2048
  powerpc: Bump COMMAND_LINE_SIZE to 2048
  powerpc: Rename duplicate COMMAND_LINE_SIZE define
  powerpc/perf/hv-24x7: Catalog version number is be64, not be32
  powerpc/perf/hv-24x7: Remove [static 4096], sparse chokes on it
  powerpc/perf/hv-24x7: Use (unsigned long) not (u32) values when calling plpar_hcall_norets()
  powerpc/perf/hv-gpci: Make device attr static
  powerpc/perf/hv_gpci: Probe failures use pr_debug(), and padding reduced
  powerpc/perf/hv_24x7: Probe errors changed to pr_debug(), padding fixed
  powerpc/mm: Fix tlbie to add AVAL fields for 64K pages
  powerpc/powernv: Fix little endian issues in OPAL dump code
  powerpc/powernv: Create OPAL sglist helper functions and fix endian issues
  powerpc/powernv: Fix little endian issues in OPAL error log code
  powerpc/powernv: Fix little endian issues with opal_do_notifier calls
  ...
parents 50f5aa8a e4565362

arch/powerpc/boot/main.c

+4 −4
Original line number Diff line number Diff line
@@ -139,18 +139,18 @@ static struct addr_range prep_initrd(struct addr_range vmlinux, void *chosen, 
 * edit the command line passed to vmlinux (by setting /chosen/bootargs).

 * The buffer is put in it's own section so that tools may locate it easier.

 */

static char cmdline[COMMAND_LINE_SIZE]

static char cmdline[BOOT_COMMAND_LINE_SIZE]

	__attribute__((__section__("__builtin_cmdline")));



static void prep_cmdline(void *chosen)

{

	if (cmdline[0] == '\0')

		getprop(chosen, "bootargs", cmdline, COMMAND_LINE_SIZE-1);

		getprop(chosen, "bootargs", cmdline, BOOT_COMMAND_LINE_SIZE-1);



	printf("\n\rLinux/PowerPC load: %s", cmdline);

	/* If possible, edit the command line */

	if (console_ops.edit_cmdline)

		console_ops.edit_cmdline(cmdline, COMMAND_LINE_SIZE);

		console_ops.edit_cmdline(cmdline, BOOT_COMMAND_LINE_SIZE);

	printf("\n\r");



	/* Put the command line back into the devtree for the kernel */
@@ -174,7 +174,7 @@ void start(void) 
	 * built-in command line wasn't set by an external tool */

	if ((loader_info.cmdline_len > 0) && (cmdline[0] == '\0'))

		memmove(cmdline, loader_info.cmdline,

			min(loader_info.cmdline_len, COMMAND_LINE_SIZE-1));

			min(loader_info.cmdline_len, BOOT_COMMAND_LINE_SIZE-1));



	if (console_ops.open && (console_ops.open() < 0))

		exit();

arch/powerpc/boot/ops.h

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include "types.h"

#include "string.h"



#define	COMMAND_LINE_SIZE	512

#define	BOOT_COMMAND_LINE_SIZE	2048

#define	MAX_PATH_LEN		256

#define	MAX_PROP_LEN		256 /* What should this be? */

arch/powerpc/boot/ps3.c

+2 −2
Original line number Diff line number Diff line
@@ -47,13 +47,13 @@ BSS_STACK(4096); 
 * The buffer is put in it's own section so that tools may locate it easier.

 */



static char cmdline[COMMAND_LINE_SIZE]

static char cmdline[BOOT_COMMAND_LINE_SIZE]

	__attribute__((__section__("__builtin_cmdline")));



static void prep_cmdline(void *chosen)

{

	if (cmdline[0] == '\0')

		getprop(chosen, "bootargs", cmdline, COMMAND_LINE_SIZE-1);

		getprop(chosen, "bootargs", cmdline, BOOT_COMMAND_LINE_SIZE-1);

	else

		setprop_str(chosen, "bootargs", cmdline);

arch/powerpc/include/asm/opal.h

+19 −23
Original line number Diff line number Diff line
@@ -41,14 +41,14 @@ struct opal_takeover_args { 
 * size except the last one in the list to be as well.

 */

struct opal_sg_entry {

	void    *data;

	long    length;

	__be64 data;

	__be64 length;

};



/* sg list */

/* SG list */

struct opal_sg_list {

	unsigned long num_entries;

	struct opal_sg_list *next;

	__be64 length;

	__be64 next;

	struct opal_sg_entry entry[];

};
@@ -858,8 +858,8 @@ int64_t opal_lpc_write(uint32_t chip_id, enum OpalLPCAddressType addr_type, 
int64_t opal_lpc_read(uint32_t chip_id, enum OpalLPCAddressType addr_type,

		      uint32_t addr, __be32 *data, uint32_t sz);



int64_t opal_read_elog(uint64_t buffer, size_t size, uint64_t log_id);

int64_t opal_get_elog_size(uint64_t *log_id, size_t *size, uint64_t *elog_type);

int64_t opal_read_elog(uint64_t buffer, uint64_t size, uint64_t log_id);

int64_t opal_get_elog_size(__be64 *log_id, __be64 *size, __be64 *elog_type);

int64_t opal_write_elog(uint64_t buffer, uint64_t size, uint64_t offset);

int64_t opal_send_ack_elog(uint64_t log_id);

void opal_resend_pending_logs(void);
@@ -868,23 +868,24 @@ int64_t opal_validate_flash(uint64_t buffer, uint32_t *size, uint32_t *result); 
int64_t opal_manage_flash(uint8_t op);

int64_t opal_update_flash(uint64_t blk_list);

int64_t opal_dump_init(uint8_t dump_type);

int64_t opal_dump_info(uint32_t *dump_id, uint32_t *dump_size);

int64_t opal_dump_info2(uint32_t *dump_id, uint32_t *dump_size, uint32_t *dump_type);

int64_t opal_dump_info(__be32 *dump_id, __be32 *dump_size);

int64_t opal_dump_info2(__be32 *dump_id, __be32 *dump_size, __be32 *dump_type);

int64_t opal_dump_read(uint32_t dump_id, uint64_t buffer);

int64_t opal_dump_ack(uint32_t dump_id);

int64_t opal_dump_resend_notification(void);



int64_t opal_get_msg(uint64_t buffer, size_t size);

int64_t opal_check_completion(uint64_t buffer, size_t size, uint64_t token);

int64_t opal_get_msg(uint64_t buffer, uint64_t size);

int64_t opal_check_completion(uint64_t buffer, uint64_t size, uint64_t token);

int64_t opal_sync_host_reboot(void);

int64_t opal_get_param(uint64_t token, uint32_t param_id, uint64_t buffer,

		size_t length);

		uint64_t length);

int64_t opal_set_param(uint64_t token, uint32_t param_id, uint64_t buffer,

		size_t length);

		uint64_t length);

int64_t opal_sensor_read(uint32_t sensor_hndl, int token, __be32 *sensor_data);



/* Internal functions */

extern int early_init_dt_scan_opal(unsigned long node, const char *uname, int depth, void *data);

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

				   int depth, void *data);

extern int early_init_dt_scan_recoverable_ranges(unsigned long node,

				 const char *uname, int depth, void *data);
@@ -893,10 +894,6 @@ extern int opal_put_chars(uint32_t vtermno, const char *buf, int total_len); 


extern void hvc_opal_init_early(void);



/* Internal functions */

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

				   int depth, void *data);



extern int opal_notifier_register(struct notifier_block *nb);

extern int opal_notifier_unregister(struct notifier_block *nb);
@@ -906,9 +903,6 @@ extern void opal_notifier_enable(void); 
extern void opal_notifier_disable(void);

extern void opal_notifier_update_evt(uint64_t evt_mask, uint64_t evt_val);



extern int opal_get_chars(uint32_t vtermno, char *buf, int count);

extern int opal_put_chars(uint32_t vtermno, const char *buf, int total_len);



extern int __opal_async_get_token(void);

extern int opal_async_get_token_interruptible(void);

extern int __opal_async_release_token(int token);
@@ -916,8 +910,6 @@ extern int opal_async_release_token(int token); 
extern int opal_async_wait_response(uint64_t token, struct opal_msg *msg);

extern int opal_get_sensor_data(u32 sensor_hndl, u32 *sensor_data);



extern void hvc_opal_init_early(void);



struct rtc_time;

extern int opal_set_rtc_time(struct rtc_time *tm);

extern void opal_get_rtc_time(struct rtc_time *tm);
@@ -937,6 +929,10 @@ extern int opal_resync_timebase(void); 


extern void opal_lpc_init(void);



struct opal_sg_list *opal_vmalloc_to_sg_list(void *vmalloc_addr,

					     unsigned long vmalloc_size);

void opal_free_sg_list(struct opal_sg_list *sg);



#endif /* __ASSEMBLY__ */



#endif /* __OPAL_H */

arch/powerpc/include/uapi/asm/setup.h

+6 −1
Original line number Diff line number Diff line 
#include <asm-generic/setup.h>
 
#ifndef _UAPI_ASM_POWERPC_SETUP_H

#define _UAPI_ASM_POWERPC_SETUP_H



#define COMMAND_LINE_SIZE	2048



#endif /* _UAPI_ASM_POWERPC_SETUP_H */