Skip to content
This repository was archived by the owner on Oct 30, 2021. It is now read-only.

Commit b09971b

Browse files
jean-m-cyrjean-m-cyr
committed
Add # of pipeline stages to status
1 parent 197063b commit b09971b

File tree

5 files changed

+23
-179
lines changed

5 files changed

+23
-179
lines changed

‎.config‎

Lines changed: 13 additions & 130 deletions
Original file line numberDiff line numberDiff line change
@@ -744,25 +744,20 @@ CONFIG_IPV6_NDISC_NODETYPE=y
744744
# CONFIG_IPV6_SEG6_LWTUNNEL is not set
745745
# CONFIG_IPV6_SEG6_HMAC is not set
746746
# CONFIG_NETWORK_SECMARK is not set
747-
CONFIG_NET_PTP_CLASSIFY=y
748-
CONFIG_NETWORK_PHY_TIMESTAMPING=y
747+
# CONFIG_NET_PTP_CLASSIFY is not set
748+
# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
749749
# CONFIG_NETFILTER is not set
750750
# CONFIG_IP_DCCP is not set
751751
# CONFIG_IP_SCTP is not set
752752
# CONFIG_RDS is not set
753753
# CONFIG_TIPC is not set
754754
# CONFIG_ATM is not set
755755
# CONFIG_L2TP is not set
756-
CONFIG_STP=y
757-
CONFIG_GARP=y
758756
# CONFIG_BRIDGE is not set
759757
CONFIG_HAVE_NET_DSA=y
760758
# CONFIG_NET_DSA is not set
761-
CONFIG_VLAN_8021Q=y
762-
CONFIG_VLAN_8021Q_GVRP=y
763-
# CONFIG_VLAN_8021Q_MVRP is not set
759+
# CONFIG_VLAN_8021Q is not set
764760
# CONFIG_DECNET is not set
765-
CONFIG_LLC=y
766761
# CONFIG_LLC2 is not set
767762
# CONFIG_IPX is not set
768763
# CONFIG_ATALK is not set
@@ -800,52 +795,7 @@ CONFIG_NET_FLOW_LIMIT=y
800795
# CONFIG_NET_PKTGEN is not set
801796
# CONFIG_NET_DROP_MONITOR is not set
802797
# CONFIG_HAMRADIO is not set
803-
CONFIG_CAN=y
804-
CONFIG_CAN_RAW=y
805-
CONFIG_CAN_BCM=y
806-
CONFIG_CAN_GW=y
807-
808-
#
809-
# CAN Device Drivers
810-
#
811-
# CONFIG_CAN_VCAN is not set
812-
# CONFIG_CAN_VXCAN is not set
813-
# CONFIG_CAN_SLCAN is not set
814-
CONFIG_CAN_DEV=y
815-
CONFIG_CAN_CALC_BITTIMING=y
816-
# CONFIG_CAN_LEDS is not set
817-
# CONFIG_CAN_FLEXCAN is not set
818-
# CONFIG_CAN_GRCAN is not set
819-
# CONFIG_CAN_TI_HECC is not set
820-
CONFIG_CAN_C_CAN=y
821-
CONFIG_CAN_C_CAN_PLATFORM=y
822-
# CONFIG_CAN_C_CAN_PCI is not set
823-
# CONFIG_CAN_CC770 is not set
824-
# CONFIG_CAN_IFI_CANFD is not set
825-
# CONFIG_CAN_M_CAN is not set
826-
# CONFIG_CAN_PEAK_PCIEFD is not set
827-
# CONFIG_CAN_RCAR is not set
828-
# CONFIG_CAN_RCAR_CANFD is not set
829-
# CONFIG_CAN_SJA1000 is not set
830-
# CONFIG_CAN_SOFTING is not set
831-
832-
#
833-
# CAN SPI interfaces
834-
#
835-
# CONFIG_CAN_HI311X is not set
836-
# CONFIG_CAN_MCP251X is not set
837-
838-
#
839-
# CAN USB interfaces
840-
#
841-
# CONFIG_CAN_EMS_USB is not set
842-
# CONFIG_CAN_ESD_USB2 is not set
843-
# CONFIG_CAN_GS_USB is not set
844-
# CONFIG_CAN_KVASER_USB is not set
845-
# CONFIG_CAN_PEAK_USB is not set
846-
# CONFIG_CAN_8DEV_USB is not set
847-
# CONFIG_CAN_MCBA_USB is not set
848-
CONFIG_CAN_DEBUG_DEVICES=y
798+
# CONFIG_CAN is not set
849799
# CONFIG_BT is not set
850800
# CONFIG_AF_RXRPC is not set
851801
# CONFIG_AF_KCM is not set
@@ -1047,6 +997,7 @@ CONFIG_EEPROM_AT24=y
1047997
# CONFIG_CXL_BASE is not set
1048998
# CONFIG_CXL_AFU_DRIVER_OPS is not set
1049999
# CONFIG_CXL_LIB is not set
1000+
CONFIG_MINER_DRIVER=m
10501001
CONFIG_HAVE_IDE=y
10511002
# CONFIG_IDE is not set
10521003

