Skip to content

L
linux
Commit 5bbec3cf authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge tag 'sh-for-5.9' of git://git.libc.org/linux-sh 

Pull arch/sh updates from Rich Felker:
 "Cleanup, SECCOMP_FILTER support, message printing fixes, and other
  changes to arch/sh"

* tag 'sh-for-5.9' of git://git.libc.org/linux-sh: (34 commits)
  sh: landisk: Add missing initialization of sh_io_port_base
  sh: bring syscall_set_return_value in line with other architectures
  sh: Add SECCOMP_FILTER
  sh: Rearrange blocks in entry-common.S
  sh: switch to copy_thread_tls()
  sh: use the generic dma coherent remap allocator
  sh: don't allow non-coherent DMA for NOMMU
  dma-mapping: consolidate the NO_DMA definition in kernel/dma/Kconfig
  sh: unexport register_trapped_io and match_trapped_io_handler
  sh: don't include <asm/io_trapped.h> in <asm/io.h>
  sh: move the ioremap implementation out of line
  sh: move ioremap_fixed details out of <asm/io.h>
  sh: remove __KERNEL__ ifdefs from non-UAPI headers
  sh: sort the selects for SUPERH alphabetically
  sh: remove -Werror from Makefiles
  sh: Replace HTTP links with HTTPS ones
  arch/sh/configs: remove obsolete CONFIG_SOC_CAMERA*
  sh: stacktrace: Remove stacktrace_ops.stack()
  sh: machvec: Modernize printing of kernel messages
  sh: pci: Modernize printing of kernel messages
  ...
