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

Commit 5ebacb27 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin:
  Blackfin: fix SMP build error in start_thread()
  Blackfin: fix memset in smp_send_reschedule() and -stop()
  Blackfin: fix typo in ptrace poking
  Blackfin: check for anomaly 05000475
  Blackfin: work around testset anomaly 05000477
  Blackfin: update anomaly lists
  Blackfin: fix cache Kconfig typo
  Blackfin: fix suspend/resume failure with some on-chip ROMs
parents 99d7832c aa23531c

arch/blackfin/kernel/bfin_dma_5xx.c

+7 −2
Original line number Diff line number Diff line
@@ -225,9 +225,14 @@ int blackfin_dma_suspend(void) 
void blackfin_dma_resume(void)

{

	int i;

	for (i = 0; i < MAX_DMA_SUSPEND_CHANNELS; ++i)



	for (i = 0; i < MAX_DMA_CHANNELS; ++i) {

		dma_ch[i].regs->cfg = 0;



		if (i < MAX_DMA_SUSPEND_CHANNELS)

			dma_ch[i].regs->peripheral_map = dma_ch[i].saved_peripheral_map;

	}

}

#endif



/**

arch/blackfin/kernel/cplb-mpu/cplbinit.c

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ void __init generate_cplb_tables_cpu(unsigned int cpu) 


#ifdef CONFIG_BFIN_EXTMEM_DCACHEABLE

	d_cache = CPLB_L1_CHBL;

#ifdef CONFIG_BFIN_EXTMEM_WRITETROUGH

#ifdef CONFIG_BFIN_EXTMEM_WRITETHROUGH

	d_cache |= CPLB_L1_AOW | CPLB_WT;

#endif

#endif

arch/blackfin/kernel/process.c

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ void start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_ 
	regs->pc = new_ip;

	if (current->mm)

		regs->p5 = current->mm->start_data;

#ifdef CONFIG_SMP

#ifndef CONFIG_SMP

	task_thread_info(current)->l1_task_info.stack_start =

		(void *)current->mm->context.stack_start;

	task_thread_info(current)->l1_task_info.lowest_sp = (void *)new_sp;

arch/blackfin/kernel/ptrace.c

+1 −1
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) 
			case BFIN_MEM_ACCESS_CORE:

			case BFIN_MEM_ACCESS_CORE_ONLY:

				copied = access_process_vm(child, addr, &data,

				                           to_copy, 0);

				                           to_copy, 1);

				if (copied)

					break;

arch/blackfin/mach-bf518/include/mach/anomaly.h

+14 −4
Original line number Diff line number Diff line 
/*

 * File: include/asm-blackfin/mach-bf518/anomaly.h

 * Bugs: Enter bugs at http://blackfin.uclinux.org/

 * DO NOT EDIT THIS FILE

 * This file is under version control at

 *   svn://sources.blackfin.uclinux.org/toolchain/trunk/proc-defs/header-frags/

 * and can be replaced with that version at any time

 * DO NOT EDIT THIS FILE

 *

 * Copyright (C) 2004-2009 Analog Devices Inc.

 * Licensed under the GPL-2 or later.

 * Copyright 2004-2009 Analog Devices Inc.

 * Licensed under the ADI BSD license.

 *   https://docs.blackfin.uclinux.org/doku.php?id=adi_bsd

 */



/* This file should be up to date with:
@@ -70,6 +74,10 @@ 
#define ANOMALY_05000461 (1)

/* Synchronization Problem at Startup May Cause SPORT Transmit Channels to Misalign */

#define ANOMALY_05000462 (1)

/* Interrupted 32-Bit SPORT Data Register Access Results In Underflow */

#define ANOMALY_05000473 (1)

/* TESTSET Instruction Cannot Be Interrupted */

#define ANOMALY_05000477 (1)



/* Anomalies that don't exist on this proc */

#define ANOMALY_05000099 (0)
@@ -133,5 +141,7 @@ 
#define ANOMALY_05000450 (0)

#define ANOMALY_05000465 (0)

#define ANOMALY_05000467 (0)

#define ANOMALY_05000474 (0)

#define ANOMALY_05000475 (0)



#endif