| Message ID | da72827dfe52c4dc96a1b5eda6d0f3d15da60646.1490202165.git.pavel.belous@aquantia.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
Hi, On 03/22/2017 01:06 PM, Pavel Belous wrote: > From: Pavel Belous <pavel.belous@aquantia.com> > > Fix Context Command bit: L3 type = "0" for IPv4, "1" for IPv6. > > Signed-off-by: Pavel Belous <pavel.belous@aquantia.com> > --- > drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 3 +++ > drivers/net/ethernet/aquantia/atlantic/aq_ring.h | 3 ++- > drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c | 3 +++ > drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 3 +++ > 4 files changed, 11 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c > index 95f9841..293b261 100644 > --- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c > +++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c > @@ -487,6 +487,9 @@ static unsigned int aq_nic_map_skb(struct aq_nic_s *self, > dx_buff->mss = skb_shinfo(skb)->gso_size; > dx_buff->is_txc = 1U; > > + dx_buff->is_ipv6 = > + (ip_hdr(skb)->version == 6) ? 1U : 0U; > + > dx = aq_ring_next_dx(ring, dx); > dx_buff = &ring->buff_ring[dx]; > ++ret; > diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_ring.h b/drivers/net/ethernet/aquantia/atlantic/aq_ring.h > index 2572546..eecd6d1 100644 > --- a/drivers/net/ethernet/aquantia/atlantic/aq_ring.h > +++ b/drivers/net/ethernet/aquantia/atlantic/aq_ring.h > @@ -58,7 +58,8 @@ struct __packed aq_ring_buff_s { > u8 len_l2; > u8 len_l3; > u8 len_l4; > - u8 rsvd2; > + u8 is_ipv6:1; > + u8 rsvd2:7; > u32 len_pkt; > }; > }; > diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c > index a2b746a..d62436e 100644 > --- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c > +++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c > @@ -433,6 +433,9 @@ static int hw_atl_a0_hw_ring_tx_xmit(struct aq_hw_s *self, > buff->len_l3 + > buff->len_l2); > is_gso = true; > + > + if (buff->is_ipv6) > + txd->ctl |= HW_ATL_B0_TXD_CTL_CMD_IPV6; I think this is a mistake. I believe it should be HW_ATL_A0_TXD_CTL_CMD_IPV6. AFAICT this file doesn't include hw_atl_b0_internal.h, so I don't believe this will compile. Thanks, -DA > } else { > buff_pa_len = buff->len; > > diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c > index cab2931..69488c9 100644 > --- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c > +++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c > @@ -471,6 +471,9 @@ static int hw_atl_b0_hw_ring_tx_xmit(struct aq_hw_s *self, > buff->len_l3 + > buff->len_l2); > is_gso = true; > + > + if (buff->is_ipv6) > + txd->ctl |= HW_ATL_B0_TXD_CTL_CMD_IPV6; > } else { > buff_pa_len = buff->len; > >
On 03/22/2017 10:21 PM, David Arcari wrote: > Hi, > > On 03/22/2017 01:06 PM, Pavel Belous wrote: >> From: Pavel Belous <pavel.belous@aquantia.com> >> >> Fix Context Command bit: L3 type = "0" for IPv4, "1" for IPv6. >> >> Signed-off-by: Pavel Belous <pavel.belous@aquantia.com> >> --- >> drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 3 +++ >> drivers/net/ethernet/aquantia/atlantic/aq_ring.h | 3 ++- >> drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c | 3 +++ >> drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 3 +++ >> 4 files changed, 11 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c >> index 95f9841..293b261 100644 >> --- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c >> +++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c >> @@ -487,6 +487,9 @@ static unsigned int aq_nic_map_skb(struct aq_nic_s *self, >> dx_buff->mss = skb_shinfo(skb)->gso_size; >> dx_buff->is_txc = 1U; >> >> + dx_buff->is_ipv6 = >> + (ip_hdr(skb)->version == 6) ? 1U : 0U; >> + >> dx = aq_ring_next_dx(ring, dx); >> dx_buff = &ring->buff_ring[dx]; >> ++ret; >> diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_ring.h b/drivers/net/ethernet/aquantia/atlantic/aq_ring.h >> index 2572546..eecd6d1 100644 >> --- a/drivers/net/ethernet/aquantia/atlantic/aq_ring.h >> +++ b/drivers/net/ethernet/aquantia/atlantic/aq_ring.h >> @@ -58,7 +58,8 @@ struct __packed aq_ring_buff_s { >> u8 len_l2; >> u8 len_l3; >> u8 len_l4; >> - u8 rsvd2; >> + u8 is_ipv6:1; >> + u8 rsvd2:7; >> u32 len_pkt; >> }; >> }; >> diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c >> index a2b746a..d62436e 100644 >> --- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c >> +++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c >> @@ -433,6 +433,9 @@ static int hw_atl_a0_hw_ring_tx_xmit(struct aq_hw_s *self, >> buff->len_l3 + >> buff->len_l2); >> is_gso = true; >> + >> + if (buff->is_ipv6) >> + txd->ctl |= HW_ATL_B0_TXD_CTL_CMD_IPV6; > > I think this is a mistake. I believe it should be HW_ATL_A0_TXD_CTL_CMD_IPV6. > > AFAICT this file doesn't include hw_atl_b0_internal.h, so I don't believe this > will compile. > > Thanks, > > -DA > >> } else { >> buff_pa_len = buff->len; >> >> diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c >> index cab2931..69488c9 100644 >> --- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c >> +++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c >> @@ -471,6 +471,9 @@ static int hw_atl_b0_hw_ring_tx_xmit(struct aq_hw_s *self, >> buff->len_l3 + >> buff->len_l2); >> is_gso = true; >> + >> + if (buff->is_ipv6) >> + txd->ctl |= HW_ATL_B0_TXD_CTL_CMD_IPV6; >> } else { >> buff_pa_len = buff->len; >> >> > Thank you, David. I will fix this in patchset v2. Regards, Pavel
Hi Pavel,
[auto build test ERROR on net/master]
url: https://github.com/0day-ci/linux/commits/Pavel-Belous/net-ethernet-aquantia-Misc-fixes-for-atlantic-driver/20170323-191314
config: x86_64-allmodconfig (attached as .config)
compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901
reproduce:
# save the attached .config to linux build tree
make ARCH=x86_64
All errors (new ones prefixed by >>):
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c: In function 'hw_atl_a0_hw_ring_tx_xmit':
>> drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c:438:17: error: 'HW_ATL_B0_TXD_CTL_CMD_IPV6' undeclared (first use in this function)
txd->ctl |= HW_ATL_B0_TXD_CTL_CMD_IPV6;
^~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c:438:17: note: each undeclared identifier is reported only once for each function it appears in
vim +/HW_ATL_B0_TXD_CTL_CMD_IPV6 +438 drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c
432 pkt_len -= (buff->len_l4 +
433 buff->len_l3 +
434 buff->len_l2);
435 is_gso = true;
436
437 if (buff->is_ipv6)
> 438 txd->ctl |= HW_ATL_B0_TXD_CTL_CMD_IPV6;
439 } else {
440 buff_pa_len = buff->len;
441
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c index 95f9841..293b261 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c +++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c @@ -487,6 +487,9 @@ static unsigned int aq_nic_map_skb(struct aq_nic_s *self, dx_buff->mss = skb_shinfo(skb)->gso_size; dx_buff->is_txc = 1U; + dx_buff->is_ipv6 = + (ip_hdr(skb)->version == 6) ? 1U : 0U; + dx = aq_ring_next_dx(ring, dx); dx_buff = &ring->buff_ring[dx]; ++ret; diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_ring.h b/drivers/net/ethernet/aquantia/atlantic/aq_ring.h index 2572546..eecd6d1 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_ring.h +++ b/drivers/net/ethernet/aquantia/atlantic/aq_ring.h @@ -58,7 +58,8 @@ struct __packed aq_ring_buff_s { u8 len_l2; u8 len_l3; u8 len_l4; - u8 rsvd2; + u8 is_ipv6:1; + u8 rsvd2:7; u32 len_pkt; }; }; diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c index a2b746a..d62436e 100644 --- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c +++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c @@ -433,6 +433,9 @@ static int hw_atl_a0_hw_ring_tx_xmit(struct aq_hw_s *self, buff->len_l3 + buff->len_l2); is_gso = true; + + if (buff->is_ipv6) + txd->ctl |= HW_ATL_B0_TXD_CTL_CMD_IPV6; } else { buff_pa_len = buff->len; diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c index cab2931..69488c9 100644 --- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c +++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c @@ -471,6 +471,9 @@ static int hw_atl_b0_hw_ring_tx_xmit(struct aq_hw_s *self, buff->len_l3 + buff->len_l2); is_gso = true; + + if (buff->is_ipv6) + txd->ctl |= HW_ATL_B0_TXD_CTL_CMD_IPV6; } else { buff_pa_len = buff->len;