GitHub/LineageOS/android_kernel_motorola_exynos9610.git
12 years agosparc32: use flushi when run-time patching in per_cpu_patch
Sam Ravnborg [Sun, 20 May 2012 15:27:53 +0000 (17:27 +0200)]
sparc32: use flushi when run-time patching in per_cpu_patch

Davis S. Miller wrote:
"
The way we do that now is overkill.  We only needed to use the MMU
cache ops when we had sun4c around because sun4c lacked support for
the "flush" instruction.

But all sun4m and later chips have it so we can use it
unconditionally.

So in the per_cpu_patch() code, get rid of the cache ops invocation,
and instead execute a "flush %reg" after each of the instruction patch
assignments, where %reg is set to the address of the instruction that
was stored into.

Perhaps take the flushi() definition from asm/cacheflush_64.h and
place it into asm/cacheflush.h, then you can simply use that.
"

Implemented as per suggestion.
Moved run-time patching before we call paging_init(),
so helper methods in paging_init() may utilise run-time patching too.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: fix cpuid_patch run-time patching
Sam Ravnborg [Sun, 20 May 2012 15:24:20 +0000 (17:24 +0200)]
sparc32: fix cpuid_patch run-time patching

We hang forever when trying to do run-time patching of instructions
identified by the cpuid_patch section

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: drop unused inline functions in srmmu.c
Sam Ravnborg [Sat, 19 May 2012 20:02:51 +0000 (20:02 +0000)]
sparc32: drop unused inline functions in srmmu.c

When decelared inline the compiler does not warn
about unused functions.
But they are not used so drop them.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: drop unused functions in pgtsrmmu.h
Sam Ravnborg [Sat, 19 May 2012 20:02:50 +0000 (20:02 +0000)]
sparc32: drop unused functions in pgtsrmmu.h

One function was only used by leon - move it to a leon specific file.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32,leon: move leon mmu functions to leon_mm.c
Sam Ravnborg [Sat, 19 May 2012 20:02:49 +0000 (20:02 +0000)]
sparc32,leon: move leon mmu functions to leon_mm.c

We already have a leaon specific file - so
keep all the laon stuff in one place.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Konrad Eisele <konrad@gaisler.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32,leon: remove duplicate definitions in leon.h
Sam Ravnborg [Sat, 19 May 2012 20:02:48 +0000 (20:02 +0000)]
sparc32,leon: remove duplicate definitions in leon.h

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Konrad Eisele <konrad@gaisler.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32,leon: remove duplicate UART register definitions
Sam Ravnborg [Sat, 19 May 2012 20:02:47 +0000 (20:02 +0000)]
sparc32,leon: remove duplicate UART register definitions

The registers are defined in leon_amba too.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Konrad Eisele <konrad@gaisler.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32,leon: move leon ASI definitions to asi.h
Sam Ravnborg [Sat, 19 May 2012 20:02:46 +0000 (20:02 +0000)]
sparc32,leon: move leon ASI definitions to asi.h

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Konrad Eisele <konrad@gaisler.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: move trap table to a separate file
Sam Ravnborg [Sat, 19 May 2012 20:02:45 +0000 (20:02 +0000)]
sparc32: move trap table to a separate file

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc64: renamed ttable.S to ttable_64.S
Sam Ravnborg [Sat, 19 May 2012 20:02:44 +0000 (20:02 +0000)]
sparc64: renamed ttable.S to ttable_64.S

To allow us to add ttable_32.S

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: Remove asm/sysen.h header.
David S. Miller [Sun, 20 May 2012 04:55:49 +0000 (21:55 -0700)]
sparc32: Remove asm/sysen.h header.

Defines a sun4c register, thus completely unused.

Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: Delete asm/smpprim.h
David S. Miller [Sun, 20 May 2012 04:51:02 +0000 (21:51 -0700)]
sparc32: Delete asm/smpprim.h

Completely unused.

Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: Remove unused empty_bad_page{,_table} declarations.
David S. Miller [Sun, 20 May 2012 04:45:08 +0000 (21:45 -0700)]
sparc32: Remove unused empty_bad_page{,_table} declarations.

Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: Kill boot_cpu_id4
David S. Miller [Sun, 20 May 2012 04:40:50 +0000 (21:40 -0700)]
sparc32: Kill boot_cpu_id4

