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

Commit 4ddebaf4 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:
 "Uli's patch fixes a regression in ptrace caused by a mis-merge of a
  previous LE patch.  The rest are all more endian fixes, all fairly
  trivial, found during testing of 3.13-rc's"

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/powernv: Fix OPAL LPC access in Little Endian
  powerpc/powernv: Fix endian issue in opal_xscom_read
  powerpc: Fix endian issues in crash dump code
  powerpc/pseries: Fix endian issues in MSI code
  powerpc/pseries: Fix PCIE link speed endian issue
  powerpc/pseries: Fix endian issues in nvram code
  powerpc/pseries: Fix endian issues in /proc/ppc64/lparcfg
  powerpc: Fix topology core_id endian issue on LE builds
  powerpc: Fix endian issue in setup-common.c
  powerpc: PTRACE_PEEKUSR always returns FPR0
parents f447ef4a 803c2d2f

arch/powerpc/include/asm/opal.h

+2 −2
Original line number Diff line number Diff line
@@ -720,13 +720,13 @@ int64_t opal_pci_next_error(uint64_t phb_id, uint64_t *first_frozen_pe, 
int64_t opal_pci_poll(uint64_t phb_id);

int64_t opal_return_cpu(void);



int64_t opal_xscom_read(uint32_t gcid, uint32_t pcb_addr, uint64_t *val);

int64_t opal_xscom_read(uint32_t gcid, uint32_t pcb_addr, __be64 *val);

int64_t opal_xscom_write(uint32_t gcid, uint32_t pcb_addr, uint64_t val);



int64_t opal_lpc_write(uint32_t chip_id, enum OpalLPCAddressType addr_type,

		       uint32_t addr, uint32_t data, uint32_t sz);

int64_t opal_lpc_read(uint32_t chip_id, enum OpalLPCAddressType addr_type,

		      uint32_t addr, uint32_t *data, uint32_t sz);

		      uint32_t addr, __be32 *data, uint32_t sz);

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);

arch/powerpc/kernel/crash_dump.c

+3 −3
Original line number Diff line number Diff line
@@ -124,15 +124,15 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf, 
void crash_free_reserved_phys_range(unsigned long begin, unsigned long end)

{

	unsigned long addr;

	const u32 *basep, *sizep;

	const __be32 *basep, *sizep;

	unsigned int rtas_start = 0, rtas_end = 0;



	basep = of_get_property(rtas.dev, "linux,rtas-base", NULL);

	sizep = of_get_property(rtas.dev, "rtas-size", NULL);



	if (basep && sizep) {

		rtas_start = *basep;

		rtas_end = *basep + *sizep;

		rtas_start = be32_to_cpup(basep);

		rtas_end = rtas_start + be32_to_cpup(sizep);

	}



	for (addr = begin; addr < end; addr += PAGE_SIZE) {

arch/powerpc/kernel/ptrace.c

+2 −2
Original line number Diff line number Diff line
@@ -1555,7 +1555,7 @@ long arch_ptrace(struct task_struct *child, long request, 


			flush_fp_to_thread(child);

			if (fpidx < (PT_FPSCR - PT_FPR0))

				memcpy(&tmp, &child->thread.fp_state.fpr,

				memcpy(&tmp, &child->thread.TS_FPR(fpidx),

				       sizeof(long));

			else

				tmp = child->thread.fp_state.fpscr;
@@ -1588,7 +1588,7 @@ long arch_ptrace(struct task_struct *child, long request, 


			flush_fp_to_thread(child);

			if (fpidx < (PT_FPSCR - PT_FPR0))

				memcpy(&child->thread.fp_state.fpr, &data,

				memcpy(&child->thread.TS_FPR(fpidx), &data,

				       sizeof(long));

			else

				child->thread.fp_state.fpscr = data;

arch/powerpc/kernel/setup-common.c

+2 −2
Original line number Diff line number Diff line
@@ -479,7 +479,7 @@ void __init smp_setup_cpu_maps(void) 
	if (machine_is(pseries) && firmware_has_feature(FW_FEATURE_LPAR) &&

	    (dn = of_find_node_by_path("/rtas"))) {

		int num_addr_cell, num_size_cell, maxcpus;

		const unsigned int *ireg;

		const __be32 *ireg;



		num_addr_cell = of_n_addr_cells(dn);

		num_size_cell = of_n_size_cells(dn);
@@ -489,7 +489,7 @@ void __init smp_setup_cpu_maps(void) 
		if (!ireg)

			goto out;



		maxcpus = ireg[num_addr_cell + num_size_cell];

		maxcpus = be32_to_cpup(ireg + num_addr_cell + num_size_cell);



		/* Double maxcpus for processors which have SMT capability */

		if (cpu_has_feature(CPU_FTR_SMT))

arch/powerpc/kernel/smp.c

+2 −2
Original line number Diff line number Diff line
@@ -580,7 +580,7 @@ int __cpu_up(unsigned int cpu, struct task_struct *tidle) 
int cpu_to_core_id(int cpu)

{

	struct device_node *np;

	const int *reg;

	const __be32 *reg;

	int id = -1;



	np = of_get_cpu_node(cpu, NULL);
@@ -591,7 +591,7 @@ int cpu_to_core_id(int cpu) 
	if (!reg)

		goto out;



	id = *reg;

	id = be32_to_cpup(reg);

out:

	of_node_put(np);

	return id;