Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
S
Simple PCIe FMC carrier SPEC
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
50
Issues
50
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
Simple PCIe FMC carrier SPEC
Commits
030ac0fe
Commit
030ac0fe
authored
May 12, 2020
by
Federico Vaga
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'release/v1.4.12'
parents
b5348bb5
d70eafc6
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
45 additions
and
8 deletions
+45
-8
CHANGELOG.rst
CHANGELOG.rst
+9
-0
Manifest.py
hdl/rtl/Manifest.py
+14
-1
spec_base_wr.vhd
hdl/rtl/spec_base_wr.vhd
+13
-3
gn412x-gpio.c
software/kernel/gn412x-gpio.c
+0
-2
spec-core.c
software/kernel/spec-core.c
+9
-2
No files found.
CHANGELOG.rst
View file @
030ac0fe
...
...
@@ -2,6 +2,15 @@
Changelog
=========
[1.4.12] 2020-05-12
===================
Added
-----
- [hdl] metadata source-id automatic assignment
Changed
-----
- [sw] do not double remap memory
[1.4.11] 2020-05-04
===================
...
...
hdl/rtl/Manifest.py
View file @
030ac0fe
files
=
[
"spec_base_regs.vhd"
,
"spec_base_wr.vhd"
]
files
=
[
"spec_base_regs.vhd"
,
"spec_base_wr.vhd"
,
"sourceid_spec_base_pkg.vhd"
,
]
try
:
# Assume this module is in fact a git submodule of a main project that
# is in the same directory as general-cores...
exec
(
open
(
"../../../"
+
"/general-cores/tools/gen_sourceid.py"
)
.
read
(),
None
,
{
'project'
:
'spec_base'
})
except
Exception
as
e
:
print
(
"Error: cannot generate source id file"
)
raise
hdl/rtl/spec_base_wr.vhd
View file @
030ac0fe
...
...
@@ -36,6 +36,7 @@ use work.wr_spec_pkg.all;
use
work
.
buildinfo_pkg
.
all
;
use
work
.
wr_fabric_pkg
.
all
;
use
work
.
streamers_pkg
.
all
;
use
work
.
sourceid_spec_base_pkg
;
library
unisim
;
use
unisim
.
vcomponents
.
all
;
...
...
@@ -595,13 +596,22 @@ begin -- architecture top
metadata_data
<=
x"53504543"
;
when
x"2"
=>
-- Version
metadata_data
<=
x"010400
00
"
;
metadata_data
<=
x"010400
12
"
;
when
x"3"
=>
-- BOM
metadata_data
<=
x"fffe0000"
;
when
x"4"
|
x"5"
|
x"6"
|
x"7"
=>
when
x"4"
=>
-- source id
metadata_data
<=
x"00000000"
;
metadata_data
<=
sourceid_spec_base_pkg
.
sourceid
(
127
downto
96
);
when
x"5"
=>
-- source id
metadata_data
<=
sourceid_spec_base_pkg
.
sourceid
(
95
downto
64
);
when
x"6"
=>
-- source id
metadata_data
<=
sourceid_spec_base_pkg
.
sourceid
(
63
downto
32
);
when
x"7"
=>
-- source id
metadata_data
<=
sourceid_spec_base_pkg
.
sourceid
(
31
downto
0
);
when
x"8"
=>
-- capability mask
metadata_data
<=
x"00000000"
;
...
...
software/kernel/gn412x-gpio.c
View file @
030ac0fe
...
...
@@ -174,8 +174,6 @@ static void gn412x_gpio_int_cfg_enable(struct gn412x_gpio_dev *gn412x)
/**
* Disable GPIO interrupts from a single configuration space
* @gn412x gn412x device
*
* Return: 0 on success, otherwise a negative error number
*/
static
void
gn412x_gpio_int_cfg_disable
(
struct
gn412x_gpio_dev
*
gn412x
)
{
...
...
software/kernel/spec-core.c
View file @
030ac0fe
...
...
@@ -132,17 +132,24 @@ static int spec_dbg_meta(struct seq_file *s, void *offset)
void
*
iomem
;
uint32_t
app_offset
;
iomem
=
ioremap
(
r0
->
start
,
resource_size
(
r0
));
if
(
!
spec_gn412x
->
spec_fpga
)
{
iomem
=
ioremap
(
r0
->
start
,
resource_size
(
r0
));
}
else
{
iomem
=
spec_gn412x
->
spec_fpga
->
fpga
;
}
if
(
!
iomem
)
{
dev_warn
(
&
spec_gn412x
->
pdev
->
dev
,
"%s: Mapping failed
\n
"
,
__func__
);
return
-
ENOMEM
;
}
app_offset
=
ioread32
(
iomem
+
0x40
);
seq_printf_meta
(
s
,
""
,
iomem
+
SPEC_META_BASE
);
seq_puts
(
s
,
"Application:
\n
"
);
seq_printf_meta
(
s
,
" "
,
iomem
+
app_offset
);
iounmap
(
iomem
);
if
(
!
spec_gn412x
->
spec_fpga
)
iounmap
(
iomem
);
return
0
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment