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 8240821ADAE; Tue, 8 Apr 2025 11:17:19 +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=1744111039; cv=none; b=kl+fTEyM7KEzwE7FidUYOMLH5uDkvpiq23wNjVIIKAO3ltkyKBGdciF8T35X5xePmEa3H2BruyGoXd+jIf8KHJls3SGKxVueoWV+Gprswz2F8qafYGEaVAdfvuzY8SArM8xqLmlsLYff6lje1Pu2xQFR/uhWKfFKHJK75rhsB5g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744111039; c=relaxed/simple; bh=QZgF3ct1JC7eAn949FfNnGz/mvKAcnUkPKKtXIIRAXg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=eHQBdTHdk080s73Bn9/DPuMoVb/TKvEWFP+/v668VYfzZj8f4HtkPPOoNKyacp41Vl3EEHW3N7aAkhGg9XElXOVTBrKQPiqWYJ5BeMRD5qzmCXAaCWpYbQ1NPu7iELDj9FVKNsKJpe/7RZVE2tgkC0b9gMXk843oZO7b1sgibz0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Nx1MTXrB; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Nx1MTXrB" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1374FC4CEE5; Tue, 8 Apr 2025 11:17:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744111039; bh=QZgF3ct1JC7eAn949FfNnGz/mvKAcnUkPKKtXIIRAXg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Nx1MTXrB3LeicXmR6Dw5Qa7tEYOu0auULU8cqOwtV3EKOA0wTzU6+DMcqG2rsq8ZH hP/QpCNukQxhYvCbfn4EpYouJJQ/GvA6p6O5U0mVD6qkhiZ+EWDw2YZ6+xEkIHAB0/ cZm11vBGShyUJC/vqgmp3Zz9afDTd2Ja/4H0YopY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Bjorn Helgaas , Xiaochun Lee , Sasha Levin Subject: [PATCH 6.14 286/731] PCI: Remove add_align overwrite unrelated to size0 Date: Tue, 8 Apr 2025 12:43:03 +0200 Message-ID: <20250408104920.931422260@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408104914.247897328@linuxfoundation.org> References: <20250408104914.247897328@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ilpo Järvinen [ Upstream commit d06cc1e3809040e8250f69a4c656e3717e6b963c ] Commit 566f1dd52816 ("PCI: Relax bridge window tail sizing rules") relaxed bridge window tail alignment rule for the non-optional part (size0, no add_size/add_align). The change, however, also overwrote add_align, which is only related to case where optional size1 related entry is added into realloc head. Correct this by removing the add_align overwrite. Link: https://lore.kernel.org/r/20241216175632.4175-2-ilpo.jarvinen@linux.intel.com Fixes: 566f1dd52816 ("PCI: Relax bridge window tail sizing rules") 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 | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 3d876d493faf2..3a1fcaad142a4 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -1149,7 +1149,6 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask, min_align = 1ULL << (max_order + __ffs(SZ_1M)); min_align = max(min_align, win_align); size0 = calculate_memsize(size, min_size, 0, 0, resource_size(b_res), win_align); - add_align = win_align; pci_info(bus->self, "bridge window %pR to %pR requires relaxed alignment rules\n", b_res, &bus->busn_res); } -- 2.39.5