linux-next: manual merge of the tip tree with the mips tree

linux-next: manual merge of the tip tree with the mips tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2153 bytes --]

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/mips/Kconfig between commit 597ce1723e0f ("MIPS: Support for 64-bit
FP with O32 binaries") from the mips tree and commit 19952a92037e
("stackprotector: Unify the HAVE_CC_STACKPROTECTOR logic between
architectures") from the tip tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/mips/Kconfig
index 87dc0c3fe05f,c93d92beb3d6..000000000000
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@@ -2354,36 -2323,6 +2355,23 @@@ config SECCOM
  
  	  If unsure, say Y. Only embedded should say N here.
  
- config CC_STACKPROTECTOR
- 	bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"
- 	help
- 	  This option turns on the -fstack-protector GCC feature. This
- 	  feature puts, at the beginning of functions, a canary value on
- 	  the stack just before the return address, and validates
- 	  the value just before actually returning.  Stack based buffer
- 	  overflows (that need to overwrite this return address) now also
- 	  overwrite the canary, which gets detected and the attack is then
- 	  neutralized via a kernel panic.
- 
- 	  This feature requires gcc version 4.2 or above.
- 
 +config MIPS_O32_FP64_SUPPORT
 +	bool "Support for O32 binaries using 64-bit FP"
 +	depends on 32BIT || MIPS32_O32
 +	default y
 +	help
 +	  When this is enabled, the kernel will support use of 64-bit floating
 +	  point registers with binaries using the O32 ABI along with the
 +	  EF_MIPS_FP64 ELF header flag (typically built with -mfp64). On
 +	  32-bit MIPS systems this support is at the cost of increasing the
 +	  size and complexity of the compiled FPU emulator. Thus if you are
 +	  running a MIPS32 system and know that none of your userland binaries
 +	  will require 64-bit floating point, you may wish to reduce the size
 +	  of your kernel & potentially improve FP emulation performance by
 +	  saying N here.
 +
 +	  If unsure, say Y.
 +
  config USE_OF
  	bool
  	select OF

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the tip tree with the mips tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the tip tree got a conflict in:

  drivers/irqchip/irq-mips-gic.c

between commit:

  ac04be51a650 ("irqchip: mips-gic: Remove gic_map_to_vpe()")
  b6e583e41993 ("irqchip: mips-gic: Make pcpu_masks a per-cpu variable")
  6ab4fb2810db ("irqchip: mips-gic: Use pcpu_masks to avoid reading GIC_SH_MASK*")
  0429ecf6a6b4 ("irqchip: mips-gic: Use cpumask_first_and() in gic_set_affinity()")
  69aa0cbafce1 ("irqchip: mips-gic: Let the core set struct irq_common_data affinity")

from the mips tree and commit:

  18416e45b761 ("irqchip/mips-gic: Report that effective affinity is a single target")

from the tip tree.

I fixed it up (I think - see below, and please check result) and can
carry the fix as necessary. This is now fixed as far as linux-next is
concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging.  You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/irqchip/irq-mips-gic.c
index 7187af1bea03,6461380ff1a4..000000000000
--- a/drivers/irqchip/irq-mips-gic.c
+++ b/drivers/irqchip/irq-mips-gic.c
@@@ -261,16 -457,18 +261,17 @@@ static int gic_set_affinity(struct irq_
  	spin_lock_irqsave(&gic_lock, flags);
  
  	/* Re-route this IRQ */
 -	gic_map_to_vpe(irq, mips_cm_vp_id(cpu));
 +	write_gic_map_vp(irq, BIT(mips_cm_vp_id(cpu)));
  
  	/* Update the pcpu_masks */
 -	for (i = 0; i < min(gic_vpes, NR_CPUS); i++)
 -		clear_bit(irq, pcpu_masks[i].pcpu_mask);
 -	set_bit(irq, pcpu_masks[cpu].pcpu_mask);
 +	gic_clear_pcpu_masks(irq);
 +	if (read_gic_mask(irq))
 +		set_bit(irq, per_cpu_ptr(pcpu_masks, cpu));
  
 -	cpumask_copy(irq_data_get_affinity_mask(d), cpumask);
+ 	irq_data_update_effective_affinity(d, cpumask_of(cpu));
  	spin_unlock_irqrestore(&gic_lock, flags);
  
 -	return IRQ_SET_MASK_OK_NOCOPY;
 +	return IRQ_SET_MASK_OK;
  }
  #endif
  

linux-next: manual merge of the tip tree with the mips tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the tip tree got a conflict in:

  arch/mips/Kconfig

between commit:

  7a50e4688dab ("MIPS: Fix build error when SMP is used without GIC")

from the mips tree and commit:

  7eb8c99db26c ("MIPS: Delete smp-gic.c")

from the tip tree.

I fixed it up (I used the tip tree version since that removed the lines
updated by the mips tree patch) and can carry the fix as necessary
(no action is required).

-- 
Cheers,
Stephen Rothwell

Re: linux-next: manual merge of the tip tree with the mips tree

[Jiri Olsa]

On Mon, Apr 13, 2015 at 03:59:13PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the tip tree got a conflict in
> tools/perf/config/Makefile between commit 4fd6ce055817 ("perf tools:
> Hook up MIPS unwind and dwarf-regs in the Makefile") from the mips tree

hi,
I remember reviewing following patchset:
  [PATCH 1/2] perf tools: Add support for MIPS userspace DWARF callchains.
  [PATCH 2/2] perf tools: Hook up MIPS unwind and dwarf-regs in the Makefile

but it did not fit on top of current tip, v2 was needed,
which I haven't seen yet.. but I might have missed that,
in which case sorry for the noise ;-)

jirka

linux-next: manual merge of the tip tree with the mips tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1195 bytes --]

Hi all,

Today's linux-next merge of the tip tree got a conflict in
tools/perf/config/Makefile between commit 4fd6ce055817 ("perf tools:
Hook up MIPS unwind and dwarf-regs in the Makefile") from the mips tree
and commit 3bc3374cc50c ("perf build: Add perf regs objects building")
from the tip tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc tools/perf/config/Makefile
index 0d0595e1ece8,59a98c643240..000000000000
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@@ -43,13 -47,10 +50,17 @@@ ifeq ($(ARCH),arm64
    LIBUNWIND_LIBS = -lunwind -lunwind-aarch64
  endif
  
 +# Additional ARCH settings for MIPS
 +ifeq ($(ARCH),mips)
 +  ARCH_SUPPORTS_LIBUNWIND := 1
 +  NO_PERF_REGS := 0
 +  LIBUNWIND_LIBS = -lunwind -lunwind-mips
 +endif
 +
+ ifeq ($(NO_PERF_REGS),0)
+   $(call detected,CONFIG_PERF_REGS)
+ endif
+ 
  # So far there's only x86 and arm libdw unwind support merged in perf.
  # Disable it on all other architectures in case libdw unwind
  # support is detected in system. Add supported architectures

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

linux-next: manual merge of the tip tree with the mips tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 941 bytes --]

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/arm64/include/asm/Kbuild between commit 2f06dbe4e4fc ("arm64: use
generic dma-contiguous.h") from the mips tree and commit c5c38ef3d703
("irq_work: Introduce arch_irq_work_has_interrupt()") from the tip tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm64/include/asm/Kbuild
index 55c179b32dd9,c1968475cc4e..000000000000
--- a/arch/arm64/include/asm/Kbuild
+++ b/arch/arm64/include/asm/Kbuild
@@@ -9,9 -9,8 +9,9 @@@ generic-y += current.
  generic-y += delay.h
  generic-y += div64.h
  generic-y += dma.h
 +generic-y += dma-contiguous.h
- generic-y += emergency-restart.h
  generic-y += early_ioremap.h
+ generic-y += emergency-restart.h
  generic-y += errno.h
  generic-y += ftrace.h
  generic-y += hash.h

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

linux-next: manual merge of the tip tree with the mips tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1107 bytes --]

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/mips/netlogic/xlp/setup.c between commit 8e4857962d97 ("MIPS:
Netlogic: Core wakeup improvements") from the mips tree and commit
7972e966b032 ("MIPS: Remove panic_timeout settings") from the tip tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/mips/netlogic/xlp/setup.c
index c3af2d8772cf,54e75c77184b..000000000000
--- a/arch/mips/netlogic/xlp/setup.c
+++ b/arch/mips/netlogic/xlp/setup.c
@@@ -96,15 -92,6 +96,14 @@@ static void __init xlp_init_mem_from_ba
  
  void __init plat_mem_setup(void)
  {
 +#ifdef CONFIG_SMP
 +	nlm_wakeup_secondary_cpus();
 +
 +	/* update TLB size after waking up threads */
 +	current_cpu_data.tlbsize = ((read_c0_config6() >> 16) & 0xffff) + 1;
 +
 +	register_smp_ops(&nlm_smp_ops);
 +#endif
- 	panic_timeout	= 5;
  	_machine_restart = (void (*)(char *))nlm_linux_exit;
  	_machine_halt	= nlm_linux_exit;
  	pm_power_off	= nlm_linux_exit;

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the tip tree with the mips tree

[Deng-Cheng Zhu]

On 11/23/2011 10:01 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in
> arch/mips/kernel/perf_event_mipsxx.c between commit f40c522a4216
> ("MIPS/Perf-events: Remove erroneous check on active_events") and
> c481e48d9478 ("MIPS/Perf-events: Remove pmu and event state checking in
> validate_event()") from the mips tree and commit aa2bc1ade590 ("perf:
> Don't use -ENOSPC for out of PMU resources") from the tip tree.
>
> Just context changes (and one hunk was removed).  I fixed it up (see
> below) and can carry the fix as necessary.

Yes, I was aware of this conflict while writing that patch series based
on linux-mips tree. Your changes look good to me. Thanks for the fixup!


Deng-Cheng

linux-next: manual merge of the tip tree with the mips tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1460 bytes --]

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/mips/kernel/perf_event_mipsxx.c between commit f40c522a4216
("MIPS/Perf-events: Remove erroneous check on active_events") and
c481e48d9478 ("MIPS/Perf-events: Remove pmu and event state checking in
validate_event()") from the mips tree and commit aa2bc1ade590 ("perf:
Don't use -ENOSPC for out of PMU resources") from the tip tree.

Just context changes (and one hunk was removed).  I fixed it up (see
below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/mips/kernel/perf_event_mipsxx.c
index bda4bc9,315fc0b..0000000
--- a/arch/mips/kernel/perf_event_mipsxx.c
+++ b/arch/mips/kernel/perf_event_mipsxx.c
@@@ -710,16 -731,16 +710,16 @@@ static int validate_group(struct perf_e
  
  	memset(&fake_cpuc, 0, sizeof(fake_cpuc));
  
 -	if (!validate_event(&fake_cpuc, leader))
 +	if (mipsxx_pmu_alloc_counter(&fake_cpuc, &leader->hw) < 0)
- 		return -ENOSPC;
+ 		return -EINVAL;
  
  	list_for_each_entry(sibling, &leader->sibling_list, group_entry) {
 -		if (!validate_event(&fake_cpuc, sibling))
 +		if (mipsxx_pmu_alloc_counter(&fake_cpuc, &sibling->hw) < 0)
- 			return -ENOSPC;
+ 			return -EINVAL;
  	}
  
 -	if (!validate_event(&fake_cpuc, event))
 +	if (mipsxx_pmu_alloc_counter(&fake_cpuc, &event->hw) < 0)
- 		return -ENOSPC;
+ 		return -EINVAL;
  
  	return 0;
  }

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the tip tree with the mips tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 656 bytes --]

Hi all,

Today's linux-next merge of the tip tree got a conflict in
scripts/recordmcount.pl between commit
8faf0bcd7be5c9a86223a857f78e033e9cf5f1f5 ("MIPS: Tracing: Add an endian
argument to scripts/recordmcount.pl") from the mips tree and commit
e2d753fac5b3954a3b6001f98479f0435fe7c868 ("tracing: Correct the check for
number of arguments in recordmcount.pl") from the tip tree.

Just two updates to the same line.  I fixed it up (using the mips tree
version) and can carry the fix as necessary.  Thanks again, Ralf, for the
heads up.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]