fill in more of mcx_cap_device so i can get to the device frequencies.

fun fact, my Connect-x 4 Lx boards seem to run at 156MHz. less fun
fact, mcx_calibrate() seems to work that out pretty well anyway,
but the maths is still a bit too wonky to make it usable for mbuf
timestamps.

1 files changed, 78 insertions, 1 deletions

diff --git a/sys/dev/pci/if_mcx.c b/sys/dev/pci/if_mcx.c
index ac5d3c6a076..30b8927887a 100644
--- a/sys/dev/pci/if_mcx.c
+++ b/sys/dev/pci/if_mcx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_mcx.c,v 1.78 2020/12/15 03:35:26 dlg Exp $ */
+/*	$OpenBSD: if_mcx.c,v 1.79 2020/12/15 03:40:29 dlg Exp $ */
 
 /*
  * Copyright (c) 2017 David Gwynne <dlg@openbsd.org>
@@ -983,6 +983,76 @@ struct mcx_cap_device {
 	uint8_t			log_max_tis_per_sq; /* 5 bits */
 #define MCX_CAP_DEVICE_LOG_MAX_TIS_PER_SQ \
 					0x1f
+
+	uint8_t			flags9;
+#define MXC_CAP_DEVICE_EXT_STRIDE_NUM_RANGES \
+					0x80
+#define MXC_CAP_DEVICE_LOG_MAX_STRIDE_SZ_RQ \
+					0x1f
+	uint8_t			log_min_stride_sz_rq; /* 5 bits */
+#define MXC_CAP_DEVICE_LOG_MIN_STRIDE_SZ_RQ \
+					0x1f
+	uint8_t			log_max_stride_sz_sq; /* 5 bits */
+#define MXC_CAP_DEVICE_LOG_MAX_STRIDE_SZ_SQ \
+					0x1f
+	uint8_t			log_min_stride_sz_sq; /* 5 bits */
+#define MXC_CAP_DEVICE_LOG_MIN_STRIDE_SZ_SQ \
+					0x1f
+
+	uint8_t			log_max_hairpin_queues;
+#define MXC_CAP_DEVICE_HAIRPIN		0x80
+#define MXC_CAP_DEVICE_LOG_MAX_HAIRPIN_QUEUES \
+					0x1f
+	uint8_t			log_min_hairpin_queues;
+#define MXC_CAP_DEVICE_LOG_MIN_HAIRPIN_QUEUES \
+					0x1f
+	uint8_t			log_max_hairpin_num_packets;
+#define MXC_CAP_DEVICE_LOG_MAX_HAIRPIN_NUM_PACKETS \
+					0x1f
+	uint8_t			log_max_mq_sz;
+#define MXC_CAP_DEVICE_LOG_MAX_WQ_SZ \
+					0x1f
+
+	uint8_t			log_min_hairpin_wq_data_sz;
+#define MXC_CAP_DEVICE_NIC_VPORT_CHANGE_EVENT \
+					0x80
+#define MXC_CAP_DEVICE_DISABLE_LOCAL_LB_UC \
+					0x40
+#define MXC_CAP_DEVICE_DISABLE_LOCAL_LB_MC \
+					0x20
+#define MCX_CAP_DEVICE_LOG_MIN_HAIRPIN_WQ_DATA_SZ \
+					0x1f
+	uint8_t			log_max_vlan_list;
+#define MXC_CAP_DEVICE_SYSTEM_IMAGE_GUID_MODIFIABLE \
+					0x80
+#define MXC_CAP_DEVICE_LOG_MAX_VLAN_LIST \
+					0x1f
+	uint8_t			log_max_current_mc_list;
+#define MXC_CAP_DEVICE_LOG_MAX_CURRENT_MC_LIST \
+					0x1f
+	uint8_t			log_max_current_uc_list;
+#define MXC_CAP_DEVICE_LOG_MAX_CURRENT_UC_LIST \
+					0x1f
+
+	uint8_t			__reserved__[4];
+
+	uint32_t		create_qp_start_hint; /* 24 bits */
+
+	uint8_t			log_max_uctx; /* 5 bits */
+#define MXC_CAP_DEVICE_LOG_MAX_UCTX	0x1f
+	uint8_t			log_max_umem; /* 5 bits */
+#define MXC_CAP_DEVICE_LOG_MAX_UMEM	0x1f
+	uint16_t		max_num_eqs;
+
+	uint8_t			log_max_l2_table; /* 5 bits */
+#define MXC_CAP_DEVICE_LOG_MAX_L2_TABLE	0x1f
+	uint8_t			__reserved__[1];
+	uint16_t		log_uar_page_sz;
+
+	uint8_t			__reserved__[8];
+
+	uint32_t		device_frequency_mhz;
+	uint32_t		device_frequency_khz;
 } __packed __aligned(8);
 
 CTASSERT(offsetof(struct mcx_cap_device, max_indirection) == 0x20);
@@ -991,6 +1061,8 @@ CTASSERT(offsetof(struct mcx_cap_device, flags2) == 0x30);
 CTASSERT(offsetof(struct mcx_cap_device, snapshot_log_max_msg) == 0x38);
 CTASSERT(offsetof(struct mcx_cap_device, flags5) == 0x40);
 CTASSERT(offsetof(struct mcx_cap_device, flags7) == 0x4c);
+CTASSERT(offsetof(struct mcx_cap_device, device_frequency_mhz) == 0x98);
+CTASSERT(offsetof(struct mcx_cap_device, device_frequency_khz) == 0x9c);
 CTASSERT(sizeof(struct mcx_cap_device) <= MCX_CMDQ_MAILBOX_DATASIZE);
 
 struct mcx_cmd_set_driver_version_in {
@@ -2383,6 +2455,8 @@ struct mcx_softc {
 	struct mcx_calibration	 sc_calibration[2];
 	unsigned int		 sc_calibration_gen;
 	struct timeout		 sc_calibrate;
+	uint32_t		 sc_mhz;
+	uint32_t		 sc_khz;
 
 	struct mcx_queues	 sc_queues[MCX_MAX_QUEUES];
 	unsigned int		 sc_nqueues;
@@ -3789,6 +3863,9 @@ mcx_hca_max_caps(struct mcx_softc *sc)
 	sc->sc_bf_size = (1 << hca->log_bf_reg_size) / 2;
 	sc->sc_max_rqt_size = (1 << hca->log_max_rqt_size);
 
+	sc->sc_mhz = bemtoh32(&hca->device_frequency_mhz);
+	sc->sc_khz = bemtoh32(&hca->device_frequency_khz);
+
 free:
 	mcx_dmamem_free(sc, &mxm);