FPGA/corundum
1
0
Fork 0
mirror of https://github.com/corundum/corundum.git synced 2025-02-06 08:38:23 +08:00
Code Issues Projects Releases Wiki Activity

Add get_id to Function, use set_completion_data

Browse Source
This commit is contained in:
Alex Forencich 2018-09-28 16:42:17 -07:00
parent 7c184bee59
commit 1f968f1aea
1 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
tb/pcie.py
View File

@ -1427,6 +1427,9 @@ class Function(PMCapability, PCIECapability):
super(Function, self).__init__(*args, **kwargs) super(Function, self).__init__(*args, **kwargs)
def get_id(self):
return (self.bus_num, self.device_num, self.function_num)
def get_desc(self): def get_desc(self):
return "%02x:%02x.%x %s" % (self.bus_num, self.device_num, self.function_num, self.desc) return "%02x:%02x.%x %s" % (self.bus_num, self.device_num, self.function_num, self.desc)
@ -1760,7 +1763,7 @@ class Function(PMCapability, PCIECapability):
# prepare completion TLP # prepare completion TLP
cpl = TLP() cpl = TLP()
cpl.set_completion(tlp, (self.bus_num, self.device_num, self.function_num)) cpl.set_completion(tlp, self.get_id())
# perform operation # perform operation
if (tlp.fmt, tlp.type) == TLP_CFG_READ_0: if (tlp.fmt, tlp.type) == TLP_CFG_READ_0:
@ -1790,7 +1793,7 @@ class Function(PMCapability, PCIECapability):
while n < length: while n < length:
tlp = TLP() tlp = TLP()
tlp.fmt, tlp.type = TLP_IO_READ tlp.fmt, tlp.type = TLP_IO_READ
tlp.requester_id = (self.bus_num, self.device_num, self.function_num) tlp.requester_id = self.get_id()
tlp.tag = self.current_tag tlp.tag = self.current_tag
first_pad = addr % 4 first_pad = addr % 4
@ -1828,7 +1831,7 @@ class Function(PMCapability, PCIECapability):
while n < len(data): while n < len(data):
tlp = TLP() tlp = TLP()
tlp.fmt, tlp.type = TLP_IO_WRITE tlp.fmt, tlp.type = TLP_IO_WRITE
tlp.requester_id = (self.bus_num, self.device_num, self.function_num) tlp.requester_id = self.get_id()
tlp.tag = self.current_tag tlp.tag = self.current_tag
first_pad = addr % 4 first_pad = addr % 4
@ -1864,7 +1867,7 @@ class Function(PMCapability, PCIECapability):
tlp.fmt, tlp.type = TLP_MEM_READ_64 tlp.fmt, tlp.type = TLP_MEM_READ_64
else: else:
tlp.fmt, tlp.type = TLP_MEM_READ tlp.fmt, tlp.type = TLP_MEM_READ
tlp.requester_id = (self.bus_num, self.device_num, self.function_num) tlp.requester_id = self.get_id()
tlp.tag = self.current_tag tlp.tag = self.current_tag
first_pad = addr % 4 first_pad = addr % 4
@ -1917,7 +1920,7 @@ class Function(PMCapability, PCIECapability):
tlp.fmt, tlp.type = TLP_MEM_WRITE_64 tlp.fmt, tlp.type = TLP_MEM_WRITE_64
else: else:
tlp.fmt, tlp.type = TLP_MEM_WRITE tlp.fmt, tlp.type = TLP_MEM_WRITE
tlp.requester_id = (self.bus_num, self.device_num, self.function_num) tlp.requester_id = self.get_id()
tlp.tag = self.current_tag tlp.tag = self.current_tag
first_pad = addr % 4 first_pad = addr % 4
@ -2084,8 +2087,7 @@ class MemoryEndpoint(Endpoint):
# prepare completion TLP # prepare completion TLP
cpl = TLP() cpl = TLP()
cpl.set_completion(tlp, (self.bus_num, self.device_num, self.function_num)) cpl.set_completion_data(tlp, self.get_id())
cpl.fmt, cpl.type = TLP_CPL_DATA
region = m[0][0] region = m[0][0]
addr = m[0][1] addr = m[0][1]
@ -2093,7 +2095,7 @@ class MemoryEndpoint(Endpoint):
start_offset = None start_offset = None
mask = tlp.first_be mask = tlp.first_be
# perform operation # perform read
data = bytearray(4) data = bytearray(4)
for k in range(4): for k in range(4):
@ -2124,7 +2126,7 @@ class MemoryEndpoint(Endpoint):
# Unsupported request # Unsupported request
cpl = TLP() cpl = TLP()
cpl.set_ur_completion(tlp, (self.bus_num, self.device_num, self.function_num)) cpl.set_ur_completion(tlp, self.get_id())
# logging # logging
print("[%s] UR Completion: %s" % (highlight(self.get_desc()), repr(cpl))) print("[%s] UR Completion: %s" % (highlight(self.get_desc()), repr(cpl)))
yield self.send(cpl) yield self.send(cpl)
@ -2137,7 +2139,7 @@ class MemoryEndpoint(Endpoint):
# prepare completion TLP # prepare completion TLP
cpl = TLP() cpl = TLP()
cpl.set_completion(tlp, (self.bus_num, self.device_num, self.function_num)) cpl.set_completion(tlp, self.get_id())
region = m[0][0] region = m[0][0]
addr = m[0][1] addr = m[0][1]
@ -2145,7 +2147,7 @@ class MemoryEndpoint(Endpoint):
start_offset = None start_offset = None
mask = tlp.first_be mask = tlp.first_be
# perform operation # perform write
data = tlp.get_data() data = tlp.get_data()
for k in range(4): for k in range(4):
@ -2172,7 +2174,7 @@ class MemoryEndpoint(Endpoint):
# Unsupported request # Unsupported request
cpl = TLP() cpl = TLP()
cpl.set_ur_completion(tlp, (self.bus_num, self.device_num, self.function_num)) cpl.set_ur_completion(tlp, self.get_id())
# logging # logging
print("[%s] UR Completion: %s" % (highlight(self.get_desc()), repr(cpl))) print("[%s] UR Completion: %s" % (highlight(self.get_desc()), repr(cpl)))
yield self.send(cpl) yield self.send(cpl)
@ -2201,7 +2203,7 @@ class MemoryEndpoint(Endpoint):
while n < length: while n < length:
cpl = TLP() cpl = TLP()
cpl.set_completion(tlp, (self.bus_num, self.device_num, self.function_num)) cpl.set_completion_data(tlp, self.get_id())
byte_length = length-n byte_length = length-n
cpl.byte_count = byte_length cpl.byte_count = byte_length
@ -2227,7 +2229,7 @@ class MemoryEndpoint(Endpoint):
# Unsupported request # Unsupported request
cpl = TLP() cpl = TLP()
cpl.set_ur_completion(tlp, (self.bus_num, self.device_num, self.function_num)) cpl.set_ur_completion(tlp, self.get_id())
# logging # logging
print("[%s] UR Completion: %s" % (highlight(self.get_desc()), repr(cpl))) print("[%s] UR Completion: %s" % (highlight(self.get_desc()), repr(cpl)))
yield self.send(cpl) yield self.send(cpl)
@ -2447,7 +2449,7 @@ class Bridge(Function):
elif ((tlp.fmt, tlp.type) == TLP_CPL or (tlp.fmt, tlp.type) == TLP_CPL_DATA or elif ((tlp.fmt, tlp.type) == TLP_CPL or (tlp.fmt, tlp.type) == TLP_CPL_DATA or
(tlp.fmt, tlp.type) == TLP_CPL_LOCKED or (tlp.fmt, tlp.type) == TLP_CPL_LOCKED_DATA): (tlp.fmt, tlp.type) == TLP_CPL_LOCKED or (tlp.fmt, tlp.type) == TLP_CPL_LOCKED_DATA):
# Completions # Completions
if not self.root and tlp.requester_id == (self.bus_num, self.device_num, self.function_num): if not self.root and tlp.requester_id == self.get_id():
# for me # for me
yield self.handle_tlp(tlp) yield self.handle_tlp(tlp)
elif self.sec_bus_num <= tlp.requester_id[0] <= self.sub_bus_num: elif self.sec_bus_num <= tlp.requester_id[0] <= self.sub_bus_num:
@ -2457,7 +2459,7 @@ class Bridge(Function):
pass pass
elif (tlp.fmt, tlp.type) == TLP_MSG_ID or (tlp.fmt, tlp.type) == TLP_MSG_DATA_ID: elif (tlp.fmt, tlp.type) == TLP_MSG_ID or (tlp.fmt, tlp.type) == TLP_MSG_DATA_ID:
# ID routed message # ID routed message
if not self.root and tlp.dest_id == (self.bus_num, self.device_num, self.function_num): if not self.root and tlp.dest_id == self.get_id():
# for me # for me
yield self.handle_tlp(tlp) yield self.handle_tlp(tlp)
elif self.sec_bus_num <= tlp.dest_id[0] <= self.sub_bus_num: elif self.sec_bus_num <= tlp.dest_id[0] <= self.sub_bus_num:
@ -2521,7 +2523,7 @@ class Bridge(Function):
elif ((tlp.fmt, tlp.type) == TLP_CPL or (tlp.fmt, tlp.type) == TLP_CPL_DATA or elif ((tlp.fmt, tlp.type) == TLP_CPL or (tlp.fmt, tlp.type) == TLP_CPL_DATA or
(tlp.fmt, tlp.type) == TLP_CPL_LOCKED or (tlp.fmt, tlp.type) == TLP_CPL_LOCKED_DATA): (tlp.fmt, tlp.type) == TLP_CPL_LOCKED or (tlp.fmt, tlp.type) == TLP_CPL_LOCKED_DATA):
# Completions # Completions
if not self.root and tlp.requester_id == (self.bus_num, self.device_num, self.function_num): if not self.root and tlp.requester_id == self.get_id():
# for me # for me
yield self.handle_tlp(tlp) yield self.handle_tlp(tlp)
elif self.sec_bus_num <= tlp.requester_id[0] <= self.sub_bus_num: elif self.sec_bus_num <= tlp.requester_id[0] <= self.sub_bus_num:
@ -2533,7 +2535,7 @@ class Bridge(Function):
yield self.upstream_send(tlp) yield self.upstream_send(tlp)
elif (tlp.fmt, tlp.type) == TLP_MSG_ID or (tlp.fmt, tlp.type) == TLP_MSG_DATA_ID: elif (tlp.fmt, tlp.type) == TLP_MSG_ID or (tlp.fmt, tlp.type) == TLP_MSG_DATA_ID:
# ID routed messages # ID routed messages
if not self.root and tlp.dest_id == (self.bus_num, self.device_num, self.function_num): if not self.root and tlp.dest_id == self.get_id():
# for me # for me
yield self.handle_tlp(tlp) yield self.handle_tlp(tlp)
elif self.sec_bus_num <= tlp.dest_id[0] <= self.sub_bus_num: elif self.sec_bus_num <= tlp.dest_id[0] <= self.sub_bus_num:
@ -2850,7 +2852,7 @@ class TreeItem(object):
self.children = [] self.children = []
def find_dev(self, b, d, f): def find_dev(self, b, d, f):
if (b, d, f) == (self.bus_num, self.device_num, self.function_num): if (b, d, f) == self.get_id():
return self return self
for c in self.children: for c in self.children:
res = c.find_dev(b, d, f) res = c.find_dev(b, d, f)
@ -3104,15 +3106,14 @@ class RootComplex(Switch):
# prepare completion TLP # prepare completion TLP
cpl = TLP() cpl = TLP()
cpl.set_completion(tlp, (0, 0, 0)) cpl.set_completion_data(tlp, (0, 0, 0))
cpl.fmt, cpl.type = TLP_CPL_DATA
addr = tlp.address addr = tlp.address
offset = 0 offset = 0
start_offset = None start_offset = None
mask = tlp.first_be mask = tlp.first_be
# perform operation # perform read
data = bytearray(4) data = bytearray(4)
for k in range(4): for k in range(4):
@ -3162,7 +3163,7 @@ class RootComplex(Switch):
start_offset = None start_offset = None
mask = tlp.first_be mask = tlp.first_be
# perform operation # perform write
data = tlp.get_data() data = tlp.get_data()
for k in range(4): for k in range(4):
@ -3220,7 +3221,7 @@ class RootComplex(Switch):
while n < length: while n < length:
cpl = TLP() cpl = TLP()
cpl.set_completion(tlp, (0, 0, 0)) cpl.set_completion_data(tlp, (0, 0, 0))
byte_length = length-n byte_length = length-n
cpl.byte_count = byte_length cpl.byte_count = byte_length