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