@@ -1636,7 +1587,6 @@ CONFIG_HW_RANDOM=m
16361587
# CONFIG_TCG_TPM is not set
16371588
CONFIG_DEVPORT=y
16381589
# CONFIG_XILLYBUS is not set
1639-
CONFIG_MINER_DRIVER=m
16401590

16411591
#
16421592
# I2C support
@@ -1743,25 +1693,16 @@ CONFIG_SPI_SPIDEV=y
17431693
# CONFIG_SPI_SLAVE is not set
17441694
# CONFIG_SPMI is not set
17451695
# CONFIG_HSI is not set
1746-
CONFIG_PPS=y
1747-
# CONFIG_PPS_DEBUG is not set
1748-
# CONFIG_NTP_PPS is not set
1749-
1750-
#
1751-
# PPS clients support
1752-
#
1753-
# CONFIG_PPS_CLIENT_KTIMER is not set
1754-
# CONFIG_PPS_CLIENT_LDISC is not set
1755-
# CONFIG_PPS_CLIENT_GPIO is not set
1696+
# CONFIG_PPS is not set
17561697

17571698
#
1758-
# PPS generators support
1699+
# PTP clock support
17591700
#
1701+
# CONFIG_PTP_1588_CLOCK is not set
17601702

17611703
#
1762-
# PTP clock support
1704+
# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
17631705
#
1764-
# CONFIG_PTP_1588_CLOCK is not set
17651706
CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
17661707
CONFIG_GPIOLIB=y
17671708
CONFIG_OF_GPIO=y
@@ -2238,17 +2179,14 @@ CONFIG_USB_STORAGE=y
22382179
# CONFIG_USB_MUSB_HDRC is not set
22392180
# CONFIG_USB_DWC3 is not set
22402181
CONFIG_USB_DWC2=y
2241-
# CONFIG_USB_DWC2_HOST is not set
2182+
CONFIG_USB_DWC2_HOST=y
22422183

22432184
#
22442185
# Gadget/Dual-role mode requires USB Gadget support to be enabled
22452186
#
2246-
# CONFIG_USB_DWC2_PERIPHERAL is not set
2247-
CONFIG_USB_DWC2_DUAL_ROLE=y
22482187
# CONFIG_USB_DWC2_PCI is not set
22492188
# CONFIG_USB_DWC2_DEBUG is not set
22502189
# CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set
2251-
# CONFIG_USB_CHIPIDEA is not set
22522190
# CONFIG_USB_ISP1760 is not set
22532191

22542192
#
@@ -2294,34 +2232,7 @@ CONFIG_NOP_USB_XCEIV=y
22942232
# CONFIG_USB_GPIO_VBUS is not set
22952233
# CONFIG_USB_ISP1301 is not set
22962234
# CONFIG_USB_ULPI is not set
2297-
CONFIG_USB_GADGET=y
2298-
# CONFIG_USB_GADGET_DEBUG is not set
2299-
# CONFIG_USB_GADGET_DEBUG_FILES is not set
2300-
# CONFIG_USB_GADGET_DEBUG_FS is not set
2301-
CONFIG_USB_GADGET_VBUS_DRAW=2
2302-
CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
2303-
2304-
#
2305-
# USB Peripheral Controller
2306-
#
2307-
# CONFIG_USB_FUSB300 is not set
2308-
# CONFIG_USB_FOTG210_UDC is not set
2309-
# CONFIG_USB_GR_UDC is not set
2310-
# CONFIG_USB_R8A66597 is not set
2311-
# CONFIG_USB_PXA27X is not set
2312-
# CONFIG_USB_MV_UDC is not set
2313-
# CONFIG_USB_MV_U3D is not set
2314-
# CONFIG_USB_SNP_UDC_PLAT is not set
2315-
# CONFIG_USB_M66592 is not set
2316-
# CONFIG_USB_BDC_UDC is not set
2317-
# CONFIG_USB_AMD5536UDC is not set
2318-
# CONFIG_USB_NET2272 is not set
2319-
# CONFIG_USB_NET2280 is not set
2320-
# CONFIG_USB_GOKU is not set
2321-
# CONFIG_USB_EG20T is not set
2322-
# CONFIG_USB_GADGET_XILINX is not set
2323-
# CONFIG_USB_DUMMY_HCD is not set
2324-
# CONFIG_USB_CONFIGFS is not set
2235+
# CONFIG_USB_GADGET is not set
23252236