It is written, but never actually read.

Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: Move GET_PROCESSOR*_ID() out of asm/asmmacro.h
David S. Miller [Sun, 20 May 2012 04:22:11 +0000 (21:22 -0700)]
sparc32: Move GET_PROCESSOR*_ID() out of asm/asmmacro.h

GET_PROCESSOR4D_ID is completely unused, so delete it.

Move GET_PROCESSOR4M_ID to the sun4m specific trap code
which uses it.

We now no longer need to include asm/asi.h

Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: Remove completely unused code from asm/cache.h
David S. Miller [Sun, 20 May 2012 04:15:37 +0000 (21:15 -0700)]
sparc32: Remove completely unused code from asm/cache.h

Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: Add ucmpdi2.o to obj-y instead of lib-y.
David S. Miller [Sat, 19 May 2012 22:27:01 +0000 (15:27 -0700)]
sparc32: Add ucmpdi2.o to obj-y instead of lib-y.

Otherwise if no references exist in the static kernel image,
we won't export the symbol properly to modules.

Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: add ucmpdi2
Sam Ravnborg [Sat, 19 May 2012 09:54:11 +0000 (11:54 +0200)]
sparc32: add ucmpdi2

Based on copy from microblaze add ucmpdi2 implementation.
This fixes build of niu driver which failed with:

drivers/built-in.o: In function `niu_get_nfc':
niu.c:(.text+0x91494): undefined reference to `__ucmpdi2'

This driver will never be used on a sparc32 system,
but patch added to fix build breakage with all*config builds.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc: introduce arch/sparc/Kbuild
Sam Ravnborg [Tue, 15 May 2012 19:27:15 +0000 (21:27 +0200)]
sparc: introduce arch/sparc/Kbuild

This allows us to do:

    make arch/sparc/

to build the core part of the sparc kernel.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc: remove obsolete documentation
Sam Ravnborg [Tue, 15 May 2012 20:10:22 +0000 (22:10 +0200)]
sparc: remove obsolete documentation

When we killed btfixup this readme no longer has any value.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc: clean up Makefile
Sam Ravnborg [Tue, 15 May 2012 19:21:55 +0000 (21:21 +0200)]
sparc: clean up Makefile

- delete unused variables
- align assignments
- drop stale comments
- kill use of "\" for line continuation

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: delete muldiv.o from Makefile
Sam Ravnborg [Tue, 15 May 2012 19:20:44 +0000 (21:20 +0200)]
sparc32: delete muldiv.o from Makefile

The source file is no more..

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: Kill off software 32-bit multiply/divide routines.
David S. Miller [Tue, 15 May 2012 18:23:01 +0000 (11:23 -0700)]
sparc32: Kill off software 32-bit multiply/divide routines.

For the explicit calls to .udiv/.umul in assembler, I made a
mechanical (read as: safe) transformation.  I didn't attempt
to make any simplifications.

In particular, __ndelay and __udelay can be simplified significantly.
Some of the %y reads are unnecessary and these routines have no need
any longer for allocating a register window, they can be leaf
functions.

Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: Build kernel with -mcpu=v8
David S. Miller [Tue, 15 May 2012 17:48:54 +0000 (10:48 -0700)]
sparc32: Build kernel with -mcpu=v8

With Cypress gone we can generate real hardware integer multiply
and divide instructions at will.

Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: cleanup mm/fault_32.c
Sam Ravnborg [Tue, 15 May 2012 17:02:08 +0000 (19:02 +0200)]
sparc32: cleanup mm/fault_32.c

- remove unused variables
- fix coding style issues that hurts my eyes

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: Remove cypress cpu support.
David S. Miller [Tue, 15 May 2012 05:02:08 +0000 (22:02 -0700)]
sparc32: Remove cypress cpu support.

It's the one aberration in v8, the only cpu that
didn't actually have hardware multiply and divide
instructions.

Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
12 years agosparc64: Remove pointless assignment in floppy support.
David S. Miller [Tue, 15 May 2012 03:59:25 +0000 (20:59 -0700)]
sparc64: Remove pointless assignment in floppy support.

Reported-by: Josip Rodin <joy@entuzijast.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: Kill unused hard_smp{4m,4d,leon}_processor_id() inlined.
David S. Miller [Mon, 14 May 2012 21:23:57 +0000 (14:23 -0700)]
sparc32: Kill unused hard_smp{4m,4d,leon}_processor_id() inlined.

