Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dma_ip_drivers
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
dma_ip_drivers
Commits
40eb3c5a
Commit
40eb3c5a
authored
Sep 27, 2020
by
Karen Xie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
XDMA: make clean to remove *.ur-safe files
parent
3b8295f6
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
14 additions
and
13 deletions
+14
-13
XDMA/linux-kernel/libxdma/libxdma.c
XDMA/linux-kernel/libxdma/libxdma.c
+7
-10
XDMA/linux-kernel/xdma/Makefile
XDMA/linux-kernel/xdma/Makefile
+1
-0
XDMA/linux-kernel/xdma/cdev_bypass.c
XDMA/linux-kernel/xdma/cdev_bypass.c
+1
-0
XDMA/linux-kernel/xdma/cdev_xvc.h
XDMA/linux-kernel/xdma/cdev_xvc.h
+1
-2
XDMA/linux-kernel/xdma/xdma_cdev.c
XDMA/linux-kernel/xdma/xdma_cdev.c
+0
-1
XDMA/linux-kernel/xdma/xdma_mod.c
XDMA/linux-kernel/xdma/xdma_mod.c
+4
-0
No files found.
XDMA/linux-kernel/libxdma/libxdma.c
View file @
40eb3c5a
...
@@ -1427,7 +1427,7 @@ static u32 engine_service_wb_monitor(struct xdma_engine *engine,
...
@@ -1427,7 +1427,7 @@ static u32 engine_service_wb_monitor(struct xdma_engine *engine,
else
if
(
desc_wb
>=
expected_wb
)
else
if
(
desc_wb
>=
expected_wb
)
break
;
break
;
/*
RTO -
prevent system from hanging in polled mode */
/* prevent system from hanging in polled mode */
if
(
time_after
(
jiffies
,
timeout
))
{
if
(
time_after
(
jiffies
,
timeout
))
{
dbg_tfr
(
"Polling timeout occurred"
);
dbg_tfr
(
"Polling timeout occurred"
);
dbg_tfr
(
"desc_wb = 0x%08x, expected 0x%08x
\n
"
,
desc_wb
,
dbg_tfr
(
"desc_wb = 0x%08x, expected 0x%08x
\n
"
,
desc_wb
,
...
@@ -1681,7 +1681,7 @@ static irqreturn_t xdma_channel_irq(int irq, void *dev_id)
...
@@ -1681,7 +1681,7 @@ static irqreturn_t xdma_channel_irq(int irq, void *dev_id)
schedule_work
(
&
engine
->
work
);
schedule_work
(
&
engine
->
work
);
/*
/*
*
RTO -
need to protect access here if multiple MSI-X are used for
* need to protect access here if multiple MSI-X are used for
* user interrupts
* user interrupts
*/
*/
xdev
->
irq_count
++
;
xdev
->
irq_count
++
;
...
@@ -1933,7 +1933,7 @@ fail:
...
@@ -1933,7 +1933,7 @@ fail:
*/
*/
/*
/*
*
RTO -
code to detect if MSI/MSI-X capability exists is derived
* code to detect if MSI/MSI-X capability exists is derived
* from linux/pci/msi.c - pci_msi_check_device
* from linux/pci/msi.c - pci_msi_check_device
*/
*/
...
@@ -2461,8 +2461,7 @@ static void xdma_desc_link(struct xdma_desc *first, struct xdma_desc *second,
...
@@ -2461,8 +2461,7 @@ static void xdma_desc_link(struct xdma_desc *first, struct xdma_desc *second,
* remember reserved control in first descriptor, but zero
* remember reserved control in first descriptor, but zero
* extra_adjacent!
* extra_adjacent!
*/
*/
/* RTO - what's this about? Shouldn't it be 0x0000c0ffUL? */
u32
control
=
le32_to_cpu
(
first
->
control
)
&
0x00FFC0ffUL
;
u32
control
=
le32_to_cpu
(
first
->
control
)
&
0x0000f0ffUL
;
/* second descriptor given? */
/* second descriptor given? */
if
(
second
)
{
if
(
second
)
{
/*
/*
...
@@ -2717,7 +2716,6 @@ static void engine_alignments(struct xdma_engine *engine)
...
@@ -2717,7 +2716,6 @@ static void engine_alignments(struct xdma_engine *engine)
dbg_init
(
"engine %p name %s alignments=0x%08x
\n
"
,
engine
,
engine
->
name
,
dbg_init
(
"engine %p name %s alignments=0x%08x
\n
"
,
engine
,
engine
->
name
,
(
int
)
w
);
(
int
)
w
);
/* RTO - add some macros to extract these fields */
align_bytes
=
(
w
&
0x00ff0000U
)
>>
16
;
align_bytes
=
(
w
&
0x00ff0000U
)
>>
16
;
granularity_bytes
=
(
w
&
0x0000ff00U
)
>>
8
;
granularity_bytes
=
(
w
&
0x0000ff00U
)
>>
8
;
address_bits
=
(
w
&
0x000000ffU
);
address_bits
=
(
w
&
0x000000ffU
);
...
@@ -2883,9 +2881,8 @@ static int engine_writeback_setup(struct xdma_engine *engine)
...
@@ -2883,9 +2881,8 @@ static int engine_writeback_setup(struct xdma_engine *engine)
}
}
/*
/*
* RTO - doing the allocation per engine is wasteful since a full page
* better to allocate one page for the whole device during probe()
* is allocated each time - better to allocate one page for the whole
* and set per-engine offsets here
* device during probe() and set per-engine offsets here
*/
*/
writeback
=
(
struct
xdma_poll_wb
*
)
engine
->
poll_mode_addr_virt
;
writeback
=
(
struct
xdma_poll_wb
*
)
engine
->
poll_mode_addr_virt
;
writeback
->
completed_desc_count
=
0
;
writeback
->
completed_desc_count
=
0
;
...
@@ -3168,7 +3165,7 @@ static int transfer_init(struct xdma_engine *engine,
...
@@ -3168,7 +3165,7 @@ static int transfer_init(struct xdma_engine *engine,
(
sizeof
(
struct
xdma_result
)
*
engine
->
desc_idx
);
(
sizeof
(
struct
xdma_result
)
*
engine
->
desc_idx
);
xfer
->
desc_index
=
engine
->
desc_idx
;
xfer
->
desc_index
=
engine
->
desc_idx
;
/*
TODO:
Need to handle desc_used >= XDMA_TRANSFER_MAX_DESC */
/* Need to handle desc_used >= XDMA_TRANSFER_MAX_DESC */
if
((
engine
->
desc_idx
+
desc_max
)
>=
XDMA_TRANSFER_MAX_DESC
)
if
((
engine
->
desc_idx
+
desc_max
)
>=
XDMA_TRANSFER_MAX_DESC
)
desc_max
=
XDMA_TRANSFER_MAX_DESC
-
engine
->
desc_idx
;
desc_max
=
XDMA_TRANSFER_MAX_DESC
-
engine
->
desc_idx
;
...
...
XDMA/linux-kernel/xdma/Makefile
View file @
40eb3c5a
...
@@ -28,6 +28,7 @@ all :
...
@@ -28,6 +28,7 @@ all :
clean
:
clean
:
$(MAKE)
-C
$(BUILDSYSTEM_DIR)
M
=
$(PWD)
clean
$(MAKE)
-C
$(BUILDSYSTEM_DIR)
M
=
$(PWD)
clean
@
/bin/rm
-f
*
.o.ur-safe
install
:
all
install
:
all
$(MAKE)
-C
$(BUILDSYSTEM_DIR)
M
=
$(PWD)
modules_install
$(MAKE)
-C
$(BUILDSYSTEM_DIR)
M
=
$(PWD)
modules_install
...
...
XDMA/linux-kernel/xdma/cdev_bypass.c
View file @
40eb3c5a
...
@@ -16,6 +16,7 @@
...
@@ -16,6 +16,7 @@
* The full GNU General Public License is included in this distribution in
* The full GNU General Public License is included in this distribution in
* the file called "COPYING".
* the file called "COPYING".
*/
*/
#define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__
#include "libxdma_api.h"
#include "libxdma_api.h"
#include "xdma_cdev.h"
#include "xdma_cdev.h"
...
...
XDMA/linux-kernel/xdma/cdev_xvc.h
View file @
40eb3c5a
...
@@ -23,8 +23,7 @@
...
@@ -23,8 +23,7 @@
#include <linux/ioctl.h>
#include <linux/ioctl.h>
/*
/*
* !!! TODO !!!
* the bar offset can be changed at compile time
* need a better way set the bar offset dynamicly
*/
*/
#define XVC_BAR_OFFSET_DFLT 0x40000
/* DSA 4.0 */
#define XVC_BAR_OFFSET_DFLT 0x40000
/* DSA 4.0 */
...
...
XDMA/linux-kernel/xdma/xdma_cdev.c
View file @
40eb3c5a
...
@@ -522,7 +522,6 @@ int xpdev_create_interfaces(struct xdma_pci_dev *xpdev)
...
@@ -522,7 +522,6 @@ int xpdev_create_interfaces(struct xdma_pci_dev *xpdev)
}
}
xpdev_flag_set
(
xpdev
,
XDF_CDEV_SG
);
xpdev_flag_set
(
xpdev
,
XDF_CDEV_SG
);
/* ??? Bypass */
/* Initialize Bypass Character Device */
/* Initialize Bypass Character Device */
if
(
xdev
->
bypass_bar_idx
>
0
)
{
if
(
xdev
->
bypass_bar_idx
>
0
)
{
for
(
i
=
0
;
i
<
xpdev
->
h2c_channel_max
;
i
++
)
{
for
(
i
=
0
;
i
<
xpdev
->
h2c_channel_max
;
i
++
)
{
...
...
XDMA/linux-kernel/xdma/xdma_mod.c
View file @
40eb3c5a
...
@@ -108,6 +108,10 @@ static const struct pci_device_id pci_ids[] = {
...
@@ -108,6 +108,10 @@ static const struct pci_device_id pci_ids[] = {
#ifdef INTERNAL_TESTING
#ifdef INTERNAL_TESTING
{
PCI_DEVICE
(
0x1d0f
,
0x1042
),
0
},
{
PCI_DEVICE
(
0x1d0f
,
0x1042
),
0
},
#endif
#endif
/* aws */
{
PCI_DEVICE
(
0x1d0f
,
0xf000
),
},
{
PCI_DEVICE
(
0x1d0f
,
0xf001
),
},
{
0
,}
{
0
,}
};
};
MODULE_DEVICE_TABLE
(
pci
,
pci_ids
);
MODULE_DEVICE_TABLE
(
pci
,
pci_ids
);
...
...
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