From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [net-next,15/19] net: usb: aqc111: Add support for VLAN_CTAG_TX/RX offload From: Oliver Neukum Message-Id: <1539008058.10342.23.camel@suse.com> Date: Mon, 08 Oct 2018 16:14:18 +0200 To: Igor Russkikh , "David S . Miller" Cc: Dmitry Bezrukov , "linux-usb@vger.kernel.org" , "netdev@vger.kernel.org" List-ID: T24gRnIsIDIwMTgtMTAtMDUgYXQgMTA6MjUgKzAwMDAsIElnb3IgUnVzc2tpa2ggd3JvdGU6Cj4g RnJvbTogRG1pdHJ5IEJlenJ1a292IDxkbWl0cnkuYmV6cnVrb3ZAYXF1YW50aWEuY29tPgo+IAo+ IFNpZ25lZC1vZmYtYnk6IERtaXRyeSBCZXpydWtvdiA8ZG1pdHJ5LmJlenJ1a292QGFxdWFudGlh LmNvbT4KPiBTaWduZWQtb2ZmLWJ5OiBJZ29yIFJ1c3NraWtoIDxpZ29yLnJ1c3NraWtoQGFxdWFu dGlhLmNvbT4KPiAtLS0KPiAgZHJpdmVycy9uZXQvdXNiL2FxYzExMS5jIHwgMTQgKysrKysrKysr KysrKysKPiAgZHJpdmVycy9uZXQvdXNiL2FxYzExMS5oIHwgIDcgKysrKysrLQo+ICAyIGZpbGVz IGNoYW5nZWQsIDIwIGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKPiAKPiBkaWZmIC0tZ2l0 IGEvZHJpdmVycy9uZXQvdXNiL2FxYzExMS5jIGIvZHJpdmVycy9uZXQvdXNiL2FxYzExMS5jCj4g aW5kZXggY2MyM2MzOWJlYWIzLi5hOTA1MWRkN2M1YmQgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9u ZXQvdXNiL2FxYzExMS5jCj4gKysrIGIvZHJpdmVycy9uZXQvdXNiL2FxYzExMS5jCj4gQEAgLTUy NCw2ICs1MjQsNyBAQCBzdGF0aWMgaW50IGFxYzExMV9iaW5kKHN0cnVjdCB1c2JuZXQgKmRldiwg c3RydWN0IHVzYl9pbnRlcmZhY2UgKmludGYpCj4gIAo+ICAJZGV2LT5uZXQtPmh3X2ZlYXR1cmVz IHw9IEFRX1NVUFBPUlRfSFdfRkVBVFVSRTsKPiAgCWRldi0+bmV0LT5mZWF0dXJlcyB8PSBBUV9T VVBQT1JUX0ZFQVRVUkU7Cj4gKwlkZXYtPm5ldC0+dmxhbl9mZWF0dXJlcyB8PSBBUV9TVVBQT1JU X1ZMQU5fRkVBVFVSRTsKPiAgCj4gIAlhcWMxMTFfcmVhZF9md192ZXJzaW9uKGRldiwgYXFjMTEx X2RhdGEpOwo+ICAJYXFjMTExX2RhdGEtPmF1dG9uZWcgPSBBVVRPTkVHX0VOQUJMRTsKPiBAQCAt ODE3LDYgKzgxOCw3IEBAIHN0YXRpYyBpbnQgYXFjMTExX3Jlc2V0KHN0cnVjdCB1c2JuZXQgKmRl dikKPiAgCj4gIAlkZXYtPm5ldC0+aHdfZmVhdHVyZXMgfD0gQVFfU1VQUE9SVF9IV19GRUFUVVJF Owo+ICAJZGV2LT5uZXQtPmZlYXR1cmVzIHw9IEFRX1NVUFBPUlRfRkVBVFVSRTsKPiArCWRldi0+ bmV0LT52bGFuX2ZlYXR1cmVzIHw9IEFRX1NVUFBPUlRfVkxBTl9GRUFUVVJFOwo+ICAKPiAgCS8q IFBvd2VyIHVwIGV0aGVybmV0IFBIWSAqLwo+ICAJYXFjMTExX2RhdGEtPnBoeV9vcHMuYWR2ZXJ0 aXNpbmcgPSAwOwo+IEBAIC05OTIsNiArOTk0LDExIEBAIHN0YXRpYyBpbnQgYXFjMTExX3J4X2Zp eHVwKHN0cnVjdCB1c2JuZXQgKmRldiwgc3RydWN0IHNrX2J1ZmYgKnNrYikKPiAgCQluZXdfc2ti LT50cnVlc2l6ZSA9IG5ld19za2ItPmxlbiArIHNpemVvZihzdHJ1Y3Qgc2tfYnVmZik7Cj4gIAkJ aWYgKGFxYzExMV9kYXRhLT5yeF9jaGVja3N1bSkKPiAgCQkJYXFjMTExX3J4X2NoZWNrc3VtKG5l d19za2IsICZwa3RfZGVzYyk7Cj4gKwkJaWYgKHBrdF9kZXNjLT52bGFuX2luZCkKPiArCQkJX192 bGFuX2h3YWNjZWxfcHV0X3RhZyhuZXdfc2tiLAo+ICsJCQkJCSAgICAgICBodG9ucyhFVEhfUF84 MDIxUSksCj4gKwkJCQkJICAgICAgIHBrdF9kZXNjLT52bGFuX3RhZyAmCj4gKwkJCQkJICAgICAg IFZMQU5fVklEX01BU0spOwo+ICAKPiAgCQl1c2JuZXRfc2tiX3JldHVybihkZXYsIG5ld19za2Ip Owo+ICAJCWlmIChwa3RfY291bnQgPT0gMCkKPiBAQCAtMTAyMCw2ICsxMDI3LDcgQEAgc3RhdGlj IHN0cnVjdCBza19idWZmICphcWMxMTFfdHhfZml4dXAoc3RydWN0IHVzYm5ldCAqZGV2LCBzdHJ1 Y3Qgc2tfYnVmZiAqc2tiLAo+ICAJaW50IHRhaWxyb29tID0gMDsKPiAgCWludCBwYWRkaW5nX3Np emUgPSAwOwo+ICAJc3RydWN0IHNrX2J1ZmYgKm5ld19za2IgPSBOVUxMOwo+ICsJdTE2IHRjaSA9 IDA7Cj4gIAo+ICAJbWVtc2V0KCZ0eF9oZHIsIDB4MDAsIHNpemVvZih0eF9oZHIpKTsKPiAgCj4g QEAgLTEwMzgsNiArMTA0NiwxMiBAQCBzdGF0aWMgc3RydWN0IHNrX2J1ZmYgKmFxYzExMV90eF9m aXh1cChzdHJ1Y3QgdXNibmV0ICpkZXYsIHN0cnVjdCBza19idWZmICpza2IsCj4gIAkJdHhfaGRy LmRyb3BfcGFkZGluZyA9IDE7Cj4gIAl9Cj4gIAo+ICsJLyogVmxhbiBUYWcgKi8KPiArCWlmICh2 bGFuX2dldF90YWcoc2tiLCAmdGNpKSA+PSAwKSB7Cj4gKwkJdHhfaGRyLnZsYW5fdGFnID0gMTsK PiArCQl0eF9oZHIudmxhbl9pbmZvID0gdGNpOwoKRW5kaWFubmVzcwoKCVJlZ2FyZHMKCQlPbGl2 ZXIK From mboxrd@z Thu Jan 1 00:00:00 1970 From: Oliver Neukum Subject: Re: [PATCH net-next 15/19] net: usb: aqc111: Add support for VLAN_CTAG_TX/RX offload Date: Mon, 08 Oct 2018 16:14:18 +0200 Message-ID: <1539008058.10342.23.camel@suse.com> References: <7d3c26e57edd4cc4f0995e66ec71be9d1c8f53d9.1538734658.git.igor.russkikh@aquantia.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Cc: Dmitry Bezrukov , "linux-usb@vger.kernel.org" , "netdev@vger.kernel.org" To: Igor Russkikh , "David S . Miller" Return-path: Received: from mx2.suse.de ([195.135.220.15]:55838 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726078AbeJHVfF (ORCPT ); Mon, 8 Oct 2018 17:35:05 -0400 In-Reply-To: <7d3c26e57edd4cc4f0995e66ec71be9d1c8f53d9.1538734658.git.igor.russkikh@aquantia.com> Sender: netdev-owner@vger.kernel.org List-ID: On Fr, 2018-10-05 at 10:25 +0000, Igor Russkikh wrote: > From: Dmitry Bezrukov > > Signed-off-by: Dmitry Bezrukov > Signed-off-by: Igor Russkikh > --- > drivers/net/usb/aqc111.c | 14 ++++++++++++++ > drivers/net/usb/aqc111.h | 7 ++++++- > 2 files changed, 20 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/usb/aqc111.c b/drivers/net/usb/aqc111.c > index cc23c39beab3..a9051dd7c5bd 100644 > --- a/drivers/net/usb/aqc111.c > +++ b/drivers/net/usb/aqc111.c > @@ -524,6 +524,7 @@ static int aqc111_bind(struct usbnet *dev, struct usb_interface *intf) > > dev->net->hw_features |= AQ_SUPPORT_HW_FEATURE; > dev->net->features |= AQ_SUPPORT_FEATURE; > + dev->net->vlan_features |= AQ_SUPPORT_VLAN_FEATURE; > > aqc111_read_fw_version(dev, aqc111_data); > aqc111_data->autoneg = AUTONEG_ENABLE; > @@ -817,6 +818,7 @@ static int aqc111_reset(struct usbnet *dev) > > dev->net->hw_features |= AQ_SUPPORT_HW_FEATURE; > dev->net->features |= AQ_SUPPORT_FEATURE; > + dev->net->vlan_features |= AQ_SUPPORT_VLAN_FEATURE; > > /* Power up ethernet PHY */ > aqc111_data->phy_ops.advertising = 0; > @@ -992,6 +994,11 @@ static int aqc111_rx_fixup(struct usbnet *dev, struct sk_buff *skb) > new_skb->truesize = new_skb->len + sizeof(struct sk_buff); > if (aqc111_data->rx_checksum) > aqc111_rx_checksum(new_skb, &pkt_desc); > + if (pkt_desc->vlan_ind) > + __vlan_hwaccel_put_tag(new_skb, > + htons(ETH_P_8021Q), > + pkt_desc->vlan_tag & > + VLAN_VID_MASK); > > usbnet_skb_return(dev, new_skb); > if (pkt_count == 0) > @@ -1020,6 +1027,7 @@ static struct sk_buff *aqc111_tx_fixup(struct usbnet *dev, struct sk_buff *skb, > int tailroom = 0; > int padding_size = 0; > struct sk_buff *new_skb = NULL; > + u16 tci = 0; > > memset(&tx_hdr, 0x00, sizeof(tx_hdr)); > > @@ -1038,6 +1046,12 @@ static struct sk_buff *aqc111_tx_fixup(struct usbnet *dev, struct sk_buff *skb, > tx_hdr.drop_padding = 1; > } > > + /* Vlan Tag */ > + if (vlan_get_tag(skb, &tci) >= 0) { > + tx_hdr.vlan_tag = 1; > + tx_hdr.vlan_info = tci; Endianness Regards Oliver