Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade to newer firmware needed by some txp(4) variants.

Browse Source 
From FreeBSD via OpenBSD.
This commit is contained in:
thorpej 2020-03-08 20:49:31 +00:00
parent 9a5bc0da50
commit 78067cc9b2
5 changed files with 4319 additions and 4090 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
sys/dev/microcode/typhoon/3c990-license Normal file
View File

@ -0,0 +1,33 @@
* Copyright 1999-2003 3Com Corporation. All Rights Reserved.
*
* Redistribution and use in source and binary forms of the 3c990img.h
* microcode software are permitted provided that the following conditions
* are met:
* 1. Redistribution of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistribution in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. The name of 3Com may not be used to endorse or promote products
* derived from this software without specific prior written permission
*
* THIS SOFTWARE IS PROVIDED BY 3COM ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* USER ACKNOWLEDGES AND AGREES THAT PURCHASE OR USE OF THE 3c990img.h
* MICROCODE SOFTWARE WILL NOT CREATE OR GIVE GROUNDS FOR A LICENSE BY
* IMPLICATION, ESTOPPEL, OR OTHERWISE IN ANY INTELLECTUAL PROPERTY RIGHTS
* (PATENT, COPYRIGHT, TRADE SECRET, MASK WORK, OR OTHER PROPRIETARY RIGHT)
* EMBODIED IN ANY OTHER 3COM HARDWARE OR SOFTWARE EITHER SOLELY OR IN
* COMBINATION WITH THE 3c990img.h MICROCODE SOFTWARE
This license applies to the 3c990 firmware for the Typhoon adapters
supported by the txp(4) driver.

BIN
sys/dev/microcode/typhoon/3c990img.bin
View File

Binary file not shown.

8364
sys/dev/microcode/typhoon/3c990img.h
View File

File diff suppressed because it is too large Load Diff

9
sys/dev/pci/if_txp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_txp.c,v 1.66 2020/03/08 19:24:40 thorpej Exp $ */
/* $NetBSD: if_txp.c,v 1.67 2020/03/08 20:49:31 thorpej Exp $ */
/*
* Copyright (c) 2001
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_txp.c,v 1.66 2020/03/08 19:24:40 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_txp.c,v 1.67 2020/03/08 20:49:31 thorpej Exp $");
#include "opt_inet.h"
@ -454,6 +454,11 @@ txp_download_fw(struct txp_softc *sc)
/* Tell boot firmware to get ready for image */
WRITE_REG(sc, TXP_H2A_1, le32toh(fileheader->addr));
WRITE_REG(sc, TXP_H2A_2, le32toh(fileheader->hmac[0]));
WRITE_REG(sc, TXP_H2A_3, le32toh(fileheader->hmac[1]));
WRITE_REG(sc, TXP_H2A_4, le32toh(fileheader->hmac[2]));
WRITE_REG(sc, TXP_H2A_5, le32toh(fileheader->hmac[3]));
WRITE_REG(sc, TXP_H2A_6, le32toh(fileheader->hmac[4]));
WRITE_REG(sc, TXP_H2A_0, TXP_BOOTCMD_RUNTIME_IMAGE);
if (txp_download_fw_wait(sc)) {

3
sys/dev/pci/if_txpreg.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_txpreg.h,v 1.7 2020/03/08 19:02:03 thorpej Exp $ */
/* $NetBSD: if_txpreg.h,v 1.8 2020/03/08 20:49:31 thorpej Exp $ */
/*
* Copyright (c) 2001 Aaron Campbell <aaron@monkey.org>.
@ -603,6 +603,7 @@ struct txp_fw_file_header {
u_int32_t version;
u_int32_t nsections;
u_int32_t addr;
u_int32_t hmac[5];
};
struct txp_fw_section_header {