Mercurial > archived > louis > epitech > mq > rathaxes
annotate rathaxes_sample_e1000_rewrite_device_dependent_code.patch @ 137:8bbdb488f6fe
Wip, cleaning up the probe function
author | Louis Opter <kalessin@kalessin.fr> |
---|---|
date | Sat, 18 Jan 2014 17:52:33 -0800 |
parents | 8229a46ec658 |
children | 6527e078252c |
rev | line source |
---|---|
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1 # HG changeset patch |
137
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2 # Parent d71e19169c392a9509bf816bf2ca7858212df878 |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
3 rathaxes: rewrite/refactor all the e1000 device dependent code |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
4 |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
5 diff --git a/notes.txt b/notes.txt |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
6 new file mode 100644 |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
7 --- /dev/null |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
8 +++ b/notes.txt |
137
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
9 @@ -0,0 +1,47 @@ |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
10 +Remarks for David & Lionel: |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
11 + |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
12 +- Too much changes to not start over; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
13 +- Lack of methods is extremely annoying and requires a lot of workarounds (e.g: |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
14 + see the register read/write/set/unset methods on e1000::Context); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
15 +- I'm using a pointcut inside the ethernet context "decl data_types" to inject |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
16 + my hardware context; it's impossible to get it back without hardcoding stuff, |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
17 + because the ethernet subsystem isn't aware of the type of the field (so I |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
18 + can't write an attribute). Being able to just inject a type (instead of a |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
19 + whole structure field) might not be the best solution but would solve this |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
20 + issue/use case; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
21 +- Can I use the same name for a pointcut and a sequence (e.g: Ethernet::send |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
22 + bot a sequence name and a pointcut same thing for the interrupt handler); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
23 +- Lack of support for circular dependencies make some code annoying or |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
24 + incorrect (circular dependencies between abstract and concrete types via the |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
25 + attribute or circular dependencies between the rings and the hardware |
133 | 26 + context); |
27 +- It would be really cool to passthrough the comments; | |
28 +- Not being able to use a Rathaxes type in the attributes is really annoying | |
29 + and forces me to hardcode a lot of stuff; | |
30 +- Pointcuts are scoped by subsystems which is kinda weird because different | |
31 + subsystems are going to share the same pointcuts (i.e: the PCI and USB | |
32 + susystem are going to expose the same pointcuts that can be used by the | |
137
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
33 + Ethernet subsystem); |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
34 +- The compiler adds a & when I try to expand e1000::Context.io_addr regardless |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
35 + of whether the attribute is declared as Builtin::symbol.ref or .scalar. |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
36 + |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
37 +Todo/Totry: |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
38 + |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
39 +- Use the rtx_ether_ctx attribute on AbstractDevice to initialize Device |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
40 + objects in ethernet.bl; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
41 +- Worry about the code being executed concurrently, e.g: what happens if the |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
42 + interrupt handler is called right before we disable it in the close path? |
133 | 43 +- Why the DMA sequences are taking an AbstractDMAHandle instead of a DMAHandle? |
137
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
44 +- Right now the Ethernet subsystem hooks into the PCI subsystem via the |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
45 + Ethernet::init sequence, maybe the content of this sequence should be moved |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
46 + under the Ethernet::Device type definition (maybe we could solve the |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
47 + free_netdev call in case of failure at the same time); |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
48 +- PCI::Device.device should be PCI::Device.k_device. |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
49 + |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
50 +Questions: |
133 | 51 + |
52 +Compiler bugs: | |
53 + | |
54 +- Trying to expand a type that doesn't exists crashes the compiler instead of | |
55 + displaying something more useful (took me 15 minutes to figure out that I | |
56 + typed 3 colons instead of 2 in a placeholder). | |
57 diff --git a/rathaxes/compiler/passes/back/rtxIntrospect.inc.cws b/rathaxes/compiler/passes/back/rtxIntrospect.inc.cws | |
58 --- a/rathaxes/compiler/passes/back/rtxIntrospect.inc.cws | |
59 +++ b/rathaxes/compiler/passes/back/rtxIntrospect.inc.cws | |
60 @@ -890,6 +890,8 @@ | |
61 local to_remove; | |
62 foreach placeHolder in local_node.body.compile | |
63 { | |
64 + if (!placeHolder.node.body.type) | |
134 | 65 + traceLine(RED + "BUG: placeHolder.node.body.type is missing in rtxIntrospect_walk<\"__rtx_chunk__\">, placeHolder = " + toString(placeHolder) + DEFAULT_COLOR); |
133 | 66 if (rtxIntrospect_InferPlaceHolderTypes<placeHolder.node.body.type>(placeHolder.node.body, local_node) == false) |
67 { | |
68 pushItem to_remove; | |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
69 diff --git a/rathaxes/samples/e1000/CMakeLists.txt b/rathaxes/samples/e1000/CMakeLists.txt |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
70 --- a/rathaxes/samples/e1000/CMakeLists.txt |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
71 +++ b/rathaxes/samples/e1000/CMakeLists.txt |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
72 @@ -17,9 +17,9 @@ |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
73 dma.blt |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
74 pci.blt |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
75 socket.blt |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
76 - e1000.blt |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
77 - ethernet.blt) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
78 + ethernet.blt |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
79 + e1000.blt) |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
80 |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
81 -IF (LINUX_KBUILD_DIR) |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
82 - ADD_RATHAXES_LKM(e1000 e1000_src) |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
83 -ENDIF (LINUX_KBUILD_DIR) |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
84 +#IF (LINUX_KBUILD_DIR) |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
85 +# ADD_RATHAXES_LKM(e1000 e1000_src) |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
86 +#ENDIF (LINUX_KBUILD_DIR) |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
87 diff --git a/rathaxes/samples/e1000/e1000.blt b/rathaxes/samples/e1000/e1000.blt |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
88 --- a/rathaxes/samples/e1000/e1000.blt |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
89 +++ b/rathaxes/samples/e1000/e1000.blt |
133 | 90 @@ -1,564 +1,8 @@ |
91 -with e1000, Ethernet, Socket, DMA, PCI, LKM, Log, Builtin | |
92 +with e1000, Ethernet, Socket, Device, DMA, PCI, LKM, Log, Builtin | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
93 { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
94 - template type e1000::RxDescriptor() |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
95 + template type e1000::Register() |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
96 { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
97 - decl data_types() |
133 | 98 - { |
99 - __le64 buff_addr; | |
100 - __le16 length; | |
101 - __le16 csum; | |
102 - unsigned char status; | |
103 - unsigned char errors; | |
104 - __le16 special; | |
105 - } | |
106 - | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
107 - chunk LKM::includes() |
133 | 108 - { |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
109 - #include <linux/types.h> |
133 | 110 - } |
111 - | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
112 - method init() |
133 | 113 - { |
114 - } | |
115 - | |
116 - map | |
117 - { | |
118 - } | |
119 - } | |
120 - | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
121 - /* |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
122 - * This is a generic tx descriptor for the e1000. When you use TCP |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
123 - * Segmentation Offload (TSO) the hardware actually uses two types of |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
124 - * tx descriptors in its tx ring: |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
125 - * - context descriptors: this descriptor doesn't actually point to data to |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
126 - * send but initialize the offloading engine for the data descriptor that |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
127 - * follow; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
128 - * - data descriptors: this descriptor points to data from the skbuffs. |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
129 - */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
130 - template type e1000::TxDescriptor() |
133 | 131 - { |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
132 - decl data_types() |
133 | 133 - { |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
134 - __le64 buff_addr; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
135 - union |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
136 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
137 - __le32 data; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
138 - struct |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
139 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
140 - __le16 length; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
141 - unsigned char csum_offset; /* CSO */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
142 - unsigned char cmd; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
143 - } fields; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
144 - } lower; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
145 - union |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
146 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
147 - __le32 data; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
148 - struct |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
149 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
150 - unsigned char status; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
151 - unsigned char csum_start; /* CSS */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
152 - __le16 special; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
153 - } fields; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
154 - } upper; |
133 | 155 - } |
156 - | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
157 - method init() |
133 | 158 - { |
159 - } | |
160 - | |
161 - map | |
162 - { | |
163 - } | |
164 - } | |
165 - | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
166 - /* |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
167 - * Ring of e1000::RxDescriptors and their corresponding skbuffs. |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
168 - * |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
169 - * - size: total size of the ring in bytes. |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
170 - * - base: address of the ring (we can't use the typedef here until we get |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
171 - * CNorm unstrict); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
172 - * - dma_base: (physical) address of the ring where the device can access |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
173 - * the different descriptors; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
174 - * - skbuffs: array of the skbuffs and their dma (physical) address |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
175 - * associated with each descriptor. |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
176 - */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
177 - template type e1000::RxRing() |
133 | 178 - { |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
179 - decl data_types() |
133 | 180 - { |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
181 - unsigned int size; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
182 - ${e1000::RxDescriptor.ref} base; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
183 - dma_addr_t dma_base; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
184 - ${Socket::SKBuff} skbuffs[${config.rx_ring_size}]; |
133 | 185 - } |
186 - | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
187 - method init() |
133 | 188 - { |
189 - } | |
190 - | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
191 - chunk Ethernet::adapter_init_rx(Ethernet::Device rtx_ether_ctx) |
133 | 192 - { |
193 - { | |
194 - ${e1000::Context.ref} hw_ctx = &${rtx_ether_ctx}->hw_ctx; | |
195 - | |
196 - /* | |
197 - * Receive initialization (section 14.4): | |
198 - * | |
199 - * 1. Program the receive address, in RAL/RAH; | |
200 - * 2. Initialize the Multicast Table Array; | |
201 - * 3. Program the interrupt mask register (done in | |
202 - * e1000::activate_device_interruption); | |
203 - * 4. Allocate the receive descriptor ring and map it to make it | |
204 - * accessible by the device; | |
205 - * 5. Write the start address of the ring in RDBAL/RDBAH and set | |
206 - * RDLEN (Receive Descriptor Length) to the size of the ring; | |
207 - * 6. Set the RDH/RDT (Receive Descriptor Head/Tail) indexes to the | |
208 - * beginning and end of the ring; | |
209 - * 7. Make sure that RCTL.BSIZE and .BSEX are at 0 to configure the | |
210 - * receive buffer size to 2048 bytes (e1000::rx_buffer_len). | |
211 - * 8. Set RCTL.EN to enable the receiver. | |
212 - * | |
213 - * The ugly casts here are caused by the lack of CNorm unstrict. | |
214 - */ | |
215 - | |
216 - int i; | |
217 - | |
218 - /* 1. Program the receive address */ | |
219 - | |
220 - /* (We should use uint{32,16}_t but CNorm doesn't know them yet) */ | |
221 - rtx_e1000_register_write32(hw_ctx, E1000_RAL, | |
222 - *(unsigned int *)(${rtx_ether_ctx.dev_addr})); | |
223 - /* | |
224 - * The 16 upper bits of RAH also store the AS bits (which should be | |
225 - * 0) and the AV bit (should be 1 to set the address as valid). | |
226 - */ | |
227 - rtx_e1000_register_write32(hw_ctx, E1000_RAH, | |
228 - *(unsigned short *)(&${rtx_ether_ctx.dev_addr}[4])); | |
229 - rtx_e1000_register_set32(hw_ctx, E1000_RAH, E1000_RAH_AV); | |
230 - | |
231 - ${Log::info("adapter_init_rx: receive address programmed")}; | |
232 - | |
233 - /* 2. Initialize the MTA */ | |
234 - | |
235 - for (i = 0; i != 128; ++i) | |
236 - rtx_e1000_register_write32(hw_ctx, E1000_MTA + i * 4, 0); | |
237 - | |
238 - ${Log::info("adapter_init_rx: MTA init done")}; | |
239 - | |
240 - /* 4. Setup the receive descriptor ring */ | |
241 - | |
242 - /* Allocate the descriptors */ | |
243 - hw_ctx->rx_ring.size = ${config.rx_ring_size} * sizeof(*hw_ctx->rx_ring.base); | |
244 - hw_ctx->rx_ring.size = ALIGN(hw_ctx->rx_ring.size, 4096); | |
245 - hw_ctx->rx_ring.base = ${DMA::alloc_coherent( | |
246 - rtx_ether_ctx.device, | |
247 - local.hw_ctx.rx_ring.size, | |
248 - local.hw_ctx.rx_ring.dma_base.dma_handle | |
249 - )}; | |
250 - if (!hw_ctx->rx_ring.base) | |
251 - { | |
252 - ${Log::info("adapter_init_rx: cannot allocate the descriptors for the rx ring")}; | |
253 - goto err_rx_ring_alloc; | |
254 - } | |
255 - | |
256 - ${Log::info("adapter_init_rx: rx descriptors allocated")}; | |
257 - | |
258 - /* | |
259 - * Allocate the skbuffs, map them for DMA, and write their address | |
260 - * in the corresponding descriptor. | |
261 - */ | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
262 - for (i = 0; i != ${config.rx_ring_size}; ++i) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
263 - { |
133 | 264 - ${Socket::SKBuff.ref} skbuff = &hw_ctx->rx_ring.skbuffs[i]; |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
265 - // XXX #46: ${rtx_ether_ctx.init_rx_skbuff(local.skbuff, config.rx_buffer_len)}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
266 - if (rtx_ethernet_init_rx_skbuff(${local.skbuff}, ${config.rx_buffer_len})) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
267 - { |
133 | 268 - ${Log::info("adapter_init_rx: cannot allocate a skbuff for the rx ring")}; |
269 - goto err_skbuffs_alloc; | |
270 - } | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
271 - // XXX #46: ${local.skbuff.map_from(rtx_ether_ctx.device)}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
272 - if (rtx_socket_skbuff_map(${local.skbuff}, ${rtx_ether_ctx.device}, RTX_DMA_FROM_DEVICE)) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
273 - { |
133 | 274 - ${Log::info("adapter_init_rx: cannot dma-map a skbuff for the rx ring")}; |
275 - goto err_skbuffs_map; | |
276 - } | |
277 - hw_ctx->rx_ring.base[i].buff_addr = cpu_to_le64(${local.skbuff.sk_buff}); | |
278 - } | |
279 - | |
280 - // ${Log::info("adapter_init_rx: skbuffs allocated}; | |
281 - pr_info("rtx_e1k: adapter_init_rx: skbuffs allocated, headlen=%d", skb_headlen((struct sk_buff *)hw_ctx->rx_ring.skbuffs[i - 1].skbuff)); | |
282 - | |
283 - /* 5. Save the emplacement and the size of the ring in RDBA/RDLEN */ | |
284 - rtx_e1000_register_write32(hw_ctx, E1000_RDBAL, hw_ctx->rx_ring.dma_base & 0xffffffff); | |
285 - rtx_e1000_register_write32(hw_ctx, E1000_RDBAH, hw_ctx->rx_ring.dma_base >> 32); | |
286 - rtx_e1000_register_write32(hw_ctx, E1000_RDLEN, hw_ctx->rx_ring.size); | |
287 - | |
288 - /* 6. Setup RDH/RDT */ | |
289 - rtx_e1000_register_write32(hw_ctx, E1000_RDH, 0); | |
290 - rtx_e1000_register_write32(hw_ctx, E1000_RDT, ${config.rx_ring_size} - 1); | |
291 - | |
292 - /* 7. Configure the buffer size, */ | |
293 - rtx_e1000_register_set32(hw_ctx, E1000_RCTL, E1000_RCTL_BSIZE_${config.rx_buffer_len}); | |
294 - | |
295 - /* 8. Enable the receiver */ | |
296 - rtx_e1000_register_set32(hw_ctx, E1000_RCTL, E1000_RCTL_EN); | |
297 - | |
298 - ${Log::info("adapter_init_rx: receive registers configured and receiver enabled")}; | |
299 - | |
300 - /* | |
301 - * XXX: We can't return here since we are not in a function but | |
302 - * in a chunk of code (injected in a function). | |
303 - */ | |
304 - goto init_rx_ok; | |
305 - | |
306 - err_skbuffs_alloc: | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
307 - while (i--) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
308 - { |
133 | 309 - dma_unmap_single( |
310 - ${rtx_ether_ctx.device}, | |
311 - /* XXX Leaking cast because of the array: */ | |
312 - *((dma_addr_t *)&(hw_ctx->rx_ring.skbuffs[i].dma_handle)), | |
313 - ${config.rx_buffer_len}, | |
314 - DMA_FROM_DEVICE); | |
315 - err_skbuffs_map: | |
316 - /* XXX leaking cast: */ | |
317 - dev_kfree_skb((struct sk_buff *)hw_ctx->rx_ring.skbuffs[i].skbuff); | |
318 - } | |
319 - | |
320 - dma_free_coherent(${rtx_ether_ctx.device}, hw_ctx->rx_ring.size, | |
321 - hw_ctx->rx_ring.base, hw_ctx->rx_ring.dma_base); | |
322 - err_rx_ring_alloc: | |
323 - /* | |
324 - * XXX: Likewise, if there is something else to rollback in the | |
325 - * enclosing function, this won't be done. | |
326 - */ | |
327 - return -ENOMEM; | |
328 - | |
329 - init_rx_ok: (void)0; /* NOP, to make this a valid label. */ | |
330 - } | |
331 - } | |
332 - | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
333 - map |
133 | 334 - { |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
335 - size: ((${self}).size); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
336 - dma_base: ((${self}).dma_base); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
337 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
338 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
339 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
340 - /* |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
341 - * Ring of e1000::TxDescriptors, this is a bit similar to the Rx ring except |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
342 - * that we don't really have to manage the skbuffs themselves (they are |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
343 - * given to use by the kernel). |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
344 - * |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
345 - * - size: total size of the ring in bytes. |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
346 - * - base: address of the ring (we can't use the typedef here until we get |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
347 - * CNorm unstrict); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
348 - * - dma_base: (physical) address of the ring where the device can access |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
349 - * the different descriptors; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
350 - * - skbuffs: the skbuffs associated with each descriptor of the ring; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
351 - * - head: index on the head of the ring; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
352 - * - tail: index on the tail of the ring. |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
353 - * |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
354 - * Keep in mind that the head and tail fields are, obviously, not |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
355 - * synchronized with TDT/TDH on the device. |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
356 - */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
357 - template type e1000::TxRing() |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
358 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
359 - decl data_types() |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
360 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
361 - unsigned int size; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
362 - /* XXX: can't use ${e1000::TxDescriptor} here: */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
363 - ${e1000::TxDescriptor.ref} base; /* rename to descs */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
364 - dma_addr_t dma_base; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
365 - ${Socket::SKBuff} skbuffs[${config.tx_ring_size}]; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
366 - unsigned short head; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
367 - unsigned short tail; |
133 | 368 - } |
369 - | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
370 - chunk LKM::prototypes() |
133 | 371 - { |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
372 - static void rtx_e1000_tx_ring_clean(${e1000::TxRing.ref}); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
373 - static unsigned int rtx_e1000_tx_ring_descriptors_remaining(${e1000::TxRing.ref}); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
374 - static int rtx_e1000_tx_ring_tso_cksum_offload(${e1000::TxRing.ref}, ${Socket::SKBuff.ref}); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
375 - static void rtx_e1000_tx_ring_put(${e1000::TxRing.ref}, ${Socket::SKBuff.ref}); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
376 - /* FIXME: See issue #54 */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
377 - static void rtx_e1000_tx_ring_start_xmit(${e1000::TxRing.ref}, /*const*/ ${e1000::Context.ref}); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
378 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
379 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
380 - chunk LKM::code() |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
381 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
382 - static void rtx_e1000_tx_ring_clean(${e1000::TxRing.ref} self) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
383 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
384 - ${e1000::TxDescriptor.ref} tx_desc; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
385 - bool done; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
386 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
387 - for (; self->head != self->tail; self->head++) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
388 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
389 - tx_desc = &self->base[self->head]; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
390 - done = tx_desc->upper.fields.status & E1000_TXD_STAT_DD; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
391 - if (!done) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
392 - break ; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
393 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
394 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
395 - pr_info("%s: tx_ring_clean: moving head to %d/%d", ${config.name}, self->head, ${config.tx_ring_size}); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
396 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
397 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
398 - static unsigned int rtx_e1000_tx_ring_descriptors_remaining(${e1000::TxRing.ref} self) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
399 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
400 - if (self->tail == self->head) /* ring is empty */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
401 - return 256; /* XXX: ${config.tx_ring_size}; */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
402 - if (self->tail > self->head) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
403 - /* XXX: ${config.tx_ring_size} */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
404 - return 256 - (self->tail - self->head); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
405 - return self->head - self->tail; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
406 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
407 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
408 - static int rtx_e1000_tx_ring_tso_cksum_offload(${e1000::TxRing.ref} self, ${Socket::SKBuff.ref} skb) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
409 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
410 - ${Socket::AbstractSKBuff.ref} k_skb = skb->skbuff; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
411 - return skb_is_gso(${local.k_skb.k_sk_buff}) || ${local.k_skb.k_sk_buff}->ip_summed == CHECKSUM_PARTIAL; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
412 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
413 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
414 - static void rtx_e1000_tx_ring_put(${e1000::TxRing.ref} self, ${Socket::SKBuff.ref} skb) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
415 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
416 - WARN_ON(!skb); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
417 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
418 - /* |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
419 - * Mark it as the last buffer (EOP) and ask the card to |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
420 - * insert the Ethernet FCS (Frame Check Sequence). |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
421 - * |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
422 - * XXX: it sucks to use skb_headlen() here (this part of the |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
423 - * code shouldn't be aware of it and use something more |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
424 - * abstract. |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
425 - */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
426 - ${Socket::AbstractSKBuff.ref} k_skb = skb->skbuff; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
427 - ${e1000::TxDescriptor.ref} tx_desc = &self->base[self->tail]; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
428 - tx_desc->lower.data = cpu_to_le32( |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
429 - E1000_TXD_CMD_EOP | |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
430 - E1000_TXD_CMD_IFCS | |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
431 - E1000_TXD_CMD_RS | |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
432 - skb_headlen(${local.k_skb.k_sk_buff})); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
433 - tx_desc->upper.data = 0; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
434 - tx_desc->buff_addr = cpu_to_le64(${local.skb.dma_handle.k_dma_handle}); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
435 - memcpy(&self->skbuffs[self->tail], ${local.k_skb.k_sk_buff}, sizeof(*${local.k_skb.k_sk_buff})); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
436 - self->tail = (self->tail + 1) % ${config.tx_ring_size}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
437 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
438 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
439 - /* FIXME: See issue #54 */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
440 - static void rtx_e1000_tx_ring_start_xmit(${e1000::TxRing.ref} self, /*const*/ ${e1000::Context.ref} hw_ctx) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
441 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
442 - pr_info("%s: start_xmit: moving tail to %d/%d", ${config.name}, self->tail, ${config.tx_ring_size}); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
443 - rtx_e1000_register_write32(hw_ctx, E1000_TDT, self->tail); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
444 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
445 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
446 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
447 - chunk Ethernet::adapter_init_tx(Ethernet::Device rtx_ether_ctx) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
448 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
449 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
450 - ${e1000::Context.ref} hw_ctx = &${rtx_ether_ctx}->hw_ctx; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
451 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
452 - /* |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
453 - * Transmission initialization (section 14.5): |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
454 - * |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
455 - * 1. Allocate the transmit descriptors ring and map it to make it |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
456 - * accessible by the device; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
457 - * 2. Write the start address of the ring in TDBAL/TDBAH and set |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
458 - * TDLEN to the size of the ring; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
459 - * 3. Set the TDH/TDT indexes to the beginning and end of the ring; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
460 - * 4. Set TCTL.PSP to pad short packets and TCTL.EN to enable the |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
461 - * transmitter. |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
462 - */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
463 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
464 - /* 1. Allocate the tx ring */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
465 - hw_ctx->tx_ring.size = ${config.tx_ring_size} * sizeof(*hw_ctx->tx_ring.base); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
466 - hw_ctx->tx_ring.size = ALIGN(hw_ctx->tx_ring.size, 4096); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
467 - hw_ctx->tx_ring.base = dma_alloc_coherent( |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
468 - ${rtx_ether_ctx.device}, |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
469 - hw_ctx->tx_ring.size, |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
470 - &hw_ctx->tx_ring.dma_base, |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
471 - GFP_KERNEL); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
472 - if (!hw_ctx->rx_ring.base) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
473 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
474 - ${Log::info("adapter_init_tx: cannot allocate the descriptors for the tx ring")}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
475 - /* |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
476 - * XXX: If there is something else to rollback in the enclosing |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
477 - * function, this won't be done. |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
478 - */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
479 - return -ENOMEM; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
480 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
481 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
482 - ${Log::info("adapter_init_tx: tx descriptors allocated")}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
483 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
484 - /* 2. Save the emplacement and the size of the ring in TDBA/TDLEN */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
485 - rtx_e1000_register_write32(hw_ctx, E1000_TDBAL, hw_ctx->tx_ring.dma_base & 0xffffffff); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
486 - rtx_e1000_register_write32(hw_ctx, E1000_TDBAH, hw_ctx->tx_ring.dma_base >> 32); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
487 - rtx_e1000_register_write32(hw_ctx, E1000_TDLEN, hw_ctx->tx_ring.size); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
488 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
489 - /* 3. Setup TDH/TDT to zero: the queue is empty */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
490 - rtx_e1000_register_write32(hw_ctx, E1000_TDH, 0); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
491 - rtx_e1000_register_write32(hw_ctx, E1000_TDT, 0); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
492 - hw_ctx->tx_ring.head = 0; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
493 - hw_ctx->tx_ring.tail = 0; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
494 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
495 - /* 4. Set TCTL.PSP and enable the transmitter */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
496 - rtx_e1000_register_set32(hw_ctx, E1000_TCTL, E1000_TCTL_PSP|E1000_TCTL_EN); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
497 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
498 - ${Log::info("adapter_init_tx: transmit registers configured and transmitter enabled")}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
499 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
500 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
501 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
502 - method clean() |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
503 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
504 - rtx_e1000_tx_ring_clean(${self}); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
505 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
506 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
507 - method descriptors_remaining() |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
508 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
509 - rtx_e1000_tx_ring_descriptors_remaining(${self}); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
510 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
511 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
512 - method tso_cksum_offload(Socket::SKBuff skb) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
513 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
514 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
515 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
516 - method put(Socket::SKBuff skb) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
517 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
518 - rtx_e1000_tx_ring_put(${self}, &${skb}); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
519 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
520 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
521 - method start_xmit(e1000::Context ctx) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
522 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
523 - rtx_e1000_tx_ring_start_xmit(${self}, ${ctx}); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
524 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
525 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
526 - method init() |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
527 - { |
133 | 528 - } |
529 - | |
530 - map | |
531 - { | |
532 - } | |
533 - } | |
534 - | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
535 - template type e1000::Context() |
133 | 536 - { |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
537 - decl data_types() |
133 | 538 - { |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
539 - int bars; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
540 - unsigned char /* __iomem */ *ioaddr; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
541 - ${e1000::RxRing.scalar} rx_ring; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
542 - ${e1000::TxRing.scalar} tx_ring; |
133 | 543 - } |
544 - | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
545 - chunk Ethernet::HardwareContext() |
133 | 546 - { |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
547 - /* |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
548 - * Force the generation of the structure in the "headers" part, we |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
549 - * have to do this since we do not use the structure in this blt |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
550 - * (we hacked a bit and used it in ethernet.blt directly). |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
551 - */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
552 - ${e1000::Context} hw_ctx; |
133 | 553 - } |
554 - | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
555 - chunk Ethernet::adapter_init_context(Ethernet::Device rtx_ether_ctx, |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
556 - Builtin::number bars, |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
557 - Builtin::symbol ioaddr) |
133 | 558 - { |
559 - { | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
560 - ${e1000::Context.ref} hw_ctx = &${rtx_ether_ctx}->hw_ctx; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
561 - hw_ctx->bars = ${bars}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
562 - hw_ctx->ioaddr = ${ioaddr}; |
133 | 563 - } |
564 - } | |
565 - | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
566 - chunk Ethernet::adapter_reset(Ethernet::Device rtx_ether_ctx) |
133 | 567 - { |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
568 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
569 - /* XXX Naming this variable 'hw_ctx' kicks the decl out of the generated code */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
570 - ${e1000::Context.ref} tmp_hw_ctx = &${rtx_ether_ctx}->hw_ctx; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
571 - rtx_e1000_register_write32(tmp_hw_ctx, E1000_CTRL, E1000_CMD_RST); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
572 - udelay(10); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
573 - } |
133 | 574 - } |
575 - | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
576 - chunk Ethernet::adapter_load_mac_address(Ethernet::Device rtx_ether_ctx) |
133 | 577 - { |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
578 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
579 - ${e1000::Context.ref} hw_ctx = &${rtx_ether_ctx}->hw_ctx; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
580 - /* Shamelessly borrowed from Minix */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
581 - for (int i = 0; i < 3; ++i) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
582 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
583 - rtx_e1000_register_write32(hw_ctx, E1000_EEPROM_READ, (i << 8) | 1); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
584 - int value; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
585 - do |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
586 - value = rtx_e1000_register_read32(hw_ctx, E1000_EEPROM_READ); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
587 - while ((value & (1 << 4)) == 0); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
588 - value >>= 16; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
589 - /* |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
590 - * NOTE: I'm not sure if Ethernet::Device should be |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
591 - * accessed directly here. But since we need to take it in |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
592 - * parameter (so we can get back our e1000::Context) it |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
593 - * seems inadequate to set this in another way: |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
594 - */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
595 - ${rtx_ether_ctx.dev_addr}[i * 2] = value & 0xff; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
596 - ${rtx_ether_ctx.dev_addr}[i * 2 + 1] = (value >> 8) & 0xff; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
597 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
598 - ${Log::info("e1000::create: mac address loaded from the EEPROM")}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
599 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
600 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
601 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
602 - chunk Ethernet::adapter_setup(Ethernet::Device rtx_ether_ctx) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
603 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
604 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
605 - ${e1000::Context.ref} hw_ctx = &${rtx_ether_ctx}->hw_ctx; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
606 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
607 - /* |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
608 - * "General Configuration" (section 14.3): |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
609 - * |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
610 - * - CTRL.ASDE/CTRL.SLU: Let the PHY handle the speed detection & |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
611 - * negociation; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
612 - * - CTRL.LRST/FRCSPD: Unset them to initiate the auto-negociation; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
613 - * - CTRL.PHY_RST: Unset it; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
614 - * - CTRL.ILOS: Unset it (ILOS is Invert Loss Of Signal); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
615 - * - CTRL.VME: Make sure it's not set to disable VLAN support; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
616 - * - Set the control flow registers to 0; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
617 - * - Finally, initialize all the statistic registers from |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
618 - * E1000_CRCERRS to E1000_TSCTFC. |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
619 - */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
620 - rtx_e1000_register_set32(hw_ctx, E1000_CTRL, |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
621 - E1000_CMD_ASDE | |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
622 - E1000_CMD_SLU); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
623 - rtx_e1000_register_unset32(hw_ctx, E1000_CTRL, |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
624 - E1000_CMD_LRST | |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
625 - E1000_CMD_FRCSPD | |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
626 - E1000_CMD_PHY_RST | |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
627 - E1000_CMD_ILOS | |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
628 - E1000_CMD_VME); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
629 - rtx_e1000_register_write32(hw_ctx, E1000_FCAH, 0); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
630 - rtx_e1000_register_write32(hw_ctx, E1000_FCAL, 0); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
631 - rtx_e1000_register_write32(hw_ctx, E1000_FCT, 0); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
632 - rtx_e1000_register_write32(hw_ctx, E1000_FCTTV, 0); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
633 - /* |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
634 - * XXX: Using int i clashes with another int i from the |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
635 - * "parent" chunk: |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
636 - */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
637 - for (int j = 0; j != 64; ++j) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
638 - rtx_e1000_register_write32(hw_ctx, E1000_CRCERRS + j * 4, 0); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
639 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
640 - ${Log::info("adapter_setup: general configuration done")}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
641 - } |
133 | 642 - } |
643 - | |
644 - map | |
645 - { | |
646 - rx_ring: ((${self})->rx_ring); | |
647 - //tx_ring: ((${self})->tx_ring); XXX Circular dep with Context | |
648 - } | |
649 - } | |
650 - | |
651 - template type e1000::Register() | |
652 - { | |
653 - decl data_types() | |
654 + decl data_types() | |
655 { | |
656 E1000_CTRL = 0x00000, /* Device Control - RW */ | |
657 E1000_CTRL_DUP = 0x00004, /* Device Control Duplicate (Shadow) - RW */ | |
658 @@ -593,19 +37,14 @@ | |
659 E1000_TDT = 0x03818, /* Transmit Descriptor Tail */ | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
660 } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
661 |
133 | 662 - method init(Builtin::number value) |
663 - { | |
664 - ${self} = ${value}; | |
665 - } | |
666 - | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
667 map |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
668 { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
669 } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
670 } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
671 |
133 | 672 - template type e1000::Commands() |
673 + template type e1000::Command() | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
674 { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
675 - decl data_types() |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
676 + decl data_types() |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
677 { |
133 | 678 E1000_CMD_FD = 0x00000001, /* Full duplex.0=half; 1=full */ |
679 E1000_CMD_BEM = 0x00000002, /* Endian Mode.0=little,1=big */ | |
680 @@ -670,9 +109,9 @@ | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
681 } |
133 | 682 } |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
683 |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
684 - template type e1000::TxDescriptorFlags() |
133 | 685 + template type e1000::TxDescriptorFlag() |
686 { | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
687 - decl data_types() |
133 | 688 + decl data_types() |
689 { | |
690 E1000_TXD_DTYP_D = 0x00100000, /* Data Descriptor */ | |
691 E1000_TXD_DTYP_C = 0x00000000, /* Context Descriptor */ | |
137
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
692 @@ -701,326 +140,701 @@ |
133 | 693 } |
694 } | |
695 | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
696 - /* TODO: make that a method of e1000::Context */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
697 - template sequence e1000::print_status(Ethernet::Device rtx_ether_ctx) |
133 | 698 + template type e1000::RxDescriptor() |
699 { | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
700 - chunk LKM::prototypes() |
133 | 701 + decl data_types() |
702 + { | |
703 + __le64 buff_addr; | |
704 + __le16 length; | |
705 + __le16 csum; | |
706 + unsigned char status; | |
707 + unsigned char errors; | |
708 + __le16 special; | |
709 + } | |
710 + | |
711 + map | |
712 + { | |
713 + } | |
714 + } | |
715 + | |
716 + // This is a generic tx descriptor for the e1000. When you use TCP | |
717 + // Segmentation Offload (TSO) the hardware actually uses two types of | |
718 + // tx descriptors in its tx ring: | |
719 + // - context descriptors: this descriptor doesn't actually point to data to | |
720 + // send but initialize the offloading engine for the data descriptor that | |
721 + // follow; | |
722 + // - data descriptors: this descriptor points to data from the skbuffs. | |
723 + template type e1000::TxDescriptor() | |
724 + { | |
725 + decl data_types() | |
726 + { | |
727 + __le64 buff_addr; | |
728 + union { | |
729 + __le32 data; | |
730 + struct { | |
731 + __le16 length; | |
732 + unsigned char csum_offset; /* CSO */ | |
733 + unsigned char cmd; | |
734 + } fields; | |
735 + } lower; | |
736 + union { | |
737 + __le32 data; | |
738 + struct { | |
739 + unsigned char status; | |
740 + unsigned char csum_start; /* CSS */ | |
741 + __le16 special; | |
742 + } fields; | |
743 + } upper; | |
744 + } | |
745 + | |
746 + map | |
747 + { | |
748 + } | |
749 + } | |
750 + | |
751 + template type e1000::Buffer() | |
752 + { | |
753 + decl data_types() | |
754 + { | |
755 + ${Socket::SKBuff} sk_buff; | |
756 + ${DMA::DMAHandle} dma; | |
757 + } | |
758 + | |
759 + method init(Socket::SKBuff sk_buff, DMA::DMAHandle dma) | |
760 + { | |
761 + ${self.sk_buff} = ${sk_buff}; | |
762 + ${self.dma} = ${dma}; | |
763 + } | |
764 + | |
765 + map | |
766 + { | |
767 + sk_buff: ${self}->sk_buff; | |
768 + dma: ${self}->dma; | |
769 + } | |
770 + } | |
771 + | |
772 + template type e1000::Context() | |
773 + { | |
774 + decl data_types() | |
775 + { | |
134 | 776 + ${Ethernet::Device.ref} net_dev; |
777 + // XXX should be annoted with __iomem: | |
778 + unsigned char *io_addr; | |
133 | 779 + // XXX Forced to hardcode the type because there is a circular |
780 + // dependency between the rings and the context. | |
136 | 781 + rtxType_e1000_TxRing tx_ring; |
782 + rtxType_e1000_RxRing rx_ring; | |
133 | 783 + } |
784 + | |
785 + chunk LKM::includes() | |
786 + { | |
787 + #include <linux/types.h> | |
788 + } | |
789 + | |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
790 + chunk LKM::prototypes() |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
791 { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
792 static void rtx_e1000_print_status(${e1000::Context.ref}); |
133 | 793 + |
794 + // XXX Needed until we can call methods (issue #46): | |
795 + static unsigned int rtx_e1000_reg_read32(${e1000::Context}, ${e1000::Register}); | |
796 + static void rtx_e1000_reg_write32(${e1000::Context}, ${e1000::Register}, unsigned int); | |
797 + static void rtx_e1000_reg_set32(${e1000::Context}, ${e1000::Register}, unsigned int); | |
798 + static void rtx_e1000_reg_unset32(${e1000::Context}, ${e1000::Register}, unsigned int); | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
799 } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
800 |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
801 - chunk LKM::code() |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
802 + chunk LKM::code() |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
803 { |
133 | 804 - static void rtx_e1000_print_status(${e1000::Context.ref} hw_ctx) |
805 + static void rtx_e1000_print_status(${e1000::Context.ref} self) | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
806 { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
807 - unsigned int status = rtx_e1000_register_read32(hw_ctx, E1000_STATUS); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
808 - ${Log::info("card status:")}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
809 - /* |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
810 - * we can't use Log::info below because it just accept a string |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
811 - * (as opposed to a format string with its parameters). |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
812 - */ |
133 | 813 + unsigned int status = rtx_e1000_reg_read32(${local.self}, E1000_STATUS); |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
814 + ${Log::info("card status:")}; |
133 | 815 + // XXX We can't use Log::info below because it just accepts a |
816 + // string (as opposed to a format string with its arguments): | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
817 pr_info("\tRegister value: 0x%x\n", status); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
818 pr_info("\tMode: %s\n", (status & 1) ? "Full": "Half"); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
819 pr_info("\tLink: %s\n", (status & 2) ? "Up" : "Down"); |
133 | 820 pr_info("\tTransmission: %s\n", (status & 4) ? "Paused" : "Ok"); |
821 pr_info("\tInterface: %s\n", (status & 3) == 3 ? "Up" : "Down"); | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
822 } |
133 | 823 + |
824 + static unsigned int rtx_e1000_reg_read32(${e1000::Context} self, ${e1000::Register} reg) | |
825 + { | |
137
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
826 + // XXX The compiler adds a & if I use ${local.self.io_addr}: |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
827 + return ioread32(self->io_addr + reg); |
133 | 828 + } |
829 + | |
830 + static void rtx_e1000_reg_write32(${e1000::Context} self, | |
831 + ${e1000::Register} reg, | |
832 + unsigned int value) | |
833 + { | |
137
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
834 + return iowrite32(value, self->io_addr + reg); |
133 | 835 + } |
836 + | |
837 + static void rtx_e1000_reg_set32(${e1000::Context} self, | |
838 + ${e1000::Register} reg, | |
839 + unsigned int value) | |
840 + { | |
841 + return iowrite32( | |
842 + rtx_e1000_reg_read32(${local.self}, reg) | value, | |
137
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
843 + self->io_addr + reg |
133 | 844 + ); |
845 + } | |
846 + | |
847 + static void rtx_e1000_reg_unset32(${e1000::Context} self, | |
848 + ${e1000::Register} reg, | |
849 + unsigned int value) | |
850 + { | |
851 + return iowrite32(rtx_e1000_reg_read32( | |
852 + ${local.self}, reg) & ~value, | |
137
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
853 + self->io_addr + reg |
133 | 854 + ); |
855 + } | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
856 } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
857 |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
858 - chunk ::CALL() |
134 | 859 + method init(Ethernet::Device rtx_ether_ctx, Builtin::symbol io_addr) |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
860 { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
861 - rtx_e1000_print_status(&${rtx_ether_ctx}->hw_ctx); |
134 | 862 + ${self.net_dev} = ${rtx_ether_ctx}; |
133 | 863 + ${self.io_addr} = ${io_addr}; |
864 + } | |
865 + | |
866 + method reg_read32(e1000::Register reg) | |
867 + { | |
868 + ioread32(${self.io_addr} + ${local.reg}); | |
869 + } | |
870 + | |
871 + method reg_write32(e1000::Register reg, Builtin::number value) | |
872 + { | |
873 + iowrite32(${value}, ${self.io_addr} + ${reg}); | |
874 + } | |
875 + | |
876 + method reg_set32(e1000::Register reg, Builtin::number value) | |
877 + { | |
878 + iowrite32(ioread32(${self.io_addr} + ${reg}) | ${value}, ${self.io_addr} + ${reg}); | |
879 + } | |
880 + | |
881 + method reg_unset32(e1000::Register reg, Builtin::number value) | |
882 + { | |
883 + iowrite32(ioread32(${self.io_addr} + ${reg}) & ~${value}, ${self.io_addr} + ${reg}); | |
884 + } | |
885 + | |
886 + chunk Ethernet::HardwareContext() | |
887 + { | |
888 + ${e1000::Context} hw_ctx; | |
889 + } | |
890 + | |
891 + chunk Ethernet::adapter_init_context(Ethernet::Device rtx_ether_ctx, Builtin::symbol io_addr) | |
892 + { | |
893 + { | |
135
9c6ae3a2e180
Wip, fixes + workarounds
Louis Opter <kalessin@kalessin.fr>
parents:
134
diff
changeset
|
894 + ${e1000::Context.ref} hw_ctx = &${rtx_ether_ctx}->hw_ctx; |
9c6ae3a2e180
Wip, fixes + workarounds
Louis Opter <kalessin@kalessin.fr>
parents:
134
diff
changeset
|
895 + // XXX doesn't work: ${local.hw_ctx.init(rtx_ether_ctx, io_addr)}; |
9c6ae3a2e180
Wip, fixes + workarounds
Louis Opter <kalessin@kalessin.fr>
parents:
134
diff
changeset
|
896 + ${local.hw_ctx.net_dev} = ${rtx_ether_ctx}; |
9c6ae3a2e180
Wip, fixes + workarounds
Louis Opter <kalessin@kalessin.fr>
parents:
134
diff
changeset
|
897 + ${local.hw_ctx.io_addr} = ${io_addr}; |
136 | 898 + // XXX doesn't work: ${local.hw_ctx.rx_ring.init(local.hw_ctx, config.rx_ring_size)}; |
899 + rtx_e1000_ring_init( | |
900 + &${local.hw_ctx.rx_ring}, | |
901 + ${config.rx_ring_size}, | |
902 + sizeof(rtxType_e1000_RxDescriptor) | |
903 + ); | |
904 + // XXX doesn't work: ${local.hw_ctx.tx_ring.init(local.hw_ctx, config.tx_ring_size)}; | |
905 + rtx_e1000_ring_init( | |
906 + &${local.hw_ctx.tx_ring}, | |
907 + ${config.tx_ring_size}, | |
908 + sizeof(rtxType_e1000_TxDescriptor) | |
909 + ); | |
133 | 910 + } |
911 + } | |
912 + | |
913 + chunk Ethernet::adapter_reset(Ethernet::Device rtx_ether_ctx) | |
914 + { | |
915 + { | |
135
9c6ae3a2e180
Wip, fixes + workarounds
Louis Opter <kalessin@kalessin.fr>
parents:
134
diff
changeset
|
916 + ${e1000::Context.ref} hw_ctx = &${rtx_ether_ctx}->hw_ctx; |
133 | 917 + // XXX #46: ${local.hw_ctx.io.write32(E1000_CTRL, E1000_CMD_RST)}; |
918 + rtx_e1000_reg_write32(hw_ctx, E1000_CTRL, E1000_CMD_RST); | |
919 + udelay(10); // TODO: abstract udelay too... | |
920 + ${Log::info("adapter has been reset")}; | |
921 + } | |
922 + } | |
923 + | |
924 + chunk Ethernet::adapter_load_mac_address(Ethernet::Device rtx_ether_ctx) | |
925 + { | |
926 + { | |
135
9c6ae3a2e180
Wip, fixes + workarounds
Louis Opter <kalessin@kalessin.fr>
parents:
134
diff
changeset
|
927 + ${e1000::Context.ref} hw_ctx = &${rtx_ether_ctx}->hw_ctx; |
133 | 928 + // Shamelessly borrowed from Minix |
929 + for (int i = 0; i < 3; ++i) { | |
930 + rtx_e1000_reg_write32(hw_ctx, E1000_EEPROM_READ, (i << 8) | 1); | |
931 + int value; | |
932 + do { | |
933 + value = rtx_e1000_reg_read32(hw_ctx, E1000_EEPROM_READ); | |
934 + } while ((value & (1 << 4)) == 0); | |
935 + value >>= 16; | |
936 + // NOTE: I'm not sure if Ethernet::Device should be | |
937 + // accessed directly here. But since we need to take it in | |
938 + // parameter (so we can get back our e1000::Context) it | |
939 + // seems inadequate to set this in another way: | |
135
9c6ae3a2e180
Wip, fixes + workarounds
Louis Opter <kalessin@kalessin.fr>
parents:
134
diff
changeset
|
940 + ${rtx_ether_ctx.dev_addr}[i * 2] = value & 0xff; |
9c6ae3a2e180
Wip, fixes + workarounds
Louis Opter <kalessin@kalessin.fr>
parents:
134
diff
changeset
|
941 + ${rtx_ether_ctx.dev_addr}[i * 2 + 1] = (value >> 8) & 0xff; |
133 | 942 + } |
943 + | |
944 + ${Log::info("mac address loaded from the EEPROM")}; | |
945 + } | |
946 + } | |
947 + | |
948 + // For e1000, this part is documented in the Intel Gigabit Ethernet | |
949 + // Controller Software Developper manual. (You can find it in the | |
950 + // doc/hardware directory). | |
951 + chunk Ethernet::adapter_setup_rx_tx(Ethernet::Device rtx_ether_ctx) | |
952 + { | |
953 + { | |
135
9c6ae3a2e180
Wip, fixes + workarounds
Louis Opter <kalessin@kalessin.fr>
parents:
134
diff
changeset
|
954 + ${e1000::Context.ref} hw_ctx = &${rtx_ether_ctx}->hw_ctx; |
133 | 955 + |
956 + // "General Configuration" (section 14.3): | |
957 + // | |
958 + // - CTRL.ASDE/CTRL.SLU: Let the PHY handle the speed detection & | |
959 + // negociation; | |
960 + // - CTRL.LRST/FRCSPD: Unset them to initiate the auto-negociation; | |
961 + // - CTRL.PHY_RST: Unset it; | |
962 + // - CTRL.ILOS: Unset it (ILOS is Invert Loss Of Signal); | |
963 + // - CTRL.VME: Make sure it's not set to disable VLAN support; | |
964 + // - Set the control flow registers to 0; | |
965 + // - Finally, initialize all the statistic registers from | |
966 + // E1000_CRCERRS to E1000_TSCTFC. | |
967 + | |
968 + // XXX #46: Use the read/write/set/unset methods on Context | |
969 + rtx_e1000_reg_set32(hw_ctx, E1000_CTRL, E1000_CMD_ASDE|E1000_CMD_SLU); | |
970 + rtx_e1000_reg_unset32( | |
971 + hw_ctx, | |
972 + E1000_CTRL, | |
973 + E1000_CMD_LRST|E1000_CMD_FRCSPD|E1000_CMD_PHY_RST| | |
974 + E1000_CMD_ILOS|E1000_CMD_VME | |
975 + ); | |
976 + rtx_e1000_reg_write32(hw_ctx, E1000_FCAH, 0); | |
977 + rtx_e1000_reg_write32(hw_ctx, E1000_FCAL, 0); | |
978 + rtx_e1000_reg_write32(hw_ctx, E1000_FCT, 0); | |
979 + rtx_e1000_reg_write32(hw_ctx, E1000_FCTTV, 0); | |
136 | 980 + // XXX int i leaks from another chunk and will not be generated |
981 + // here, let's use a different index name: | |
982 + for (int j = 0; j != 64; ++j) | |
983 + rtx_e1000_reg_write32(hw_ctx, E1000_CRCERRS + j * 4, 0); | |
133 | 984 + |
985 + ${Log::info("adapter_setup_rx_tx: general configuration done")}; | |
986 + | |
987 + int err; | |
988 + | |
989 + err = rtx_e1000_rx_ring_alloc_resources(&hw_ctx->rx_ring); | |
990 + if (err) | |
991 + goto err_alloc_rx_ring; | |
992 + rtx_e1000_rx_ring_configure(&hw_ctx->rx_ring); | |
993 + | |
994 + err = rtx_e1000_tx_ring_alloc_resources(&hw_ctx->tx_ring); | |
995 + if (err) | |
996 + goto err_alloc_tx_ring; | |
997 + rtx_e1000_tx_ring_configure(&hw_ctx->tx_ring); | |
998 + | |
999 + err_alloc_tx_ring: | |
1000 + rtx_e1000_rx_ring_free_resources(&hw_ctx->rx_ring); | |
1001 + err_alloc_rx_ring: | |
1002 + // XXX Can't return here since we don't know the context. | |
1003 + // TODO: hardcode a goto | |
1004 + (void)1; | |
1005 + } | |
1006 + } | |
1007 + | |
136 | 1008 + chunk Ethernet::adapter_enable_interrupts(Ethernet::Device rtx_ether_ctx) |
133 | 1009 + { |
1010 + { | |
135
9c6ae3a2e180
Wip, fixes + workarounds
Louis Opter <kalessin@kalessin.fr>
parents:
134
diff
changeset
|
1011 + ${e1000::Context.ref} hw_ctx = &${rtx_ether_ctx}->hw_ctx; |
133 | 1012 + rtx_e1000_reg_write32( |
1013 + hw_ctx, | |
1014 + E1000_IMS, | |
1015 + E1000_INTR_TXDW|E1000_INTR_TXQE|E1000_INTR_LSC| | |
1016 + E1000_INTR_RXO|E1000_INTR_RXT0 | |
1017 + ); | |
1018 + | |
1019 + // XXX We should probably move that elsewhere (it just used to | |
1020 + // be done right after we enabled interrupts when this was | |
1021 + // still in lkm.rtx): | |
1022 + // XXX #46: ${local.hw_ctx.print_status()}; | |
1023 + rtx_e1000_print_status(hw_ctx); | |
1024 + } | |
1025 + } | |
1026 + | |
134 | 1027 + chunk Ethernet::adapter_disable_interrupts(Ethernet::Device rtx_ether_ctx) |
133 | 1028 + { |
1029 + { ${Log::info("adapter_disable_interrupts: TBD...")}; } | |
1030 + } | |
1031 + | |
1032 + chunk Ethernet::adapter_handle_interrupt(Ethernet::Device rtx_ether_ctx) | |
1033 + { | |
1034 + { | |
135
9c6ae3a2e180
Wip, fixes + workarounds
Louis Opter <kalessin@kalessin.fr>
parents:
134
diff
changeset
|
1035 + ${e1000::Context.ref} hw_ctx = &${rtx_ether_ctx}->hw_ctx; |
133 | 1036 + unsigned int icr = rtx_e1000_reg_read32(hw_ctx, E1000_ICR); |
1037 + pr_info("%s: interrupt received, ICR: 0x%x", ${config.name}, icr); | |
1038 + if (icr) { | |
1039 + if (icr & E1000_INTR_LSC) { | |
1040 + ${Log::info("handle_interrupt: cable link status changed, dumping card status:")}; | |
1041 + // XXX #46: ${local.hw_ctx.print_status()}; | |
1042 + rtx_e1000_print_status(hw_ctx); | |
1043 + } | |
1044 + if (icr & (E1000_INTR_TXQE|E1000_INTR_TXDW)) { | |
1045 + ${Log::info("handle_interrupt: TxRing: packet(s) sent")}; | |
1046 + } | |
1047 + if (icr & E1000_INTR_RXT0) { | |
1048 + ${Log::info("handle_interrupt: RxRing: packet(s) received")}; | |
1049 + } | |
1050 + if (icr & E1000_INTR_RXO) { | |
1051 + ${Log::info("handle_interrupt: RxRing: overrun")}; | |
1052 + } | |
1053 + | |
1054 + // XXX: This sucks since we don't know the pointcut context: | |
1055 + return IRQ_HANDLED; | |
1056 + } | |
1057 + } | |
1058 + } | |
1059 + | |
1060 + chunk Ethernet::adapter_xmit(Ethernet::Device rtx_ether_ctx, Socket::SKBuff rtx_skb) | |
1061 + { | |
1062 + { ${Log::info("adapter_xmit: TBD...")}; } | |
1063 + } | |
1064 + | |
1065 + chunk Ethernet::adapter_disable_rx(Ethernet::Device rtx_ether_ctx) | |
1066 + { | |
1067 + { ${Log::info("adapter_disable_rx: TBD..")}; } | |
1068 + } | |
1069 + | |
134 | 1070 + chunk Ethernet::adapter_disable_tx(Ethernet::Device rtx_ether_ctx) |
133 | 1071 + { |
1072 + { ${Log::info("adapter_disable_tx: TBD..")}; } | |
1073 + } | |
1074 + | |
1075 + chunk Ethernet::adapter_free_rx_tx(Ethernet::Device rtx_ether_ctx) | |
1076 + { | |
1077 + { ${Log::info("adapter_free_rx_tx: TBD..")}; } | |
1078 + } | |
1079 + | |
1080 + method print_status() | |
1081 + { | |
1082 + rtx_e1000_print_status(${self}); | |
1083 + } | |
1084 + | |
1085 + map | |
1086 + { | |
136 | 1087 + io_addr: ${self}->io_addr; |
133 | 1088 + rx_ring: ${self}->rx_ring; |
1089 + tx_ring: ${self}->tx_ring; | |
134 | 1090 + net_dev: ${self}->net_dev; |
133 | 1091 } |
1092 } | |
1093 | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1094 - /* |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1095 - * We should have been able to do something along those lines, but |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1096 - * it didn't work so we made the call manually. |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1097 - * |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1098 - * Ideally: |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1099 - * ${e1000::register_read32(rtx_ether_ctx->hw_ctx, E1000_STATUS)}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1100 - * |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1101 - * Ideally2, not sure about the syntax on the register parameter: |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1102 - * ${e1000::register_read32(rtx_ether_ctx->hw_ctx, ${e1000::Register.E1000_STATUS})}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1103 - * |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1104 - * "Acceptable": |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1105 - * ${e1000::Register} reg_status; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1106 - * ${e1000.init(E1000_STATUS); // didn't work, so we used the next line |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1107 - * reg_status = E1000_STATUS; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1108 - * ${e1000::register_read32(rtx_ether_ctx->hw_ctx, reg_status)}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1109 - * |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1110 - * TODO: make them methods of e1000::Context |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1111 - */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1112 - template sequence e1000::register_read32(e1000::Context ctx, e1000::Register reg_offset) |
133 | 1113 + template type e1000::Ring() |
1114 { | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1115 - chunk LKM::prototypes() |
133 | 1116 + decl data_types() |
1117 { | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1118 - /* FIXME: See issue #54 */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1119 - static unsigned int rtx_e1000_register_read32(/*const*/ ${e1000::Context.ref}, unsigned int); |
133 | 1120 + ${e1000::Context} hw_ctx; |
1121 + ${DMA::DMAHandle} dma; | |
1122 + unsigned int size; | |
1123 + ${Builtin::symbol.ref} descs; | |
1124 + ${e1000::Buffer.ref} buffs; | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1125 } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1126 |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1127 - chunk LKM::code() |
133 | 1128 + chunk LKM::prototypes() |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1129 { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1130 - /* FIXME: See issue #54 */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1131 - static unsigned int rtx_e1000_register_read32(/*const*/ ${e1000::Context.ref} ctx, unsigned int reg_offset) |
133 | 1132 + static void rtx_e1000_ring_init(${e1000::Ring.ref}, ${e1000::Context}, int, int); |
1133 + } | |
1134 + | |
1135 + chunk LKM::code() | |
1136 + { | |
1137 + static void rtx_e1000_ring_init(${e1000::Ring.ref} self, ${e1000::Context} hw_ctx, | |
1138 + int desc_count, int desc_size) | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1139 { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1140 - return ioread32(ctx->ioaddr + reg_offset); |
133 | 1141 + BUG_ON(desc_count <= 0 || desc_size <= 0); |
1142 + memset(self, 0, sizeof(*self)); | |
1143 + self->size = ALIGN(desc_count * desc_size, 4096); | |
1144 + self->hw_ctx = hw_ctx; | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1145 } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1146 } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1147 |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1148 - chunk ::CALL() |
133 | 1149 + method init(e1000::Context hw_ctx, Builtin::number desc_count, Builtin::number desc_size) |
1150 { | |
1151 - rtx_e1000_register_read32(${ctx}, ${reg_offset}); | |
1152 + rtx_e1000_ring_init(&${self}, ${hw_ctx}, ${desc_count}, ${desc_size}); | |
1153 + } | |
1154 + | |
1155 + map | |
1156 + { | |
1157 + hw_ctx: ${self}->hw_ctx; | |
1158 + dma: ${self}->dma; | |
1159 + size: ${self}->size; | |
1160 + descs: ${self}->descs; | |
1161 + buffs: ${self}->buffs; | |
1162 } | |
1163 } | |
1164 | |
1165 - template sequence e1000::register_write32(e1000::Context ctx, e1000::Register reg_offset, ::number value) | |
1166 + template type e1000::RxRing() | |
1167 { | |
1168 - chunk LKM::prototypes() | |
1169 + decl data_types() | |
1170 { | |
1171 - /* FIXME: See issue #54 */ | |
1172 - static void rtx_e1000_register_write32(/*const*/ ${e1000::Context.ref}, unsigned int, unsigned int); | |
1173 + ${e1000::Ring} ring; | |
1174 } | |
1175 | |
1176 - chunk LKM::code() | |
1177 + chunk LKM::prototypes() | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1178 { |
133 | 1179 - /* FIXME: See issue #54 */ |
1180 - static void rtx_e1000_register_write32(/*const*/ ${e1000::Context.ref} ctx, unsigned int reg_offset, unsigned int value) | |
1181 + static int rtx_e1000_rx_ring_alloc_resources(${e1000::RxRing.ref}); | |
134 | 1182 + static void rtx_e1000_rx_ring_free_resources(${e1000::RxRing.ref}); |
133 | 1183 + static void rtx_e1000_rx_ring_configure(${e1000::RxRing.ref}); |
1184 + } | |
1185 + | |
1186 + chunk LKM::code() | |
1187 + { | |
1188 + static int rtx_e1000_rx_ring_alloc_resources(${e1000::RxRing.ref} self) | |
1189 { | |
1190 - iowrite32(value, ctx->ioaddr + reg_offset); | |
1191 + // XXX Reread & Fix everything down there (data structure changes and so on) | |
1192 + | |
1193 + // 4. Setup the receive descriptor ring | |
1194 + | |
1195 + int i; | |
1196 + | |
1197 + // Allocate the descriptors | |
1198 + hw_ctx->rx_ring.base = ${DMA::alloc_coherent( | |
1199 + local.self.hw_ctx.net_dev.device, local.self.size, | |
1200 + local.self.dma.dma_handle | |
1201 + )}; | |
1202 + if (!hw_ctx->rx_ring.base) { | |
1203 + ${Log::info("adapter_init_rx: cannot allocate the descriptors for the rx ring")}; | |
1204 + goto err_rx_ring_alloc; | |
1205 + } | |
1206 + | |
1207 + ${Log::info("adapter_init_rx: rx descriptors allocated")}; | |
1208 + | |
1209 + // Allocate the skbuffs, map them for DMA, and write their address | |
1210 + // in the corresponding descriptor. | |
1211 +// for (i = 0; i != ${config.rx_ring_size}; ++i) { | |
1212 +// ${Socket::SKBuff.ref} skbuff = &hw_ctx->rx_ring.skbuffs[i]; | |
1213 +// // XXX #46: ${rtx_ether_ctx.alloc_rx_skbuff(local.skbuff, config.rx_buffer_len)}; | |
1214 +// if (rtx_ethernet_alloc_rx_skbuff(ocal.skbuff, ${config.rx_buffer_len})) { | |
1215 +// ${Log::info("adapter_init_rx: cannot allocate a skbuff for the rx ring")}; | |
1216 +// goto err_skbuffs_alloc; | |
1217 +// } | |
1218 +// /* TODO: recuperer le dma handle et le placer correctement dans le descripteur. */ | |
135
9c6ae3a2e180
Wip, fixes + workarounds
Louis Opter <kalessin@kalessin.fr>
parents:
134
diff
changeset
|
1219 +// ${DMA::map(rtx_ether_ctx.device, local.skbuff.data, local.skbuff.len, RTX_DMA_FROM_DEVICE)} |
9c6ae3a2e180
Wip, fixes + workarounds
Louis Opter <kalessin@kalessin.fr>
parents:
134
diff
changeset
|
1220 +// if (${DMA::map(rtx_ether_ctx.device, local.skbuff.data, local.skbuff.len, RTX_DMA_FROM_DEVICE)}) { |
133 | 1221 +// ${Log::info("adapter_init_rx: cannot dma-map a skbuff for the rx ring")}; |
1222 +// goto err_skbuffs_map; | |
1223 +// } | |
1224 +// hw_ctx->rx_ring.base[i].buff_addr = cpu_to_le64(${local.skbuff.sk_buff}); | |
1225 +// } | |
1226 + | |
1227 + // ${Log::info("adapter_init_rx: skbuffs allocated}; | |
1228 + pr_info("rtx_e1k: adapter_init_rx: skbuffs allocated, headlen=%d", skb_headlen((struct sk_buff *)hw_ctx->rx_ring.skbuffs[i - 1].skbuff)); | |
1229 + | |
1230 + err_skbuffs_alloc: | |
1231 + while (i--) { | |
134 | 1232 +// XXX ${DMA::unmap( |
1233 +// local.self.hw_ctx.net_dev.device, | |
1234 +// // XXX Leaking cast because of the array: (TODO: the data structure changed) | |
1235 +// *((dma_addr_t *)&(self->buffs[i].dma_handle)), | |
1236 +// config.rx_buffer_len, | |
1237 +// RTX_DMA_FROM_DEVICE | |
1238 +// )}; | |
133 | 1239 + err_skbuffs_map: |
1240 + // XXX leaking cast: (TODO: the data structure changed) | |
1241 + dev_kfree_skb((struct sk_buff *)hw_ctx->rx_ring.skbuffs[i].skbuff); | |
1242 + } | |
1243 + | |
136 | 1244 + void *descs = ${local.self.descs}; |
1245 + ${cast local.descs as Builtin::symbol.ref}; | |
133 | 1246 + ${DMA::free_coherent( |
1247 + local.self.hw_ctx.net_dev.device, local.self.size, | |
136 | 1248 + local.descs, local.self.dma.dma_handle |
133 | 1249 + )}; |
1250 + err_rx_ring_alloc: | |
1251 + return -ENOMEM; | |
1252 + } | |
1253 + | |
134 | 1254 + static void rtx_e1000_rx_ring_free_resources(${e1000::RxRing.ref} self) |
1255 + { | |
1256 + ${Log::info("e1000_rx_ring_free_resources: TBD...")}; | |
1257 + } | |
1258 + | |
133 | 1259 + static void rtx_e1000_rx_ring_configure(${e1000::RxRing.ref} self) |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1260 + { |
133 | 1261 + // XXX Reread & Fix everything down there (data structure changes and so on) |
1262 + | |
1263 + // Receive initialization (section 14.4): | |
1264 + // | |
1265 + // 1. Program the receive address, in RAL/RAH; | |
1266 + // 2. Initialize the Multicast Table Array; | |
1267 + // 3. Program the interrupt mask register (done in | |
1268 + // e1000::activate_device_interruption); | |
1269 + // 4. Allocate the receive descriptor ring and map it to make it | |
1270 + // accessible by the device; | |
1271 + // 5. Write the start address of the ring in RDBAL/RDBAH and set | |
1272 + // RDLEN (Receive Descriptor Length) to the size of the ring; | |
1273 + // 6. Set the RDH/RDT (Receive Descriptor Head/Tail) indexes to the | |
1274 + // beginning and end of the ring; | |
1275 + // 7. Make sure that RCTL.BSIZE and .BSEX are at 0 to configure the | |
1276 + // receive buffer size to 2048 bytes (e1000::rx_buffer_len). | |
1277 + // 8. Set RCTL.EN to enable the receiver. | |
1278 + // | |
1279 + // The ugly casts here are caused by the lack of CNorm unstrict. | |
1280 + | |
1281 + int i; | |
1282 + | |
1283 + // 1. Program the receive address | |
1284 + | |
1285 + // (We should use uint{32,16}_t but CNorm doesn't know them yet) | |
1286 + rtx_e1000_reg_write32( | |
1287 + ${local.self.hw_ctx}, E1000_RAL, | |
1288 + *(unsigned int *)(${local.self.hw_ctx.net_dev.dev_addr}) | |
1289 + ); | |
1290 + // The 16 upper bits of RAH also store the AS bits (which should be | |
1291 + // 0) and the AV bit (should be 1 to set the address as valid). | |
1292 + rtx_e1000_reg_write32( | |
1293 + ${local.self.hw_ctx}, E1000_RAH, | |
1294 + *(unsigned short *)(&${local.self.hw_ctx.net_dev.dev_addr}[4]) | |
1295 + ); | |
1296 + rtx_e1000_reg_set32(${local.self.hw_ctx}, E1000_RAH, E1000_RAH_AV); | |
1297 + | |
1298 + ${Log::info("rx_ring_configure: receive address programmed")}; | |
1299 + | |
1300 + // 2. Initialize the MTA | |
1301 + | |
1302 + for (i = 0; i != 128; ++i) // TODO Remove that hardcoded 128 | |
1303 + rtx_e1000_reg_write32(${local.self.hw_ctx}, E1000_MTA + i * 4, 0); | |
1304 + | |
1305 + ${Log::info("rx_ring_configure: MTA init done")}; | |
1306 + | |
1307 + // 5. Save the emplacement and the size of the ring in RDBA/RDLEN | |
1308 + rtx_e1000_reg_write32( | |
1309 + ${local.self.hw_ctx}, E1000_RDBAL, | |
1310 + ${local.self.hw_ctx}->rx_ring.dma_base & 0xffffffff | |
1311 + ); | |
1312 + rtx_e1000_reg_write32( | |
1313 + ${local.self.hw_ctx}, E1000_RDBAH, | |
1314 + ${local.self.hw_ctx}->rx_ring.dma_base >> 32 | |
1315 + ); | |
1316 + rtx_e1000_reg_write32( | |
1317 + ${local.self.hw_ctx}, E1000_RDLEN, | |
1318 + ${local.self.hw_ctx}->rx_ring.size | |
1319 + ); | |
1320 + | |
1321 + // 6. Setup RDH/RDT | |
1322 + rtx_e1000_reg_write32(${local.self.hw_ctx}, E1000_RDH, 0); | |
1323 + rtx_e1000_reg_write32( | |
1324 + ${local.self.hw_ctx}, E1000_RDT, | |
1325 + ${config.rx_ring_size} - 1 | |
1326 + ); | |
1327 + | |
1328 + // 7. Configure the buffer size | |
1329 + rtx_e1000_reg_set32( | |
1330 + ${local.self.hw_ctx}, E1000_RCTL, | |
1331 + E1000_RCTL_BSIZE_${config.rx_buffer_len} | |
1332 + ); | |
1333 + | |
1334 + // 8. Enable the receiver | |
1335 + rtx_e1000_reg_set32(${local.self.hw_ctx}, E1000_RCTL, E1000_RCTL_EN); | |
1336 + | |
1337 + ${Log::info("rx_ring_configure: receive registers configured and receiver enabled")}; | |
1338 + | |
1339 + return 0; | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1340 } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1341 } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1342 |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1343 - chunk ::CALL() |
133 | 1344 + method init(e1000::Context hw_ctx, Builtin::number desc_count) |
1345 { | |
1346 - rtx_e1000_register_write32(${ctx}, ${reg_offset}, ${value}); | |
135
9c6ae3a2e180
Wip, fixes + workarounds
Louis Opter <kalessin@kalessin.fr>
parents:
134
diff
changeset
|
1347 + // XXX doesn't work: ${self.ring.init(hw_ctx, desc_count, self.desc_size)}; |
9c6ae3a2e180
Wip, fixes + workarounds
Louis Opter <kalessin@kalessin.fr>
parents:
134
diff
changeset
|
1348 + rtx_e1000_ring_init(&${self}, ${hw_ctx}, ${desc_count}, ${self.desc_size}); |
133 | 1349 + } |
1350 + | |
1351 + method alloc() | |
1352 + { | |
1353 + rtx_e1000_rx_ring_alloc_resources(${self}); | |
1354 + } | |
1355 + | |
134 | 1356 + method free() |
1357 + { | |
1358 + rtx_e1000_rx_ring_free_resources(${self}); | |
1359 + } | |
1360 + | |
133 | 1361 + method configure() |
1362 + { | |
1363 + rtx_e1000_rx_ring_configure(${self}); | |
1364 + } | |
1365 + | |
1366 + map | |
1367 + { | |
1368 + // TODO: fix cast to directly get the attributes from the Ring: | |
1369 + hw_ctx: ((int)(${self})->hw_ctx); | |
1370 + dma: ((int)(${self})->dma); | |
1371 + size: ((int)(${self})->size); | |
1372 + descs: ((int)(${self})->descs); | |
1373 + buffs: ((int)(${self})->buffs); | |
1374 + desc_size: sizeof(/* TODO: get the generated type... ${e1000::RxDescriptor} */int); | |
1375 } | |
1376 } | |
1377 | |
1378 - template sequence e1000::register_set32(e1000::Context ctx, e1000::Register reg_offset, ::number value) | |
1379 + template type e1000::TxRing() | |
1380 { | |
1381 - chunk LKM::prototypes() | |
1382 + decl data_types() | |
1383 { | |
1384 - /* FIXME: See issue #54 */ | |
1385 - static void rtx_e1000_register_set32(/*const*/ ${e1000::Context.ref}, unsigned int, unsigned int); | |
1386 + ${e1000::Ring} ring; | |
1387 } | |
1388 | |
1389 - chunk LKM::code() | |
1390 + chunk LKM::prototypes() | |
1391 { | |
1392 - /* FIXME: See issue #54 */ | |
1393 - static void rtx_e1000_register_set32(/*const*/ ${e1000::Context.ref} ctx, unsigned int reg_offset, unsigned int value) | |
1394 + static int rtx_e1000_tx_ring_alloc_resources(${e1000::TxRing.ref}); | |
134 | 1395 + static void rtx_e1000_tx_ring_free_resources(${e1000::TxRing.ref}); |
133 | 1396 + static void rtx_e1000_tx_ring_configure(${e1000::TxRing.ref}); |
1397 + } | |
1398 + | |
1399 + chunk LKM::code() | |
1400 + { | |
1401 + static int rtx_e1000_tx_ring_alloc_resources(${e1000::TxRing.ref} self) | |
1402 { | |
1403 - iowrite32(rtx_e1000_register_read32(ctx, reg_offset) | value, ctx->ioaddr + reg_offset); | |
134 | 1404 + ${Log::info("e1000_tx_ring_alloc_resources: TBD...")}; |
133 | 1405 + return 0; |
1406 + } | |
1407 + | |
134 | 1408 + static void rtx_e1000_tx_ring_free_resources(${e1000::TxRing.ref} self) |
1409 + { | |
1410 + ${Log::info("e1000_tx_ring_free_resources: TBD...")}; | |
1411 + } | |
1412 + | |
133 | 1413 + static void rtx_e1000_tx_ring_configure(${e1000::TxRing.ref} self) |
1414 + { | |
1415 + // return ; XXX wtf fails with: | |
1416 + // function 'rtxPH_compile(local_node : node, compile : node, node_idx : value)' hasn't been implemented | |
1417 } | |
1418 } | |
1419 | |
1420 - chunk ::CALL() | |
1421 + method init(e1000::Context hw_ctx, Builtin::number desc_count) | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1422 { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1423 - rtx_e1000_register_set32(${ctx}, ${reg_offset}, ${value}); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1424 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1425 - } |
133 | 1426 - |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1427 - template sequence e1000::register_unset32(e1000::Context ctx, e1000::Register reg_offset, ::number value) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1428 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1429 - chunk LKM::prototypes() |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1430 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1431 - /* FIXME: See issue #54 */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1432 - static void rtx_e1000_register_unset32(/*const*/ ${e1000::Context.ref}, unsigned int, unsigned int); |
135
9c6ae3a2e180
Wip, fixes + workarounds
Louis Opter <kalessin@kalessin.fr>
parents:
134
diff
changeset
|
1433 + // XXX doesn't work: ${self.ring.init(hw_ctx, desc_count, self.desc_size)}; |
9c6ae3a2e180
Wip, fixes + workarounds
Louis Opter <kalessin@kalessin.fr>
parents:
134
diff
changeset
|
1434 + rtx_e1000_ring_init(&${self}, ${hw_ctx}, ${desc_count}, ${self.desc_size}); |
133 | 1435 } |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1436 |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1437 - chunk LKM::code() |
133 | 1438 + method alloc() |
1439 { | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1440 - /* FIXME: See issue #54 */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1441 - static void rtx_e1000_register_unset32(/*const*/ ${e1000::Context.ref} ctx, unsigned int reg_offset, unsigned int value) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1442 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1443 - iowrite32(rtx_e1000_register_read32(ctx, reg_offset) & ~value, ctx->ioaddr + reg_offset); |
133 | 1444 - } |
1445 + rtx_e1000_tx_ring_alloc_resources(${self}); | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1446 } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1447 |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1448 - chunk ::CALL() |
134 | 1449 + method free() |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1450 { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1451 - rtx_e1000_register_unset32(${ctx}, ${reg_offset}, ${value}); |
134 | 1452 + rtx_e1000_tx_ring_free_resources(${self}); |
133 | 1453 } |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1454 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1455 |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1456 - template sequence activate_device_interruption(Ethernet::Device rtx_ether_ctx) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1457 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1458 - chunk ::CALL() |
134 | 1459 + method configure() |
133 | 1460 { |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1461 - rtx_e1000_register_write32(&${rtx_ether_ctx}->hw_ctx, E1000_IMS, |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1462 - E1000_INTR_TXDW | |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1463 - E1000_INTR_TXQE | |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1464 - E1000_INTR_LSC | |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1465 - E1000_INTR_RXO | |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1466 - E1000_INTR_RXT0); |
134 | 1467 + rtx_e1000_tx_ring_configure(${self}); |
1468 } | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1469 - } |
134 | 1470 |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1471 - /* TODO: |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1472 - * |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1473 - * Refactor into two methods (one in RxRing and one in TxRing) and make use |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1474 - * of the new methods in Socket::SKBuff. |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1475 - */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1476 - template sequence free_rx_tx(Ethernet::Device rtx_ether_ctx) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1477 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1478 - chunk ::CALL() |
134 | 1479 + map |
1480 { | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1481 - /* |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1482 - * XXX: Not generated if named "hw_ctx" (which is funny because |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1483 - * it's used and works in the template right above this one): |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1484 - */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1485 - ${e1000::Context.ref} hw_ctx_; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1486 - hw_ctx_ = &${rtx_ether_ctx}->hw_ctx; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1487 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1488 - /* |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1489 - * Free the rx ring: |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1490 - * - Unmap and free the skbuffs; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1491 - * - Free the descriptors array. |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1492 - */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1493 - for (int i = 0; i != ${config.rx_ring_size}; ++i) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1494 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1495 - /* |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1496 - * XXX Leaking casts: |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1497 - * |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1498 - * We should go through the rtx types (Socket::SKBuff, |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1499 - * AbstractSKBuff), but we can't because of the array here, |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1500 - * which is not supported by the compiler. |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1501 - */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1502 - dma_unmap_single( |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1503 - ${rtx_ether_ctx.device}, |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1504 - *((dma_addr_t *)&(hw_ctx_->rx_ring.skbuffs[i].dma_handle)), |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1505 - ${config.rx_buffer_len}, |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1506 - DMA_FROM_DEVICE); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1507 - dev_kfree_skb((struct sk_buff *)hw_ctx_->rx_ring.skbuffs[i].skbuff); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1508 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1509 - dma_free_coherent(${rtx_ether_ctx.device}, hw_ctx_->rx_ring.size, |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1510 - hw_ctx_->rx_ring.base, hw_ctx_->rx_ring.dma_base); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1511 - ${Log::info("free_rx_tx: rx ring free'ed")}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1512 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1513 - /* |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1514 - * Free the tx ring: |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1515 - * - Free the descriptors array. |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1516 - */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1517 - dma_free_coherent(${rtx_ether_ctx.device}, hw_ctx_->tx_ring.size, |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1518 - hw_ctx_->tx_ring.base, hw_ctx_->tx_ring.dma_base); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1519 - ${Log::info("free_rx_tx: tx ring free'ed")}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1520 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1521 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1522 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1523 - template sequence handle_interrupt(Ethernet::Device rtx_ether_ctx) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1524 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1525 - chunk ::CALL() |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1526 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1527 - unsigned int icr = rtx_e1000_register_read32(&${rtx_ether_ctx}->hw_ctx, E1000_ICR); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1528 - pr_info("%s: interrupt received, ICR: 0x%x", ${config.name}, icr); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1529 - if (icr) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1530 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1531 - if (icr & E1000_INTR_LSC) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1532 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1533 - ${Log::info("handle_interrupt: cable link status changed, dumping card status:")}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1534 - ${e1000::print_status(rtx_ether_ctx)}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1535 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1536 - if (icr & (E1000_INTR_TXQE|E1000_INTR_TXDW)) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1537 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1538 - ${Log::info("handle_interrupt: TxRing: packet(s) sent")}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1539 - /* |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1540 - * XXX Do a Rathaxes call (how can I bind |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1541 - * "&${rtx_ether_ctx}->hw_ctx.tx_ring" to e1000::TxRing easily?) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1542 - */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1543 - rtx_e1000_tx_ring_clean(&${rtx_ether_ctx}->hw_ctx.tx_ring); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1544 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1545 - if (icr & E1000_INTR_RXT0) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1546 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1547 - ${Log::info("handle_interrupt: RxRing: packet(s) received")}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1548 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1549 - if (icr & E1000_INTR_RXO) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1550 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1551 - ${Log::info("handle_interrupt: RxRing: overrun")}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1552 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1553 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1554 - return IRQ_HANDLED; |
133 | 1555 - } |
1556 - } | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1557 - } |
133 | 1558 - |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1559 - template sequence e1000::xmit(Ethernet::Device rtx_ether_ctx, Socket::AbstractSKBuff kernel_skb) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1560 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1561 - chunk ::CALL() |
133 | 1562 - { |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1563 - /* |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1564 - * Put packets on the TX ring, must return NETDEV_TX_OK or |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1565 - * NETDEV_TX_BUSY. |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1566 - */ |
133 | 1567 - |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1568 - ${Socket::SKBuff} skb; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1569 - ${e1000::Context.ref} hw_ctx; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1570 - ${e1000::TxRing.ref} tx_ring; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1571 - ${Device::AbstractDevice.ref} devp; |
133 | 1572 - |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1573 - ${local.skb.init(kernel_skb)}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1574 - hw_ctx = &${rtx_ether_ctx}->hw_ctx; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1575 - tx_ring = &hw_ctx->tx_ring; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1576 - devp = (${Device::AbstractDevice.ref})${rtx_ether_ctx.device}; |
133 | 1577 - |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1578 - ${Log::info("xmit: skbuff details:")}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1579 - /* |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1580 - * skb does not expand on the bound C variable (should be |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1581 - * rtx_skbuff), which is funny because it works for the |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1582 - * sequence template call right after. |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1583 - */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1584 - /* |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1585 - * XXX: doesn't work (I tried to pass self explicitely too): |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1586 - * ${local.skb.dump_infos()}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1587 - */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1588 - rtx_socket_skbuff_dump_infos(&skb); |
133 | 1589 - |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1590 - /* |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1591 - * The transmission is going to be several steps: |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1592 - * 1. TCP Segmentation Offload & Checksum Offloading: pick a |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1593 - * descriptor from the tx ring and fill it as a context |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1594 - * descriptor to allow the card to slice into several packets |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1595 - * according to the MSS; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1596 - * 2. DMA Map the skbuff data as slices of 4096; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1597 - * 3. Signal the hardware that data is available via a tx desc. |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1598 - */ |
133 | 1599 - |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1600 - /* XXX: same thing wanted to use: ${local.tx_ring.descriptors_remaining()} */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1601 - if (!rtx_e1000_tx_ring_descriptors_remaining(tx_ring)) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1602 - return NETDEV_TX_BUSY; |
133 | 1603 - |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1604 - /* 1. Offloading */ |
133 | 1605 - |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1606 - /* XXX: ${local.tx_ring.tso_cksum_offload(skb)}; */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1607 - if (rtx_e1000_tx_ring_tso_cksum_offload(tx_ring, &skb)) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1608 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1609 - ${Log::info("xmit: the packet needs to be fragmented and/or checksummed but this not implemented yet!")}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1610 - goto err_offload; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1611 - } |
133 | 1612 - |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1613 - /* 2. Map the data */ |
133 | 1614 - |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1615 - /* XXX: ${local.skb.map_to(devp.k_device)}; */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1616 - if (rtx_socket_skbuff_map(&skb, ${devp.k_device}, DMA_TO_DEVICE)) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1617 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1618 - ${Log::info("xmit: can't DMA map a SKbuff")}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1619 - goto err_skb_map_to; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1620 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1621 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1622 - /* 3. Update the TX Ring and signal the hardware */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1623 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1624 - /* XXX: ${local.tx_ring.put(skb)}; */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1625 - rtx_e1000_tx_ring_put(tx_ring, &skb); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1626 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1627 - /* XXX: ${local.tx_ring.start_xmit(hw_ctx)}; */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1628 - rtx_e1000_tx_ring_start_xmit(tx_ring, hw_ctx); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1629 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1630 - return NETDEV_TX_OK; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1631 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1632 - err_offload: |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1633 - err_skb_map_to: |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1634 - /* XXX: ${local.skb.unmap_to_and_free(local.dev)}; */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1635 - rtx_socket_skbuff_unmap_and_free(&skb, ${devp.k_device}, DMA_TO_DEVICE); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1636 - return NETDEV_TX_OK; |
133 | 1637 + // TODO: fix cast to directly get the attributes from the Ring: |
1638 + hw_ctx: ((int)(${self})->hw_ctx); | |
1639 + dma: ((int)(${self})->dma); | |
1640 + size: ((int)(${self})->size); | |
1641 + descs: ((int)(${self})->descs); | |
1642 + buffs: ((int)(${self})->buffs); | |
1643 + desc_size: sizeof(/* TODO: get the generated type ${e1000::TxDescriptor} */int); | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1644 } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1645 } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1646 } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1647 diff --git a/rathaxes/samples/e1000/e1000.rti b/rathaxes/samples/e1000/e1000.rti |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1648 --- a/rathaxes/samples/e1000/e1000.rti |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1649 +++ b/rathaxes/samples/e1000/e1000.rti |
136 | 1650 @@ -1,157 +1,125 @@ |
133 | 1651 -interface e1000 : Socket, Ethernet, DMA, PCI, LKM, Builtin |
1652 +interface e1000 : Socket, Ethernet, Device, DMA, PCI, LKM, Builtin | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1653 { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1654 - required variable Builtin::number rx_ring_size; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1655 - required variable Builtin::number tx_ring_size; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1656 - required variable Builtin::number rx_buffer_len; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1657 - required variable Builtin::number tx_max_data_per_desc; |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1658 + required variable Builtin::number rx_ring_size; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1659 + required variable Builtin::number tx_ring_size; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1660 + required variable Builtin::number rx_buffer_len; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1661 + required variable Builtin::number tx_max_data_per_desc; |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1662 |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1663 - provided type RxDescriptor |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1664 + // Hardware values/data structures, should probably be in the front-end: |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1665 + provided type Register { decl data_types(); } |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1666 + provided type Command { decl data_types(); } |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1667 + provided type TxDescriptorFlag { decl data_types(); } |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1668 + provided type RxDescriptor { decl data_types(); } |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1669 + provided type TxDescriptor { decl data_types(); } |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1670 + |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1671 + provided type Buffer |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1672 { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1673 - chunk LKM::includes(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1674 decl data_types(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1675 - method init(); |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1676 + |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1677 + method init(Socket::SKBuff, DMA::DMAHandle); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1678 + |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1679 + attribute Socket::SKBuff.ref sk_buff; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1680 + attribute DMA::DMAHandle.ref dma; |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1681 } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1682 |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1683 - provided type TxDescriptor |
133 | 1684 + provided type Context |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1685 { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1686 decl data_types(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1687 - method init(); |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1688 + |
133 | 1689 + chunk LKM::includes(); |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1690 + chunk LKM::prototypes(); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1691 + chunk LKM::code(); |
133 | 1692 + chunk Ethernet::HardwareContext(); |
1693 + | |
1694 + // NOTE: Those callbacks/hooks should probably be in the front-end: | |
1695 + | |
1696 + chunk Ethernet::adapter_init_context(Ethernet::Device, Builtin::symbol); | |
1697 + chunk Ethernet::adapter_reset(Ethernet::Device); | |
1698 + chunk Ethernet::adapter_load_mac_address(Ethernet::Device); | |
1699 + chunk Ethernet::adapter_setup_rx_tx(Ethernet::Device); | |
1700 + chunk Ethernet::adapter_enable_interrupts(Ethernet::Device); | |
1701 + chunk Ethernet::adapter_disable_interrupts(Ethernet::Device); | |
1702 + chunk Ethernet::adapter_handle_interrupt(Ethernet::Device); | |
1703 + chunk Ethernet::adapter_xmit(Ethernet::Device, Socket::SKBuff); | |
1704 + chunk Ethernet::adapter_disable_rx(Ethernet::Device); | |
1705 + chunk Ethernet::adapter_disable_tx(Ethernet::Device); | |
1706 + chunk Ethernet::adapter_free_rx_tx(Ethernet::Device); | |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1707 + |
134 | 1708 + method init(Ethernet::Device net_dev, Builtin::symbol); |
133 | 1709 + method print_status(); |
1710 + method reg_read32(Register); | |
1711 + method reg_write32(Register, Builtin::number); | |
1712 + method reg_set32(Register, Builtin::number); | |
1713 + method reg_unset32(Register, Builtin::number); | |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1714 + |
133 | 1715 + // XXX: Circular dependency with the rings, this will prevent us to |
136 | 1716 + // call methods even when issue $46 is resolved, it also forces us to |
1717 + // hardcode generated types in the definition of the type, and they | |
1718 + // can't be "dereferenced" (e.g: local.hw_ctx.rx_ring.desc_size can't | |
1719 + // work since local.hw_ctx.rx_ring is just going to be a symbol). | |
133 | 1720 + attribute Builtin::symbol.scalar rx_ring; |
1721 + attribute Builtin::symbol.scalar tx_ring; | |
137
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
1722 + attribute Builtin::symbol.ref io_addr; |
133 | 1723 + attribute Ethernet::Device.ref net_dev; |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1724 + } |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1725 + |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1726 + provided type Ring |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1727 + { |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1728 + decl data_types(); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1729 + |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1730 + chunk LKM::prototypes(); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1731 + chunk LKM::code(); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1732 + |
134 | 1733 + method init(e1000::Context, Builtin::number, Builtin::number); |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1734 + |
133 | 1735 + // Keep a backref to The context since it's going to be needed for of |
1736 + // operations involving the ethernet device, flags on the context, etc. | |
1737 + attribute Context.ref hw_ctx; | |
1738 + attribute DMA::DMAHandle.scalar dma; | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1739 + attribute Builtin::number.scalar size; // Total size in bytes |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1740 + attribute Builtin::symbol.ref descs; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1741 + attribute Buffer.ref buffs; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1742 } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1743 |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1744 provided type RxRing |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1745 { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1746 decl data_types(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1747 - method init(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1748 |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1749 - /* XXX: Callback that should be in the front-end: */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1750 - chunk Ethernet::adapter_init_rx(Ethernet::Device); |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1751 + chunk LKM::prototypes(); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1752 + chunk LKM::code(); |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1753 |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1754 - attribute DMA::DMAHandle.scalar dma_base; |
133 | 1755 + method init(e1000::Context, Builtin::number); |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1756 + method alloc(); // Returns != 0 on failure |
133 | 1757 + method free(); |
1758 + method configure(); | |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1759 + |
133 | 1760 + // Re-expose all the Ring attributes + the size of a single descriptor: |
1761 + attribute Context.ref hw_ctx; | |
1762 + attribute DMA::DMAHandle.scalar dma; | |
1763 attribute Builtin::number.scalar size; | |
1764 - } | |
1765 - | |
1766 - provided type Context | |
1767 - { | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1768 - chunk Ethernet::HardwareContext(); |
133 | 1769 - decl data_types(); |
1770 - | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1771 - /* XXX: |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1772 - * These callbacks/Hooks which should probably be in the front-end. |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1773 - * Also, I'm not too happy about the names, it's difficult to make |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1774 - * the difference between the probe and open parts. |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1775 - */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1776 - chunk Ethernet::adapter_init_context(Ethernet::Device, |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1777 - Builtin::number, |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1778 - Builtin::symbol); |
133 | 1779 - chunk Ethernet::adapter_reset(Ethernet::Device); |
1780 - chunk Ethernet::adapter_load_mac_address(Ethernet::Device); | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1781 - chunk Ethernet::adapter_setup(Ethernet::Device); |
133 | 1782 - |
1783 - attribute RxRing.scalar rx_ring; | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1784 - /* XXX: circular dependency with Contex: */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1785 - //attribute TxRing.scalar tx_ring; |
136 | 1786 + attribute RxDescriptor.ref descs; |
133 | 1787 + attribute Builtin::number.scalar desc_size; |
134 | 1788 + attribute Buffer.ref buffs; |
133 | 1789 } |
1790 | |
1791 provided type TxRing | |
1792 { | |
1793 + decl data_types(); | |
1794 + | |
1795 chunk LKM::prototypes(); | |
1796 chunk LKM::code(); | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1797 - decl data_types(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1798 - method init(); |
133 | 1799 |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1800 - /* XXX: Callback that should be in the front-end: */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1801 - chunk Ethernet::adapter_init_tx(Ethernet::Device); |
133 | 1802 + method init(e1000::Context, Builtin::number); |
1803 + method alloc(); // Returns != 0 on failure | |
1804 + method free(); | |
1805 + method configure(); | |
1806 | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1807 - /* Clean the ring (i.e: move the head closer to the tail): */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1808 - method clean(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1809 - /* Return the number of clean descriptors left in the ring: */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1810 - method descriptors_remaining(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1811 - method tso_cksum_offload(Socket::SKBuff); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1812 - method put(Socket::SKBuff); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1813 - /* Signal the device that new dirty descriptors are on the ring: */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1814 - method start_xmit(e1000::Context); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1815 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1816 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1817 - /* |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1818 - * These two types should actually be registers definitions in the frontend: |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1819 - */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1820 - provided type Register |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1821 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1822 - decl data_types(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1823 - method init(Builtin::number); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1824 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1825 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1826 - provided type Commands |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1827 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1828 - decl data_types(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1829 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1830 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1831 - provided type TxDescriptorFlags |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1832 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1833 - decl data_types(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1834 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1835 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1836 - /* |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1837 - * This should take an e1000::Context as the first argument but this was |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1838 - * not working as wished. |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1839 - */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1840 - provided sequence print_status(Ethernet::Device) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1841 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1842 - provided chunk LKM::prototypes(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1843 - provided chunk LKM::code(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1844 - provided chunk ::CALL(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1845 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1846 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1847 - provided sequence activate_device_interruption(Ethernet::Device) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1848 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1849 - provided chunk ::CALL(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1850 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1851 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1852 - provided sequence set_up_device(Ethernet::Device) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1853 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1854 - provided chunk ::CALL(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1855 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1856 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1857 - provided sequence free_rx_tx(Ethernet::Device dev) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1858 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1859 - provided chunk ::CALL(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1860 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1861 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1862 - provided sequence handle_interrupt(Ethernet::Device) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1863 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1864 - provided chunk ::CALL(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1865 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1866 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1867 - provided sequence xmit(Ethernet::Device, Socket::AbstractSKBuff) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1868 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1869 - provided chunk ::CALL(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1870 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1871 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1872 - provided sequence register_read32(e1000::Context, e1000::Register) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1873 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1874 - provided chunk LKM::prototypes(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1875 - provided chunk LKM::code(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1876 - provided chunk ::CALL(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1877 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1878 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1879 - provided sequence register_write32(e1000::Context, e1000::Register, ::number) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1880 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1881 - provided chunk LKM::prototypes(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1882 - provided chunk LKM::code(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1883 - provided chunk ::CALL(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1884 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1885 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1886 - provided sequence register_set32(e1000::Context, e1000::Register, ::number) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1887 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1888 - provided chunk LKM::prototypes(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1889 - provided chunk LKM::code(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1890 - provided chunk ::CALL(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1891 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1892 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1893 - provided sequence register_unset32(e1000::Context, e1000::Register, ::number) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1894 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1895 - provided chunk LKM::prototypes(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1896 - provided chunk LKM::code(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1897 - provided chunk ::CALL(); |
133 | 1898 + // Re-expose all the Ring attributes + the size of a single descriptor: |
1899 + attribute Context.ref hw_ctx; | |
1900 + attribute DMA::DMAHandle.scalar dma; | |
1901 + attribute Builtin::number.scalar size; | |
136 | 1902 + attribute TxDescriptor.ref descs; |
133 | 1903 + attribute Builtin::number.scalar desc_size; |
134 | 1904 + attribute Buffer.ref buffs; |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1905 } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1906 } |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1907 diff --git a/rathaxes/samples/e1000/ethernet.blt b/rathaxes/samples/e1000/ethernet.blt |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1908 --- a/rathaxes/samples/e1000/ethernet.blt |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1909 +++ b/rathaxes/samples/e1000/ethernet.blt |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1910 @@ -1,4 +1,4 @@ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1911 -with Ethernet, PCI, LKM, Log, Builtin |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1912 +with Ethernet, Socket, PCI, LKM, Log, Builtin |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1913 { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1914 template type Ethernet::ProtocolId() |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1915 { |
133 | 1916 @@ -9,7 +9,7 @@ |
1917 | |
1918 chunk LKM::prototypes() | |
1919 { | |
1920 - static const char *rtx_ethernet_protocol_id_to_str(unsigned short); | |
1921 + static const char *rtx_ethernet_protocol_id_to_str(unsigned short); | |
1922 } | |
1923 | |
1924 chunk LKM::data() | |
1925 @@ -28,7 +28,7 @@ | |
1926 | |
1927 chunk LKM::code() | |
1928 { | |
1929 - static const char *rtx_ethernet_protocol_id_to_str(unsigned short proto_id) | |
1930 + static const char *rtx_ethernet_protocol_id_to_str(unsigned short proto_id) | |
1931 { | |
1932 for (int i = 0; | |
1933 i != sizeof(rtx_ethernet_proto_table) / sizeof(rtx_ethernet_proto_table[0]); | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1934 @@ -61,7 +61,7 @@ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1935 |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1936 method init(Builtin::symbol dev) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1937 { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1938 - ${self} = (${Ethernet::AbstractDevice} *)${dev}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1939 + ${self} = (${Ethernet::AbstractDevice.ref})${dev}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1940 } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1941 |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1942 map |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1943 @@ -104,9 +104,12 @@ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1944 { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1945 static int rtx_ethernet_alloc_rx_skbuff(${Ethernet::Device.ref} self, ${Socket::SKBuff.ref} sk_buff, ${Builtin::number} size) |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1946 { |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1947 - ${Socket::AbstractSKBuff} k_sk_buff = netdev_alloc_skb(${local.self.net_device.k_net_dev}, ${local.size}); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1948 - if (${local.k_sk_buff) { |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1949 - ${local.sk_buff.init(local.k_sk_buff, local.size)}; |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1950 + ${Socket::AbstractSKBuff.ref} k_skb = netdev_alloc_skb(${local.self.net_device.k_net_dev}, ${local.size}); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1951 + if (${local.k_skb}) { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1952 + // XXX meh, can't use the init method since we get a copy |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1953 + // of the pointer, so we have to do this which is |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1954 + // inconsistent with the rest of code: |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1955 + sk_buff->skbuff = k_skb; |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1956 return 0; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1957 } |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1958 return 1; |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1959 @@ -148,7 +151,7 @@ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1960 } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1961 } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1962 |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1963 - template sequence Ethernet::open(Ethernet::Device dev) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1964 + template sequence Ethernet::open() |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1965 { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1966 chunk LKM::includes() |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1967 { |
133 | 1968 @@ -157,100 +160,114 @@ |
1969 | |
1970 chunk LKM::prototypes() | |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1971 { |
133 | 1972 - static int rtx_ethernet_open(struct net_device *); |
1973 + static int rtx_ethernet_open(struct net_device *); | |
1974 } | |
1975 | |
1976 chunk LKM::code() | |
1977 { | |
1978 - static int rtx_ethernet_open(struct net_device *dev) | |
1979 + static int rtx_ethernet_open(struct net_device *dev) | |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1980 { |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1981 - /* |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1982 - * XXX The casts are here because the compiler doesn't resolve |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1983 - * "enclosed" type (e.g: local.var.enclosed) correctly. |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1984 - */ |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1985 ${Ethernet::AbstractDevice.ref} rtx_net_dev; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1986 { /* XXX: I end up with a placeholder if I don't open a scope */ |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1987 ${local.rtx_net_dev.init(local.dev)}; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1988 } |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1989 ${Ethernet::Device.ref} rtx_ether_ctx = ${local.rtx_net_dev.rtx_ether_ctx}; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1990 |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1991 - int error; |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1992 - { |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1993 - ${Log::info("installing the interrupt handler")}; |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
1994 - } |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1995 - error = request_irq(${local.rtx_ether_ctx.irq}, |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1996 - rtx_ethernet_interrupt_handler, |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1997 - IRQF_SHARED, |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1998 - ${config.name}, |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
1999 - dev); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2000 - if (error) |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2001 - { |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2002 + ${pointcut Ethernet::adapter_setup_rx_tx(local.rtx_ether_ctx)}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2003 + |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2004 + ${Log::info("Installing the interrupt handler")}; |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2005 + int error = request_irq( |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2006 + ${local.rtx_ether_ctx.irq}, |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2007 + rtx_ethernet_interrupt_handler, |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2008 + IRQF_SHARED, |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2009 + ${config.name}, |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2010 + dev |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2011 + ); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2012 + if (error) { |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2013 ${Log::info("Cannot register the interrupt handler")}; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2014 return error; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2015 } |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2016 - ${pointcut Ethernet::adapter_setup(local.rtx_ether_ctx)}; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2017 - ${pointcut Ethernet::adapter_init_rx(local.rtx_ether_ctx)}; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2018 - ${pointcut Ethernet::adapter_init_tx(local.rtx_ether_ctx)}; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2019 - ${pointcut ::IMPLEMENTATION(local.rtx_ether_ctx)}; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2020 + |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2021 + ${pointcut Ethernet::adapter_enable_interrupts(local.rtx_ether_ctx)}; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2022 |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2023 return 0; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2024 } |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2025 } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2026 + |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2027 + /* XXX This chunk should be removed (see #26) */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2028 + chunk ::CALL() |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2029 + { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2030 + } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2031 } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2032 |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2033 - template sequence Ethernet::send(Ethernet::Device dev, Socket::AbstractSKBuff skb) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2034 + template sequence Ethernet::send() |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2035 { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2036 chunk LKM::prototypes() |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2037 { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2038 - static int rtx_ethernet_xmit(struct sk_buff* skb, struct net_device *dev); |
133 | 2039 + static int rtx_ethernet_xmit(struct sk_buff *skb, struct net_device *dev); |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2040 } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2041 |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2042 chunk LKM::code() |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2043 { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2044 - static int rtx_ethernet_xmit(struct sk_buff* kernel_skb, struct net_device *net_dev) |
133 | 2045 + static int rtx_ethernet_xmit(struct sk_buff *k_skb, struct net_device *net_dev) |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2046 { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2047 ${Ethernet::Device.ref} rtx_ether_ctx = netdev_priv(net_dev); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2048 - ${Socket::AbstractSKBuff.ref} rtx_skb = (${Socket::AbstractSKBuff.ref}) kernel_skb; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2049 + ${Socket::SKBuff.ref} rtx_skb; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2050 |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2051 - ${pointcut ::IMPLEMENTATION(local.rtx_ether_ctx, local.rtx_skb)}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2052 + ${cast local.k_skb as Socket::AbstractSKBuff.ref}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2053 + ${local.rtx_skb.init(local.k_skb)}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2054 + |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2055 + ${Log::info("we have one packet to transmit!")}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2056 + ${pointcut Ethernet::adapter_xmit(local.rtx_ether_ctx, local.rtx_skb)}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2057 } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2058 } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2059 + |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2060 + /* XXX This chunk should be removed (see #26) */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2061 + chunk ::CALL() |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2062 + { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2063 + } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2064 } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2065 |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2066 - template sequence Ethernet::close(Ethernet::Device dev) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2067 + template sequence Ethernet::close() |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2068 { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2069 chunk LKM::prototypes() |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2070 { |
133 | 2071 - static int rtx_ethernet_close(struct net_device *); |
2072 + static int rtx_ethernet_close(struct net_device *); | |
2073 } | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2074 |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2075 chunk LKM::code() |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2076 { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2077 - static int rtx_ethernet_close(struct net_device *dev) |
133 | 2078 + static int rtx_ethernet_close(struct net_device *net_dev) |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2079 { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2080 - ${Ethernet::AbstractDevice.ref} rtx_net_dev; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2081 - { /* XXX: I end up with a placeholder if I don't open a scope */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2082 - ${local.rtx_net_dev.init(local.dev)}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2083 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2084 + ${cast local.net_dev as Ethernet::AbstractDevice.ref}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2085 + ${Ethernet::Device.ref} rtx_ether_ctx = ${local.net_dev.rtx_ether_ctx}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2086 |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2087 - ${Ethernet::Device.ref} rtx_ether_ctx = ${local.rtx_net_dev.rtx_ether_ctx}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2088 + ${pointcut Ethernet::adapter_disable_rx(local.rtx_ether_ctx)}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2089 |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2090 - /* TODO: change this pointcut into a pointcut/adapter/callback: */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2091 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2092 - ${pointcut ::IMPLEMENTATION(local.rtx_ether_ctx)}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2093 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2094 + netif_tx_disable(net_dev); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2095 + ${pointcut Ethernet::adapter_disable_tx(local.rtx_ether_ctx)}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2096 |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2097 + ${pointcut Ethernet::adapter_disable_interrupts(local.rtx_ether_ctx)}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2098 free_irq(${local.rtx_ether_ctx.irq}, dev); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2099 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2100 - ${Log::info("interrupt handler free'ed")}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2101 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2102 + ${Log::info("interrupt handler free'ed")}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2103 + |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2104 + // TODO/XXX: There is definitely more stuff to do around here |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2105 + // (e.g: clean the rings, flush some stuff...) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2106 + |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2107 + ${pointcut Ethernet::adapter_reset(local.rtx_ether_ctx)}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2108 + ${pointcut Ethernet::adapter_free_rx_tx(local.rtx_ether_ctx)}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2109 |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2110 return 0; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2111 } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2112 } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2113 + |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2114 + /* XXX This chunk should be removed (see #26) */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2115 + chunk ::CALL() |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2116 + { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2117 + } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2118 } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2119 |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2120 - template sequence Ethernet::interrupt_handler(Ethernet::Device dev) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2121 + template sequence Ethernet::interrupt_handler() |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2122 { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2123 /* |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2124 * We can't use the irqreturn_t type here because CNornm doesn't know |
133 | 2125 @@ -258,29 +275,34 @@ |
2126 */ | |
2127 chunk LKM::prototypes() | |
2128 { | |
2129 - static enum irqreturn rtx_ethernet_interrupt_handler(int, void *); | |
2130 + static enum irqreturn rtx_ethernet_interrupt_handler(int, void *); | |
2131 } | |
2132 | |
2133 chunk LKM::code() | |
2134 { | |
2135 - static enum irqreturn rtx_ethernet_interrupt_handler(int irq, void *dev_id) | |
2136 + static enum irqreturn rtx_ethernet_interrupt_handler(int irq, void *dev_id) | |
2137 { | |
2138 ${Ethernet::AbstractDevice.ref} rtx_net_dev = dev_id; | |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2139 ${Ethernet::Device.ref} rtx_ether_ctx; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2140 rtx_ether_ctx = ${local.rtx_net_dev.rtx_ether_ctx}; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2141 |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2142 - ${pointcut ::IMPLEMENTATION(local.rtx_ether_ctx)}; |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2143 + ${pointcut Ethernet::adapter_handle_interrupt(local.rtx_ether_ctx)}; |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2144 |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2145 return IRQ_NONE; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2146 } |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2147 } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2148 + |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2149 + /* XXX This chunk should be removed (see #26) */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2150 + chunk ::CALL() |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2151 + { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2152 + } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2153 } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2154 |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2155 template sequence Ethernet::init() |
133 | 2156 { |
2157 chunk LKM::data() | |
2158 { | |
2159 - static const struct net_device_ops rtx_ether_ops = | |
2160 + static const struct net_device_ops rtx_ether_ops = | |
2161 { | |
2162 .ndo_open = rtx_ethernet_open, | |
2163 .ndo_stop = rtx_ethernet_close, | |
137
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2164 @@ -288,74 +310,65 @@ |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2165 }; |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2166 } |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2167 |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2168 - /* |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2169 - * NOTE: for now, the error handling is leaking from PCI::probe(), but |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2170 - * it's better than doing it at all. |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2171 - * |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2172 - * XXX: the chunk argument isn't correctly expanded by the |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2173 - * compiler I have to use the same name as the actual C |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2174 - * variable: |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2175 - */ |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2176 + // NOTE: for now, the error handling is leaking from PCI::probe(), but |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2177 + // it's better than not doing it at all. |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2178 + // |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2179 + // XXX: the chunk argument isn't correctly expanded by the compiler I |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2180 + // have to use the same name as the actual C variable: |
133 | 2181 chunk PCI::pci_probe_hook(PCI::Device rtx_pci_dev) |
2182 { | |
2183 - ${Ethernet::AbstractDevice.ref} rtx_net_dev; | |
2184 - ${Ethernet::Device.ref} rtx_ether_ctx; | |
2185 + { | |
2186 + ${Ethernet::AbstractDevice.ref} rtx_net_dev; | |
2187 + ${Ethernet::Device.ref} rtx_ether_ctx; | |
2188 | |
2189 - rtx_net_dev = (${Ethernet::AbstractDevice.ref})alloc_etherdev(sizeof(*rtx_ether_ctx)); | |
2190 - if (!rtx_net_dev) | |
2191 - { | |
2192 - ${Log::info("cannot allocate the ethernet device context")}; | |
2193 - error = -ENOMEM; | |
2194 - goto fail; | |
2195 + rtx_net_dev = (${Ethernet::AbstractDevice.ref})alloc_etherdev(sizeof(*rtx_ether_ctx)); | |
2196 + if (!rtx_net_dev) | |
2197 + { | |
2198 + ${Log::info("cannot allocate the ethernet device context")}; | |
2199 + error = -ENOMEM; | |
2200 + goto fail; | |
2201 + } | |
137
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2202 + // XXX Past this point we should have another label to do |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2203 + // free_netdev(rtx_net_dev) in case of failure but we don't |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2204 + // have a nice way of doing that. |
133 | 2205 + SET_NETDEV_DEV(${local.rtx_net_dev.k_net_dev}, ${rtx_pci_dev.device}); |
2206 + strlcpy(${local.rtx_net_dev.k_net_dev}->name, | |
2207 + ${config.ifname}, | |
2208 + sizeof(${local.rtx_net_dev.k_net_dev}->name)); | |
2209 + ${local.rtx_net_dev.k_net_dev}->irq = ${rtx_pci_dev.irq}; | |
2210 + ${local.rtx_net_dev.k_net_dev}->netdev_ops = &rtx_ether_ops; | |
2211 + | |
2212 + error = register_netdev(${local.rtx_net_dev.k_net_dev}); | |
2213 + if (error) | |
2214 + { | |
2215 + ${Log::info("cannot register the driver in the net subsystem")}; | |
2216 + goto fail; | |
2217 + } | |
2218 + | |
2219 + /* Initialize our context held by the net_device structure */ | |
2220 + { /* XXX: I end up with a placeholder if I don't open a scope */ | |
137
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2221 + ${local.rtx_ether_ctx.init(local.rtx_net_dev, rtx_pci_dev.pci_device)}; |
133 | 2222 + } |
2223 + | |
2224 + /* Register ourselves in the parent context: */ | |
2225 + /* ${rtx_pci_dev.set_context(local.rtx_ether_ctx)}; */ | |
137
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2226 + ${rtx_pci_dev.rtx_drv_context} = rtx_ether_ctx; |
133 | 2227 + |
2228 + /* | |
2229 + * XXX: the asssignments/casts are here to circumvent | |
2230 + * typing issues in the compiler (see previous XXX). | |
2231 + */ | |
2232 + unsigned char /* __iomem */ *io_addr = ${rtx_pci_dev.ioaddr}; | |
2233 + ${pointcut Ethernet::adapter_init_context(local.rtx_ether_ctx, local.io_addr)}; | |
2234 + ${pointcut Ethernet::adapter_reset(local.rtx_ether_ctx)}; | |
2235 + ${pointcut Ethernet::adapter_load_mac_address(local.rtx_ether_ctx)}; | |
2236 + memcpy(${local.rtx_ether_ctx.perm_addr}, | |
2237 + ${local.rtx_ether_ctx.dev_addr}, | |
2238 + ${local.rtx_net_dev.k_net_dev}->addr_len); | |
2239 } | |
2240 - SET_NETDEV_DEV(${local.rtx_net_dev.k_net_dev}, ${rtx_pci_dev.device}); | |
2241 - strlcpy(${local.rtx_net_dev.k_net_dev}->name, | |
2242 - ${config.ifname}, | |
2243 - sizeof(${local.rtx_net_dev.k_net_dev}->name)); | |
2244 - ${local.rtx_net_dev.k_net_dev}->irq = ${rtx_pci_dev.irq}; | |
2245 - ${local.rtx_net_dev.k_net_dev}->netdev_ops = &rtx_ether_ops; | |
2246 - | |
2247 - error = register_netdev(${local.rtx_net_dev.k_net_dev}); | |
2248 - if (error) | |
2249 - { | |
2250 - ${Log::info("cannot register the driver in the net subsystem")}; | |
2251 - goto fail; | |
2252 - } | |
2253 - | |
2254 - /* Initialize our context held by the net_device structure */ | |
2255 - /* | |
2256 - * XXX: the cast is here because the compiler resolve the | |
2257 - * type of rtx_pci_dev.pci_device to the type of | |
2258 - * rtx_pci_dev instead of the type of rtx_pci_dev.pci_device. | |
2259 - */ | |
2260 - ${PCI::AbstractDevice.ref} workaround = ${rtx_pci_dev.pci_device}; | |
2261 - ${cast local.workaround as PCI::AbstractDevice}; | |
2262 - { /* XXX: I end up with a placeholder if I don't open a scope */ | |
2263 - ${local.rtx_ether_ctx.init(local.rtx_net_dev, local.workaround)}; | |
2264 - } | |
2265 - | |
2266 - /* Register ourselves in the parent context: */ | |
2267 - /* ${rtx_pci_dev.set_context(local.rtx_ether_ctx)}; */ | |
2268 - ${rtx_pci_dev}->context = rtx_ether_ctx; | |
2269 - | |
2270 - /* | |
2271 - * XXX: the asssignments/casts are here to circumvent | |
2272 - * typing issues in the compiler (see previous XXX). | |
2273 - */ | |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2274 - int bars = ${rtx_pci_dev.bars}; |
133 | 2275 - unsigned char /* __iomem */ *ioaddr = ${rtx_pci_dev.ioaddr}; |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2276 - ${cast local.bars as Builtin::number}; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2277 - ${pointcut Ethernet::adapter_init_context(local.rtx_ether_ctx, |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2278 - local.bars, |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2279 - local.ioaddr)}; |
133 | 2280 - ${pointcut Ethernet::adapter_reset(local.rtx_ether_ctx)}; |
2281 - ${pointcut Ethernet::adapter_load_mac_address(local.rtx_ether_ctx)}; | |
2282 - memcpy(${local.rtx_ether_ctx.perm_addr}, | |
2283 - ${local.rtx_ether_ctx.dev_addr}, | |
2284 - ${local.rtx_net_dev.k_net_dev}->addr_len); | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2285 } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2286 |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2287 - /* This chunk should be removed (see #26) */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2288 + /* XXX This chunk should be removed (see #26) */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2289 chunk ::CALL() |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2290 { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2291 } |
137
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2292 @@ -369,15 +382,17 @@ |
133 | 2293 */ |
2294 chunk PCI::pci_remove_hook(PCI::Device rtx_pci_dev) | |
2295 { | |
2296 - ${Ethernet::Device.ref} rtx_ether_ctx = ${rtx_pci_dev.rtx_drv_context}; | |
2297 - BUG_ON(!rtx_ether_ctx); | |
2298 + { | |
2299 + ${Ethernet::Device.ref} rtx_ether_ctx = ${rtx_pci_dev.rtx_drv_context}; | |
2300 + BUG_ON(!rtx_ether_ctx); | |
2301 | |
2302 - ${Ethernet::AbstractDevice.ref} rtx_net_dev = ${local.rtx_ether_ctx.net_device}; | |
2303 - unregister_netdev(${local.rtx_net_dev.k_net_dev}); | |
2304 - free_netdev(${local.rtx_net_dev.k_net_dev}); | |
2305 + ${Ethernet::AbstractDevice.ref} rtx_net_dev = ${local.rtx_ether_ctx.net_device}; | |
2306 + unregister_netdev(${local.rtx_net_dev.k_net_dev}); | |
2307 + free_netdev(${local.rtx_net_dev.k_net_dev}); | |
2308 + } | |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2309 } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2310 |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2311 - /* This chunk should be removed (see #26) */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2312 + /* XXX This chunk should be removed (see #26) */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2313 chunk ::CALL() |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2314 { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2315 } |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2316 diff --git a/rathaxes/samples/e1000/ethernet.rti b/rathaxes/samples/e1000/ethernet.rti |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2317 --- a/rathaxes/samples/e1000/ethernet.rti |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2318 +++ b/rathaxes/samples/e1000/ethernet.rti |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2319 @@ -2,16 +2,16 @@ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2320 { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2321 required variable Builtin::string ifname; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2322 |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2323 - provided type ProtocolId |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2324 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2325 - chunk LKM::prototypes(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2326 - chunk LKM::data(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2327 - chunk LKM::code(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2328 - decl data_types(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2329 + provided type ProtocolId |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2330 + { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2331 + chunk LKM::prototypes(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2332 + chunk LKM::data(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2333 + chunk LKM::code(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2334 + decl data_types(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2335 |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2336 - attribute Builtin::number.scalar id; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2337 - attribute Builtin::string.scalar str; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2338 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2339 + attribute Builtin::number.scalar id; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2340 + attribute Builtin::string.scalar str; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2341 + } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2342 |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2343 provided type AbstractDevice |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2344 { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2345 @@ -28,72 +28,88 @@ |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2346 |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2347 provided type Device |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2348 { |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2349 + decl data_types(); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2350 + |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2351 chunk LKM::includes(); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2352 - decl data_types(); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2353 + chunk LKM::prototypes(); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2354 + chunk LKM::code(); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2355 + |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2356 pointcut Ethernet::HardwareContext(); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2357 |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2358 method init(Ethernet::AbstractDevice, PCI::AbstractDevice); |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2359 - /* |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2360 - * Alloc (the AbstractSKBuff inside) the given SKBuff and initialize |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2361 - * the SKBuff, return 1 if the allocation failed, 0 on success. |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2362 - */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2363 + |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2364 + // Alloc (the AbstractSKBuff inside) the given SKBuff and initialize |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2365 + // the SKBuff, return 1 if the allocation failed, 0 on success: |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2366 method alloc_rx_skbuff(Socket::SKBuff, Builtin::number); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2367 |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2368 attribute Device::AbstractDevice.ref device; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2369 attribute PCI::AbstractDevice.ref pci_device; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2370 attribute Ethernet::AbstractDevice.ref net_device; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2371 - /* |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2372 - * I'd like to use better names here, but I'd like to understand the |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2373 - * difference between the two first: |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2374 - */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2375 + |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2376 + // I'd like to use better names here, but I'd like to understand the |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2377 + // difference between the two first: |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2378 attribute Builtin::symbol.ref perm_addr; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2379 attribute Builtin::symbol.ref dev_addr; |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2380 attribute Builtin::symbol.scalar irq; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2381 } |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2382 |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2383 - required sequence open(Ethernet::Device) |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2384 + provided sequence open() |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2385 { |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2386 - provided chunk LKM::includes(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2387 - provided chunk LKM::prototypes(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2388 - provided chunk LKM::code(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2389 + provided chunk LKM::includes(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2390 + provided chunk LKM::prototypes(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2391 + provided chunk LKM::code(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2392 |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2393 - /* |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2394 - * For e1000, this part is documented in the Intel Gigabit Ethernet |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2395 - * Controller Software Developper manual. (You can find it in the |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2396 - * doc/hardware directory). |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2397 - */ |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2398 - provided pointcut Ethernet::adapter_setup(Ethernet::Device); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2399 - provided pointcut Ethernet::adapter_init_rx(Ethernet::Device); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2400 - provided pointcut Ethernet::adapter_init_tx(Ethernet::Device); |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2401 + // Prepare the device and the resources for rx/tx: |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2402 + provided pointcut Ethernet::adapter_setup_rx_tx(Ethernet::Device); |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2403 + |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2404 + // Enable interrupts: |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2405 + provided pointcut Ethernet::adapter_enable_interrupts(Ethernet::Device); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2406 } |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2407 |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2408 - required sequence send(Ethernet::Device, Socket::AbstractSKBuff) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2409 + provided sequence send() |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2410 { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2411 - provided chunk LKM::prototypes(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2412 - provided chunk LKM::code(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2413 + provided chunk LKM::prototypes(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2414 + provided chunk LKM::code(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2415 + |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2416 + // Put a packet on the tx ring and signal the device: |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2417 + provided pointcut Ethernet::adapter_xmit(Ethernet::Device, Socket::SKBuff); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2418 } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2419 |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2420 - required sequence close(Ethernet::Device) |
133 | 2421 + provided sequence close() |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2422 { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2423 - provided chunk LKM::prototypes(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2424 - provided chunk LKM::code(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2425 + provided chunk LKM::prototypes(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2426 + provided chunk LKM::code(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2427 + |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2428 + provided pointcut Ethernet::adapter_disable_rx(Ethernet::Device); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2429 + provided pointcut Ethernet::adapter_disable_tx(Ethernet::Device); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2430 + provided pointcut Ethernet::adapter_disable_interrupts(Ethernet::Device); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2431 + |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2432 + // Clean and free all resources on the rx/tx rings: |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2433 + provided pointcut Ethernet::adapter_free_rx_tx(Ethernet::Device); |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2434 } |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2435 |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2436 - required sequence interrupt_handler(Ethernet::Device) |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2437 + provided sequence interrupt_handler() |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2438 { |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2439 - provided chunk LKM::prototypes(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2440 - provided chunk LKM::code(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2441 + provided chunk LKM::prototypes(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2442 + provided chunk LKM::code(); |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2443 + |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2444 + // Interrupt handler: |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2445 + provided pointcut Ethernet::adapter_handle_interrupt(Ethernet::Device); |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2446 } |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2447 |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2448 - provided sequence init() |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2449 + provided sequence init() |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2450 { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2451 - provided chunk LKM::data(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2452 - provided chunk PCI::pci_probe_hook(PCI::Device); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2453 + provided chunk LKM::data(); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2454 + provided chunk PCI::pci_probe_hook(PCI::Device); |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2455 |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2456 - provided pointcut Ethernet::adapter_init_context(Ethernet::Device, |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2457 - Builtin::number, |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2458 - Builtin::symbol); |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2459 + // Init the hardware context structure, doesn't allocate anything: |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2460 + provided pointcut Ethernet::adapter_init_context(Ethernet::Device, Builtin::symbol); |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2461 + |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2462 + // Reset the adapter: |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2463 provided pointcut Ethernet::adapter_reset(Ethernet::Device); |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2464 + |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2465 + // Load the MAC address from the EEPROM and save it into the |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2466 + // dev_addr field/attribute of Ethernet::Device: |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2467 provided pointcut Ethernet::adapter_load_mac_address(Ethernet::Device); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2468 } |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2469 |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2470 diff --git a/rathaxes/samples/e1000/lkm.rtx b/rathaxes/samples/e1000/lkm.rtx |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2471 --- a/rathaxes/samples/e1000/lkm.rtx |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2472 +++ b/rathaxes/samples/e1000/lkm.rtx |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2473 @@ -1,40 +1,5 @@ |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2474 device LKM use LKM, PCI, Ethernet, Log, Socket |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2475 { |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2476 - Ethernet::open(Ethernet::Device dev) |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2477 - { |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2478 - Log::info("opening the device"); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2479 - |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2480 - e1000::activate_device_interruption(dev); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2481 - Log::info("interruption enabled"); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2482 - |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2483 - e1000::print_status(dev); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2484 - } |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2485 - |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2486 - Ethernet::close(Ethernet::Device dev) |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2487 - { |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2488 - Log::info("closing the device"); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2489 - |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2490 - /* |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2491 - * Note: some calls to release resources must be done when IRQs are |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2492 - * enabled (dma_free_coherent() for example). So we have to cleanup our |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2493 - * stuff before free_interrupt_handler(). |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2494 - */ |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2495 - e1000::free_rx_tx(dev); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2496 - Log::info("free'ed up rx/tx resources"); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2497 - } |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2498 - |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2499 - Ethernet::interrupt_handler(Ethernet::Device dev) |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2500 - { |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2501 - Log::info("got an interruption"); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2502 - e1000::handle_interrupt(dev); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2503 - } |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2504 - |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2505 - Ethernet::send(Ethernet::Device dev, Socket::AbstractSKBuff skb) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2506 - { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2507 - Log::info("we have one packet to transmit!"); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2508 - e1000::xmit(dev, skb); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2509 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2510 - |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2511 LKM::init() |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2512 { |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2513 Log::info("loading module"); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2514 @@ -50,7 +15,7 @@ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2515 { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2516 LKM::name = "rtx_e1k"; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2517 LKM::author = "Rathaxes"; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2518 - LKM::description = "Hello World Loadable Kernel Module (LKM)"; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2519 + LKM::description = "Rathaxes Intel PCI Gigabit NIC sample driver"; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2520 LKM::license = "GPL"; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2521 |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2522 /* |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2523 diff --git a/rathaxes/samples/e1000/e1000.blt b/rathaxes/samples/e1000/old_e1000.blt |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2524 copy from rathaxes/samples/e1000/e1000.blt |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2525 copy to rathaxes/samples/e1000/old_e1000.blt |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2526 --- a/rathaxes/samples/e1000/e1000.blt |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2527 +++ b/rathaxes/samples/e1000/old_e1000.blt |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2528 @@ -170,14 +170,15 @@ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2529 for (i = 0; i != ${config.rx_ring_size}; ++i) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2530 { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2531 ${Socket::SKBuff.ref} skbuff = &hw_ctx->rx_ring.skbuffs[i]; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2532 - // XXX #46: ${rtx_ether_ctx.init_rx_skbuff(local.skbuff, config.rx_buffer_len)}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2533 - if (rtx_ethernet_init_rx_skbuff(${local.skbuff}, ${config.rx_buffer_len})) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2534 + // XXX #46: ${rtx_ether_ctx.alloc_rx_skbuff(local.skbuff, config.rx_buffer_len)}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2535 + if (rtx_ethernet_alloc_rx_skbuff(${local.skbuff}, ${config.rx_buffer_len})) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2536 { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2537 ${Log::info("adapter_init_rx: cannot allocate a skbuff for the rx ring")}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2538 goto err_skbuffs_alloc; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2539 } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2540 - // XXX #46: ${local.skbuff.map_from(rtx_ether_ctx.device)}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2541 - if (rtx_socket_skbuff_map(${local.skbuff}, ${rtx_ether_ctx.device}, RTX_DMA_FROM_DEVICE)) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2542 + /* XXX: recuperer le dma handle et le placer correctement dans le descripteur. */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2543 + ${DMA::map(local.rtx_ether_ctx.device, local.skbuff.data, local.skbuff.len, RTX_DMA_FROM_DEVICE)} |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2544 + if (${DMA::map(local.rtx_ether_ctx.device, local.skbuff.data, local.skbuff.len, RTX_DMA_FROM_DEVICE)}) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2545 { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2546 ${Log::info("adapter_init_rx: cannot dma-map a skbuff for the rx ring")}; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2547 goto err_skbuffs_map; |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2548 diff --git a/rathaxes/samples/e1000/e1000.rti b/rathaxes/samples/e1000/old_e1000.rti |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2549 copy from rathaxes/samples/e1000/e1000.rti |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2550 copy to rathaxes/samples/e1000/old_e1000.rti |
137
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2551 diff --git a/rathaxes/samples/e1000/pci.blt b/rathaxes/samples/e1000/pci.blt |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2552 --- a/rathaxes/samples/e1000/pci.blt |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2553 +++ b/rathaxes/samples/e1000/pci.blt |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2554 @@ -73,9 +73,8 @@ |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2555 |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2556 method init(PCI::AbstractDevice pdev) |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2557 { |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2558 - ${PCI::AbstractDevice.ref} workaround = (${PCI::AbstractDevice.ref})pdev; |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2559 ${self}->pdev = ${pdev}; |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2560 - ${self}->bars = pci_select_bars(${local.workaround.k_pci_dev}, IORESOURCE_MEM); |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2561 + ${self}->bars = pci_select_bars(${pdev.k_pci_dev}, IORESOURCE_MEM); |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2562 ${self}->ioaddr = NULL; |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2563 ${self}->context = NULL; |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2564 } |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2565 @@ -98,7 +97,7 @@ |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2566 |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2567 method set_rtx_drv_context(Builtin::symbol ctx) |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2568 { |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2569 - ${self}->context = ctx; |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2570 + ${self.rtx_drv_context} = ${ctx}; |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2571 } |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2572 |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2573 map |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2574 @@ -127,7 +126,7 @@ |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2575 const struct pci_device_id *pdev_id) |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2576 { |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2577 int error; |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2578 - ${PCI::Device.ref} rtx_pci_dev; |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2579 + ${PCI::Device.ref} rtx_pci_dev = NULL; |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2580 ${PCI::AbstractDevice.ref} rtx_pdev = (${PCI::AbstractDevice.ref})pdev; |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2581 |
8bbdb488f6fe
Wip, cleaning up the probe function
Louis Opter <kalessin@kalessin.fr>
parents:
136
diff
changeset
|
2582 rtx_pci_dev = kmalloc(sizeof(*rtx_pci_dev), GFP_KERNEL); |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2583 diff --git a/rathaxes/samples/e1000/socket.blt b/rathaxes/samples/e1000/socket.blt |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2584 --- a/rathaxes/samples/e1000/socket.blt |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2585 +++ b/rathaxes/samples/e1000/socket.blt |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2586 @@ -22,16 +22,12 @@ |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2587 { |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2588 decl data_types() |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2589 { |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2590 - ${Socket::AbstractSKBuff.ref} skbuff; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2591 - ${DMA::AbstractDMAHandle.scalar} dma_handle; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2592 - unsigned int size; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2593 + ${Socket::AbstractSKBuff.ref} skbuff; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2594 } |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2595 |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2596 chunk LKM::prototypes() |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2597 { |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2598 static void rtx_socket_skbuff_dump_infos(${Socket::SKBuff.ref}); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2599 - static int rtx_socket_skbuff_map(${Socket::SKBuff.ref}, ${Device::AbstractDevice.ref}, ${DMA::DMADirection.scalar}); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2600 - static void rtx_socket_skbuff_unmap_and_free(${Socket::SKBuff.ref}, ${Device::AbstractDevice.ref}, ${DMA::DMADirection.scalar}); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2601 } |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2602 |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2603 chunk LKM::code() |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2604 @@ -52,98 +48,29 @@ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2605 * arguments yet. |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2606 */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2607 pr_info( |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2608 - "\t protocol = %#-5x (%s) ip_summed = %d (%s)\n" |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2609 - "\t len = %-5u data_len = %-5u head_len = %-5u\n" |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2610 - "\t nr_frags = %u\n" |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2611 - "\t gso_size = %-5u gso_segs = %-5u gso_type = %-5u", |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2612 - /* XXX: can't use ${local.ethernet_proto.id} here (issue #52): */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2613 - ethernet_proto.id, ${local.ethernet_proto.str}, |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2614 - ${local.self.sk_buff.k_sk_buff}->ip_summed, ip_summed_values[${local.self.sk_buff.k_sk_buff}->ip_summed], |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2615 - ${local.self.sk_buff.k_sk_buff}->len, ${local.self.sk_buff.k_sk_buff}->data_len, skb_headlen(${local.self.sk_buff.k_sk_buff}), |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2616 - shinfo->nr_frags, shinfo->gso_size, shinfo->gso_segs, shinfo->gso_type |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2617 + "\t protocol = %#-5x (%s) ip_summed = %d (%s)\n" |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2618 + "\t len = %-5u data_len = %-5u head_len = %-5u\n" |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2619 + "\t nr_frags = %u\n" |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2620 + "\t gso_size = %-5u gso_segs = %-5u gso_type = %-5u", |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2621 + /* XXX: can't use ${local.ethernet_proto.id} here (issue #52): */ |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2622 + ethernet_proto.id, ${local.ethernet_proto.str}, |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2623 + ${local.self.sk_buff.k_sk_buff}->ip_summed, ip_summed_values[${local.self.sk_buff.k_sk_buff}->ip_summed], |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2624 + ${local.self.sk_buff.k_sk_buff}->len, ${local.self.sk_buff.k_sk_buff}->data_len, skb_headlen(${local.self.sk_buff.k_sk_buff}), |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2625 + shinfo->nr_frags, shinfo->gso_size, shinfo->gso_segs, shinfo->gso_type |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2626 ); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2627 } |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2628 - |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2629 - static int rtx_socket_skbuff_map(${Socket::SKBuff.ref} self, |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2630 - ${Device::AbstractDevice.ref} dev, |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2631 - ${DMA::DMADirection.scalar} direction) |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2632 - { |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2633 - WARN_ON(!${local.self.sk_buff}); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2634 - WARN_ON(${local.self.dma_handle}); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2635 - /* |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2636 - * TODO: we don't support skbuffs with paged data yet (see also |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2637 - * http://vger.kernel.org/~davem/skb_data.html). |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2638 - */ |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2639 - WARN_ON(skb_is_nonlinear(${local.self.sk_buff.k_sk_buff})); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2640 - |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2641 - unsigned int len = ${local.self.size}; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2642 - ${cast local.len as Builtin::number}; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2643 - ${local.self.dma_handle} = ${DMA::map(local.dev, local.self.sk_buff.k_sk_buff, local.len, local.direction)}; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2644 - int err = ${DMA::mapping_error(local.dev, local.self.dma_handle)}; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2645 - if (err) |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2646 - { |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2647 - ${local.self.dma_handle} = 0; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2648 - return err; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2649 - } |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2650 - return 0; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2651 - } |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2652 - |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2653 - static void rtx_socket_skbuff_unmap_and_free(${Socket::SKBuff.ref} self, |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2654 - ${Device::AbstractDevice.ref} dev, |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2655 - ${DMA::DMADirection} direction) |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2656 - { |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2657 - WARN_ON(!${local.self.sk_buff}); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2658 - WARN_ON(skb_is_nonlinear(${local.self.sk_buff.k_sk_buff}); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2659 - |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2660 - if (${local.self.dma_handle}) |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2661 - { |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2662 - unsigned int len = ${local.self.size}; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2663 - ${cast local.len as Builtin::number}; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2664 - ${DMA::unmap(local.dev, local.self.dma_handle, local.len, local.direction)}; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2665 - ${local.self.dma_handle} = 0; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2666 - } |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2667 - dev_kfree_skb_any(${local.self.sk_buff.k_sk_buff}); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2668 - ${local.self.sk_buff} = NULL; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2669 - } |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2670 } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2671 |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2672 - /* |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2673 - * XXX: the rathaxes argument kernel_skb is not actually bound to the |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2674 - * correct C variable from Ethernet::send() (so I named it as the C |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2675 - * variable I needed) |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2676 - */ |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2677 - method init(Socket::AbstractSKBuff kernel_skb, Builtin::number size) |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2678 + method init(Socket::AbstractSKBuff k_skb) |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2679 { |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2680 - ${self.sk_buff} = ${kernel_skb}; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2681 - ${self.size} = ${size}; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2682 - ${self.dma_handle} = 0; |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2683 + ${self} = (${Socket::SKBuff.ref})(${k_skb}); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2684 } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2685 |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2686 - method dump_infos() |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2687 + method dump_infos() |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2688 { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2689 rtx_socket_skbuff_dump_infos(${self}); |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2690 } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2691 |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2692 - method map_to(Device::AbstractDevice dev) |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2693 - { |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2694 - rtx_socket_skbuff_map(${self}, ${dev}, RTX_DMA_TO_DEVICE); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2695 - } |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2696 - |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2697 - method map_from(Device::AbstractDevice dev) |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2698 - { |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2699 - rtx_socket_skbuff_map(${self}, ${dev}, RTX_DMA_FROM_DEVICE); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2700 - } |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2701 - |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2702 - method unmap_to_and_free(Device::AbstractDevice dev) |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2703 - { |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2704 - rtx_socket_skbuff_unmap_and_free(${self}, ${dev}, RTX_DMA_TO_DEVICE); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2705 - } |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2706 - |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2707 - method unmap_from_and_free(Device::AbstractDevice dev) |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2708 - { |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2709 - rtx_socket_skbuff_unmap_and_free(${self}, ${dev}, RTX_DMA_FROM_DEVICE); |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2710 - } |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2711 - |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2712 map |
132
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2713 { |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2714 // Some work may have to be done here in order to access to some |
f2e4dd91dc6f
Wip, leave some "functions" empty but start some build tests
Louis Opter <kalessin@kalessin.fr>
parents:
131
diff
changeset
|
2715 @@ -151,13 +78,9 @@ |
131
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2716 // management can be abstracted from the user. But this is at least |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2717 // useful for internal use: |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2718 sk_buff: (${self})->skbuff; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2719 - // XXX: We need to cast here so we can do things like |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2720 - // var.dma_handle = 0; but the type shouldn't be hardcoded (at the |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2721 - // same time ${DMA:AbstractDMAHandle} couldn't be used because that |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2722 - // would yield to a struct type which you can't assign directly; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2723 - // but maybe doing the ->data in that case would be acceptable). |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2724 - dma_handle: (*((dma_addr_t *)&(${self})->dma_handle)); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2725 - size: (${self})->size; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2726 + |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2727 + data: ((struct sk_buff *)((${self})->sk_buff))->data; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2728 + len: ((struct sk_buff *)((${self})->sk_buff))->len; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2729 } |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2730 } |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2731 } |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2732 diff --git a/rathaxes/samples/e1000/socket.rti b/rathaxes/samples/e1000/socket.rti |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2733 --- a/rathaxes/samples/e1000/socket.rti |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2734 +++ b/rathaxes/samples/e1000/socket.rti |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2735 @@ -12,20 +12,14 @@ |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2736 { |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2737 chunk LKM::prototypes(); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2738 chunk LKM::code(); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2739 + |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2740 decl data_types(); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2741 - method init(Socket::AbstractSKBuff, Builtin::number); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2742 + |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2743 + method init(Socket::AbstractSKBuff); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2744 method dump_infos(); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2745 - /* |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2746 - * map_to and map_from return a non-zero value on failure (which |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2747 - * doesn't correspond to an errno value): |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2748 - */ |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2749 - method map_to(Device::AbstractDevice); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2750 - method map_from(Device::AbstractDevice); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2751 - method unmap_to_and_free(Device::AbstractDevice); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2752 - method unmap_from_and_free(Device::AbstractDevice); |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2753 |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2754 - attribute Socket::AbstractSKBuff.ref sk_buff; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2755 - attribute DMA::AbstractDMAHandle.scalar dma_handle; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2756 - attribute Builtin::number.scalar size; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2757 + attribute Socket::AbstractSKBuff.ref sk_buff; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2758 + attribute Builtin::symbol.ref data; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2759 + attribute Builtin::number.scalar len; |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2760 } |
c209851a82de
Wip, start a rewrite of the e1000 device dependent code
Louis Opter <kalessin@kalessin.fr>
parents:
diff
changeset
|
2761 } |