Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci-2.6.23
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-2.6.23
Commits
8b78e83b
Commit
8b78e83b
authored
Jan 09, 2006
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
parents
cf10b285
b887030a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
24 additions
and
6 deletions
+24
-6
drivers/scsi/sata_nv.c
drivers/scsi/sata_nv.c
+24
-6
No files found.
drivers/scsi/sata_nv.c
View file @
8b78e83b
...
...
@@ -29,6 +29,12 @@
* NV-specific details such as register offsets, SATA phy location,
* hotplug info, etc.
*
* 0.10
* - Fixed spurious interrupts issue seen with the Maxtor 6H500F0 500GB
* drive. Also made the check_hotplug() callbacks return whether there
* was a hotplug interrupt or not. This was not the source of the
* spurious interrupts, but is the right thing to do anyway.
*
* 0.09
* - Fixed bug introduced by 0.08's MCP51 and MCP55 support.
*
...
...
@@ -124,10 +130,10 @@ static void nv_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);
static
void
nv_host_stop
(
struct
ata_host_set
*
host_set
);
static
void
nv_enable_hotplug
(
struct
ata_probe_ent
*
probe_ent
);
static
void
nv_disable_hotplug
(
struct
ata_host_set
*
host_set
);
static
void
nv_check_hotplug
(
struct
ata_host_set
*
host_set
);
static
int
nv_check_hotplug
(
struct
ata_host_set
*
host_set
);
static
void
nv_enable_hotplug_ck804
(
struct
ata_probe_ent
*
probe_ent
);
static
void
nv_disable_hotplug_ck804
(
struct
ata_host_set
*
host_set
);
static
void
nv_check_hotplug_ck804
(
struct
ata_host_set
*
host_set
);
static
int
nv_check_hotplug_ck804
(
struct
ata_host_set
*
host_set
);
enum
nv_host_type
{
...
...
@@ -176,7 +182,7 @@ struct nv_host_desc
enum
nv_host_type
host_type
;
void
(
*
enable_hotplug
)(
struct
ata_probe_ent
*
probe_ent
);
void
(
*
disable_hotplug
)(
struct
ata_host_set
*
host_set
);
void
(
*
check_hotplug
)(
struct
ata_host_set
*
host_set
);
int
(
*
check_hotplug
)(
struct
ata_host_set
*
host_set
);
};
static
struct
nv_host_desc
nv_device_tbl
[]
=
{
...
...
@@ -309,12 +315,16 @@ static irqreturn_t nv_interrupt (int irq, void *dev_instance,
qc
=
ata_qc_from_tag
(
ap
,
ap
->
active_tag
);
if
(
qc
&&
(
!
(
qc
->
tf
.
ctl
&
ATA_NIEN
)))
handled
+=
ata_host_intr
(
ap
,
qc
);
else
// No request pending? Clear interrupt status
// anyway, in case there's one pending.
ap
->
ops
->
check_status
(
ap
);
}
}
if
(
host
->
host_desc
->
check_hotplug
)
host
->
host_desc
->
check_hotplug
(
host_set
);
h
andled
+=
h
ost
->
host_desc
->
check_hotplug
(
host_set
);
spin_unlock_irqrestore
(
&
host_set
->
lock
,
flags
);
...
...
@@ -497,7 +507,7 @@ static void nv_disable_hotplug(struct ata_host_set *host_set)
outb
(
intr_mask
,
host_set
->
ports
[
0
]
->
ioaddr
.
scr_addr
+
NV_INT_ENABLE
);
}
static
void
nv_check_hotplug
(
struct
ata_host_set
*
host_set
)
static
int
nv_check_hotplug
(
struct
ata_host_set
*
host_set
)
{
u8
intr_status
;
...
...
@@ -522,7 +532,11 @@ static void nv_check_hotplug(struct ata_host_set *host_set)
if
(
intr_status
&
NV_INT_STATUS_SDEV_REMOVED
)
printk
(
KERN_WARNING
"nv_sata: "
"Secondary device removed
\n
"
);
return
1
;
}
return
0
;
}
static
void
nv_enable_hotplug_ck804
(
struct
ata_probe_ent
*
probe_ent
)
...
...
@@ -560,7 +574,7 @@ static void nv_disable_hotplug_ck804(struct ata_host_set *host_set)
pci_write_config_byte
(
pdev
,
NV_MCP_SATA_CFG_20
,
regval
);
}
static
void
nv_check_hotplug_ck804
(
struct
ata_host_set
*
host_set
)
static
int
nv_check_hotplug_ck804
(
struct
ata_host_set
*
host_set
)
{
u8
intr_status
;
...
...
@@ -585,7 +599,11 @@ static void nv_check_hotplug_ck804(struct ata_host_set *host_set)
if
(
intr_status
&
NV_INT_STATUS_SDEV_REMOVED
)
printk
(
KERN_WARNING
"nv_sata: "
"Secondary device removed
\n
"
);
return
1
;
}
return
0
;
}
static
int
__init
nv_init
(
void
)
...
...
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