Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
L
Linux
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
E-EXK4 - Operating System Group
projects
Linux
Commits
b0942f78
Commit
b0942f78
authored
16 years ago
by
Krzysztof Hałasa
Browse files
Options
Downloads
Patches
Plain Diff
WAN: HD64572 already handles TX underruns with DMAC.
Signed-off-by:
Krzysztof Hałasa
<
khc@pm.waw.pl
>
parent
09fd65aa
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
drivers/net/wan/hd64572.c
+15
-17
15 additions, 17 deletions
drivers/net/wan/hd64572.c
with
15 additions
and
17 deletions
drivers/net/wan/hd64572.c
+
15
−
17
View file @
b0942f78
...
@@ -232,19 +232,12 @@ static inline void sca_msci_intr(port_t *port)
...
@@ -232,19 +232,12 @@ static inline void sca_msci_intr(port_t *port)
{
{
u16
msci
=
get_msci
(
port
);
u16
msci
=
get_msci
(
port
);
card_t
*
card
=
port_to_card
(
port
);
card_t
*
card
=
port_to_card
(
port
);
u8
stat
=
sca_in
(
msci
+
ST1
,
card
);
/* read MSCI ST1 status */
/* Reset MSCI TX underrun and CDCD status bit */
if
(
sca_in
(
msci
+
ST1
,
card
)
&
ST1_CDCD
)
{
sca_out
(
stat
&
(
ST1_UDRN
|
ST1_CDCD
),
msci
+
ST1
,
card
);
/* Reset MSCI CDCD status bit */
sca_out
(
ST1_CDCD
,
msci
+
ST1
,
card
);
if
(
stat
&
ST1_UDRN
)
{
/* TX Underrun error detected */
port_to_dev
(
port
)
->
stats
.
tx_errors
++
;
port_to_dev
(
port
)
->
stats
.
tx_fifo_errors
++
;
}
if
(
stat
&
ST1_CDCD
)
sca_set_carrier
(
port
);
sca_set_carrier
(
port
);
}
}
}
...
@@ -351,11 +344,17 @@ static inline void sca_tx_done(port_t *port)
...
@@ -351,11 +344,17 @@ static inline void sca_tx_done(port_t *port)
while
(
1
)
{
while
(
1
)
{
pkt_desc
__iomem
*
desc
=
desc_address
(
port
,
port
->
txlast
,
1
);
pkt_desc
__iomem
*
desc
=
desc_address
(
port
,
port
->
txlast
,
1
);
u8
stat
=
readb
(
&
desc
->
stat
);
if
(
!
(
readb
(
&
desc
->
stat
)
&
ST_TX_OWNRSHP
))
if
(
!
(
stat
&
ST_TX_OWNRSHP
))
break
;
/* not yet transmitted */
break
;
/* not yet transmitted */
dev
->
stats
.
tx_packets
++
;
if
(
stat
&
ST_TX_UNDRRUN
)
{
dev
->
stats
.
tx_bytes
+=
readw
(
&
desc
->
len
);
dev
->
stats
.
tx_errors
++
;
dev
->
stats
.
tx_fifo_errors
++
;
}
else
{
dev
->
stats
.
tx_packets
++
;
dev
->
stats
.
tx_bytes
+=
readw
(
&
desc
->
len
);
}
writeb
(
0
,
&
desc
->
stat
);
/* Free descriptor */
writeb
(
0
,
&
desc
->
stat
);
/* Free descriptor */
port
->
txlast
=
next_desc
(
port
,
port
->
txlast
,
1
);
port
->
txlast
=
next_desc
(
port
,
port
->
txlast
,
1
);
}
}
...
@@ -503,12 +502,11 @@ static void sca_open(struct net_device *dev)
...
@@ -503,12 +502,11 @@ static void sca_open(struct net_device *dev)
sca_out
(
0x3F
,
msci
+
TNR1
,
card
);
/* +1=TX DMA deactivation condition*/
sca_out
(
0x3F
,
msci
+
TNR1
,
card
);
/* +1=TX DMA deactivation condition*/
/* We're using the following interrupts:
/* We're using the following interrupts:
- TXINT (DMAC completed all transmissions
, underrun or
DCD change)
- TXINT (DMAC completed all transmissions
and
DCD change
s
)
- all DMA interrupts
- all DMA interrupts
*/
*/
/* MSCI TXINT and RXINTA interrupt enable */
/* MSCI TXINT and RXINTA interrupt enable */
sca_outl
(
IE0_TXINT
|
IE0_RXINTA
|
IE0_UDRN
|
IE0_CDCD
,
msci
+
IE0
,
sca_outl
(
IE0_TXINT
|
IE0_RXINTA
|
IE0_CDCD
,
msci
+
IE0
,
card
);
card
);
sca_out
(
port
->
tmc
,
msci
+
TMCR
,
card
);
sca_out
(
port
->
tmc
,
msci
+
TMCR
,
card
);
sca_out
(
port
->
tmc
,
msci
+
TMCT
,
card
);
sca_out
(
port
->
tmc
,
msci
+
TMCT
,
card
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment