From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B5C22C00142 for ; Sun, 29 Oct 2023 22:54:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230461AbjJ2Wys (ORCPT ); Sun, 29 Oct 2023 18:54:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49296 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229533AbjJ2Wyr (ORCPT ); Sun, 29 Oct 2023 18:54:47 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 56877BC; Sun, 29 Oct 2023 15:54:45 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 26B6DC433C8; Sun, 29 Oct 2023 22:54:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1698620084; bh=1TQGvqTPML02EuJFmbb4WOcBkTgs/4pXNv1pyJS/8MU=; h=From:To:Cc:Subject:Date:From; b=Nwj9TYQQhvbAK9FlhXRfayCnzie8HdZbyhsQMcaEEGKtBFGMJfV+MuPixVxhBLnWy eNXiWdZvN2sjTpwkwMhikT7wcNvlifwBO238ZWbFXRXzdjWWZIAaTOnBGlnESQN9TM GaPTuRfQ9gYDF/nMo+wfQpPfj1hGBzENG7T2huahodgH3FOB4BBHQR7CZ0cDxRjGRt zofJi+JaxUshDvNl/NfVWtc14uy4BiNRoqLYpxTpOofWbjlbc+4jhAFnFsEfEOMSMK FS4AW6rql892cz1rczqiYK6h53uCakStB5bzHsNppuzZhMsPmzgIG5w9DpUj8nUhhl vhz5rr8ihyfOQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Arnd Bergmann , Baoquan He , Luis Chamberlain , Helge Deller , Thomas Zimmermann , Christophe Leroy , linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, Sasha Levin , sam@ravnborg.org, javierm@redhat.com, xu.panda@zte.com.cn, schnelle@linux.ibm.com, steve@sk2.org Subject: [PATCH AUTOSEL 6.5 01/52] fbdev: atyfb: only use ioremap_uc() on i386 and ia64 Date: Sun, 29 Oct 2023 18:52:48 -0400 Message-ID: <20231029225441.789781-1-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.5.9 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnd Bergmann [ Upstream commit c1a8d1d0edb71dec15c9649cb56866c71c1ecd9e ] ioremap_uc() is only meaningful on old x86-32 systems with the PAT extension, and on ia64 with its slightly unconventional ioremap() behavior, everywhere else this is the same as ioremap() anyway. Change the only driver that still references ioremap_uc() to only do so on x86-32/ia64 in order to allow removing that interface at some point in the future for the other architectures. On some architectures, ioremap_uc() just returns NULL, changing the driver to call ioremap() means that they now have a chance of working correctly. Signed-off-by: Arnd Bergmann Signed-off-by: Baoquan He Reviewed-by: Luis Chamberlain Cc: Helge Deller Cc: Thomas Zimmermann Cc: Christophe Leroy Cc: linux-fbdev@vger.kernel.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: Helge Deller Signed-off-by: Sasha Levin --- drivers/video/fbdev/aty/atyfb_base.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/video/fbdev/aty/atyfb_base.c b/drivers/video/fbdev/aty/atyfb_base.c index cba2b113b28b0..a73114c1c6918 100644 --- a/drivers/video/fbdev/aty/atyfb_base.c +++ b/drivers/video/fbdev/aty/atyfb_base.c @@ -3440,11 +3440,15 @@ static int atyfb_setup_generic(struct pci_dev *pdev, struct fb_info *info, } info->fix.mmio_start = raddr; +#if defined(__i386__) || defined(__ia64__) /* * By using strong UC we force the MTRR to never have an * effect on the MMIO region on both non-PAT and PAT systems. */ par->ati_regbase = ioremap_uc(info->fix.mmio_start, 0x1000); +#else + par->ati_regbase = ioremap(info->fix.mmio_start, 0x1000); +#endif if (par->ati_regbase == NULL) return -ENOMEM; -- 2.42.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 75D31C4167B for ; Sun, 29 Oct 2023 22:54:48 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CEA8B10E09A; Sun, 29 Oct 2023 22:54:47 +0000 (UTC) Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4C6CC10E09A for ; Sun, 29 Oct 2023 22:54:46 +0000 (UTC) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 4B54860C79; Sun, 29 Oct 2023 22:54:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 26B6DC433C8; Sun, 29 Oct 2023 22:54:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1698620084; bh=1TQGvqTPML02EuJFmbb4WOcBkTgs/4pXNv1pyJS/8MU=; h=From:To:Cc:Subject:Date:From; b=Nwj9TYQQhvbAK9FlhXRfayCnzie8HdZbyhsQMcaEEGKtBFGMJfV+MuPixVxhBLnWy eNXiWdZvN2sjTpwkwMhikT7wcNvlifwBO238ZWbFXRXzdjWWZIAaTOnBGlnESQN9TM GaPTuRfQ9gYDF/nMo+wfQpPfj1hGBzENG7T2huahodgH3FOB4BBHQR7CZ0cDxRjGRt zofJi+JaxUshDvNl/NfVWtc14uy4BiNRoqLYpxTpOofWbjlbc+4jhAFnFsEfEOMSMK FS4AW6rql892cz1rczqiYK6h53uCakStB5bzHsNppuzZhMsPmzgIG5w9DpUj8nUhhl vhz5rr8ihyfOQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 6.5 01/52] fbdev: atyfb: only use ioremap_uc() on i386 and ia64 Date: Sun, 29 Oct 2023 18:52:48 -0400 Message-ID: <20231029225441.789781-1-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.5.9 Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sasha Levin , linux-fbdev@vger.kernel.org, steve@sk2.org, Arnd Bergmann , Baoquan He , schnelle@linux.ibm.com, xu.panda@zte.com.cn, Helge Deller , javierm@redhat.com, Christophe Leroy , Luis Chamberlain , dri-devel@lists.freedesktop.org, Thomas Zimmermann , sam@ravnborg.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Arnd Bergmann [ Upstream commit c1a8d1d0edb71dec15c9649cb56866c71c1ecd9e ] ioremap_uc() is only meaningful on old x86-32 systems with the PAT extension, and on ia64 with its slightly unconventional ioremap() behavior, everywhere else this is the same as ioremap() anyway. Change the only driver that still references ioremap_uc() to only do so on x86-32/ia64 in order to allow removing that interface at some point in the future for the other architectures. On some architectures, ioremap_uc() just returns NULL, changing the driver to call ioremap() means that they now have a chance of working correctly. Signed-off-by: Arnd Bergmann Signed-off-by: Baoquan He Reviewed-by: Luis Chamberlain Cc: Helge Deller Cc: Thomas Zimmermann Cc: Christophe Leroy Cc: linux-fbdev@vger.kernel.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: Helge Deller Signed-off-by: Sasha Levin --- drivers/video/fbdev/aty/atyfb_base.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/video/fbdev/aty/atyfb_base.c b/drivers/video/fbdev/aty/atyfb_base.c index cba2b113b28b0..a73114c1c6918 100644 --- a/drivers/video/fbdev/aty/atyfb_base.c +++ b/drivers/video/fbdev/aty/atyfb_base.c @@ -3440,11 +3440,15 @@ static int atyfb_setup_generic(struct pci_dev *pdev, struct fb_info *info, } info->fix.mmio_start = raddr; +#if defined(__i386__) || defined(__ia64__) /* * By using strong UC we force the MTRR to never have an * effect on the MMIO region on both non-PAT and PAT systems. */ par->ati_regbase = ioremap_uc(info->fix.mmio_start, 0x1000); +#else + par->ati_regbase = ioremap(info->fix.mmio_start, 0x1000); +#endif if (par->ati_regbase == NULL) return -ENOMEM; -- 2.42.0