From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=195.135.223.131 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794841365; b=pJgREgAfBelMW+2/fjxlC6M86VB2XBLCxsIraD3f9kwHZ2BToMQXv3XOTG+sdyOoKVMs 7ex+ETAVT7Q1bKZp05KwnbtiOyWl+6+qEqXdLsVK+DyNXvjleDkiBTsQQutfV9bMW2Hby 1/o7m9hc8VDt6JNSschMJW8nBfXWv7LYHXO2eGKaLFj5y9U+OOvbbRzzjN41GV0B+HFqF iSH5J8OAvTGnWEInctQHVbP5jxl0afR6KQu+lWjeURPVMqM4bbbVTe4MiUhxHYyVMqrzi nor6oZozdeHryeflbffBR8hpHJeD25KAcvNEBk5MZv8FoQG3hZ30XPUA2irmz9SE1yg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794841365; h=DMARC-Filter:Received:DKIM-Signature:DKIM-Signature:Received: Received:From:To:Cc:Subject:Date:Message-ID:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:X-Spamd-Result: X-Rspamd-Server:X-Rspamd-Action:X-Spam-Flag:X-Spam-Score:X-Spam-Level: X-Rspamd-Queue-Id; bh=J5VnG0NPXUCKdQJEnrA3iW0cqMEJyeKN/gOcr8jRAcw=; b=rMpdJDzmk6DSR0JbXu/9Bq7HdnnFK8BcQt8UvGjIkVL6x+wRba68IPZBVcZA/XKBrdJ4 l+g1Kl7kM/lWfbC1e3x/rGdV95Rf4n+86pEpzl/LR0G5oUf1pTUttcAMjpTge8ApLzt/K +2icWDKKbxXn9kizB0QP3hNmF7aoi6DdGnCBNKJ1t0dMm01siM0KpZv6GPRGrRY6m+LQu xi7oOtna+rD0Heix7SsOKBL1jVoxL85y08ciumRTXq36iR1UphUiIBXN2CDFdSw0GzlxT 1yuizj9TENPYNjhzCzubBtox6F6qNKdIGuYjPawiM3KObu8/6huimLaWh3pZ+euBDaQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass header.d=suse.com header.i=@suse.com header.a=rsa-sha256 header.s=susede1 header.b=rWKhfsNn; dkim=pass header.d=suse.com header.i=@suse.com header.a=rsa-sha256 header.s=susede1 header.b=rWKhfsNn; arc=none smtp.remote-ip=195.135.223.131 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6B931606A329 for ; Mon, 16 Nov 2026 15:02:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 6B931606A329 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.a=rsa-sha256 header.s=susede1 header.b=rWKhfsNn; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.a=rsa-sha256 header.s=susede1 header.b=rWKhfsNn Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 9D7E01FB16; Mon, 16 Nov 2026 15:02:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1794841362; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=J5VnG0NPXUCKdQJEnrA3iW0cqMEJyeKN/gOcr8jRAcw=; b=rWKhfsNn4WbapkBCldm/RX2TuiuDRM8WcCcA2ZdmXhaxUGU+XUqG30wcS8PCEOCS4jCz3v oiwr6+Bhwk7GjvomUH0+nP2xkodv3Lfn3gw/upg+Msu4fGVPU7lbQS8vDMogAGIFEZ5aZP j4tOVou8yHj+719+paW/BVw3RNUzn8E= Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.com header.s=susede1 header.b=rWKhfsNn DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1794841362; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=J5VnG0NPXUCKdQJEnrA3iW0cqMEJyeKN/gOcr8jRAcw=; b=rWKhfsNn4WbapkBCldm/RX2TuiuDRM8WcCcA2ZdmXhaxUGU+XUqG30wcS8PCEOCS4jCz3v oiwr6+Bhwk7GjvomUH0+nP2xkodv3Lfn3gw/upg+Msu4fGVPU7lbQS8vDMogAGIFEZ5aZP j4tOVou8yHj+719+paW/BVw3RNUzn8E= Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 5462413408; Mon, 16 Nov 2026 15:02:42 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id gro6CxIb+2ryDwAAD6G6ig (envelope-from ); Mon, 16 Nov 2026 15:02:42 +0000 From: Juergen Gross To: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Cc: Juergen Gross , David Airlie Subject: [PATCH v6 05/12] agp/nvidia: Stop using 32-bit MSR interfaces Date: Mon, 16 Nov 2026 16:02:01 +0100 Message-ID: <20261116150208.1572254-6-jgross@suse.com> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261116150208.1572254-1-jgross@suse.com> References: <20261116150208.1572254-1-jgross@suse.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Result: default: False [-12.01 / 50.00]; SUSE_INTERNAL_BYPASS(-9.00)[]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.com:s=susede1]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; URIBL_BLOCKED(0.00)[imap1.dmz-prg2.suse.org:rdns,imap1.dmz-prg2.suse.org:helo,suse.com:email,suse.com:dkim]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_ALL(0.00)[]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.com:email,suse.com:dkim,imap1.dmz-prg2.suse.org:rdns,imap1.dmz-prg2.suse.org:helo]; RCVD_COUNT_TWO(0.00)[2]; RCPT_COUNT_THREE(0.00)[4]; DKIM_TRACE(0.00)[suse.com:+] X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Rspamd-Action: no action X-Spam-Flag: NO X-Spam-Score: -12.01 X-Spam-Level: X-Rspamd-Queue-Id: 9D7E01FB16 The 32-bit MSR interfaces rdmsr() and wrmsr() are planned to be removed. Use the related 64-bit variants instead. Signed-off-by: Juergen Gross --- drivers/char/agp/nvidia-agp.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/drivers/char/agp/nvidia-agp.c b/drivers/char/agp/nvidia-agp.c index 4787391bb6b4..3e760bc00afa 100644 --- a/drivers/char/agp/nvidia-agp.c +++ b/drivers/char/agp/nvidia-agp.c @@ -65,22 +65,20 @@ static int nvidia_fetch_size(void) static int nvidia_init_iorr(u32 base, u32 size) { - u32 base_hi, base_lo; - u32 mask_hi, mask_lo; - u32 sys_hi, sys_lo; + struct msr base_msr, mask_msr, sys_msr; u32 iorr_addr, free_iorr_addr; /* Find the iorr that is already used for the base */ /* If not found, determine the uppermost available iorr */ free_iorr_addr = AMD_K7_NUM_IORR; for (iorr_addr = 0; iorr_addr < AMD_K7_NUM_IORR; iorr_addr++) { - rdmsr(IORR_BASE0 + 2 * iorr_addr, base_lo, base_hi); - rdmsr(IORR_MASK0 + 2 * iorr_addr, mask_lo, mask_hi); + rdmsrq(IORR_BASE0 + 2 * iorr_addr, base_msr.q); + rdmsrq(IORR_MASK0 + 2 * iorr_addr, mask_msr.q); - if ((base_lo & 0xfffff000) == (base & 0xfffff000)) + if ((base_msr.l & 0xfffff000) == (base & 0xfffff000)) break; - if ((mask_lo & 0x00000800) == 0) + if ((mask_msr.l & 0x00000800) == 0) free_iorr_addr = iorr_addr; } @@ -89,16 +87,16 @@ static int nvidia_init_iorr(u32 base, u32 size) if (iorr_addr >= AMD_K7_NUM_IORR) return -EINVAL; } - base_hi = 0x0; - base_lo = (base & ~0xfff) | 0x18; - mask_hi = 0xf; - mask_lo = ((~(size - 1)) & 0xfffff000) | 0x800; - wrmsr(IORR_BASE0 + 2 * iorr_addr, base_lo, base_hi); - wrmsr(IORR_MASK0 + 2 * iorr_addr, mask_lo, mask_hi); - - rdmsr(SYSCFG, sys_lo, sys_hi); - sys_lo |= 0x00100000; - wrmsr(SYSCFG, sys_lo, sys_hi); + base_msr.h = 0x0; + base_msr.l = (base & ~0xfff) | 0x18; + mask_msr.h = 0xf; + mask_msr.l = ((~(size - 1)) & 0xfffff000) | 0x800; + wrmsrq(IORR_BASE0 + 2 * iorr_addr, base_msr.q); + wrmsrq(IORR_MASK0 + 2 * iorr_addr, mask_msr.q); + + rdmsrq(SYSCFG, sys_msr.q); + sys_msr.l |= 0x00100000; + wrmsrq(SYSCFG, sys_msr.q); return 0; } -- 2.56.0