23262237
#
23272238
# USB Power Delivery and Type-C drivers
@@ -2727,36 +2638,8 @@ CONFIG_TMPFS=y
27272638
# CONFIG_TMPFS_XATTR is not set
27282639
# CONFIG_HUGETLB_PAGE is not set
27292640
CONFIG_CONFIGFS_FS=y
2730-
CONFIG_MISC_FILESYSTEMS=y
2731-
# CONFIG_ORANGEFS_FS is not set
2732-
# CONFIG_ADFS_FS is not set
2733-
# CONFIG_AFFS_FS is not set
2734-
# CONFIG_ECRYPT_FS is not set
2735-
# CONFIG_HFS_FS is not set
2736-
# CONFIG_HFSPLUS_FS is not set
2737-
# CONFIG_BEFS_FS is not set
2738-
# CONFIG_BFS_FS is not set
2739-
# CONFIG_EFS_FS is not set
2740-
# CONFIG_CRAMFS is not set
2741-
# CONFIG_SQUASHFS is not set
2742-
# CONFIG_VXFS_FS is not set
2743-
# CONFIG_MINIX_FS is not set
2744-
# CONFIG_OMFS_FS is not set
2745-
# CONFIG_HPFS_FS is not set
2746-
# CONFIG_QNX4FS_FS is not set
2747-
# CONFIG_QNX6FS_FS is not set
2748-
# CONFIG_ROMFS_FS is not set
2749-
# CONFIG_PSTORE is not set
2750-
# CONFIG_SYSV_FS is not set
2751-
# CONFIG_UFS_FS is not set
2752-
CONFIG_NETWORK_FILESYSTEMS=y
2753-
# CONFIG_NFS_FS is not set
2754-
# CONFIG_NFSD is not set
2755-
# CONFIG_CEPH_FS is not set
2756-
# CONFIG_CIFS is not set
2757-
# CONFIG_NCP_FS is not set
2758-
# CONFIG_CODA_FS is not set
2759-
# CONFIG_AFS_FS is not set
2641+
# CONFIG_MISC_FILESYSTEMS is not set
2642+
# CONFIG_NETWORK_FILESYSTEMS is not set
27602643
CONFIG_NLS=y
27612644
CONFIG_NLS_DEFAULT="iso8859-1"
27622645
CONFIG_NLS_CODEPAGE_437=y

‎.config.old‎

Lines changed: 3 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1743,20 +1743,7 @@ CONFIG_SPI_SPIDEV=y
17431743
# CONFIG_SPI_SLAVE is not set
17441744
# CONFIG_SPMI is not set
17451745
# CONFIG_HSI is not set
1746-
CONFIG_PPS=y
1747-
# CONFIG_PPS_DEBUG is not set
1748-
# CONFIG_NTP_PPS is not set
1749-
1750-
#
1751-
# PPS clients support
1752-
#
1753-
# CONFIG_PPS_CLIENT_KTIMER is not set
1754-
# CONFIG_PPS_CLIENT_LDISC is not set
1755-
# CONFIG_PPS_CLIENT_GPIO is not set
1756-
1757-
#
1758-
# PPS generators support
1759-
#
1746+
# CONFIG_PPS is not set
17601747

17611748
#
17621749
# PTP clock support
@@ -2238,17 +2225,14 @@ CONFIG_USB_STORAGE=y
22382225
# CONFIG_USB_MUSB_HDRC is not set
22392226
# CONFIG_USB_DWC3 is not set
22402227
CONFIG_USB_DWC2=y
2241-
# CONFIG_USB_DWC2_HOST is not set
2228+
CONFIG_USB_DWC2_HOST=y
22422229

