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
47a08786
Commit
47a08786
authored
Sep 04, 2019
by
Federico Vaga
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sw:drv: fix after cheby mmap renaming
Signed-off-by:
Federico Vaga
<
federico.vaga@cern.ch
>
parent
0efc571f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
21 deletions
+21
-21
Makefile
software/kernel/Makefile
+1
-1
spec-core-fpga.c
software/kernel/spec-core-fpga.c
+19
-19
spec.h
software/kernel/spec.h
+1
-1
No files found.
software/kernel/Makefile
View file @
47a08786
...
...
@@ -23,7 +23,7 @@ all: modules
.PHONY
:
all modules clean help install modules_install spec-core-fpga.h
spec-core-fpga.h
:
$(CHEBY)
--gen-c
-i
$(HDL_DIR)
/rtl/spec_
templat
e_regs.cheby
>
$@
$(CHEBY)
--gen-c
-i
$(HDL_DIR)
/rtl/spec_
bas
e_regs.cheby
>
$@
modules help install modules_install
:
spec-core-fpga.h
$(MAKE)
-C
$(LINUX)
M
=
$(
shell
pwd
)
VERSION
=
$(VERSION)
CONFIG_FPGA_MGR_BACKPORT_PATH_ABS
=
$(CONFIG_FPGA_MGR_BACKPORT_PATH_ABS)
CONFIG_FPGA_MGR_BACKPORT
=
$(CONFIG_FPGA_MGR_BACKPORT)
FMC_ABS
=
$(FMC_ABS)
I2C_ABS
=
$(I2C_ABS)
$@
...
...
software/kernel/spec-core-fpga.c
View file @
47a08786
...
...
@@ -27,12 +27,12 @@ enum spec_fpga_irq_lines {
};
enum
spec_fpga_csr_offsets
{
SPEC_FPGA_CSR_APP_OFF
=
SPEC_
TEMPLAT
E_REGS_CSR
+
0x00
,
SPEC_FPGA_CSR_RESETS
=
SPEC_
TEMPLAT
E_REGS_CSR
+
0x04
,
SPEC_FPGA_CSR_FMC_PRESENT
=
SPEC_
TEMPLAT
E_REGS_CSR
+
0x08
,
SPEC_FPGA_CSR_GN4124_STATUS
=
SPEC_
TEMPLAT
E_REGS_CSR
+
0x0C
,
SPEC_FPGA_CSR_DDR_STATUS
=
SPEC_
TEMPLAT
E_REGS_CSR
+
0x10
,
SPEC_FPGA_CSR_PCB_REV
=
SPEC_
TEMPLAT
E_REGS_CSR
+
0x14
,
SPEC_FPGA_CSR_APP_OFF
=
SPEC_
BAS
E_REGS_CSR
+
0x00
,
SPEC_FPGA_CSR_RESETS
=
SPEC_
BAS
E_REGS_CSR
+
0x04
,
SPEC_FPGA_CSR_FMC_PRESENT
=
SPEC_
BAS
E_REGS_CSR
+
0x08
,
SPEC_FPGA_CSR_GN4124_STATUS
=
SPEC_
BAS
E_REGS_CSR
+
0x0C
,
SPEC_FPGA_CSR_DDR_STATUS
=
SPEC_
BAS
E_REGS_CSR
+
0x10
,
SPEC_FPGA_CSR_PCB_REV
=
SPEC_
BAS
E_REGS_CSR
+
0x14
,
};
enum
spec_fpga_csr_fields
{
...
...
@@ -40,9 +40,9 @@ enum spec_fpga_csr_fields {
};
enum
spec_fpga_therm_offsets
{
SPEC_FPGA_THERM_SERID_MSB
=
SPEC_
TEMPLAT
E_REGS_THERM_ID
+
0x0
,
SPEC_FPGA_THERM_SERID_LSB
=
SPEC_
TEMPLAT
E_REGS_THERM_ID
+
0x4
,
SPEC_FPGA_THERM_TEMP
=
SPEC_
TEMPLAT
E_REGS_THERM_ID
+
0x8
,
SPEC_FPGA_THERM_SERID_MSB
=
SPEC_
BAS
E_REGS_THERM_ID
+
0x0
,
SPEC_FPGA_THERM_SERID_LSB
=
SPEC_
BAS
E_REGS_THERM_ID
+
0x4
,
SPEC_FPGA_THERM_TEMP
=
SPEC_
BAS
E_REGS_THERM_ID
+
0x8
,
};
enum
spec_fpga_meta_cap_mask
{
...
...
@@ -92,8 +92,8 @@ static int spec_fpga_dbg_bld_info(struct seq_file *s, void *offset)
return
0
;
}
for
(
off
=
SPEC_
TEMPLAT
E_REGS_BUILDINFO
;
off
<
SPEC_
TEMPLATE_REGS_BUILDINFO
+
SPEC_TEMPLAT
E_REGS_BUILDINFO_SIZE
-
1
;
for
(
off
=
SPEC_
BAS
E_REGS_BUILDINFO
;
off
<
SPEC_
BASE_REGS_BUILDINFO
+
SPEC_BAS
E_REGS_BUILDINFO_SIZE
-
1
;
off
++
)
{
char
tmp
=
ioread8
(
spec_fpga
->
fpga
+
off
);
...
...
@@ -189,8 +189,8 @@ static struct resource spec_fpga_vic_res[] = {
{
.
name
=
"htvic-mem"
,
.
flags
=
IORESOURCE_MEM
,
.
start
=
SPEC_
TEMPLAT
E_REGS_VIC
,
.
end
=
SPEC_
TEMPLATE_REGS_VIC
+
SPEC_TEMPLAT
E_REGS_VIC_SIZE
-
1
,
.
start
=
SPEC_
BAS
E_REGS_VIC
,
.
end
=
SPEC_
BASE_REGS_VIC
+
SPEC_BAS
E_REGS_VIC_SIZE
-
1
,
},
{
.
name
=
"htvic-irq"
,
.
flags
=
IORESOURCE_IRQ
|
IORESOURCE_IRQ_HIGHLEVEL
,
...
...
@@ -242,8 +242,8 @@ static struct resource spec_fpga_dma_res[] = {
{
.
name
=
"spec-gn412x-dma-mem"
,
.
flags
=
IORESOURCE_MEM
,
.
start
=
SPEC_
TEMPLAT
E_REGS_DMA
,
.
end
=
SPEC_
TEMPLATE_REGS_DMA
+
SPEC_TEMPLAT
E_REGS_DMA_SIZE
-
1
,
.
start
=
SPEC_
BAS
E_REGS_DMA
,
.
end
=
SPEC_
BASE_REGS_DMA
+
SPEC_BAS
E_REGS_DMA_SIZE
-
1
,
},
{
.
name
=
"spec-gn412x-dma-irq-done"
,
.
flags
=
IORESOURCE_IRQ
|
IORESOURCE_IRQ_HIGHLEVEL
,
...
...
@@ -313,8 +313,8 @@ static struct resource spec_fpga_fmc_i2c_res[] = {
{
.
name
=
"i2c-ocores-mem"
,
.
flags
=
IORESOURCE_MEM
,
.
start
=
SPEC_
TEMPLAT
E_REGS_FMC_I2C
,
.
end
=
SPEC_
TEMPLATE_REGS_FMC_I2C
+
SPEC_TEMPLAT
E_REGS_FMC_I2C_SIZE
-
1
,
.
start
=
SPEC_
BAS
E_REGS_FMC_I2C
,
.
end
=
SPEC_
BASE_REGS_FMC_I2C
+
SPEC_BAS
E_REGS_FMC_I2C_SIZE
-
1
,
},
{
.
name
=
"i2c-ocores-irq"
,
.
flags
=
IORESOURCE_IRQ
|
IORESOURCE_IRQ_HIGHLEVEL
,
...
...
@@ -338,8 +338,8 @@ static struct resource spec_fpga_spi_res[] = {
{
.
name
=
"spi-ocores-mem"
,
.
flags
=
IORESOURCE_MEM
,
.
start
=
SPEC_
TEMPLAT
E_REGS_FLASH_SPI
,
.
end
=
SPEC_
TEMPLATE_REGS_FLASH_SPI
+
SPEC_TEMPLAT
E_REGS_FLASH_SPI_SIZE
-
1
,
.
start
=
SPEC_
BAS
E_REGS_FLASH_SPI
,
.
end
=
SPEC_
BASE_REGS_FLASH_SPI
+
SPEC_BAS
E_REGS_FLASH_SPI_SIZE
-
1
,
},
{
.
name
=
"spi-ocores-irq"
,
.
flags
=
IORESOURCE_IRQ
|
IORESOURCE_IRQ_HIGHLEVEL
,
...
...
software/kernel/spec.h
View file @
47a08786
...
...
@@ -67,7 +67,7 @@ enum {
enum
{
/* Metadata */
SPEC_META_BASE
=
SPEC_
TEMPLAT
E_REGS_METADATA
,
SPEC_META_BASE
=
SPEC_
BAS
E_REGS_METADATA
,
SPEC_META_VENDOR
=
SPEC_META_BASE
+
FPGA_META_VENDOR
,
SPEC_META_DEVICE
=
SPEC_META_BASE
+
FPGA_META_DEVICE
,
SPEC_META_VERSION
=
SPEC_META_BASE
+
FPGA_META_VERSION
,
...
...
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