SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

e1000: Use more constant definitions

Browse Source 
The definitions for E1000_VFTA_ENTRY_SHIFT, E1000_VFTA_ENTRY_MASK, and
E1000_VFTA_ENTRY_BIT_SHIFT_MASK were copied from:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tree/drivers/net/ethernet/intel/e1000/e1000_hw.h?h=v6.0.9#n306

The definitions for E1000_NUM_UNICAST, E1000_MC_TBL_SIZE, and
E1000_VLAN_FILTER_TBL_SIZE were copied from:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tree/drivers/net/ethernet/intel/e1000/e1000_hw.h?h=v6.0.9#n707

Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
Akihiko Odaki 2023-02-23 19:19:52 +09:00 committed by Jason Wang
parent c16bd68e16
commit 2fe63579d8
4 changed files with 41 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
hw/net/e1000.c
View File

@ -43,8 +43,6 @@
#include "trace.h" #include "trace.h"
#include "qom/object.h" #include "qom/object.h"
static const uint8_t bcast[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
/* #define E1000_DEBUG */ /* #define E1000_DEBUG */
#ifdef E1000_DEBUG #ifdef E1000_DEBUG
@ -67,9 +65,8 @@ static int debugflags = DBGBIT(TXERR) | DBGBIT(GENERAL);
#define IOPORT_SIZE 0x40 #define IOPORT_SIZE 0x40
#define PNPMMIO_SIZE 0x20000 #define PNPMMIO_SIZE 0x20000
#define MIN_BUF_SIZE 60 /* Min. octets in an ethernet frame sans FCS */
#define MAXIMUM_ETHERNET_HDR_LEN (14+4) #define MAXIMUM_ETHERNET_HDR_LEN (ETH_HLEN + 4)
/* /*
* HW models: * HW models:
@ -239,10 +236,16 @@ static const uint16_t phy_reg_init[] = {
[MII_PHYID1] = 0x141, [MII_PHYID1] = 0x141,
/* [MII_PHYID2] configured per DevId, from e1000_reset() */ /* [MII_PHYID2] configured per DevId, from e1000_reset() */
[MII_ANAR] = 0xde1, [MII_ANAR] = MII_ANAR_CSMACD | MII_ANAR_10 |
[MII_ANLPAR] = 0x1e0, MII_ANAR_10FD | MII_ANAR_TX |
[MII_CTRL1000] = 0x0e00, MII_ANAR_TXFD | MII_ANAR_PAUSE |
[MII_STAT1000] = 0x3c00, MII_ANAR_PAUSE_ASYM,
[MII_ANLPAR] = MII_ANLPAR_10 | MII_ANLPAR_10FD |
MII_ANLPAR_TX | MII_ANLPAR_TXFD,
[MII_CTRL1000] = MII_CTRL1000_FULL | MII_CTRL1000_PORT |
MII_CTRL1000_MASTER,
[MII_STAT1000] = MII_STAT1000_HALF | MII_STAT1000_FULL |
MII_STAT1000_ROK | MII_STAT1000_LOK,
[M88E1000_PHY_SPEC_CTRL] = 0x360, [M88E1000_PHY_SPEC_CTRL] = 0x360,
[M88E1000_PHY_SPEC_STATUS] = 0xac00, [M88E1000_PHY_SPEC_STATUS] = 0xac00,
[M88E1000_EXT_PHY_SPEC_CTRL] = 0x0d60, [M88E1000_EXT_PHY_SPEC_CTRL] = 0x0d60,
@ -548,9 +551,9 @@ putsum(uint8_t *data, uint32_t n, uint32_t sloc, uint32_t css, uint32_t cse)
static inline void static inline void
inc_tx_bcast_or_mcast_count(E1000State *s, const unsigned char *arr) inc_tx_bcast_or_mcast_count(E1000State *s, const unsigned char *arr)
{ {
if (!memcmp(arr, bcast, sizeof bcast)) { if (is_broadcast_ether_addr(arr)) {
e1000x_inc_reg_if_not_full(s->mac_reg, BPTC); e1000x_inc_reg_if_not_full(s->mac_reg, BPTC);
} else if (arr[0] & 1) { } else if (is_multicast_ether_addr(arr)) {
e1000x_inc_reg_if_not_full(s->mac_reg, MPTC); e1000x_inc_reg_if_not_full(s->mac_reg, MPTC);
} }
} }
@ -804,14 +807,16 @@ static int
receive_filter(E1000State *s, const uint8_t *buf, int size) receive_filter(E1000State *s, const uint8_t *buf, int size)
{ {
uint32_t rctl = s->mac_reg[RCTL]; uint32_t rctl = s->mac_reg[RCTL];
int isbcast = !memcmp(buf, bcast, sizeof bcast), ismcast = (buf[0] & 1); int isbcast = is_broadcast_ether_addr(buf);
int ismcast = is_multicast_ether_addr(buf);
if (e1000x_is_vlan_packet(buf, le16_to_cpu(s->mac_reg[VET])) && if (e1000x_is_vlan_packet(buf, le16_to_cpu(s->mac_reg[VET])) &&
e1000x_vlan_rx_filter_enabled(s->mac_reg)) { e1000x_vlan_rx_filter_enabled(s->mac_reg)) {
uint16_t vid = lduw_be_p(buf + 14); uint16_t vid = lduw_be_p(&PKT_GET_VLAN_HDR(buf)->h_tci);
uint32_t vfta = ldl_le_p((uint32_t *)(s->mac_reg + VFTA) + uint32_t vfta =
((vid >> 5) & 0x7f)); ldl_le_p((uint32_t *)(s->mac_reg + VFTA) +
if ((vfta & (1 << (vid & 0x1f))) == 0) { ((vid >> E1000_VFTA_ENTRY_SHIFT) & E1000_VFTA_ENTRY_MASK));
if ((vfta & (1 << (vid & E1000_VFTA_ENTRY_BIT_SHIFT_MASK))) == 0) {
return 0; return 0;
} }
} }
@ -909,7 +914,7 @@ e1000_receive_iov(NetClientState *nc, const struct iovec *iov, int iovcnt)
uint32_t rdh_start; uint32_t rdh_start;
uint16_t vlan_special = 0; uint16_t vlan_special = 0;
uint8_t vlan_status = 0; uint8_t vlan_status = 0;
uint8_t min_buf[MIN_BUF_SIZE]; uint8_t min_buf[ETH_ZLEN];
struct iovec min_iov; struct iovec min_iov;
uint8_t *filter_buf = iov->iov_base; uint8_t *filter_buf = iov->iov_base;
size_t size = iov_size(iov, iovcnt); size_t size = iov_size(iov, iovcnt);
@ -1204,8 +1209,8 @@ static const readops macreg_readops[] = {
[FFLT ... FFLT + 6] = &mac_readreg, [FFLT ... FFLT + 6] = &mac_readreg,
[RA ... RA + 31] = &mac_readreg, [RA ... RA + 31] = &mac_readreg,
[WUPM ... WUPM + 31] = &mac_readreg, [WUPM ... WUPM + 31] = &mac_readreg,
[MTA ... MTA + 127] = &mac_readreg, [MTA ... MTA + E1000_MC_TBL_SIZE - 1] = &mac_readreg,
[VFTA ... VFTA + 127] = &mac_readreg, [VFTA ... VFTA + E1000_VLAN_FILTER_TBL_SIZE - 1] = &mac_readreg,
[FFMT ... FFMT + 254] = &mac_readreg, [FFMT ... FFMT + 254] = &mac_readreg,
[FFVT ... FFVT + 254] = &mac_readreg, [FFVT ... FFVT + 254] = &mac_readreg,
[PBM ... PBM + 16383] = &mac_readreg, [PBM ... PBM + 16383] = &mac_readreg,
@ -1236,8 +1241,8 @@ static const writeops macreg_writeops[] = {
[FFLT ... FFLT + 6] = &set_11bit, [FFLT ... FFLT + 6] = &set_11bit,
[RA ... RA + 31] = &mac_writereg, [RA ... RA + 31] = &mac_writereg,
[WUPM ... WUPM + 31] = &mac_writereg, [WUPM ... WUPM + 31] = &mac_writereg,
[MTA ... MTA + 127] = &mac_writereg, [MTA ... MTA + E1000_MC_TBL_SIZE - 1] = &mac_writereg,
[VFTA ... VFTA + 127] = &mac_writereg, [VFTA ... VFTA + E1000_VLAN_FILTER_TBL_SIZE - 1] = &mac_writereg,
[FFMT ... FFMT + 254] = &set_4bit, [FFVT ... FFVT + 254] = &mac_writereg, [FFMT ... FFMT + 254] = &set_4bit, [FFVT ... FFVT + 254] = &mac_writereg,
[PBM ... PBM + 16383] = &mac_writereg, [PBM ... PBM + 16383] = &mac_writereg,
}; };
@ -1603,8 +1608,9 @@ static const VMStateDescription vmstate_e1000 = {
VMSTATE_UINT32(mac_reg[WUFC], E1000State), VMSTATE_UINT32(mac_reg[WUFC], E1000State),
VMSTATE_UINT32(mac_reg[VET], E1000State), VMSTATE_UINT32(mac_reg[VET], E1000State),
VMSTATE_UINT32_SUB_ARRAY(mac_reg, E1000State, RA, 32), VMSTATE_UINT32_SUB_ARRAY(mac_reg, E1000State, RA, 32),
VMSTATE_UINT32_SUB_ARRAY(mac_reg, E1000State, MTA, 128), VMSTATE_UINT32_SUB_ARRAY(mac_reg, E1000State, MTA, E1000_MC_TBL_SIZE),
VMSTATE_UINT32_SUB_ARRAY(mac_reg, E1000State, VFTA, 128), VMSTATE_UINT32_SUB_ARRAY(mac_reg, E1000State, VFTA,
E1000_VLAN_FILTER_TBL_SIZE),
VMSTATE_END_OF_LIST() VMSTATE_END_OF_LIST()
}, },
.subsections = (const VMStateDescription*[]) { .subsections = (const VMStateDescription*[]) {

9
hw/net/e1000_regs.h
View File

@ -1154,6 +1154,11 @@ struct e1000_data_desc {
} upper; } upper;
}; };
/* Filters */
#define E1000_NUM_UNICAST 16 /* Unicast filter entries */
#define E1000_MC_TBL_SIZE 128 /* Multicast Filter Table (4096 bits) */
#define E1000_VLAN_FILTER_TBL_SIZE 128 /* VLAN Filter Table (4096 bits) */
/* Management Control */ /* Management Control */
#define E1000_MANC_SMBUS_EN 0x00000001 /* SMBus Enabled - RO */ #define E1000_MANC_SMBUS_EN 0x00000001 /* SMBus Enabled - RO */
#define E1000_MANC_ASF_EN 0x00000002 /* ASF Enabled - RO */ #define E1000_MANC_ASF_EN 0x00000002 /* ASF Enabled - RO */
@ -1202,4 +1207,8 @@ struct e1000_data_desc {
#define E1000_IOADDR 0x00 #define E1000_IOADDR 0x00
#define E1000_IODATA 0x04 #define E1000_IODATA 0x04
#define E1000_VFTA_ENTRY_SHIFT 5
#define E1000_VFTA_ENTRY_MASK 0x7F
#define E1000_VFTA_ENTRY_BIT_SHIFT_MASK 0x1F
#endif /* HW_E1000_REGS_H */ #endif /* HW_E1000_REGS_H */

5
hw/net/e1000x_common.c
View File

@ -26,6 +26,7 @@
#include "qemu/units.h" #include "qemu/units.h"
#include "hw/net/mii.h" #include "hw/net/mii.h"
#include "hw/pci/pci_device.h" #include "hw/pci/pci_device.h"
#include "net/eth.h"
#include "net/net.h" #include "net/net.h"
#include "e1000x_common.h" #include "e1000x_common.h"
@ -48,7 +49,7 @@ bool e1000x_rx_ready(PCIDevice *d, uint32_t *mac)
bool e1000x_is_vlan_packet(const uint8_t *buf, uint16_t vet) bool e1000x_is_vlan_packet(const uint8_t *buf, uint16_t vet)
{ {
uint16_t eth_proto = lduw_be_p(buf + 12); uint16_t eth_proto = lduw_be_p(&PKT_GET_ETH_HDR(buf)->h_proto);
bool res = (eth_proto == vet); bool res = (eth_proto == vet);
trace_e1000x_vlan_is_vlan_pkt(res, eth_proto, vet); trace_e1000x_vlan_is_vlan_pkt(res, eth_proto, vet);
@ -67,7 +68,7 @@ bool e1000x_rx_group_filter(uint32_t *mac, const uint8_t *buf)
} }
ra[0] = cpu_to_le32(rp[0]); ra[0] = cpu_to_le32(rp[0]);
ra[1] = cpu_to_le32(rp[1]); ra[1] = cpu_to_le32(rp[1]);
if (!memcmp(buf, (uint8_t *)ra, 6)) { if (!memcmp(buf, (uint8_t *)ra, ETH_ALEN)) {
trace_e1000x_rx_flt_ucast_match((int)(rp - mac - RA) / 2, trace_e1000x_rx_flt_ucast_match((int)(rp - mac - RA) / 2,
MAC_ARG(buf)); MAC_ARG(buf));
return true; return true;

2
hw/net/e1000x_common.h
View File

@ -102,7 +102,7 @@ enum {
static inline void static inline void
e1000x_inc_reg_if_not_full(uint32_t *mac, int index) e1000x_inc_reg_if_not_full(uint32_t *mac, int index)
{ {
if (mac[index] != 0xffffffff) { if (mac[index] != UINT32_MAX) {
mac[index]++; mac[index]++;
} }
} }