diff --git a/test_plans/cvl_dcf_switch_filter_test_plan.rst b/test_plans/cvl_dcf_switch_filter_test_plan.rst
index 3b63c041..11d35f0f 100644
--- a/test_plans/cvl_dcf_switch_filter_test_plan.rst
+++ b/test_plans/cvl_dcf_switch_filter_test_plan.rst
@@ -4549,13 +4549,7 @@ Subcase 1: DCF stop/DCF start
      tetspmd> port stop 0
      testpmd> port start 0
 
-4. check the rule list::
-
-     testpmd> flow list 0
-
-   check the rule is still there.
-
-5. send matched packets, port 1 can still receive the packets.
+4. send matched packets, port 1 can still receive the packets.
 
 Test case: Drop action test
 ===========================
diff --git a/test_plans/dcf_lifecycle_test_plan_bak.rst b/test_plans/dcf_lifecycle_test_plan_bak.rst
new file mode 100644
index 00000000..1e5fcecd
--- /dev/null
+++ b/test_plans/dcf_lifecycle_test_plan_bak.rst
@@ -0,0 +1,1074 @@
+.. Copyright (c) <2019-2020>, Intel Corporation
+         All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in
+     the documentation and/or other materials provided with the
+     distribution.
+
+   - Neither the name of Intel Corporation nor the names of its
+     contributors may be used to endorse or promote products derived
+     from this software without specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+   COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+   INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+   OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+============================
+CVL DCF Lifecycle Test Suite
+============================
+
+Description
+===========
+
+The DCF is a device configuration function (DCF - driver) bound to
+one of the device's VFs which can act as a sole controlling entity
+to exercise advance functionality (such as switch, ACL) for rest of
+the VNFs (virtual network functions) under a DPDK based NFV deployment.
+
+The DCF can act as a special VF talking to the kernel PF over the same
+virtchannel mailbox to configure the underlying device (port) for the VFs.
+
+The test suite covers the lifecycle of DCF context in Kernel PF, such as
+launch, and exit, switch rules handling, resetting, and exception exit.
+
+
+Configuration
+=============
+
+NIC: 2x25G or 2x100G, several TC need breakout mode.
+NIC should have 2 PF ports at least, and connect to tester's ports.
+
+Topology
+
+  +-------+       +--------+
+  |       |       |        |
+  |     p1|<----->|        |
+  |  DUT  |       | Tester |
+  |     p2|<----->|        |
+  |       |       |        |
+  +-------+       +--------+
+
+
+Device naming convention and mapping in this test suite
+(You should change these names by your setup)
+
+  +-------------+--------------+------------------+
+  | Device Name |   PCI addr   | Kernel Interface |
+  +=============+==============+==================+
+  |     P1      | 0000:18:00.0 |    enp24s0f0     |
+  +-------------+--------------+------------------+
+  |     VF0     | 0000:18:01.0 |     enp24s1      |
+  +-------------+--------------+------------------+
+  |     P2      | 0000:18:00.1 |    enp24s0f1     |
+  +-------------+--------------+------------------+
+
+
+Support DCF mode
+================
+
+
+TC01: DCF on 1 trust VF on 1 PF
+-------------------------------
+
+Generate 1 trust VF on 1 PF, and request 1 DCF on the trust VF.
+PF should grant DCF mode to it.
+
+Generate 4 VFs on PF ::
+
+    echo 4 > /sys/bus/pci/devices/0000:18:00.0/sriov_numvfs
+
+Set a VF as trust ::
+
+    ip link set enp24s0f0 vf 0 trust on
+
+Launch dpdk on the VF, request DCF mode ::
+
+    ./usertools/dpdk-devbind.py -b vfio-pci 18:01.0
+    ./x86_64-native-linuxapp-gcc/app/testpmd -l 6-10 -n 4 -w 18:01.0,cap=dcf --file-prefix=vf -- -i
+
+Expected: VF get DCF mode. There are outputs in testpmd launching ::
+
+    EAL: Probe PCI driver: net_ice_dcf (8086:1889) device: 0000:18:01.0 (socket 0)
+
+
+TC02: DCF on 2 PFs, 1 trust VF on each PF
+-----------------------------------------
+
+Generate 2 trust VFs on 2 PFs, each trust VF request DCF.
+Each PF should grant DCF mode to them.
+
+Generate 4 VFs on PF ::
+
+    echo 4 > /sys/bus/pci/devices/0000:18:00.0/sriov_numvfs
+    echo 4 > /sys/bus/pci/devices/0000:18:00.1/sriov_numvfs
+
+Set a VF as trust on each PF ::
+
+    ip link set enp24s0f0 vf 0 trust on
+    ip link set enp24s0f1 vf 0 trust on
+
+Launch dpdk on the VF on each PF, request DCF mode ::
+
+    ./usertools/dpdk-devbind.py -b vfio-pci 18:01.0 18:11.0
+    ./x86_64-native-linuxapp-gcc/app/testpmd -l 6-10 -n 4 -w 18:01.0,cap=dcf --file-prefix=dcf1 -- -i
+    ./x86_64-native-linuxapp-gcc/app/testpmd -l 11-15 -n 4 -w 18:11.0,cap=dcf --file-prefix=dcf2 -- -i
+
+Expected: VF get DCF mode. There are outputs in each testpmd launching ::
+
+    EAL: Probe PCI driver: net_ice_dcf (8086:1889) device: 0000:18:01.0 (socket 0)
+
+    EAL: Probe PCI driver: net_ice_dcf (8086:1889) device: 0000:18:11.0 (socket 0)
+
+
+TC03: Check only VF zero can get DCF mode
+-----------------------------------------
+
+Generate 4 VFs on PF ::
+
+    echo 4 > /sys/bus/pci/devices/0000:18:00.0/sriov_numvfs
+
+Set a VF as trust ::
+
+    ip link set enp24s0f0 vf 1 trust on
+
+Launch dpdk on the VF, request DCF mode ::
+
+    ./usertools/dpdk-devbind.py -b vfio-pci 18:01.1
+    ./x86_64-native-linuxapp-gcc/app/testpmd -l 6-10 -n 4 -w 18:01.1,cap=dcf --file-prefix=vf -- -i
+
+Expected: VF can NOT get DCF mode. testpmd should provide a friendly output ::
+
+    ice_dcf_get_vf_resource(): Failed to get response of OP_GET_VF_RESOURCE
+    ice_dcf_init_hw(): Failed to get VF resource
+    ice_dcf_dev_init(): Failed to init DCF hardware
+
+Error message in dmesg ::
+
+    ice 0000:18:00.0: VF 1 requested DCF capability, but only VF 0 is allowed to request DCF capability
+    ice 0000:18:00.0: VF 1 failed opcode 3, retval: -5
+
+
+TC04: Check only trusted VF can get DCF mode
+--------------------------------------------
+
+Generate 4 VFs on PF ::
+
+    echo 4 > /sys/bus/pci/devices/0000:18:00.0/sriov_numvfs
+
+Set a VF as trust ::
+
+    ip link set enp24s0f0 vf 0 trust off
+
+Launch dpdk on the VF, request DCF mode ::
+
+    ./usertools/dpdk-devbind.py -b vfio-pci 18:01.0
+    ./x86_64-native-linuxapp-gcc/app/testpmd -l 6-10 -n 4 -w 18:01.0,cap=dcf --file-prefix=vf -- -i
+
+Expected: VF can NOT get DCF mode. testpmd should provide a friendly output ::
+
+    ice_dcf_get_vf_resource(): Failed to get response of OP_GET_VF_RESOURCE
+    ice_dcf_init_hw(): Failed to get VF resource
+    ice_dcf_dev_init(): Failed to init DCF hardware
+
+Error message in dmesg ::
+
+    ice 0000:18:00.0: VF needs to be trusted to configure DCF capability
+    ice 0000:18:00.0: VF 0 failed opcode 3, retval: -5
+
+
+TC05: DCF graceful exit
+-----------------------
+
+Generate 4 VFs on PF ::
+
+    echo 4 > /sys/bus/pci/devices/0000:18:00.0/sriov_numvfs
+
+Set a VF as trust ::
+
+    ip link set enp24s0f0 vf 0 trust on
+
+Launch dpdk on the VF, request DCF mode ::
+
+    ./usertools/dpdk-devbind.py -b vfio-pci 18:01.0 18:01.1
+    ./x86_64-native-linuxapp-gcc/app/testpmd -l 6-10 -n 4 -w 18:01.0,cap=dcf --file-prefix=dcf -- -i
+
+Launch another testpmd on the VF1, and start mac forward ::
+
+    ./x86_64-native-linuxapp-gcc/app/testpmd -l 11-14 -n 4 -w 18:01.1 --file-prefix=vf -- -i
+    set verbose 1
+    set fwd mac
+    start
+
+Set switch rule to VF1 `0000:18:01.1` from DCF ::
+
+    flow create 0 priority 0 ingress pattern eth / ipv4 src is 192.168.0.2 dst is 192.168.0.3 / end actions vf id 1 / end
+
+Send a scapy packet to VF1 ::
+
+    p = Ether(dst='xx:xx:xx:xx:xx:xx')/IP(src='192.168.0.2', dst='192.168.0.3')/Raw(64*'x')
+    sendp(p, iface='testeri0', count=1)
+
+Check VF1 received the packet. Stats shows 1 packet received and forwarded. ::
+
+    show port stats all
+
+Exit the DCF in DCF testpmd ::
+
+    quit
+
+Send scapy packet again. Check VF1 can't receive the packet ::
+
+    show port stats all
+
+Expect: VF1 can't receive the packet
+
+
+Handling of switch filters added by DCF
+=======================================
+
+TC11: Turn trust mode off, when DCF launched
+--------------------------------------------
+
+If turn trust mode off, when DCF launched. The DCF rules should be removed.
+
+Generate 4 VFs on PF ::
+
+    echo 4 > /sys/bus/pci/devices/0000:18:00.0/sriov_numvfs
+
+Set a VF as trust ::
+
+    ip link set enp24s0f0 vf 0 trust on
+
+Launch dpdk on the VF, request DCF mode ::
+
+    ./usertools/dpdk-devbind.py -b vfio-pci 18:01.0 18:01.1
+    ./x86_64-native-linuxapp-gcc/app/testpmd -l 6-10 -n 4 -w 18:01.0,cap=dcf --file-prefix=dcf -- -i
+
+Launch another testpmd on the VF1, and start mac forward ::
+
+    ./x86_64-native-linuxapp-gcc/app/testpmd -l 11-14 -n 4 -w 18:01.1 --file-prefix=vf -- -i
+    set verbose 1
+    set fwd mac
+    start
+
+Set switch rule to VF1 0000:18:01.1 from DCF ::
+
+    flow create 0 priority 0 ingress pattern eth / ipv4 src is 192.168.0.2 dst is 192.168.0.3 / end actions vf id 1 / end
+
+Send a scapy packet to VF1 ::
+
+    p = Ether(dst='xx:xx:xx:xx:xx:xx')/IP(src='192.168.0.2', dst='192.168.0.3')/Raw(64*'x')
+    sendp(p, iface='testeri0', count=1)
+
+Check VF1 received the packet. Stats shows 1 packet received and forwarded ::
+
+    show port stats all
+
+Turn off DCF trust mode ::
+
+    ip link set enp24s0f0 vf 0 trust off
+
+Send scapy packet again. Check VF1 can't receive the packet ::
+
+    show port stats all
+
+Expect: VF1 can't receive the packet
+
+
+TC12: Kill DCF process
+----------------------
+
+If kill DCF process, when DCF launched. The DCF rules should be removed.
+
+Generate 4 VFs on PF ::
+
+    echo 4 > /sys/bus/pci/devices/0000:18:00.0/sriov_numvfs
+
+Set a VF as trust ::
+
+    ip link set enp24s0f0 vf 0 trust on
+
+Launch dpdk on the VF, request DCF mode ::
+
+    ./usertools/dpdk-devbind.py -b vfio-pci 18:01.0 18:01.1
+    ./x86_64-native-linuxapp-gcc/app/testpmd -l 6-10 -n 4 -w 18:01.0,cap=dcf --file-prefix=dcf -- -i
+
+Launch another testpmd on the VF1, and start mac forward ::
+
+    ./x86_64-native-linuxapp-gcc/app/testpmd -l 11-14 -n 4 -w 18:01.1 --file-prefix=vf -- -i
+    set verbose 1
+    set fwd mac
+    start
+
+Set switch rule to VF1 0000:18:01.1 from DCF ::
+
+    flow create 0 priority 0 ingress pattern eth / ipv4 src is 192.168.0.2 dst is 192.168.0.3 / end actions vf id 1 / end
+
+Send a scapy packet to VF1 ::
+
+    p = Ether(dst='xx:xx:xx:xx:xx:xx')/IP(src='192.168.0.2', dst='192.168.0.3')/Raw(64*'x')
+    sendp(p, iface='testeri0', count=1)
+
+Check VF1 received the packet. Stats shows 1 packet received and forwarded ::
+
+    show port stats all
+
+Kill DCF process ::
+
+    ps -ef |grep testpmd #Check the process id
+    kill -9 <pid>
+
+Send scapy packet again. DCF flow rule is still valid, check VF1 can receive the packet ::
+
+    show port stats all
+
+Expect: VF1 can receive the packet
+
+
+TC13: Launch 2nd DCF process on the same VF
+-------------------------------------------
+
+Launch 2nd DCF process on the same VF, PF shall reject the request.
+DPDK does not support to open 2nd DCF PMD driver on same VF.
+
+Generate 4 VFs on PF ::
+
+    echo 4 > /sys/bus/pci/devices/0000:18:00.0/sriov_numvfs
+
+Set a VF as trust ::
+
+    ip link set enp24s0f0 vf 0 trust on
+
+Launch dpdk on the VF, request DCF mode ::
+
+    ./usertools/dpdk-devbind.py -b vfio-pci 18:01.0 18:01.1
+    ./x86_64-native-linuxapp-gcc/app/testpmd -l 6-10 -n 4 -w 18:01.0,cap=dcf --file-prefix=dcf -- -i
+
+Launch another testpmd on the DCF ::
+
+    ./x86_64-native-linuxapp-gcc/app/testpmd -l 11-14 -n 4 -w 18:01.0,cap=dcf --file-prefix=dcf2 -- -i
+
+Expect: the second testpmd can't be launched
+
+
+TC14: DCF enabled, one of VF reset
+----------------------------------
+
+If DCF enabled, one of VF reset. DCF shall clean up all the rules of this VF.
+
+Generate 4 VFs on PF ::
+
+    echo 4 > /sys/bus/pci/devices/0000:18:00.0/sriov_numvfs
+
+Set a VF as trust ::
+
+    ip link set enp24s0f0 vf 0 trust on
+
+Launch dpdk on the VF, request DCF mode ::
+
+    ./usertools/dpdk-devbind.py -b vfio-pci 18:01.0 18:01.1
+    ./x86_64-native-linuxapp-gcc/app/testpmd -l 6-10 -n 4 -w 18:01.0,cap=dcf --file-prefix=dcf -- -i
+
+Launch another testpmd on the VF1 and VF2, and start mac forward ::
+
+    ./x86_64-native-linuxapp-gcc/app/testpmd -l 11-14 -n 4 -w 18:01.1 --file-prefix=vf1 -- -i
+    set verbose 1
+    set fwd mac
+    start
+
+    ./x86_64-native-linuxapp-gcc/app/testpmd -l 15-16 -n 4 -w 18:01.2 --file-prefix=vf2 -- -i
+    set verbose 1
+    set fwd mac
+    start
+
+Set switch rule to VF1 0000:18:01.1 from DCF ::
+
+    flow create 0 priority 0 ingress pattern eth / ipv4 src is 192.168.0.2 dst is 192.168.0.3 / end actions vf id 1 / end
+    flow create 0 priority 0 ingress pattern eth / ipv4 src is 192.168.0.4 dst is 192.168.0.5 / end actions vf id 1 / end
+
+Send a scapy packet to VF1 ::
+
+    p = Ether(dst='xx:xx:xx:xx:xx:xx')/IP(src='192.168.0.2', dst='192.168.0.3')/Raw(64*'x')
+    sendp(p, iface='testeri0', count=1)
+
+Send a scapy packet to VF2 ::
+
+    p = Ether(dst='xx:xx:xx:xx:xx:xx')/IP(src='192.168.0.4', dst='192.168.0.5')/Raw(64*'x')
+    sendp(p, iface='testeri0', count=1)
+
+Check VF1 received the packet. Stats shows 1 packet received and forwarded ::
+
+    show port stats all
+
+Reset VF1 by set mac addr, to trigger VF reset ::
+
+    ip link set enp24s0f0 vf 1 mac 00:01:02:03:04:05
+
+Reset port in testpmd::
+
+    stop
+    port stop all
+    port reset all
+    port start all
+    start
+
+Send scapy packet again. Check VF1 can receive the packet ::
+
+    show port stats all
+
+Expect: Send packet to VF1 and VF2. VF1 can receive the packet, VF2 can receive the packet.
+
+
+TC15: DCF enabled, PF reset - PFR
+---------------------------------
+
+If DCF enabled, PF reset - PFR. All DCF the rules should be clean up.
+
+Generate 4 VFs on PF ::
+
+    echo 4 > /sys/bus/pci/devices/0000:18:00.0/sriov_numvfs
+
+Set a VF as trust ::
+
+    ip link set enp24s0f0 vf 0 trust on
+
+Launch dpdk on the VF, request DCF mode ::
+
+    ./usertools/dpdk-devbind.py -b vfio-pci 18:01.0 18:01.1 18:01.2
+    ./x86_64-native-linuxapp-gcc/app/testpmd -l 6-10 -n 4 -w 18:01.0,cap=dcf --file-prefix=dcf -- -i
+
+Launch another testpmd on the VF1, and start mac forward ::
+
+    ./x86_64-native-linuxapp-gcc/app/testpmd -l 11-14 -n 4 -w 18:01.1 -w 18:01.2 --file-prefix=vf -- -i
+    set verbose 1
+    set fwd mac
+    start
+
+Set switch rule to VF1 0000:18:01.1 and VF2 0000:18:01.2 from DCF ::
+
+    flow create 0 priority 0 ingress pattern eth / ipv4 src is 192.168.0.2 dst is 192.168.0.3 / end actions vf id 1 / end
+
+Send a scapy packet to VF1 and VF2 ::
+
+    p1 = Ether(dst='xx:xx:xx:xx:xx:xx')/IP(src='192.168.0.2', dst='192.168.0.3')/Raw(64*'x')
+    sendp(p1, iface='testeri0', count=1)
+
+Check if VF1 and VF2 received the packet.
+Stats shows 1 packet received and forwarded on each VF ::
+
+    show port stats all
+
+Reset PF by lanconf command::
+
+    lanconf /zeroinit
+    <Choose 18:00.0 device> and Enter. See the "Initialize Options Menu"
+    Press Esc, See "LANConf Menu"
+    Select "SV Menu" and then select "Reset Menu"
+    Select "PF Reset" to trigger PF reset event
+
+Send scapy packet again. Check VF1 can't receive the packet::
+
+    show port stats all
+
+Expect: VF1 can't receive the packet
+
+
+TC16: DCF enabled, PF reset - CORER. All the rules should be clean up
+---------------------------------------------------------------------
+
+Same to TC15, just reset command is different at last step::
+
+    Select "Core Reset" to trigger Core reset event
+
+
+TC17: DCF enabled, PF reset - GLOBR. All the rules should be clean up
+---------------------------------------------------------------------
+
+Same to TC15, just reset command is different at last step::
+
+    Select "Global Reset" to trigger Global reset event
+
+
+TC18: DCF enabled, PF reset - ENPR. All the rules should be clean up
+--------------------------------------------------------------------
+
+Same to TC15, just reset command is different at last step::
+
+    Select "EMP Reset" to trigger EMP reset event
+
+
+ADQ and DCF mode shall be mutually exclusive
+============================================
+
+TC19: When ADQ set on PF, PF should reject the DCF mode
+-------------------------------------------------------
+
+When ADQ set on PF, PF should reject the DCF mode. Remove the ADQ setting, PF shall accept DCF mode.
+
+Host kernel version is required 4.19+, and MACVLAN offload should be set off
+
+Generate 4 VFs on PF ::
+
+    echo 4 > /sys/bus/pci/devices/0000:18:00.0/sriov_numvfs
+
+Set a VF as trust ::
+
+    ip link set enp24s0f0 vf 0 trust on
+
+Set ADQ on PF ::
+
+    modprobe sch_mqprio
+    modprobe act_mirred
+    modprobe cls_flower
+
+    ethtool -K enp24s0f0 hw-tc-offload on
+    tc qdisc add dev enp24s0f0 ingress
+    tc qdisc show dev enp24s0f0
+    tc qdisc add dev enp24s0f0 root mqprio num_tc 4 map 0 0 0 0 1 1 1 1 2 2 2 2 3 3 3 3 queues 4@0 4@4 8@8 8@16 hw 1 mode channel
+    tc filter add dev enp24s0f0 protocol ip parent ffff: prio 1 flower dst_ip 192.168.1.10 ip_proto tcp action gact pass
+    tc filter show dev enp24s0f0 parent ffff:
+
+Try to launch dpdk on the VF, request DCF mode ::
+
+    ./usertools/dpdk-devbind.py -b vfio-pci 18:01.0
+    ./x86_64-native-linuxapp-gcc/app/testpmd -l 6-10 -n 4 -w 18:01.0,cap=dcf --file-prefix=dcf -- -i
+
+Expect: testpmd can't be launched. PF should reject DCF mode.
+
+Remove ADQ on PF ::
+
+    tc filter del dev enp24s0f0 parent ffff: pref 1 protocol ip
+    tc filter show dev enp24s0f0 parent ffff:
+    tc qdisc del dev enp24s0f0 root mqprio
+    tc qdisc del dev enp24s0f0 ingress
+    tc qdisc show dev enp24s0f0
+    ethtool -K enp24s0f0 hw-tc-offload off
+
+Launch dpdk on the VF, request DCF mode ::
+
+    ./usertools/dpdk-devbind.py -b vfio-pci 18:01.0
+    ./x86_64-native-linuxapp-gcc/app/testpmd -l 6-10 -n 4 -w 18:01.0,cap=dcf --file-prefix=dcf -- -i
+
+Expect: testpmd can launch successfully. DCF mode can be grant ::
+
+    EAL: Probe PCI driver: net_ice_dcf (8086:1889) device: 0000:18:01.0 (socket 0)
+
+
+TC20: When DCF mode enabled, ADQ setting on PF shall fail
+---------------------------------------------------------
+
+When DCF mode enabled, ADQ setting on PF shall fail.
+Exit DCF mode, ADQ setting on PF shall be successful.
+
+Generate 4 VFs on PF ::
+
+    echo 4 > /sys/bus/pci/devices/0000:18:00.0/sriov_numvfs
+
+Set a VF as trust ::
+
+    ip link set enp24s0f0 vf 0 trust on
+
+Launch dpdk on the VF, request DCF mode ::
+
+    ./usertools/dpdk-devbind.py -b vfio-pci 18:01.0
+    ./x86_64-native-linuxapp-gcc/app/testpmd -l 6-10 -n 4 -w 18:01.0,cap=dcf --file-prefix=dcf -- -i
+
+Set ADQ on PF ::
+
+    ethtool -K enp24s0f0 hw-tc-offload on
+    tc qdisc add dev enp24s0f0 ingress
+    tc qdisc show dev enp24s0f0
+    tc qdisc add dev enp24s0f0 root mqprio num_tc 4 map 0 0 0 0 1 1 1 1 2 2 2 2 3 3 3 3 queues 4@0 4@4 8@8 8@16 hw 1 mode channel
+    tc filter add dev enp24s0f0 protocol ip parent ffff: prio 1 flower dst_ip 192.168.1.10 ip_proto tcp action gact pass
+    tc filter show dev enp24s0f0 parent ffff:
+
+Expect: ADQ command can't be executed successfully
+
+Exit testpmd ::
+
+    quit
+
+Set ADQ on PF again
+
+Expect: ADQ can be set.
+
+
+TC21: DCF and ADQ can be enabled on different PF
+------------------------------------------------
+
+Configure the DCF on 1 PF port and configure ADQ on the other PF port.
+Then turn off DCF, other PF's should not be impact.
+
+Generate 4 VFs on PF1 and 4VFs on PF2 ::
+
+    echo 4 > /sys/bus/pci/devices/0000:18:00.0/sriov_numvfs
+    echo 4 > /sys/bus/pci/devices/0000:18:00.1/sriov_numvfs
+
+Set a VF as trust ::
+
+    ip link set enp24s0f0 vf 0 trust on
+
+Launch dpdk on the VF0 on PF1, request DCF mode ::
+
+    ./usertools/dpdk-devbind.py -b vfio-pci 18:01.0
+    ./x86_64-native-linuxapp-gcc/app/testpmd -l 6-10 -n 4 -w 18:01.0,cap=dcf --file-prefix=dcf -- -i
+
+Set ADQ on PF2 ::
+
+    modprobe sch_mqprio
+    modprobe act_mirred
+    modprobe cls_flower
+
+    ethtool -K enp24s0f1 hw-tc-offload on
+    tc qdisc add dev enp24s0f1 ingress
+    tc qdisc show dev enp24s0f1
+    tc qdisc add dev enp24s0f1 root mqprio num_tc 4 map 0 0 0 0 1 1 1 1 2 2 2 2 3 3 3 3 queues 4@0 4@4 8@8 8@16 hw 1 mode channel
+    tc filter add dev enp24s0f1 protocol ip parent ffff: prio 1 flower dst_ip 192.168.1.10 ip_proto tcp action gact pass
+    tc filter show dev enp24s0f1 parent ffff:
+
+Expect: ADQ can be set on PF2.
+
+
+L2 Forwarding (MAC-VLAN feature) and DCF mode shall be mutually exclusive
+=========================================================================
+
+TC22: When L2 forwarding set, PF should reject the DCF mode
+-----------------------------------------------------------
+
+When L2 forwarding set, PF should reject the DCF mode.
+Remove L2 forwarding set, PF shall accept the DCF mode.
+
+Similar to ADQ test TC19
+
+Just change the ADQ commands to MAC-VLAN ::
+
+    ethtool -K enp24s0f0 l2-fwd-offload on
+    ip link add link macvlan0 link enp24s0f0 type macvlan
+    ifconfig macvlan0 192.168.1.111
+    ipconfig macvlan0 up
+
+Remove MAC-VLAN commands ::
+
+   ip link del macvlan0
+   ethtool -K enp24s0f0 l2-fwd-offload off
+
+
+TC23: When DCF mode enabled, PF can't set L2 forwarding
+-------------------------------------------------------
+
+When DCF mode enabled, PF can't set L2 forwarding.
+Exit DCF mode, PF can set L2 forwarding.
+
+Similar to ADQ test TC20
+
+Just change the ADQ commands to MAC-VLAN ::
+
+    ethtool -K enp24s0f0 l2-fwd-offload on
+    ip link add link macvlan0 link enp24s0f0 type macvlan
+    ifconfig macvlan0 192.168.1.111
+    ipconfig macvlan0 up
+
+Remove MAC-VLAN commands ::
+
+    ip link del macvlan0
+    ethtool -K enp24s0f0 l2-fwd-offload off
+
+
+TC24: DCF and L2 forwarding can be enabled on different PF
+----------------------------------------------------------
+
+Configure the DCF on 1 PF port and configure MAC-VLAN on the other PF port.
+Then turn off DCF, other PF's MAC-VLAN filter should not be impact.
+
+Similar to ADQ test TC21
+
+Just change the ADQ commands to MAC-VLAN ::
+
+    ethtool -K enp24s0f1 l2-fwd-offload on
+    ip link add link macvlan0 link enp24s0f1 type macvlan
+    ifconfig macvlan0 192.168.1.111
+    ipconfig macvlan0 up
+
+Remove MAC-VLAN commands ::
+
+    ip link del macvlan0
+    ethtool -K enp24s0f1 l2-fwd-offload off
+
+
+Handling of ACL filters added by DCF
+====================================
+1. PF base driver shall track all the ACL filters being added by DCF.
+   Additionally it shall also track the related profiles needed for
+   the ACL filters being added.
+2. PF base driver shall ensure cleanup of these ACL filters and profiles
+   during resets and exception cases.
+
+pre-steps:
+
+1. Generate 2 VFs on PF0::
+
+    echo 2 > /sys/bus/pci/devices/0000:18:00.0/sriov_numvfs
+
+    0000:18:01.0 'Ethernet Adaptive Virtual Function 1889' if=enp24s1 drv=iavf unused=vfio-pci
+    0000:18:01.1 'Ethernet Adaptive Virtual Function 1889' if=enp24s1f1 drv=iavf unused=vfio-pci
+
+2. Set VF0 as trust::
+
+    ip link set enp24s0f0 vf 0 trust on
+
+3. Bind VFs to dpdk driver::
+
+    modprobe vfio-pci
+    ./usertools/dpdk-devbind.py -b vfio-pci 0000:18:01.0 0000:18:01.1
+
+4. Launch dpdk on VF0, and VF0 request DCF mode::
+
+    ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xf -n 4 -w 0000:18:01.0,cap=dcf --file-prefix=vf0 -- -i
+    testpmd> set fwd mac
+    testpmd> set verbose 1
+    testpmd> start
+    testpmd> show port info all
+
+   check the VF0 driver is net_ice_dcf.
+
+5. Launch dpdk on VF1::
+
+    ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xf0 -n 4 -w 18:01.1 --file-prefix=vf1 -- -i
+    testpmd> set fwd rxonly
+    testpmd> set verbose 1
+    testpmd> start
+    testpmd> show port info all
+
+   check the VF1 driver is net_iavf.
+   the mac address is 5E:8E:8B:4D:89:05
+
+TC25: Turn trust mode off, when DCF launched
+--------------------------------------------
+If turn trust mode off, when DCF launched. The DCF rules should be removed.
+
+1. Create an ACL rule::
+
+    flow create 0 priority 0 ingress pattern eth / ipv4 / tcp src spec 8010 src mask 65520 / end actions drop / end
+
+   check the rule created successfully.
+
+2. send packet with dst mac of VF1::
+
+    sendp([Ether(src="00:11:22:33:44:55", dst="5E:8E:8B:4D:89:05")/IP()/TCP(sport=8012)/Raw(load='X'*30)], iface="testeri0")
+
+   check the packet is dropped by VF1::
+
+    ---------------------- Forward statistics for port 0  ----------------------
+    RX-packets: 0              RX-dropped: 1             RX-total: 1
+    TX-packets: 0              TX-dropped: 0             TX-total: 0
+    ----------------------------------------------------------------------------
+
+    +++++++++++++++ Accumulated forward statistics for all ports+++++++++++++++
+    RX-packets: 0              RX-dropped: 1             RX-total: 1
+    TX-packets: 0              TX-dropped: 0             TX-total: 0
+    ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+3. turn VF0 trust mode off, while DCF launched::
+
+    ip link set enp24s0f0 vf 0 trust off
+
+4. check the DCF ACL rule can be listed.
+   send the packet again, check the packet not dropped by VF1.
+   so the rule can't take effect any more.
+
+5. turn VF0 trust mode on, then re-launch dpdk on VF0, which requests DCF mode again.
+   check there is no ACL rule listed.
+   repeat step 1-2, check the packet is dropped by VF1.
+
+TC26: Kill DCF process
+----------------------
+If kill DCF process, when DCF launched. The DCF rules should be removed.
+
+1. Create an ACL rule::
+
+    flow create 0 priority 0 ingress pattern eth / ipv4 / tcp src spec 8010 src mask 65520 / end actions drop / end
+
+   check the rule created successfully.
+
+2. send packet with dst mac of VF1::
+
+    sendp([Ether(src="00:11:22:33:44:55", dst="5E:8E:8B:4D:89:05")/IP()/TCP(sport=8012)/Raw(load='X'*30)], iface="testeri0")
+
+   check the packet is dropped by VF1.
+
+3. kill DCF process ::
+
+    ps -ef |grep testpmd #Check the process id
+    kill -9 <pid>
+
+4. send the packet again, check the packet not dropped by VF1.
+   so the rule can't take effect any more.
+
+5. re-launch dpdk on VF0, which requests DCF mode again.
+   check there is no ACL rule listed.
+   send the packet again, check the packet not dropped by VF1.
+
+6. repeat step 1-2, check the packet is dropped by VF1.
+
+TC27: Allow AVF request
+-----------------------
+This is a scenario when the DCF user process was killed and a new AVF is being installed.
+Kill DCF process, then fail to launch avf on the previous DCF VF.
+
+1. Create an ACL rule::
+
+    flow create 0 priority 0 ingress pattern eth / ipv4 / tcp src spec 8010 src mask 65520 / end actions drop / end
+
+   check the rule created successfully.
+
+2. send packet with dst mac of VF1::
+
+    sendp([Ether(src="00:11:22:33:44:55", dst="5E:8E:8B:4D:89:05")/IP()/TCP(sport=8012)/Raw(load='X'*30)], iface="testeri0")
+
+   check the packet is dropped by VF1.
+
+3. kill DCF process ::
+
+    ps -ef |grep testpmd #Check the process id
+    kill -9 <pid>
+
+4. send the packet again, check the packet not dropped by VF1.
+   so the rule can't take effect any more.
+
+5. re-launch dpdk on VF0, which requests AVF mode::
+
+    ./x86_64-native-linuxapp-gcc/app/dpdk-testpmd -c 0xf -n 4 -w 0000:18:01.0 --file-prefix=vf0 -- -i
+
+   report::
+
+    iavf_get_vf_resource(): Failed to execute command of OP_GET_VF_RESOURCE
+    iavf_init_vf(): iavf_get_vf_config failed
+    iavf_dev_init(): Init vf failed
+
+   then quit the process, re-launch AVF on VF0 again, launch successfully.
+   send the packet again, check the packet not dropped by VF1.
+
+TC28: DCF graceful exit
+-----------------------
+1. Create an ACL rule::
+
+    flow create 0 priority 0 ingress pattern eth / ipv4 / tcp src spec 8010 src mask 65520 / end actions drop / end
+
+   check the rule created successfully.
+
+2. send packet with dst mac of VF1::
+
+    sendp([Ether(src="00:11:22:33:44:55", dst="5E:8E:8B:4D:89:05")/IP()/TCP(sport=8012)/Raw(load='X'*30)], iface="testeri0")
+
+   check the packet is dropped by VF1.
+
+3. Exit the DCF in DCF testpmd ::
+
+    testpmd> quit
+
+4. send the packet again, check the packet not dropped by VF1.
+   the ACL rule is removed.
+
+TC29: DCF enabled, AVF VF reset
+-------------------------------
+1. Create an ACL rule::
+
+    flow create 0 priority 0 ingress pattern eth / ipv4 / tcp src spec 8010 src mask 65520 / end actions drop / end
+
+   check the rule created successfully.
+
+2. send packet with dst mac of VF1::
+
+    sendp([Ether(src="00:11:22:33:44:55", dst="5E:8E:8B:4D:89:05")/IP()/TCP(sport=8012)/Raw(load='X'*30)], iface="testeri0")
+
+   check the packet is dropped by VF1.
+
+3. reset VF1 in testpmd::
+
+    stop
+    port stop 0
+    port reset 0
+    port start 0
+    start
+
+4. send the packet again, check the packet still be dropped by VF1.
+   so the rule still take effect.
+
+5. Reset VF1 by setting mac addr::
+
+    ip link set enp24s0f0 vf 1 mac 00:01:02:03:04:05
+
+   Reset port in testpmd::
+
+    stop
+    port stop all
+    port reset all
+    port start all
+    start
+
+6. send the packet with changed dst mac address "00:01:02:03:04:05",
+   check the packet still be dropped by VF1.
+   so the rule still take effect.
+
+TC30: DCF enabled, DCF VF reset
+-------------------------------
+1. Create an ACL rule::
+
+    flow create 0 priority 0 ingress pattern eth / ipv4 / tcp src spec 8010 src mask 65520 / end actions drop / end
+
+   check the rule created successfully.
+
+2. send packet with dst mac of VF1::
+
+    sendp([Ether(src="00:11:22:33:44:55", dst="5E:8E:8B:4D:89:05")/IP()/TCP(sport=8012)/Raw(load='X'*30)], iface="testeri0")
+
+   check the packet is dropped by VF1.
+
+3. reset VF0 in testpmd::
+
+    stop
+    port stop 0
+    port reset 0
+    port start 0
+    start
+
+4. check the rule still be listed.
+   send the packet with new mac address of VF1 again, check the packet still be dropped by VF1.
+   the rule still take effect.
+
+DCF mode and any ACL filters (not added by DCF) shall be mutually exclusive
+===========================================================================
+PF base driver shall ensure ACL filters being added by host based
+configuration tools such as tc flower or tc u32 (but not limited to)
+are mutually exclusive to DCF mode.
+
+TC31: add ACL rule by kernel, reject request for DCF functionality
+------------------------------------------------------------------
+1. create 2 VFs on PF0, set trust mode to VF0::
+
+    echo 2 > /sys/bus/pci/devices/0000:18:00.0/sriov_numvfs
+    ip link set enp24s0f0 vf 0 trust on
+
+2. create an ACL rule on PF0 by kernel command::
+
+    # ethtool -N enp24s0f0 flow-type tcp4 src-ip 192.168.10.0 m 0.255.255.255 dst-port 8000 m 0x00ff action -1
+    Added rule with ID 15871
+
+3. launch testpmd on VF0 requesting for DCF funtionality::
+
+    ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xc -n 4 -w 18:01.0,cap=dcf --log-level=ice,7 -- -i --port-topology=loop
+
+   report error::
+
+    ice_dcf_init_parent_hw(): firmware 5.1.5 api 1.7.3 build 0x7a25e184
+    ice_load_pkg_type(): Active package is: 1.3.20.0, ICE COMMS Package
+    ice_dcf_send_aq_cmd(): No response (201 times) or return failure (desc: -63 / buff: -63)
+    ice_flow_init(): Failed to initialize engine 4
+    ice_dcf_init_parent_adapter(): Failed to initialize flow
+    ice_dcf_dev_init(): Failed to init DCF parent adapter
+
+   get dmesg::
+
+    ice 0000:18:00.0: Grant request for DCF functionality to VF0
+    ice 0000:18:00.0: Failed to grant ACL capability to VF0 as ACL rules already exist
+
+4. delete the kernel ACL rule::
+
+    ethtool -N enp24s0f0 delete 15871
+
+5. relaunch testpmd on VF0 requesting for DCF funtionality with same command.
+   accept request for DCF functionality.
+   show the port info::
+
+    Driver name: net_ice_dcf
+
+   there is not Failed infomation in dmesg.
+
+TC32: add ACL rule by kernel, accept request for DCF functionality of another PF
+--------------------------------------------------------------------------------
+1. create 2 VFs on PF0, set trust mode to VF0::
+
+    echo 2 > /sys/bus/pci/devices/0000:18:00.0/sriov_numvfs
+    ip link set enp24s0f0 vf 0 trust on
+
+2. create an ACL rule on PF1 by kernel command::
+
+    # ethtool -N enp24s0f1 flow-type tcp4 src-ip 192.168.10.0 m 0.255.255.255 dst-port 8000 m 0x00ff action -1
+    Added rule with ID 15871
+
+3. launch testpmd on VF0 of PF0 requesting for DCF funtionality successfully::
+
+    ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xc -n 4 -w 18:01.0,cap=dcf --log-level=ice,7 -- -i --port-topology=loop
+
+   show the port info::
+
+    Driver name: net_ice_dcf
+
+   there is not Failed infomation in dmesg.
+
+TC33: ACL DCF mode is active, add ACL filters by way of host based configuration is rejected
+--------------------------------------------------------------------------------------------
+1. create 2 VFs on PF0, set trust mode to VF0::
+
+    echo 2 > /sys/bus/pci/devices/0000:18:00.0/sriov_numvfs
+    ip link set enp24s0f0 vf 0 trust on
+
+2. launch testpmd on VF0 of PF0 requesting for DCF funtionality successfully::
+
+    ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xc -n 4 -w 18:01.0,cap=dcf --log-level=ice,7 -- -i --port-topology=loop
+
+   show the port info::
+
+    Driver name: net_ice_dcf
+
+3. failed to add ACL filter by host kernel command::
+
+    ~# ethtool -N enp24s0f0 flow-type tcp4 src-ip 192.168.10.0 m 0.255.255.255 dst-port 8000 m 0x00ff action -1
+    rmgr: Cannot insert RX class rule: No such file or directory
+
+4. exit ACL DCF mode::
+
+    testpmd> quit
+
+5. add ACL filters by way of host based configuration successfully::
+
+    # ethtool -N enp24s0f0 flow-type tcp4 src-ip 192.168.10.0 m 0.255.255.255 dst-port 8000 m 0x00ff action -1
+    Added rule with ID 15871
+
+TC34: ACL DCF mode is active, add ACL filters by way of host based configuration on another PF successfully
+-----------------------------------------------------------------------------------------------------------
+1. create 2 VFs on PF0, set trust mode to VF0::
+
+    echo 2 > /sys/bus/pci/devices/0000:18:00.0/sriov_numvfs
+    ip link set enp24s0f0 vf 0 trust on
+
+2. launch testpmd on VF0 of PF0 requesting for DCF funtionality successfully::
+
+    ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xc -n 4 -w 18:01.0,cap=dcf --log-level=ice,7 -- -i --port-topology=loop
+
+   show the port info::
+
+    Driver name: net_ice_dcf
+
+3. add ACL filter by host kernel command on PF1 successfully::
+
+    # ethtool -N enp24s0f1 flow-type tcp4 src-ip 192.168.10.0 m 0.255.255.255 dst-port 8000 m 0x00ff action -1
+    Added rule with ID 15871
diff --git a/test_plans/iavf_fdir_test_plan.rst b/test_plans/iavf_fdir_test_plan.rst
index 6de28d2c..f210751f 100644
--- a/test_plans/iavf_fdir_test_plan.rst
+++ b/test_plans/iavf_fdir_test_plan.rst
@@ -4077,9 +4077,9 @@ Subcase 1: port stop/port start
     testpmd> port stop 0
     testpmd> port start 0
 
