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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B9938C00141 for ; Tue, 7 Nov 2023 15:51:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=9Mj4mQFtXzLTFadoLDYN4c2dcGk2Z2z3yAco8NQATSY=; b=aTPoTkIiSAWQJ1 tiOmX/pgA6KdcACLUWCZbuoxQF1zMOgl9peGEGFdFMk8zi4g0CeOc94yX7XHKYILSLXKr4ODwkuL+ gBJcavEVMDqsN8P+reSu/pvOuszkUDqIkMmH86nhiw3Nf04Pcbqx2Ee+iBoq7VPeSk5pbJjo3vKIK 3lJmxLO+c7VgD+rpSMtBsQmIeF1hSYIERjwBzUieJ8PdDogiEJdFPcFkRu/wbH6sTfJUE4M4kHFGU 6chdjNx3vkL9VUwaaSXxKOGdQ0g6oVOYnUL8Gwbs8UlB8YSDsGguG8EonNuxe5bLwH9Rifsmit1RI DjVVZRunbqvsKzi7M+tQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r0OMF-001u7G-0s; Tue, 07 Nov 2023 15:51:15 +0000 Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r0OMB-001u5e-1v for linux-arm-kernel@lists.infradead.org; Tue, 07 Nov 2023 15:51:13 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by ams.source.kernel.org (Postfix) with ESMTP id 48659B8165B; Tue, 7 Nov 2023 15:51:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 56F2BC433C7; Tue, 7 Nov 2023 15:51:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699372269; bh=xnwLLrOtV0XNMAWL9nFKXKRIvwqgnK5CKXFhpg70WoA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hQQdJWwJA7IJnxBK/uJoTkiCfwSCvHxaS+LAXOtCu+4IzxAMvcKn9yN1mmKUfsBOy gUtPmpYyrlIqw+hMsvlvUvMLv0YV2g4/kLqAnA2KIIzyjwSD+Ai6ZawmaCIt/0pSIC 1ipgqSBTxmhrsSeIdBlelyOMzQKMU2oTeDIFM/4mKhpbd7U+AuyFvjD9NwjbDP6iVx I4LPto8tWqKxGmdwms81zSvVK46BtXWmYV/mMYxEWyfXEi7Q4WeiL59B5lnlETjj48 eNRl0M3rIS6Pz6SDGwJBEW5Wdix/3Og93kN9EeR2kvULrI5UufqxZjSkYRYTkt5Xhe uka45h3ntejVw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Bjorn Helgaas , Jonathan Cameron , Sasha Levin , thomas.petazzoni@bootlin.com, pali@kernel.org, lpieralisi@kernel.org, kw@linux.com, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 6.1 17/30] PCI: mvebu: Use FIELD_PREP() with Link Width Date: Tue, 7 Nov 2023 10:49:51 -0500 Message-ID: <20231107155024.3766950-17-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231107155024.3766950-1-sashal@kernel.org> References: <20231107155024.3766950-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.61 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231107_075111_766809_C29B033A X-CRM114-Status: UNSURE ( 9.94 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org RnJvbTogSWxwbyBKw6RydmluZW4gPGlscG8uamFydmluZW5AbGludXguaW50ZWwuY29tPgoKWyBV cHN0cmVhbSBjb21taXQgNDA4NTk5ZWM1NjFhZDU4NjJjZGE0ZjEwNzYyNjAwOWY2ZmE5N2E3NCBd CgptdmVidV9wY2llX3NldHVwX2h3KCkgc2V0dXBzIHRoZSBNYXhpbXVtIExpbmsgV2lkdGggZmll bGQgaW4gdGhlIExpbmsKQ2FwYWJpbGl0aWVzIHJlZ2lzdGVycyB1c2luZyBhbiBvcGVuLWNvZGVk IHZhcmlhbnQgb2YgRklFTERfUFJFUCgpIHdpdGgKYSBsaXRlcmFsIGluIHNoaWZ0LiBJbXByb3Zl IHJlYWRhYmlsaXR5IGJ5IHVzaW5nCkZJRUxEX1BSRVAoUENJX0VYUF9MTktDQVBfTUxXLCAuLi4p LgoKTGluazogaHR0cHM6Ly9sb3JlLmtlcm5lbC5vcmcvci8yMDIzMDkxOTEyNTY0OC4xOTIwLTYt aWxwby5qYXJ2aW5lbkBsaW51eC5pbnRlbC5jb20KU2lnbmVkLW9mZi1ieTogSWxwbyBKw6Rydmlu ZW4gPGlscG8uamFydmluZW5AbGludXguaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBCam9ybiBI ZWxnYWFzIDxiaGVsZ2Fhc0Bnb29nbGUuY29tPgpSZXZpZXdlZC1ieTogSm9uYXRoYW4gQ2FtZXJv biA8Sm9uYXRoYW4uQ2FtZXJvbkBodWF3ZWkuY29tPgpTaWduZWQtb2ZmLWJ5OiBTYXNoYSBMZXZp biA8c2FzaGFsQGtlcm5lbC5vcmc+Ci0tLQogZHJpdmVycy9wY2kvY29udHJvbGxlci9wY2ktbXZl YnUuYyB8IDIgKy0KIDEgZmlsZSBjaGFuZ2VkLCAxIGluc2VydGlvbigrKSwgMSBkZWxldGlvbigt KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvcGNpL2NvbnRyb2xsZXIvcGNpLW12ZWJ1LmMgYi9kcml2 ZXJzL3BjaS9jb250cm9sbGVyL3BjaS1tdmVidS5jCmluZGV4IDFjZWQ3MzcyNmEyNjcuLjY2ODYw MWZkMGIyOTYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvcGNpL2NvbnRyb2xsZXIvcGNpLW12ZWJ1LmMK KysrIGIvZHJpdmVycy9wY2kvY29udHJvbGxlci9wY2ktbXZlYnUuYwpAQCAtMjY0LDcgKzI2NCw3 IEBAIHN0YXRpYyB2b2lkIG12ZWJ1X3BjaWVfc2V0dXBfaHcoc3RydWN0IG12ZWJ1X3BjaWVfcG9y dCAqcG9ydCkKIAkgKi8KIAlsbmtjYXAgPSBtdmVidV9yZWFkbChwb3J0LCBQQ0lFX0NBUF9QQ0lF WFAgKyBQQ0lfRVhQX0xOS0NBUCk7CiAJbG5rY2FwICY9IH5QQ0lfRVhQX0xOS0NBUF9NTFc7Ci0J bG5rY2FwIHw9IChwb3J0LT5pc194NCA/IDQgOiAxKSA8PCA0OworCWxua2NhcCB8PSBGSUVMRF9Q UkVQKFBDSV9FWFBfTE5LQ0FQX01MVywgcG9ydC0+aXNfeDQgPyA0IDogMSk7CiAJbXZlYnVfd3Jp dGVsKHBvcnQsIGxua2NhcCwgUENJRV9DQVBfUENJRVhQICsgUENJX0VYUF9MTktDQVApOwogCiAJ LyogRGlzYWJsZSBSb290IEJyaWRnZSBJL08gc3BhY2UsIG1lbW9yeSBzcGFjZSBhbmQgYnVzIG1h c3RlcmluZy4gKi8KLS0gCjIuNDIuMAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCmxpbnV4LWFybS1rZXJuZWwgbWFpbGluZyBsaXN0CmxpbnV4LWFybS1r ZXJuZWxAbGlzdHMuaW5mcmFkZWFkLm9yZwpodHRwOi8vbGlzdHMuaW5mcmFkZWFkLm9yZy9tYWls bWFuL2xpc3RpbmZvL2xpbnV4LWFybS1rZXJuZWwK 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 A2C01C4332F for ; Tue, 7 Nov 2023 15:58:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344087AbjKGP6G (ORCPT ); Tue, 7 Nov 2023 10:58:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55126 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235549AbjKGP5f (ORCPT ); Tue, 7 Nov 2023 10:57:35 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 029845BBF; Tue, 7 Nov 2023 07:51:10 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 56F2BC433C7; Tue, 7 Nov 2023 15:51:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699372269; bh=xnwLLrOtV0XNMAWL9nFKXKRIvwqgnK5CKXFhpg70WoA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hQQdJWwJA7IJnxBK/uJoTkiCfwSCvHxaS+LAXOtCu+4IzxAMvcKn9yN1mmKUfsBOy gUtPmpYyrlIqw+hMsvlvUvMLv0YV2g4/kLqAnA2KIIzyjwSD+Ai6ZawmaCIt/0pSIC 1ipgqSBTxmhrsSeIdBlelyOMzQKMU2oTeDIFM/4mKhpbd7U+AuyFvjD9NwjbDP6iVx I4LPto8tWqKxGmdwms81zSvVK46BtXWmYV/mMYxEWyfXEi7Q4WeiL59B5lnlETjj48 eNRl0M3rIS6Pz6SDGwJBEW5Wdix/3Og93kN9EeR2kvULrI5UufqxZjSkYRYTkt5Xhe uka45h3ntejVw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Bjorn Helgaas , Jonathan Cameron , Sasha Levin , thomas.petazzoni@bootlin.com, pali@kernel.org, lpieralisi@kernel.org, kw@linux.com, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 6.1 17/30] PCI: mvebu: Use FIELD_PREP() with Link Width Date: Tue, 7 Nov 2023 10:49:51 -0500 Message-ID: <20231107155024.3766950-17-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231107155024.3766950-1-sashal@kernel.org> References: <20231107155024.3766950-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.61 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ilpo Järvinen [ Upstream commit 408599ec561ad5862cda4f107626009f6fa97a74 ] mvebu_pcie_setup_hw() setups the Maximum Link Width field in the Link Capabilities registers using an open-coded variant of FIELD_PREP() with a literal in shift. Improve readability by using FIELD_PREP(PCI_EXP_LNKCAP_MLW, ...). Link: https://lore.kernel.org/r/20230919125648.1920-6-ilpo.jarvinen@linux.intel.com Signed-off-by: Ilpo Järvinen Signed-off-by: Bjorn Helgaas Reviewed-by: Jonathan Cameron Signed-off-by: Sasha Levin --- drivers/pci/controller/pci-mvebu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/controller/pci-mvebu.c b/drivers/pci/controller/pci-mvebu.c index 1ced73726a267..668601fd0b296 100644 --- a/drivers/pci/controller/pci-mvebu.c +++ b/drivers/pci/controller/pci-mvebu.c @@ -264,7 +264,7 @@ static void mvebu_pcie_setup_hw(struct mvebu_pcie_port *port) */ lnkcap = mvebu_readl(port, PCIE_CAP_PCIEXP + PCI_EXP_LNKCAP); lnkcap &= ~PCI_EXP_LNKCAP_MLW; - lnkcap |= (port->is_x4 ? 4 : 1) << 4; + lnkcap |= FIELD_PREP(PCI_EXP_LNKCAP_MLW, port->is_x4 ? 4 : 1); mvebu_writel(port, lnkcap, PCIE_CAP_PCIEXP + PCI_EXP_LNKCAP); /* Disable Root Bridge I/O space, memory space and bus mastering. */ -- 2.42.0