Reported-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: drop build time btfixup patching
Sam Ravnborg [Mon, 14 May 2012 17:35:50 +0000 (19:35 +0200)]
sparc32: drop build time btfixup patching

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: remove runtime btfix support
Sam Ravnborg [Mon, 14 May 2012 15:58:57 +0000 (17:58 +0200)]
sparc32: remove runtime btfix support

- remove all uses of btfixup header
- remove the btfixup header
- remove the btfixup code

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: remove remaining users of btfixup
Sam Ravnborg [Mon, 14 May 2012 15:30:35 +0000 (17:30 +0200)]
sparc32: remove remaining users of btfixup

Use sparc_config to hold the last two function pointers.  There was no
point generating dedicated _ops structures only for these.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: move smp ipi to method ops
Sam Ravnborg [Mon, 14 May 2012 13:14:36 +0000 (15:14 +0200)]
sparc32: move smp ipi to method ops

I ended up renaming set_cpu_int to send_ipi to
be consistent all way around.
send_ipi was moved to the *_smp.c files so
we could call the relevant method direct,
without any _ops indirection.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: Implement hard_smp_processor_id() via instruction patching.
David S. Miller [Mon, 14 May 2012 06:09:04 +0000 (23:09 -0700)]
sparc32: Implement hard_smp_processor_id() via instruction patching.

This is the last non-trivial user of btfixup.

Like sparc64, use a special patch section to resolve the various
implementations of how to read the current CPU's ID when we don't
have current_thread_info()->cpu necessarily available.

Signed-off-by: David S. Miller <davem@davemloft.net>
Tested-by: Sam Ravnborg <sam@ravnborg.org>
12 years agosparc32: Move cache and TLB flushes over to method ops.
David S. Miller [Mon, 14 May 2012 03:49:31 +0000 (20:49 -0700)]
sparc32: Move cache and TLB flushes over to method ops.

This eliminated most of the remaining users of btfixup.

There are some complications because of the special cases we
have for sun4d, leon, and some flavors of viking.

It was found that there are no cases where a flush_page_for_dma
method was not hooked up to something, so the "noflush" iommu
methods were removed.

Add some documentation to the viking_sun4d_smp_ops to describe exactly
the hardware bug which causes us to need special TLB flushing on
sun4d.

Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: Remove unused declarations in srmmu.c
David S. Miller [Sun, 13 May 2012 22:27:09 +0000 (15:27 -0700)]
sparc32: Remove unused declarations in srmmu.c

Uses of these went away with the sun4c removal.

Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: Convert mmu_* interfaces from btfixup to method ops.
David S. Miller [Sun, 13 May 2012 20:57:05 +0000 (13:57 -0700)]
sparc32: Convert mmu_* interfaces from btfixup to method ops.

This set of changes displays one major danger of btfixup, interface
signatures are not always type checked fully.  As seen here the iounit
variant of the map_dma_area routine had an incorrect type for one of
it's arguments.

It turns out to be harmless in this case, but just imagine trying to
debug something involving this kind of problem.  No thanks.

Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc: Kill mmu_{un,}lockarea().
David S. Miller [Sun, 13 May 2012 20:23:16 +0000 (13:23 -0700)]
sparc: Kill mmu_{un,}lockarea().

These were used on sun4c during floppy data transfers since on that
chip we had to lock the cpu mappings into the TLB because we cannot
take a TLB miss during the assembler floppy interrupt handler that
does the data transfer.

That is no longer necessary since we've removed sun4c support, thus
this stuff can disappear completely.

Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: Un-btfixup update_mmu_cache().
David S. Miller [Sun, 13 May 2012 20:16:39 +0000 (13:16 -0700)]
sparc32: Un-btfixup update_mmu_cache().

The magic Swift SRMMU code in question has not been enabled for
something on the order of a decade, and it as well as it's comment
is there in the history in case we ever need it again.

Therefore all implementations are NOPs and we can kill this stuff
off.

Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: Kill btfixup for xchg()'s 'swap' instruction.
David S. Miller [Sun, 13 May 2012 20:07:16 +0000 (13:07 -0700)]
sparc32: Kill btfixup for xchg()'s 'swap' instruction.

We always have this instruction available, so no need to use
btfixup for it any more.