-4. show the rule list, the rule is still there.
+4. show the rule list, there is no rule listed.
 
-5. verify matched packet can be still redirected to queue 1 with FDIR matched ID=0x0.
+5. verify matched packet is distributed by RSS without FDIR matched ID.
 
 Subcase 2: delete rules
 -----------------------
@@ -4182,8 +4182,9 @@ Subcase 3: VF port reset and create a new rule
 
    the port can be stop/reset/start normally without error message.
 
-4. check the rule still be listed,
-   send matched packet to vf0, check the packet is redirected by RSS without FDIR matched ID.
+4. check there is not rule listed on port 0.
+   the rule of port 1 is still be listed.
+   send matched packet to vf0, check the packet is distributed by RSS.
    send matched packet to vf1, check the packet is redirected to queue 5 with FDIR matched ID=0x0.
 
 5. create rule 0 on port 0 again, the rule can be created successfully.
@@ -4210,18 +4211,18 @@ Subcase 4: VF port reset and delete the rule
 
 3. vf reset::
 
-    port stop 0
-    port reset 0
-    port start 0
+    port stop 1
+    port reset 1
+    port start 1
 
    the port can be stop/reset/start normally without error message.
 
-4. check the rule still be listed,
-   send matched packet to vf0, check the packet is redirected by RSS without FDIR matched ID.
-   send matched packet to vf1, check the packet is redirected to queue 5 with FDIR matched ID=0x0.
+4. check there is not rule listed on port 1.
+   the rule of port 0 is still be listed.
+   send matched packet to vf0, check the packet is redirected to queue 5 with FDIR matched ID=0x0.
+   send matched packet to vf1, check the packet is distributed by RSS.
 
