From nobody Thu Apr 16 05:20:42 2026 Received: from ZRZP278CU001.outbound.protection.outlook.com (mail-switzerlandnorthazon11021090.outbound.protection.outlook.com [40.107.167.90]) (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 53FCB3B8BD3 for ; Mon, 2 Mar 2026 13:47:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.167.90 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772459272; cv=fail; b=YBcnXOYTYMDHaur2PaX4H8nd6DCfdPYxjR+vlMX35kpbAG68/suY5NcP8ADrpGDzmDxfnQYsHKthZRvcDNOdJubMFN3ebai1aedWuMA/0tRCgsHngaC+3u/3ybIJqLWx7cjRo6SDXMWdlpbHfZs29b/NVEf3cOdoYsKEEFXDxw8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772459272; c=relaxed/simple; bh=Zh9ES6lxfYQslawh4Cf7CagzIgL6MYcjqPPfKVev67c=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=obeaF3MDvwvGZfFEHVIcnWRpm17tBuWuK6ExRheNrWJ967bVxneFA216WRRkPOyek+It2sXvy6qHTnKCtax7UI78J/nktjOC8Jthhuw0i5zTnnaImc8LNuwXNk6OIk82+EXhINWgJMy58em71kYQt7wzbpEMKWoci3b5pd1exhs= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=duagon.com; spf=pass smtp.mailfrom=duagon.com; dkim=pass (1024-bit key) header.d=duagon.com header.i=@duagon.com header.b=TcJ2A5Bn; arc=fail smtp.client-ip=40.107.167.90 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=duagon.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=duagon.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=duagon.com header.i=@duagon.com header.b="TcJ2A5Bn" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=TGIzdL5DJ8WJ+I991niA5/4ESaHRDNgeh5LlYSnoHZEF4xBLMvUjj7m1tCYH89GQY4Vp4uOyL37EetIY2zHFf1KqgmOJgbcKbediDyBRR3PYE5+FaWeNns6WN/EEc2oHpXkKkgiiYkcwr10AXfgA/p0jCNl8t5YEcVtNKe0thGzYHStlG81qRy8aJmfAiE1/OWbcU5HO9ArlpJS7OZvnvbgUmkTcRBDqDTlSQ2TqXY87H6S/DD1jIoqzFEFZ8ikWLnr3SUORLGUMYqG9a00/KXimd4WtclXkiFYtFyEPwHBxPUSj+VfGkumvcrEFIsowctX8sPpjQo324nR72Tgx6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=LLb6wehqmf4hAROfsImXyAxKPS9mp++hR/PeNUFrgdE=; b=SWPAOUUbo90Lcsn1stxOKcfWQgoiz+1M24itxRy0+7W3Ri+9kaHhGrp8NGZzirqJfeq2UzRH5cp7vf9VaaDmxs6vy0w08t2BchG6lWj2xxlPHw9otIABYmxpEh+u8okRlfkMgqWsb/KCO7Cm3+ed6QE7oOiV/1Lr6rlOygA8aXF80rCXsRWN6m6UbsbzWtRNPzbxlAqXFz/H5BLqhbpTOEtYrBrkLnFlPpyW5R6uMyqPAcP/iDyabkaUi6lFgROY9Vcem2ZwA0NyQpwu+zL3Qq8YHuymMx8IFjlKbV1CyzsDQsQPChX/WysK/bwvelWlv44HS4TPhpDF7PbhS3ekLQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.93.86.6) smtp.rcpttodomain=gmail.com smtp.mailfrom=duagon.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=duagon.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=duagon.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=LLb6wehqmf4hAROfsImXyAxKPS9mp++hR/PeNUFrgdE=; b=TcJ2A5BnBweqTvjnGZIFWq3tXxUWZAExyLdtAYt2yETLXkErPLxxc1yMVUqTxNsbYV3xbKDcsudzPWWxHOMEq2fUCQPbpm11sfxmJm2LlJLFd14/ARmhVCqIpvH2EapLqKD+GI8URNsMtNbN9vVkkCJuI7rNLYHNnzK1llzpxus= Received: from DU2PR04CA0217.eurprd04.prod.outlook.com (2603:10a6:10:2b1::12) by ZR3P278MB1404.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:a0::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9654.21; Mon, 2 Mar 2026 13:47:47 +0000 Received: from DB1PEPF000509E7.eurprd03.prod.outlook.com (2603:10a6:10:2b1:cafe::d2) by DU2PR04CA0217.outlook.office365.com (2603:10a6:10:2b1::12) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9654.19 via Frontend Transport; Mon, 2 Mar 2026 13:47:42 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.93.86.6) smtp.mailfrom=duagon.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=duagon.com; Received-SPF: Pass (protection.outlook.com: domain of duagon.com designates 40.93.86.6 as permitted sender) receiver=protection.outlook.com; client-ip=40.93.86.6; helo=GVAP278CU002.outbound.protection.outlook.com; pr=C Received: from hz-deliver02.de.seppmail.cloud (2a01:4f8:272:5fe6::218) by DB1PEPF000509E7.mail.protection.outlook.com (2603:10a6:18:3::619) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9654.16 via Frontend Transport; Mon, 2 Mar 2026 13:47:47 +0000 Received: from hz-glue06.de.seppmail.cloud (unknown [10.11.0.48]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by hz-deliver02.de.seppmail.cloud (Postfix) with ESMTPS id 4fPgH64fnbz11Fl; Mon, 2 Mar 2026 14:47:46 +0100 (CET) Received: from hz-glue06.de.seppmail.cloud (unknown [172.18.0.5]) by hz-glue06.de.seppmail.cloud (Postfix) with ESMTP id 4fPgH64QY1z20Mn; Mon, 2 Mar 2026 14:47:46 +0100 (CET) X-SEPP-Suspect: a99798333be44a15a958f2da1df97342 Received: from hz-scan06.de.seppmail.cloud (unknown [10.11.0.39]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by hz-glue04.de.seppmail.cloud (Postfix) with ESMTPS id 4fPgH641c6z27kP; Mon, 2 Mar 2026 14:47:46 +0100 (CET) Received: from hz-scan06 (localhost [127.0.0.1]) by hz-scan06.de.seppmail.cloud (Postfix) with SMTP id 4fPgH63nJMz1l4v; Mon, 02 Mar 2026 14:47:46 +0100 (CET) Received: from hz-m365gate02.de.seppmail.cloud (unknown [10.11.0.28]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by hz-scan06.de.seppmail.cloud (Postfix) with ESMTPS; Mon, 02 Mar 2026 14:47:45 +0100 (CET) Received: from GVAP278CU002.outbound.protection.outlook.com (mail-switzerlandwestazlp17010006.outbound.protection.outlook.com [40.93.86.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (secp384r1) server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mail.protection.outlook.com", Issuer "DigiCert Cloud Services CA-1" (not verified)) by hz-m365gate02.de.seppmail.cloud (Postfix) with ESMTPS id 4fPgH44wWWz2x5W; Mon, 2 Mar 2026 14:47:44 +0100 (CET) Received: from ZR0P278MB1218.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:80::5) by ZRAP278MB0740.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:4c::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9654.21; Mon, 2 Mar 2026 13:47:37 +0000 Received: from ZR0P278MB1218.CHEP278.PROD.OUTLOOK.COM ([fe80::311:4b5c:48da:9514]) by ZR0P278MB1218.CHEP278.PROD.OUTLOOK.COM ([fe80::311:4b5c:48da:9514%5]) with mapi id 15.20.9654.020; Mon, 2 Mar 2026 13:47:37 +0000 From: Filip Jensen To: morbidrsa@gmail.com Cc: linux-kernel@vger.kernel.org, Filip Jensen , Jose Javier Rodriguez Barbarin Subject: [PATCH v2 1/2] mcb: Use more than the first bar in pci devices Date: Mon, 2 Mar 2026 14:47:02 +0100 Message-Id: <20260302134703.29913-2-dev-Felipe.Jensen@duagon.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260302134703.29913-1-dev-Felipe.Jensen@duagon.com> References: <20260302134703.29913-1-dev-Felipe.Jensen@duagon.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: MA2P292CA0029.ESPP292.PROD.OUTLOOK.COM (2603:10a6:250::19) To ZR0P278MB1218.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:80::5) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-TrafficTypeDiagnostic: ZR0P278MB1218:EE_|ZRAP278MB0740:EE_|DB1PEPF000509E7:EE_|ZR3P278MB1404:EE_ X-MS-Office365-Filtering-Correlation-Id: 273b12e9-13f6-4013-6d42-08de786249ac X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0;ARA:13230040|1800799024|366016|52116014|376014|38350700014; X-Microsoft-Antispam-Message-Info-Original: FZSqhXEY/YZBjKqz7sm4frODqzNjQF4FX5d2B+0K2uOlbkNMKvSxw1fYBCZPge9ByC1jGmmttIfP8+av1QXnjG00Rh4J5M+/1t4mZIkBlHyWirWoMDY95gEAssZOYWjfwmvEdWwHqEWgR/qTiUVzr/xHG7jFWzcxtiPvVMKPMyl5n2cUE9u6yxhSJ7RHv/KfoWba+y71cREfDnwsCOIkBqN3pFsuawkR0Fbe9AF/rWs/D7giIUkvYXOmGcA2rCpvh9HIb3ktWkIyR9vXSExQ+bEMIXGAHdRwj9N8WxADpb1QAbRG8QAdeGirxfzSsXuu93UFrB/6+kS+5+3LNKu1aW72jd9CRG+lhpwKfDPerMV48yyi7OB5PzlSuM11mMHxtGY2wNpQFnixCDYG/+0/BNo4sHISgh0vUo2IxOi252RWsgCPCsM4i0QNmzaIe9/zIfcLcuKeVEBuAQ9YuMRGz2eGky67lsWxo3AzpoWypym8mb3CY7HynX76QMah//IM5owGavtooClYKeHxXSQ5nE1j3h+qPpk4u8VI8jnYV2qQfoLtzAWhagHXTZFcRw9ca7ecCEtA/oXzTGy5S5I84kMsKAyelBc9b1nrDFVp+4P5PJXqSz4Zdk1eHB53t9UKNYF6WWaDDzz/U4f6BHyXZ40YUwalRLQ5W/AWddrMtdIxJugSmJeoubCFgITnPdToDbQlpp3FAnjlvCPr/YnByThX48yLBYYUS+E2AY3/hA1RNVv3TOOGbK91WnK1h+CrHr6UaW5yG+oFmaCY3nZ7OWrcvdYt2qY75yFkBxjWQGI= X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:ZR0P278MB1218.CHEP278.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(52116014)(376014)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZRAP278MB0740 X-SEPP-CCCVersion: 2025-12-11T08:12:51+01:00 9ed91da2 X-EOPAttributedMessage: 0 X-MS-Exchange-SkipListedInternetSender: ip=[40.93.86.6];domain=GVAP278CU002.outbound.protection.outlook.com X-MS-Exchange-ExternalOriginalInternetSender: ip=[40.93.86.6];domain=GVAP278CU002.outbound.protection.outlook.com X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB1PEPF000509E7.eurprd03.prod.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: d5d02977-6bca-4035-15c6-08de786243a1 X-SM-ruleversion: 2.1.0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|82310400026|36860700013|35042699022|10070799003|14060799003|376014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?L1dXdVJScGhrSXRMUTJ1UHB3VDJlSW9GclFvTFFvT1F2T2pTZ3V1S1Zudzh3?= =?utf-8?B?dHAzMjBwUXlPMTNrZnQ1aElreXB1bDA3eENUWkZGRUZkalZwNWZ2VnFvTVBW?= =?utf-8?B?Rk1GdXZNNTlvWXY1RzN4NWlFbUZ0UzdoM1BaMlh6bk5GeUJKWWR2eS9lYkpi?= =?utf-8?B?Wm9mdVFyOHcvQ0Z0K0VEMGp4S2dNOGR1dE5XVzJXQkFaQWlibG80U1lUMlZk?= =?utf-8?B?Zk1zS05Xd3NRbSt2eGt5UCtRUmhFbXByeS9QYXNubUFtcVEyN1ZxcVBVM1JK?= =?utf-8?B?eFdHbHFFUVJvUEFSeUpNSXZ3S0xUSmM2U0xrR3pXRm1Gbmdway9qUWFTbStk?= =?utf-8?B?SnFjZWk4MGd3Z2lCS1lJeWNsNTVKS0Y1Yy9Wb25KQld3UlI2K3ZFOVBqa1Jk?= =?utf-8?B?VkZuRFdLZjJFbElHZTEyNy9BcVVvWDFPTXFzNHdaV0M1dGZWWVFsYTBFVHFX?= =?utf-8?B?UXIzQS9OMEh2SVZuTXJvZThqM2Z5UHp1ZzhNZ2p3Q25mT2JYc1c5c01VaTFX?= =?utf-8?B?VkQxZ3AydXR3OGJFZUQ5Ujg0QzBpR1NUUXlJR0ZGRXFxSFpzQnFDMUZ5Um1j?= =?utf-8?B?Vk5aRVpNdGE1WWpuS3dlSmRCYU12bFlMRVFmalVjMUFsZFkxME1VM1R4TlVX?= =?utf-8?B?Qkk0QnJXUDdIMW40enRMUjZhVVUrTldJMDE2L05RTW13R0lSNFdpUHliMHJF?= =?utf-8?B?TnFDcFRxanpuSmdwWEhYcjZvWWdyUnk4OFpuMXUvYlNrTTMzajB3K3hwU0hR?= =?utf-8?B?WHV1OTRoR09DQzFaT3Y5OGsxbEhHRnVwYkdsK0tDQ0xTWnhLUE5MSDBrcm5S?= =?utf-8?B?UzFEN1BrQU9hcDZpZTc3dEdBdHlYMUc5bWRwbDZBWGphMHg3TFF2WXE2Z1Fl?= =?utf-8?B?OTlpVnBnWjJ4NlhzWDRESzJOSnZybXdQcnFIeURtL09ZRlpVaTRDMXY2TGh4?= =?utf-8?B?U0ZubzBYcERkYXRsNDlIN1l0MklNL3NTT3RheGZnWVdyYkJJNmVjZWUxYmFO?= =?utf-8?B?d1BmUlF0MW84a0F6NnEwcnZoZnZkZ1pvSytPQk0ySWN0eDV0UFJ5Q1FXcmg1?= =?utf-8?B?SHowWEVVYW5oNVR1NkFuWjNPNXYrL3hFSmJiSmw4OE92SUtHdlhGb2hRVnJQ?= =?utf-8?B?dnVpM0ZJTEZJc1lZbFZiZlZGanNkZC9XL0g1VUI2ajcwL0tFdjdoeW1yWnNV?= =?utf-8?B?SDVaYjZhcG9QUUV6YlpGZVRTRVIyNHhFZ2hkSGhQYnVrRGx6QmZROGRiNEh6?= =?utf-8?B?eUpzMkNxeGs5U21DVi9EVVo0dDU2WVJPRUJrOHl5Ynh4MEkyaDdobDFKaTJK?= =?utf-8?B?OGw0ajJtSTRwYStFYVVNTGlndVVnQ3ROd1FVZTd0TVZLemtwMmdnd2hxRkkx?= =?utf-8?B?UDh1OS9CNTRrSjJtK3JCQlVra2pMZGpWdW1SOCtXUjNIZ0hYenpPZlJoN0NW?= =?utf-8?B?TzlxbjhJVUt0UUtaNkNEdEZacUZpeGZ3dUpta1dFMTFjbWdRcU9HaXlOWm1K?= =?utf-8?Q?uMq2p5EvHW49sSZxQoLlPvuGvFF?= X-Forefront-Antispam-Report: CIP:2a01:4f8:272:5fe6::218;CTRY:CH;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:GVAP278CU002.outbound.protection.outlook.com;PTR:mail-switzerlandwestazlp17010006.outbound.protection.outlook.com;CAT:NONE;SFS:(13230040)(1800799024)(82310400026)(36860700013)(35042699022)(10070799003)(14060799003)(376014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: c851Li2GkYqFVhwRcNVAfKtvpvGWGiEvnzPafAUgSRyluasnq1wS+CoL1TgGlKGEzp5ACai0JF83JykLqCk/RIN9c8wkS1eqiLm27OF0seXs5dbH7iuB5r1DkqYT0kNtdR6uT7LIGxOjDgsOZ2v2DHbaNNMoihvs2QB6Uob2U2YaeqXslLEdQAImSdteAhsYwuJygfEICvJakYpdRBzWWbpN3kzSVWpNk4nYdAoKoSfJ7hIO4W8sE8lCtmlDX/B4/esH4cQK3H4LMkqqsIS4p7r6pZevJjO+7pUogxsdu2QYgMFDqno3grG+yyNQxranGhN23Jk5SwaUVNQ/1EcS/z8LTFBj2JGKcFs3cBNtzuVs5LVak++c8HeUeDXj3JWT4qpEW1H03mQT8gBAzvgP2BOh39WaEsXwZecZC/XSA3F+xvZRG8cQs/rJCKhKUqg9 X-OriginatorOrg: duagon.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Mar 2026 13:47:47.0368 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 273b12e9-13f6-4013-6d42-08de786249ac X-MS-Exchange-CrossTenant-Id: e5e7e96e-8a28-45d6-9093-a40dd5b51a57 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=e5e7e96e-8a28-45d6-9093-a40dd5b51a57;Ip=[2a01:4f8:272:5fe6::218];Helo=[hz-deliver02.de.seppmail.cloud] X-MS-Exchange-CrossTenant-AuthSource: DB1PEPF000509E7.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZR3P278MB1404 Currently The mcb driver in a PCI bus only uses the first BAR when parsing the table of attached devices and thus cannot map devices using other BARS (=C2=ABNo BAR for 16z=C2=BB error will be thrown in method chameleon_parse_gdd if assigned to a bar higher than the first). This patch allows the parsing of devices in BARS other than the first using the standard PCI helpers for accessing PCI BAR info as described in pci.h Reviewed-by: Jose Javier Rodriguez Barbarin Signed-off-by: Filip Jensen --- V1 -> V2: No changes in this patch V1: https://lore.kernel.org/lkml/20260226151339.48800-2-dev-Felipe.Jensen@d= uagon.com/ drivers/mcb/mcb-internal.h | 3 +-- drivers/mcb/mcb-lpc.c | 2 +- drivers/mcb/mcb-parse.c | 22 +++++++++++++--------- drivers/mcb/mcb-pci.c | 2 +- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/drivers/mcb/mcb-internal.h b/drivers/mcb/mcb-internal.h index 3602cb3b2021..180ba97cfc08 100644 --- a/drivers/mcb/mcb-internal.h +++ b/drivers/mcb/mcb-internal.h @@ -122,7 +122,6 @@ struct chameleon_bar { #define CHAMELEON_BAR_MAX 6 #define BAR_DESC_SIZE(x) ((x) * sizeof(struct chameleon_bar) + sizeof(__le= 32)) =20 -int chameleon_parse_cells(struct mcb_bus *bus, phys_addr_t mapbase, - void __iomem *base); +int chameleon_parse_cells(struct mcb_bus *bus, void __iomem *base); =20 #endif diff --git a/drivers/mcb/mcb-lpc.c b/drivers/mcb/mcb-lpc.c index 070aa787abc6..d3f48e1ea08b 100644 --- a/drivers/mcb/mcb-lpc.c +++ b/drivers/mcb/mcb-lpc.c @@ -56,7 +56,7 @@ static int mcb_lpc_probe(struct platform_device *pdev) if (IS_ERR(priv->bus)) return PTR_ERR(priv->bus); =20 - ret =3D chameleon_parse_cells(priv->bus, priv->mem->start, priv->base); + ret =3D chameleon_parse_cells(priv->bus, priv->base); if (ret < 0) { goto out_mcb_bus; } diff --git a/drivers/mcb/mcb-parse.c b/drivers/mcb/mcb-parse.c index 2b115cb0e5d9..806be67b960d 100644 --- a/drivers/mcb/mcb-parse.c +++ b/drivers/mcb/mcb-parse.c @@ -6,6 +6,7 @@ #include #include =20 +#include #include "mcb-internal.h" =20 #define for_each_chameleon_cell(dtype, p) \ @@ -123,13 +124,14 @@ static void chameleon_parse_bar(void __iomem *base, } } =20 -static int chameleon_get_bar(void __iomem **base, phys_addr_t mapbase, - struct chameleon_bar **cb) +static int chameleon_get_bar(void __iomem **base, struct chameleon_bar **c= b, + struct device *dev) { struct chameleon_bar *c; int bar_count; __le32 reg; u32 dtype; + struct pci_dev *pdev; =20 /* * For those devices which are not connected @@ -153,12 +155,15 @@ static int chameleon_get_bar(void __iomem **base, phy= s_addr_t mapbase, chameleon_parse_bar(*base, c, bar_count); *base +=3D BAR_DESC_SIZE(bar_count); } else { - c =3D kzalloc_obj(struct chameleon_bar); + pdev =3D to_pci_dev(dev); + bar_count =3D PCI_STD_NUM_BARS; + c =3D kzalloc_objs(struct chameleon_bar, bar_count); if (!c) return -ENOMEM; - - bar_count =3D 1; - c->addr =3D mapbase; + for (int i =3D 0; i < bar_count; ++i) { + c[i].addr =3D pci_resource_start(pdev, i); + c[i].size =3D pci_resource_len(pdev, i); + } } =20 *cb =3D c; @@ -166,8 +171,7 @@ static int chameleon_get_bar(void __iomem **base, phys_= addr_t mapbase, return bar_count; } =20 -int chameleon_parse_cells(struct mcb_bus *bus, phys_addr_t mapbase, - void __iomem *base) +int chameleon_parse_cells(struct mcb_bus *bus, void __iomem *base) { struct chameleon_fpga_header *header; struct chameleon_bar *cb; @@ -203,7 +207,7 @@ int chameleon_parse_cells(struct mcb_bus *bus, phys_add= r_t mapbase, memcpy(bus->name, header->filename, CHAMELEON_FILENAME_LEN); bus->name[CHAMELEON_FILENAME_LEN] =3D '\0'; =20 - bar_count =3D chameleon_get_bar(&p, mapbase, &cb); + bar_count =3D chameleon_get_bar(&p, &cb, bus->carrier); if (bar_count < 0) { ret =3D bar_count; goto free_header; diff --git a/drivers/mcb/mcb-pci.c b/drivers/mcb/mcb-pci.c index f1353da6ef4f..2401c19a8830 100644 --- a/drivers/mcb/mcb-pci.c +++ b/drivers/mcb/mcb-pci.c @@ -86,7 +86,7 @@ static int mcb_pci_probe(struct pci_dev *pdev, const stru= ct pci_device_id *id) =20 priv->bus->get_irq =3D mcb_pci_get_irq; =20 - ret =3D chameleon_parse_cells(priv->bus, priv->mapbase, priv->base); + ret =3D chameleon_parse_cells(priv->bus, priv->base); if (ret < 0) goto out_mcb_bus; =20 --=20 2.34.1 From nobody Thu Apr 16 05:20:42 2026 Received: from GVAP278CU002.outbound.protection.outlook.com (mail-switzerlandwestazon11020141.outbound.protection.outlook.com [52.101.188.141]) (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 9C4733E5581 for ; Mon, 2 Mar 2026 13:47:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.188.141 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772459275; cv=fail; b=faaD85mRxFa9pe7/QOcMKNfBqGa88qNWQx2Atj+U1fLK6q8b5p6nXnLwZ83BwqpIYdd3hG3t1FMIwpYJ1BALyitJ19JJPg1vZUhrVLask1xhNPzlmwkM8uMWcZdozW1OJjKnemXLbM+aTmA4p2nH1U3ua6UXYxDfr8lfPKsf2Po= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772459275; c=relaxed/simple; bh=O1GLgi+y6byJOG1WWL9nH7/9WaWyelYYEiWqHyDg4l0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=UHr5RlXCnAnnYbNNVMxVBPtnA6jFkgeIt3bP3gneOfnZhzUtDfPbJ7120VvfUzNKVTO+y6RshsW878gplrxbleAAp/JoBFrH2czKn81xFTqN1DVf+mmlsY/aV+POg49OvLNl+9a5CRYO4YBCdcgOKFn22e1SuF/puhKM+TxZisc= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=duagon.com; spf=pass smtp.mailfrom=duagon.com; dkim=pass (1024-bit key) header.d=duagon.com header.i=@duagon.com header.b=B4finaDw; arc=fail smtp.client-ip=52.101.188.141 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=duagon.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=duagon.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=duagon.com header.i=@duagon.com header.b="B4finaDw" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=OxroJCcvHBbUjfNIwklqfpY436Lm7zN5Vd0ncU7Ndtdd9huvLwxd7MUmSS67Md2EKhCp6FlwE/FOWkpPccvuTgDUxPO0z+nmk7J/OmkAWEFmjWgkM3Qc1SaPwXsxYUL1rmwzMRpeYW4zy9y0acoxuccusqlkDRXqazPNS/iCdj1Qboj8NCwz5x40Vk+5UlIlknmx57YljoacEzJiBfiTQ5HNBt8qU/iWhwPjhsmaVRfG8qbXanlTqH5ZjyYXkvlMWxx67O6tvlynCKDtMfpdf5AAx/B/rvDhMOh3QiucgmbCL5wHp/hWg0LLUEUCap8Stj2cyn2Wr9g4NWLr9rezzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=biryC8k3YxQhCW/d/uJv3xn0y+7e/tGTm/mWfMVWOmw=; b=dliPPL+kw7rAv47GpdsCMZda/NwWCVRu6oD4ulNCJdxnRz4ooB0k/fCKK2KP1ladBAdTHjTJh3af/g8+cdeNYn2irp2DwE4nsMFAICEZ+h3qYcGgZfKs23XUlLixbCEORFxs7VkrWPbw4tk/tw3DZ6hl251AgfNBSqCsDXxbCNscxoWRIxuKmZqjZtnYHYs9XGNjkhpVrhU3629/DgN6X0y3lcxRKsuetd2jcB4HtsIBzJ/icZeXqp4/vQB0BatwmFvb9Z6hIAhI96pEBUep9LFDwzG8F4erNCtwKR2fGAKWdmb1Y2Td1XH4Qi4tEcJwKKQlmtA9+Ax8m9T+W5Shmg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.93.86.6) smtp.rcpttodomain=gmail.com smtp.mailfrom=duagon.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=duagon.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=duagon.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=biryC8k3YxQhCW/d/uJv3xn0y+7e/tGTm/mWfMVWOmw=; b=B4finaDwaXee0p/Z0f3bApuNFUtfEptUwMHCe2rzH/+UKqxLuK8t5r/6haAye3PIL+SOOdhd7z5wgSqGX+DNLKGtM+fMIibg7dK22k4kkVzuV30N02ndz8fggYyH3rWTbyxSXcdSebmNopjUi3Wg1YpdyYwY51oKO51AssEtJIo= Received: from AS4P195CA0038.EURP195.PROD.OUTLOOK.COM (2603:10a6:20b:65a::21) by ZR1PPF689FDCEED.CHEP278.PROD.OUTLOOK.COM (2603:10a6:918::292) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9654.20; Mon, 2 Mar 2026 13:47:48 +0000 Received: from AMS0EPF00000198.eurprd05.prod.outlook.com (2603:10a6:20b:65a:cafe::34) by AS4P195CA0038.outlook.office365.com (2603:10a6:20b:65a::21) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9654.20 via Frontend Transport; Mon, 2 Mar 2026 13:47:45 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.93.86.6) smtp.mailfrom=duagon.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=duagon.com; Received-SPF: Pass (protection.outlook.com: domain of duagon.com designates 40.93.86.6 as permitted sender) receiver=protection.outlook.com; client-ip=40.93.86.6; helo=GVAP278CU002.outbound.protection.outlook.com; pr=C Received: from hz-deliver02.de.seppmail.cloud (162.55.72.218) by AMS0EPF00000198.mail.protection.outlook.com (10.167.16.244) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9654.16 via Frontend Transport; Mon, 2 Mar 2026 13:47:47 +0000 Received: from hz-glue04.de.seppmail.cloud (unknown [10.11.0.13]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by hz-deliver02.de.seppmail.cloud (Postfix) with ESMTPS id 4fPgH75VRdz118g; Mon, 2 Mar 2026 14:47:47 +0100 (CET) Received: from hz-glue04.de.seppmail.cloud (unknown [172.18.0.7]) by hz-glue04.de.seppmail.cloud (Postfix) with ESMTP id 4fPgH75HJXz27nC; Mon, 2 Mar 2026 14:47:47 +0100 (CET) X-SEPP-Suspect: a1460275aab1472898c03d0291a27475 Received: from hz-scan06.de.seppmail.cloud (unknown [10.11.0.39]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by hz-glue04.de.seppmail.cloud (Postfix) with ESMTPS id 4fPgH74sQQz27mX; Mon, 2 Mar 2026 14:47:47 +0100 (CET) Received: from hz-scan06 (localhost [127.0.0.1]) by hz-scan06.de.seppmail.cloud (Postfix) with SMTP id 4fPgH74Qhyz1l4v; Mon, 02 Mar 2026 14:47:47 +0100 (CET) Received: from hz-m365gate02.de.seppmail.cloud (unknown [10.11.0.28]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by hz-scan06.de.seppmail.cloud (Postfix) with ESMTPS; Mon, 02 Mar 2026 14:47:45 +0100 (CET) Received: from GVAP278CU002.outbound.protection.outlook.com (mail-switzerlandwestazlp17010006.outbound.protection.outlook.com [40.93.86.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (secp384r1) server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mail.protection.outlook.com", Issuer "DigiCert Cloud Services CA-1" (not verified)) by hz-m365gate02.de.seppmail.cloud (Postfix) with ESMTPS id 4fPgH52MMNz2x6F; Mon, 2 Mar 2026 14:47:45 +0100 (CET) Received: from ZR0P278MB1218.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:80::5) by ZRAP278MB0740.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:4c::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9654.21; Mon, 2 Mar 2026 13:47:39 +0000 Received: from ZR0P278MB1218.CHEP278.PROD.OUTLOOK.COM ([fe80::311:4b5c:48da:9514]) by ZR0P278MB1218.CHEP278.PROD.OUTLOOK.COM ([fe80::311:4b5c:48da:9514%5]) with mapi id 15.20.9654.020; Mon, 2 Mar 2026 13:47:38 +0000 From: Filip Jensen To: morbidrsa@gmail.com Cc: linux-kernel@vger.kernel.org, Filip Jensen , Jose Javier Rodriguez Barbarin Subject: [PATCH v2 2/2] mcb: refactor the bus operations out of the common code Date: Mon, 2 Mar 2026 14:47:03 +0100 Message-Id: <20260302134703.29913-3-dev-Felipe.Jensen@duagon.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260302134703.29913-1-dev-Felipe.Jensen@duagon.com> References: <20260302134703.29913-1-dev-Felipe.Jensen@duagon.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: MA2P292CA0029.ESPP292.PROD.OUTLOOK.COM (2603:10a6:250::19) To ZR0P278MB1218.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:80::5) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-TrafficTypeDiagnostic: ZR0P278MB1218:EE_|ZRAP278MB0740:EE_|AMS0EPF00000198:EE_|ZR1PPF689FDCEED:EE_ X-MS-Office365-Filtering-Correlation-Id: bf2ed518-d3ae-44ea-7870-08de78624a38 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0;ARA:13230040|1800799024|366016|52116014|376014|38350700014; X-Microsoft-Antispam-Message-Info-Original: 2IMI3TQkB7P6Q5FiJW1I7E9XNjiAehMK2Kq4MWl5uCMt1u8d+ziyuFSt0aNzj78AQFYyVublFzsF1ZlQ/O7eE0U3a7ORvi/8LyO2NoXm1kq+zEetm5+RfOfoxnZNDzvFl6gubTZckclvfj5vY+kC1LSN6aQwT5Bd8Kc4RL9Pc8GmVzRGI6yxu3DXJheOYTbMC8/WdfDQiIaHsr6Rd64Hm7PRb5iOp3sG6hfZDZpbiOE4YneGLwOepjl+S0CkbXmg8dcQQUKbK208FsmPY0t59K0gFAgi5hobHZCSW2khj0/CnG9WaIHOHl3HVdKqpgMeDPeh1NHS6fOuLiDSynQPsD495bVPL+6PU0beGtP3H6Ii8C74rIMcqMztikBv8DSvHv5MMpYtruf9x6ZdDgI+bmMk+ktUQhrvAZnV50U/hU+Yxk196kb1n9bwKBNxgxGmTo6Cd0LfPfkD74O+wqcTDrDLQwYh3bbRcMPBYV0tP6MaXZBwM+X9SsM6DQ+RpcP42N4Dwcq9sMuZ3JM+2KC3cmoKEq7YU8zEvEJMGcrv/f1mZ/s2+8ZMmrK+II4RKeYHRWujJiy1HyL5wUDC5M3eRRfMOXVkBhIy52MVWMWqaBcyylsgH95+xlSiFkkqTThOMys3m3QhB4VlmenL2aXXd4sW7S3MyQjyE2a0McfVE7aXlhYSSFZn4cUKVGkvAfT8xXdjD6kWOceIq/q8BZPhJWctEfvB0OnsQVbfTTGOixxmgANs5QkPoVObKQw/2GeHltOFrwacPMiQVbAB3b632k8rsevMfHSgpgqwrWuDFzo= X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:ZR0P278MB1218.CHEP278.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(52116014)(376014)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZRAP278MB0740 X-SEPP-CCCVersion: 2025-12-11T08:12:51+01:00 9ed91da2 X-EOPAttributedMessage: 0 X-MS-Exchange-SkipListedInternetSender: ip=[40.93.86.6];domain=GVAP278CU002.outbound.protection.outlook.com X-MS-Exchange-ExternalOriginalInternetSender: ip=[40.93.86.6];domain=GVAP278CU002.outbound.protection.outlook.com X-MS-Exchange-Transport-CrossTenantHeadersStripped: AMS0EPF00000198.eurprd05.prod.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 0f070679-e96d-4463-982d-08de78624498 X-SM-ruleversion: 2.1.0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|14060799003|156008|35042699022|82310400026|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?01usDqdJqbbhiSYIbbKis8Ves6a5nnFUVSCFIcaXEmyispbYowdJGlQUMqDC?= =?us-ascii?Q?4qyFAS/gM28LAeIL37zSB2/OZ6fcrpVz2JTafbkxxuNGQK6ZSLPofoCCinJD?= =?us-ascii?Q?SkhXMwoGUDf3TVsp+GMaefx+Q6e4qbP18GoJGcVhcqeE4bWCAK47gfcSWgFh?= =?us-ascii?Q?AvTpj3WR/z2AP7EOn4XsadaZ5CqXD15LtV76iR2p+a7jPH7b3pZf3zUNjG/z?= =?us-ascii?Q?0Zn44n1zDI6MTgHHD2w6/IkllNp0B8AzkSEc7ZvZqsjcN3woi6YYZYD5I5CI?= =?us-ascii?Q?qDtVidDPEd6UWGdnlOr/lNPMqnrUHJxft+EfFlr8Q2Pi8+QN7QwcENsJBRyb?= =?us-ascii?Q?bDX4zRSzvgATeTvI0qzVDM2k0Xc+LO7EQUNTq2dRO9Nk6jX+zhxovxOKv9PQ?= =?us-ascii?Q?fzAkZXg17w1icMm5XDDud5vHWZ8g/dt51BotW0/m9e9oE5dk8UeyZ4uRBB3I?= =?us-ascii?Q?sHJyu4/SEXwNPXovXg2IB/8DquvbFKitkmaIJeh3DGg1tb6Z/1YSEUVXXx2X?= =?us-ascii?Q?ydI3T6KiwM7AJvCRj8SM2dudd7KpzeVRCJBIeSequWiPkw228/ws1tJm6a+t?= =?us-ascii?Q?NbpWu94sr0Nl9GiX7GwTKUG1smTCO8qUXxK033RWL0AAShpJaXpWt30p11c6?= =?us-ascii?Q?Nt91jPLcjy5U4mHnDK27J/n/QTwEXH7ozTlDKuPhJDgSYkkZsDrK/peWGBsw?= =?us-ascii?Q?6aW+U0iRFF+LGSzBK0Pg7iRh/Ras/Q+0nB1sHT9yqtfR+MI33/xULbKGj5dP?= =?us-ascii?Q?dJH54Bv8W1mU3aIBpJKukUlRIiNKqyRY2plUepcBkmvmyRqY91Nhx7S/amV+?= =?us-ascii?Q?ge0GXFvYg8YLkEW9gJF+uqI8ZRZowLg8Bly4kb8J5qmydy4TJNI1ledw+yuj?= =?us-ascii?Q?xBmjqy/MM/iW7DbR5lgWFSJtTpswGGqnCF7YuTvHzdE61m6cGxfayUgcU1T5?= =?us-ascii?Q?pPTs11hH115Um3aeLlr0Yj5Vs7WYM6NRbOku7uQ9eU3agjzfuo0AHB5PuvME?= =?us-ascii?Q?5h9zriGUEJxWeEpQi1DAE3N8z6vTn2s0JrVZ+ovhf7/5ZBW2nqA7LyINKban?= =?us-ascii?Q?6f+dLBRDlslq8zBhNlJLxZwiMSfFEcrBwaNTeOXzSy26PAY6gccCILRC86Gg?= =?us-ascii?Q?7Q15NADBv2WG?= X-Forefront-Antispam-Report: CIP:162.55.72.218;CTRY:CH;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:GVAP278CU002.outbound.protection.outlook.com;PTR:mail-switzerlandwestazlp17010006.outbound.protection.outlook.com;CAT:NONE;SFS:(13230040)(36860700013)(1800799024)(14060799003)(156008)(35042699022)(82310400026)(376014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LGCzcseWTjYqDRYE7LQQtSyuVJQvDwy0PTlVLiTG3rMzM0XxyPBC6h6SKiqjvI0/8RAX8BqtURqZ+U7eVYZQX/TPApP8l/1gsvZrVeHXwIx3X1ID1fQWdoUn7Fjj1X1avPib1IIDx4ZnnwubA/w3pYKiucQMIRqgWxTQD3O51SpsuEbuSCDrEDNzmZpy2OZZLwFBwoIaYiSx0l4RhPc4Ipj6ouwffIFV7yaRQF7wiFzLEb+oPTvz4rX8Zj6AFKRbz9nvniR70pRorj87qAuipnbBYThqmFnGYT2OyuFtXPGuWeDdc7kHEkIHdBGFIfueYPZZVDd7CuNnl1lfRRn5mWRHlFJl3zafIv9Ro+OcrbKxMSQnHEDWAG90oT3hSqvdm1bwoMUv15I/fvFVJC0FORq5/sec5VNVOSyykY1KHsCQPPhveQ15j9tE4atlFHdC X-OriginatorOrg: duagon.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Mar 2026 13:47:47.9832 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bf2ed518-d3ae-44ea-7870-08de78624a38 X-MS-Exchange-CrossTenant-Id: e5e7e96e-8a28-45d6-9093-a40dd5b51a57 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=e5e7e96e-8a28-45d6-9093-a40dd5b51a57;Ip=[162.55.72.218];Helo=[hz-deliver02.de.seppmail.cloud] X-MS-Exchange-CrossTenant-AuthSource: AMS0EPF00000198.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZR1PPF689FDCEED Content-Type: text/plain; charset="utf-8" Two operations can be identified that are bus dependent and are needed in both modules mcb-pci and mcb-lpc. In order to avoid having info of both buses in common code, two callbacks operations (is_bar_iomapped and get_bars) are defined and passed as parameters to the mcb-parser. Reviewed-by: Jose Javier Rodriguez Barbarin Signed-off-by: Filip Jensen --- V1 -> V2: Patch V1 2/3 is removed as its changes were removed in V1 3/3. V2 has the refactor of the previous V1 3/3 V1: https://lore.kernel.org/lkml/20260226151339.48800-3-dev-Felipe.Jensen@d= uagon.com/ drivers/mcb/mcb-internal.h | 9 ++++- drivers/mcb/mcb-lpc.c | 56 +++++++++++++++++++++++++- drivers/mcb/mcb-parse.c | 81 +++++--------------------------------- drivers/mcb/mcb-pci.c | 40 ++++++++++++++++++- 4 files changed, 111 insertions(+), 75 deletions(-) diff --git a/drivers/mcb/mcb-internal.h b/drivers/mcb/mcb-internal.h index 180ba97cfc08..3152cb4bd1b5 100644 --- a/drivers/mcb/mcb-internal.h +++ b/drivers/mcb/mcb-internal.h @@ -122,6 +122,13 @@ struct chameleon_bar { #define CHAMELEON_BAR_MAX 6 #define BAR_DESC_SIZE(x) ((x) * sizeof(struct chameleon_bar) + sizeof(__le= 32)) =20 -int chameleon_parse_cells(struct mcb_bus *bus, void __iomem *base); +struct chameleon_parse_ops { + bool (*is_bar_iomapped)(struct device *dev, struct chameleon_bar *cb, + int bar); + int (*get_bars)(void __iomem **base, struct chameleon_bar **cb, + struct device *dev); +}; =20 +int chameleon_parse_cells(struct mcb_bus *bus, void __iomem *base, + struct chameleon_parse_ops *cham_bus_ops); #endif diff --git a/drivers/mcb/mcb-lpc.c b/drivers/mcb/mcb-lpc.c index d3f48e1ea08b..9dbf9604e5a9 100644 --- a/drivers/mcb/mcb-lpc.c +++ b/drivers/mcb/mcb-lpc.c @@ -19,6 +19,60 @@ struct priv { void __iomem *base; }; =20 +static int mcb_lpc_get_bars(void __iomem **base, struct chameleon_bar **cb, + struct device *pdev) +{ + struct chameleon_bar *c; + int bar_count; + __le32 reg; + char __iomem *p =3D *base; + int i; + + /* + * For those devices which are not connected + * to the PCI Bus (e.g. LPC) there is a bar + * descriptor located directly after the + * chameleon header. This header is comparable + * to a PCI header. + */ + reg =3D readl(*base); + + bar_count =3D BAR_CNT(reg); + if (bar_count <=3D 0 || bar_count > CHAMELEON_BAR_MAX) + return -ENODEV; + + c =3D kzalloc_objs(struct chameleon_bar, bar_count); + if (!c) + return -ENOMEM; + + /* skip reg1 */ + p +=3D sizeof(__le32); + + for (i =3D 0; i < bar_count; i++) { + c[i].addr =3D readl(p); + c[i].size =3D readl(p + 4); + + p +=3D sizeof(struct chameleon_bar); + } + *base +=3D BAR_DESC_SIZE(bar_count); + *cb =3D c; + + return bar_count; +} + +static bool mcb_is_lpc_bar_iomapped(struct device *dev, + struct chameleon_bar *cb, int bar) +{ + if (cb[bar].addr & 0x01) + return true; + return false; +} + +static struct chameleon_parse_ops lpc_parse_ops =3D { + .is_bar_iomapped =3D mcb_is_lpc_bar_iomapped, + .get_bars =3D mcb_lpc_get_bars, +}; + static int mcb_lpc_probe(struct platform_device *pdev) { struct resource *res; @@ -56,7 +110,7 @@ static int mcb_lpc_probe(struct platform_device *pdev) if (IS_ERR(priv->bus)) return PTR_ERR(priv->bus); =20 - ret =3D chameleon_parse_cells(priv->bus, priv->base); + ret =3D chameleon_parse_cells(priv->bus, priv->base, &lpc_parse_ops); if (ret < 0) { goto out_mcb_bus; } diff --git a/drivers/mcb/mcb-parse.c b/drivers/mcb/mcb-parse.c index 806be67b960d..f5e86b6e2e4f 100644 --- a/drivers/mcb/mcb-parse.c +++ b/drivers/mcb/mcb-parse.c @@ -6,7 +6,6 @@ #include #include =20 -#include #include "mcb-internal.h" =20 #define for_each_chameleon_cell(dtype, p) \ @@ -29,9 +28,9 @@ static int chameleon_parse_bdd(struct mcb_bus *bus, return 0; } =20 -static int chameleon_parse_gdd(struct mcb_bus *bus, - struct chameleon_bar *cb, - void __iomem *base, int bar_count) +static int chameleon_parse_gdd(struct mcb_bus *bus, struct chameleon_bar *= cb, + void __iomem *base, int bar_count, + struct chameleon_parse_ops *cham_ops) { struct chameleon_gdd __iomem *gdd =3D (struct chameleon_gdd __iomem *) base; @@ -77,7 +76,7 @@ static int chameleon_parse_gdd(struct mcb_bus *bus, goto err; } =20 - if (dev_mapbase & 0x01) { + if (cham_ops->is_bar_iomapped(bus->carrier, cb, mdev->bar)) { pr_info("IO mapped Device (16z%03d) not yet supported\n", mdev->id); ret =3D 0; @@ -107,71 +106,8 @@ static int chameleon_parse_gdd(struct mcb_bus *bus, return ret; } =20 -static void chameleon_parse_bar(void __iomem *base, - struct chameleon_bar *cb, int bar_count) -{ - char __iomem *p =3D base; - int i; - - /* skip reg1 */ - p +=3D sizeof(__le32); - - for (i =3D 0; i < bar_count; i++) { - cb[i].addr =3D readl(p); - cb[i].size =3D readl(p + 4); - - p +=3D sizeof(struct chameleon_bar); - } -} - -static int chameleon_get_bar(void __iomem **base, struct chameleon_bar **c= b, - struct device *dev) -{ - struct chameleon_bar *c; - int bar_count; - __le32 reg; - u32 dtype; - struct pci_dev *pdev; - - /* - * For those devices which are not connected - * to the PCI Bus (e.g. LPC) there is a bar - * descriptor located directly after the - * chameleon header. This header is comparable - * to a PCI header. - */ - dtype =3D get_next_dtype(*base); - if (dtype =3D=3D CHAMELEON_DTYPE_BAR) { - reg =3D readl(*base); - - bar_count =3D BAR_CNT(reg); - if (bar_count <=3D 0 || bar_count > CHAMELEON_BAR_MAX) - return -ENODEV; - - c =3D kzalloc_objs(struct chameleon_bar, bar_count); - if (!c) - return -ENOMEM; - - chameleon_parse_bar(*base, c, bar_count); - *base +=3D BAR_DESC_SIZE(bar_count); - } else { - pdev =3D to_pci_dev(dev); - bar_count =3D PCI_STD_NUM_BARS; - c =3D kzalloc_objs(struct chameleon_bar, bar_count); - if (!c) - return -ENOMEM; - for (int i =3D 0; i < bar_count; ++i) { - c[i].addr =3D pci_resource_start(pdev, i); - c[i].size =3D pci_resource_len(pdev, i); - } - } - - *cb =3D c; - - return bar_count; -} - -int chameleon_parse_cells(struct mcb_bus *bus, void __iomem *base) +int chameleon_parse_cells(struct mcb_bus *bus, void __iomem *base, + struct chameleon_parse_ops *cham_bus_ops) { struct chameleon_fpga_header *header; struct chameleon_bar *cb; @@ -207,7 +143,7 @@ int chameleon_parse_cells(struct mcb_bus *bus, void __i= omem *base) memcpy(bus->name, header->filename, CHAMELEON_FILENAME_LEN); bus->name[CHAMELEON_FILENAME_LEN] =3D '\0'; =20 - bar_count =3D chameleon_get_bar(&p, &cb, bus->carrier); + bar_count =3D cham_bus_ops->get_bars(&p, &cb, bus->carrier); if (bar_count < 0) { ret =3D bar_count; goto free_header; @@ -216,7 +152,8 @@ int chameleon_parse_cells(struct mcb_bus *bus, void __i= omem *base) for_each_chameleon_cell(dtype, p) { switch (dtype) { case CHAMELEON_DTYPE_GENERAL: - ret =3D chameleon_parse_gdd(bus, cb, p, bar_count); + ret =3D chameleon_parse_gdd(bus, cb, p, bar_count, + cham_bus_ops); if (ret < 0) goto free_bar; p +=3D sizeof(struct chameleon_gdd); diff --git a/drivers/mcb/mcb-pci.c b/drivers/mcb/mcb-pci.c index 2401c19a8830..6245714646a7 100644 --- a/drivers/mcb/mcb-pci.c +++ b/drivers/mcb/mcb-pci.c @@ -18,6 +18,44 @@ struct priv { void __iomem *base; }; =20 +static int pci_get_bars(void __iomem **base, struct chameleon_bar **cb, + struct device *dev) +{ + struct pci_dev *pdev; + struct chameleon_bar *c; + int bar_count; + + pdev =3D to_pci_dev(dev); + bar_count =3D PCI_STD_NUM_BARS; + c =3D kzalloc_objs(struct chameleon_bar, bar_count); + if (!c) + return -ENOMEM; + for (int i =3D 0; i < bar_count; ++i) { + c[i].addr =3D pci_resource_start(pdev, i); + c[i].size =3D pci_resource_len(pdev, i); + } + + *cb =3D c; + + return bar_count; +} + +static bool is_pci_bar_iomapped(struct device *dev, struct chameleon_bar *= cb, + int bar) +{ + struct pci_dev *pdev; + + pdev =3D to_pci_dev(dev); + if (pci_resource_flags(pdev, bar) & IORESOURCE_IO) + return true; + return false; +} + +static struct chameleon_parse_ops cham_pci_ops =3D { + .is_bar_iomapped =3D is_pci_bar_iomapped, + .get_bars =3D pci_get_bars, +}; + static int mcb_pci_get_irq(struct mcb_device *mdev) { struct mcb_bus *mbus =3D mdev->bus; @@ -86,7 +124,7 @@ static int mcb_pci_probe(struct pci_dev *pdev, const str= uct pci_device_id *id) =20 priv->bus->get_irq =3D mcb_pci_get_irq; =20 - ret =3D chameleon_parse_cells(priv->bus, priv->base); + ret =3D chameleon_parse_cells(priv->bus, priv->base, &cham_pci_ops); if (ret < 0) goto out_mcb_bus; =20 --=20 2.34.1