From 2fc5c81ed69fc2bd5cb8e825ea69ddd89ec9c242 Mon Sep 17 00:00:00 2001 From: stsp Date: Sat, 11 Nov 2023 16:32:56 +0000 Subject: [PATCH] Correct wrong register offset macros for dwqe(4) DMA burst length. Intel Elkhart Lake Ethernet now reaches 934 Mbps Tx/Rx in my testing. Patch by msaitoh@netbsd, thanks! Tested by myself on Elkhart Lake, dlg@ on arm64, and jca@ on riscv. ok dlg@ patrick@ --- sys/dev/ic/dwqereg.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/dev/ic/dwqereg.h b/sys/dev/ic/dwqereg.h index 88da091f1ad..bc6de32a5a5 100644 --- a/sys/dev/ic/dwqereg.h +++ b/sys/dev/ic/dwqereg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dwqereg.h,v 1.4 2023/10/11 12:32:46 stsp Exp $ */ +/* $OpenBSD: dwqereg.h,v 1.5 2023/11/11 16:32:56 stsp Exp $ */ /* * Copyright (c) 2008, 2019 Mark Kettenis * Copyright (c) 2017, 2022 Patrick Wildt @@ -159,13 +159,13 @@ #define GMAC_CHAN_CONTROL(x) (GMAC_CHAN_BASE_ADDR(x) + 0x0) #define GMAC_CHAN_CONTROL_8XPBL (1 << 16) #define GMAC_CHAN_TX_CONTROL(x) (GMAC_CHAN_BASE_ADDR(x) + 0x4) -#define GMAC_CHAN_TX_CONTROL_PBL_MASK (0x3f << 8) -#define GMAC_CHAN_TX_CONTROL_PBL_SHIFT 8 +#define GMAC_CHAN_TX_CONTROL_PBL_MASK (0x3f << 16) +#define GMAC_CHAN_TX_CONTROL_PBL_SHIFT 16 #define GMAC_CHAN_TX_CONTROL_OSP (1 << 4) #define GMAC_CHAN_TX_CONTROL_ST (1 << 0) #define GMAC_CHAN_RX_CONTROL(x) (GMAC_CHAN_BASE_ADDR(x) + 0x8) -#define GMAC_CHAN_RX_CONTROL_RPBL_MASK (0x3f << 17) -#define GMAC_CHAN_RX_CONTROL_RPBL_SHIFT 17 +#define GMAC_CHAN_RX_CONTROL_RPBL_MASK (0x3f << 16) +#define GMAC_CHAN_RX_CONTROL_RPBL_SHIFT 16 #define GMAC_CHAN_RX_CONTROL_SR (1 << 0) #define GMAC_CHAN_TX_BASE_ADDR_HI(x) (GMAC_CHAN_BASE_ADDR(x) + 0x10) #define GMAC_CHAN_TX_BASE_ADDR(x) (GMAC_CHAN_BASE_ADDR(x) + 0x14) -- 2.20.1