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
7aa3b084
Commit
7aa3b084
authored
Aug 31, 2003
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge
bk://kernel.bkbits.net/jgarzik/pci-2.5
into home.osdl.org:/home/torvalds/v2.5/linux
parents
2bd49a75
12354010
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
45 additions
and
44 deletions
+45
-44
drivers/atm/eni.c
drivers/atm/eni.c
+0
-4
drivers/ide/pci/cmd64x.c
drivers/ide/pci/cmd64x.c
+1
-4
drivers/ide/pci/ns87415.c
drivers/ide/pci/ns87415.c
+1
-3
drivers/media/video/planb.c
drivers/media/video/planb.c
+22
-8
drivers/net/tokenring/lanstreamer.c
drivers/net/tokenring/lanstreamer.c
+21
-25
No files found.
drivers/atm/eni.c
View file @
7aa3b084
...
...
@@ -1809,10 +1809,6 @@ static int __devinit eni_start(struct atm_dev *dev)
"master (0x%02x)
\n
"
,
dev
->
number
,
error
);
return
error
;
}
#ifdef __sparc_v9__
/* copied from drivers/net/sunhme.c */
/* NOTE: Cache line size is in 32-bit word units. */
pci_write_config_byte
(
eni_dev
->
pci_dev
,
PCI_CACHE_LINE_SIZE
,
0x10
);
#endif
if
((
error
=
pci_write_config_byte
(
eni_dev
->
pci_dev
,
PCI_TONGA_CTRL
,
END_SWAP_DMA
)))
{
printk
(
KERN_ERR
DEV_LABEL
"(itf %d): can't set endian swap "
...
...
drivers/ide/pci/cmd64x.c
View file @
7aa3b084
...
...
@@ -628,10 +628,7 @@ static unsigned int __init init_chipset_cmd64x (struct pci_dev *dev, const char
/* Set a good latency timer and cache line size value. */
(
void
)
pci_write_config_byte
(
dev
,
PCI_LATENCY_TIMER
,
64
);
#ifdef __sparc_v9__
(
void
)
pci_write_config_byte
(
dev
,
PCI_CACHE_LINE_SIZE
,
0x10
);
#endif
/* FIXME: pci_set_master() to ensure a good latency timer value */
/* Setup interrupts. */
(
void
)
pci_read_config_byte
(
dev
,
MRDMODE
,
&
mrdmode
);
...
...
drivers/ide/pci/ns87415.c
View file @
7aa3b084
...
...
@@ -147,9 +147,7 @@ static void __init init_hwif_ns87415 (ide_hwif_t *hwif)
/* Set a good latency timer and cache line size value. */
(
void
)
pci_write_config_byte
(
dev
,
PCI_LATENCY_TIMER
,
64
);
#ifdef __sparc_v9__
(
void
)
pci_write_config_byte
(
dev
,
PCI_CACHE_LINE_SIZE
,
0x10
);
#endif
/* FIXME: use pci_set_master() to ensure good latency timer value */
/*
* We cannot probe for IRQ: both ports share common IRQ on INTA.
...
...
drivers/media/video/planb.c
View file @
7aa3b084
...
...
@@ -2158,6 +2158,7 @@ static int find_planb(void)
unsigned
int
old_base
,
new_base
;
unsigned
int
irq
;
struct
pci_dev
*
pdev
;
int
rc
;
if
(
_machine
!=
_MACH_Pmac
)
return
0
;
...
...
@@ -2211,18 +2212,25 @@ static int find_planb(void)
pdev
=
pci_find_slot
(
bus
,
dev_fn
);
if
(
!
pdev
)
{
printk
(
KERN_ERR
"cannot find slot
\n
"
);
/* XXX handle error */
printk
(
KERN_ERR
"
planb:
cannot find slot
\n
"
);
goto
err_out
;
}
/* Enable response in memory space, bus mastering,
use memory write and invalidate */
pci_write_config_word
(
pdev
,
PCI_COMMAND
,
PCI_COMMAND_MEMORY
|
PCI_COMMAND_MASTER
|
PCI_COMMAND_INVALIDATE
);
/* Set PCI Cache line size & latency timer */
pci_write_config_byte
(
pdev
,
PCI_CACHE_LINE_SIZE
,
0x8
);
pci_write_config_byte
(
pdev
,
PCI_LATENCY_TIMER
,
0x40
);
rc
=
pci_enable_device
(
pdev
);
if
(
rc
)
{
printk
(
KERN_ERR
"planb: cannot enable PCI device %s
\n
"
,
pci_name
(
pdev
));
goto
err_out
;
}
rc
=
pci_set_mwi
(
pdev
);
if
(
rc
)
{
printk
(
KERN_ERR
"planb: cannot enable MWI on PCI device %s
\n
"
,
pci_name
(
pdev
));
goto
err_out_disable
;
}
pci_set_master
(
pdev
);
/* Set the new base address */
pci_write_config_dword
(
pdev
,
confreg
,
new_base
);
...
...
@@ -2234,6 +2242,12 @@ static int find_planb(void)
pb
->
irq
=
irq
;
return
planb_num
;
err_out_disable:
pci_disable_device
(
pdev
);
err_out:
/* FIXME handle error */
/* comment moved from pci_find_slot, above */
return
0
;
}
static
void
release_planb
(
void
)
...
...
drivers/net/tokenring/lanstreamer.c
View file @
7aa3b084
...
...
@@ -228,7 +228,6 @@ static int __devinit streamer_init_one(struct pci_dev *pdev,
int
rc
=
0
;
static
int
card_no
=-
1
;
u16
pcr
;
u8
cls
=
0
;
#if STREAMER_DEBUG
printk
(
"lanstreamer::streamer_init_one, entry pdev %p
\n
"
,
pdev
);
...
...
@@ -254,14 +253,16 @@ static int __devinit streamer_init_one(struct pci_dev *pdev,
#endif
#endif
if
(
pci_set_dma_mask
(
pdev
,
0xFFFFFFFF
))
{
rc
=
pci_set_dma_mask
(
pdev
,
0xFFFFFFFFULL
);
if
(
rc
)
{
printk
(
KERN_ERR
"%s: No suitable PCI mapping available.
\n
"
,
dev
->
name
);
rc
=
-
ENODEV
;
goto
err_out
;
}
if
(
pci_enable_device
(
pdev
))
{
rc
=
pci_enable_device
(
pdev
);
if
(
rc
)
{
printk
(
KERN_ERR
"lanstreamer: unable to enable pci device
\n
"
);
rc
=-
EIO
;
goto
err_out
;
...
...
@@ -269,6 +270,12 @@ static int __devinit streamer_init_one(struct pci_dev *pdev,
pci_set_master
(
pdev
);
rc
=
pci_set_mwi
(
pdev
);
if
(
rc
)
{
printk
(
KERN_ERR
"lanstreamer: unable to enable MWI on pci device
\n
"
);
goto
err_out_disable
;
}
pio_start
=
pci_resource_start
(
pdev
,
0
);
pio_end
=
pci_resource_end
(
pdev
,
0
);
pio_flags
=
pci_resource_flags
(
pdev
,
0
);
...
...
@@ -290,7 +297,7 @@ static int __devinit streamer_init_one(struct pci_dev *pdev,
printk
(
KERN_ERR
"lanstreamer: unable to get pci io addr %lx
\n
"
,
pio_start
);
rc
=
-
EBUSY
;
goto
err_out
;
goto
err_out
_mwi
;
}
if
(
!
request_mem_region
(
mmio_start
,
mmio_len
,
"lanstreamer"
))
{
...
...
@@ -341,26 +348,9 @@ static int __devinit streamer_init_one(struct pci_dev *pdev,
spin_lock_init
(
&
streamer_priv
->
streamer_lock
);
pci_read_config_byte
(
pdev
,
PCI_CACHE_LINE_SIZE
,
&
cls
);
cls
<<=
2
;
if
(
cls
!=
SMP_CACHE_BYTES
)
{
printk
(
KERN_INFO
" PCI cache line size set incorrectly "
"(%i bytes) by BIOS/FW, "
,
cls
);
if
(
cls
>
SMP_CACHE_BYTES
)
printk
(
"expecting %i
\n
"
,
SMP_CACHE_BYTES
);
else
{
printk
(
"correcting to %i
\n
"
,
SMP_CACHE_BYTES
);
pci_write_config_byte
(
pdev
,
PCI_CACHE_LINE_SIZE
,
SMP_CACHE_BYTES
>>
2
);
}
}
pci_read_config_word
(
pdev
,
PCI_COMMAND
,
&
pcr
);
pcr
|=
(
PCI_COMMAND_INVALIDATE
|
PCI_COMMAND_SERR
);
pcr
|=
PCI_COMMAND_SERR
;
pci_write_config_word
(
pdev
,
PCI_COMMAND
,
pcr
);
pci_read_config_word
(
pdev
,
PCI_COMMAND
,
&
pcr
);
printk
(
"%s
\n
"
,
version
);
printk
(
"%s: %s. I/O at %hx, MMIO at %p, using irq %d
\n
"
,
dev
->
name
,
...
...
@@ -383,8 +373,12 @@ static int __devinit streamer_init_one(struct pci_dev *pdev,
release_mem_region
(
mmio_start
,
mmio_len
);
err_out_free_pio:
release_region
(
pio_start
,
pio_len
);
err_out_mwi:
pci_clear_mwi
(
pdev
);
err_out_disable:
pci_disable_device
(
pdev
);
err_out:
kfree
(
dev
);
free_netdev
(
dev
);
#if STREAMER_DEBUG
printk
(
"lanstreamer: Exit error %x
\n
"
,
rc
);
#endif
...
...
@@ -430,9 +424,11 @@ static void __devexit streamer_remove_one(struct pci_dev *pdev)
#endif
unregister_netdev
(
dev
);
/* shouldn't we do iounmap here? */
release_region
(
pci_resource_start
(
pdev
,
0
),
pci_resource_len
(
pdev
,
0
));
iounmap
(
streamer_priv
->
streamer_mmio
);
release_mem_region
(
pci_resource_start
(
pdev
,
1
),
pci_resource_len
(
pdev
,
1
));
release_region
(
pci_resource_start
(
pdev
,
0
),
pci_resource_len
(
pdev
,
0
));
pci_clear_mwi
(
pdev
);
pci_disable_device
(
pdev
);
free_netdev
(
dev
);
pci_set_drvdata
(
pdev
,
NULL
);
}
...
...
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