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 5B3E3CCA486 for ; Tue, 28 Jun 2022 02:29:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230354AbiF1C3z (ORCPT ); Mon, 27 Jun 2022 22:29:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40410 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244876AbiF1C2P (ORCPT ); Mon, 27 Jun 2022 22:28:15 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 447A5252B6; Mon, 27 Jun 2022 19:27:13 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id D5CA961956; Tue, 28 Jun 2022 02:27:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5B113C341CB; Tue, 28 Jun 2022 02:27:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1656383232; bh=tiXH/T7g462YrC81TWBszoTWj9vCYXtfXO+RNyErlGg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JkKOigCJ47AF90eBC0S/PyUXbat6hueTExgV+gPkME0Ty+QmVb5VHYbcu9gEvQsx8 6c96kU+mFWkxtxzO74TRY5HaEqJPumiQk8TU1RcIryT9VJ01KARblIDnVHintqfzhv Ezbr8qIPsfEL0yr3x8AL3h5oFMkviqqOykHapbS9KkvSnZWgrXstvpPnnFqaXsOJa7 40OUjbfn97jmN7UdVWkvEnM0Ex3zoM6/YFRG8hQ6folRlRkYr1J+KEh7d9q4Ry18sc WBQaWIxn0uDTC1TBl0O5NeXvWwxA4vbLF0GWDE3TIo1Ing3caaVtLh8yReee5KOvpS OYnWw923+Xbrg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Petr Cvek , Helge Deller , Sasha Levin , mbroemme@libmpq.org, linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.9 06/13] video: fbdev: intelfb: Use aperture size from pci_resource_len Date: Mon, 27 Jun 2022 22:26:50 -0400 Message-Id: <20220628022657.597208-6-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220628022657.597208-1-sashal@kernel.org> References: <20220628022657.597208-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org From: Petr Cvek [ Upstream commit 25c9a15fb7bbfafb94dd3b4e3165c18b8e1bd039 ] Aperture size for i9x5 variants is determined from PCI base address. if (pci_resource_start(pdev, 2) & 0x08000000) *aperture_size = MB(128); ... This condition is incorrect as 128 MiB address can have the address set as 0x?8000000 or 0x?0000000. Also the code can be simplified to just use pci_resource_len(). The true settings of the aperture size is in the MSAC register, which could be used instead. However the value is used only as an info message, so it doesn't matter. Signed-off-by: Petr Cvek Signed-off-by: Helge Deller Signed-off-by: Sasha Levin --- drivers/video/fbdev/intelfb/intelfbhw.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/video/fbdev/intelfb/intelfbhw.c b/drivers/video/fbdev/intelfb/intelfbhw.c index d31ed4e2c46f..3aa93565e935 100644 --- a/drivers/video/fbdev/intelfb/intelfbhw.c +++ b/drivers/video/fbdev/intelfb/intelfbhw.c @@ -199,13 +199,11 @@ int intelfbhw_get_memory(struct pci_dev *pdev, int *aperture_size, case PCI_DEVICE_ID_INTEL_945GME: case PCI_DEVICE_ID_INTEL_965G: case PCI_DEVICE_ID_INTEL_965GM: - /* 915, 945 and 965 chipsets support a 256MB aperture. - Aperture size is determined by inspected the - base address of the aperture. */ - if (pci_resource_start(pdev, 2) & 0x08000000) - *aperture_size = MB(128); - else - *aperture_size = MB(256); + /* + * 915, 945 and 965 chipsets support 64MB, 128MB or 256MB + * aperture. Determine size from PCI resource length. + */ + *aperture_size = pci_resource_len(pdev, 2); break; default: if ((tmp & INTEL_GMCH_MEM_MASK) == INTEL_GMCH_MEM_64M) -- 2.35.1