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 4EF21C4332F for ; Sun, 29 Oct 2023 23:04:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231804AbjJ2XEs (ORCPT ); Sun, 29 Oct 2023 19:04:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44224 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231994AbjJ2XEE (ORCPT ); Sun, 29 Oct 2023 19:04:04 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 243AF7D88; Sun, 29 Oct 2023 16:02:17 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 17BD7C433C7; Sun, 29 Oct 2023 23:02:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1698620536; bh=ThgpdufNRoS1xMLZQV3AzV26leDqwWdIz1O5qKKzcyI=; h=From:To:Cc:Subject:Date:From; b=hPBJEkeYCK/jYjN7WS+9uvobXluiDB3Rgq51FDTIGXvYoPD+5E0A8o1XEXvLSN+ix m613sFOX2rQ+ZT5LZ/cMSJSR6OQ+F8wv1KZsxv55PiphFmnsIiOZb7RXSYM7PDus+7 03Pn3Jur9WsEDuhHKQnF+MAvhxvzPUInT/+eI5QgDG/rchEQ/DsWbjej55gkS06UZo l+WF/xtCn2LLUc/B04bsc2lLIpSVUEafJHPNallg9rd/ehJ/liS0mjcJQ87MhWjFVz CQLAVUACsnP3qU7e102HihIuoE+9d8c8Pa1WR5GV+Klpybl5T3C0/6+5USfYyYgAgW gsD7ekCrO5yKA== 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, daniel.thompson@linaro.org, steve@sk2.org, schnelle@linux.ibm.com, xu.panda@zte.com.cn Subject: [PATCH AUTOSEL 4.14 01/11] fbdev: atyfb: only use ioremap_uc() on i386 and ia64 Date: Sun, 29 Oct 2023 19:01:52 -0400 Message-ID: <20231029230213.793581-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 4.14.328 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 d4b938276d238..71e95533613cd 100644 --- a/drivers/video/fbdev/aty/atyfb_base.c +++ b/drivers/video/fbdev/aty/atyfb_base.c @@ -3435,11 +3435,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