From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 E82A52D8376; Tue, 21 Jul 2026 18:06:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784657201; cv=none; b=mVq30lDvpNtsneN4z83dUU/wcMeJf8mhxsu95p+EMBn5HEt15kFY2YMJJnyKEsawi3GR411UtCMtLEa3F0S9xkmhljRiEo+gsbGYjJgf4D+/9ttUYwNxEeYW3kmiGyfLDixn1sh7pC0zPIloK8LxIwzxU/05ijHEYKevhtbOJOE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784657201; c=relaxed/simple; bh=QasNqcGaTM7Jl4yCmJqDtQ6Tl8+A5C+MAdwLeGkxXKs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=jTMoAsfsv78NFnjzjomY4lLZyNoALxNmDMvJxMAVJQ1HUexl/KpOxp/OA+hky9IV3AOCWOlWy7H0z7snESqJv2nl/E/g7TECyiu+WVnxvhsRpeV3rhOKq2gXRfVJJ52SdNvv4FlKygKm4BWMG85DoU3Mkbb9Lln1btTS8ArjVH0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ncktAC/b; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ncktAC/b" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5B6AB1F000E9; Tue, 21 Jul 2026 18:06:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784657199; bh=wbiy+Y8lm/TGqml4nKzD4X2rdsvUK34S5ng+JOOmIRk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ncktAC/bVo6Bf2cLEeTlUvI4wM+i8OTDbCB+bSdzuy4C9kyPvbCKsAYQvwvfGlW+D NDVWiatF2JhnqVfRc+LVI8/n/FlKz0Z+f+i9qEgV8dq0cZhhC6VkYcHhq3o6K9qVyr aA1nmMGn6JtG+IWiVCcnqV3rrlMo3nb512d5OLZY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Li RongQing , Manivannan Sadhasivam , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Sasha Levin Subject: [PATCH 6.18 0675/1611] PCI: mediatek: Fix operator precedence in PCIE_FTS_NUM_L0 macro Date: Tue, 21 Jul 2026 17:13:11 +0200 Message-ID: <20260721152530.565772128@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152514.750365251@linuxfoundation.org> References: <20260721152514.750365251@linuxfoundation.org> User-Agent: quilt/0.69 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.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Li RongQing [ Upstream commit 282305d7e9c0e27fd8b4df34b7cd5506a1eccdd6 ] The original PCIE_FTS_NUM_L0(x) macro was buggy due to improper operator precedence, where ((x) & 0xff << 8) was evaluated as ((x) & 0xff00). Instead of just fixing the parentheses, use the standard FIELD_PREP() macro. This makes the code more robust by automatically handling masks and shifts, while also adding compile-time type and range checking to ensure the value fits within PCIE_FTS_NUM_MASK. Fixes: 637cfacae96f ("PCI: mediatek: Add MediaTek PCIe host controller support") Signed-off-by: Li RongQing [mani: added the bitfield header include spotted by Sashiko] Signed-off-by: Manivannan Sadhasivam Reviewed-by: Krzysztof Wilczyński Link: https://patch.msgid.link/20260515005552.2343-1-lirongqing@baidu.com Signed-off-by: Sasha Levin --- drivers/pci/controller/pcie-mediatek.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/pci/controller/pcie-mediatek.c b/drivers/pci/controller/pcie-mediatek.c index d779baf1ae6d81..83880840b8764c 100644 --- a/drivers/pci/controller/pcie-mediatek.c +++ b/drivers/pci/controller/pcie-mediatek.c @@ -7,6 +7,7 @@ * Honghui Zhang */ +#include #include #include #include @@ -61,7 +62,7 @@ /* MediaTek specific configuration registers */ #define PCIE_FTS_NUM 0x70c #define PCIE_FTS_NUM_MASK GENMASK(15, 8) -#define PCIE_FTS_NUM_L0(x) ((x) & 0xff << 8) +#define PCIE_FTS_NUM_L0(x) FIELD_PREP(PCIE_FTS_NUM_MASK, x) #define PCIE_FC_CREDIT 0x73c #define PCIE_FC_CREDIT_MASK (GENMASK(31, 31) | GENMASK(28, 16)) -- 2.53.0