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 C22C5379EDA for ; Wed, 15 Jul 2026 01:22:58 +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=1784078579; cv=none; b=Pqn5zW9IFFUbP1HgU6Yv544QDU3AGXWUYdtU4bmKo6nPZrmHt3KbukKM58qPj/jaxH+ueH9PQhKwjITPkvzlKqucWEjizYMngh76DSE4dVKG080SozkzloE75V0sRMmso7Xry6sDX/uSZ0+zySbF5TvnoC23N806tijRj0ygbO8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784078579; c=relaxed/simple; bh=OEi/t49PYQKrKDGgCSLn/mw59ysfPtiCXojBwBxC/80=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PyVqbBR17qlVexUxCTwIee8vAUmLZkOquN/d67wgLbPEOYihI7bCQReSMNPrJFY5kxL0FrRuGy1delXHl0LCibfM/d4CRpZIK4aV8qlEl7vtyx2dxdDNkoGBNW5HAz53srkHZXSP09hFxqets+2U4I6xTDj5s8pJ9beSS2eJOpk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=WwwX5BTZ; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="WwwX5BTZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1C8CC1F00A3A; Wed, 15 Jul 2026 01:22:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1784078578; bh=23JPN3N5wmmKFt8V4zRbSpKuyNswMuLk2AH1YNEXg5Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=WwwX5BTZmEPC8XMetLTGSSGoULg4mf9Dv10BQ0R3ejyT07kX0w9GG2Wkhi35LMqXR vPKF+T6Dq+JKSl6yEAM1DoDNiDinM4zypaORaPthoFPY5luhAr0816uLT4FtZqUBI/ JCRPOKt9qIdgt3PV05a/F2T404efpRtT00xEca2301IAXj9IZ2YciAoX/C6e6Ly4eM +Zv2upwPRArWfUOS1XkQ5FA6t0R09qnhCkh0Nry8SYWT8eahLIG5YsSZR//cLW9TJz B/yUBxakFikZQflNSM6+kFGP9pmLIvDE55XdGq7w0izBN66Bd8t69G2lFX0tVg736A x0tFo2b69xF3g== From: Sasha Levin To: stable@vger.kernel.org Cc: Christian Marangi , Manivannan Sadhasivam , AngeloGioacchino Del Regno , Sasha Levin Subject: [PATCH 5.10.y 2/3] PCI: mediatek: Convert bool to single quirks entry and bitmap Date: Tue, 14 Jul 2026 21:22:54 -0400 Message-ID: <20260715012255.4073217-2-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260715012255.4073217-1-sashal@kernel.org> References: <2026071332-nectar-acre-e146@gregkh> <20260715012255.4073217-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Christian Marangi [ Upstream commit 04305367fab7ec9c98eeba315ad09c8b20abce93 ] To clean Mediatek SoC PCIe struct, convert all the bool to a bitmap and use a single quirks to reference all the values. This permits cleaner addition of new quirk without having to define a new bool in the struct. Signed-off-by: Christian Marangi Signed-off-by: Manivannan Sadhasivam Reviewed-by: AngeloGioacchino Del Regno Link: https://patch.msgid.link/20251020111121.31779-4-ansuelsmth@gmail.com Stable-dep-of: f865a57896bd ("PCI: mediatek: Fix IRQ domain leak when port fails to enable") Signed-off-by: Sasha Levin --- drivers/pci/controller/pcie-mediatek.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/drivers/pci/controller/pcie-mediatek.c b/drivers/pci/controller/pcie-mediatek.c index 3e4b0882ee3350..a69f5c89cbd0f6 100644 --- a/drivers/pci/controller/pcie-mediatek.c +++ b/drivers/pci/controller/pcie-mediatek.c @@ -139,22 +139,30 @@ struct mtk_pcie_port; +/** + * enum mtk_pcie_quirks - MTK PCIe quirks + * @MTK_PCIE_FIX_CLASS_ID: host's class ID needed to be fixed + * @MTK_PCIE_FIX_DEVICE_ID: host's device ID needed to be fixed + */ +enum mtk_pcie_quirks { + MTK_PCIE_FIX_CLASS_ID = BIT(0), + MTK_PCIE_FIX_DEVICE_ID = BIT(1), +}; + /** * struct mtk_pcie_soc - differentiate between host generations - * @need_fix_class_id: whether this host's class ID needed to be fixed or not - * @need_fix_device_id: whether this host's device ID needed to be fixed or not * @device_id: device ID which this host need to be fixed * @ops: pointer to configuration access functions * @startup: pointer to controller setting functions * @setup_irq: pointer to initialize IRQ functions + * @quirks: PCIe device quirks. */ struct mtk_pcie_soc { - bool need_fix_class_id; - bool need_fix_device_id; unsigned int device_id; struct pci_ops *ops; int (*startup)(struct mtk_pcie_port *port); int (*setup_irq)(struct mtk_pcie_port *port, struct device_node *node); + enum mtk_pcie_quirks quirks; }; /** @@ -707,7 +715,7 @@ static int mtk_pcie_startup_port_v2(struct mtk_pcie_port *port) writel(val, port->base + PCIE_RST_CTRL); /* Set up vendor ID and class code */ - if (soc->need_fix_class_id) { + if (soc->quirks & MTK_PCIE_FIX_CLASS_ID) { val = PCI_VENDOR_ID_MEDIATEK; writew(val, port->base + PCIE_CONF_VEND_ID); @@ -715,7 +723,7 @@ static int mtk_pcie_startup_port_v2(struct mtk_pcie_port *port) writew(val, port->base + PCIE_CONF_CLASS_ID); } - if (soc->need_fix_device_id) + if (soc->quirks & MTK_PCIE_FIX_DEVICE_ID) writew(soc->device_id, port->base + PCIE_CONF_DEVICE_ID); /* 100ms timeout value should be enough for Gen1/2 training */ @@ -1195,19 +1203,18 @@ static const struct mtk_pcie_soc mtk_pcie_soc_mt2712 = { }; static const struct mtk_pcie_soc mtk_pcie_soc_mt7622 = { - .need_fix_class_id = true, .ops = &mtk_pcie_ops_v2, .startup = mtk_pcie_startup_port_v2, .setup_irq = mtk_pcie_setup_irq, + .quirks = MTK_PCIE_FIX_CLASS_ID, }; static const struct mtk_pcie_soc mtk_pcie_soc_mt7629 = { - .need_fix_class_id = true, - .need_fix_device_id = true, .device_id = PCI_DEVICE_ID_MEDIATEK_7629, .ops = &mtk_pcie_ops_v2, .startup = mtk_pcie_startup_port_v2, .setup_irq = mtk_pcie_setup_irq, + .quirks = MTK_PCIE_FIX_CLASS_ID | MTK_PCIE_FIX_DEVICE_ID, }; static const struct of_device_id mtk_pcie_ids[] = { -- 2.53.0