From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A16AA28314D; Mon, 5 May 2025 22:50:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746485442; cv=none; b=oueKFqiHg1GkuR6EAfmKYZoDjmCOWmbfyeRqhDJHAqZ0tXmtaqI/rWjIfpCpQ4Qk+S7V9eGgaY2v3/XkKyQOQqfA7hTOFAvi1TruLnH7MTfNmgMmU8EmKNWkdT6LtYkmZV8ZO6YMOZiYYnplZnCXv9YFC91mIf4/NLFj2p20h/k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746485442; c=relaxed/simple; bh=fR7n2uUh6ns2A+Oabi0RDGnhrzZrWOGnblAvmSj/Cpo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=Xn2uLcGEaMjrLA5oadZ4uQWj2IdvItoM/z1ze/PguF9aakLD1mWCx6Fo9pzg1rvTMNWBE3iC84pHl+jIx1U5Vs9rceuM8M6g1I7t1mkXmNEte2xyo9MVExw1obOpaqdsAj0C4jUo39zghp67TTMUBRgZfqQwq+f2SHe6wWV3emA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=K3GU4Ztg; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="K3GU4Ztg" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3FD0BC4CEEE; Mon, 5 May 2025 22:50:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746485441; bh=fR7n2uUh6ns2A+Oabi0RDGnhrzZrWOGnblAvmSj/Cpo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=K3GU4ZtglBoR9UvYUDQqoJsN1xJMR+haSfZXsvPRs3jBObbmPjuuTPuYWVg5PFJqP HtRfewqOZFug5/oLQZYAeLtqt1rruwX/CPFY5jJSLaHyLwzAXUC1vE+jVz/CaN7UDr n8fKvkdDzCpioDDLoxpL3KNxnZkr1eEV0FDnFdaeQ+3UaLI+sxvf/cjAl5jPoB4kS/ X3sQXGJjEb1Kqf7fJ86YpCQyJij6ACIyb+A+lXG/sOYjaI5msYDA4zWBgcu/8rhf5O V1bd3pUCTRpDCvQCVwHjP7uK6SBr1oWok6l9UUj8WzMSLMn39RvzSagRLdO/Clobav WWA0cxcOanYoA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Bjorn Helgaas , Xiaochun Lee , Sasha Levin , linux-pci@vger.kernel.org Subject: [PATCH AUTOSEL 6.12 313/486] PCI: Fix old_size lower bound in calculate_iosize() too Date: Mon, 5 May 2025 18:36:29 -0400 Message-Id: <20250505223922.2682012-313-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505223922.2682012-1-sashal@kernel.org> References: <20250505223922.2682012-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.12.26 Content-Transfer-Encoding: 8bit From: Ilpo Järvinen [ Upstream commit ff61f380de5652e723168341480cc7adf1dd6213 ] Commit 903534fa7d30 ("PCI: Fix resource double counting on remove & rescan") fixed double counting of mem resources because of old_size being applied too early. Fix a similar counting bug on the io resource side. Link: https://lore.kernel.org/r/20241216175632.4175-6-ilpo.jarvinen@linux.intel.com Signed-off-by: Ilpo Järvinen Signed-off-by: Bjorn Helgaas Tested-by: Xiaochun Lee Signed-off-by: Sasha Levin --- drivers/pci/setup-bus.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index f16c7ce3bf3fc..1eceabef9e84d 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -814,11 +814,9 @@ static resource_size_t calculate_iosize(resource_size_t size, size = (size & 0xff) + ((size & ~0xffUL) << 2); #endif size = size + size1; - if (size < old_size) - size = old_size; - size = ALIGN(max(size, add_size) + children_add_size, align); - return size; + size = max(size, add_size) + children_add_size; + return ALIGN(max(size, old_size), align); } static resource_size_t calculate_memsize(resource_size_t size, -- 2.39.5