From owner-svn-src-all@freebsd.org Wed May 18 07:01:24 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 02B23B40AC1; Wed, 18 May 2016 07:01:24 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9B46B1B92; Wed, 18 May 2016 07:01:23 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4I71MtR069532; Wed, 18 May 2016 07:01:22 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4I71Md6069531; Wed, 18 May 2016 07:01:22 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201605180701.u4I71Md6069531@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Wed, 18 May 2016 07:01:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r300125 - head/sys/dev/siba X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 May 2016 07:01:24 -0000 Author: adrian Date: Wed May 18 07:01:22 2016 New Revision: 300125 URL: https://svnweb.freebsd.org/changeset/base/300125 Log: [siba] use the correct SPROM offsets. I transcribed the linux ssb offsets and .. didn't pick up that our SIBA SPROM code has an offset of 0x1000. This fixes a bunch of odd parsing values that showed up when I tried using a newer NIC. The NIC still doesn't yet work but now the SPROM values are right. Oops! Modified: head/sys/dev/siba/sibareg.h Modified: head/sys/dev/siba/sibareg.h ============================================================================== --- head/sys/dev/siba/sibareg.h Wed May 18 06:52:20 2016 (r300124) +++ head/sys/dev/siba/sibareg.h Wed May 18 07:01:22 2016 (r300125) @@ -399,10 +399,10 @@ #define SIBA_SPROM4_GPIOB_P3 0xff00 /* The following four blocks share the same structure */ -#define SIBA_SPROM4_PWR_INFO_CORE0 0x0080 -#define SIBA_SPROM4_PWR_INFO_CORE1 0x00AE -#define SIBA_SPROM4_PWR_INFO_CORE2 0x00DC -#define SIBA_SPROM4_PWR_INFO_CORE3 0x010A +#define SIBA_SPROM4_PWR_INFO_CORE0 0x1080 +#define SIBA_SPROM4_PWR_INFO_CORE1 0x10AE +#define SIBA_SPROM4_PWR_INFO_CORE2 0x10DC +#define SIBA_SPROM4_PWR_INFO_CORE3 0x110A #define SIBA_SPROM4_2G_MAXP_ITSSI 0x00 /* 2 GHz ITSSI and 2 GHz Max Power */ #define SIBA_SPROM4_2G_MAXP 0x00FF @@ -486,8 +486,8 @@ #define SIBA_SPROM8_RXPO5G 0xff00 /* The FEM blocks share the same structure */ -#define SIBA_SPROM8_FEM2G 0x00AE -#define SIBA_SPROM8_FEM5G 0x00B0 +#define SIBA_SPROM8_FEM2G 0x10ae +#define SIBA_SPROM8_FEM5G 0x10b0 #define SSB_SROM8_FEM_TSSIPOS 0x0001 #define SSB_SROM8_FEM_EXTPA_GAIN 0x0006 #define SSB_SROM8_FEM_PDET_RANGE 0x00F8 @@ -526,10 +526,10 @@ #define SIBA_SPROM8_BWDUPPO 0x0198 /* There are 4 blocks with power info sharing the same layout */ -#define SIBA_SROM8_PWR_INFO_CORE0 0x00C0 -#define SIBA_SROM8_PWR_INFO_CORE1 0x00E0 -#define SIBA_SROM8_PWR_INFO_CORE2 0x0100 -#define SIBA_SROM8_PWR_INFO_CORE3 0x0120 +#define SIBA_SROM8_PWR_INFO_CORE0 0x10C0 +#define SIBA_SROM8_PWR_INFO_CORE1 0x10E0 +#define SIBA_SROM8_PWR_INFO_CORE2 0x1100 +#define SIBA_SROM8_PWR_INFO_CORE3 0x1120 #define SIBA_SROM8_2G_MAXP_ITSSI 0x00 #define SIBA_SPROM8_2G_MAXP 0x00FF