Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
4cf14800
Commit
4cf14800
authored
Jan 12, 2003
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge
bk://kernel.bkbits.net/davem/sparc-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
parents
3f81804d
1d81a925
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
69 additions
and
20 deletions
+69
-20
arch/ppc/lib/string.S
arch/ppc/lib/string.S
+25
-14
arch/ppc/platforms/k2_pci.c
arch/ppc/platforms/k2_pci.c
+7
-0
arch/ppc/syslib/cpc710.h
arch/ppc/syslib/cpc710.h
+6
-0
arch/ppc/syslib/mpc10x_common.c
arch/ppc/syslib/mpc10x_common.c
+24
-0
arch/ppc/syslib/todc_time.c
arch/ppc/syslib/todc_time.c
+4
-0
include/asm-ppc/mpc10x.h
include/asm-ppc/mpc10x.h
+1
-0
include/asm-ppc/tlb.h
include/asm-ppc/tlb.h
+2
-6
No files found.
arch/ppc/lib/string.S
View file @
4cf14800
...
...
@@ -507,18 +507,18 @@ _GLOBAL(__copy_tofrom_user)
blr
/*
read
fault
,
initial
single
-
byte
copy
*/
100
:
li
r
4
,
0
100
:
li
r
9
,
0
b
90
f
/*
write
fault
,
initial
single
-
byte
copy
*/
101
:
li
r
4
,
1
101
:
li
r
9
,
1
90
:
subf
r5
,
r8
,
r5
li
r3
,
0
b
99
f
/*
read
fault
,
initial
word
copy
*/
102
:
li
r
4
,
0
102
:
li
r
9
,
0
b
91
f
/*
write
fault
,
initial
word
copy
*/
103
:
li
r
4
,
1
103
:
li
r
9
,
1
91
:
li
r3
,
2
b
99
f
...
...
@@ -542,38 +542,47 @@ _GLOBAL(__copy_tofrom_user)
#endif
/*
read
fault
in
cacheline
loop
*/
104
:
li
r
4
,
0
104
:
li
r
9
,
0
b
92
f
/*
fault
on
dcbz
(
effectively
a
write
fault
)
*/
/*
or
write
fault
in
cacheline
loop
*/
105
:
li
r
4
,
1
105
:
li
r
9
,
1
92
:
li
r3
,
LG_CACHELINE_BYTES
b
99
f
/*
read
fault
in
final
word
loop
*/
108
:
li
r
4
,
0
108
:
li
r
9
,
0
b
93
f
/*
write
fault
in
final
word
loop
*/
109
:
li
r
4
,
1
109
:
li
r
9
,
1
93
:
andi
.
r5
,
r5
,
3
li
r3
,
2
b
99
f
/*
read
fault
in
final
byte
loop
*/
110
:
li
r
4
,
0
110
:
li
r
9
,
0
b
94
f
/*
write
fault
in
final
byte
loop
*/
111
:
li
r
4
,
1
111
:
li
r
9
,
1
94
:
li
r5
,
0
li
r3
,
0
/*
*
At
this
stage
the
number
of
bytes
not
copied
is
*
r5
+
(
ctr
<<
r3
),
and
r
4
is
0
for
read
or
1
for
write
.
*
r5
+
(
ctr
<<
r3
),
and
r
9
is
0
for
read
or
1
for
write
.
*/
99
:
mfctr
r0
slw
r3
,
r0
,
r3
add
r3
,
r3
,
r5
cmpwi
0
,
r4
,
0
add
.
r3
,
r3
,
r5
beq
120
f
/*
shouldn
't happen */
cmpwi
0
,
r9
,
0
bne
120
f
/*
for
read
fault
,
clear
out
the
destination
:
r3
bytes
starting
at
4
(
r6
)
*/
/*
for
a
read
fault
,
first
try
to
continue
the
copy
one
byte
at
a
time
*/
mtctr
r3
130
:
lbz
r0
,
4
(
r4
)
131
:
stb
r0
,
4
(
r6
)
addi
r4
,
r4
,
1
addi
r6
,
r6
,
1
bdnz
130
b
/*
then
clear
out
the
destination
:
r3
bytes
starting
at
4
(
r6
)
*/
132
:
mfctr
r3
srwi
.
r0
,
r3
,
2
li
r9
,
0
mtctr
r0
...
...
@@ -594,6 +603,8 @@ _GLOBAL(__copy_tofrom_user)
.
long
31
b
,
109
b
.
long
40
b
,
110
b
.
long
41
b
,
111
b
.
long
130
b
,
132
b
.
long
131
b
,
120
b
.
long
112
b
,
120
b
.
long
114
b
,
120
b
.
text
...
...
arch/ppc/platforms/k2_pci.c
View file @
4cf14800
...
...
@@ -156,6 +156,13 @@ void k2_setup_hoses(void)
__raw_writel
(
0x00000080
,
K2_PCI32_BAR
+
PSBAR
);
/* Base@0x80 */
__raw_writel
(
0x00000000
,
K2_PCI32_BAR
+
PPBAR
);
__raw_writel
(
0xc0000000
,
K2_PCI32_BAR
+
BPMDLK
);
__raw_writel
(
0xd0000000
,
K2_PCI32_BAR
+
TPMDLK
);
__raw_writel
(
0x80000000
,
K2_PCI32_BAR
+
BIODLK
);
__raw_writel
(
0x80100000
,
K2_PCI32_BAR
+
TIODLK
);
__raw_writel
(
0xe0008000
,
K2_PCI32_BAR
+
DLKCTRL
);
__raw_writel
(
0xffffffff
,
K2_PCI32_BAR
+
DLKDEV
);
/* PCI64 mappings */
__raw_writel
(
0x00100000
,
K2_PCI64_BAR
+
PIBAR
);
/* PCI I/O base */
__raw_writel
(
0x10000000
,
K2_PCI64_BAR
+
PMBAR
);
/* PCI Mem base */
...
...
arch/ppc/syslib/cpc710.h
View file @
4cf14800
...
...
@@ -61,6 +61,12 @@
#define BARPP 0x000f8130
#define PSBAR 0x000f8140
#define PPBAR 0x000f8150
#define BPMDLK 0x000f8200
/* Bottom of Peripheral Memory Space */
#define TPMDLK 0x000f8210
/* Top of Peripheral Memory Space */
#define BIODLK 0x000f8220
/* Bottom of Peripheral I/O Space */
#define TIODLK 0x000f8230
/* Top of Perioheral I/O Space */
#define DLKCTRL 0x000f8240
/* Deadlock control */
#define DLKDEV 0x000f8250
/* Deadlock device */
/* System standard configuration registers space */
#define DCR 0xff200000
...
...
arch/ppc/syslib/mpc10x_common.c
View file @
4cf14800
...
...
@@ -243,6 +243,8 @@ mpc10x_bridge_init(struct pci_controller *hose,
#ifdef CONFIG_MPC10X_STORE_GATHERING
mpc10x_enable_store_gathering
(
hose
);
#else
mpc10x_disable_store_gathering
(
hose
);
#endif
if
(
ppc_md
.
progress
)
ppc_md
.
progress
(
"mpc10x:exit"
,
0x100
);
...
...
@@ -376,3 +378,25 @@ mpc10x_enable_store_gathering(struct pci_controller *hose)
return
0
;
}
int
__init
mpc10x_disable_store_gathering
(
struct
pci_controller
*
hose
)
{
uint
picr1
;
early_read_config_dword
(
hose
,
0
,
PCI_DEVFN
(
0
,
0
),
MPC10X_CFG_PICR1_REG
,
&
picr1
);
picr1
&=
~
MPC10X_CFG_PICR1_ST_GATH_EN
;
early_write_config_dword
(
hose
,
0
,
PCI_DEVFN
(
0
,
0
),
MPC10X_CFG_PICR1_REG
,
picr1
);
return
0
;
}
arch/ppc/syslib/todc_time.c
View file @
4cf14800
...
...
@@ -240,6 +240,7 @@ todc_get_rtc_time(void)
switch
(
todc_info
->
rtc_type
)
{
case
TODC_TYPE_DS1557
:
case
TODC_TYPE_DS1743
:
case
TODC_TYPE_DS1746
:
/* XXXX BAD HACK -> FIX */
case
TODC_TYPE_DS1747
:
break
;
...
...
@@ -274,6 +275,7 @@ todc_get_rtc_time(void)
if
(
todc_info
->
rtc_type
!=
TODC_TYPE_MC146818
)
{
switch
(
todc_info
->
rtc_type
)
{
case
TODC_TYPE_DS1557
:
case
TODC_TYPE_DS1743
:
case
TODC_TYPE_DS1746
:
/* XXXX BAD HACK -> FIX */
case
TODC_TYPE_DS1747
:
break
;
...
...
@@ -367,6 +369,7 @@ static unsigned char __init todc_read_timereg(int addr)
switch
(
todc_info
->
rtc_type
)
{
case
TODC_TYPE_DS1557
:
case
TODC_TYPE_DS1743
:
case
TODC_TYPE_DS1746
:
/* XXXX BAD HACK -> FIX */
case
TODC_TYPE_DS1747
:
case
TODC_TYPE_MC146818
:
...
...
@@ -381,6 +384,7 @@ static unsigned char __init todc_read_timereg(int addr)
switch
(
todc_info
->
rtc_type
)
{
case
TODC_TYPE_DS1557
:
case
TODC_TYPE_DS1743
:
case
TODC_TYPE_DS1746
:
/* XXXX BAD HACK -> FIX */
case
TODC_TYPE_DS1747
:
case
TODC_TYPE_MC146818
:
...
...
include/asm-ppc/mpc10x.h
View file @
4cf14800
...
...
@@ -164,5 +164,6 @@ int mpc10x_bridge_init(struct pci_controller *hose,
uint
phys_eumb_base
);
unsigned
long
mpc10x_get_mem_size
(
uint
mem_map
);
int
mpc10x_enable_store_gathering
(
struct
pci_controller
*
hose
);
int
mpc10x_disable_store_gathering
(
struct
pci_controller
*
hose
);
#endif
/* __PPC_KERNEL_MPC10X_H */
include/asm-ppc/tlb.h
View file @
4cf14800
...
...
@@ -21,8 +21,8 @@
#ifdef CONFIG_PPC_STD_MMU
/* Classic PPC with hash-table based MMU... */
struct
free_pte_ctx
;
extern
void
tlb_flush
(
struct
free_pte_ctx
*
tlb
);
struct
mmu_gather
;
extern
void
tlb_flush
(
struct
mmu_gather
*
tlb
);
/* Get the generic bits... */
#include <asm-generic/tlb.h>
...
...
@@ -44,10 +44,6 @@ static inline void __tlb_remove_tlb_entry(struct mmu_gather *tlb, pte_t *ptep,
#else
/* Embedded PPC with software-loaded TLB, very simple... */
struct
flush_tlb_arch
{
};
#define tlb_init_arch(tlb, full_flush) do { } while (0)
#define tlb_finish_arch(tlb) do { } while (0)
#define tlb_start_vma(tlb, vma) do { } while (0)
#define tlb_end_vma(tlb, vma) do { } while (0)
#define __tlb_remove_tlb_entry(tlb, pte, address) do { } while (0)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment