diff options
| -rw-r--r-- | share/man/man4/man4.octeon/ogx.4 | 8 | ||||
| -rw-r--r-- | sys/arch/octeon/dev/if_ogx.c | 52 | ||||
| -rw-r--r-- | sys/arch/octeon/dev/ogxreg.h | 12 |
3 files changed, 59 insertions, 13 deletions
diff --git a/share/man/man4/man4.octeon/ogx.4 b/share/man/man4/man4.octeon/ogx.4 index a1b0c9c1c1d..b1ce614789b 100644 --- a/share/man/man4/man4.octeon/ogx.4 +++ b/share/man/man4/man4.octeon/ogx.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ogx.4,v 1.1 2019/11/05 14:27:59 visa Exp $ +.\" $OpenBSD: ogx.4,v 1.2 2020/12/31 09:57:23 visa Exp $ .\" .\" Copyright (c) 2019 Visa Hankala .\" @@ -15,7 +15,7 @@ .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" .\" -.Dd $Mdocdate: November 5 2019 $ +.Dd $Mdocdate: December 31 2020 $ .Dt OGX 4 octeon .Os .Sh NAME @@ -27,6 +27,10 @@ The .Nm driver supports built-in Ethernet ports on the OCTEON III network processor. +.Pp +The +.Nm +driver utilizes IPv4 and TCP/UDP checksum offload on transmission. .Sh SEE ALSO .Xr arp 4 , .Xr ifmedia 4 , diff --git a/sys/arch/octeon/dev/if_ogx.c b/sys/arch/octeon/dev/if_ogx.c index 079741c7dd3..365d30002ce 100644 --- a/sys/arch/octeon/dev/if_ogx.c +++ b/sys/arch/octeon/dev/if_ogx.c @@ -1,7 +1,7 @@ -/* $OpenBSD: if_ogx.c,v 1.3 2020/12/12 11:48:52 jan Exp $ */ +/* $OpenBSD: if_ogx.c,v 1.4 2020/12/31 09:57:23 visa Exp $ */ /* - * Copyright (c) 2019 Visa Hankala + * Copyright (c) 2019-2020 Visa Hankala * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -34,12 +34,17 @@ #include <net/if.h> #include <net/if_media.h> #include <netinet/in.h> +#include <netinet/ip.h> #include <netinet/if_ether.h> #if NBPFILTER > 0 #include <net/bpf.h> #endif +#ifdef INET6 +#include <netinet/ip6.h> +#endif + #include <dev/mii/mii.h> #include <dev/mii/miivar.h> @@ -458,6 +463,9 @@ ogx_attach(struct device *parent, struct device *self, void *aux) ifp->if_xflags |= IFXF_MPSAFE; ifp->if_ioctl = ogx_ioctl; ifp->if_qstart = ogx_start; + ifp->if_capabilities = IFCAP_CSUM_IPv4 | + IFCAP_CSUM_TCPv4 | IFCAP_CSUM_UDPv4 | + IFCAP_CSUM_TCPv6 | IFCAP_CSUM_UDPv6; sc->sc_mii.mii_ifp = ifp; sc->sc_mii.mii_readreg = ogx_mii_readreg; @@ -1216,8 +1224,9 @@ ogx_start(struct ifqueue *ifq) int ogx_send_mbuf(struct ogx_softc *sc, struct mbuf *m0) { + struct ether_header *eh; struct mbuf *m; - uint64_t scroff, word; + uint64_t ehdrlen, hdr, scroff, word; unsigned int nfrags; /* Save original pointer for freeing after transmission. */ @@ -1225,6 +1234,37 @@ ogx_send_mbuf(struct ogx_softc *sc, struct mbuf *m0) /* Add a tag for sanity checking. */ m0->m_pkthdr.ph_ifidx = (u_int)(uintptr_t)sc; + hdr = PKO3_SEND_HDR_DF; + hdr |= m0->m_pkthdr.len << PKO3_SEND_HDR_TOTAL_S; + + if (m0->m_pkthdr.csum_flags & + (M_IPV4_CSUM_OUT | M_TCP_CSUM_OUT | M_UDP_CSUM_OUT)) { + eh = mtod(m0, struct ether_header *); + ehdrlen = ETHER_HDR_LEN; + + switch (ntohs(eh->ether_type)) { + case ETHERTYPE_IP: + hdr |= ehdrlen << PKO3_SEND_HDR_L3PTR_S; + hdr |= (ehdrlen + sizeof(struct ip)) << + PKO3_SEND_HDR_L4PTR_S; + break; + case ETHERTYPE_IPV6: + hdr |= ehdrlen << PKO3_SEND_HDR_L3PTR_S; + hdr |= (ehdrlen + sizeof(struct ip6_hdr)) << + PKO3_SEND_HDR_L4PTR_S; + break; + default: + break; + } + + if (m0->m_pkthdr.csum_flags & M_IPV4_CSUM_OUT) + hdr |= PKO3_SEND_HDR_CKL3; + if (m0->m_pkthdr.csum_flags & M_TCP_CSUM_OUT) + hdr |= PKO3_SEND_HDR_CKL4_TCP; + if (m0->m_pkthdr.csum_flags & M_UDP_CSUM_OUT) + hdr |= PKO3_SEND_HDR_CKL4_UDP; + } + /* Flush pending writes before packet submission. */ octeon_syncw(); @@ -1234,10 +1274,8 @@ ogx_send_mbuf(struct ogx_softc *sc, struct mbuf *m0) /* Get the LMTDMA region offset in the scratchpad. */ scroff = 2 * 0x80; - word = PKO3_SEND_HDR_DF; - word |= m0->m_pkthdr.len << PKO3_SEND_HDR_TOTAL_S; - octeon_cvmseg_write_8(scroff, word); - scroff += sizeof(word); + octeon_cvmseg_write_8(scroff, hdr); + scroff += sizeof(hdr); for (m = m0, nfrags = 0; m != NULL && nfrags < 13; m = m->m_next, nfrags++) { diff --git a/sys/arch/octeon/dev/ogxreg.h b/sys/arch/octeon/dev/ogxreg.h index 382d22440e9..e3749a61ea1 100644 --- a/sys/arch/octeon/dev/ogxreg.h +++ b/sys/arch/octeon/dev/ogxreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ogxreg.h,v 1.1 2019/11/04 14:58:40 visa Exp $ */ +/* $OpenBSD: ogxreg.h,v 1.2 2020/12/31 09:57:23 visa Exp $ */ /* * Copyright (c) 2019 Visa Hankala @@ -332,7 +332,9 @@ */ #define PKO3_SEND_HDR_AURA 0x0fff000000000000ULL -#define PKO3_SEND_HDR_CKL4 0x0000c00000000000ULL +#define PKO3_SEND_HDR_CKL4_M 0x0000c00000000000ULL +#define PKO3_SEND_HDR_CKL4_TCP 0x0000800000000000ULL +#define PKO3_SEND_HDR_CKL4_UDP 0x0000400000000000ULL #define PKO3_SEND_HDR_CKL3 0x0000200000000000ULL #define PKO3_SEND_HDR_DS 0x0000100000000000ULL #define PKO3_SEND_HDR_LE 0x0000080000000000ULL @@ -340,8 +342,10 @@ #define PKO3_SEND_HDR_II 0x0000020000000000ULL #define PKO3_SEND_HDR_DF 0x0000010000000000ULL #define PKO3_SEND_HDR_FORMAT 0x0000007f00000000ULL -#define PKO3_SEND_HDR_L4PTR 0x00000000ff000000ULL -#define PKO3_SEND_HDR_L3PTR 0x0000000000ff0000ULL +#define PKO3_SEND_HDR_L4PTR_M 0x00000000ff000000ULL +#define PKO3_SEND_HDR_L4PTR_S 24 +#define PKO3_SEND_HDR_L3PTR_M 0x0000000000ff0000ULL +#define PKO3_SEND_HDR_L3PTR_S 16 #define PKO3_SEND_HDR_TOTAL_M 0x000000000000ffffULL #define PKO3_SEND_HDR_TOTAL_S 0 |