-5. destroy rule 0 of vf0, report error, but no core dump.
-   destroy rule 0 of vf1 successfully.
+5. destroy rule 0 of vf0 successfully.
    send matched packet to vf0, check the packet is redirected by RSS without FDIR matched ID.
    send matched packet to vf1, check the packet is redirected by RSS without FDIR matched ID.
 
@@ -4260,7 +4261,7 @@ Subcase 5: PF reset VF and create a new rule
 
    the port can be stop/reset/start normally without error message.
 
-5. check the rule of vf0 still be listed,
+5. check there is not rule listed on vf0.
    send matched packet to vf0 with new mac address, check the packet is redirected by RSS without FDIR matched ID.
    send matched packet to vf1, check the packet is redirected to queue 5 with FDIR matched ID=0x0.
 
@@ -4291,27 +4292,27 @@ Subcase 6: PF reset VF and delete the rule
 
 3. pf trigger vf reset::
 
-    ip link set enp134s0f0 vf 0 mac 00:11:22:33:44:56
+    ip link set enp134s0f0 vf 1 mac 00:11:22:33:44:56
 
 4. testpmd shows::
 
-    Port 0: reset event
+    Port 1: reset event
 
    then vf reset::
 
-    port stop 0
-    port reset 0
-    port start 0
+    port stop 1
+    port reset 1
+    port start 1
 
    the port can be stop/reset/start normally without error message.
 
-5. destroy rule 0 of vf0, report error, but no core dump.
-   destroy rule 0 of vf1 successfully.
+5. check there is not rule listed on vf1.
+   destroy rule 0 of vf0 successfully.
    send matched packet to vf0, check the packet is redirected by RSS without FDIR matched ID.
    send matched packet to vf1, check the packet is redirected by RSS without FDIR matched ID.
 
-6. create rule 0 on port 0 again, the rule can be created successfully.
-   send matched packet to port 0, the packet can be redirected to queue 5 with FDIR matched ID=0x0.
+6. create rule 1 on port 1 again, the rule can be created successfully.
+   send matched packet to port 1, the packet can be redirected to queue 5 with FDIR matched ID=0x0.
 
 7. quit and relaunch testpmd, then create same rules successfully.
 
