Module Name: src Committed By: buhrow Date: Thu May 19 04:43:43 UTC 2022
Modified Files: src/sys/dev/pci: if_bge.c Log Message: For chips which contain an ASF/IPMI firmware, instruct the chip to shut the host ASF firmware down when attaching the device so the IPMI BMC can use the same physical port even when NetBSD doesn't have a network configuration on the device. By contrast, when the device gets a network configuration assigned to it and bge_init() is called, the host ASF firmware is brought up so both NetBSD and the IPMI BMc can use the same physical port. This now matches FreeBSD behavior, as well as behavior from NetBSD-5.2. Tested on a Sunfire X2200-M2 system with the following chip: bge1 at pci7 dev 4 function 1: Broadcom BCM5715 Gigabit Ethernet bge1: interrupting at ioapic0 pin 11 bge1: HW config 000000d4, 00000014, 00000000, 00000000 00000000 bge1: ASIC BCM5715 A3 (0x9003), Ethernet address 00:1e:68:XX:XX:XX bge1: setting short Tx thresholds brgphy1 at bge1 phy 1: BCM5714 1000BASE-T/X media interface, rev. 0 brgphy1: 10baseT, 10baseT-FDX, 100baseTX, 100baseTX-FDX, 1000baseT, 1000baseT-FDX, auto To generate a diff of this commit: cvs rdiff -u -r1.352 -r1.353 src/sys/dev/pci/if_bge.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/pci/if_bge.c diff -u src/sys/dev/pci/if_bge.c:1.352 src/sys/dev/pci/if_bge.c:1.353 --- src/sys/dev/pci/if_bge.c:1.352 Thu Apr 7 19:33:38 2022 +++ src/sys/dev/pci/if_bge.c Thu May 19 04:43:43 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: if_bge.c,v 1.352 2022/04/07 19:33:38 andvar Exp $ */ +/* $NetBSD: if_bge.c,v 1.353 2022/05/19 04:43:43 buhrow Exp $ */ /* * Copyright (c) 2001 Wind River Systems @@ -79,7 +79,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.352 2022/04/07 19:33:38 andvar Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.353 2022/05/19 04:43:43 buhrow Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -3640,7 +3640,7 @@ bge_attach(device_t parent, device_t sel BGE_SETBIT_FLUSH(sc, BGE_MISC_LOCAL_CTL, BGE_MLC_AUTO_EEPROM); bge_stop_fw(sc); - bge_sig_pre_reset(sc, BGE_RESET_START); + bge_sig_pre_reset(sc, BGE_RESET_SHUTDOWN); if (bge_reset(sc)) aprint_error_dev(sc->bge_dev, "chip reset failed\n"); @@ -3674,8 +3674,8 @@ bge_attach(device_t parent, device_t sel "HW config %08x, %08x, %08x, %08x %08x\n", hwcfg, hwcfg2, hwcfg3, hwcfg4, hwcfg5); - bge_sig_legacy(sc, BGE_RESET_START); - bge_sig_post_reset(sc, BGE_RESET_START); + bge_sig_legacy(sc, BGE_RESET_SHUTDOWN); + bge_sig_post_reset(sc, BGE_RESET_SHUTDOWN); if (bge_chipinit(sc)) { aprint_error_dev(sc->bge_dev, "chip initialization failed\n");