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 1CAD5C4332F for ; Sun, 29 Oct 2023 23:36:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231937AbjJ2Xga (ORCPT ); Sun, 29 Oct 2023 19:36:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35132 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231747AbjJ2XDx (ORCPT ); Sun, 29 Oct 2023 19:03:53 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A2B0386A9; Sun, 29 Oct 2023 16:02:42 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1D946C433B6; Sun, 29 Oct 2023 23:00:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1698620461; bh=GR11dSCmXDQaGLlSghT5l5vMdJAfd6ZPWoQdAcTV658=; h=From:To:Cc:Subject:Date:From; b=c4PhYA1r3oGMYBdERBBQEbQwOtaWEPjuyx+tpMirj7hRC0dL2LBXLo19rf2nQFldN dfI+l+SIGiCeLse0TmX4ctPPxGVPAUpex39UGARl9PBLBBwJsO8hX0WibhCTxOHpbW iaGOPxrfwjHMVOFD3aIwvRdyMqi13xW3UtmfacrD6So7aJStZirhFPdopnC8/k+g/U AWr/XqEqeaBch5/u3nHKpC7Honkap9o25qSLC3p+XN1FWHtZFt4uVYT7XwjtS/TqlH N+5njeFI44XvQ9IqeB6D1X/ykYLA9JKrtQ7JzplU69+1MQrfrqqiSXbPWG4JbMfGYH 7H9sQf3csc/AQ== 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 , javierm@redhat.com, sam@ravnborg.org, daniel.thompson@linaro.org, schnelle@linux.ibm.com, xu.panda@zte.com.cn, steve@sk2.org Subject: [PATCH AUTOSEL 5.4 01/13] fbdev: atyfb: only use ioremap_uc() on i386 and ia64 Date: Sun, 29 Oct 2023 19:00:34 -0400 Message-ID: <20231029230057.792930-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 5.4.259 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 6dda5d885a03b..bb9ecf12e7630 100644 --- a/drivers/video/fbdev/aty/atyfb_base.c +++ b/drivers/video/fbdev/aty/atyfb_base.c @@ -3410,11 +3410,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