From: Zhenyu Wang Subject: Re: [PATCH] agp/intel: Fix dma mask for Sandybridge Date: Mon, 23 Aug 2010 14:48:54 +0800 Message-ID: <20100823064854.GE29442@zhen-devel.sh.intel.com> References: <20100823013507.GA29442@zhen-devel.sh.intel.com> <20100823054303.GC29442@zhen-devel.sh.intel.com> <20100823061922.GD29442@zhen-devel.sh.intel.com> Reply-To: Zhenyu Wang Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="QXO0/MSS4VvK6f+D" Return-path: Content-Disposition: inline In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org To: Takashi Iwai Cc: Eric Anholt , David Airlie , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org --QXO0/MSS4VvK6f+D Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On 2010.08.23 08:31:42 +0200, Takashi Iwai wrote: > > bit 31 bit 11 bit 4 bit 0 > > |<-physical addr 31:12->|<-physical addr 39:32->|<-cache ctl 3:1->|v= alid| >=20 > Then I really don't understand why it works. > You shift 28bit and mask with 0xff. Obviously it overwrite bits 0:3 > with original 28:31 bits. Masking 0xff0 fixes the issue. >=20 ah, sorry, my stupid. Thanks for catching this! Subject: [PATCH] agp/intel: fix physical address mask bits for sandybridge It should shift bit 39-32 into pte's bit 11-4. Reported-by: Takashi Iwai Signed-off-by: Zhenyu Wang --- drivers/char/agp/intel-gtt.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c index d22ffb8..0edfc87 100644 --- a/drivers/char/agp/intel-gtt.c +++ b/drivers/char/agp/intel-gtt.c @@ -1333,8 +1333,8 @@ static unsigned long intel_i965_mask_memory(struct ag= p_bridge_data *bridge, static unsigned long intel_gen6_mask_memory(struct agp_bridge_data *bridge, dma_addr_t addr, int type) { - /* Shift high bits down */ - addr |=3D (addr >> 28) & 0xff; + /* gen6 has bit11-4 for physical addr bit39-32 */ + addr |=3D (addr >> 28) & 0xff0; =20 /* Type checking must be done elsewhere */ return addr | bridge->driver->masks[type].mask; --=20 1.7.0.4 --=20 Open Source Technology Center, Intel ltd. $gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827 --QXO0/MSS4VvK6f+D Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iEYEARECAAYFAkxyGdYACgkQsQQaM014GCeQfACgmL8JvmFYh1ud1pv/3rtC1sLt G5kAnR9ix7NmtRlk6Mc1OqNs8NGQKS34 =Rvh6 -----END PGP SIGNATURE----- --QXO0/MSS4VvK6f+D--