From owner-svn-src-all@freebsd.org Tue May 23 22:30:16 2017 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 C3EA1D78231; Tue, 23 May 2017 22:30:16 +0000 (UTC) (envelope-from landonf@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 70ED91E96; Tue, 23 May 2017 22:30:16 +0000 (UTC) (envelope-from landonf@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4NMUFc3051323; Tue, 23 May 2017 22:30:15 GMT (envelope-from landonf@FreeBSD.org) Received: (from landonf@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4NMUFj9051321; Tue, 23 May 2017 22:30:15 GMT (envelope-from landonf@FreeBSD.org) Message-Id: <201705232230.v4NMUFj9051321@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: landonf set sender to landonf@FreeBSD.org using -f From: "Landon J. Fuller" Date: Tue, 23 May 2017 22:30:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r318760 - head/sys/dev/bhnd/nvram 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.23 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: Tue, 23 May 2017 22:30:16 -0000 Author: landonf Date: Tue May 23 22:30:15 2017 New Revision: 318760 URL: https://svnweb.freebsd.org/changeset/base/318760 Log: bhnd(4): Fix a SPROM identification regression introduced in r315866 In r315866, we introduced a direct read of the 8-bit sromrev field from the memory mapped SPROM/OTP device. On OTP devices that require 16-bit access alignment, this read fails, preventing identification of the SPROM layout. So, let's perform an aligned read of the combined 16-bit sromrev/crc field instead. Approved by: adrian (mentor, implicit) Modified: head/sys/dev/bhnd/nvram/bhnd_nvram_data_sprom.c head/sys/dev/bhnd/nvram/bhnd_sprom.c Modified: head/sys/dev/bhnd/nvram/bhnd_nvram_data_sprom.c ============================================================================== --- head/sys/dev/bhnd/nvram/bhnd_nvram_data_sprom.c Tue May 23 22:11:45 2017 (r318759) +++ head/sys/dev/bhnd/nvram/bhnd_nvram_data_sprom.c Tue May 23 22:30:15 2017 (r318760) @@ -184,6 +184,7 @@ bhnd_nvram_sprom_ident(struct bhnd_nvram u_char buf[512]; size_t nread; uint16_t magic; + uint8_t srevcrc[2]; uint8_t srev; bool crc_valid; bool have_magic; @@ -224,12 +225,15 @@ bhnd_nvram_sprom_ident(struct bhnd_nvram nbytes += nr; } - /* Read SPROM revision */ - error = bhnd_nvram_io_read(io, layout->srev_offset, &srev, - sizeof(srev)); + /* Read 8-bit SPROM revision, maintaining 16-bit size alignment + * required by some OTP/SPROM chipsets. */ + error = bhnd_nvram_io_read(io, layout->srev_offset, &srevcrc, + sizeof(srevcrc)); if (error) return (error); + srev = srevcrc[0]; + /* Early sromrev 1 devices (specifically some BCM440x enet * cards) are reported to have been incorrectly programmed * with a revision of 0x10. */ Modified: head/sys/dev/bhnd/nvram/bhnd_sprom.c ============================================================================== --- head/sys/dev/bhnd/nvram/bhnd_sprom.c Tue May 23 22:11:45 2017 (r318759) +++ head/sys/dev/bhnd/nvram/bhnd_sprom.c Tue May 23 22:30:15 2017 (r318760) @@ -120,9 +120,9 @@ bhnd_sprom_attach(device_t dev, bus_size sprom_size = r_size - offset; - /* Allocate an I/O context for the SPROM parser. SPROM reads do not - * appear to require any specific alignment. */ - io = bhnd_nvram_iores_new(r, offset, sprom_size, 1); + /* Allocate an I/O context for the SPROM parser. All SPROM reads + * must be 16-bit aligned */ + io = bhnd_nvram_iores_new(r, offset, sprom_size, sizeof(uint16_t)); if (io == NULL) { error = ENXIO; goto failed;