Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1151 from fjullien/fix_wb_slave_cache_configuration 

soc: raise an error if adding a SoCRegion with incoherent cache configuration
This commit is contained in:
enjoy-digital 2022-01-06 10:12:20 +01:00 committed by GitHub
parent 153f9e9f6c 330144021b
commit 5363d61859
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
litex/soc/integration/soc.py
View File

@ -197,17 +197,24 @@ class SoCBusHandler(Module):
self.regions[name] = region self.regions[name] = region
# Else add Region. # Else add Region.
else: else:
# If Region is an IO Region is not cached. if self.check_region_is_io(region):
if not region.cached: # If Region is an IO Region it is not cached.
if not self.check_region_is_io(region): if region.cached:
self.logger.error("{} Region {}: {}.".format( self.logger.error("{} {}".format(
colorer(name), colorer(name + " Region in IO region, it can't be cached:", color="red"),
colorer("not in IO region", color="red"), str(region)))
self.logger.error(self)
raise SoCError()
else:
# If Region is not an IO Region it is cached.
if not region.cached:
self.logger.error("{} {}".format(
colorer(name + " Region not in IO region, it must be cached:", color="red"),
str(region))) str(region)))
self.logger.error(self) self.logger.error(self)
raise SoCError() raise SoCError()
self.regions[name] = region self.regions[name] = region
# Check for overlab with others IO regions. # Check for overlap with others IO regions.
overlap = self.check_regions_overlap(self.regions) overlap = self.check_regions_overlap(self.regions)
if overlap is not None: if overlap is not None:
self.logger.error("Region {} between {} and {}:".format( self.logger.error("Region {} between {} and {}:".format(