parents 713eee84 0c64a0dc
Show whitespace changes
Inline Side-by-side
Showing with 370 additions and 998 deletions
arch/m68k/Kconfig
View file @ 5bbec3cf
...@@ -16,6 +16,7 @@ config M68K ...@@ -16,6 +16,7 @@ config M68K
select HAVE_DEBUG_BUGVERBOSE select HAVE_DEBUG_BUGVERBOSE
select GENERIC_IRQ_SHOW select GENERIC_IRQ_SHOW
select GENERIC_ATOMIC64 select GENERIC_ATOMIC64
select NO_DMA if !MMU && !COLDFIRE
select HAVE_UID16 select HAVE_UID16
select VIRT_TO_BUS select VIRT_TO_BUS
select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS
...@@ -59,9 +60,6 @@ config TIME_LOW_RES ...@@ -59,9 +60,6 @@ config TIME_LOW_RES
config NO_IOPORT_MAP config NO_IOPORT_MAP
def_bool y def_bool y
config NO_DMA
def_bool (MMU && SUN3) || (!MMU && !COLDFIRE)
config ZONE_DMA config ZONE_DMA
bool bool
default y default y
......
arch/m68k/Kconfig.machine
View file @ 5bbec3cf
...@@ -126,6 +126,7 @@ config SUN3 ...@@ -126,6 +126,7 @@ config SUN3
depends on MMU depends on MMU
depends on !MMU_MOTOROLA depends on !MMU_MOTOROLA
select MMU_SUN3 if MMU select MMU_SUN3 if MMU
select NO_DMA
select M68020 select M68020
help help
This option enables support for the Sun 3 series of workstations This option enables support for the Sun 3 series of workstations
......
arch/sh/Kconfig
View file @ 5bbec3cf
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
config SUPERH config SUPERH
def_bool y def_bool y
select ARCH_32BIT_OFF_T
select ARCH_HAVE_CUSTOM_GPIO_H
select ARCH_HAVE_NMI_SAFE_CMPXCHG if (GUSA_RB || CPU_SH4A)
select ARCH_HAS_BINFMT_FLAT if !MMU select ARCH_HAS_BINFMT_FLAT if !MMU
select ARCH_HAS_GIGANTIC_PAGE
select ARCH_HAS_GCOV_PROFILE_ALL
select ARCH_HAS_PTE_SPECIAL select ARCH_HAS_PTE_SPECIAL
select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
select ARCH_HIBERNATION_POSSIBLE if MMU
select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_MIGHT_HAVE_PC_PARPORT
select HAVE_PATA_PLATFORM select ARCH_WANT_IPC_PARSE_VERSION
select CLKDEV_LOOKUP select CLKDEV_LOOKUP
select CPU_NO_EFFICIENT_FFS
select DMA_DECLARE_COHERENT select DMA_DECLARE_COHERENT
select HAVE_IDE if HAS_IOPORT_MAP select GENERIC_ATOMIC64
select HAVE_OPROFILE select GENERIC_CLOCKEVENTS
select GENERIC_CMOS_UPDATE if SH_SH03 || SH_DREAMCAST
select GENERIC_IDLE_POLL_SETUP
select GENERIC_IRQ_SHOW
select GENERIC_PCI_IOMAP if PCI
select GENERIC_SCHED_CLOCK
select GENERIC_STRNCPY_FROM_USER
select GENERIC_STRNLEN_USER
select GENERIC_SMP_IDLE_THREAD
select GUP_GET_PTE_LOW_HIGH if X2TLB
select HAVE_ARCH_AUDITSYSCALL
select HAVE_ARCH_KGDB
select HAVE_ARCH_SECCOMP_FILTER
select HAVE_ARCH_TRACEHOOK select HAVE_ARCH_TRACEHOOK
select HAVE_PERF_EVENTS select HAVE_COPY_THREAD_TLS
select HAVE_DEBUG_BUGVERBOSE select HAVE_DEBUG_BUGVERBOSE
select HAVE_FAST_GUP if MMU
select ARCH_HAVE_CUSTOM_GPIO_H
select ARCH_HAVE_NMI_SAFE_CMPXCHG if (GUSA_RB || CPU_SH4A)
select ARCH_HAS_GCOV_PROFILE_ALL
select PERF_USE_VMALLOC
select HAVE_DEBUG_KMEMLEAK select HAVE_DEBUG_KMEMLEAK
select HAVE_KERNEL_GZIP select HAVE_DYNAMIC_FTRACE
select CPU_NO_EFFICIENT_FFS select HAVE_FAST_GUP if MMU
select HAVE_FUNCTION_GRAPH_TRACER
select HAVE_FUNCTION_TRACER
select HAVE_FUTEX_CMPXCHG if FUTEX
select HAVE_FTRACE_MCOUNT_RECORD
select HAVE_HW_BREAKPOINT
select HAVE_IDE if HAS_IOPORT_MAP
select HAVE_IOREMAP_PROT if MMU && !X2TLB
select HAVE_KERNEL_BZIP2 select HAVE_KERNEL_BZIP2
select HAVE_KERNEL_GZIP
select HAVE_KERNEL_LZMA select HAVE_KERNEL_LZMA
select HAVE_KERNEL_XZ
select HAVE_KERNEL_LZO select HAVE_KERNEL_LZO
select HAVE_KERNEL_XZ
select HAVE_KPROBES
select HAVE_KRETPROBES
select HAVE_MIXED_BREAKPOINTS_REGS
select HAVE_MOD_ARCH_SPECIFIC if DWARF_UNWINDER
select HAVE_NMI
select HAVE_OPROFILE
select HAVE_PATA_PLATFORM
select HAVE_PERF_EVENTS
select HAVE_REGS_AND_STACK_ACCESS_API
select HAVE_UID16 select HAVE_UID16
select ARCH_WANT_IPC_PARSE_VERSION select HAVE_STACKPROTECTOR
select HAVE_SYSCALL_TRACEPOINTS select HAVE_SYSCALL_TRACEPOINTS
select HAVE_REGS_AND_STACK_ACCESS_API
select MAY_HAVE_SPARSE_IRQ
select IRQ_FORCED_THREADING select IRQ_FORCED_THREADING
select RTC_LIB select MAY_HAVE_SPARSE_IRQ
select GENERIC_ATOMIC64
select GENERIC_IRQ_SHOW
select GENERIC_SMP_IDLE_THREAD
select GENERIC_IDLE_POLL_SETUP
select GENERIC_CLOCKEVENTS
select GENERIC_CMOS_UPDATE if SH_SH03 || SH_DREAMCAST
select GENERIC_PCI_IOMAP if PCI
select GENERIC_SCHED_CLOCK
select GENERIC_STRNCPY_FROM_USER
select GENERIC_STRNLEN_USER
select HAVE_MOD_ARCH_SPECIFIC if DWARF_UNWINDER
select MODULES_USE_ELF_RELA select MODULES_USE_ELF_RELA
select NEED_SG_DMA_LENGTH
select NO_DMA if !MMU && !DMA_COHERENT
select NO_GENERIC_PCI_IOPORT_MAP if PCI select NO_GENERIC_PCI_IOPORT_MAP if PCI
select OLD_SIGSUSPEND
select OLD_SIGACTION select OLD_SIGACTION
select OLD_SIGSUSPEND
select PCI_DOMAINS if PCI select PCI_DOMAINS if PCI
select HAVE_ARCH_AUDITSYSCALL
select HAVE_FUTEX_CMPXCHG if FUTEX
select HAVE_NMI
select NEED_SG_DMA_LENGTH
select ARCH_HAS_GIGANTIC_PAGE
select ARCH_32BIT_OFF_T
select GUP_GET_PTE_LOW_HIGH if X2TLB
select HAVE_KPROBES
select HAVE_KRETPROBES
select HAVE_IOREMAP_PROT if MMU && !X2TLB
select HAVE_FUNCTION_TRACER
select HAVE_FTRACE_MCOUNT_RECORD
select HAVE_DYNAMIC_FTRACE
select ARCH_WANT_IPC_PARSE_VERSION
select HAVE_FUNCTION_GRAPH_TRACER
select HAVE_ARCH_KGDB
select HAVE_HW_BREAKPOINT
select HAVE_MIXED_BREAKPOINTS_REGS
select PERF_EVENTS select PERF_EVENTS
select ARCH_HIBERNATION_POSSIBLE if MMU select PERF_USE_VMALLOC
select RTC_LIB
select SPARSE_IRQ select SPARSE_IRQ
select HAVE_STACKPROTECTOR
help help
The SuperH is a RISC processor targeted for use in embedded systems The SuperH is a RISC processor targeted for use in embedded systems
and consumer electronics; it was also used in the Sega Dreamcast and consumer electronics; it was also used in the Sega Dreamcast
...@@ -123,8 +125,8 @@ config ARCH_HAS_ILOG2_U64 ...@@ -123,8 +125,8 @@ config ARCH_HAS_ILOG2_U64
config NO_IOPORT_MAP config NO_IOPORT_MAP
def_bool !PCI def_bool !PCI
depends on !SH_CAYMAN && !SH_SH4202_MICRODEV && !SH_SHMIN && \ depends on !SH_SH4202_MICRODEV && !SH_SHMIN && !SH_HP6XX && \
!SH_HP6XX && !SH_SOLUTION_ENGINE !SH_SOLUTION_ENGINE
config IO_TRAPPED config IO_TRAPPED
bool bool
...@@ -136,8 +138,10 @@ config DMA_COHERENT ...@@ -136,8 +138,10 @@ config DMA_COHERENT
bool bool
config DMA_NONCOHERENT config DMA_NONCOHERENT
def_bool !DMA_COHERENT def_bool !NO_DMA && !DMA_COHERENT
select ARCH_HAS_DMA_PREP_COHERENT
select ARCH_HAS_SYNC_DMA_FOR_DEVICE select ARCH_HAS_SYNC_DMA_FOR_DEVICE
select DMA_DIRECT_REMAP
config PGTABLE_LEVELS config PGTABLE_LEVELS
default 3 if X2TLB default 3 if X2TLB
...@@ -630,7 +634,7 @@ config SMP ...@@ -630,7 +634,7 @@ config SMP
Y to "Enhanced Real Time Clock Support", below. Y to "Enhanced Real Time Clock Support", below.
See also <file:Documentation/admin-guide/lockup-watchdogs.rst> and the SMP-HOWTO See also <file:Documentation/admin-guide/lockup-watchdogs.rst> and the SMP-HOWTO
available at <http://www.tldp.org/docs.html#howto>. available at <https://www.tldp.org/docs.html#howto>.
If you don't know what to do here, say N. If you don't know what to do here, say N.
...@@ -726,7 +730,6 @@ config ZERO_PAGE_OFFSET ...@@ -726,7 +730,6 @@ config ZERO_PAGE_OFFSET
config BOOT_LINK_OFFSET config BOOT_LINK_OFFSET
hex hex
default "0x00210000" if SH_SHMIN default "0x00210000" if SH_SHMIN
default "0x00400000" if SH_CAYMAN
default "0x00810000" if SH_7780_SOLUTION_ENGINE default "0x00810000" if SH_7780_SOLUTION_ENGINE
default "0x009e0000" if SH_TITAN default "0x009e0000" if SH_TITAN
default "0x01800000" if SH_SDK7780 default "0x01800000" if SH_SDK7780
......
arch/sh/Makefile
View file @ 5bbec3cf
...@@ -15,11 +15,7 @@ ifneq ($(SUBARCH),$(ARCH)) ...@@ -15,11 +15,7 @@ ifneq ($(SUBARCH),$(ARCH))
endif endif
endif endif
ifeq ($(ARCH),sh)
KBUILD_DEFCONFIG := shx3_defconfig KBUILD_DEFCONFIG := shx3_defconfig
else
KBUILD_DEFCONFIG := cayman_defconfig
endif
isa-y := any isa-y := any
isa-$(CONFIG_SH_DSP) := sh isa-$(CONFIG_SH_DSP) := sh
...@@ -143,7 +139,6 @@ machdir-$(CONFIG_SH_SH7763RDP) += mach-sh7763rdp ...@@ -143,7 +139,6 @@ machdir-$(CONFIG_SH_SH7763RDP) += mach-sh7763rdp
machdir-$(CONFIG_SH_SH4202_MICRODEV) += mach-microdev machdir-$(CONFIG_SH_SH4202_MICRODEV) += mach-microdev
machdir-$(CONFIG_SH_LANDISK) += mach-landisk machdir-$(CONFIG_SH_LANDISK) += mach-landisk
machdir-$(CONFIG_SH_LBOX_RE2) += mach-lboxre2 machdir-$(CONFIG_SH_LBOX_RE2) += mach-lboxre2
machdir-$(CONFIG_SH_CAYMAN) += mach-cayman
machdir-$(CONFIG_SH_RSK) += mach-rsk machdir-$(CONFIG_SH_RSK) += mach-rsk
ifneq ($(machdir-y),) ifneq ($(machdir-y),)
......
arch/sh/boards/Kconfig
View file @ 5bbec3cf
...@@ -340,12 +340,6 @@ config SH_MAGIC_PANEL_R2 ...@@ -340,12 +340,6 @@ config SH_MAGIC_PANEL_R2
help help
Select Magic Panel R2 if configuring for Magic Panel R2. Select Magic Panel R2 if configuring for Magic Panel R2.
config SH_CAYMAN
bool "Hitachi Cayman"
depends on CPU_SUBTYPE_SH5_101 || CPU_SUBTYPE_SH5_103
select HAVE_PCI
select ARCH_MIGHT_HAVE_PC_SERIO
config SH_POLARIS config SH_POLARIS
bool "SMSC Polaris" bool "SMSC Polaris"
select CPU_HAS_IPR_IRQ select CPU_HAS_IPR_IRQ
......
arch/sh/boards/board-sh2007.c
View file @ 5bbec3cf
...@@ -126,14 +126,14 @@ static void __init sh2007_init_irq(void) ...@@ -126,14 +126,14 @@ static void __init sh2007_init_irq(void)
*/ */
static void __init sh2007_setup(char **cmdline_p) static void __init sh2007_setup(char **cmdline_p)
{ {
printk(KERN_INFO "SH-2007 Setup..."); pr_info("SH-2007 Setup...");
/* setup wait control registers for area 5 */ /* setup wait control registers for area 5 */
__raw_writel(CS5BCR_D, CS5BCR); __raw_writel(CS5BCR_D, CS5BCR);
__raw_writel(CS5WCR_D, CS5WCR); __raw_writel(CS5WCR_D, CS5WCR);
__raw_writel(CS5PCR_D, CS5PCR); __raw_writel(CS5PCR_D, CS5PCR);
printk(KERN_INFO " done.\n"); pr_cont(" done.\n");
} }
/* /*
......
arch/sh/boards/mach-cayman/Makefile deleted 100644 → 0
View file @ 713eee84
# SPDX-License-Identifier: GPL-2.0
#
# Makefile for the Hitachi Cayman specific parts of the kernel
#
obj-y := setup.o irq.o panic.o
arch/sh/boards/mach-cayman/irq.c deleted 100644 → 0
View file @ 713eee84
// SPDX-License-Identifier: GPL-2.0
/*
* arch/sh/mach-cayman/irq.c - SH-5 Cayman Interrupt Support
*
* This file handles the board specific parts of the Cayman interrupt system
*
* Copyright (C) 2002 Stuart Menefy
*/
#include <linux/io.h>
#include <linux/irq.h>
#include <linux/interrupt.h>
#include <linux/signal.h>
#include <cpu/irq.h>
#include <asm/page.h>
/* Setup for the SMSC FDC37C935 / LAN91C100FD */
#define SMSC_IRQ IRQ_IRL1
/* Setup for PCI Bus 2, which transmits interrupts via the EPLD */
#define PCI2_IRQ IRQ_IRL3
unsigned long epld_virt;
#define EPLD_BASE 0x04002000
#define EPLD_STATUS_BASE (epld_virt + 0x10)
#define EPLD_MASK_BASE (epld_virt + 0x20)
/* Note the SMSC SuperIO chip and SMSC LAN chip interrupts are all muxed onto
the same SH-5 interrupt */
static irqreturn_t cayman_interrupt_smsc(int irq, void *dev_id)
{
printk(KERN_INFO "CAYMAN: spurious SMSC interrupt\n");
return IRQ_NONE;
}
static irqreturn_t cayman_interrupt_pci2(int irq, void *dev_id)
{
printk(KERN_INFO "CAYMAN: spurious PCI interrupt, IRQ %d\n", irq);
return IRQ_NONE;
}
static void enable_cayman_irq(struct irq_data *data)
{
unsigned int irq = data->irq;
unsigned long flags;
unsigned long mask;
unsigned int reg;
unsigned char bit;
irq -= START_EXT_IRQS;
reg = EPLD_MASK_BASE + ((irq / 8) << 2);
bit = 1<<(irq % 8);
local_irq_save(flags);
mask = __raw_readl(reg);
mask |= bit;
__raw_writel(mask, reg);
local_irq_restore(flags);
}
static void disable_cayman_irq(struct irq_data *data)
{
unsigned int irq = data->irq;
unsigned long flags;
unsigned long mask;
unsigned int reg;
unsigned char bit;
irq -= START_EXT_IRQS;
reg = EPLD_MASK_BASE + ((irq / 8) << 2);
bit = 1<<(irq % 8);
local_irq_save(flags);
mask = __raw_readl(reg);
mask &= ~bit;
__raw_writel(mask, reg);
local_irq_restore(flags);
}
struct irq_chip cayman_irq_type = {
.name = "Cayman-IRQ",
.irq_unmask = enable_cayman_irq,
.irq_mask = disable_cayman_irq,
};
int cayman_irq_demux(int evt)
{
int irq = intc_evt_to_irq[evt];
if (irq == SMSC_IRQ) {
unsigned long status;
int i;
status = __raw_readl(EPLD_STATUS_BASE) &
__raw_readl(EPLD_MASK_BASE) & 0xff;
if (status == 0) {
irq = -1;
} else {
for (i=0; i<8; i++) {
if (status & (1<<i))
break;
}
irq = START_EXT_IRQS + i;
}
}
if (irq == PCI2_IRQ) {
unsigned long status;
int i;
status = __raw_readl(EPLD_STATUS_BASE + 3 * sizeof(u32)) &
__raw_readl(EPLD_MASK_BASE + 3 * sizeof(u32)) & 0xff;
if (status == 0) {
irq = -1;
} else {
for (i=0; i<8; i++) {
if (status & (1<<i))
break;
}
irq = START_EXT_IRQS + (3 * 8) + i;
}
}
return irq;
}
void init_cayman_irq(void)
{
int i;
epld_virt = (unsigned long)ioremap(EPLD_BASE, 1024);
if (!epld_virt) {
printk(KERN_ERR "Cayman IRQ: Unable to remap EPLD\n");
return;
}
for (i = 0; i < NR_EXT_IRQS; i++) {
irq_set_chip_and_handler(START_EXT_IRQS + i,
&cayman_irq_type, handle_level_irq);
}
/* Setup the SMSC interrupt */
if (request_irq(SMSC_IRQ, cayman_interrupt_smsc, 0, "Cayman SMSC Mux",
NULL))
pr_err("Failed to register Cayman SMSC Mux interrupt\n");
if (request_irq(PCI2_IRQ, cayman_interrupt_pci2, 0, "Cayman PCI2 Mux",
NULL))
pr_err("Failed to register Cayman PCI2 Mux interrupt\n");
}
arch/sh/boards/mach-cayman/panic.c deleted 100644 → 0
View file @ 713eee84
// SPDX-License-Identifier: GPL-2.0
/*
* Copyright (C) 2003 Richard Curnow, SuperH UK Limited
*/
#include <linux/kernel.h>
#include <linux/io.h>
#include <cpu/registers.h>
/* THIS IS A PHYSICAL ADDRESS */
#define HDSP2534_ADDR (0x04002100)
static void poor_mans_delay(void)
{
int i;
for (i = 0; i < 2500000; i++)
cpu_relax();
}
static void show_value(unsigned long x)
{
int i;
unsigned nibble;
for (i = 0; i < 8; i++) {
nibble = ((x >> (i * 4)) & 0xf);
__raw_writeb(nibble + ((nibble > 9) ? 55 : 48),
HDSP2534_ADDR + 0xe0 + ((7 - i) << 2));
}
}
void
panic_handler(unsigned long panicPC, unsigned long panicSSR,
unsigned long panicEXPEVT)
{
while (1) {
/* This piece of code displays the PC on the LED display */
show_value(panicPC);
poor_mans_delay();
show_value(panicSSR);
poor_mans_delay();
show_value(panicEXPEVT);
poor_mans_delay();
}
}
arch/sh/boards/mach-cayman/setup.c deleted 100644 → 0
View file @ 713eee84
// SPDX-License-Identifier: GPL-2.0
/*
* arch/sh/mach-cayman/setup.c
*
* SH5 Cayman support
*
* Copyright (C) 2002 David J. Mckay & Benedict Gaster
* Copyright (C) 2003 - 2007 Paul Mundt
*/
#include <linux/init.h>
#include <linux/io.h>
#include <linux/kernel.h>
#include <cpu/irq.h>
/*
* Platform Dependent Interrupt Priorities.
*/
/* Using defaults defined in irq.h */
#define RES NO_PRIORITY /* Disabled */
#define IR0 IRL0_PRIORITY /* IRLs */
#define IR1 IRL1_PRIORITY
#define IR2 IRL2_PRIORITY
#define IR3 IRL3_PRIORITY
#define PCA INTA_PRIORITY /* PCI Ints */
#define PCB INTB_PRIORITY
#define PCC INTC_PRIORITY
#define PCD INTD_PRIORITY
#define SER TOP_PRIORITY
#define ERR TOP_PRIORITY
#define PW0 TOP_PRIORITY
#define PW1 TOP_PRIORITY
#define PW2 TOP_PRIORITY
#define PW3 TOP_PRIORITY
#define DM0 NO_PRIORITY /* DMA Ints */
#define DM1 NO_PRIORITY
#define DM2 NO_PRIORITY
#define DM3 NO_PRIORITY
#define DAE NO_PRIORITY
#define TU0 TIMER_PRIORITY /* TMU Ints */
#define TU1 NO_PRIORITY
#define TU2 NO_PRIORITY
#define TI2 NO_PRIORITY
#define ATI NO_PRIORITY /* RTC Ints */
#define PRI NO_PRIORITY
#define CUI RTC_PRIORITY
#define ERI SCIF_PRIORITY /* SCIF Ints */
#define RXI SCIF_PRIORITY
#define BRI SCIF_PRIORITY
#define TXI SCIF_PRIORITY
#define ITI TOP_PRIORITY /* WDT Ints */
/* Setup for the SMSC FDC37C935 */
#define SMSC_SUPERIO_BASE 0x04000000
#define SMSC_CONFIG_PORT_ADDR 0x3f0
#define SMSC_INDEX_PORT_ADDR SMSC_CONFIG_PORT_ADDR
#define SMSC_DATA_PORT_ADDR 0x3f1
#define SMSC_ENTER_CONFIG_KEY 0x55
#define SMSC_EXIT_CONFIG_KEY 0xaa
#define SMCS_LOGICAL_DEV_INDEX 0x07
#define SMSC_DEVICE_ID_INDEX 0x20
#define SMSC_DEVICE_REV_INDEX 0x21
#define SMSC_ACTIVATE_INDEX 0x30
#define SMSC_PRIMARY_BASE_INDEX 0x60
#define SMSC_SECONDARY_BASE_INDEX 0x62
#define SMSC_PRIMARY_INT_INDEX 0x70
#define SMSC_SECONDARY_INT_INDEX 0x72
#define SMSC_IDE1_DEVICE 1
#define SMSC_KEYBOARD_DEVICE 7
#define SMSC_CONFIG_REGISTERS 8
#define SMSC_SUPERIO_READ_INDEXED(index) ({ \
outb((index), SMSC_INDEX_PORT_ADDR); \
inb(SMSC_DATA_PORT_ADDR); })
#define SMSC_SUPERIO_WRITE_INDEXED(val, index) ({ \
outb((index), SMSC_INDEX_PORT_ADDR); \
outb((val), SMSC_DATA_PORT_ADDR); })
#define IDE1_PRIMARY_BASE 0x01f0
#define IDE1_SECONDARY_BASE 0x03f6
unsigned long smsc_superio_virt;
int platform_int_priority[NR_INTC_IRQS] = {
IR0, IR1, IR2, IR3, PCA, PCB, PCC, PCD, /* IRQ 0- 7 */
RES, RES, RES, RES, SER, ERR, PW3, PW2, /* IRQ 8-15 */
PW1, PW0, DM0, DM1, DM2, DM3, DAE, RES, /* IRQ 16-23 */
RES, RES, RES, RES, RES, RES, RES, RES, /* IRQ 24-31 */
TU0, TU1, TU2, TI2, ATI, PRI, CUI, ERI, /* IRQ 32-39 */
RXI, BRI, TXI, RES, RES, RES, RES, RES, /* IRQ 40-47 */
RES, RES, RES, RES, RES, RES, RES, RES, /* IRQ 48-55 */
RES, RES, RES, RES, RES, RES, RES, ITI, /* IRQ 56-63 */
};
static int __init smsc_superio_setup(void)
{
unsigned char devid, devrev;
smsc_superio_virt = (unsigned long)ioremap(SMSC_SUPERIO_BASE, 1024);
if (!smsc_superio_virt) {
panic("Unable to remap SMSC SuperIO\n");
}
/* Initially the chip is in run state */
/* Put it into configuration state */
outb(SMSC_ENTER_CONFIG_KEY, SMSC_CONFIG_PORT_ADDR);
outb(SMSC_ENTER_CONFIG_KEY, SMSC_CONFIG_PORT_ADDR);
/* Read device ID info */
devid = SMSC_SUPERIO_READ_INDEXED(SMSC_DEVICE_ID_INDEX);
devrev = SMSC_SUPERIO_READ_INDEXED(SMSC_DEVICE_REV_INDEX);
printk("SMSC SuperIO devid %02x rev %02x\n", devid, devrev);
/* Select the keyboard device */
SMSC_SUPERIO_WRITE_INDEXED(SMSC_KEYBOARD_DEVICE, SMCS_LOGICAL_DEV_INDEX);
/* enable it */
SMSC_SUPERIO_WRITE_INDEXED(1, SMSC_ACTIVATE_INDEX);
/* Select the interrupts */
/* On a PC keyboard is IRQ1, mouse is IRQ12 */
SMSC_SUPERIO_WRITE_INDEXED(1, SMSC_PRIMARY_INT_INDEX);
SMSC_SUPERIO_WRITE_INDEXED(12, SMSC_SECONDARY_INT_INDEX);
/*
* Only IDE1 exists on the Cayman
*/
/* Power it on */
SMSC_SUPERIO_WRITE_INDEXED(1 << SMSC_IDE1_DEVICE, 0x22);
SMSC_SUPERIO_WRITE_INDEXED(SMSC_IDE1_DEVICE, SMCS_LOGICAL_DEV_INDEX);
SMSC_SUPERIO_WRITE_INDEXED(1, SMSC_ACTIVATE_INDEX);
SMSC_SUPERIO_WRITE_INDEXED(IDE1_PRIMARY_BASE >> 8,
SMSC_PRIMARY_BASE_INDEX + 0);
SMSC_SUPERIO_WRITE_INDEXED(IDE1_PRIMARY_BASE & 0xff,
SMSC_PRIMARY_BASE_INDEX + 1);
SMSC_SUPERIO_WRITE_INDEXED(IDE1_SECONDARY_BASE >> 8,
SMSC_SECONDARY_BASE_INDEX + 0);
SMSC_SUPERIO_WRITE_INDEXED(IDE1_SECONDARY_BASE & 0xff,
SMSC_SECONDARY_BASE_INDEX + 1);
SMSC_SUPERIO_WRITE_INDEXED(14, SMSC_PRIMARY_INT_INDEX);
SMSC_SUPERIO_WRITE_INDEXED(SMSC_CONFIG_REGISTERS,
SMCS_LOGICAL_DEV_INDEX);
SMSC_SUPERIO_WRITE_INDEXED(0x00, 0xc2); /* GP42 = nIDE1_OE */
SMSC_SUPERIO_WRITE_INDEXED(0x01, 0xc5); /* GP45 = IDE1_IRQ */
SMSC_SUPERIO_WRITE_INDEXED(0x00, 0xc6); /* GP46 = nIOROP */
SMSC_SUPERIO_WRITE_INDEXED(0x00, 0xc7); /* GP47 = nIOWOP */
/* Exit the configuration state */
outb(SMSC_EXIT_CONFIG_KEY, SMSC_CONFIG_PORT_ADDR);
return 0;
}
device_initcall(smsc_superio_setup);
static void __iomem *cayman_ioport_map(unsigned long port, unsigned int len)
{
if (port < 0x400) {
extern unsigned long smsc_superio_virt;
return (void __iomem *)((port << 2) | smsc_superio_virt);
}
return (void __iomem *)port;
}
extern void init_cayman_irq(void);
static struct sh_machine_vector mv_cayman __initmv = {
.mv_name = "Hitachi Cayman",
.mv_ioport_map = cayman_ioport_map,
.mv_init_irq = init_cayman_irq,
};
arch/sh/boards/mach-landisk/setup.c
View file @ 5bbec3cf
...@@ -82,6 +82,9 @@ device_initcall(landisk_devices_setup); ...@@ -82,6 +82,9 @@ device_initcall(landisk_devices_setup);
static void __init landisk_setup(char **cmdline_p) static void __init landisk_setup(char **cmdline_p)
{ {
/* I/O port identity mapping */
__set_io_port_base(0);
/* LED ON */ /* LED ON */
__raw_writeb(__raw_readb(PA_LED) | 0x03, PA_LED); __raw_writeb(__raw_readb(PA_LED) | 0x03, PA_LED);
......
arch/sh/configs/cayman_defconfig deleted 100644 → 0
View file @ 713eee84
CONFIG_POSIX_MQUEUE=y
CONFIG_LOG_BUF_SHIFT=14
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
CONFIG_SLAB=y
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
# CONFIG_BLK_DEV_BSG is not set
CONFIG_FORCE_MAX_ZONEORDER=11
CONFIG_MEMORY_START=0x80000000
CONFIG_MEMORY_SIZE=0x00400000
CONFIG_FLATMEM_MANUAL=y
CONFIG_CACHE_OFF=y
CONFIG_SH_PCLK_FREQ=50000000
CONFIG_HEARTBEAT=y
CONFIG_PREEMPT=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
CONFIG_INET=y
CONFIG_IP_PNP=y
# CONFIG_IPV6 is not set
# CONFIG_FW_LOADER is not set
CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_RAM=y
CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y
CONFIG_SCSI_MULTI_LUN=y
CONFIG_SCSI_SPI_ATTRS=y
CONFIG_NETDEVICES=y
CONFIG_NET_ETHERNET=y
# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
# CONFIG_INPUT_KEYBOARD is not set
# CONFIG_INPUT_MOUSE is not set
# CONFIG_SERIO is not set
CONFIG_HW_RANDOM=y
CONFIG_I2C=m
CONFIG_WATCHDOG=y
CONFIG_FB=y
CONFIG_FIRMWARE_EDID=y
CONFIG_FB_MODE_HELPERS=y
CONFIG_FB_SH_MOBILE_LCDC=m
CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FONTS=y
CONFIG_FONT_8x16=y
CONFIG_LOGO=y
# CONFIG_LOGO_LINUX_MONO is not set
# CONFIG_LOGO_LINUX_VGA16 is not set
# CONFIG_LOGO_LINUX_CLUT224 is not set
# CONFIG_LOGO_SUPERH_MONO is not set
# CONFIG_LOGO_SUPERH_VGA16 is not set
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
CONFIG_MINIX_FS=y
CONFIG_ROMFS_FS=y
CONFIG_NFS_FS=y
CONFIG_NFS_V3=y
CONFIG_ROOT_NFS=y
CONFIG_PARTITION_ADVANCED=y
CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_FS=y
CONFIG_DEBUG_KERNEL=y
CONFIG_DETECT_HUNG_TASK=y
CONFIG_SCHEDSTATS=y
CONFIG_FRAME_POINTER=y
# CONFIG_CRYPTO_ANSI_CPRNG is not set
arch/sh/drivers/pci/Makefile
View file @ 5bbec3cf
...@@ -25,4 +25,3 @@ obj-$(CONFIG_SH_7780_SOLUTION_ENGINE) += fixups-sdk7780.o ...@@ -25,4 +25,3 @@ obj-$(CONFIG_SH_7780_SOLUTION_ENGINE) += fixups-sdk7780.o
obj-$(CONFIG_SH_TITAN) += fixups-titan.o obj-$(CONFIG_SH_TITAN) += fixups-titan.o
obj-$(CONFIG_SH_LANDISK) += fixups-landisk.o obj-$(CONFIG_SH_LANDISK) += fixups-landisk.o
obj-$(CONFIG_SH_LBOX_RE2) += fixups-rts7751r2d.o obj-$(CONFIG_SH_LBOX_RE2) += fixups-rts7751r2d.o
obj-$(CONFIG_SH_CAYMAN) += fixups-cayman.o
arch/sh/drivers/pci/common.c
View file @ 5bbec3cf
...@@ -54,7 +54,7 @@ int __init pci_is_66mhz_capable(struct pci_channel *hose, ...@@ -54,7 +54,7 @@ int __init pci_is_66mhz_capable(struct pci_channel *hose,
int cap66 = -1; int cap66 = -1;
u16 stat; u16 stat;
printk(KERN_INFO "PCI: Checking 66MHz capabilities...\n"); pr_info("PCI: Checking 66MHz capabilities...\n");
for (pci_devfn = 0; pci_devfn < 0xff; pci_devfn++) { for (pci_devfn = 0; pci_devfn < 0xff; pci_devfn++) {
if (PCI_FUNC(pci_devfn)) if (PCI_FUNC(pci_devfn))
...@@ -134,7 +134,7 @@ unsigned int pcibios_handle_status_errors(unsigned long addr, ...@@ -134,7 +134,7 @@ unsigned int pcibios_handle_status_errors(unsigned long addr,
pcibios_report_status(PCI_STATUS_REC_TARGET_ABORT | pcibios_report_status(PCI_STATUS_REC_TARGET_ABORT |
PCI_STATUS_SIG_TARGET_ABORT | PCI_STATUS_SIG_TARGET_ABORT |
PCI_STATUS_REC_MASTER_ABORT, 1); PCI_STATUS_REC_MASTER_ABORT, 1);
printk("\n"); pr_cont("\n");
cmd |= PCI_STATUS_REC_TARGET_ABORT; cmd |= PCI_STATUS_REC_TARGET_ABORT;
} }
...@@ -143,7 +143,7 @@ unsigned int pcibios_handle_status_errors(unsigned long addr, ...@@ -143,7 +143,7 @@ unsigned int pcibios_handle_status_errors(unsigned long addr,
printk(KERN_DEBUG "PCI: parity error detected: "); printk(KERN_DEBUG "PCI: parity error detected: ");
pcibios_report_status(PCI_STATUS_PARITY | pcibios_report_status(PCI_STATUS_PARITY |
PCI_STATUS_DETECTED_PARITY, 1); PCI_STATUS_DETECTED_PARITY, 1);
printk("\n"); pr_cont("\n");
cmd |= PCI_STATUS_PARITY | PCI_STATUS_DETECTED_PARITY; cmd |= PCI_STATUS_PARITY | PCI_STATUS_DETECTED_PARITY;
......
arch/sh/drivers/pci/fixups-cayman.c deleted 100644 → 0
View file @ 713eee84
// SPDX-License-Identifier: GPL-2.0
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/pci.h>
#include <linux/types.h>
#include <cpu/irq.h>
#include "pci-sh5.h"
int pcibios_map_platform_irq(const struct pci_dev *dev, u8 slot, u8 pin)
{
int result = -1;
/* The complication here is that the PCI IRQ lines from the Cayman's 2
5V slots get into the CPU via a different path from the IRQ lines
from the 3 3.3V slots. Thus, we have to detect whether the card's
interrupts go via the 5V or 3.3V path, i.e. the 'bridge swizzling'
at the point where we cross from 5V to 3.3V is not the normal case.
The added complication is that we don't know that the 5V slots are
always bus 2, because a card containing a PCI-PCI bridge may be
plugged into a 3.3V slot, and this changes the bus numbering.
Also, the Cayman has an intermediate PCI bus that goes a custom
expansion board header (and to the secondary bridge). This bus has
never been used in practice.
The 1ary onboard PCI-PCI bridge is device 3 on bus 0
The 2ary onboard PCI-PCI bridge is device 0 on the 2ary bus of
the 1ary bridge.
*/
struct slot_pin {
int slot;
int pin;
} path[4];
int i=0;
while (dev->bus->number > 0) {
slot = path[i].slot = PCI_SLOT(dev->devfn);
pin = path[i].pin = pci_swizzle_interrupt_pin(dev, pin);
dev = dev->bus->self;
i++;
if (i > 3) panic("PCI path to root bus too long!\n");
}
slot = PCI_SLOT(dev->devfn);
/* This is the slot on bus 0 through which the device is eventually
reachable. */
/* Now work back up. */
if ((slot < 3) || (i == 0)) {
/* Bus 0 (incl. PCI-PCI bridge itself) : perform the final
swizzle now. */
result = IRQ_INTA + pci_swizzle_interrupt_pin(dev, pin) - 1;
} else {
i--;
slot = path[i].slot;
pin = path[i].pin;
if (slot > 0) {
panic("PCI expansion bus device found - not handled!\n");
} else {
if (i > 0) {
/* 5V slots */
i--;
slot = path[i].slot;
pin = path[i].pin;
/* 'pin' was swizzled earlier wrt slot, don't do it again. */
result = IRQ_P2INTA + (pin - 1);
} else {
/* IRQ for 2ary PCI-PCI bridge : unused */
result = -1;
}
}
}
return result;
}
arch/sh/drivers/pci/pci-sh7780.c
View file @ 5bbec3cf
...@@ -148,7 +148,7 @@ static irqreturn_t sh7780_pci_serr_irq(int irq, void *dev_id) ...@@ -148,7 +148,7 @@ static irqreturn_t sh7780_pci_serr_irq(int irq, void *dev_id)
printk(KERN_DEBUG "PCI: system error received: "); printk(KERN_DEBUG "PCI: system error received: ");
pcibios_report_status(PCI_STATUS_SIG_SYSTEM_ERROR, 1); pcibios_report_status(PCI_STATUS_SIG_SYSTEM_ERROR, 1);
printk("\n"); pr_cont("\n");
/* Deassert SERR */ /* Deassert SERR */
__raw_writel(SH4_PCIINTM_SDIM, hose->reg_base + SH4_PCIINTM); __raw_writel(SH4_PCIINTM_SDIM, hose->reg_base + SH4_PCIINTM);
...@@ -179,7 +179,7 @@ static int __init sh7780_pci_setup_irqs(struct pci_channel *hose) ...@@ -179,7 +179,7 @@ static int __init sh7780_pci_setup_irqs(struct pci_channel *hose)
ret = request_irq(hose->serr_irq, sh7780_pci_serr_irq, 0, ret = request_irq(hose->serr_irq, sh7780_pci_serr_irq, 0,
"PCI SERR interrupt", hose); "PCI SERR interrupt", hose);
if (unlikely(ret)) { if (unlikely(ret)) {
printk(KERN_ERR "PCI: Failed hooking SERR IRQ\n"); pr_err("PCI: Failed hooking SERR IRQ\n");
return ret; return ret;
} }
...@@ -250,7 +250,7 @@ static int __init sh7780_pci_init(void) ...@@ -250,7 +250,7 @@ static int __init sh7780_pci_init(void)
const char *type; const char *type;
int ret, i; int ret, i;
printk(KERN_NOTICE "PCI: Starting initialization.\n"); pr_notice("PCI: Starting initialization.\n");
chan->reg_base = 0xfe040000; chan->reg_base = 0xfe040000;
...@@ -270,7 +270,7 @@ static int __init sh7780_pci_init(void) ...@@ -270,7 +270,7 @@ static int __init sh7780_pci_init(void)
id = __raw_readw(chan->reg_base + PCI_VENDOR_ID); id = __raw_readw(chan->reg_base + PCI_VENDOR_ID);
if (id != PCI_VENDOR_ID_RENESAS) { if (id != PCI_VENDOR_ID_RENESAS) {
printk(KERN_ERR "PCI: Unknown vendor ID 0x%04x.\n", id); pr_err("PCI: Unknown vendor ID 0x%04x.\n", id);
return -ENODEV; return -ENODEV;
} }
...@@ -281,14 +281,13 @@ static int __init sh7780_pci_init(void) ...@@ -281,14 +281,13 @@ static int __init sh7780_pci_init(void)
(id == PCI_DEVICE_ID_RENESAS_SH7785) ? "SH7785" : (id == PCI_DEVICE_ID_RENESAS_SH7785) ? "SH7785" :
NULL; NULL;
if (unlikely(!type)) { if (unlikely(!type)) {
printk(KERN_ERR "PCI: Found an unsupported Renesas host " pr_err("PCI: Found an unsupported Renesas host controller, device id 0x%04x.\n",
"controller, device id 0x%04x.\n", id); id);
return -EINVAL; return -EINVAL;
} }
printk(KERN_NOTICE "PCI: Found a Renesas %s host " pr_notice("PCI: Found a Renesas %s host controller, revision %d.\n",
"controller, revision %d.\n", type, type, __raw_readb(chan->reg_base + PCI_REVISION_ID));
__raw_readb(chan->reg_base + PCI_REVISION_ID));
/* /*
* Now throw it in to register initialization mode and * Now throw it in to register initialization mode and
...@@ -395,9 +394,9 @@ static int __init sh7780_pci_init(void) ...@@ -395,9 +394,9 @@ static int __init sh7780_pci_init(void)
sh7780_pci66_init(chan); sh7780_pci66_init(chan);
printk(KERN_NOTICE "PCI: Running at %dMHz.\n", pr_notice("PCI: Running at %dMHz.\n",
(__raw_readw(chan->reg_base + PCI_STATUS) & PCI_STATUS_66MHZ) ? (__raw_readw(chan->reg_base + PCI_STATUS) & PCI_STATUS_66MHZ)
66 : 33); ? 66 : 33);
return 0; return 0;
......
arch/sh/drivers/pci/pci.c
View file @ 5bbec3cf
...@@ -120,8 +120,7 @@ int register_pci_controller(struct pci_channel *hose) ...@@ -120,8 +120,7 @@ int register_pci_controller(struct pci_channel *hose)
* Do not panic here but later - this might happen before console init. * Do not panic here but later - this might happen before console init.
*/ */
if (!hose->io_map_base) { if (!hose->io_map_base) {
printk(KERN_WARNING pr_warn("registering PCI controller with io_map_base unset\n");
"registering PCI controller with io_map_base unset\n");
} }
/* /*
...@@ -145,7 +144,7 @@ int register_pci_controller(struct pci_channel *hose) ...@@ -145,7 +144,7 @@ int register_pci_controller(struct pci_channel *hose)
for (--i; i >= 0; i--) for (--i; i >= 0; i--)
release_resource(&hose->resources[i]); release_resource(&hose->resources[i]);
printk(KERN_WARNING "Skipping PCI bus scan due to resource conflict\n"); pr_warn("Skipping PCI bus scan due to resource conflict\n");
return -1; return -1;
} }
...@@ -213,8 +212,8 @@ pcibios_bus_report_status_early(struct pci_channel *hose, ...@@ -213,8 +212,8 @@ pcibios_bus_report_status_early(struct pci_channel *hose,
pci_devfn, PCI_STATUS, pci_devfn, PCI_STATUS,
status & status_mask); status & status_mask);
if (warn) if (warn)
printk("(%02x:%02x: %04X) ", current_bus, pr_cont("(%02x:%02x: %04X) ", current_bus, pci_devfn,
pci_devfn, status); status);
} }
} }
...@@ -249,7 +248,7 @@ pcibios_bus_report_status(struct pci_bus *bus, unsigned int status_mask, ...@@ -249,7 +248,7 @@ pcibios_bus_report_status(struct pci_bus *bus, unsigned int status_mask,
pci_write_config_word(dev, PCI_STATUS, status & status_mask); pci_write_config_word(dev, PCI_STATUS, status & status_mask);
if (warn) if (warn)
printk("(%s: %04X) ", pci_name(dev), status); pr_cont("(%s: %04X) ", pci_name(dev), status);
} }
list_for_each_entry(dev, &bus->devices, bus_list) list_for_each_entry(dev, &bus->devices, bus_list)
......
arch/sh/include/asm/adc.h
View file @ 5bbec3cf
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
#ifndef __ASM_ADC_H #ifndef __ASM_ADC_H
#define __ASM_ADC_H #define __ASM_ADC_H
#ifdef __KERNEL__
/* /*
* Copyright (C) 2004 Andriy Skulysh * Copyright (C) 2004 Andriy Skulysh
*/ */
...@@ -10,5 +9,4 @@ ...@@ -10,5 +9,4 @@
int adc_single(unsigned int channel); int adc_single(unsigned int channel);
#endif /* __KERNEL__ */
#endif /* __ASM_ADC_H */ #endif /* __ASM_ADC_H */
arch/sh/include/asm/addrspace.h
View file @ 5bbec3cf
...@@ -7,8 +7,6 @@ ...@@ -7,8 +7,6 @@
#ifndef __ASM_SH_ADDRSPACE_H #ifndef __ASM_SH_ADDRSPACE_H
#define __ASM_SH_ADDRSPACE_H #define __ASM_SH_ADDRSPACE_H
#ifdef __KERNEL__
#include <cpu/addrspace.h> #include <cpu/addrspace.h>
/* If this CPU supports segmentation, hook up the helpers */ /* If this CPU supports segmentation, hook up the helpers */
...@@ -62,5 +60,4 @@ ...@@ -62,5 +60,4 @@
#define P3_ADDR_MAX P4SEG #define P3_ADDR_MAX P4SEG
#endif #endif
#endif /* __KERNEL__ */
#endif /* __ASM_SH_ADDRSPACE_H */ #endif /* __ASM_SH_ADDRSPACE_H */
arch/sh/include/asm/bitops.h
View file @ 5bbec3cf
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
#ifndef __ASM_SH_BITOPS_H #ifndef __ASM_SH_BITOPS_H
#define __ASM_SH_BITOPS_H #define __ASM_SH_BITOPS_H
#ifdef __KERNEL__
#ifndef _LINUX_BITOPS_H #ifndef _LINUX_BITOPS_H
#error only <linux/bitops.h> can be included directly #error only <linux/bitops.h> can be included directly
#endif #endif
...@@ -71,6 +69,4 @@ static inline unsigned long __ffs(unsigned long word) ...@@ -71,6 +69,4 @@ static inline unsigned long __ffs(unsigned long word)
#include <asm-generic/bitops/__fls.h> #include <asm-generic/bitops/__fls.h>
#include <asm-generic/bitops/fls64.h> #include <asm-generic/bitops/fls64.h>
#endif /* __KERNEL__ */
#endif /* __ASM_SH_BITOPS_H */ #endif /* __ASM_SH_BITOPS_H */
arch/sh/include/asm/cache.h
View file @ 5bbec3cf
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
*/ */
#ifndef __ASM_SH_CACHE_H #ifndef __ASM_SH_CACHE_H
#define __ASM_SH_CACHE_H #define __ASM_SH_CACHE_H
#ifdef __KERNEL__
#include <linux/init.h> #include <linux/init.h>
#include <cpu/cache.h> #include <cpu/cache.h>
...@@ -44,5 +43,4 @@ struct cache_info { ...@@ -44,5 +43,4 @@ struct cache_info {
unsigned long flags; unsigned long flags;
}; };
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */
#endif /* __ASM_SH_CACHE_H */ #endif /* __ASM_SH_CACHE_H */
arch/sh/include/asm/cacheflush.h
View file @ 5bbec3cf
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
#ifndef __ASM_SH_CACHEFLUSH_H #ifndef __ASM_SH_CACHEFLUSH_H
#define __ASM_SH_CACHEFLUSH_H #define __ASM_SH_CACHEFLUSH_H
#ifdef __KERNEL__
#include <linux/mm.h> #include <linux/mm.h>
/* /*
...@@ -109,5 +107,4 @@ static inline void *sh_cacheop_vaddr(void *vaddr) ...@@ -109,5 +107,4 @@ static inline void *sh_cacheop_vaddr(void *vaddr)
return vaddr; return vaddr;
} }
#endif /* __KERNEL__ */
#endif /* __ASM_SH_CACHEFLUSH_H */ #endif /* __ASM_SH_CACHEFLUSH_H */
arch/sh/include/asm/dma.h
View file @ 5bbec3cf
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
*/ */
#ifndef __ASM_SH_DMA_H #ifndef __ASM_SH_DMA_H
#define __ASM_SH_DMA_H #define __ASM_SH_DMA_H
#ifdef __KERNEL__
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/wait.h> #include <linux/wait.h>
...@@ -144,5 +143,4 @@ extern int isa_dma_bridge_buggy; ...@@ -144,5 +143,4 @@ extern int isa_dma_bridge_buggy;
#define isa_dma_bridge_buggy (0) #define isa_dma_bridge_buggy (0)
#endif #endif
#endif /* __KERNEL__ */
#endif /* __ASM_SH_DMA_H */ #endif /* __ASM_SH_DMA_H */
arch/sh/include/asm/elf.h
View file @ 5bbec3cf
...@@ -90,7 +90,6 @@ typedef struct user_fpu_struct elf_fpregset_t; ...@@ -90,7 +90,6 @@ typedef struct user_fpu_struct elf_fpregset_t;
#endif #endif
#define ELF_ARCH EM_SH #define ELF_ARCH EM_SH
#ifdef __KERNEL__
/* /*
* This is used to ensure we don't load something for the wrong architecture. * This is used to ensure we don't load something for the wrong architecture.
*/ */
...@@ -209,5 +208,4 @@ do { \ ...@@ -209,5 +208,4 @@ do { \
NEW_AUX_ENT(AT_L2_CACHESHAPE, l2_cache_shape); \ NEW_AUX_ENT(AT_L2_CACHESHAPE, l2_cache_shape); \
} while (0) } while (0)
#endif /* __KERNEL__ */
#endif /* __ASM_SH_ELF_H */ #endif /* __ASM_SH_ELF_H */
arch/sh/include/asm/freq.h
View file @ 5bbec3cf
...@@ -6,9 +6,7 @@ ...@@ -6,9 +6,7 @@
*/ */
#ifndef __ASM_SH_FREQ_H #ifndef __ASM_SH_FREQ_H
#define __ASM_SH_FREQ_H #define __ASM_SH_FREQ_H
#ifdef __KERNEL__
#include <cpu/freq.h> #include <cpu/freq.h>
#endif /* __KERNEL__ */
#endif /* __ASM_SH_FREQ_H */ #endif /* __ASM_SH_FREQ_H */
arch/sh/include/asm/futex.h
View file @ 5bbec3cf
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
#ifndef __ASM_SH_FUTEX_H #ifndef __ASM_SH_FUTEX_H
#define __ASM_SH_FUTEX_H #define __ASM_SH_FUTEX_H
#ifdef __KERNEL__
#include <linux/futex.h> #include <linux/futex.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <asm/errno.h> #include <asm/errno.h>
...@@ -71,5 +69,4 @@ static inline int arch_futex_atomic_op_inuser(int op, u32 oparg, int *oval, ...@@ -71,5 +69,4 @@ static inline int arch_futex_atomic_op_inuser(int op, u32 oparg, int *oval,
return ret; return ret;
} }
#endif /* __KERNEL__ */
#endif /* __ASM_SH_FUTEX_H */ #endif /* __ASM_SH_FUTEX_H */
arch/sh/include/asm/io.h
View file @ 5bbec3cf
...@@ -21,10 +21,8 @@ ...@@ -21,10 +21,8 @@
#include <linux/pgtable.h> #include <linux/pgtable.h>
#include <asm-generic/iomap.h> #include <asm-generic/iomap.h>
#ifdef __KERNEL__
#define __IO_PREFIX generic #define __IO_PREFIX generic
#include <asm/io_generic.h> #include <asm/io_generic.h>
#include <asm/io_trapped.h>
#include <asm-generic/pci_iomap.h> #include <asm-generic/pci_iomap.h>
#include <mach/mangle-port.h> #include <mach/mangle-port.h>
...@@ -244,125 +242,38 @@ unsigned long long poke_real_address_q(unsigned long long addr, ...@@ -244,125 +242,38 @@ unsigned long long poke_real_address_q(unsigned long long addr,
#define phys_to_virt(address) (__va(address)) #define phys_to_virt(address) (__va(address))
#endif #endif
/*
* On 32-bit SH, we traditionally have the whole physical address space
* mapped at all times (as MIPS does), so "ioremap()" and "iounmap()" do
* not need to do anything but place the address in the proper segment.
* This is true for P1 and P2 addresses, as well as some P3 ones.
* However, most of the P3 addresses and newer cores using extended
* addressing need to map through page tables, so the ioremap()
* implementation becomes a bit more complicated.
*
* See arch/sh/mm/ioremap.c for additional notes on this.
*
* We cheat a bit and always return uncachable areas until we've fixed
* the drivers to handle caching properly.
*
* On the SH-5 the concept of segmentation in the 1:1 PXSEG sense simply
* doesn't exist, so everything must go through page tables.
*/
#ifdef CONFIG_MMU #ifdef CONFIG_MMU
void iounmap(void __iomem *addr);
void __iomem *__ioremap_caller(phys_addr_t offset, unsigned long size, void __iomem *__ioremap_caller(phys_addr_t offset, unsigned long size,
pgprot_t prot, void *caller); pgprot_t prot, void *caller);
void iounmap(void __iomem *addr);
static inline void __iomem *
__ioremap(phys_addr_t offset, unsigned long size, pgprot_t prot)
{
return __ioremap_caller(offset, size, prot, __builtin_return_address(0));
}
static inline void __iomem *
__ioremap_29bit(phys_addr_t offset, unsigned long size, pgprot_t prot)
{
#ifdef CONFIG_29BIT
phys_addr_t last_addr = offset + size - 1;
/*
* For P1 and P2 space this is trivial, as everything is already
* mapped. Uncached access for P1 addresses are done through P2.
* In the P3 case or for addresses outside of the 29-bit space,
* mapping must be done by the PMB or by using page tables.
*/
if (likely(PXSEG(offset) < P3SEG && PXSEG(last_addr) < P3SEG)) {
u64 flags = pgprot_val(prot);
/*
* Anything using the legacy PTEA space attributes needs
* to be kicked down to page table mappings.
*/
if (unlikely(flags & _PAGE_PCC_MASK))
return NULL;
if (unlikely(flags & _PAGE_CACHABLE))
return (void __iomem *)P1SEGADDR(offset);
return (void __iomem *)P2SEGADDR(offset);
}
/* P4 above the store queues are always mapped. */
if (unlikely(offset >= P3_ADDR_MAX))
return (void __iomem *)P4SEGADDR(offset);
#endif
return NULL;
}
static inline void __iomem *
__ioremap_mode(phys_addr_t offset, unsigned long size, pgprot_t prot)
{
void __iomem *ret;
ret = __ioremap_trapped(offset, size);
if (ret)
return ret;
ret = __ioremap_29bit(offset, size, prot);
if (ret)
return ret;
return __ioremap(offset, size, prot);
}
#else
#define __ioremap(offset, size, prot) ((void __iomem *)(offset))
#define __ioremap_mode(offset, size, prot) ((void __iomem *)(offset))
static inline void iounmap(void __iomem *addr) {}
#endif /* CONFIG_MMU */
static inline void __iomem *ioremap(phys_addr_t offset, unsigned long size) static inline void __iomem *ioremap(phys_addr_t offset, unsigned long size)
{ {
return __ioremap_mode(offset, size, PAGE_KERNEL_NOCACHE); return __ioremap_caller(offset, size, PAGE_KERNEL_NOCACHE,
__builtin_return_address(0));
} }
static inline void __iomem * static inline void __iomem *
ioremap_cache(phys_addr_t offset, unsigned long size) ioremap_cache(phys_addr_t offset, unsigned long size)
{ {
return __ioremap_mode(offset, size, PAGE_KERNEL); return __ioremap_caller(offset, size, PAGE_KERNEL,
__builtin_return_address(0));
} }
#define ioremap_cache ioremap_cache #define ioremap_cache ioremap_cache
#ifdef CONFIG_HAVE_IOREMAP_PROT #ifdef CONFIG_HAVE_IOREMAP_PROT
static inline void __iomem * static inline void __iomem *ioremap_prot(phys_addr_t offset, unsigned long size,
ioremap_prot(phys_addr_t offset, unsigned long size, unsigned long flags) unsigned long flags)
{
return __ioremap_mode(offset, size, __pgprot(flags));
}
#endif
#ifdef CONFIG_IOREMAP_FIXED
extern void __iomem *ioremap_fixed(phys_addr_t, unsigned long, pgprot_t);
extern int iounmap_fixed(void __iomem *);
extern void ioremap_fixed_init(void);
#else
static inline void __iomem *
ioremap_fixed(phys_addr_t phys_addr, unsigned long size, pgprot_t prot)
{ {
BUG(); return __ioremap_caller(offset, size, __pgprot(flags),
return NULL; __builtin_return_address(0));
} }
#endif /* CONFIG_HAVE_IOREMAP_PROT */
static inline void ioremap_fixed_init(void) { } #else /* CONFIG_MMU */
static inline int iounmap_fixed(void __iomem *addr) { return -EINVAL; } #define iounmap(addr) do { } while (0)
#endif #define ioremap(offset, size) ((void __iomem *)(unsigned long)(offset))
#endif /* CONFIG_MMU */
#define ioremap_uc ioremap #define ioremap_uc ioremap
...@@ -381,6 +292,4 @@ static inline int iounmap_fixed(void __iomem *addr) { return -EINVAL; } ...@@ -381,6 +292,4 @@ static inline int iounmap_fixed(void __iomem *addr) { return -EINVAL; }
int valid_phys_addr_range(phys_addr_t addr, size_t size); int valid_phys_addr_range(phys_addr_t addr, size_t size);
int valid_mmap_phys_addr_range(unsigned long pfn, size_t size); int valid_mmap_phys_addr_range(unsigned long pfn, size_t size);
#endif /* __KERNEL__ */
#endif /* __ASM_SH_IO_H */ #endif /* __ASM_SH_IO_H */
arch/sh/include/asm/kdebug.h
View file @ 5bbec3cf
...@@ -12,8 +12,7 @@ enum die_val { ...@@ -12,8 +12,7 @@ enum die_val {
}; };
/* arch/sh/kernel/dumpstack.c */ /* arch/sh/kernel/dumpstack.c */
extern void printk_address(unsigned long address, int reliable, extern void printk_address(unsigned long address, int reliable);
const char *loglvl);
extern void dump_mem(const char *str, const char *loglvl, extern void dump_mem(const char *str, const char *loglvl,
unsigned long bottom, unsigned long top); unsigned long bottom, unsigned long top);
......
arch/sh/include/asm/mmu_context.h
View file @ 5bbec3cf
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
#ifndef __ASM_SH_MMU_CONTEXT_H #ifndef __ASM_SH_MMU_CONTEXT_H
#define __ASM_SH_MMU_CONTEXT_H #define __ASM_SH_MMU_CONTEXT_H
#ifdef __KERNEL__
#include <cpu/mmu_context.h> #include <cpu/mmu_context.h>
#include <asm/tlbflush.h> #include <asm/tlbflush.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
...@@ -177,5 +176,4 @@ static inline void disable_mmu(void) ...@@ -177,5 +176,4 @@ static inline void disable_mmu(void)
#define disable_mmu() do { } while (0) #define disable_mmu() do { } while (0)
#endif #endif
#endif /* __KERNEL__ */
#endif /* __ASM_SH_MMU_CONTEXT_H */ #endif /* __ASM_SH_MMU_CONTEXT_H */
arch/sh/include/asm/mmzone.h
View file @ 5bbec3cf
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
#ifndef __ASM_SH_MMZONE_H #ifndef __ASM_SH_MMZONE_H
#define __ASM_SH_MMZONE_H #define __ASM_SH_MMZONE_H
#ifdef __KERNEL__
#ifdef CONFIG_NEED_MULTIPLE_NODES #ifdef CONFIG_NEED_MULTIPLE_NODES
#include <linux/numa.h> #include <linux/numa.h>
...@@ -44,5 +42,4 @@ void __init __add_active_range(unsigned int nid, unsigned long start_pfn, ...@@ -44,5 +42,4 @@ void __init __add_active_range(unsigned int nid, unsigned long start_pfn,
/* arch/sh/mm/init.c */ /* arch/sh/mm/init.c */
void __init allocate_pgdat(unsigned int nid); void __init allocate_pgdat(unsigned int nid);
#endif /* __KERNEL__ */
#endif /* __ASM_SH_MMZONE_H */ #endif /* __ASM_SH_MMZONE_H */
arch/sh/include/asm/pci.h
View file @ 5bbec3cf
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
#ifndef __ASM_SH_PCI_H #ifndef __ASM_SH_PCI_H
#define __ASM_SH_PCI_H #define __ASM_SH_PCI_H
#ifdef __KERNEL__
/* Can be used to override the logic in pci_scan_bus for skipping /* Can be used to override the logic in pci_scan_bus for skipping
already-configured bus numbers - to be used for buggy BIOSes already-configured bus numbers - to be used for buggy BIOSes
or architectures with incomplete PCI setup by the loader */ or architectures with incomplete PCI setup by the loader */
...@@ -96,6 +94,4 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) ...@@ -96,6 +94,4 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
return channel ? 15 : 14; return channel ? 15 : 14;
} }
#endif /* __KERNEL__ */
#endif /* __ASM_SH_PCI_H */ #endif /* __ASM_SH_PCI_H */
arch/sh/include/asm/processor_32.h
View file @ 5bbec3cf
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
#ifndef __ASM_SH_PROCESSOR_32_H #ifndef __ASM_SH_PROCESSOR_32_H
#define __ASM_SH_PROCESSOR_32_H #define __ASM_SH_PROCESSOR_32_H
#ifdef __KERNEL__
#include <linux/compiler.h> #include <linux/compiler.h>
#include <linux/linkage.h> #include <linux/linkage.h>
...@@ -203,5 +202,4 @@ static inline void prefetchw(const void *x) ...@@ -203,5 +202,4 @@ static inline void prefetchw(const void *x)
} }
#endif #endif
#endif /* __KERNEL__ */
#endif /* __ASM_SH_PROCESSOR_32_H */ #endif /* __ASM_SH_PROCESSOR_32_H */
arch/sh/include/asm/smc37c93x.h
View file @ 5bbec3cf
...@@ -112,8 +112,8 @@ typedef struct uart_reg { ...@@ -112,8 +112,8 @@ typedef struct uart_reg {
#define FCR_RFRES 0x0200 /* Receiver FIFO reset */ #define FCR_RFRES 0x0200 /* Receiver FIFO reset */
#define FCR_TFRES 0x0400 /* Transmitter FIFO reset */ #define FCR_TFRES 0x0400 /* Transmitter FIFO reset */
#define FCR_DMA 0x0800 /* DMA mode select */ #define FCR_DMA 0x0800 /* DMA mode select */
#define FCR_RTL 0x4000 /* Receiver triger (LSB) */ #define FCR_RTL 0x4000 /* Receiver trigger (LSB) */
#define FCR_RTM 0x8000 /* Receiver triger (MSB) */ #define FCR_RTM 0x8000 /* Receiver trigger (MSB) */
/* Line Control Register */ /* Line Control Register */
......
arch/sh/include/asm/sparsemem.h
View file @ 5bbec3cf
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
#ifndef __ASM_SH_SPARSEMEM_H #ifndef __ASM_SH_SPARSEMEM_H
#define __ASM_SH_SPARSEMEM_H #define __ASM_SH_SPARSEMEM_H
#ifdef __KERNEL__
/* /*
* SECTION_SIZE_BITS 2^N: how big each section will be * SECTION_SIZE_BITS 2^N: how big each section will be
* MAX_PHYSMEM_BITS 2^N: how much physical address space we have * MAX_PHYSMEM_BITS 2^N: how much physical address space we have
...@@ -10,6 +9,4 @@ ...@@ -10,6 +9,4 @@
#define SECTION_SIZE_BITS 26 #define SECTION_SIZE_BITS 26
#define MAX_PHYSMEM_BITS 32 #define MAX_PHYSMEM_BITS 32
#endif
#endif /* __ASM_SH_SPARSEMEM_H */ #endif /* __ASM_SH_SPARSEMEM_H */
arch/sh/include/asm/stacktrace.h
View file @ 5bbec3cf
...@@ -12,8 +12,6 @@ ...@@ -12,8 +12,6 @@
struct stacktrace_ops { struct stacktrace_ops {
void (*address)(void *data, unsigned long address, int reliable); void (*address)(void *data, unsigned long address, int reliable);
/* On negative return stop dumping */
int (*stack)(void *data, char *name);
}; };
void dump_trace(struct task_struct *tsk, struct pt_regs *regs, void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
......
arch/sh/include/asm/string_32.h
View file @ 5bbec3cf
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
#ifndef __ASM_SH_STRING_H #ifndef __ASM_SH_STRING_H
#define __ASM_SH_STRING_H #define __ASM_SH_STRING_H
#ifdef __KERNEL__
/* /*
* Copyright (C) 1999 Niibe Yutaka * Copyright (C) 1999 Niibe Yutaka
* But consider these trivial functions to be public domain. * But consider these trivial functions to be public domain.
...@@ -101,6 +99,4 @@ extern void *memchr(const void *__s, int __c, size_t __n); ...@@ -101,6 +99,4 @@ extern void *memchr(const void *__s, int __c, size_t __n);
#define __HAVE_ARCH_STRLEN #define __HAVE_ARCH_STRLEN
extern size_t strlen(const char *); extern size_t strlen(const char *);
#endif /* __KERNEL__ */
#endif /* __ASM_SH_STRING_H */ #endif /* __ASM_SH_STRING_H */
arch/sh/include/asm/syscall_32.h
View file @ 5bbec3cf
...@@ -40,10 +40,7 @@ static inline void syscall_set_return_value(struct task_struct *task, ...@@ -40,10 +40,7 @@ static inline void syscall_set_return_value(struct task_struct *task,
struct pt_regs *regs, struct pt_regs *regs,
int error, long val) int error, long val)
{ {
if (error) regs->regs[0] = (long) error ?: val;
regs->regs[0] = -error;
else
regs->regs[0] = val;
} }
static inline void syscall_get_arguments(struct task_struct *task, static inline void syscall_get_arguments(struct task_struct *task,
......
arch/sh/include/asm/syscalls_32.h
View file @ 5bbec3cf
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
#ifndef __ASM_SH_SYSCALLS_32_H #ifndef __ASM_SH_SYSCALLS_32_H
#define __ASM_SH_SYSCALLS_32_H #define __ASM_SH_SYSCALLS_32_H
#ifdef __KERNEL__
#include <linux/compiler.h> #include <linux/compiler.h>
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/types.h> #include <linux/types.h>
...@@ -26,5 +24,4 @@ asmlinkage void do_syscall_trace_leave(struct pt_regs *regs); ...@@ -26,5 +24,4 @@ asmlinkage void do_syscall_trace_leave(struct pt_regs *regs);
asmlinkage void do_notify_resume(struct pt_regs *regs, unsigned int save_r0, asmlinkage void do_notify_resume(struct pt_regs *regs, unsigned int save_r0,
unsigned long thread_info_flags); unsigned long thread_info_flags);
#endif /* __KERNEL__ */
#endif /* __ASM_SH_SYSCALLS_32_H */ #endif /* __ASM_SH_SYSCALLS_32_H */
arch/sh/include/asm/thread_info.h
View file @ 5bbec3cf
...@@ -10,8 +10,6 @@ ...@@ -10,8 +10,6 @@
* Copyright (C) 2002 David Howells (dhowells@redhat.com) * Copyright (C) 2002 David Howells (dhowells@redhat.com)
* - Incorporating suggestions made by Linus Torvalds and Dave Miller * - Incorporating suggestions made by Linus Torvalds and Dave Miller
*/ */
#ifdef __KERNEL__
#include <asm/page.h> #include <asm/page.h>
/* /*
...@@ -170,7 +168,4 @@ static inline unsigned int get_thread_fault_code(void) ...@@ -170,7 +168,4 @@ static inline unsigned int get_thread_fault_code(void)
} }
#endif /* !__ASSEMBLY__ */ #endif /* !__ASSEMBLY__ */
#endif /* __KERNEL__ */
#endif /* __ASM_SH_THREAD_INFO_H */ #endif /* __ASM_SH_THREAD_INFO_H */
arch/sh/include/asm/uaccess_32.h
View file @ 5bbec3cf
...@@ -26,6 +26,9 @@ do { \ ...@@ -26,6 +26,9 @@ do { \
case 4: \ case 4: \
__get_user_asm(x, ptr, retval, "l"); \ __get_user_asm(x, ptr, retval, "l"); \
break; \ break; \
case 8: \
__get_user_u64(x, ptr, retval); \
break; \
default: \ default: \
__get_user_unknown(); \ __get_user_unknown(); \
break; \ break; \
...@@ -66,6 +69,56 @@ do { \ ...@@ -66,6 +69,56 @@ do { \
extern void __get_user_unknown(void); extern void __get_user_unknown(void);
#if defined(CONFIG_CPU_LITTLE_ENDIAN)
#define __get_user_u64(x, addr, err) \
({ \
__asm__ __volatile__( \
"1:\n\t" \
"mov.l %2,%R1\n\t" \
"mov.l %T2,%S1\n\t" \
"2:\n" \
".section .fixup,\"ax\"\n" \
"3:\n\t" \
"mov #0,%R1\n\t" \
"mov #0,%S1\n\t" \
"mov.l 4f, %0\n\t" \
"jmp @%0\n\t" \
" mov %3, %0\n\t" \
".balign 4\n" \
"4: .long 2b\n\t" \
".previous\n" \
".section __ex_table,\"a\"\n\t" \
".long 1b, 3b\n\t" \
".long 1b + 2, 3b\n\t" \
".previous" \
:"=&r" (err), "=&r" (x) \
:"m" (__m(addr)), "i" (-EFAULT), "0" (err)); })
#else
#define __get_user_u64(x, addr, err) \
({ \
__asm__ __volatile__( \
"1:\n\t" \
"mov.l %2,%S1\n\t" \
"mov.l %T2,%R1\n\t" \
"2:\n" \
".section .fixup,\"ax\"\n" \
"3:\n\t" \
"mov #0,%S1\n\t" \
"mov #0,%R1\n\t" \
"mov.l 4f, %0\n\t" \
"jmp @%0\n\t" \
" mov %3, %0\n\t" \
".balign 4\n" \
"4: .long 2b\n\t" \
".previous\n" \
".section __ex_table,\"a\"\n\t" \
".long 1b, 3b\n\t" \
".long 1b + 2, 3b\n\t" \
".previous" \
:"=&r" (err), "=&r" (x) \
:"m" (__m(addr)), "i" (-EFAULT), "0" (err)); })
#endif
#define __put_user_size(x,ptr,size,retval) \ #define __put_user_size(x,ptr,size,retval) \
do { \ do { \
retval = 0; \ retval = 0; \
......
arch/sh/include/asm/watchdog.h
View file @ 5bbec3cf
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
*/ */
#ifndef __ASM_SH_WATCHDOG_H #ifndef __ASM_SH_WATCHDOG_H
#define __ASM_SH_WATCHDOG_H #define __ASM_SH_WATCHDOG_H
#ifdef __KERNEL__
#include <linux/types.h> #include <linux/types.h>
#include <linux/io.h> #include <linux/io.h>
...@@ -157,5 +156,4 @@ static inline void sh_wdt_write_csr(__u8 val) ...@@ -157,5 +156,4 @@ static inline void sh_wdt_write_csr(__u8 val)
__raw_writew((WTCSR_HIGH << 8) | (__u16)val, WTCSR); __raw_writew((WTCSR_HIGH << 8) | (__u16)val, WTCSR);
} }
#endif /* CONFIG_CPU_SUBTYPE_SH7785 || CONFIG_CPU_SUBTYPE_SH7780 */ #endif /* CONFIG_CPU_SUBTYPE_SH7785 || CONFIG_CPU_SUBTYPE_SH7780 */
#endif /* __KERNEL__ */
#endif /* __ASM_SH_WATCHDOG_H */ #endif /* __ASM_SH_WATCHDOG_H */
arch/sh/kernel/Makefile
View file @ 5bbec3cf
...@@ -47,5 +47,3 @@ obj-$(CONFIG_DWARF_UNWINDER) += dwarf.o ...@@ -47,5 +47,3 @@ obj-$(CONFIG_DWARF_UNWINDER) += dwarf.o
obj-$(CONFIG_PERF_EVENTS) += perf_event.o perf_callchain.o obj-$(CONFIG_PERF_EVENTS) += perf_event.o perf_callchain.o
obj-$(CONFIG_DMA_NONCOHERENT) += dma-coherent.o obj-$(CONFIG_DMA_NONCOHERENT) += dma-coherent.o
obj-$(CONFIG_HAVE_HW_BREAKPOINT) += hw_breakpoint.o obj-$(CONFIG_HAVE_HW_BREAKPOINT) += hw_breakpoint.o
ccflags-y := -Werror
arch/sh/kernel/disassemble.c
View file @ 5bbec3cf
...@@ -376,148 +376,148 @@ static void print_sh_insn(u32 memaddr, u16 insn) ...@@ -376,148 +376,148 @@ static void print_sh_insn(u32 memaddr, u16 insn)
} }
ok: ok:
printk("%-8s ", op->name); pr_cont("%-8s ", op->name);
lastsp = (op->arg[0] == A_END); lastsp = (op->arg[0] == A_END);
disp_pc = 0; disp_pc = 0;
for (n = 0; n < 6 && op->arg[n] != A_END; n++) { for (n = 0; n < 6 && op->arg[n] != A_END; n++) {
if (n && op->arg[1] != A_END) if (n && op->arg[1] != A_END)
printk(", "); pr_cont(", ");
switch (op->arg[n]) { switch (op->arg[n]) {
case A_IMM: case A_IMM:
printk("#%d", (char)(imm)); pr_cont("#%d", (char)(imm));
break; break;
case A_R0: case A_R0:
printk("r0"); pr_cont("r0");
break; break;
case A_REG_N: case A_REG_N:
printk("r%d", rn); pr_cont("r%d", rn);
break; break;
case A_INC_N: case A_INC_N:
printk("@r%d+", rn); pr_cont("@r%d+", rn);
break; break;
case A_DEC_N: case A_DEC_N:
printk("@-r%d", rn); pr_cont("@-r%d", rn);
break; break;
case A_IND_N: case A_IND_N:
printk("@r%d", rn); pr_cont("@r%d", rn);
break; break;
case A_DISP_REG_N: case A_DISP_REG_N:
printk("@(%d,r%d)", imm, rn); pr_cont("@(%d,r%d)", imm, rn);
break; break;
case A_REG_M: case A_REG_M:
printk("r%d", rm); pr_cont("r%d", rm);
break; break;
case A_INC_M: case A_INC_M:
printk("@r%d+", rm); pr_cont("@r%d+", rm);
break; break;
case A_DEC_M: case A_DEC_M:
printk("@-r%d", rm); pr_cont("@-r%d", rm);
break; break;
case A_IND_M: case A_IND_M:
printk("@r%d", rm); pr_cont("@r%d", rm);
break; break;
case A_DISP_REG_M: case A_DISP_REG_M:
printk("@(%d,r%d)", imm, rm); pr_cont("@(%d,r%d)", imm, rm);
break; break;
case A_REG_B: case A_REG_B:
printk("r%d_bank", rb); pr_cont("r%d_bank", rb);
break; break;
case A_DISP_PC: case A_DISP_PC:
disp_pc = 1; disp_pc = 1;
disp_pc_addr = imm + 4 + (memaddr & relmask); disp_pc_addr = imm + 4 + (memaddr & relmask);
printk("%08x <%pS>", disp_pc_addr, pr_cont("%08x <%pS>", disp_pc_addr,
(void *)disp_pc_addr); (void *)disp_pc_addr);
break; break;
case A_IND_R0_REG_N: case A_IND_R0_REG_N:
printk("@(r0,r%d)", rn); pr_cont("@(r0,r%d)", rn);
break; break;
case A_IND_R0_REG_M: case A_IND_R0_REG_M:
printk("@(r0,r%d)", rm); pr_cont("@(r0,r%d)", rm);
break; break;
case A_DISP_GBR: case A_DISP_GBR:
printk("@(%d,gbr)",imm); pr_cont("@(%d,gbr)", imm);
break; break;
case A_R0_GBR: case A_R0_GBR:
printk("@(r0,gbr)"); pr_cont("@(r0,gbr)");
break; break;
case A_BDISP12: case A_BDISP12:
case A_BDISP8: case A_BDISP8:
printk("%08x", imm + memaddr); pr_cont("%08x", imm + memaddr);
break; break;
case A_SR: case A_SR:
printk("sr"); pr_cont("sr");
break; break;
case A_GBR: case A_GBR:
printk("gbr"); pr_cont("gbr");
break; break;
case A_VBR: case A_VBR:
printk("vbr"); pr_cont("vbr");
break; break;
case A_SSR: case A_SSR:
printk("ssr"); pr_cont("ssr");
break; break;
case A_SPC: case A_SPC:
printk("spc"); pr_cont("spc");
break; break;
case A_MACH: case A_MACH:
printk("mach"); pr_cont("mach");
break; break;
case A_MACL: case A_MACL:
printk("macl"); pr_cont("macl");
break; break;
case A_PR: case A_PR:
printk("pr"); pr_cont("pr");
break; break;
case A_SGR: case A_SGR:
printk("sgr"); pr_cont("sgr");
break; break;
case A_DBR: case A_DBR:
printk("dbr"); pr_cont("dbr");
break; break;
case FD_REG_N: case FD_REG_N:
case F_REG_N: case F_REG_N:
printk("fr%d", rn); pr_cont("fr%d", rn);
break; break;
case F_REG_M: case F_REG_M:
printk("fr%d", rm); pr_cont("fr%d", rm);
break; break;
case DX_REG_N: case DX_REG_N:
if (rn & 1) { if (rn & 1) {
printk("xd%d", rn & ~1); pr_cont("xd%d", rn & ~1);
break; break;
} }
/* else, fall through */ /* else, fall through */
case D_REG_N: case D_REG_N:
printk("dr%d", rn); pr_cont("dr%d", rn);
break; break;
case DX_REG_M: case DX_REG_M:
if (rm & 1) { if (rm & 1) {
printk("xd%d", rm & ~1); pr_cont("xd%d", rm & ~1);
break; break;
} }
/* else, fall through */ /* else, fall through */
case D_REG_M: case D_REG_M:
printk("dr%d", rm); pr_cont("dr%d", rm);
break; break;
case FPSCR_M: case FPSCR_M:
case FPSCR_N: case FPSCR_N:
printk("fpscr"); pr_cont("fpscr");
break; break;
case FPUL_M: case FPUL_M:
case FPUL_N: case FPUL_N:
printk("fpul"); pr_cont("fpul");
break; break;
case F_FR0: case F_FR0:
printk("fr0"); pr_cont("fr0");
break; break;
case V_REG_N: case V_REG_N:
printk("fv%d", rn*4); pr_cont("fv%d", rn*4);
break; break;
case V_REG_M: case V_REG_M:
printk("fv%d", rm*4); pr_cont("fv%d", rm*4);
break; break;
case XMTRX_M4: case XMTRX_M4:
printk("xmtrx"); pr_cont("xmtrx");
break; break;
default: default:
return; return;
...@@ -532,7 +532,7 @@ static void print_sh_insn(u32 memaddr, u16 insn) ...@@ -532,7 +532,7 @@ static void print_sh_insn(u32 memaddr, u16 insn)
else else
__get_user(val, (u32 *)disp_pc_addr); __get_user(val, (u32 *)disp_pc_addr);
printk(" ! %08x <%pS>", val, (void *)val); pr_cont(" ! %08x <%pS>", val, (void *)val);
} }
return; return;
...@@ -541,7 +541,7 @@ static void print_sh_insn(u32 memaddr, u16 insn) ...@@ -541,7 +541,7 @@ static void print_sh_insn(u32 memaddr, u16 insn)
} }
printk(".word 0x%x%x%x%x", nibs[0], nibs[1], nibs[2], nibs[3]); pr_info(".word 0x%x%x%x%x", nibs[0], nibs[1], nibs[2], nibs[3]);
} }
void show_code(struct pt_regs *regs) void show_code(struct pt_regs *regs)
...@@ -552,20 +552,21 @@ void show_code(struct pt_regs *regs) ...@@ -552,20 +552,21 @@ void show_code(struct pt_regs *regs)
if (regs->pc & 0x1) if (regs->pc & 0x1)
return; return;
printk("Code:\n"); pr_info("Code:\n");
for (i = -3 ; i < 6 ; i++) { for (i = -3 ; i < 6 ; i++) {
unsigned short insn; unsigned short insn;
if (__get_user(insn, pc + i)) { if (__get_user(insn, pc + i)) {
printk(" (Bad address in pc)\n"); pr_err(" (Bad address in pc)\n");
break; break;
} }
printk("%s%08lx: ", (i ? " ": "->"), (unsigned long)(pc + i)); pr_info("%s%08lx: ", (i ? " " : "->"),
(unsigned long)(pc + i));
print_sh_insn((unsigned long)(pc + i), insn); print_sh_insn((unsigned long)(pc + i), insn);
printk("\n"); pr_cont("\n");
} }
printk("\n"); pr_info("\n");
} }
arch/sh/kernel/dma-coherent.c
View file @ 5bbec3cf
...@@ -3,60 +3,13 @@ ...@@ -3,60 +3,13 @@
* Copyright (C) 2004 - 2007 Paul Mundt * Copyright (C) 2004 - 2007 Paul Mundt
*/ */
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/init.h>
#include <linux/dma-noncoherent.h> #include <linux/dma-noncoherent.h>
#include <linux/module.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/addrspace.h> #include <asm/addrspace.h>
void *arch_dma_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle, void arch_dma_prep_coherent(struct page *page, size_t size)
gfp_t gfp, unsigned long attrs)
{ {
void *ret, *ret_nocache; __flush_purge_region(page_address(page), size);
int order = get_order(size);
gfp |= __GFP_ZERO;
ret = (void *)__get_free_pages(gfp, order);
if (!ret)
return NULL;
/*
* Pages from the page allocator may have data present in
* cache. So flush the cache before using uncached memory.
*/
arch_sync_dma_for_device(virt_to_phys(ret), size,
DMA_BIDIRECTIONAL);
ret_nocache = (void __force *)ioremap(virt_to_phys(ret), size);
if (!ret_nocache) {
free_pages((unsigned long)ret, order);
return NULL;
}
split_page(pfn_to_page(virt_to_phys(ret) >> PAGE_SHIFT), order);
*dma_handle = virt_to_phys(ret);
if (!WARN_ON(!dev))
*dma_handle -= PFN_PHYS(dev->dma_pfn_offset);
return ret_nocache;
}
void arch_dma_free(struct device *dev, size_t size, void *vaddr,
dma_addr_t dma_handle, unsigned long attrs)
{
int order = get_order(size);
unsigned long pfn = (dma_handle >> PAGE_SHIFT);
int k;
if (!WARN_ON(!dev))
pfn += dev->dma_pfn_offset;
for (k = 0; k < (1 << order); k++)
__free_pages(pfn_to_page(pfn + k), 0);
iounmap(vaddr);
} }
void arch_sync_dma_for_device(phys_addr_t paddr, size_t size, void arch_sync_dma_for_device(phys_addr_t paddr, size_t size,
......
arch/sh/kernel/dumpstack.c
View file @ 5bbec3cf
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include <asm/unwinder.h> #include <asm/unwinder.h>
#include <asm/stacktrace.h> #include <asm/stacktrace.h>
void dump_mem(const char *str, const char *loglvl, void dump_mem(const char *str, const char *loglvl, unsigned long bottom,
unsigned long bottom, unsigned long top) unsigned long top)
{ {
unsigned long p; unsigned long p;
int i; int i;
...@@ -31,22 +31,22 @@ void dump_mem(const char *str, const char *loglvl, ...@@ -31,22 +31,22 @@ void dump_mem(const char *str, const char *loglvl,
unsigned int val; unsigned int val;
if (p < bottom || p >= top) if (p < bottom || p >= top)
printk("%s ", loglvl); pr_cont(" ");
else { else {
if (__get_user(val, (unsigned int __user *)p)) { if (__get_user(val, (unsigned int __user *)p)) {
printk("%s\n", loglvl); pr_cont("\n");
return; return;
} }
printk("%s%08x ", loglvl, val); pr_cont("%08x ", val);
} }
} }
printk("%s\n", loglvl); pr_cont("\n");
} }
} }
void printk_address(unsigned long address, int reliable, const char *loglvl) void printk_address(unsigned long address, int reliable)
{ {
printk("%s [<%p>] %s%pS\n", loglvl, (void *) address, pr_cont(" [<%px>] %s%pS\n", (void *) address,
reliable ? "" : "? ", (void *) address); reliable ? "" : "? ", (void *) address);
} }
...@@ -107,22 +107,16 @@ stack_reader_dump(struct task_struct *task, struct pt_regs *regs, ...@@ -107,22 +107,16 @@ stack_reader_dump(struct task_struct *task, struct pt_regs *regs,
} }
} }
static int print_trace_stack(void *data, char *name)
{
printk("%s <%s> ", (char *)data, name);
return 0;
}
/* /*
* Print one address/symbol entries per line. * Print one address/symbol entries per line.
*/ */
static void print_trace_address(void *data, unsigned long addr, int reliable) static void print_trace_address(void *data, unsigned long addr, int reliable)
{ {
printk_address(addr, reliable, (char *)data); printk("%s", (char *)data);
printk_address(addr, reliable);
} }
static const struct stacktrace_ops print_trace_ops = { static const struct stacktrace_ops print_trace_ops = {
.stack = print_trace_stack,
.address = print_trace_address, .address = print_trace_address,
}; };
...@@ -136,7 +130,7 @@ void show_trace(struct task_struct *tsk, unsigned long *sp, ...@@ -136,7 +130,7 @@ void show_trace(struct task_struct *tsk, unsigned long *sp,
unwind_stack(tsk, regs, sp, &print_trace_ops, (void *)loglvl); unwind_stack(tsk, regs, sp, &print_trace_ops, (void *)loglvl);
printk("%s\n", loglvl); pr_cont("\n");
if (!tsk) if (!tsk)
tsk = current; tsk = current;
......
arch/sh/kernel/entry-common.S
View file @ 5bbec3cf
...@@ -178,34 +178,6 @@ syscall_exit_work: ...@@ -178,34 +178,6 @@ syscall_exit_work:
bra resume_userspace bra resume_userspace
nop nop
.align 2
syscall_trace_entry:
! Yes it is traced.
mov r15, r4
mov.l 7f, r11 ! Call do_syscall_trace_enter which notifies
jsr @r11 ! superior (will chomp R[0-7])
nop
mov.l r0, @(OFF_R0,r15) ! Save return value
! Reload R0-R4 from kernel stack, where the
! parent may have modified them using
! ptrace(POKEUSR). (Note that R0-R2 are
! reloaded from the kernel stack by syscall_call
! below, so don't need to be reloaded here.)
! This allows the parent to rewrite system calls
! and args on the fly.
mov.l @(OFF_R4,r15), r4 ! arg0
mov.l @(OFF_R5,r15), r5
mov.l @(OFF_R6,r15), r6
mov.l @(OFF_R7,r15), r7 ! arg3
mov.l @(OFF_R3,r15), r3 ! syscall_nr
!
mov.l 6f, r10 ! Number of syscalls
cmp/hs r10, r3
bf syscall_call
mov #-ENOSYS, r0
bra syscall_exit
mov.l r0, @(OFF_R0,r15) ! Return value
__restore_all: __restore_all:
mov #OFF_SR, r0 mov #OFF_SR, r0
mov.l @(r0,r15), r0 ! get status register mov.l @(r0,r15), r0 ! get status register
...@@ -388,6 +360,37 @@ syscall_exit: ...@@ -388,6 +360,37 @@ syscall_exit:
bf syscall_exit_work bf syscall_exit_work
bra __restore_all bra __restore_all
nop nop
.align 2
syscall_trace_entry:
! Yes it is traced.
mov r15, r4
mov.l 7f, r11 ! Call do_syscall_trace_enter which notifies
jsr @r11 ! superior (will chomp R[0-7])
nop
cmp/eq #-1, r0
bt syscall_exit
mov.l r0, @(OFF_R0,r15) ! Save return value
! Reload R0-R4 from kernel stack, where the
! parent may have modified them using
! ptrace(POKEUSR). (Note that R0-R2 are
! reloaded from the kernel stack by syscall_call
! below, so don't need to be reloaded here.)
! This allows the parent to rewrite system calls
! and args on the fly.
mov.l @(OFF_R4,r15), r4 ! arg0
mov.l @(OFF_R5,r15), r5
mov.l @(OFF_R6,r15), r6
mov.l @(OFF_R7,r15), r7 ! arg3
mov.l @(OFF_R3,r15), r3 ! syscall_nr
!
mov.l 6f, r10 ! Number of syscalls
cmp/hs r10, r3
bf syscall_call
mov #-ENOSYS, r0
bra syscall_exit
mov.l r0, @(OFF_R0,r15) ! Return value
.align 2 .align 2
#if !defined(CONFIG_CPU_SH2) #if !defined(CONFIG_CPU_SH2)
1: .long TRA 1: .long TRA
......
arch/sh/kernel/io_trapped.c
View file @ 5bbec3cf
...@@ -102,7 +102,6 @@ int register_trapped_io(struct trapped_io *tiop) ...@@ -102,7 +102,6 @@ int register_trapped_io(struct trapped_io *tiop)
pr_warn("unable to install trapped io filter\n"); pr_warn("unable to install trapped io filter\n");
return -1; return -1;
} }
EXPORT_SYMBOL_GPL(register_trapped_io);
void __iomem *match_trapped_io_handler(struct list_head *list, void __iomem *match_trapped_io_handler(struct list_head *list,
unsigned long offset, unsigned long offset,
...@@ -131,7 +130,6 @@ void __iomem *match_trapped_io_handler(struct list_head *list, ...@@ -131,7 +130,6 @@ void __iomem *match_trapped_io_handler(struct list_head *list,
spin_unlock_irqrestore(&trapped_lock, flags); spin_unlock_irqrestore(&trapped_lock, flags);
return NULL; return NULL;
} }
EXPORT_SYMBOL_GPL(match_trapped_io_handler);
static struct trapped_io *lookup_tiop(unsigned long address) static struct trapped_io *lookup_tiop(unsigned long address)
{ {
......
arch/sh/kernel/ioport.c
View file @ 5bbec3cf
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
*/ */
#include <linux/module.h> #include <linux/module.h>
#include <linux/io.h> #include <linux/io.h>
#include <asm/io_trapped.h>
unsigned long sh_io_port_base __read_mostly = -1; unsigned long sh_io_port_base __read_mostly = -1;
EXPORT_SYMBOL(sh_io_port_base); EXPORT_SYMBOL(sh_io_port_base);
......
arch/sh/kernel/machvec.c
View file @ 5bbec3cf
...@@ -65,10 +65,10 @@ static int __init early_parse_mv(char *from) ...@@ -65,10 +65,10 @@ static int __init early_parse_mv(char *from)
mvp = get_mv_byname(mv_name); mvp = get_mv_byname(mv_name);
if (unlikely(!mvp)) { if (unlikely(!mvp)) {
printk("Available vectors:\n\n\t'%s', ", sh_mv.mv_name); pr_info("Available vectors:\n\n\t'%s', ", sh_mv.mv_name);
for_each_mv(mvp) for_each_mv(mvp)
printk("'%s', ", mvp->mv_name); pr_cont("'%s', ", mvp->mv_name);
printk("\n\n"); pr_cont("\n\n");
panic("Failed to select machvec '%s' -- halting.\n", panic("Failed to select machvec '%s' -- halting.\n",
mv_name); mv_name);
} else } else
...@@ -105,7 +105,7 @@ void __init sh_mv_setup(void) ...@@ -105,7 +105,7 @@ void __init sh_mv_setup(void)
sh_mv = *(struct sh_machine_vector *)&__machvec_start; sh_mv = *(struct sh_machine_vector *)&__machvec_start;
} }
printk(KERN_NOTICE "Booting machvec: %s\n", get_system_type()); pr_notice("Booting machvec: %s\n", get_system_type());
/* /*
* Manually walk the vec, fill in anything that the board hasn't yet * Manually walk the vec, fill in anything that the board hasn't yet
......
arch/sh/kernel/perf_callchain.c
View file @ 5bbec3cf
...@@ -11,11 +11,6 @@ ...@@ -11,11 +11,6 @@
#include <asm/unwinder.h> #include <asm/unwinder.h>
#include <asm/ptrace.h> #include <asm/ptrace.h>
static int callchain_stack(void *data, char *name)
{
return 0;
}
static void callchain_address(void *data, unsigned long addr, int reliable) static void callchain_address(void *data, unsigned long addr, int reliable)
{ {
struct perf_callchain_entry_ctx *entry = data; struct perf_callchain_entry_ctx *entry = data;
...@@ -25,7 +20,6 @@ static void callchain_address(void *data, unsigned long addr, int reliable) ...@@ -25,7 +20,6 @@ static void callchain_address(void *data, unsigned long addr, int reliable)
} }
static const struct stacktrace_ops callchain_ops = { static const struct stacktrace_ops callchain_ops = {
.stack = callchain_stack,
.address = callchain_address, .address = callchain_address,
}; };
......
arch/sh/kernel/process_32.c
View file @ 5bbec3cf
...@@ -30,33 +30,29 @@ ...@@ -30,33 +30,29 @@
void show_regs(struct pt_regs * regs) void show_regs(struct pt_regs * regs)
{ {
printk("\n"); pr_info("\n");
show_regs_print_info(KERN_DEFAULT); show_regs_print_info(KERN_DEFAULT);
printk("PC is at %pS\n", (void *)instruction_pointer(regs)); pr_info("PC is at %pS\n", (void *)instruction_pointer(regs));
printk("PR is at %pS\n", (void *)regs->pr); pr_info("PR is at %pS\n", (void *)regs->pr);
printk("PC : %08lx SP : %08lx SR : %08lx ", pr_info("PC : %08lx SP : %08lx SR : %08lx ", regs->pc,
regs->pc, regs->regs[15], regs->sr); regs->regs[15], regs->sr);
#ifdef CONFIG_MMU #ifdef CONFIG_MMU
printk("TEA : %08x\n", __raw_readl(MMU_TEA)); pr_cont("TEA : %08x\n", __raw_readl(MMU_TEA));
#else #else
printk("\n"); pr_cont("\n");
#endif #endif
printk("R0 : %08lx R1 : %08lx R2 : %08lx R3 : %08lx\n", pr_info("R0 : %08lx R1 : %08lx R2 : %08lx R3 : %08lx\n",
regs->regs[0],regs->regs[1], regs->regs[0], regs->regs[1], regs->regs[2], regs->regs[3]);
regs->regs[2],regs->regs[3]); pr_info("R4 : %08lx R5 : %08lx R6 : %08lx R7 : %08lx\n",
printk("R4 : %08lx R5 : %08lx R6 : %08lx R7 : %08lx\n", regs->regs[4], regs->regs[5], regs->regs[6], regs->regs[7]);
regs->regs[4],regs->regs[5], pr_info("R8 : %08lx R9 : %08lx R10 : %08lx R11 : %08lx\n",
regs->regs[6],regs->regs[7]); regs->regs[8], regs->regs[9], regs->regs[10], regs->regs[11]);
printk("R8 : %08lx R9 : %08lx R10 : %08lx R11 : %08lx\n", pr_info("R12 : %08lx R13 : %08lx R14 : %08lx\n",
regs->regs[8],regs->regs[9], regs->regs[12], regs->regs[13], regs->regs[14]);
regs->regs[10],regs->regs[11]); pr_info("MACH: %08lx MACL: %08lx GBR : %08lx PR : %08lx\n",
printk("R12 : %08lx R13 : %08lx R14 : %08lx\n",
regs->regs[12],regs->regs[13],
regs->regs[14]);
printk("MACH: %08lx MACL: %08lx GBR : %08lx PR : %08lx\n",
regs->mach, regs->macl, regs->gbr, regs->pr); regs->mach, regs->macl, regs->gbr, regs->pr);
show_trace(NULL, (unsigned long *)regs->regs[15], regs, KERN_DEFAULT); show_trace(NULL, (unsigned long *)regs->regs[15], regs, KERN_DEFAULT);
......
arch/sh/kernel/ptrace_32.c
View file @ 5bbec3cf
...@@ -457,8 +457,6 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs) ...@@ -457,8 +457,6 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs)
{ {
long ret = 0; long ret = 0;
secure_computing_strict(regs->regs[0]);
if (test_thread_flag(TIF_SYSCALL_TRACE) && if (test_thread_flag(TIF_SYSCALL_TRACE) &&
tracehook_report_syscall_entry(regs)) tracehook_report_syscall_entry(regs))
/* /*
...@@ -468,6 +466,9 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs) ...@@ -468,6 +466,9 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs)
*/ */
ret = -1L; ret = -1L;
if (secure_computing() == -1)
return -1;
if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT))) if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
trace_sys_enter(regs, regs->regs[0]); trace_sys_enter(regs, regs->regs[0]);
......
arch/sh/kernel/stacktrace.c
View file @ 5bbec3cf
...@@ -15,11 +15,6 @@ ...@@ -15,11 +15,6 @@
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <asm/stacktrace.h> #include <asm/stacktrace.h>
static int save_stack_stack(void *data, char *name)
{
return 0;
}
/* /*
* Save stack-backtrace addresses into a stack_trace buffer. * Save stack-backtrace addresses into a stack_trace buffer.
*/ */
...@@ -40,7 +35,6 @@ static void save_stack_address(void *data, unsigned long addr, int reliable) ...@@ -40,7 +35,6 @@ static void save_stack_address(void *data, unsigned long addr, int reliable)
} }
static const struct stacktrace_ops save_stack_ops = { static const struct stacktrace_ops save_stack_ops = {
.stack = save_stack_stack,
.address = save_stack_address, .address = save_stack_address,
}; };
...@@ -73,7 +67,6 @@ save_stack_address_nosched(void *data, unsigned long addr, int reliable) ...@@ -73,7 +67,6 @@ save_stack_address_nosched(void *data, unsigned long addr, int reliable)
} }
static const struct stacktrace_ops save_stack_ops_nosched = { static const struct stacktrace_ops save_stack_ops_nosched = {
.stack = save_stack_stack,
.address = save_stack_address_nosched, .address = save_stack_address_nosched,
}; };
......
arch/sh/lib/Makefile
View file @ 5bbec3cf
...@@ -30,5 +30,3 @@ memset-$(CONFIG_CPU_SH4) := memset-sh4.o ...@@ -30,5 +30,3 @@ memset-$(CONFIG_CPU_SH4) := memset-sh4.o
lib-$(CONFIG_MMU) += copy_page.o __clear_user.o lib-$(CONFIG_MMU) += copy_page.o __clear_user.o
lib-$(CONFIG_MCOUNT) += mcount.o lib-$(CONFIG_MCOUNT) += mcount.o
lib-y += $(memcpy-y) $(memset-y) $(udivsi3-y) lib-y += $(memcpy-y) $(memset-y) $(udivsi3-y)
ccflags-y := -Werror
arch/sh/lib/delay.c
View file @ 5bbec3cf
...@@ -29,7 +29,6 @@ void __delay(unsigned long loops) ...@@ -29,7 +29,6 @@ void __delay(unsigned long loops)
: "0" (loops) : "0" (loops)
: "t"); : "t");
} }
EXPORT_SYMBOL(__delay);
inline void __const_udelay(unsigned long xloops) inline void __const_udelay(unsigned long xloops)
{ {
......
arch/sh/mm/Makefile
View file @ 5bbec3cf
...@@ -43,5 +43,3 @@ obj-$(CONFIG_UNCACHED_MAPPING) += uncached.o ...@@ -43,5 +43,3 @@ obj-$(CONFIG_UNCACHED_MAPPING) += uncached.o
obj-$(CONFIG_HAVE_SRAM_POOL) += sram.o obj-$(CONFIG_HAVE_SRAM_POOL) += sram.o
GCOV_PROFILE_pmb.o := n GCOV_PROFILE_pmb.o := n
ccflags-y := -Werror
arch/sh/mm/consistent.c
View file @ 5bbec3cf
...@@ -57,8 +57,6 @@ int __init platform_resource_setup_memory(struct platform_device *pdev, ...@@ -57,8 +57,6 @@ int __init platform_resource_setup_memory(struct platform_device *pdev,
return -ENOMEM; return -ENOMEM;
} }
memset(buf, 0, memsize);
r->flags = IORESOURCE_MEM; r->flags = IORESOURCE_MEM;
r->start = dma_handle; r->start = dma_handle;
r->end = r->start + memsize - 1; r->end = r->start + memsize - 1;
......
arch/sh/mm/fault.c
View file @ 5bbec3cf
...@@ -208,13 +208,12 @@ show_fault_oops(struct pt_regs *regs, unsigned long address) ...@@ -208,13 +208,12 @@ show_fault_oops(struct pt_regs *regs, unsigned long address)
if (!oops_may_print()) if (!oops_may_print())
return; return;
printk(KERN_ALERT "PC:");
pr_alert("BUG: unable to handle kernel %s at %08lx\n", pr_alert("BUG: unable to handle kernel %s at %08lx\n",
address < PAGE_SIZE ? "NULL pointer dereference" address < PAGE_SIZE ? "NULL pointer dereference"
: "paging request", : "paging request",
address); address);
pr_alert("PC:"); pr_alert("PC:");
printk_address(regs->pc, 1, KERN_ALERT); printk_address(regs->pc, 1);
show_pte(NULL, address); show_pte(NULL, address);
} }
......
arch/sh/mm/init.c
View file @ 5bbec3cf
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include <asm/cache.h> #include <asm/cache.h>
#include <asm/pgalloc.h> #include <asm/pgalloc.h>
#include <linux/sizes.h> #include <linux/sizes.h>
#include "ioremap.h"
pgd_t swapper_pg_dir[PTRS_PER_PGD]; pgd_t swapper_pg_dir[PTRS_PER_PGD];
......
arch/sh/mm/ioremap.c
View file @ 5bbec3cf
...@@ -18,12 +18,59 @@ ...@@ -18,12 +18,59 @@
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/io.h> #include <linux/io.h>
#include <asm/io_trapped.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/pgalloc.h> #include <asm/pgalloc.h>
#include <asm/addrspace.h> #include <asm/addrspace.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/tlbflush.h> #include <asm/tlbflush.h>
#include <asm/mmu.h> #include <asm/mmu.h>
#include "ioremap.h"
/*
* On 32-bit SH, we traditionally have the whole physical address space mapped
* at all times (as MIPS does), so "ioremap()" and "iounmap()" do not need to do
* anything but place the address in the proper segment. This is true for P1
* and P2 addresses, as well as some P3 ones. However, most of the P3 addresses
* and newer cores using extended addressing need to map through page tables, so
* the ioremap() implementation becomes a bit more complicated.
*/
#ifdef CONFIG_29BIT
static void __iomem *
__ioremap_29bit(phys_addr_t offset, unsigned long size, pgprot_t prot)
{
phys_addr_t last_addr = offset + size - 1;
/*
* For P1 and P2 space this is trivial, as everything is already
* mapped. Uncached access for P1 addresses are done through P2.
* In the P3 case or for addresses outside of the 29-bit space,
* mapping must be done by the PMB or by using page tables.
*/
if (likely(PXSEG(offset) < P3SEG && PXSEG(last_addr) < P3SEG)) {
u64 flags = pgprot_val(prot);
/*
* Anything using the legacy PTEA space attributes needs
* to be kicked down to page table mappings.
*/
if (unlikely(flags & _PAGE_PCC_MASK))
return NULL;
if (unlikely(flags & _PAGE_CACHABLE))
return (void __iomem *)P1SEGADDR(offset);
return (void __iomem *)P2SEGADDR(offset);
}
/* P4 above the store queues are always mapped. */
if (unlikely(offset >= P3_ADDR_MAX))
return (void __iomem *)P4SEGADDR(offset);
return NULL;
}
#else
#define __ioremap_29bit(offset, size, prot) NULL
#endif /* CONFIG_29BIT */
/* /*
* Remap an arbitrary physical address space into the kernel virtual * Remap an arbitrary physical address space into the kernel virtual
...@@ -42,6 +89,14 @@ __ioremap_caller(phys_addr_t phys_addr, unsigned long size, ...@@ -42,6 +89,14 @@ __ioremap_caller(phys_addr_t phys_addr, unsigned long size,
unsigned long offset, last_addr, addr, orig_addr; unsigned long offset, last_addr, addr, orig_addr;
void __iomem *mapped; void __iomem *mapped;
mapped = __ioremap_trapped(phys_addr, size);
if (mapped)
return mapped;
mapped = __ioremap_29bit(phys_addr, size, pgprot);
if (mapped)
return mapped;
/* Don't allow wraparound or zero size */ /* Don't allow wraparound or zero size */
last_addr = phys_addr + size - 1; last_addr = phys_addr + size - 1;
if (!size || last_addr < phys_addr) if (!size || last_addr < phys_addr)
......
arch/sh/mm/ioremap.h 0 → 100644
View file @ 5bbec3cf
#ifndef _SH_MM_IORMEMAP_H
#define _SH_MM_IORMEMAP_H 1
#ifdef CONFIG_IOREMAP_FIXED
void __iomem *ioremap_fixed(phys_addr_t, unsigned long, pgprot_t);
int iounmap_fixed(void __iomem *);
void ioremap_fixed_init(void);
#else
static inline void __iomem *
ioremap_fixed(phys_addr_t phys_addr, unsigned long size, pgprot_t prot)
{
BUG();
return NULL;
}
static inline void ioremap_fixed_init(void)
{
}
static inline int iounmap_fixed(void __iomem *addr)
{
return -EINVAL;
}
#endif /* CONFIG_IOREMAP_FIXED */
#endif /* _SH_MM_IORMEMAP_H */
arch/sh/mm/ioremap_fixed.c
View file @ 5bbec3cf
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include <asm/tlbflush.h> #include <asm/tlbflush.h>
#include <asm/mmu.h> #include <asm/mmu.h>
#include <asm/mmu_context.h> #include <asm/mmu_context.h>
#include "ioremap.h"
struct ioremap_map { struct ioremap_map {
void __iomem *addr; void __iomem *addr;
......
arch/sh/mm/pgtable.c
View file @ 5bbec3cf
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/slab.h> #include <linux/slab.h>
#define PGALLOC_GFP GFP_KERNEL | __GFP_ZERO
static struct kmem_cache *pgd_cachep; static struct kmem_cache *pgd_cachep;
#if PAGETABLE_LEVELS > 2 #if PAGETABLE_LEVELS > 2
static struct kmem_cache *pmd_cachep; static struct kmem_cache *pmd_cachep;
...@@ -13,6 +11,7 @@ void pgd_ctor(void *x) ...@@ -13,6 +11,7 @@ void pgd_ctor(void *x)
{ {
pgd_t *pgd = x; pgd_t *pgd = x;
memset(pgd, 0, USER_PTRS_PER_PGD * sizeof(pgd_t));
memcpy(pgd + USER_PTRS_PER_PGD, memcpy(pgd + USER_PTRS_PER_PGD,
swapper_pg_dir + USER_PTRS_PER_PGD, swapper_pg_dir + USER_PTRS_PER_PGD,
(PTRS_PER_PGD - USER_PTRS_PER_PGD) * sizeof(pgd_t)); (PTRS_PER_PGD - USER_PTRS_PER_PGD) * sizeof(pgd_t));
...@@ -32,7 +31,7 @@ void pgtable_cache_init(void) ...@@ -32,7 +31,7 @@ void pgtable_cache_init(void)
pgd_t *pgd_alloc(struct mm_struct *mm) pgd_t *pgd_alloc(struct mm_struct *mm)
{ {
return kmem_cache_alloc(pgd_cachep, PGALLOC_GFP); return kmem_cache_alloc(pgd_cachep, GFP_KERNEL);
} }
void pgd_free(struct mm_struct *mm, pgd_t *pgd) void pgd_free(struct mm_struct *mm, pgd_t *pgd)
...@@ -48,7 +47,7 @@ void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd) ...@@ -48,7 +47,7 @@ void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address) pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
{ {
return kmem_cache_alloc(pmd_cachep, PGALLOC_GFP); return kmem_cache_alloc(pmd_cachep, GFP_KERNEL | __GFP_ZERO);
} }
void pmd_free(struct mm_struct *mm, pmd_t *pmd) void pmd_free(struct mm_struct *mm, pmd_t *pmd)
......
arch/sh/oprofile/backtrace.c
View file @ 5bbec3cf
...@@ -19,12 +19,6 @@ ...@@ -19,12 +19,6 @@
#include <asm/sections.h> #include <asm/sections.h>
#include <asm/stacktrace.h> #include <asm/stacktrace.h>
static int backtrace_stack(void *data, char *name)
{
/* Yes, we want all stacks */
return 0;
}
static void backtrace_address(void *data, unsigned long addr, int reliable) static void backtrace_address(void *data, unsigned long addr, int reliable)
{ {
unsigned int *depth = data; unsigned int *depth = data;
...@@ -34,7 +28,6 @@ static void backtrace_address(void *data, unsigned long addr, int reliable) ...@@ -34,7 +28,6 @@ static void backtrace_address(void *data, unsigned long addr, int reliable)
} }
static struct stacktrace_ops backtrace_ops = { static struct stacktrace_ops backtrace_ops = {
.stack = backtrace_stack,
.address = backtrace_address, .address = backtrace_address,
}; };
......
arch/sh/tools/mach-types
View file @ 5bbec3cf
...@@ -46,7 +46,6 @@ X3PROTO SH_X3PROTO ...@@ -46,7 +46,6 @@ X3PROTO SH_X3PROTO
MAGICPANELR2 SH_MAGIC_PANEL_R2 MAGICPANELR2 SH_MAGIC_PANEL_R2
R2D_PLUS RTS7751R2D_PLUS R2D_PLUS RTS7751R2D_PLUS
R2D_1 RTS7751R2D_1 R2D_1 RTS7751R2D_1
CAYMAN SH_CAYMAN
SDK7780 SH_SDK7780 SDK7780 SH_SDK7780
MIGOR SH_MIGOR MIGOR SH_MIGOR
RSK7201 SH_RSK7201 RSK7201 SH_RSK7201
......
arch/um/Kconfig
View file @ 5bbec3cf
...@@ -14,6 +14,7 @@ config UML ...@@ -14,6 +14,7 @@ config UML
select HAVE_FUTEX_CMPXCHG if FUTEX select HAVE_FUTEX_CMPXCHG if FUTEX
select HAVE_DEBUG_KMEMLEAK select HAVE_DEBUG_KMEMLEAK
select HAVE_DEBUG_BUGVERBOSE select HAVE_DEBUG_BUGVERBOSE
select NO_DMA
select GENERIC_IRQ_SHOW select GENERIC_IRQ_SHOW
select GENERIC_CPU_DEVICES select GENERIC_CPU_DEVICES
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
...@@ -167,9 +168,6 @@ config MMAPPER ...@@ -167,9 +168,6 @@ config MMAPPER
This driver allows a host file to be used as emulated IO memory inside This driver allows a host file to be used as emulated IO memory inside
UML. UML.
config NO_DMA
def_bool y
config PGTABLE_LEVELS config PGTABLE_LEVELS
int int
default 3 if 3_LEVEL_PGTABLES default 3 if 3_LEVEL_PGTABLES
......
drivers/input/serio/i8042-io.h
View file @ 5bbec3cf
...@@ -21,8 +21,6 @@ ...@@ -21,8 +21,6 @@
#elif defined(__arm__) #elif defined(__arm__)
/* defined in include/asm-arm/arch-xxx/irqs.h */ /* defined in include/asm-arm/arch-xxx/irqs.h */
#include <asm/irq.h> #include <asm/irq.h>
#elif defined(CONFIG_SH_CAYMAN)
#include <asm/irq.h>
#elif defined(CONFIG_PPC) #elif defined(CONFIG_PPC)
extern int of_i8042_kbd_irq; extern int of_i8042_kbd_irq;
extern int of_i8042_aux_irq; extern int of_i8042_aux_irq;
......
kernel/dma/Kconfig
View file @ 5bbec3cf
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
config NO_DMA
bool
config HAS_DMA config HAS_DMA
bool bool
depends on !NO_DMA depends on !NO_DMA
......
tools/testing/selftests/seccomp/seccomp_bpf.c
View file @ 5bbec3cf
...@@ -133,6 +133,8 @@ struct seccomp_data { ...@@ -133,6 +133,8 @@ struct seccomp_data {
# define __NR_seccomp 348 # define __NR_seccomp 348
# elif defined(__xtensa__) # elif defined(__xtensa__)
# define __NR_seccomp 337 # define __NR_seccomp 337
# elif defined(__sh__)
# define __NR_seccomp 372
# else # else
# warning "seccomp syscall number unknown for this architecture" # warning "seccomp syscall number unknown for this architecture"
# define __NR_seccomp 0xffff # define __NR_seccomp 0xffff
...@@ -1719,6 +1721,10 @@ TEST_F(TRACE_poke, getpid_runs_normally) ...@@ -1719,6 +1721,10 @@ TEST_F(TRACE_poke, getpid_runs_normally)
* a2 of the current window which is not fixed. * a2 of the current window which is not fixed.
*/ */
#define SYSCALL_RET(reg) a[(reg).windowbase * 4 + 2] #define SYSCALL_RET(reg) a[(reg).windowbase * 4 + 2]
#elif defined(__sh__)
# define ARCH_REGS struct pt_regs
# define SYSCALL_NUM gpr[3]
# define SYSCALL_RET gpr[0]
#else #else
# error "Do not know how to find your architecture's registers and syscalls" # error "Do not know how to find your architecture's registers and syscalls"
#endif #endif
...@@ -1791,7 +1797,7 @@ void change_syscall(struct __test_metadata *_metadata, ...@@ -1791,7 +1797,7 @@ void change_syscall(struct __test_metadata *_metadata,
#if defined(__x86_64__) || defined(__i386__) || defined(__powerpc__) || \ #if defined(__x86_64__) || defined(__i386__) || defined(__powerpc__) || \
defined(__s390__) || defined(__hppa__) || defined(__riscv) || \ defined(__s390__) || defined(__hppa__) || defined(__riscv) || \
defined(__xtensa__) || defined(__csky__) defined(__xtensa__) || defined(__csky__) || defined(__sh__)
{ {
regs.SYSCALL_NUM = syscall; regs.SYSCALL_NUM = syscall;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7