| Message ID | 20241020205452.2660042-2-paweldembicki@gmail.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next,1/3] net: dsa: vsc73xx: implement transmit via control interface | expand |
On Sun, Oct 20, 2024 at 10:54:51PM +0200, Pawel Dembicki wrote: > Some types of packets can be forwarded only to and from the PI/SI > interface. For more information, see Chapter 2.7.1 (CPU Forwarding) in > the datasheet. > > This patch implements the routines required for link-local reception. > This kind of traffic can't be transferred through the RGMII interface in > vsc73xx. > > The packet receiver poller uses a kthread worker, which checks if a packet > has arrived in the CPU buffer. If the header is valid, the packet is > transferred to the correct DSA conduit interface. > > Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com> Hi Pawel, This is not a full review, but I noticed a problem that I wanted to bring to your attention. Please wait a day or so for others to provide a proper review before posting a v2. Thanks! > --- > drivers/net/dsa/vitesse-vsc73xx-core.c | 174 +++++++++++++++++++++++++ > drivers/net/dsa/vitesse-vsc73xx.h | 4 + > 2 files changed, 178 insertions(+) > > diff --git a/drivers/net/dsa/vitesse-vsc73xx-core.c b/drivers/net/dsa/vitesse-vsc73xx-core.c ... > @@ -373,6 +415,7 @@ > #define VSC73XX_POLL_SLEEP_US 1000 > #define VSC73XX_MDIO_POLL_SLEEP_US 5 > #define VSC73XX_POLL_TIMEOUT_US 10000 > +#define VSC73XX_RCV_POLL_INTERVAL 100 > > #define VSC73XX_IFH_MAGIC 0x52 > #define VSC73XX_IFH_SIZE 8 > @@ -834,6 +877,115 @@ static void vsc73xx_deferred_xmit(struct kthread_work *work) > kfree(xmit_work); > } > > +static void vsc73xx_polled_rcv(struct kthread_work *work) > +{ > + struct vsc73xx *vsc = container_of(work, struct vsc73xx, dwork.work); > + u16 ptr = VSC73XX_CAPT_FRAME_DATA; > + struct dsa_switch *ds = vsc->ds; > + int ret, buf_len, len, part; > + struct vsc73xx_ifh ifh; > + struct net_device *dev; > + struct dsa_port *dp; > + struct sk_buff *skb; > + u32 val, *buf; > + u16 count; > + > + ret = vsc73xx_read(vsc, VSC73XX_BLOCK_SYSTEM, 0, VSC73XX_CAPCTRL, &val); > + if (ret) > + goto queue; > + > + if (!(val & VSC73XX_CAPCTRL_QUEUE0_READY)) > + /* No frame to read */ > + goto queue; > + > + /* Initialise reading */ > + ret = vsc73xx_read(vsc, VSC73XX_BLOCK_CAPTURE, VSC73XX_BLOCK_CAPT_Q0, > + VSC73XX_CAPT_CAPREADP, &val); > + if (ret) > + goto queue; > + > + /* Get internal frame header */ > + ret = vsc73xx_read(vsc, VSC73XX_BLOCK_CAPTURE, > + VSC73XX_BLOCK_CAPT_FRAME0, ptr++, &ifh.datah); > + if (ret) > + goto queue; > + > + ret = vsc73xx_read(vsc, VSC73XX_BLOCK_CAPTURE, > + VSC73XX_BLOCK_CAPT_FRAME0, ptr++, &ifh.datal); > + if (ret) > + goto queue; > + > + if (ifh.magic != VSC73XX_IFH_MAGIC) { > + /* Something goes wrong with buffer. Reset capture block */ > + vsc73xx_write(vsc, VSC73XX_BLOCK_CAPTURE, > + VSC73XX_BLOCK_CAPT_RST, VSC73XX_CAPT_CAPRST, 1); > + goto queue; > + } > + > + if (!dsa_is_user_port(ds, ifh.port)) > + goto release_frame; > + > + dp = dsa_to_port(ds, ifh.port); > + dev = dp->user; > + if (!dev) > + goto release_frame; > + > + count = (ifh.frame_length + 7 + VSC73XX_IFH_SIZE - ETH_FCS_LEN) >> 2; > + > + skb = netdev_alloc_skb(dev, len); len does not appear to be initialised here. Flagged by W=1 builds. > + if (unlikely(!skb)) { > + netdev_err(dev, "Unable to allocate sk_buff\n"); > + goto release_frame; > + } > + > + buf_len = ifh.frame_length - ETH_FCS_LEN; > + buf = (u32 *)skb_put(skb, buf_len); > + len = 0; > + part = 0; > + > + while (ptr < count) { > + ret = vsc73xx_read(vsc, VSC73XX_BLOCK_CAPTURE, > + VSC73XX_BLOCK_CAPT_FRAME0 + part, ptr++, > + buf + len); > + if (ret) > + goto free_skb; > + len++; > + if (ptr > VSC73XX_CAPT_FRAME_DATA_MAX && > + count != VSC73XX_CAPT_FRAME_DATA_MAX) { > + ptr = VSC73XX_CAPT_FRAME_DATA; > + part++; > + count -= VSC73XX_CAPT_FRAME_DATA_MAX; > + } > + } > + > + /* Get FCS */ > + ret = vsc73xx_read(vsc, VSC73XX_BLOCK_CAPTURE, > + VSC73XX_BLOCK_CAPT_FRAME0, ptr++, &val); > + if (ret) > + goto free_skb; > + > + /* Everything we see on an interface that is in the HW bridge > + * has already been forwarded. > + */ > + if (dp->bridge) > + skb->offload_fwd_mark = 1; > + > + skb->protocol = eth_type_trans(skb, dev); > + > + netif_rx(skb); > + goto release_frame; > + > +free_skb: > + kfree_skb(skb); > +release_frame: > + /* Release the frame from internal buffer */ > + vsc73xx_write(vsc, VSC73XX_BLOCK_CAPTURE, VSC73XX_BLOCK_CAPT_Q0, > + VSC73XX_CAPT_CAPREADP, 0); > +queue: > + kthread_queue_delayed_work(vsc->rcv_worker, &vsc->dwork, > + msecs_to_jiffies(VSC73XX_RCV_POLL_INTERVAL)); > +} ...
On Sun, Oct 20, 2024 at 10:54:51PM +0200, Pawel Dembicki wrote: > Some types of packets can be forwarded only to and from the PI/SI > interface. For more information, see Chapter 2.7.1 (CPU Forwarding) in > the datasheet. > > This patch implements the routines required for link-local reception. > This kind of traffic can't be transferred through the RGMII interface in > vsc73xx. > > The packet receiver poller uses a kthread worker, which checks if a packet > has arrived in the CPU buffer. If the header is valid, the packet is > transferred to the correct DSA conduit interface. > > Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com> > --- Is there no way to use an IRQ for packet reception from the PI/SI interface? And if not, is there no way to use any workaround to do event-based reception? Like for example how felix has the quirk_no_xtr_irq mechanism through which it replicates all traffic that would go to the PI/SI interface to also go over Ethernet, and use the reception of the packet as the trigger for something being available to read from PI/SI? > +static void vsc73xx_polled_rcv(struct kthread_work *work) > +{ > + struct vsc73xx *vsc = container_of(work, struct vsc73xx, dwork.work); > + u16 ptr = VSC73XX_CAPT_FRAME_DATA; > + struct dsa_switch *ds = vsc->ds; > + int ret, buf_len, len, part; > + struct vsc73xx_ifh ifh; > + struct net_device *dev; > + struct dsa_port *dp; > + struct sk_buff *skb; > + u32 val, *buf; > + u16 count; > + > + ret = vsc73xx_read(vsc, VSC73XX_BLOCK_SYSTEM, 0, VSC73XX_CAPCTRL, &val); > + if (ret) > + goto queue; > + > + if (!(val & VSC73XX_CAPCTRL_QUEUE0_READY)) > + /* No frame to read */ > + goto queue; > + > + /* Initialise reading */ > + ret = vsc73xx_read(vsc, VSC73XX_BLOCK_CAPTURE, VSC73XX_BLOCK_CAPT_Q0, > + VSC73XX_CAPT_CAPREADP, &val); > + if (ret) > + goto queue; > + > + /* Get internal frame header */ > + ret = vsc73xx_read(vsc, VSC73XX_BLOCK_CAPTURE, > + VSC73XX_BLOCK_CAPT_FRAME0, ptr++, &ifh.datah); > + if (ret) > + goto queue; > + > + ret = vsc73xx_read(vsc, VSC73XX_BLOCK_CAPTURE, > + VSC73XX_BLOCK_CAPT_FRAME0, ptr++, &ifh.datal); > + if (ret) > + goto queue; > + > + if (ifh.magic != VSC73XX_IFH_MAGIC) { > + /* Something goes wrong with buffer. Reset capture block */ > + vsc73xx_write(vsc, VSC73XX_BLOCK_CAPTURE, > + VSC73XX_BLOCK_CAPT_RST, VSC73XX_CAPT_CAPRST, 1); Log that? > + goto queue; > + } > + > + if (!dsa_is_user_port(ds, ifh.port)) > + goto release_frame; First do the dsa_to_port(), and then convert this to dsa_port_is_user(). > + > + dp = dsa_to_port(ds, ifh.port); > + dev = dp->user; > + if (!dev) > + goto release_frame; > + > + count = (ifh.frame_length + 7 + VSC73XX_IFH_SIZE - ETH_FCS_LEN) >> 2; What's "(.. + 7) >> 2" doing? Some sort of DIV_ROUND_UP(..., 4)? But why 7? Please don't be afraid to use the arithmetic macros that make the code more readable. You can confirm with "make drivers/net/dsa/vitesse-vsc73xx-core.lst" that they should end up generating code that is just as efficient as the "optimized" bit shift. > + > + skb = netdev_alloc_skb(dev, len); > + if (unlikely(!skb)) { > + netdev_err(dev, "Unable to allocate sk_buff\n"); > + goto release_frame; > + } > + > + buf_len = ifh.frame_length - ETH_FCS_LEN; > + buf = (u32 *)skb_put(skb, buf_len); > + len = 0; > + part = 0; > + > + while (ptr < count) { > + ret = vsc73xx_read(vsc, VSC73XX_BLOCK_CAPTURE, > + VSC73XX_BLOCK_CAPT_FRAME0 + part, ptr++, > + buf + len); > + if (ret) > + goto free_skb; > + len++; > + if (ptr > VSC73XX_CAPT_FRAME_DATA_MAX && > + count != VSC73XX_CAPT_FRAME_DATA_MAX) { > + ptr = VSC73XX_CAPT_FRAME_DATA; > + part++; > + count -= VSC73XX_CAPT_FRAME_DATA_MAX; > + } > + } > + > + /* Get FCS */ > + ret = vsc73xx_read(vsc, VSC73XX_BLOCK_CAPTURE, > + VSC73XX_BLOCK_CAPT_FRAME0, ptr++, &val); > + if (ret) > + goto free_skb; > + > + /* Everything we see on an interface that is in the HW bridge > + * has already been forwarded. > + */ > + if (dp->bridge) > + skb->offload_fwd_mark = 1; > + > + skb->protocol = eth_type_trans(skb, dev); > + > + netif_rx(skb); > + goto release_frame; > + > +free_skb: > + kfree_skb(skb); > +release_frame: > + /* Release the frame from internal buffer */ > + vsc73xx_write(vsc, VSC73XX_BLOCK_CAPTURE, VSC73XX_BLOCK_CAPT_Q0, > + VSC73XX_CAPT_CAPREADP, 0); > +queue: Log errors with dev_err_ratelimited() maybe? > + kthread_queue_delayed_work(vsc->rcv_worker, &vsc->dwork, > + msecs_to_jiffies(VSC73XX_RCV_POLL_INTERVAL)); > +} > + > static int > vsc73xx_connect_tag_protocol(struct dsa_switch *ds, enum dsa_tag_protocol proto) > { > @@ -1111,14 +1263,36 @@ static int vsc73xx_setup(struct dsa_switch *ds) > ret = dsa_tag_8021q_register(ds, htons(ETH_P_8021Q)); > rtnl_unlock(); > > + /* Reset capture block */ > + vsc73xx_write(vsc, VSC73XX_BLOCK_CAPTURE, VSC73XX_BLOCK_CAPT_RST, > + VSC73XX_CAPT_CAPRST, 1); > + > + /* Capture BPDU frames */ > + vsc73xx_write(vsc, VSC73XX_BLOCK_ANALYZER, 0, VSC73XX_CAPENAB, > + VSC73XX_CAPENAB_BPDU); > + > + vsc->rcv_worker = kthread_create_worker(0, "vsc73xx_rcv"); > + if (IS_ERR(vsc->rcv_worker)) > + return PTR_ERR(vsc->rcv_worker); There's teardown work to do on error here. > + > + kthread_init_delayed_work(&vsc->dwork, vsc73xx_polled_rcv); > + > + kthread_queue_delayed_work(vsc->rcv_worker, &vsc->dwork, > + msecs_to_jiffies(VSC73XX_RCV_POLL_INTERVAL)); > + > return ret; This "return ret" is the error code of dsa_tag_8021q_register(). The new code block is very badly placed. > } > > static void vsc73xx_teardown(struct dsa_switch *ds) > { > + struct vsc73xx *vsc = ds->priv; > + > rtnl_lock(); > dsa_tag_8021q_unregister(ds); > rtnl_unlock(); > + > + kthread_cancel_delayed_work_sync(&vsc->dwork); > + kthread_destroy_worker(vsc->rcv_worker); This needs to be the reverse process of vsc73xx_setup(). > } > > static void vsc73xx_init_port(struct vsc73xx *vsc, int port) > diff --git a/drivers/net/dsa/vitesse-vsc73xx.h b/drivers/net/dsa/vitesse-vsc73xx.h > index bf55a20f07f3..5dd458793741 100644 > --- a/drivers/net/dsa/vitesse-vsc73xx.h > +++ b/drivers/net/dsa/vitesse-vsc73xx.h > @@ -47,6 +47,8 @@ struct vsc73xx_portinfo { > * every vlan configured in port vlan operation. It doesn't cover tag_8021q > * vlans. > * @fdb_lock: Mutex protects fdb access > + * @rcv_worker: Kthread worker struct for packet reciver poller > + * @dwork: Work struct for scheduling work to the packet reciver poller > */ > struct vsc73xx { > struct device *dev; > @@ -60,6 +62,8 @@ struct vsc73xx { > struct vsc73xx_portinfo portinfo[VSC73XX_MAX_NUM_PORTS]; > struct list_head vlans; > struct mutex fdb_lock; > + struct kthread_worker *rcv_worker; > + struct kthread_delayed_work dwork; > }; > > /** > -- > 2.34.1 >
On Sun, Oct 20, 2024 at 10:54:51PM +0200, Pawel Dembicki wrote: > The packet receiver poller uses a kthread worker, which checks if a packet > has arrived in the CPU buffer. If the header is valid, the packet is > transferred to the correct DSA conduit interface. s/conduit/user/
Hi Pawel, kernel test robot noticed the following build warnings: [auto build test WARNING on net-next/main] url: https://github.com/intel-lab-lkp/linux/commits/Pawel-Dembicki/net-dsa-vsc73xx-implement-packet-reception-via-control-interface/20241021-050041 base: net-next/main patch link: https://lore.kernel.org/r/20241020205452.2660042-2-paweldembicki%40gmail.com patch subject: [PATCH net-next 2/3] net: dsa: vsc73xx: implement packet reception via control interface config: x86_64-allyesconfig (https://download.01.org/0day-ci/archive/20241022/202410220908.uFiUPMGy-lkp@intel.com/config) compiler: clang version 18.1.8 (https://github.com/llvm/llvm-project 3b5b5c1ec4a3095ab096dd780e84d7ab81f3d7ff) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20241022/202410220908.uFiUPMGy-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202410220908.uFiUPMGy-lkp@intel.com/ All warnings (new ones prefixed by >>): >> drivers/net/dsa/vitesse-vsc73xx-core.c:935:30: warning: variable 'len' is uninitialized when used here [-Wuninitialized] 935 | skb = netdev_alloc_skb(dev, len); | ^~~ drivers/net/dsa/vitesse-vsc73xx-core.c:885:23: note: initialize the variable 'len' to silence this warning 885 | int ret, buf_len, len, part; | ^ | = 0 1 warning generated. vim +/len +935 drivers/net/dsa/vitesse-vsc73xx-core.c 879 880 static void vsc73xx_polled_rcv(struct kthread_work *work) 881 { 882 struct vsc73xx *vsc = container_of(work, struct vsc73xx, dwork.work); 883 u16 ptr = VSC73XX_CAPT_FRAME_DATA; 884 struct dsa_switch *ds = vsc->ds; 885 int ret, buf_len, len, part; 886 struct vsc73xx_ifh ifh; 887 struct net_device *dev; 888 struct dsa_port *dp; 889 struct sk_buff *skb; 890 u32 val, *buf; 891 u16 count; 892 893 ret = vsc73xx_read(vsc, VSC73XX_BLOCK_SYSTEM, 0, VSC73XX_CAPCTRL, &val); 894 if (ret) 895 goto queue; 896 897 if (!(val & VSC73XX_CAPCTRL_QUEUE0_READY)) 898 /* No frame to read */ 899 goto queue; 900 901 /* Initialise reading */ 902 ret = vsc73xx_read(vsc, VSC73XX_BLOCK_CAPTURE, VSC73XX_BLOCK_CAPT_Q0, 903 VSC73XX_CAPT_CAPREADP, &val); 904 if (ret) 905 goto queue; 906 907 /* Get internal frame header */ 908 ret = vsc73xx_read(vsc, VSC73XX_BLOCK_CAPTURE, 909 VSC73XX_BLOCK_CAPT_FRAME0, ptr++, &ifh.datah); 910 if (ret) 911 goto queue; 912 913 ret = vsc73xx_read(vsc, VSC73XX_BLOCK_CAPTURE, 914 VSC73XX_BLOCK_CAPT_FRAME0, ptr++, &ifh.datal); 915 if (ret) 916 goto queue; 917 918 if (ifh.magic != VSC73XX_IFH_MAGIC) { 919 /* Something goes wrong with buffer. Reset capture block */ 920 vsc73xx_write(vsc, VSC73XX_BLOCK_CAPTURE, 921 VSC73XX_BLOCK_CAPT_RST, VSC73XX_CAPT_CAPRST, 1); 922 goto queue; 923 } 924 925 if (!dsa_is_user_port(ds, ifh.port)) 926 goto release_frame; 927 928 dp = dsa_to_port(ds, ifh.port); 929 dev = dp->user; 930 if (!dev) 931 goto release_frame; 932 933 count = (ifh.frame_length + 7 + VSC73XX_IFH_SIZE - ETH_FCS_LEN) >> 2; 934 > 935 skb = netdev_alloc_skb(dev, len); 936 if (unlikely(!skb)) { 937 netdev_err(dev, "Unable to allocate sk_buff\n"); 938 goto release_frame; 939 } 940 941 buf_len = ifh.frame_length - ETH_FCS_LEN; 942 buf = (u32 *)skb_put(skb, buf_len); 943 len = 0; 944 part = 0; 945 946 while (ptr < count) { 947 ret = vsc73xx_read(vsc, VSC73XX_BLOCK_CAPTURE, 948 VSC73XX_BLOCK_CAPT_FRAME0 + part, ptr++, 949 buf + len); 950 if (ret) 951 goto free_skb; 952 len++; 953 if (ptr > VSC73XX_CAPT_FRAME_DATA_MAX && 954 count != VSC73XX_CAPT_FRAME_DATA_MAX) { 955 ptr = VSC73XX_CAPT_FRAME_DATA; 956 part++; 957 count -= VSC73XX_CAPT_FRAME_DATA_MAX; 958 } 959 } 960 961 /* Get FCS */ 962 ret = vsc73xx_read(vsc, VSC73XX_BLOCK_CAPTURE, 963 VSC73XX_BLOCK_CAPT_FRAME0, ptr++, &val); 964 if (ret) 965 goto free_skb; 966 967 /* Everything we see on an interface that is in the HW bridge 968 * has already been forwarded. 969 */ 970 if (dp->bridge) 971 skb->offload_fwd_mark = 1; 972 973 skb->protocol = eth_type_trans(skb, dev); 974 975 netif_rx(skb); 976 goto release_frame; 977 978 free_skb: 979 kfree_skb(skb); 980 release_frame: 981 /* Release the frame from internal buffer */ 982 vsc73xx_write(vsc, VSC73XX_BLOCK_CAPTURE, VSC73XX_BLOCK_CAPT_Q0, 983 VSC73XX_CAPT_CAPREADP, 0); 984 queue: 985 kthread_queue_delayed_work(vsc->rcv_worker, &vsc->dwork, 986 msecs_to_jiffies(VSC73XX_RCV_POLL_INTERVAL)); 987 } 988
diff --git a/drivers/net/dsa/vitesse-vsc73xx-core.c b/drivers/net/dsa/vitesse-vsc73xx-core.c index 21ab3f214490..596b11c4d672 100644 --- a/drivers/net/dsa/vitesse-vsc73xx-core.c +++ b/drivers/net/dsa/vitesse-vsc73xx-core.c @@ -45,6 +45,15 @@ #define VSC73XX_BLOCK_MII_INTERNAL 0x0 /* Internal MDIO subblock */ #define VSC73XX_BLOCK_MII_EXTERNAL 0x1 /* External MDIO subblock */ +/* CAPTURE Block subblock */ +#define VSC73XX_BLOCK_CAPT_FRAME0 0x0 /* Frame 0 subblock */ +#define VSC73XX_BLOCK_CAPT_FRAME1 0x1 /* Frame 1 subblock */ +#define VSC73XX_BLOCK_CAPT_FRAME2 0x2 /* Frame 2 subblock */ +#define VSC73XX_BLOCK_CAPT_FRAME3 0x3 /* Frame 3 subblock */ +#define VSC73XX_BLOCK_CAPT_Q0 0x4 /* Queue 0 subblock */ +#define VSC73XX_BLOCK_CAPT_Q1 0x6 /* Queue 0 subblock */ +#define VSC73XX_BLOCK_CAPT_RST 0x7 /* Capture reset subblock */ + #define CPU_PORT 6 /* CPU port */ #define VSC73XX_NUM_FDB_ROWS 2048 #define VSC73XX_NUM_BUCKETS 4 @@ -244,6 +253,13 @@ #define VSC73XX_MACTINDX_BUCKET_MSK GENMASK(12, 11) #define VSC73XX_MACTINDX_INDEX_MSK GENMASK(10, 0) +#define VSC73XX_CAPENAB_IPMC BIT(20) +#define VSC73XX_CAPENAB_ARPBC BIT(19) +#define VSC73XX_CAPENAB_IGMP BIT(18) +#define VSC73XX_CAPENAB_ALLBRIDGE BIT(17) +#define VSC73XX_CAPENAB_BPDU BIT(16) +#define VSC73XX_CAPENAB_GARP GENMASK(15, 0) + #define VSC73XX_MACACCESS_CPU_COPY BIT(14) #define VSC73XX_MACACCESS_FWD_KILL BIT(13) #define VSC73XX_MACACCESS_IGNORE_VLAN BIT(12) @@ -297,6 +313,13 @@ #define VSC73XX_MII_STAT_BUSY BIT(3) +/* Capture block 4 registers */ +#define VSC73XX_CAPT_FRAME_DATA 0x0 +#define VSC73XX_CAPT_FRAME_DATA_MAX 0xff +#define VSC73XX_CAPT_CAPREADP 0x0 +#define VSC73XX_CAPT_CAPWRP 0x3 +#define VSC73XX_CAPT_CAPRST 0xff + /* Arbiter block 5 registers */ #define VSC73XX_ARBEMPTY 0x0c #define VSC73XX_ARBDISC 0x0e @@ -316,6 +339,7 @@ #define VSC73XX_ICPU_MBOX_SET 0x16 #define VSC73XX_ICPU_MBOX_CLR 0x17 #define VSC73XX_CHIPID 0x18 +#define VSC73XX_CAPCTRL 0x31 #define VSC73XX_GPIO 0x34 #define VSC73XX_GMIIDELAY_GMII0_GTXDELAY_NONE 0 @@ -364,6 +388,24 @@ VSC73XX_ICPU_CTRL_CLK_EN | \ VSC73XX_ICPU_CTRL_SRST) +#define VSC73XX_CAPCTRL_QUEUE1_READY BIT(31) +#define VSC73XX_CAPCTRL_QUEUE0_READY BIT(30) +#define VSC73XX_CAPCTRL_ARPBC_Q BIT(18) +#define VSC73XX_CAPCTRL_IPMC_Q BIT(17) +#define VSC73XX_CAPCTRL_IGMP_Q BIT(16) +#define VSC73XX_CAPCTRL_ALLBRIDGE_Q BIT(15) +#define VSC73XX_CAPCTRL_GARP_Q BIT(14) +#define VSC73XX_CAPCTRL_BPDU_Q BIT(13) +#define VSC73XX_CAPCTRL_FIFO_MODE BIT(12) +#define VSC73XX_CAPCTRL_QUEUE1_ENA BIT(11) +#define VSC73XX_CAPCTRL_Q1_IRQ_EN BIT(6) +#define VSC73XX_CAPCTRL_Q0_IRQ_EN BIT(5) +#define VSC73XX_CAPCTRL_Q1_IRQ_PIN BIT(4) +#define VSC73XX_CAPCTRL_Q0_IRQ_PIN BIT(3) +#define VSC73XX_CAPCTRL_LEARN_TRUNCATE BIT(2) +#define VSC73XX_CAPCTRL_LEARN_Q BIT(1) +#define VSC73XX_CAPCTRL_MACB_Q BIT(0) + #define IS_7385(a) ((a)->chipid == VSC73XX_CHIPID_ID_7385) #define IS_7388(a) ((a)->chipid == VSC73XX_CHIPID_ID_7388) #define IS_7395(a) ((a)->chipid == VSC73XX_CHIPID_ID_7395) @@ -373,6 +415,7 @@ #define VSC73XX_POLL_SLEEP_US 1000 #define VSC73XX_MDIO_POLL_SLEEP_US 5 #define VSC73XX_POLL_TIMEOUT_US 10000 +#define VSC73XX_RCV_POLL_INTERVAL 100 #define VSC73XX_IFH_MAGIC 0x52 #define VSC73XX_IFH_SIZE 8 @@ -834,6 +877,115 @@ static void vsc73xx_deferred_xmit(struct kthread_work *work) kfree(xmit_work); } +static void vsc73xx_polled_rcv(struct kthread_work *work) +{ + struct vsc73xx *vsc = container_of(work, struct vsc73xx, dwork.work); + u16 ptr = VSC73XX_CAPT_FRAME_DATA; + struct dsa_switch *ds = vsc->ds; + int ret, buf_len, len, part; + struct vsc73xx_ifh ifh; + struct net_device *dev; + struct dsa_port *dp; + struct sk_buff *skb; + u32 val, *buf; + u16 count; + + ret = vsc73xx_read(vsc, VSC73XX_BLOCK_SYSTEM, 0, VSC73XX_CAPCTRL, &val); + if (ret) + goto queue; + + if (!(val & VSC73XX_CAPCTRL_QUEUE0_READY)) + /* No frame to read */ + goto queue; + + /* Initialise reading */ + ret = vsc73xx_read(vsc, VSC73XX_BLOCK_CAPTURE, VSC73XX_BLOCK_CAPT_Q0, + VSC73XX_CAPT_CAPREADP, &val); + if (ret) + goto queue; + + /* Get internal frame header */ + ret = vsc73xx_read(vsc, VSC73XX_BLOCK_CAPTURE, + VSC73XX_BLOCK_CAPT_FRAME0, ptr++, &ifh.datah); + if (ret) + goto queue; + + ret = vsc73xx_read(vsc, VSC73XX_BLOCK_CAPTURE, + VSC73XX_BLOCK_CAPT_FRAME0, ptr++, &ifh.datal); + if (ret) + goto queue; + + if (ifh.magic != VSC73XX_IFH_MAGIC) { + /* Something goes wrong with buffer. Reset capture block */ + vsc73xx_write(vsc, VSC73XX_BLOCK_CAPTURE, + VSC73XX_BLOCK_CAPT_RST, VSC73XX_CAPT_CAPRST, 1); + goto queue; + } + + if (!dsa_is_user_port(ds, ifh.port)) + goto release_frame; + + dp = dsa_to_port(ds, ifh.port); + dev = dp->user; + if (!dev) + goto release_frame; + + count = (ifh.frame_length + 7 + VSC73XX_IFH_SIZE - ETH_FCS_LEN) >> 2; + + skb = netdev_alloc_skb(dev, len); + if (unlikely(!skb)) { + netdev_err(dev, "Unable to allocate sk_buff\n"); + goto release_frame; + } + + buf_len = ifh.frame_length - ETH_FCS_LEN; + buf = (u32 *)skb_put(skb, buf_len); + len = 0; + part = 0; + + while (ptr < count) { + ret = vsc73xx_read(vsc, VSC73XX_BLOCK_CAPTURE, + VSC73XX_BLOCK_CAPT_FRAME0 + part, ptr++, + buf + len); + if (ret) + goto free_skb; + len++; + if (ptr > VSC73XX_CAPT_FRAME_DATA_MAX && + count != VSC73XX_CAPT_FRAME_DATA_MAX) { + ptr = VSC73XX_CAPT_FRAME_DATA; + part++; + count -= VSC73XX_CAPT_FRAME_DATA_MAX; + } + } + + /* Get FCS */ + ret = vsc73xx_read(vsc, VSC73XX_BLOCK_CAPTURE, + VSC73XX_BLOCK_CAPT_FRAME0, ptr++, &val); + if (ret) + goto free_skb; + + /* Everything we see on an interface that is in the HW bridge + * has already been forwarded. + */ + if (dp->bridge) + skb->offload_fwd_mark = 1; + + skb->protocol = eth_type_trans(skb, dev); + + netif_rx(skb); + goto release_frame; + +free_skb: + kfree_skb(skb); +release_frame: + /* Release the frame from internal buffer */ + vsc73xx_write(vsc, VSC73XX_BLOCK_CAPTURE, VSC73XX_BLOCK_CAPT_Q0, + VSC73XX_CAPT_CAPREADP, 0); +queue: + kthread_queue_delayed_work(vsc->rcv_worker, &vsc->dwork, + msecs_to_jiffies(VSC73XX_RCV_POLL_INTERVAL)); +} + static int vsc73xx_connect_tag_protocol(struct dsa_switch *ds, enum dsa_tag_protocol proto) { @@ -1111,14 +1263,36 @@ static int vsc73xx_setup(struct dsa_switch *ds) ret = dsa_tag_8021q_register(ds, htons(ETH_P_8021Q)); rtnl_unlock(); + /* Reset capture block */ + vsc73xx_write(vsc, VSC73XX_BLOCK_CAPTURE, VSC73XX_BLOCK_CAPT_RST, + VSC73XX_CAPT_CAPRST, 1); + + /* Capture BPDU frames */ + vsc73xx_write(vsc, VSC73XX_BLOCK_ANALYZER, 0, VSC73XX_CAPENAB, + VSC73XX_CAPENAB_BPDU); + + vsc->rcv_worker = kthread_create_worker(0, "vsc73xx_rcv"); + if (IS_ERR(vsc->rcv_worker)) + return PTR_ERR(vsc->rcv_worker); + + kthread_init_delayed_work(&vsc->dwork, vsc73xx_polled_rcv); + + kthread_queue_delayed_work(vsc->rcv_worker, &vsc->dwork, + msecs_to_jiffies(VSC73XX_RCV_POLL_INTERVAL)); + return ret; } static void vsc73xx_teardown(struct dsa_switch *ds) { + struct vsc73xx *vsc = ds->priv; + rtnl_lock(); dsa_tag_8021q_unregister(ds); rtnl_unlock(); + + kthread_cancel_delayed_work_sync(&vsc->dwork); + kthread_destroy_worker(vsc->rcv_worker); } static void vsc73xx_init_port(struct vsc73xx *vsc, int port) diff --git a/drivers/net/dsa/vitesse-vsc73xx.h b/drivers/net/dsa/vitesse-vsc73xx.h index bf55a20f07f3..5dd458793741 100644 --- a/drivers/net/dsa/vitesse-vsc73xx.h +++ b/drivers/net/dsa/vitesse-vsc73xx.h @@ -47,6 +47,8 @@ struct vsc73xx_portinfo { * every vlan configured in port vlan operation. It doesn't cover tag_8021q * vlans. * @fdb_lock: Mutex protects fdb access + * @rcv_worker: Kthread worker struct for packet reciver poller + * @dwork: Work struct for scheduling work to the packet reciver poller */ struct vsc73xx { struct device *dev; @@ -60,6 +62,8 @@ struct vsc73xx { struct vsc73xx_portinfo portinfo[VSC73XX_MAX_NUM_PORTS]; struct list_head vlans; struct mutex fdb_lock; + struct kthread_worker *rcv_worker; + struct kthread_delayed_work dwork; }; /**
Some types of packets can be forwarded only to and from the PI/SI interface. For more information, see Chapter 2.7.1 (CPU Forwarding) in the datasheet. This patch implements the routines required for link-local reception. This kind of traffic can't be transferred through the RGMII interface in vsc73xx. The packet receiver poller uses a kthread worker, which checks if a packet has arrived in the CPU buffer. If the header is valid, the packet is transferred to the correct DSA conduit interface. Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com> --- drivers/net/dsa/vitesse-vsc73xx-core.c | 174 +++++++++++++++++++++++++ drivers/net/dsa/vitesse-vsc73xx.h | 4 + 2 files changed, 178 insertions(+)