This also eradicates the whole of atomic_32.S and thus the
__atomic_begin and __atomic_end symbols completely.

Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: drop unused clear_cpu_int
Sam Ravnborg [Sun, 13 May 2012 13:43:41 +0000 (15:43 +0200)]
sparc32: drop unused clear_cpu_int

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: drop unused set_irq_udt
Sam Ravnborg [Sun, 13 May 2012 13:29:09 +0000 (15:29 +0200)]
sparc32: drop unused set_irq_udt

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: drop btfixup in page_32.h
Sam Ravnborg [Sun, 13 May 2012 08:45:18 +0000 (10:45 +0200)]
sparc32: drop btfixup in page_32.h

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: drop unused prototype from timer_32.h
Sam Ravnborg [Sun, 13 May 2012 08:35:20 +0000 (10:35 +0200)]
sparc32: drop unused prototype from timer_32.h

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: drop btfixup in mmu_context_32.h
Sam Ravnborg [Sun, 13 May 2012 08:30:54 +0000 (10:30 +0200)]
sparc32: drop btfixup in mmu_context_32.h

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: drop btfixup in pgtable_32.h
Sam Ravnborg [Sun, 13 May 2012 08:21:25 +0000 (10:21 +0200)]
sparc32: drop btfixup in pgtable_32.h

Only one function left using btfixup.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: drop btfixup in pgalloc_32.h
Sam Ravnborg [Sun, 13 May 2012 06:40:27 +0000 (08:40 +0200)]
sparc32: drop btfixup in pgalloc_32.h

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: Pass -mcpu=v7 explicitly to gcc.
David S. Miller [Sat, 12 May 2012 22:16:45 +0000 (15:16 -0700)]
sparc32: Pass -mcpu=v7 explicitly to gcc.

We should be agnostic to what gcc happens to be generating by default.

Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: Un-btfixup more PTE constants and PTE ops.
David S. Miller [Sat, 12 May 2012 20:54:58 +0000 (13:54 -0700)]
sparc32: Un-btfixup more PTE constants and PTE ops.

pte_{filei,wrprotecti,mkcleani,mkoldi}
pte_{mkwrite,mkdirty,mkyoung}

Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: Un-btfixup pte_{write,dirty,young}i
David S. Miller [Sat, 12 May 2012 20:48:10 +0000 (13:48 -0700)]
sparc32: Un-btfixup pte_{write,dirty,young}i

And we can certainly get rid of the const function attributes, there
is no way that's needed any longer and no other arch uses this kind
of annotation here.

Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: drop unused code in process_32
Sam Ravnborg [Sat, 12 May 2012 20:40:45 +0000 (22:40 +0200)]
sparc32: drop unused code in process_32

It is commented out using #ifdef 0 / #endif,
and has been so for a long time.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: Un-btfixup set_pte, pte_present, mk_pte{_phys,_io}().
David S. Miller [Sat, 12 May 2012 20:39:23 +0000 (13:39 -0700)]
sparc32: Un-btfixup set_pte, pte_present, mk_pte{_phys,_io}().

Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: drop loadmmu
Sam Ravnborg [Sat, 12 May 2012 18:35:52 +0000 (20:35 +0200)]
sparc32: drop loadmmu

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: Un-btfixup pmd_{bad,present}().
David S. Miller [Sat, 12 May 2012 20:30:28 +0000 (13:30 -0700)]
sparc32: Un-btfixup pmd_{bad,present}().

Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: Un-btfixup pgd_{none,bad,present}.
David S. Miller [Sat, 12 May 2012 20:13:16 +0000 (13:13 -0700)]
sparc32: Un-btfixup pgd_{none,bad,present}.

Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: Un-btfixup PAGE_{NONE,COPY,READONLY,SHARED,KERNEL}.
David S. Miller [Sat, 12 May 2012 19:52:47 +0000 (12:52 -0700)]
sparc32: Un-btfixup PAGE_{NONE,COPY,READONLY,SHARED,KERNEL}.

That lets us also get rid of the run-time initialization of
protection_map[] and all the ugly module workarounds for
PAGE_KERNEL and PAGE_SHARED to deal with the fact that we
can't do btfixups for modular code.

Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: Un-btfixup pmd_page and pte_pfn.
David S. Miller [Sat, 12 May 2012 19:33:08 +0000 (12:33 -0700)]
sparc32: Un-btfixup pmd_page and pte_pfn.

Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: Un-btfixup {pte,pmd,pgd}_clear().
David S. Miller [Sat, 12 May 2012 19:26:47 +0000 (12:26 -0700)]
sparc32: Un-btfixup {pte,pmd,pgd}_clear().

