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
Kirill Smelkov
linux
Commits
48f97bf4
Commit
48f97bf4
authored
Sep 15, 2002
by
Paul Mackerras
Browse files
Options
Browse Files
Download
Plain Diff
Merge samba.org:/home/paulus/kernel/linux-2.5
into samba.org:/home/paulus/kernel/for-linus-ppc
parents
2c66151c
bb5eec4a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
76 additions
and
43 deletions
+76
-43
arch/ppc/kernel/irq.c
arch/ppc/kernel/irq.c
+1
-2
arch/ppc/mm/pgtable.c
arch/ppc/mm/pgtable.c
+3
-2
arch/ppc/platforms/prep_pci.c
arch/ppc/platforms/prep_pci.c
+72
-39
No files found.
arch/ppc/kernel/irq.c
View file @
48f97bf4
...
...
@@ -29,13 +29,12 @@
* to reduce code space and undefined function references.
*/
#include <linux/ptrace.h>
#include <linux/errno.h>
#include <linux/threads.h>
#include <linux/kernel_stat.h>
#include <linux/signal.h>
#include <linux/sched.h>
#include <linux/ptrace.h>
#include <linux/ioport.h>
#include <linux/interrupt.h>
#include <linux/timex.h>
...
...
arch/ppc/mm/pgtable.c
View file @
48f97bf4
...
...
@@ -26,6 +26,7 @@
#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/mm.h>
#include <linux/vmalloc.h>
#include <linux/init.h>
#include <linux/highmem.h>
...
...
@@ -202,7 +203,7 @@ __ioremap(unsigned long addr, unsigned long size, unsigned long flags)
err
=
map_page
(
v
+
i
,
p
+
i
,
flags
);
if
(
err
)
{
if
(
mem_init_done
)
v
free
((
void
*
)
v
);
v
unmap
((
void
*
)
v
);
return
NULL
;
}
...
...
@@ -219,7 +220,7 @@ void iounmap(void *addr)
if
(
v_mapped_by_bats
((
unsigned
long
)
addr
))
return
;
if
(
addr
>
high_memory
&&
(
unsigned
long
)
addr
<
ioremap_bot
)
v
free
((
void
*
)
(
PAGE_MASK
&
(
unsigned
long
)
addr
));
v
unmap
((
void
*
)
(
PAGE_MASK
&
(
unsigned
long
)
addr
));
}
#endif
/* CONFIG_PPC_ISERIES */
...
...
arch/ppc/platforms/prep_pci.c
View file @
48f97bf4
...
...
@@ -27,7 +27,6 @@
#include <asm/machdep.h>
#include <asm/open_pic.h>
#define MAX_DEVNR 22
/* Which PCI interrupt line does a given device [slot] use? */
/* Note: This really should be two dimensional based in slot/pin used */
...
...
@@ -616,47 +615,79 @@ static unsigned char prep_pci_intpins[4][4] __prepdata =
#define ELCRM_INT7_LVL 0x80
#define ELCRM_INT5_LVL 0x20
#define CFGPTR(dev) (0x80800000 | (1<<(dev>>3)) | ((dev&7)<<8) | offset)
#define DEVNO(dev) (dev>>3)
#define cfg_read(val, addr, type, op) *val = op((type)(addr))
#define cfg_write(val, addr, type, op) op((type *)(addr), (val))
#define cfg_read_bad(val, size) *val = bad_##size;
#define cfg_write_bad(val, size)
#define bad_byte 0xff
#define bad_word 0xffff
#define bad_dword 0xffffffffU
#define PREP_PCI_OP(rw, size, type, op) \
static int __prep \
prep_##rw##_config_##size(struct pci_dev *dev, int offset, type val) \
{ \
if ((dev->bus->number != 0) || (DEVNO(dev->devfn) > MAX_DEVNR)) \
{ \
cfg_##rw##_bad(val, size) \
return PCIBIOS_DEVICE_NOT_FOUND; \
} \
cfg_##rw(val, CFGPTR(dev->devfn), type, op); \
return PCIBIOS_SUCCESSFUL; \
/*
* PCI config space access.
*/
#define CFGADDR(dev) ((1<<(dev>>3)) | ((dev&7)<<8))
#define DEVNO(dev) (dev>>3)
#define MIN_DEVNR 11
#define MAX_DEVNR 22
static
int
__prep
prep_read_config
(
struct
pci_bus
*
bus
,
unsigned
int
devfn
,
int
offset
,
int
len
,
u32
*
val
)
{
struct
pci_controller
*
hose
=
bus
->
sysdata
;
volatile
unsigned
char
*
cfg_data
;
if
(
bus
->
number
!=
0
||
DEVNO
(
devfn
)
<
MIN_DEVNR
||
DEVNO
(
devfn
)
>
MAX_DEVNR
)
return
PCIBIOS_DEVICE_NOT_FOUND
;
/*
* Note: the caller has already checked that offset is
* suitably aligned and that len is 1, 2 or 4.
*/
cfg_data
=
hose
->
cfg_data
+
CFGADDR
(
devfn
)
+
offset
;
switch
(
len
)
{
case
1
:
*
val
=
in_8
((
u8
*
)
cfg_data
);
break
;
case
2
:
*
val
=
in_le16
((
u16
*
)
cfg_data
);
break
;
default:
*
val
=
in_le32
((
u32
*
)
cfg_data
);
break
;
}
return
PCIBIOS_SUCCESSFUL
;
}
PREP_PCI_OP
(
read
,
byte
,
u8
*
,
in_8
)
PREP_PCI_OP
(
read
,
word
,
u16
*
,
in_le16
)
PREP_PCI_OP
(
read
,
dword
,
u32
*
,
in_le32
)
PREP_PCI_OP
(
write
,
byte
,
u8
,
out_8
)
PREP_PCI_OP
(
write
,
word
,
u16
,
out_le16
)
PREP_PCI_OP
(
write
,
dword
,
u32
,
out_le32
)
static
int
__prep
prep_write_config
(
struct
pci_bus
*
bus
,
unsigned
int
devfn
,
int
offset
,
int
len
,
u32
val
)
{
struct
pci_controller
*
hose
=
bus
->
sysdata
;
volatile
unsigned
char
*
cfg_data
;
if
(
bus
->
number
!=
0
||
DEVNO
(
devfn
)
<
MIN_DEVNR
||
DEVNO
(
devfn
)
>
MAX_DEVNR
)
return
PCIBIOS_DEVICE_NOT_FOUND
;
/*
* Note: the caller has already checked that offset is
* suitably aligned and that len is 1, 2 or 4.
*/
cfg_data
=
hose
->
cfg_data
+
CFGADDR
(
devfn
)
+
offset
;
switch
(
len
)
{
case
1
:
out_8
((
u8
*
)
cfg_data
,
val
);
break
;
case
2
:
out_le16
((
u16
*
)
cfg_data
,
val
);
break
;
default:
out_le32
((
u32
*
)
cfg_data
,
val
);
break
;
}
return
PCIBIOS_SUCCESSFUL
;
}
static
struct
pci_ops
prep_pci_ops
=
{
prep_read_config_byte
,
prep_read_config_word
,
prep_read_config_dword
,
prep_write_config_byte
,
prep_write_config_word
,
prep_write_config_dword
prep_read_config
,
prep_write_config
};
#define MOTOROLA_CPUTYPE_REG 0x800
...
...
@@ -1239,10 +1270,12 @@ prep_find_bridges(void)
hose
->
last_busno
=
0xff
;
hose
->
pci_mem_offset
=
PREP_ISA_MEM_BASE
;
hose
->
io_base_phys
=
PREP_ISA_IO_BASE
;
hose
->
io_base_virt
=
(
void
*
)
0x80000000
;
/* see prep_map_io() */
prep_init_resource
(
&
hose
->
io_resource
,
0
,
0x00
f
fffff
,
IORESOURCE_IO
);
hose
->
io_base_virt
=
ioremap
(
PREP_ISA_IO_BASE
,
0x800000
);
prep_init_resource
(
&
hose
->
io_resource
,
0
,
0x00
7
fffff
,
IORESOURCE_IO
);
prep_init_resource
(
&
hose
->
mem_resources
[
0
],
0xc0000000
,
0xfeffffff
,
IORESOURCE_MEM
);
/* XXX why can't we use the indirect config space access method? */
hose
->
cfg_data
=
ioremap
(
PREP_ISA_IO_BASE
+
0x800000
,
0x800000
);
hose
->
ops
=
&
prep_pci_ops
;
printk
(
"PReP architecture
\n
"
);
...
...
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