From owner-svn-src-head@FreeBSD.ORG  Sat Jan  7 04:13:25 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7BA5F106564A;
	Sat,  7 Jan 2012 04:13:25 +0000 (UTC)
	(envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6AA528FC0A;
	Sat,  7 Jan 2012 04:13:25 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q074DPqt024075;
	Sat, 7 Jan 2012 04:13:25 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q074DPNR024073;
	Sat, 7 Jan 2012 04:13:25 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201201070413.q074DPNR024073@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sat, 7 Jan 2012 04:13:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229765 - head/sys/mips/atheros
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Jan 2012 04:13:25 -0000

Author: adrian
Date: Sat Jan  7 04:13:25 2012
New Revision: 229765
URL: http://svn.freebsd.org/changeset/base/229765

Log:
  Fix the ar724x shift calculation when writing to the PCI config space.
  
  This was preventing the ath driver from being loaded at runtime.
  It worked fine when compiled statically into the kernel but not when
  kldload'ed after the system booted.
  
  The root cause was that PCIR_INTLINE (register 60) was being
  overwritten by zeros when register 62 was being written to.
  A subsequent read of this register would return 0, and thus
  the rest of the PCI glue assumed an IRQ resource had already
  been allocated.  This caused the device to fail to attach at
  runtime as the device itself didn't contain any IRQ resources.
  
  TODO: go back over the ar71xx and ar724x PCI config read/write
  code and ensure it's correct.

Modified:
  head/sys/mips/atheros/ar724x_pci.c

Modified: head/sys/mips/atheros/ar724x_pci.c
==============================================================================
--- head/sys/mips/atheros/ar724x_pci.c	Sat Jan  7 03:32:47 2012	(r229764)
+++ head/sys/mips/atheros/ar724x_pci.c	Sat Jan  7 04:13:25 2012	(r229765)
@@ -93,7 +93,7 @@ ar724x_pci_write(uint32_t reg, uint32_t 
 	uint32_t val, mask, shift;
 
 	/* Register access is 32-bit aligned */
-	shift = 8 * (offset & (bytes % 4));
+	shift = (offset & 3) * 8;
 	if (bytes % 4)
 		mask = (1 << (bytes * 8)) - 1;
 	else