Also we can remove BTFIXUPCALL_SWAPO0G0 as that is no longer
used.

This was rather amusing, we were setting the btfixup vectors
based upon cpu type but all to the same exact generic srmmu
routines.

Furthermore, we were inconsistently marking the fixup as
either BTFIXUPCALL_SWAPO0G0 or BTFIXUPCALL_NORM.

What a mess, glad we could untangle this stuff.

Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: Un-btfixup PGDIR_{SHIFT,SIZE,MASK} {USER_,}PTRS_PER_{PGD,PMD}
David S. Miller [Sat, 12 May 2012 19:02:02 +0000 (12:02 -0700)]
sparc32: Un-btfixup PGDIR_{SHIFT,SIZE,MASK} {USER_,}PTRS_PER_{PGD,PMD}

Only one set of values exist, the SRMMU ones.

Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: drop unused type/extern
Sam Ravnborg [Sat, 12 May 2012 08:04:13 +0000 (08:04 +0000)]
sparc32: drop unused type/extern

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: drop btfixup for check_pgt_cache
Sam Ravnborg [Sat, 12 May 2012 08:04:12 +0000 (08:04 +0000)]
sparc32: drop btfixup for check_pgt_cache

It is a noop for srmmu - so use a define as sparc64 does.
And drop all sparc callers - no need to confuse our-self
be calling a noop function.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: drop btfixup for switch_mm
Sam Ravnborg [Sat, 12 May 2012 08:04:11 +0000 (08:04 +0000)]
sparc32: drop btfixup for switch_mm

This revealed that the implementation of switch_mm
had a bogus extra argument.
No harm as said argument was never used - but confusing.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: code cleanup in floppy glue
Sam Ravnborg [Sat, 12 May 2012 08:04:10 +0000 (08:04 +0000)]
sparc32: code cleanup in floppy glue

Small cleanup to improve readability.
Dropped one test for sparc_cpu_model -
we already know that only sun4m support floppy.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: fix warning in floopy glue
Sam Ravnborg [Sat, 12 May 2012 08:04:09 +0000 (08:04 +0000)]
sparc32: fix warning in floopy glue

Fix following warning:
arch/sparc/include/asm/floppy_32.h:342:5: warning: 'op' may be used uninitialized in this function

The warning are legitimite and we can end up using op uninitialized.
This fixes build with my gcc on UP.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: simpler cputype check in head_32.S
Sam Ravnborg [Sat, 12 May 2012 01:43:49 +0000 (01:43 +0000)]
sparc32: simpler cputype check in head_32.S

We know this is not a sun4/sun4c - as we checked earlier.
So no need to repeat the check.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: drop extra getprop call during boot
Sam Ravnborg [Sat, 12 May 2012 01:43:48 +0000 (01:43 +0000)]
sparc32: drop extra getprop call during boot

It was present only to support the sun4, sun4c boxes which
do not have the "compatible" property in the root-node
of the device tree.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: drop prom version check in head_32.S
Sam Ravnborg [Sat, 12 May 2012 01:43:47 +0000 (01:43 +0000)]
sparc32: drop prom version check in head_32.S

We already sorted out if we are a sun4/sun4c and halted.
So no need to check the prom version as we know this is
a v2 or v3 as sun4m, sun4d etc. does not use a v1 prom.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: remove sun4c specific variables from head_32.S
Sam Ravnborg [Sat, 12 May 2012 01:43:46 +0000 (01:43 +0000)]
sparc32: remove sun4c specific variables from head_32.S

This gives us back 7 pages...

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: Add back early sun4/sun4c detection so we can warn properly.
David S. Miller [Sat, 12 May 2012 08:02:11 +0000 (01:02 -0700)]
sparc32: Add back early sun4/sun4c detection so we can warn properly.

We need to do the check before we try to remap the kernel using
SRMMU operations.

Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: Trivial removal of sun4c references in comments.
David S. Miller [Sat, 12 May 2012 07:35:45 +0000 (00:35 -0700)]
sparc32: Trivial removal of sun4c references in comments.

I left some around, like the ones in the openprom headers, since
we need to think about which pieces of those datastructures and
code we can completely toss now.

Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: Remove sun4 and sun4c from enum sparc_cpu.
David S. Miller [Sat, 12 May 2012 07:23:23 +0000 (00:23 -0700)]
sparc32: Remove sun4 and sun4c from enum sparc_cpu.