22432230
#
22442231
# Gadget/Dual-role mode requires USB Gadget support to be enabled
22452232
#
2246-
# CONFIG_USB_DWC2_PERIPHERAL is not set
2247-
CONFIG_USB_DWC2_DUAL_ROLE=y
22482233
# CONFIG_USB_DWC2_PCI is not set
22492234
# CONFIG_USB_DWC2_DEBUG is not set
22502235
# CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set
2251-
# CONFIG_USB_CHIPIDEA is not set
22522236
# CONFIG_USB_ISP1760 is not set
22532237

22542238
#
@@ -2294,34 +2278,7 @@ CONFIG_NOP_USB_XCEIV=y
22942278
# CONFIG_USB_GPIO_VBUS is not set
22952279
# CONFIG_USB_ISP1301 is not set
22962280
# CONFIG_USB_ULPI is not set
2297-
CONFIG_USB_GADGET=y
2298-
# CONFIG_USB_GADGET_DEBUG is not set
2299-
# CONFIG_USB_GADGET_DEBUG_FILES is not set
2300-
# CONFIG_USB_GADGET_DEBUG_FS is not set
2301-
CONFIG_USB_GADGET_VBUS_DRAW=2
2302-
CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
2303-
2304-
#
2305-
# USB Peripheral Controller
2306-
#
2307-
# CONFIG_USB_FUSB300 is not set
2308-
# CONFIG_USB_FOTG210_UDC is not set
2309-
# CONFIG_USB_GR_UDC is not set
2310-
# CONFIG_USB_R8A66597 is not set
2311-
# CONFIG_USB_PXA27X is not set
2312-
# CONFIG_USB_MV_UDC is not set
2313-
# CONFIG_USB_MV_U3D is not set
2314-
# CONFIG_USB_SNP_UDC_PLAT is not set
2315-
# CONFIG_USB_M66592 is not set
2316-
# CONFIG_USB_BDC_UDC is not set
2317-
# CONFIG_USB_AMD5536UDC is not set
2318-
# CONFIG_USB_NET2272 is not set
2319-
# CONFIG_USB_NET2280 is not set
2320-
# CONFIG_USB_GOKU is not set
2321-
# CONFIG_USB_EG20T is not set
2322-
# CONFIG_USB_GADGET_XILINX is not set
2323-
# CONFIG_USB_DUMMY_HCD is not set
2324-
# CONFIG_USB_CONFIGFS is not set
2281+
# CONFIG_USB_GADGET is not set
23252282

23262283
#
23272284
# USB Power Delivery and Type-C drivers

‎cp2nano‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/bin/bash
22
echo copying kernel
3-
scp arch/arm/boot/zImage overlay.dtso root@de10nano:boot
3+
scp arch/arm/boot/zImage overlay.dtso root@de10nano:
44
cd /tmp/dist
55
rm -rf /tmp/dist/lib/modules/*/build
66
rm -rf /tmp/dist/lib/modules/*/source
77
tar czf /tmp/modules.tgz *
88
cd
9-
scp /tmp/modules.tgz root@de10nano:boot
9+
scp /tmp/modules.tgz root@de10nano:

‎drivers/misc/miner/miner.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
#define MINER_STATUS_RUN_SHIFT 1u
4141
#define MINER_STATUS_TEST_MASK 0x00000004u
4242
#define MINER_STATUS_TEST_SHIFT 2u
43+
#define MINER_STATUS_STAGES_MASK 0x00000078u
44+
#define MINER_STATUS_STAGES_SHIFT 3u
4345
#define MINER_STATUS_MHZ_MASK 0x0000ff00u
4446
#define MINER_STATUS_MHZ_SHIFT 8u
4547
#define MINER_STATUS_MAJ_MASK 0x000f0000u

‎tools/testing/miner/main.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,9 @@ int main()
294294

295295
printf("Checking hash rate\n");
296296
uint32_t h = bitfield(STATUS, MHZ);
297-
double expected = h / 3.0;
297+
uint8_t stages = bitfield(STATUS, STAGES);
298+
299+
double expected = h / (24.0 / stages);
298300
printf("Miner clock %'u MHz, expected hash rate %'.2f MH/S\n", h, expected);
299301
double r = rate() / 1.0e6;
300302
int pass = fabs(r - expected) < (expected * .001);

0 commit comments

Comments
 (0)