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 DC2B414A4D2; Tue, 25 Jun 2024 09:40:47 +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=1719308447; cv=none; b=u1DaG+Zxmgk0Rg0vluBTQuKIvcSZWD5sPQw6HlX/TXlbu7/tf6dr13eWL7xKhyojgHe5/M+kslJHf/b7/bm9Zz2PnbU+fyfZ/+fidC0bQvxFiAyEJdjJlWBn7dBR9HxBNNFtEgwHUckejR++jrH42Gl3JQsY6C8WNcHIC5QEe/M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719308447; c=relaxed/simple; bh=XFFUa2MCYhatFRSBwdcKo+D7a5suA3tPwCScnQl7c78=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=dmwAzFadqqOqu3SfJN3k4qh419lhTvnVJgB0QNwTlE+79p1rXsnwn4dpMfRnnAsFEDxcvIcgdnpQl3ToQy8wdNYVHZ5H3oakfIMrXYnAm2KfMxiZqtxJdSulEwYUKw1+hh4HtgyYwdK3QMM1uFGLiYb4k0VjAbaWpzEmtvNQaGg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=yhgBl1b3; 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="yhgBl1b3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6405BC32786; Tue, 25 Jun 2024 09:40:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1719308447; bh=XFFUa2MCYhatFRSBwdcKo+D7a5suA3tPwCScnQl7c78=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yhgBl1b36HtU3RI+2J7xSxfStRaSm7HyJJMuuRP2VsZ/H8EqmCmnMSTsxtXV98n7m Keuw6x9sIJbGpoRgJ6evDJYdsxffGIuJLq1Qk8yIMaEctpckkCcb+qJAN5RaJP8T5+ DxeY9LpRci6IPpaqTMMUItgeut6nRvIeEeMXeReE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Thomas Bogendoerfer , Sasha Levin Subject: [PATCH 6.9 097/250] MIPS: Routerboard 532: Fix vendor retry check code Date: Tue, 25 Jun 2024 11:30:55 +0200 Message-ID: <20240625085551.794861248@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240625085548.033507125@linuxfoundation.org> References: <20240625085548.033507125@linuxfoundation.org> User-Agent: quilt/0.67 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.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ilpo Järvinen [ Upstream commit ae9daffd9028f2500c9ac1517e46d4f2b57efb80 ] read_config_dword() contains strange condition checking ret for a number of values. The ret variable, however, is always zero because config_access() never returns anything else. Thus, the retry is always taken until number of tries is exceeded. The code looks like it wants to check *val instead of ret to see if the read gave an error response. Fixes: 73b4390fb234 ("[MIPS] Routerboard 532: Support for base system") Signed-off-by: Ilpo Järvinen Signed-off-by: Thomas Bogendoerfer Signed-off-by: Sasha Levin --- arch/mips/pci/ops-rc32434.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/mips/pci/ops-rc32434.c b/arch/mips/pci/ops-rc32434.c index 874ed6df97683..34b9323bdabb0 100644 --- a/arch/mips/pci/ops-rc32434.c +++ b/arch/mips/pci/ops-rc32434.c @@ -112,8 +112,8 @@ static int read_config_dword(struct pci_bus *bus, unsigned int devfn, * gives them time to settle */ if (where == PCI_VENDOR_ID) { - if (ret == 0xffffffff || ret == 0x00000000 || - ret == 0x0000ffff || ret == 0xffff0000) { + if (*val == 0xffffffff || *val == 0x00000000 || + *val == 0x0000ffff || *val == 0xffff0000) { if (delay > 4) return 0; delay *= 2; -- 2.43.0