Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
b481b4ec
Commit
b481b4ec
authored
Feb 09, 2006
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
parents
9ac95f2f
9caafa6c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
3 deletions
+18
-3
drivers/scsi/sata_mv.c
drivers/scsi/sata_mv.c
+10
-1
drivers/scsi/sata_sil.c
drivers/scsi/sata_sil.c
+8
-2
No files found.
drivers/scsi/sata_mv.c
View file @
b481b4ec
...
...
@@ -509,6 +509,12 @@ static const struct mv_hw_ops mv6xxx_ops = {
.
reset_bus
=
mv_reset_pci_bus
,
};
/*
* module options
*/
static
int
msi
;
/* Use PCI msi; either zero (off, default) or non-zero */
/*
* Functions
*/
...
...
@@ -2191,7 +2197,7 @@ static int mv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
}
/* Enable interrupts */
if
(
pci_enable_msi
(
pdev
)
==
0
)
{
if
(
msi
&&
pci_enable_msi
(
pdev
)
==
0
)
{
hpriv
->
hp_flags
|=
MV_HP_FLAG_MSI
;
}
else
{
pci_intx
(
pdev
,
1
);
...
...
@@ -2246,5 +2252,8 @@ MODULE_LICENSE("GPL");
MODULE_DEVICE_TABLE
(
pci
,
mv_pci_tbl
);
MODULE_VERSION
(
DRV_VERSION
);
module_param
(
msi
,
int
,
0444
);
MODULE_PARM_DESC
(
msi
,
"Enable use of PCI MSI (0=off, 1=on)"
);
module_init
(
mv_init
);
module_exit
(
mv_exit
);
drivers/scsi/sata_sil.c
View file @
b481b4ec
...
...
@@ -231,6 +231,10 @@ MODULE_LICENSE("GPL");
MODULE_DEVICE_TABLE
(
pci
,
sil_pci_tbl
);
MODULE_VERSION
(
DRV_VERSION
);
static
int
slow_down
=
0
;
module_param
(
slow_down
,
int
,
0444
);
MODULE_PARM_DESC
(
slow_down
,
"Sledgehammer used to work around random problems, by limiting commands to 15 sectors (0=off, 1=on)"
);
static
unsigned
char
sil_get_device_cache_line
(
struct
pci_dev
*
pdev
)
{
...
...
@@ -354,8 +358,10 @@ static void sil_dev_config(struct ata_port *ap, struct ata_device *dev)
}
/* limit requests to 15 sectors */
if
((
ap
->
flags
&
SIL_FLAG_MOD15WRITE
)
&&
(
quirks
&
SIL_QUIRK_MOD15WRITE
))
{
printk
(
KERN_INFO
"ata%u(%u): applying Seagate errata fix
\n
"
,
if
(
slow_down
||
((
ap
->
flags
&
SIL_FLAG_MOD15WRITE
)
&&
(
quirks
&
SIL_QUIRK_MOD15WRITE
)))
{
printk
(
KERN_INFO
"ata%u(%u): applying Seagate errata fix (mod15write workaround)
\n
"
,
ap
->
id
,
dev
->
devno
);
ap
->
host
->
max_sectors
=
15
;
ap
->
host
->
hostt
->
max_sectors
=
15
;
...
...
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