All the remaining references are trivially removed since we've
just eliminated the final reference to sparc_cpu_model from
assembler code in commit b7d96ce189564e661909fbf8df39d7358149885b
("sparc32: Remove sparc_cpu_model read from floppy interrupt handler.")

Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: Remove sparc_cpu_model read from floppy interrupt handler.
David S. Miller [Sat, 12 May 2012 07:13:32 +0000 (00:13 -0700)]
sparc32: Remove sparc_cpu_model read from floppy interrupt handler.

Since we no longer test the cpu model value, no need to load
it into a register any more.

It just gets overwritten in the next instruction anyways. :-)

Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: Kill unused defines from asm/head_32.h
David S. Miller [Sat, 12 May 2012 04:43:11 +0000 (21:43 -0700)]
sparc32: Kill unused defines from asm/head_32.h

Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: Remove some more sun4c code from floppy glue.
David S. Miller [Sat, 12 May 2012 04:39:48 +0000 (21:39 -0700)]
sparc32: Remove some more sun4c code from floppy glue.

Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: Remove sun4c tlb/vac insn patching from entry.S
David S. Miller [Sat, 12 May 2012 04:35:36 +0000 (21:35 -0700)]
sparc32: Remove sun4c tlb/vac insn patching from entry.S

No longer used.

Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: Remove ldXa and stXa defines, unused.
David S. Miller [Sat, 12 May 2012 04:31:49 +0000 (21:31 -0700)]
sparc32: Remove ldXa and stXa defines, unused.

These were for sharing some MMU code between sun4 and sun4c.

Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: Remove sun4{,c} control reg definitions from contregs.h.
David S. Miller [Sat, 12 May 2012 04:29:17 +0000 (21:29 -0700)]
sparc32: Remove sun4{,c} control reg definitions from contregs.h.

No longer used.

Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: Remove sparc_lvl15_nmi().
David S. Miller [Sat, 12 May 2012 04:27:04 +0000 (21:27 -0700)]
sparc32: Remove sparc_lvl15_nmi().

No longer used.

Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: Restore SMP build and rectify sun4m NMI when non-SMP.
David S. Miller [Sat, 12 May 2012 04:23:05 +0000 (21:23 -0700)]
sparc32: Restore SMP build and rectify sun4m NMI when non-SMP.

The non-SMP sun4m NMI handler was still accessing SUN4C registers.

Fix that and share the sun4m NMI trap code between SMP and non-SMP
cases.

Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: Kill asm/vac-ops.h
David S. Miller [Sat, 12 May 2012 04:07:50 +0000 (21:07 -0700)]
sparc32: Kill asm/vac-ops.h

All sun4/sun4c stuff and unused.

Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: Stop warning about sun4/sun4c in SMP Kconfig option.
David S. Miller [Sat, 12 May 2012 04:01:47 +0000 (21:01 -0700)]
sparc32: Stop warning about sun4/sun4c in SMP Kconfig option.

Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: Remove sun4c floppy assembler.
David S. Miller [Sat, 12 May 2012 03:59:57 +0000 (20:59 -0700)]
sparc32: Remove sun4c floppy assembler.

There were two blocks of code for the two ways to twiddle
the terminal count pin in the AUXIO register, one for
sun4c and one for sun4m.  Kill the former.

Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: Put back SPARC_BRANCH.
David S. Miller [Sat, 12 May 2012 03:57:29 +0000 (20:57 -0700)]
sparc32: Put back SPARC_BRANCH.

It's needed for the floppy interrupt trap table patching.

Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: Kill SUN4C_LOCK_{VADDR,END} and associated comment.
David S. Miller [Sat, 12 May 2012 03:51:51 +0000 (20:51 -0700)]
sparc32: Kill SUN4C_LOCK_{VADDR,END} and associated comment.

No longer used.

Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc: Clear out unused asm/machines.h values.
David S. Miller [Sat, 12 May 2012 03:45:18 +0000 (20:45 -0700)]
sparc: Clear out unused asm/machines.h values.

Remove sun4 and sun4c machine ID values from asm/machines.h

Also kill NUM_SUN_MACHINES, use ARRAY_SIZE instead.

Kill asm/machines.h include and sun4c checks from asm/floppy_32.h

Remove asm/machines.h include from setup_32.c and time_32.c, unused.

Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc: Convert some assembler over to linakge.h's ENTRY/ENDPROC
David S. Miller [Sat, 12 May 2012 03:33:22 +0000 (20:33 -0700)]
sparc: Convert some assembler over to linakge.h's ENTRY/ENDPROC

