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
409f3569
Commit
409f3569
authored
Mar 08, 2004
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge
bk://kernel.bkbits.net/jgarzik/via-crypto-2.5
into ppc970.osdl.org:/home/torvalds/v2.5/linux
parents
0628cffc
6cc556b6
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
45 additions
and
8 deletions
+45
-8
drivers/net/hp100.c
drivers/net/hp100.c
+1
-1
drivers/net/pcnet32.c
drivers/net/pcnet32.c
+3
-2
drivers/scsi/ata_piix.c
drivers/scsi/ata_piix.c
+27
-4
drivers/scsi/libata-core.c
drivers/scsi/libata-core.c
+5
-0
drivers/scsi/sata_promise.c
drivers/scsi/sata_promise.c
+9
-1
No files found.
drivers/net/hp100.c
View file @
409f3569
...
...
@@ -2862,7 +2862,7 @@ static int __init hp100_eisa_probe (struct device *gendev)
SET_MODULE_OWNER
(
dev
);
SET_NETDEV_DEV
(
dev
,
&
edev
->
dev
);
err
=
hp100_probe1
(
dev
,
edev
->
base_addr
,
HP100_BUS_EISA
,
NULL
);
err
=
hp100_probe1
(
dev
,
edev
->
base_addr
+
0xC38
,
HP100_BUS_EISA
,
NULL
);
if
(
err
)
goto
out1
;
...
...
drivers/net/pcnet32.c
View file @
409f3569
...
...
@@ -1452,11 +1452,12 @@ pcnet32_start_xmit(struct sk_buff *skb, struct net_device *dev)
status
=
0x8300
;
entry
=
(
lp
->
cur_tx
-
lp
->
dirty_tx
)
&
TX_RING_MOD_MASK
;
if
((
lp
->
ltint
)
&&
((
entry
==
TX_RING_SIZE
/
2
)
||
((
entry
==
TX_RING_SIZE
/
3
)
||
(
entry
==
(
TX_RING_SIZE
*
2
)
/
3
)
||
(
entry
>=
TX_RING_SIZE
-
2
)))
{
/* Enable Successful-TxDone interrupt if we have
* 1/
2 of,
or nearly all of, our ring buffer Tx'd
* 1/
3, 2/3
or nearly all of, our ring buffer Tx'd
* but not yet cleaned up. Thus, most of the time,
* we will not enable Successful-TxDone interrupts.
*/
...
...
drivers/scsi/ata_piix.c
View file @
409f3569
...
...
@@ -28,12 +28,13 @@
#include <linux/libata.h>
#define DRV_NAME "ata_piix"
#define DRV_VERSION "1.0
0
"
#define DRV_VERSION "1.0
1
"
enum
{
PIIX_IOCFG
=
0x54
,
/* IDE I/O configuration register */
ICH5_PCS
=
0x92
,
/* port control and status */
PIIX_FLAG_CHECKINTR
=
(
1
<<
29
),
/* make sure PCI INTx enabled */
PIIX_FLAG_COMBINED
=
(
1
<<
30
),
/* combined mode possible */
PIIX_COMB_PRI
=
(
1
<<
0
),
/* combined mode, PATA primary */
...
...
@@ -163,7 +164,8 @@ static struct ata_port_info piix_port_info[] = {
/* ich5_pata */
{
.
sht
=
&
piix_sht
,
.
host_flags
=
ATA_FLAG_SLAVE_POSS
|
ATA_FLAG_SRST
,
.
host_flags
=
ATA_FLAG_SLAVE_POSS
|
ATA_FLAG_SRST
|
PIIX_FLAG_CHECKINTR
,
.
pio_mask
=
0x03
,
/* pio3-4 */
.
udma_mask
=
ATA_UDMA_MASK_40C
,
/* FIXME: cbl det */
.
port_ops
=
&
piix_pata_ops
,
...
...
@@ -172,8 +174,8 @@ static struct ata_port_info piix_port_info[] = {
/* ich5_sata */
{
.
sht
=
&
piix_sht
,
.
host_flags
=
ATA_FLAG_SATA
|
PIIX_FLAG_COMBINED
|
ATA_FLAG_SRST
,
.
host_flags
=
ATA_FLAG_SATA
|
ATA_FLAG_SRST
|
PIIX_FLAG_COMBINED
|
PIIX_FLAG_CHECKINTR
,
.
pio_mask
=
0x03
,
/* pio3-4 */
.
udma_mask
=
0x7f
,
/* udma0-6 ; FIXME */
.
port_ops
=
&
piix_sata_ops
,
...
...
@@ -518,6 +520,18 @@ static void piix_probe_combined (struct pci_dev *pdev, unsigned int *mask)
*
mask
|=
PIIX_COMB_PRI
;
}
/* move to PCI layer, integrate w/ MSI stuff */
static
void
pci_enable_intx
(
struct
pci_dev
*
pdev
)
{
u16
pci_command
;
pci_read_config_word
(
pdev
,
PCI_COMMAND
,
&
pci_command
);
if
(
pci_command
&
PCI_COMMAND_INTX_DISABLE
)
{
pci_command
&=
~
PCI_COMMAND_INTX_DISABLE
;
pci_write_config_word
(
pdev
,
PCI_COMMAND
,
pci_command
);
}
}
/**
* piix_init_one - Register PIIX ATA PCI device with kernel services
* @pdev: PCI device to register
...
...
@@ -552,6 +566,15 @@ static int piix_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
if
(
port_info
[
0
]
->
host_flags
&
PIIX_FLAG_COMBINED
)
piix_probe_combined
(
pdev
,
&
combined
);
/* On ICH5, some BIOSen disable the interrupt using the
* PCI_COMMAND_INTX_DISABLE bit added in PCI 2.3.
* On ICH6, this bit has the same effect, but only when
* MSI is disabled (and it is disabled, as we don't use
* message-signalled interrupts currently).
*/
if
(
port_info
[
0
]
->
host_flags
&
PIIX_FLAG_CHECKINTR
)
pci_enable_intx
(
pdev
);
if
(
combined
&
PIIX_COMB_PRI
)
sata_comb
=
1
;
else
if
(
combined
&
PIIX_COMB_SEC
)
...
...
drivers/scsi/libata-core.c
View file @
409f3569
...
...
@@ -34,6 +34,7 @@
#include <linux/delay.h>
#include <linux/timer.h>
#include <linux/interrupt.h>
#include <linux/suspend.h>
#include <scsi/scsi.h>
#include "scsi.h"
#include "hosts.h"
...
...
@@ -2600,6 +2601,10 @@ static int ata_thread (void *data)
if
(
signal_pending
(
current
))
flush_signals
(
current
);
if
(
current
->
flags
&
PF_FREEZE
)
refrigerator
(
PF_IOTHREAD
);
if
((
timeout
<
0
)
||
(
ap
->
time_to_die
))
break
;
...
...
drivers/scsi/sata_promise.c
View file @
409f3569
...
...
@@ -35,7 +35,7 @@
#include <asm/io.h>
#define DRV_NAME "sata_promise"
#define DRV_VERSION "0.9
0
"
#define DRV_VERSION "0.9
1
"
enum
{
...
...
@@ -1014,6 +1014,14 @@ static void pdc_eng_timeout(struct ata_port *ap)
goto
out
;
}
/* hack alert! We cannot use the supplied completion
* function from inside the ->eh_strategy_handler() thread.
* libata is the only user of ->eh_strategy_handler() in
* any kernel, so the default scsi_done() assumes it is
* not being called from the SCSI EH.
*/
qc
->
scsidone
=
scsi_finish_command
;
switch
(
qc
->
tf
.
protocol
)
{
case
ATA_PROT_DMA_READ
:
case
ATA_PROT_DMA_WRITE
:
...
...
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