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
84a76754
Commit
84a76754
authored
Nov 07, 2003
by
Jeff Garzik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[libata] fix Promise PCI posting bugs
parent
7879ab1b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
1 deletion
+11
-1
drivers/scsi/sata_promise.c
drivers/scsi/sata_promise.c
+11
-1
No files found.
drivers/scsi/sata_promise.c
View file @
84a76754
...
@@ -37,7 +37,7 @@
...
@@ -37,7 +37,7 @@
#undef DIRECT_HDMA
#undef DIRECT_HDMA
#define DRV_NAME "sata_promise"
#define DRV_NAME "sata_promise"
#define DRV_VERSION "0.8
5
"
#define DRV_VERSION "0.8
6
"
enum
{
enum
{
...
@@ -626,6 +626,7 @@ static void pdc20621_fill_sg(struct ata_queued_cmd *qc)
...
@@ -626,6 +626,7 @@ static void pdc20621_fill_sg(struct ata_queued_cmd *qc)
memcpy_toio
(
dimm_mmio
+
(
portno
*
PDC_DIMM_WINDOW_STEP
)
+
memcpy_toio
(
dimm_mmio
+
(
portno
*
PDC_DIMM_WINDOW_STEP
)
+
PDC_DIMM_HOST_PRD
,
PDC_DIMM_HOST_PRD
,
&
pp
->
dimm_buf
[
PDC_DIMM_HEADER_SZ
],
sgt_len
);
&
pp
->
dimm_buf
[
PDC_DIMM_HEADER_SZ
],
sgt_len
);
readl
(
dimm_mmio
);
/* flush */
VPRINTK
(
"ata pkt buf ofs %u, prd size %u, mmio copied
\n
"
,
i
,
sgt_len
);
VPRINTK
(
"ata pkt buf ofs %u, prd size %u, mmio copied
\n
"
,
i
,
sgt_len
);
}
}
...
@@ -711,6 +712,7 @@ static void pdc20621_dma_start(struct ata_queued_cmd *qc)
...
@@ -711,6 +712,7 @@ static void pdc20621_dma_start(struct ata_queued_cmd *qc)
wmb
();
/* flush PRD, pkt writes */
wmb
();
/* flush PRD, pkt writes */
writel
(
0x00000001
,
mmio
+
PDC_20621_SEQCTL
+
(
seq
*
4
));
writel
(
0x00000001
,
mmio
+
PDC_20621_SEQCTL
+
(
seq
*
4
));
readl
(
mmio
+
PDC_20621_SEQCTL
+
(
seq
*
4
));
/* flush */
if
(
doing_hdma
)
{
if
(
doing_hdma
)
{
pdc20621_dump_hdma
(
qc
);
pdc20621_dump_hdma
(
qc
);
...
@@ -719,6 +721,7 @@ static void pdc20621_dma_start(struct ata_queued_cmd *qc)
...
@@ -719,6 +721,7 @@ static void pdc20621_dma_start(struct ata_queued_cmd *qc)
#else
#else
writel
(
port_ofs
+
PDC_DIMM_HOST_PKT
,
writel
(
port_ofs
+
PDC_DIMM_HOST_PKT
,
mmio
+
PDC_HDMA_PKT_SUBMIT
);
mmio
+
PDC_HDMA_PKT_SUBMIT
);
readl
(
mmio
+
PDC_HDMA_PKT_SUBMIT
);
/* flush */
#endif
#endif
VPRINTK
(
"submitted ofs 0x%x (%u), seq %u
\n
"
,
VPRINTK
(
"submitted ofs 0x%x (%u), seq %u
\n
"
,
port_ofs
+
PDC_DIMM_HOST_PKT
,
port_ofs
+
PDC_DIMM_HOST_PKT
,
...
@@ -727,6 +730,7 @@ static void pdc20621_dma_start(struct ata_queued_cmd *qc)
...
@@ -727,6 +730,7 @@ static void pdc20621_dma_start(struct ata_queued_cmd *qc)
}
else
{
}
else
{
writel
(
port_ofs
+
PDC_DIMM_ATA_PKT
,
writel
(
port_ofs
+
PDC_DIMM_ATA_PKT
,
(
void
*
)
ap
->
ioaddr
.
cmd_addr
+
PDC_PKT_SUBMIT
);
(
void
*
)
ap
->
ioaddr
.
cmd_addr
+
PDC_PKT_SUBMIT
);
readl
((
void
*
)
ap
->
ioaddr
.
cmd_addr
+
PDC_PKT_SUBMIT
);
VPRINTK
(
"submitted ofs 0x%x (%u), seq %u
\n
"
,
VPRINTK
(
"submitted ofs 0x%x (%u), seq %u
\n
"
,
port_ofs
+
PDC_DIMM_ATA_PKT
,
port_ofs
+
PDC_DIMM_ATA_PKT
,
port_ofs
+
PDC_DIMM_ATA_PKT
,
port_ofs
+
PDC_DIMM_ATA_PKT
,
...
@@ -765,11 +769,13 @@ static inline unsigned int pdc20621_host_intr( struct ata_port *ap,
...
@@ -765,11 +769,13 @@ static inline unsigned int pdc20621_host_intr( struct ata_port *ap,
/* submit hdma pkt */
/* submit hdma pkt */
pdc20621_dump_hdma
(
qc
);
pdc20621_dump_hdma
(
qc
);
writel
(
0x00000001
,
mmio
+
PDC_20621_SEQCTL
+
(
seq
*
4
));
writel
(
0x00000001
,
mmio
+
PDC_20621_SEQCTL
+
(
seq
*
4
));
readl
(
mmio
+
PDC_20621_SEQCTL
+
(
seq
*
4
));
#ifdef DIRECT_HDMA
#ifdef DIRECT_HDMA
pdc20621_push_hdma
(
qc
);
pdc20621_push_hdma
(
qc
);
#else
#else
writel
(
port_ofs
+
PDC_DIMM_HOST_PKT
,
writel
(
port_ofs
+
PDC_DIMM_HOST_PKT
,
mmio
+
PDC_HDMA_PKT_SUBMIT
);
mmio
+
PDC_HDMA_PKT_SUBMIT
);
readl
(
mmio
+
PDC_HDMA_PKT_SUBMIT
);
#endif
#endif
}
}
handled
=
1
;
handled
=
1
;
...
@@ -784,8 +790,10 @@ static inline unsigned int pdc20621_host_intr( struct ata_port *ap,
...
@@ -784,8 +790,10 @@ static inline unsigned int pdc20621_host_intr( struct ata_port *ap,
/* submit ata pkt */
/* submit ata pkt */
writel
(
0x00000001
,
mmio
+
PDC_20621_SEQCTL
+
(
seq
*
4
));
writel
(
0x00000001
,
mmio
+
PDC_20621_SEQCTL
+
(
seq
*
4
));
readl
(
mmio
+
PDC_20621_SEQCTL
+
(
seq
*
4
));
writel
(
port_ofs
+
PDC_DIMM_ATA_PKT
,
writel
(
port_ofs
+
PDC_DIMM_ATA_PKT
,
(
void
*
)
ap
->
ioaddr
.
cmd_addr
+
PDC_PKT_SUBMIT
);
(
void
*
)
ap
->
ioaddr
.
cmd_addr
+
PDC_PKT_SUBMIT
);
readl
((
void
*
)
ap
->
ioaddr
.
cmd_addr
+
PDC_PKT_SUBMIT
);
}
}
/* step two - execute ATA command */
/* step two - execute ATA command */
...
@@ -1039,10 +1047,12 @@ static void pdc_dma_start(struct ata_queued_cmd *qc)
...
@@ -1039,10 +1047,12 @@ static void pdc_dma_start(struct ata_queued_cmd *qc)
VPRINTK
(
"ENTER, ap %p
\n
"
,
ap
);
VPRINTK
(
"ENTER, ap %p
\n
"
,
ap
);
writel
(
0x00000001
,
ap
->
host_set
->
mmio_base
+
(
seq
*
4
));
writel
(
0x00000001
,
ap
->
host_set
->
mmio_base
+
(
seq
*
4
));
readl
(
ap
->
host_set
->
mmio_base
+
(
seq
*
4
));
/* flush */
pp
->
pkt
[
2
]
=
seq
;
pp
->
pkt
[
2
]
=
seq
;
wmb
();
/* flush PRD, pkt writes */
wmb
();
/* flush PRD, pkt writes */
writel
(
pp
->
pkt_dma
,
(
void
*
)
ap
->
ioaddr
.
cmd_addr
+
PDC_PKT_SUBMIT
);
writel
(
pp
->
pkt_dma
,
(
void
*
)
ap
->
ioaddr
.
cmd_addr
+
PDC_PKT_SUBMIT
);
readl
((
void
*
)
ap
->
ioaddr
.
cmd_addr
+
PDC_PKT_SUBMIT
);
/* flush */
}
}
static
void
pdc_tf_load_mmio
(
struct
ata_port
*
ap
,
struct
ata_taskfile
*
tf
)
static
void
pdc_tf_load_mmio
(
struct
ata_port
*
ap
,
struct
ata_taskfile
*
tf
)
...
...
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