Use those, instead of doing it all by hand.

Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: Remove inline strncmp "optimization" for constant counts.
David S. Miller [Sat, 12 May 2012 02:53:29 +0000 (19:53 -0700)]
sparc32: Remove inline strncmp "optimization" for constant counts.

Let the compiler do stuff like this.

Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: use inline versions of pgprot_noncached, pte_to_pgoff and pgoff_to_pte
Sam Ravnborg [Fri, 11 May 2012 11:35:17 +0000 (11:35 +0000)]
sparc32: use inline versions of pgprot_noncached, pte_to_pgoff and pgoff_to_pte

We no longer have different versions of these so use a few simple
static inline functions.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: drop btfixup for alloc_thread_info_node/free_thread_info
Sam Ravnborg [Fri, 11 May 2012 11:35:16 +0000 (11:35 +0000)]
sparc32: drop btfixup for alloc_thread_info_node/free_thread_info

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: drop sun4c bits from head_32.S
Sam Ravnborg [Fri, 11 May 2012 11:35:15 +0000 (11:35 +0000)]
sparc32: drop sun4c bits from head_32.S

As we no longer support sun4c we can remove all the code to
support remapping the kernel in head_32.S.
We also try to tell the user that the machine is not support,
in case someone try to boot the kernel on a sun4c one day

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: drop test for sun4c in signal_32
Sam Ravnborg [Fri, 11 May 2012 11:35:14 +0000 (11:35 +0000)]
sparc32: drop test for sun4c in signal_32

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: drop sun4c user stack checking routine
Sam Ravnborg [Fri, 11 May 2012 11:35:13 +0000 (11:35 +0000)]
sparc32: drop sun4c user stack checking routine

With this we no longer do any run-time patchings of traps.
So drop the function + macro to support this.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: drop sun4c stack checking routine
Sam Ravnborg [Fri, 11 May 2012 11:35:12 +0000 (11:35 +0000)]
sparc32: drop sun4c stack checking routine

And drop run-time patching too.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: drop sun4c window overflow stack checking routine
Sam Ravnborg [Fri, 11 May 2012 11:35:11 +0000 (11:35 +0000)]
sparc32: drop sun4c window overflow stack checking routine

Also drop run-time patching for srmmu

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: drop sun4c specific stack validation
Sam Ravnborg [Fri, 11 May 2012 11:35:10 +0000 (11:35 +0000)]
sparc32: drop sun4c specific stack validation

This allows us to kill run-time patching for this function too

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: delete pgtsun4c.h
Sam Ravnborg [Thu, 10 May 2012 21:12:10 +0000 (23:12 +0200)]
sparc32: delete pgtsun4c.h

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: remove all uses of ARCH_SUN4C
Sam Ravnborg [Fri, 11 May 2012 11:35:08 +0000 (11:35 +0000)]
sparc32: remove all uses of ARCH_SUN4C

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: drop sun4c specific ___xchg32 implementation
Sam Ravnborg [Fri, 11 May 2012 11:35:07 +0000 (11:35 +0000)]
sparc32: drop sun4c specific ___xchg32 implementation

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: remove sun4c traps
Sam Ravnborg [Fri, 11 May 2012 11:35:06 +0000 (11:35 +0000)]
sparc32: remove sun4c traps

We used to runtime patch the trap table for srmmu.
With the removal of sun4c support this is no longer required.

With the sun4c trap removed we can remove all the referenced
trap handling which is sun4c specific.
This also allows us to get rid of the nosun4c.c file that
contained only dummy functions/data.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: remove calls to sun4c dummy mm inits functions
Sam Ravnborg [Fri, 11 May 2012 11:35:05 +0000 (11:35 +0000)]
sparc32: remove calls to sun4c dummy mm inits functions

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agosparc32: drop sun4c support
Sam Ravnborg [Fri, 11 May 2012 11:35:04 +0000 (11:35 +0000)]
sparc32: drop sun4c support

Machines with sun4c support are very rare these days, and noone
is using them for any practical purposes.
The sun4c support has been know broken for quite some time too.

So rather than trying to keep it up-to-date, lets get rid of it.
This allows us to do some very welcome cleanup of sparc32 support.

Updated the former sun4c specifc nmi (which was also used
for sun4m UP) to be a generic UP NMI.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>