Menu
▾
▴
linux-mips-commits — CVS Commit Patches
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(165) |
Sep
(240) |
Oct
(424) |
Nov
(526) |
Dec
(293) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(242) |
Feb
(149) |
Mar
(143) |
Apr
(143) |
May
(76) |
Jun
(59) |
Jul
(20) |
Aug
(2) |
Sep
(49) |
Oct
(1) |
Nov
(4) |
Dec
|
| 2003 |
Jan
(1) |
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(3) |
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
(72) |
Jul
(36) |
Aug
(9) |
Sep
(16) |
Oct
(23) |
Nov
(9) |
Dec
(3) |
| 2010 |
Jan
|
Feb
(1) |
Mar
(35) |
Apr
(44) |
May
(56) |
Jun
(71) |
Jul
(41) |
Aug
(41) |
Sep
(22) |
Oct
(3) |
Nov
(1) |
Dec
(1) |
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
(1) |
Nov
(1) |
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
(1) |
Apr
(1) |
May
(1) |
Jun
|
Jul
(1) |
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2021 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
(1) |
Sep
(25) |
Oct
(105) |
Nov
(15) |
Dec
|
| 2025 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
(4) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: James S. <jsi...@us...> - 2002-03-18 22:25:13
|
Update of /cvsroot/linux-mips/linux/arch/mips64/math-emu In directory usw-pr-cvs1:/tmp/cvs-serv25230/arch/mips64/math-emu Removed Files: cp1emu.c Log Message: Use the 32-bit fp emulator for the 32-bit kernel also. --- cp1emu.c DELETED --- |
|
From: James S. <jsi...@us...> - 2002-03-18 22:25:13
|
Update of /cvsroot/linux-mips/linux/include/asm-mips64
In directory usw-pr-cvs1:/tmp/cvs-serv25230/include/asm-mips64
Added Files:
fpu_emulator.h inst.h
Log Message:
Use the 32-bit fp emulator for the 32-bit kernel also.
--- NEW FILE: fpu_emulator.h ---
/*
* Definitiona for the Algorithmics FPU Emulator port into MIPS Linux
*/
/**************************************************************************
*
* include/asm-mips/fpu_emulator.h
*
* Kevin D. Kissell, ke...@mi... and Carsten Langgaard, car...@mi...
* Copyright (C) 2000 MIPS Technologies, Inc. All rights reserved.
*
* ########################################################################
*
* This program is free software; you can distribute it and/or modify it
* under the terms of the GNU General Public License (Version 2) as
* published by the Free Software Foundation.
*
* This program is distributed in the hope it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
*
*************************************************************************/
/*
* Further private data for which no space exists in mips_fpu_soft_struct.
* This should be subsumed into the mips_fpu_soft_struct structure as
* defined in processor.h as soon as the absurd wired absolute assembler
* offsets become dynamic at compile time.
*/
struct mips_fpu_emulator_private {
unsigned int eir;
struct {
unsigned int emulated;
unsigned int loads;
unsigned int stores;
unsigned int cp1ops;
unsigned int cp1xops;
unsigned int errors;
} stats;
};
--- NEW FILE: inst.h ---
/*
* Format of an instruction in memory.
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
* Copyright (C) 1996, 2000 by Ralf Baechle
*/
#ifndef _ASM_INST_H
#define _ASM_INST_H
/*
* Major opcodes; before MIPS IV cop1x was called cop3.
*/
enum major_op {
spec_op, bcond_op, j_op, jal_op,
beq_op, bne_op, blez_op, bgtz_op,
addi_op, addiu_op, slti_op, sltiu_op,
andi_op, ori_op, xori_op, lui_op,
cop0_op, cop1_op, cop2_op, cop1x_op,
beql_op, bnel_op, blezl_op, bgtzl_op,
daddi_op, daddiu_op, ldl_op, ldr_op,
major_1c_op, jalx_op, major_1e_op, major_1f_op,
lb_op, lh_op, lwl_op, lw_op,
lbu_op, lhu_op, lwr_op, lwu_op,
sb_op, sh_op, swl_op, sw_op,
sdl_op, sdr_op, swr_op, cache_op,
ll_op, lwc1_op, lwc2_op, pref_op,
lld_op, ldc1_op, ldc2_op, ld_op,
sc_op, swc1_op, swc2_op, major_3b_op, /* Opcode 0x3b is unused */
scd_op, sdc1_op, sdc2_op, sd_op
};
/*
* func field of spec opcode.
*/
enum spec_op {
sll_op, movc_op, srl_op, sra_op,
sllv_op, srlv_op, srav_op, spec1_unused_op, /* Opcode 0x07 is unused */
jr_op, jalr_op, movz_op, movn_op,
syscall_op, break_op, spim_op, sync_op,
mfhi_op, mthi_op, mflo_op, mtlo_op,
dsllv_op, spec2_unused_op, dsrlv_op, dsrav_op,
mult_op, multu_op, div_op, divu_op,
dmult_op, dmultu_op, ddiv_op, ddivu_op,
add_op, addu_op, sub_op, subu_op,
and_op, or_op, xor_op, nor_op,
spec3_unused_op, spec4_unused_op, slt_op, sltu_op,
dadd_op, daddu_op, dsub_op, dsubu_op,
tge_op, tgeu_op, tlt_op, tltu_op,
teq_op, spec5_unused_op, tne_op, spec6_unused_op,
dsll_op, spec7_unused_op, dsrl_op, dsra_op,
dsll32_op, spec8_unused_op, dsrl32_op, dsra32_op
};
/*
* rt field of bcond opcodes.
*/
enum rt_op {
bltz_op, bgez_op, bltzl_op, bgezl_op,
spimi_op, unused_rt_op_0x05, unused_rt_op_0x06, unused_rt_op_0x07,
tgei_op, tgeiu_op, tlti_op, tltiu_op,
teqi_op, unused_0x0d_rt_op, tnei_op, unused_0x0f_rt_op,
bltzal_op, bgezal_op, bltzall_op, bgezall_op
/*
* The others (0x14 - 0x1f) are unused.
*/
};
/*
* rs field of cop opcodes.
*/
enum cop_op {
mfc_op = 0x00, dmfc_op = 0x01,
cfc_op = 0x02, mtc_op = 0x04,
dmtc_op = 0x05, ctc_op = 0x06,
bc_op = 0x08, cop_op = 0x10,
copm_op = 0x18
};
/*
* rt field of cop.bc_op opcodes
*/
enum bcop_op {
bcf_op, bct_op, bcfl_op, bctl_op
};
/*
* func field of cop0 coi opcodes.
*/
enum cop0_coi_func {
tlbr_op = 0x01, tlbwi_op = 0x02,
tlbwr_op = 0x06, tlbp_op = 0x08,
rfe_op = 0x10, eret_op = 0x18
};
/*
* func field of cop0 com opcodes.
*/
enum cop0_com_func {
tlbr1_op = 0x01, tlbw_op = 0x02,
tlbp1_op = 0x08, dctr_op = 0x09,
dctw_op = 0x0a
};
/*
* fmt field of cop1 opcodes.
*/
enum cop1_fmt {
s_fmt, d_fmt, e_fmt, q_fmt,
w_fmt, l_fmt
};
/*
* func field of cop1 instructions using d, s or w format.
*/
enum cop1_sdw_func {
fadd_op = 0x00, fsub_op = 0x01,
fmul_op = 0x02, fdiv_op = 0x03,
fsqrt_op = 0x04, fabs_op = 0x05,
fmov_op = 0x06, fneg_op = 0x07,
froundl_op = 0x08, ftruncl_op = 0x09,
fceill_op = 0x0a, ffloorl_op = 0x0b,
fround_op = 0x0c, ftrunc_op = 0x0d,
fceil_op = 0x0e, ffloor_op = 0x0f,
fmovc_op = 0x11, fmovz_op = 0x12,
fmovn_op = 0x13, frecip_op = 0x15,
frsqrt_op = 0x16, fcvts_op = 0x20,
fcvtd_op = 0x21, fcvte_op = 0x22,
fcvtw_op = 0x24, fcvtl_op = 0x25,
fcmp_op = 0x30
};
/*
* func field of cop1x opcodes (MIPS IV).
*/
enum cop1x_func {
lwxc1_op = 0x00, ldxc1_op = 0x01,
pfetch_op = 0x07, swxc1_op = 0x08,
sdxc1_op = 0x09, madd_s_op = 0x20,
madd_d_op = 0x21, madd_e_op = 0x22,
msub_s_op = 0x28, msub_d_op = 0x29,
msub_e_op = 0x2a, nmadd_s_op = 0x30,
nmadd_d_op = 0x31, nmadd_e_op = 0x32,
nmsub_s_op = 0x38, nmsub_d_op = 0x39,
nmsub_e_op = 0x3a
};
/*
* func field for mad opcodes (MIPS IV).
*/
enum mad_func {
madd_op = 0x08, msub_op = 0x0a,
nmadd_op = 0x0c, nmsub_op = 0x0e
};
/*
* Damn ... bitfields depend from byteorder :-(
*/
#ifdef __MIPSEB__
struct j_format { /* Jump format */
unsigned int opcode : 6;
unsigned int target : 26;
};
struct i_format { /* Immediate format (addi, lw, ...) */
unsigned int opcode : 6;
unsigned int rs : 5;
unsigned int rt : 5;
signed int simmediate : 16;
};
struct u_format { /* Unsigned immediate format (ori, xori, ...) */
unsigned int opcode : 6;
unsigned int rs : 5;
unsigned int rt : 5;
unsigned int uimmediate : 16;
};
struct c_format { /* Cache (>= R6000) format */
unsigned int opcode : 6;
unsigned int rs : 5;
unsigned int c_op : 3;
unsigned int cache : 2;
unsigned int simmediate : 16;
};
struct r_format { /* Register format */
unsigned int opcode : 6;
unsigned int rs : 5;
unsigned int rt : 5;
unsigned int rd : 5;
unsigned int re : 5;
unsigned int func : 6;
};
struct p_format { /* Performance counter format (R10000) */
unsigned int opcode : 6;
unsigned int rs : 5;
unsigned int rt : 5;
unsigned int rd : 5;
unsigned int re : 5;
unsigned int func : 6;
};
struct f_format { /* FPU register format */
unsigned int opcode : 6;
unsigned int : 1;
unsigned int fmt : 4;
unsigned int rt : 5;
unsigned int rd : 5;
unsigned int re : 5;
unsigned int func : 6;
};
struct ma_format { /* FPU multipy and add format (MIPS IV) */
unsigned int opcode : 6;
unsigned int fr : 5;
unsigned int ft : 5;
unsigned int fs : 5;
unsigned int fd : 5;
unsigned int func : 4;
unsigned int fmt : 2;
};
#elif defined(__MIPSEL__)
struct j_format { /* Jump format */
unsigned int target : 26;
unsigned int opcode : 6;
};
struct i_format { /* Immediate format */
signed int simmediate : 16;
unsigned int rt : 5;
unsigned int rs : 5;
unsigned int opcode : 6;
};
struct u_format { /* Unsigned immediate format */
unsigned int uimmediate : 16;
unsigned int rt : 5;
unsigned int rs : 5;
unsigned int opcode : 6;
};
struct c_format { /* Cache (>= R6000) format */
unsigned int simmediate : 16;
unsigned int cache : 2;
unsigned int c_op : 3;
unsigned int rs : 5;
unsigned int opcode : 6;
};
struct r_format { /* Register format */
unsigned int func : 6;
unsigned int re : 5;
unsigned int rd : 5;
unsigned int rt : 5;
unsigned int rs : 5;
unsigned int opcode : 6;
};
struct p_format { /* Performance counter format (R10000) */
unsigned int func : 6;
unsigned int re : 5;
unsigned int rd : 5;
unsigned int rt : 5;
unsigned int rs : 5;
unsigned int opcode : 6;
};
struct f_format { /* FPU register format */
unsigned int func : 6;
unsigned int re : 5;
unsigned int rd : 5;
unsigned int rt : 5;
unsigned int fmt : 4;
unsigned int : 1;
unsigned int opcode : 6;
};
struct ma_format { /* FPU multipy and add format (MIPS IV) */
unsigned int fmt : 2;
unsigned int func : 4;
unsigned int fd : 5;
unsigned int fs : 5;
unsigned int ft : 5;
unsigned int fr : 5;
unsigned int opcode : 6;
};
#else /* !defined (__MIPSEB__) && !defined (__MIPSEL__) */
#error "MIPS but neither __MIPSEL__ nor __MIPSEB__?"
#endif
union mips_instruction {
unsigned int word;
unsigned short halfword[2];
unsigned char byte[4];
struct j_format j_format;
struct i_format i_format;
struct u_format u_format;
struct c_format c_format;
struct r_format r_format;
struct f_format f_format;
struct ma_format ma_format;
};
/* HACHACHAHCAHC ... */
/* In case some other massaging is needed, keep MIPSInst as wrapper */
#define MIPSInst(x) x
#define I_OPCODE_SFT 26
#define MIPSInst_OPCODE(x) (MIPSInst(x) >> I_OPCODE_SFT)
#define I_JTARGET_SFT 0
#define MIPSInst_JTARGET(x) (MIPSInst(x) & 0x03ffffff)
#define I_RS_SFT 21
#define MIPSInst_RS(x) ((MIPSInst(x) & 0x03e00000) >> I_RS_SFT)
#define I_RT_SFT 16
#define MIPSInst_RT(x) ((MIPSInst(x) & 0x001f0000) >> I_RT_SFT)
#define I_IMM_SFT 0
#define MIPSInst_SIMM(x) ((int)((short)(MIPSInst(x) & 0xffff)))
#define MIPSInst_UIMM(x) (MIPSInst(x) & 0xffff)
#define I_CACHEOP_SFT 18
#define MIPSInst_CACHEOP(x) ((MIPSInst(x) & 0x001c0000) >> I_CACHEOP_SFT)
#define I_CACHESEL_SFT 16
#define MIPSInst_CACHESEL(x) ((MIPSInst(x) & 0x00030000) >> I_CACHESEL_SFT)
#define I_RD_SFT 11
#define MIPSInst_RD(x) ((MIPSInst(x) & 0x0000f800) >> I_RD_SFT)
#define I_RE_SFT 6
#define MIPSInst_RE(x) ((MIPSInst(x) & 0x000007c0) >> I_RE_SFT)
#define I_FUNC_SFT 0
#define MIPSInst_FUNC(x) (MIPSInst(x) & 0x0000003f)
#define I_FFMT_SFT 21
#define MIPSInst_FFMT(x) ((MIPSInst(x) & 0x01e00000) >> I_FFMT_SFT)
#define I_FT_SFT 16
#define MIPSInst_FT(x) ((MIPSInst(x) & 0x001f0000) >> I_FT_SFT)
#define I_FS_SFT 11
#define MIPSInst_FS(x) ((MIPSInst(x) & 0x0000f800) >> I_FS_SFT)
#define I_FD_SFT 6
#define MIPSInst_FD(x) ((MIPSInst(x) & 0x000007c0) >> I_FD_SFT)
#define I_FR_SFT 21
#define MIPSInst_FR(x) ((MIPSInst(x) & 0x03e00000) >> I_FR_SFT)
#define I_FMA_FUNC_SFT 2
#define MIPSInst_FMA_FUNC(x) ((MIPSInst(x) & 0x0000003c) >> I_FMA_FUNC_SFT)
#define I_FMA_FFMT_SFT 0
#define MIPSInst_FMA_FFMT(x) (MIPSInst(x) & 0x00000003)
typedef unsigned int mips_instruction;
#endif /* _ASM_INST_H */
|
|
From: James S. <jsi...@us...> - 2002-03-18 22:25:10
|
Update of /cvsroot/linux-mips/linux/arch/mips64/configs In directory usw-pr-cvs1:/tmp/cvs-serv25230/arch/mips64/configs Modified Files: defconfig-atlas defconfig-ip22 defconfig-ip32 defconfig-malta Log Message: Use the 32-bit fp emulator for the 32-bit kernel also. Index: defconfig-atlas =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips64/configs/defconfig-atlas,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- defconfig-atlas 26 Feb 2002 19:03:28 -0000 1.5 +++ defconfig-atlas 18 Mar 2002 22:25:07 -0000 1.6 @@ -47,7 +47,6 @@ # General setup # # CONFIG_CPU_LITTLE_ENDIAN is not set -# CONFIG_MIPS_FPU_EMULATOR is not set CONFIG_NET=y CONFIG_PCI_NAMES=y # CONFIG_HOTPLUG is not set Index: defconfig-ip22 =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips64/configs/defconfig-ip22,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- defconfig-ip22 26 Feb 2002 17:46:06 -0000 1.10 +++ defconfig-ip22 18 Mar 2002 22:25:07 -0000 1.11 @@ -53,7 +53,6 @@ # General setup # # CONFIG_CPU_LITTLE_ENDIAN is not set -# CONFIG_MIPS_FPU_EMULATOR is not set CONFIG_NET=y # CONFIG_HOTPLUG is not set # CONFIG_PCMCIA is not set Index: defconfig-ip32 =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips64/configs/defconfig-ip32,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- defconfig-ip32 26 Feb 2002 19:03:28 -0000 1.10 +++ defconfig-ip32 18 Mar 2002 22:25:07 -0000 1.11 @@ -50,7 +50,6 @@ # General setup # # CONFIG_CPU_LITTLE_ENDIAN is not set -# CONFIG_MIPS_FPU_EMULATOR is not set CONFIG_NET=y CONFIG_PCI_NAMES=y # CONFIG_HOTPLUG is not set Index: defconfig-malta =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips64/configs/defconfig-malta,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- defconfig-malta 26 Feb 2002 19:03:28 -0000 1.5 +++ defconfig-malta 18 Mar 2002 22:25:07 -0000 1.6 @@ -48,7 +48,6 @@ # General setup # CONFIG_CPU_LITTLE_ENDIAN=y -# CONFIG_MIPS_FPU_EMULATOR is not set CONFIG_NET=y CONFIG_PCI_NAMES=y # CONFIG_HOTPLUG is not set |
|
From: James S. <jsi...@us...> - 2002-03-18 22:25:10
|
Update of /cvsroot/linux-mips/linux/arch/mips64 In directory usw-pr-cvs1:/tmp/cvs-serv25230/arch/mips64 Modified Files: Makefile config.in Log Message: Use the 32-bit fp emulator for the 32-bit kernel also. Index: Makefile =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips64/Makefile,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Makefile 28 Jan 2002 20:31:57 -0000 1.8 +++ Makefile 18 Mar 2002 22:25:07 -0000 1.9 @@ -67,10 +67,11 @@ CFLAGS += -mcpu=r8000 -mips4 endif -ifdef CONFIG_MIPS_FPU_EMULATOR -CORE_FILES += arch/mips64/math-emu/fpu_emulator.o -SUBDIRS += arch/mips64/math-emu -endif +# +# We unconditionally build the math emulator +# +CORE_FILES += arch/mips/math-emu/fpu_emulator.o +SUBDIRS += arch/mips/math-emu # # Board-dependent options and extra files Index: config.in =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips64/config.in,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- config.in 14 Feb 2002 20:42:00 -0000 1.14 +++ config.in 18 Mar 2002 22:25:07 -0000 1.15 @@ -160,10 +160,6 @@ fi bool 'Generate little endian code' CONFIG_CPU_LITTLE_ENDIAN -if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then - bool 'Kernel floating-point emulation' CONFIG_MIPS_FPU_EMULATOR -fi - bool 'Networking support' CONFIG_NET source drivers/pci/Config.in |
|
From: Pete P. <pp...@us...> - 2002-03-13 17:57:53
|
Update of /cvsroot/linux-mips/linux/include/pcmcia
In directory usw-pr-cvs1:/tmp/cvs-serv23623/include/pcmcia
Modified Files:
cs_types.h ss.h
Log Message:
* Make ioaddr_t 32 bit or 64 bit depending on whether 64 BIT
support is enabled.
* Added a new type, memaddr_t which is the same as ioaddr_t but reflects
the fact that that variable holds the physical address of the pcmcia
* attribute or common memory (vs pcmcia io address).
Index: cs_types.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/pcmcia/cs_types.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cs_types.h 30 Nov 2001 00:14:45 -0000 1.1
+++ cs_types.h 13 Mar 2002 17:57:49 -0000 1.2
@@ -36,10 +36,20 @@
#include <sys/types.h>
#endif
-#if defined(__arm__) || defined(__mips__)
-typedef u_int ioaddr_t;
+#if defined(__arm__)
+typedef u_int ioaddr_t;
+typedef u_int memaddr_t;
+#elif defined(__mips__)
+ #ifdef CONFIG_64BIT_PHYS_ADDR
+ typedef unsigned long long ioaddr_t;
+ typedef unsigned long long memaddr_t;
+ #else
+ typedef unsigned long ioaddr_t;
+ typedef unsigned long memaddr_t;
+ #endif
#else
typedef u_short ioaddr_t;
+typedef u_int memaddr_t;
#endif
typedef u_short socket_t;
Index: ss.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/pcmcia/ss.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ss.h 27 Nov 2001 00:15:13 -0000 1.4
+++ ss.h 13 Mar 2002 17:57:50 -0000 1.5
@@ -111,7 +111,7 @@
u_char map;
u_char flags;
u_short speed;
- u_long sys_start, sys_stop;
+ memaddr_t sys_start, sys_stop;
u_int card_start;
} pccard_mem_map;
|
|
From: Pete P. <pp...@us...> - 2002-03-12 22:51:40
|
Update of /cvsroot/linux-mips/linux/arch/mips
In directory usw-pr-cvs1:/tmp/cvs-serv29206/arch/mips
Modified Files:
config.in
Log Message:
Added CONFIG_PCI_AUTO to the Pb1500.
Index: config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/config.in,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- config.in 9 Mar 2002 07:47:19 -0000 1.88
+++ config.in 12 Mar 2002 22:51:31 -0000 1.89
@@ -377,6 +377,7 @@
define_bool CONFIG_NEW_IRQ y
define_bool CONFIG_PCI y
define_bool CONFIG_NEW_PCI y
+ define_bool CONFIG_PCI_AUTO y
define_bool CONFIG_NONCOHERENT_IO y
define_bool CONFIG_PC_KEYB y
define_int MAX_HWIFS 1
|
|
From: Paul M. <le...@us...> - 2002-03-12 05:23:16
|
Update of /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4122/eagle In directory usw-pr-cvs1:/tmp/cvs-serv10280 Modified Files: pci_fixup.c Log Message: Fix empty breaks, nuke useless ifdef. Index: pci_fixup.c =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4122/eagle/pci_fixup.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- pci_fixup.c 7 Mar 2002 03:16:54 -0000 1.1 +++ pci_fixup.c 12 Mar 2002 05:23:12 -0000 1.2 @@ -32,12 +32,13 @@ */ /* * Changes: + * Paul Mundt <le...@ch...> + * - Fix empty break statements, remove useless CONFIG_PCI. + * * MontaVista Software Inc. <yy...@mv...> or <so...@mv...> * - New creation, NEC Eagle is supported. */ #include <linux/config.h> - -#ifdef CONFIG_PCI #include <linux/init.h> #include <linux/pci.h> @@ -98,14 +99,14 @@ dev->irq = CP_INTA_IRQ; break; case 2: - break; dev->irq = CP_INTB_IRQ; - case 3: break; + case 3: dev->irq = CP_INTC_IRQ; - case 4: break; + case 4: dev->irq = CP_INTD_IRQ; + break; } break; #ifdef CONFIG_VRC4173 @@ -148,4 +149,3 @@ return 0; } -#endif |
|
From: Paul M. <le...@us...> - 2002-03-11 20:08:15
|
Update of /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4111/mobilepro
In directory usw-pr-cvs1:/tmp/cvs-serv31721/vr41xx/vr4111/mobilepro
Modified Files:
setup.c
Log Message:
Start on some setup cleanups ..
Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4111/mobilepro/setup.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- setup.c 10 Mar 2002 23:33:11 -0000 1.1
+++ setup.c 11 Mar 2002 19:36:43 -0000 1.2
@@ -37,7 +37,7 @@
{
}
-void __init nec_mobilepro_setup(void)
+void __init nec_vr41xx_setup(void)
{
set_io_port_base(VR41XX_PORT_BASE);
isa_slot_offset = VR41XX_ISAMEM_BASE;
|
|
From: Paul M. <le...@us...> - 2002-03-11 20:08:12
|
Update of /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4111/clio-1000
In directory usw-pr-cvs1:/tmp/cvs-serv31721/vr41xx/vr4111/clio-1000
Modified Files:
setup.c
Log Message:
Start on some setup cleanups ..
Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4111/clio-1000/setup.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- setup.c 10 Mar 2002 23:33:11 -0000 1.1
+++ setup.c 11 Mar 2002 19:36:42 -0000 1.2
@@ -52,7 +52,7 @@
{
}
-void __init clio_1000_setup(void)
+void __init nec_vr41xx_setup(void)
{
unsigned short val;
|
|
From: Paul M. <le...@us...> - 2002-03-11 20:08:12
|
Update of /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4111/casio-e15
In directory usw-pr-cvs1:/tmp/cvs-serv31721/vr41xx/vr4111/casio-e15
Modified Files:
setup.c
Log Message:
Start on some setup cleanups ..
Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4111/casio-e15/setup.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- setup.c 10 Mar 2002 23:33:11 -0000 1.1
+++ setup.c 11 Mar 2002 19:36:41 -0000 1.2
@@ -63,7 +63,7 @@
{
}
-void __init casio_e15_setup(void)
+void __init nec_vr41xx_setup(void)
{
set_io_port_base(VR41XX_PORT_BASE);
|
|
From: Paul M. <le...@us...> - 2002-03-11 20:08:12
|
Update of /cvsroot/linux-mips/linux/arch/mips/kernel In directory usw-pr-cvs1:/tmp/cvs-serv31721/kernel Modified Files: setup.c Log Message: Start on some setup cleanups .. Index: setup.c =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips/kernel/setup.c,v retrieving revision 1.52 retrieving revision 1.53 diff -u -d -r1.52 -r1.53 --- setup.c 9 Mar 2002 01:28:02 -0000 1.52 +++ setup.c 11 Mar 2002 19:36:36 -0000 1.53 @@ -715,9 +715,6 @@ void nec_osprey_setup(void); void nec_korva_setup(void); void ps2_setup(void); - void clio_1000_setup(void); - void casio_e15_setup(void); - void nec_mobilepro_setup(void); void jmr3927_setup(void); void it8172_setup(void); void swarm_setup(void); @@ -818,21 +815,6 @@ #ifdef CONFIG_NEC_KORVA case MACH_GROUP_NEC_VR41XX: nec_korva_setup(); - break; -#endif -#ifdef CONFIG_VADEM_CLIO_1000 - case MACH_GROUP_NEC_VR41XX: - clio_1000_setup(); - break; -#endif -#ifdef CONFIG_CASIO_E15 - case MACH_GROUP_NEC_VR41XX: - casio_e15_setup(); - break; -#endif -#ifdef CONFIG_NEC_MOBILEPRO_780 - case MACH_GROUP_NEC_VR41XX: - nec_mobilepro_setup(); break; #endif #ifdef CONFIG_CPU_VR41XX |
|
From: Paul M. <le...@us...> - 2002-03-10 23:33:14
|
Update of /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4111/clio-1000
In directory usw-pr-cvs1:/tmp/cvs-serv29866/clio-1000
Added Files:
Makefile prom.c setup.c
Log Message:
Add it back in, under the new structure..
--- NEW FILE: Makefile ---
#
# Makefile for the Vadem Clio 1000 / Sharp Mobilon Tripad PV-6000
#
# Note! Dependencies are done automagically by 'make dep', which also
# removes any old dependencies. DON'T put your own dependencies here
# unless it's something special (ie not a .c file).
#
.S.s:
$(CPP) $(AFLAGS) $< -o $@
.S.o:
$(CC) $(AFLAGS) -c $< -o $@
O_TARGET := clio-1000.o
all: clio-1000.o
obj-y := setup.o prom.o
include $(TOPDIR)/Rules.make
--- NEW FILE: prom.c ---
/*
* arch/mips/vr4111/clio-1000/prom.c
*
* Copyright (C) 1999 Bradley D. LaRonde and Michael Klar
*
* Copyright (C) 2001 Jim Paris <ji...@jt...>
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
*/
#include <linux/init.h>
#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/mm.h>
#include <linux/bootmem.h>
#include <asm/bootinfo.h>
#include <asm/vr41xx.h>
char arcs_cmdline[CL_SIZE];
extern unsigned long probe_ram_size(void);
const char *get_system_type(void)
{
return "NEC_Vr41xx Vadem Clio 1000";
}
void __init prom_init(int argc, char **argv, char **envp)
{
unsigned long mem_detected;
int i;
/*
* Clear ERL and EXL in case the bootloader got us here
* through an exception
*/
write_32bit_cp0_register(CP0_STATUS, 0);
/*
* Collect args and prepare cmd_line
*/
strcpy(arcs_cmdline, "");
for (i = 1; i < argc; i++) {
strcat(arcs_cmdline, argv[i]);
if (i < (argc - 1))
strcat(arcs_cmdline, " ");
}
mips_machgroup = MACH_GROUP_NEC_VR41XX;
mips_machtype = MACH_VADEM_CLIO_1000;
mem_detected = probe_ram_size();
printk("Detected %dMB of memory.\n",(int)mem_detected >> 20);
add_memory_region(0, mem_detected, BOOT_MEM_RAM);
}
void __init prom_free_prom_memory(void)
{
}
--- NEW FILE: setup.c ---
/*
* linux/arch/mips/vr4111/setup.c
*
* VR41xx setup routines
*
* Copyright (C) 1999 Bradley D. LaRonde
* Copyright (C) 1999, 2000 Michael Klar
*
* Copyright 2001 MontaVista Software Inc.
* Author: js...@mv... or js...@ju...
*
* Copyright 2001 Jim Paris <ji...@jt...>
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
*/
#include <linux/config.h>
#include <linux/console.h>
#ifdef CONFIG_IDE
#include <linux/ide.h>
#endif
#include <linux/init.h>
#include <linux/delay.h>
#include <asm/time.h>
#include <asm/reboot.h>
#include <asm/vr41xx.h>
#include <asm/io.h>
extern void vr41xx_restart(char *c);
extern void vr4111_hibernate(void);
extern void vr4111_wait(void);
extern void vr4111_time_init(void);
extern void vr4111_timer_setup(void);
#ifdef CONFIG_IDE
extern struct ide_ops std_ide_ops;
#endif
#ifdef CONFIG_PCMCIA
void __init put_cf_reg(unsigned char reg, unsigned char val)
{
/* PCMCIA controller (VG469) is mapped here */
outb(reg, 0x3e0);
outb(val, 0x3e1);
}
#endif
void __init bus_error_init(void)
{
}
void __init clio_1000_setup(void)
{
unsigned short val;
set_io_port_base(VR41XX_PORT_BASE);
isa_slot_offset = VR41XX_ISAMEM_BASE;
board_time_init = vr4111_time_init;
board_timer_setup = vr4111_timer_setup;
_machine_restart = vr41xx_restart;
_machine_halt = vr4111_hibernate;
_machine_power_off = vr4111_hibernate;
cpu_wait = vr4111_wait;
#ifdef CONFIG_IDE
ide_ops = &std_ide_ops;
#endif
#ifdef CONFIG_FB
conswitchp = &dummy_con;
#endif
#ifdef CONFIG_PCMCIA
/* Reset the PCMCIA and CF and power them off */
put_cf_reg(0x03, 0x20); /* Socket 0 */
put_cf_reg(0x43, 0x20); /* Socket 1 */
put_cf_reg(0x02, 0x00); /* Socket 0 */
put_cf_reg(0x42, 0x00); /* Socket 1 */
#endif
/* Clio-specific RS232 enable */
*VR41XX_GIUPODATL |= VR41XX_GIUPODATL_GPIO42;
vr4111_init_serial();
/* Turn the green LED on (debug) */
*VR41XX_GIUPODATH = 0;
*VR41XX_GIUPODATH = 0x302;
*VR41XX_GIUPODATH = 0x303;
*VR41XX_GIUPODATH = 0;
}
|
|
From: Paul M. <le...@us...> - 2002-03-10 23:33:14
|
Update of /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4111/mobilepro
In directory usw-pr-cvs1:/tmp/cvs-serv29866/mobilepro
Added Files:
Makefile prom.c setup.c
Log Message:
Add it back in, under the new structure..
--- NEW FILE: Makefile ---
#
# Makefile for the NEC MobilePro 780 PDA
#
# Note! Dependencies are done automagically by 'make dep', which also
# removes any old dependencies. DON'T put your own dependencies here
# unless it's something special (ie not a .c file).
#
.S.s:
$(CPP) $(AFLAGS) $< -o $@
.S.o:
$(CC) $(AFLAGS) -c $< -o $@
O_TARGET := mobilepro.o
all: mobilepro.o
obj-y := setup.o prom.o
include $(TOPDIR)/Rules.make
--- NEW FILE: prom.c ---
/*
* arch/mips/vr4111/mobilepro/prom.c
*
* Copyright (C) 1999 Bradley D. LaRonde and Michael Klar
*
* Copyright (C) 2001 Jim Paris <ji...@jt...>
*
* Adapted for NEC MobilePro PDA by Johannes Stezenbach <js...@co...>.
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
*/
#include <linux/init.h>
#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/mm.h>
#include <linux/bootmem.h>
#include <asm/bootinfo.h>
#include <asm/vr41xx.h>
char arcs_cmdline[CL_SIZE];
extern unsigned long probe_ram_size(void);
const char *get_system_type(void)
{
return "NEC_Vr41xx MobilePro 780 PDA";
}
void __init prom_init(int argc, char **argv, char **envp)
{
unsigned long mem_detected;
int i;
/*
* Clear ERL and EXL in case the bootloader got us here
* through an exception
*/
write_32bit_cp0_register(CP0_STATUS, 0);
/*
* Collect args and prepare cmd_line
*/
strcpy(arcs_cmdline, "");
for (i = 1; i < argc; i++) {
strcat(arcs_cmdline, argv[i]);
if (i < (argc - 1))
strcat(arcs_cmdline, " ");
}
mips_machgroup = MACH_GROUP_NEC_VR41XX;
#ifdef CONFIG_NEC_MOBILEPRO_780
/* add #ifdef for MOBILEPRO_770 later... */
mips_machtype = MACH_NEC_MOBILEPRO_780;
#endif
mem_detected = probe_ram_size();
printk("Detected %dMB of memory.\n",(int)mem_detected >> 20);
add_memory_region(0, mem_detected, BOOT_MEM_RAM);
}
void __init prom_free_prom_memory(void)
{
}
--- NEW FILE: setup.c ---
/*
* linux/arch/mips/vr4111/setup.c
*
* VR41xx setup routines
*
* Copyright (C) 1999 Bradley D. LaRonde
* Copyright (C) 1999, 2000 Michael Klar
*
* Copyright 2001 MontaVista Software Inc.
* Author: js...@mv... or js...@ju...
*
* Copyright 2001 Jim Paris <ji...@jt...>
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
*/
#include <linux/config.h>
#include <linux/console.h>
#include <linux/init.h>
#include <linux/delay.h>
#include <asm/time.h>
#include <asm/reboot.h>
#include <asm/vr41xx.h>
#include <asm/io.h>
extern void vr41xx_restart(char *c);
extern void vr4111_hibernate(void);
extern void vr4111_wait(void);
extern void vr4111_time_init(void);
extern void vr4111_timer_setup(struct irqaction *irq);
extern void vr4111_init_serial(void);
void __init bus_error_init(void)
{
}
void __init nec_mobilepro_setup(void)
{
set_io_port_base(VR41XX_PORT_BASE);
isa_slot_offset = VR41XX_ISAMEM_BASE;
board_time_init = vr4111_time_init;
board_timer_setup = vr4111_timer_setup;
_machine_restart = vr41xx_restart;
_machine_halt = vr4111_hibernate;
_machine_power_off = vr4111_hibernate;
cpu_wait = vr4111_wait;
#ifdef CONFIG_FB
conswitchp = &dummy_con;
#endif
vr4111_init_serial();
}
|
|
From: Paul M. <le...@us...> - 2002-03-10 23:33:14
|
Update of /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4111/casio-e15
In directory usw-pr-cvs1:/tmp/cvs-serv29866/casio-e15
Added Files:
Makefile prom.c setup.c
Log Message:
Add it back in, under the new structure..
--- NEW FILE: Makefile ---
# Makefile for the VR41XX-specific parts of the kernel
#
# This file is subject to the terms and conditions of the GNU General Public
# License. See the file "COPYING" in the main directory of this archive
# for more details.
#
# Copyright (C) 1999 by Bradley D. LaRonde and Mike Klar.
#
# Note! Dependencies are done automagically by 'make dep', which also
# removes any old dependencies. DON'T put your own dependencies here
# unless it's something special (ie not a .c file).
.S.s:
$(CPP) $(AFLAGS) $< -o $@
.S.o:
$(CC) $(AFLAGS) -c $< -o $@
O_TARGET := casio.o
all: casio.o
obj-y += setup.o prom.o
include $(TOPDIR)/Rules.make
--- NEW FILE: prom.c ---
/*
* arch/mips/vr4111/casio/prom.c
*
* Copyright (C) 1999 Bradley D. LaRonde and Michael Klar
*
* Copyright (C) 2001 Jim Paris <ji...@jt...>
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
*/
#include <linux/init.h>
#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/mm.h>
#include <linux/bootmem.h>
#include <asm/bootinfo.h>
#include <asm/vr41xx.h>
char arcs_cmdline[CL_SIZE];
extern unsigned long probe_ram_size(void);
const char *get_system_type(void)
{
return "NEC_Vr41xx Casio Cassiopeia E15";
}
void __init prom_init(int argc, char **argv, char **envp)
{
unsigned long mem_detected;
int i;
/*
* Clear ERL and EXL in case the bootloader got us here
* through an exception
*/
write_32bit_cp0_register(CP0_STATUS, 0);
/*
* Collect args and prepare cmd_line
*/
strcpy(arcs_cmdline, "");
for (i = 1; i < argc; i++) {
strcat(arcs_cmdline, argv[i]);
if (i < (argc - 1))
strcat(arcs_cmdline, " ");
}
mips_machgroup = MACH_GROUP_NEC_VR41XX;
mips_machtype = MACH_CASIO_E15;
mem_detected = probe_ram_size();
printk("Detected %dMB of memory.\n",(int)mem_detected >> 20);
add_memory_region(0, mem_detected, BOOT_MEM_RAM);
}
void __init prom_free_prom_memory(void)
{
}
--- NEW FILE: setup.c ---
/*
* linux/arch/mips/vr4111/casio/setup.c
*
* VR41xx setup routines
*
* Copyright (C) 1999 Bradley D. LaRonde
* Copyright (C) 1999, 2000 Michael Klar
*
* Copyright 2001 MontaVista Software Inc.
* Author: js...@mv... or js...@ju...
*
* Copyright 2001 Jim Paris <ji...@jt...>
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
*/
#include <linux/config.h>
#include <linux/console.h>
#ifdef CONFIG_IDE
#include <linux/ide.h>
#endif
#include <linux/init.h>
#include <linux/delay.h>
#include <asm/time.h>
#include <asm/reboot.h>
#include <asm/vr41xx.h>
#include <asm/io.h>
#ifdef CONFIG_PM_SUSPEND_WAKEUP
#include <asm/power.h>
#endif
extern void vr41xx_restart(char *c);
extern void vr4111_standby(void);
extern void vr4111_suspend(void);
extern void vr4111_hibernate(void);
extern void vr4111_wait(void);
extern void vr4111_time_init(void);
extern void vr4111_timer_setup(void);
extern void vr4111_init_serial(void);
extern void vr41xx_xblink_led(unsigned int times, unsigned int time_on, unsigned int time_off);
#ifdef CONFIG_BLK_DEV_IDE
extern struct ide_ops std_ide_ops;
//extern struct ide_ops vr41xx_ide_ops;
#endif
struct semaphore vr41xx_dma_sem;
#ifdef CONFIG_PCMCIA
void __init put_cf_reg(unsigned char reg, unsigned char val)
{
/* PCMCIA controller (VG469) is mapped here */
outb(reg, 0x3e0);
outb(val, 0x3e1);
}
#endif
void __init bus_error_init(void)
{
}
void __init casio_e15_setup(void)
{
set_io_port_base(VR41XX_PORT_BASE);
isa_slot_offset = VR41XX_ISAMEM_BASE;
board_time_init = vr4111_time_init;
board_timer_setup = vr4111_timer_setup;
#ifdef CONFIG_PM_SUSPEND_WAKEUP
_machine_restart = do_wakeup;
#else
_machine_restart = vr41xx_restart;
#endif
_machine_halt = vr4111_hibernate;
_machine_power_off = vr4111_suspend;
cpu_wait = vr4111_wait;
#ifdef CONFIG_BLK_DEV_IDE
ide_ops = &std_ide_ops;
//ide_ops = &vr41xx_ide_ops;
#endif
#ifdef CONFIG_FB
conswitchp = &dummy_con;
#endif
#ifdef CONFIG_PCMCIA
/* Reset the PCMCIA and CF and power them off */
put_cf_reg(0x03, 0x20); /* Socket 0 */
put_cf_reg(0x43, 0x20); /* Socket 1 */
put_cf_reg(0x02, 0x00); /* Socket 0 */
put_cf_reg(0x42, 0x00); /* Socket 1 */
#endif
vr4111_init_serial();
// Insure that vr41xx_dma_sem is initialized as unlocked, even
// in the case of a failed hibernate/wakeup:
init_MUTEX(&vr41xx_dma_sem);
#ifdef CONFIG_VR41XX_LED
vr41xx_xblink_led(4, 16, 4);
#endif
}
|
|
From: Paul M. <le...@us...> - 2002-03-10 23:32:47
|
Update of /cvsroot/linux-mips/linux/arch/mips/vr4111/clio-1000 In directory usw-pr-cvs1:/tmp/cvs-serv29755/clio-1000 Removed Files: Makefile prom.c setup.c Log Message: Nuke old vr4111 cruft. --- Makefile DELETED --- --- prom.c DELETED --- --- setup.c DELETED --- |
|
From: Paul M. <le...@us...> - 2002-03-10 23:32:47
|
Update of /cvsroot/linux-mips/linux/arch/mips/vr4111/casio In directory usw-pr-cvs1:/tmp/cvs-serv29755/casio Removed Files: Makefile prom.c setup.c Log Message: Nuke old vr4111 cruft. --- Makefile DELETED --- --- prom.c DELETED --- --- setup.c DELETED --- |
|
From: Paul M. <le...@us...> - 2002-03-10 23:32:47
|
Update of /cvsroot/linux-mips/linux/arch/mips/vr4111/mobilepro In directory usw-pr-cvs1:/tmp/cvs-serv29755/mobilepro Removed Files: Makefile prom.c setup.c Log Message: Nuke old vr4111 cruft. --- Makefile DELETED --- --- prom.c DELETED --- --- setup.c DELETED --- |
|
From: Paul M. <le...@us...> - 2002-03-10 23:31:52
|
Update of /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4111/casio-e15 In directory usw-pr-cvs1:/tmp/cvs-serv29545/casio-e15 Log Message: Directory /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4111/casio-e15 added to the repository |
|
From: Paul M. <le...@us...> - 2002-03-10 23:31:52
|
Update of /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4111/mobilepro In directory usw-pr-cvs1:/tmp/cvs-serv29545/mobilepro Log Message: Directory /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4111/mobilepro added to the repository |
|
From: Paul M. <le...@us...> - 2002-03-10 23:31:52
|
Update of /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4111/clio-1000 In directory usw-pr-cvs1:/tmp/cvs-serv29545/clio-1000 Log Message: Directory /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4111/clio-1000 added to the repository |
|
From: Paul M. <le...@us...> - 2002-03-10 23:23:38
|
Update of /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4121/common
In directory usw-pr-cvs1:/tmp/cvs-serv27731/vr4121/common
Modified Files:
icu.c
Log Message:
Add kgdb support to ICU code.
Index: icu.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4121/common/icu.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- icu.c 7 Mar 2002 03:16:54 -0000 1.1
+++ icu.c 10 Mar 2002 23:23:35 -0000 1.2
@@ -32,6 +32,9 @@
*/
/*
* Changes:
+ * Paul Mundt <le...@ch...>
+ * - kgdb support.
+ *
* MontaVista Software Inc. <yy...@mv...> or <so...@mv...>
* - New creation, NEC VR4122 and VR4131 are supported.
*
@@ -318,7 +321,6 @@
void __init init_IRQ(void)
{
-
memset(irq_desc, 0, sizeof(irq_desc));
init_generic_irq();
@@ -330,6 +332,12 @@
setup_irq(GIU_IRQ, &cascade);
set_except_vector(0, vr41xx_handle_interrupt);
+
+#ifdef CONFIG_REMOTE_DEBUG
+ printk("Setting debug traps - please connect the remote debugger.\n");
+ set_debug_traps();
+ breakpoint();
+#endif
}
/*=======================================================================*/
|
|
From: Paul M. <le...@us...> - 2002-03-10 23:23:37
|
Update of /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4111/common In directory usw-pr-cvs1:/tmp/cvs-serv27731/vr4111/common Modified Files: icu.c Log Message: Add kgdb support to ICU code. Index: icu.c =================================================================== RCS file: /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4111/common/icu.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- icu.c 10 Mar 2002 23:15:47 -0000 1.2 +++ icu.c 10 Mar 2002 23:23:35 -0000 1.3 @@ -32,6 +32,9 @@ */ /* * Changes: + * Paul Mundt <le...@ch...> + * - kgdb support. + * * MontaVista Software Inc. <yy...@mv...> or <so...@mv...> * - New creation, NEC VR4122 and VR4131 are supported. * |
|
From: Paul M. <le...@us...> - 2002-03-10 23:23:37
|
Update of /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4122/common
In directory usw-pr-cvs1:/tmp/cvs-serv27731/vr4122/common
Modified Files:
icu.c
Log Message:
Add kgdb support to ICU code.
Index: icu.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4122/common/icu.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- icu.c 7 Mar 2002 03:16:54 -0000 1.1
+++ icu.c 10 Mar 2002 23:23:35 -0000 1.2
@@ -32,6 +32,9 @@
*/
/*
* Changes:
+ * Paul Mundt <le...@ch...>
+ * - kgdb support.
+ *
* MontaVista Software Inc. <yy...@mv...> or <so...@mv...>
* - New creation, NEC VR4122 and VR4131 are supported.
*/
@@ -43,6 +46,7 @@
#include <asm/io.h>
#include <asm/mipsregs.h>
#include <asm/vr41xx.h>
+#include <asm/gdb-stub.h>
#include "icu.h"
@@ -314,7 +318,6 @@
void __init init_IRQ(void)
{
-
memset(irq_desc, 0, sizeof(irq_desc));
init_generic_irq();
@@ -326,6 +329,12 @@
setup_irq(GIU_IRQ, &cascade);
set_except_vector(0, vr41xx_handle_interrupt);
+
+#ifdef CONFIG_REMOTE_DEBUG
+ printk("Setting debug traps - please connect the remote debugger.\n");
+ set_debug_traps();
+ breakpoint();
+#endif
}
/*=======================================================================*/
|
|
From: Paul M. <le...@us...> - 2002-03-10 23:15:49
|
Update of /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4111/common
In directory usw-pr-cvs1:/tmp/cvs-serv25942/common
Modified Files:
Makefile icu.c
Added Files:
power.c probe-ram.c time.c
Log Message:
Add back in some remnants of the prior Vr4111 common code, and start cleaning
them up for the new structure..
--- NEW FILE: power.c ---
/*
* VR4111 reset and power management type stuff
*
* Copyright (C) 2000 Michael Klar
*
* Copyright (C) 2001 Jim Paris <ji...@jt...>
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
*/
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/config.h>
#include <linux/delay.h>
#include <linux/mm.h>
#include <linux/sysctl.h>
#include <linux/pm.h>
#include <linux/acpi.h>
#include <linux/irq.h> /* for disable_irq, enable_irq, to be removed */
#include <asm/vr41xx.h>
#include <asm/cacheops.h>
#include <asm/mipsregs.h>
#include <asm/pgalloc.h>
/*
* vr4111_dma_sem is needed because we cannot suspend while a DMA transfer
* is in progress, otherwise the CPU will be left in an undefined state.
*/
extern struct semaphore vr41xx_dma_sem;
void vr4111_wait(void)
{
/* Use "standby" instead of "wait" on VR4111. */
asm volatile (
".set noreorder\n"
"standby\n"
"nop\n"
"nop\n"
"nop\n"
".set reorder\n"
);
}
void vr4111_hibernate(void)
{
asm volatile (
" .set noreorder\n"
" .align 4\n"
" hibernate\n"
" nop\n"
" nop\n"
" nop\n"
" .set reorder\n"
);
}
void vr4111_suspend(void)
{
asm volatile (
" .set noreorder\n"
" .align 4\n"
" suspend\n"
" nop\n"
" nop\n"
" nop\n"
" .set reorder\n"
);
}
void vr4111_standby(void)
{
asm volatile (
" .set noreorder\n"
" .align 4\n"
" standby\n"
" nop\n"
" nop\n"
" nop\n"
" .set reorder\n"
);
}
--- NEW FILE: probe-ram.c ---
/*
* arch/mips/vr4111/common/probe-ram.c
*
* Copyright (C) 1999 Bradley D. LaRonde and Michael Klar
*
* Copyright (C) 2001 Jim Paris <ji...@jt...>
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
*/
#include <linux/init.h>
#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/mm.h>
#include <asm/vr41xx.h>
extern int _end;
unsigned long __init probe_ram_size(void)
{
unsigned long ramsize;
unsigned int *p1, *p2;
unsigned int d1, d2;
/* Begin probe starting with the first 1MB past the global data */
ramsize = ((unsigned long)&_end + 0x000fffff) & 0x1ff00000;
/* Probe sequential 1MB areas, looking for a lack of RAM */
while (ramsize < 0x04000000) {
/* Save the data and replace with a pattern */
p1 = (unsigned int *)(KSEG1 + ramsize + 0x000ffff0);
d1 = *p1;
*p1 = 0x1234a5a5;
barrier();
/* Do it again to ensure it's not an empty bus */
p2 = (unsigned int *)(KSEG1 + ramsize + 0x000fffe0);
d2 = *p2;
*p2 = 0x00ff5a5a;
barrier();
/* Is the first pattern there? */
if (*p1 != 0x1234a5a5)
break;
/* Put the old data back */
*p1 = d1;
*p2 = d2;
ramsize += 0x00100000;
}
return ramsize;
}
--- NEW FILE: time.c ---
/*
* BRIEF MODULE DESCRIPTION
* NEC Vr4111 RTC Unit routines.
*
* Copyright 2001 MontaVista Software Inc.
* Author: Yoichi Yuasa
* yy...@mv... or so...@mv...
*
* Adapted to the VR4111 from arch/mips/vr4122/common/time.c
* by Jim Paris <ji...@jt...>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <linux/spinlock.h>
#include <linux/config.h>
#include <linux/irq.h>
#include <asm/io.h>
#include <asm/time.h>
#include <asm/vr41xx.h>
spinlock_t vr4111_rtc_lock = SPIN_LOCK_UNLOCKED;
static inline unsigned short read_etime_register(volatile unsigned short *addr)
{
unsigned short val;
do {
val = *addr;
} while (val != *addr);
return val;
}
static unsigned long vr4111_rtc_get_time(void)
{
unsigned short etimel, etimem, etimeh;
do {
etimem = read_etime_register(VR41XX_ETIMEMREG);
etimeh = read_etime_register(VR41XX_ETIMEHREG);
etimel = read_etime_register(VR41XX_ETIMELREG);
} while (etimem != read_etime_register(VR41XX_ETIMEMREG));
return ((etimeh << 17) | (etimem << 1) | (etimel >> 15));
}
static int vr4111_rtc_set_time(unsigned long sec)
{
unsigned long flags;
spin_lock_irqsave(&vr4111_rtc_lock, flags);
*VR41XX_ETIMELREG = sec << 15;
*VR41XX_ETIMEMREG = sec >> 1;
*VR41XX_ETIMEHREG = sec >> 17;
spin_unlock_irqrestore(&vr4111_rtc_lock, flags);
return 0;
}
void vr4111_time_init(void)
{
unsigned long clock;
unsigned short val;
rtc_get_time = vr4111_rtc_get_time;
rtc_set_time = vr4111_rtc_set_time;
/* If it's not already set (by board-specific code),
figure out the counter frequency from the clock speed
register */
if(mips_counter_frequency) return;
val = *VR41XX_CLKSPEEDREG;
if((val & 0x1f)==0)
panic("can't determine core clock clock: divide by zero!");
clock = (18432000 * 64) / (val & 0x1f);
printk("CPU core clock: %ldHz\n",clock);
switch((~val) & 0xE000) {
case 0x8000:
clock = clock / 2;
break;
case 0x4000:
clock = clock / 3;
break;
case 0x2000:
clock = clock / 4;
break;
default:
panic("can't determine peripheral clock: unknown divisor!");
}
printk("Peripheral unit clock: %ldHz\n",clock);
mips_counter_frequency = clock / 4;
}
void vr4111_timer_setup(struct irqaction *irq)
{
unsigned int count;
count = read_32bit_cp0_register(CP0_COUNT);
write_32bit_cp0_register (CP0_COMPARE,
count + (mips_counter_frequency / HZ));
setup_irq(VR41XX_IRQ_TIMER, irq);
}
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4111/common/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile 7 Mar 2002 03:16:53 -0000 1.1
+++ Makefile 10 Mar 2002 23:15:47 -0000 1.2
@@ -15,6 +15,6 @@
O_TARGET := vr4111.o
-obj-y := bcu.o cmu.o icu.o siu.o
+obj-y := bcu.o cmu.o icu.o siu.o power.o probe-ram.o time.o
include $(TOPDIR)/Rules.make
Index: icu.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr41xx/vr4111/common/icu.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- icu.c 7 Mar 2002 03:16:53 -0000 1.1
+++ icu.c 10 Mar 2002 23:15:47 -0000 1.2
@@ -47,6 +47,7 @@
#include <asm/io.h>
#include <asm/mipsregs.h>
#include <asm/vr41xx.h>
+#include <asm/gdb-stub.h>
#include "icu.h"
@@ -330,6 +331,12 @@
setup_irq(GIU_IRQ, &cascade);
set_except_vector(0, vr41xx_handle_interrupt);
+
+#ifdef CONFIG_REMOTE_DEBUG
+ printk("Setting debug traps - please connect the remote debugger.\n");
+ set_debug_traps();
+ breakpoint();
+#endif
}
/*=======================================================================*/
|
|
From: Paul M. <le...@us...> - 2002-03-10 23:14:21
|
Update of /cvsroot/linux-mips/linux/arch/mips/vr4111/common In directory usw-pr-cvs1:/tmp/cvs-serv25704/common Removed Files: Makefile icu.c int-handler.S irq.c power.c probe-ram.c serial.c time.c Log Message: Nuke old useless common code. --- Makefile DELETED --- --- icu.c DELETED --- --- int-handler.S DELETED --- --- irq.c DELETED --- --- power.c DELETED --- --- probe-ram.c DELETED --- --- serial.c DELETED --- --- time.c DELETED --- |
582 messages has been excluded from this view by a project administrator.
