From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from ZR1P278CU001.outbound.protection.outlook.com (mail-switzerlandnorthazon11022107.outbound.protection.outlook.com [40.107.168.107]) (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 1E4473F0746 for ; Thu, 26 Feb 2026 15:14:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.168.107 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772118880; cv=fail; b=nKrC5iyIzp45An1DjpB2Q+fD0uMwDntlL0wfPAnCOHp0jyxRRqr5007Ut+qhPrwBog4VcLWFIpPG5siy1tigpLV6k0ywajlB51bYlpcYDfwXpb53cpzNnenvzqHCbCZtFxnY8ev8aN2MN5CUpreuq8IGPAIgw17l9kcAfIeRgcE= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772118880; c=relaxed/simple; bh=MT2OGRG90PwJlWvXaHCNbdQWSCkxIRWVC3K2/l3rnrM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=sggZmvEd9fR6aAvhIg0WaDK6K2U1hdABDo0PtadWUdTfuJQgoKncbN0MBd+MgkxNp/YyoOkQXxRqKObvsqQ7lev97NCwn4tjGudZF2KwSS0gqpoH2PBYoIE7BQ5R9ObUHisJg/l3f2FaNBqjxG2YdW1iGeur7dHbPcwjV6sP4Nc= 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=dvOMheIX; arc=fail smtp.client-ip=40.107.168.107 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="dvOMheIX" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=K4JFu4hE/STcE5UXK9bvB2H+1B646qDNG8KvbAAgqp9qdUeEDaUaVg1pq48KGl6/HeAjeE8PS6u9zjblQTjNsngTxBfx0kIGDzDixoUJl8GxMO5tyUnC+YZTNFfFD629yv1l4tbmiJzzFIp28YX8nMf8/RFzfV6q8XvYvkv9NwbzVjd9t85r6Wt6Vo+YiBTlhnwa4XbNTeblw+H4mH3VZ7de3RtbGRPLTj8oxxtb9GGB0B+DCllkjjC5WZI3NG8p4eDdNMCQl9zX5yFV1NOF5OFdp6NdH2s0nbRGumElfj5MANfNuAuPYUeGrK01LwJDQjZTDV67SJDaMfnpqpnQzg== 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=mKQcSfaOqpMzfriev39CpHcy8B4HS0uxQyxEBG67c0I=; b=Ld7ELl91w/Xtnt8DhWKaTsAY8sHuoDxCjHOoymYsjMEBK2j1ilcG1a07IN3bfkNyZEHbhNQeX+jxEFArWmaaLkR33J1l540FT9kgUF/wglivfBdg35EqD4ABp5ndvRcWOFZqzMznDeA/BzMtBfFrDdmHlErPZER+3SBnPpPvhP99z7szDzROqnfUuufEpVPSbTSYQVsyjRZVxEfP0M45dY5pAo/W/oPPnfak4d8kVzNIcWY44rbbIvpSYBVebCRXS9MHgnb9QKnBrf7s7frnOAJoeE5dwW+3YyWf2iOQApQhcmHDUEZXhh1hoGJlJdJdIhy5+BiAPsJEczBjseyMcg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.93.85.54) 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=mKQcSfaOqpMzfriev39CpHcy8B4HS0uxQyxEBG67c0I=; b=dvOMheIX+ynUf9dRTkXScrQhdyUofrkeBu6CVMbC6rRboNEVthOZcN07g7KWgMI/RdbUjz4QMVTjrm9wbgNzDkf9uPcwQeCfQNyf73fnuw7ZRNJxufQrmrImfAXZJWfAiDCmo1pfE2BvhjpwaC+qxN21LMmFbwOuV57Rar/mFBA= Received: from AS4P191CA0011.EURP191.PROD.OUTLOOK.COM (2603:10a6:20b:5d5::9) by GVAP278MB0117.CHEP278.PROD.OUTLOOK.COM (2603:10a6:710:23::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9654.14; Thu, 26 Feb 2026 15:14:34 +0000 Received: from AMS0EPF000001AD.eurprd05.prod.outlook.com (2603:10a6:20b:5d5:cafe::25) by AS4P191CA0011.outlook.office365.com (2603:10a6:20b:5d5::9) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9632.24 via Frontend Transport; Thu, 26 Feb 2026 15:14:31 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.93.85.54) 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.85.54 as permitted sender) receiver=protection.outlook.com; client-ip=40.93.85.54; helo=ZR1P278CU001.outbound.protection.outlook.com; pr=C Received: from hz-deliver02.de.seppmail.cloud (2a01:4f8:272:5fe6::218) by AMS0EPF000001AD.mail.protection.outlook.com (2603:10a6:20f:fff4:0:9:0:9) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9632.12 via Frontend Transport; Thu, 26 Feb 2026 15:14:34 +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 4fMFP61F12zyRm; Thu, 26 Feb 2026 16:14:34 +0100 (CET) Received: from hz-glue06.de.seppmail.cloud (unknown [172.18.0.8]) by hz-glue06.de.seppmail.cloud (Postfix) with ESMTP id 4fMFP613ycz1wP9; Thu, 26 Feb 2026 16:14:34 +0100 (CET) X-SEPP-Suspect: ef37547d87b54938b222c080a4be5362 Received: from hz-scan02.de.seppmail.cloud (unknown [10.11.0.16]) (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 4fMFP60k9Nz1vtx; Thu, 26 Feb 2026 16:14:34 +0100 (CET) Received: from hz-scan02 (localhost [127.0.0.1]) by hz-scan02.de.seppmail.cloud (Postfix) with SMTP id 4fMFP609Mhz6FSM; Thu, 26 Feb 2026 16:14:34 +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-scan02.de.seppmail.cloud (Postfix) with ESMTPS; Thu, 26 Feb 2026 16:14:32 +0100 (CET) Received: from ZR1P278CU001.outbound.protection.outlook.com (mail-switzerlandnorthazlp17012054.outbound.protection.outlook.com [40.93.85.54]) (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 4fMFP35wC8z2w8c; Thu, 26 Feb 2026 16:14:31 +0100 (CET) Received: from ZR0P278MB1218.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:80::5) by ZRAP278MB0963.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:49::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9654.14; Thu, 26 Feb 2026 15:14:29 +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.013; Thu, 26 Feb 2026 15:14:29 +0000 From: Filip Jensen To: morbidrsa@gmail.com Cc: linux-kernel@vger.kernel.org, Filip Jensen , Jose Javier Rodriguez Barbarin Subject: [PATCH 3/3] mcb: refactor the bus operations out of the common code Date: Thu, 26 Feb 2026 16:13:39 +0100 Message-Id: <20260226151339.48800-4-dev-Felipe.Jensen@duagon.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260226151339.48800-1-dev-Felipe.Jensen@duagon.com> References: <20260226151339.48800-1-dev-Felipe.Jensen@duagon.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: MA3P292CA0019.ESPP292.PROD.OUTLOOK.COM (2603:10a6:250:47::9) 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_|ZRAP278MB0963:EE_|AMS0EPF000001AD:EE_|GVAP278MB0117:EE_ X-MS-Office365-Filtering-Correlation-Id: 35cdc0bc-784b-4825-5612-08de7549bfd4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0;ARA:13230040|366016|376014|52116014|1800799024|38350700014; X-Microsoft-Antispam-Message-Info-Original: WFDSDkuRevyV2Kx7+6B9a7CZ92IaT6h7PGwE2/JKU12jtiUkPIxeQm86wqFa4/1vUZIH5K7a8DEmN7zHwTLRspSzZP/9ZbPHgy+mgejNdqD4BeXzriaoVJWjaMd1l2wggk3Vscl5trL3sITZA/ANREszm7BdkXwv+8Ih5sGNXkh3/qwd/q/0Yi4N9TWA+36MQwVLxiEwkBrEvZMHhOhWZUQis49ZMl96GWQ4YGPxxKYF86jJfUE+lvt+YLm95QnQEGdQDaDX+Mr5JOPuQLwMby7Xb0xMij3J0M7Lh+mXlpxdxzLGqDyKJl32PoKIya0Zj0SdeR/elDKiFr6IcFUK+t9uyOFKkTJ7/h58Evw9mXS7JYS/TP285Zd9YsAGtnis/Z0nYklVBFqvBsPKbjxvQgXCetmYf0OOpJpGluT7l8QrzukOYnG4hxu63cOiP9ZQbWPNBE/lmpo+ZIsQd1eHuQIfi8LSHknkQWWz7ez4FKKMbslflwTPJEe5yhH0Oq2I+v/AHsznEd9IR3kQT/R4t+sJ0/EvUbAeLbJDaFyyPYeyzJzBJI1WJy5XDoWeoh6Iw02bip676K7D4BBknAjomMuh6cB3BPbwHkVcLuVryBo5SUKd6zzlOVepgyQAkwMf7suuBgYWsvTm74sgmTnkRb8xj98nTh1MAyUpkFMBeekoBXGEiOTs6Iu87zC3nkOrbWY7iGNMko2NYYop4OnSJdHB6cNKoH4g2QAVI8CauDk0+m7MT9SAYIIFyZOHQOk/1WTt5G6dq97/xSiuS6UAu+hO2D5d/uoQ8TS7i08KDgc= 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)(366016)(376014)(52116014)(1800799024)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZRAP278MB0963 X-SEPP-CCCVersion: 2025-12-11T08:12:51+01:00 9ed91da2 X-EOPAttributedMessage: 0 X-MS-Exchange-SkipListedInternetSender: ip=[40.93.85.54];domain=ZR1P278CU001.outbound.protection.outlook.com X-MS-Exchange-ExternalOriginalInternetSender: ip=[40.93.85.54];domain=ZR1P278CU001.outbound.protection.outlook.com X-MS-Exchange-Transport-CrossTenantHeadersStripped: AMS0EPF000001AD.eurprd05.prod.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: db1aa416-d91c-4b73-6950-08de7549bca7 X-SM-ruleversion: 2.1.0 X-Microsoft-Antispam: BCL:0;ARA:13230040|14060799003|36860700013|10070799003|82310400026|35042699022|1800799024|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?6SCoRUorr85n1zgTaM7kFSWWUZ8E6Vn3EFmEA9KpY8dxj6s55paxR9sq/Hlb?= =?us-ascii?Q?sfHDOyzr1MbWu931y4trkacMGk0pIw9WGAyn3oMreggCvA9wioKtsUyGVJPJ?= =?us-ascii?Q?RkvW7CnZXlHdxMbAgTGkOez81siRjwFKzZ5cIbv3AAjJcGYYCWWn5qHWX/0u?= =?us-ascii?Q?gaOoPXoZKyWA+CmG9KTYUGVxzAl5sI3cU+gSlokJnwmHJ6DNo7iWFc3sAeBM?= =?us-ascii?Q?5G3fDqoES8vngjBBDVsGo5qXycoC0Udy2cnhlpE/q6uMaOWFen4nbU1FqNM4?= =?us-ascii?Q?6jqdBtgd+Y0VtM5RRRuBLU47dyX3AYRWLvHo3otiOWRsTBIirBI8UJwSBulK?= =?us-ascii?Q?daEhz8H0eQBVD30+W7l/aDu//B1QBr/aScdZwaB93LO58guf5l8QcfyW1F+N?= =?us-ascii?Q?fDcszcF+1062YB3gEYoT7xBj6z45V6mmLjoNlUjPYFAJdJvVaeUuiLkfpB5p?= =?us-ascii?Q?4EJ9sh/Zj34Uo9XmkSecBJjOGVvkG+hDX/vm8jYKw8NiEfTX6Hg1LDV62BSn?= =?us-ascii?Q?Idk7PjpxDsYIqRwMgoSg9lE9HRwt8TOGYoSEScyeKYeeFdJPzBZ20KtcyRgh?= =?us-ascii?Q?xfqEi58NFgk9r+ucDDsY9Ls6k5DJoeEEVn7Dya+r8olr/+K4/mQlpSmlb6zx?= =?us-ascii?Q?V5J7MDnnWj2uOezl1sKMXyjOhY+quIJCZk1xTLhyIOeCQ9G7Ad3qshDniKii?= =?us-ascii?Q?FRFNCnae8d7W+08Ooo8gdOop3TuldoGzrCS9MEnu4pA3Ww7kj7aYuh+ygVJa?= =?us-ascii?Q?2YgI05YS8meib+45EjKYQyvOldytAz1AoyP1zJLa+UAlIQMiKTNu8skqrHUH?= =?us-ascii?Q?qz0V1hiUJQXp3bFQ6euAQPtcXoMd/cJU9muT3TdygAuRhXEJFVIIllsjru2G?= =?us-ascii?Q?MCK7oYkYVYvlv0qTflTS39gEq8tZpobLKgRQYt85F0gO1RfFaSQhlIwT7dRx?= =?us-ascii?Q?7VE+sFCeLYpPrHtKZD2YsmZ5PhBbR/als5g2YIqMDWjqo18YfnJGa8SmIfsF?= =?us-ascii?Q?LBHNwBNKPHNLlRVOfvXNaJ8I4pX6qqQ/DbI5cjL8BmF4vnPpdVB+o1MGWfxG?= =?us-ascii?Q?Il82/SzFTA/vEoDcgkySOZS5IeRdWAAomEtE1is5QJlq0zj1hki4suCIildP?= =?us-ascii?Q?nSoNpRUXMaeZ?= X-Forefront-Antispam-Report: CIP:2a01:4f8:272:5fe6::218;CTRY:CH;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:ZR1P278CU001.outbound.protection.outlook.com;PTR:mail-switzerlandnorthazlp17012054.outbound.protection.outlook.com;CAT:NONE;SFS:(13230040)(14060799003)(36860700013)(10070799003)(82310400026)(35042699022)(1800799024)(376014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Aj9pLkd0CsxEdO9V2C3rjxs3cchxujTe7MD4HcwpomFvcqHH68W2avtfnHD5DYca9RNpoeNklGQPEj8J7GeJdXUzPM0XKv/1hmmYK8tpHunkxnl+D8AEWBi9UTfjH0CJTmAP8kwy/+aTGaEl6+e8GVqIbIpS9AeYozrsUvxMCdDIxMf48Wzu6PZPRKVh3OsQ+fFMdX5dByqGXNOfNlAcY73t9jIjuxGx5DkZvXmp6/4xlvXb+jC0QaERusHyXE3WrO9GmFTWzxtaNXeylW6V7KQL5EmRgSBnE5VrxuuPMYyhUarSw/l4wa2hx9rxe4GCH4TQOOAOtFL/txv10m+vq4bhC4SogEpmLrzAZicvQqWTl+uLXEeawp/tU5zVy+GGNtij7e062NCIIaD2vDPrw5hzDyRXlAODcBUcNrldHpBtd/ljPu4Jcp1J/8HU1/cN X-OriginatorOrg: duagon.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Feb 2026 15:14:34.3760 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 35cdc0bc-784b-4825-5612-08de7549bfd4 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: AMS0EPF000001AD.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVAP278MB0117 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 --- drivers/mcb/mcb-internal.h | 9 +++- drivers/mcb/mcb-lpc.c | 56 ++++++++++++++++++++++++- drivers/mcb/mcb-parse.c | 86 ++++---------------------------------- drivers/mcb/mcb-pci.c | 40 +++++++++++++++++- 4 files changed, 109 insertions(+), 82 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(__le32)) -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); +}; +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; }; +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 = *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 = readl(*base); + + bar_count = BAR_CNT(reg); + if (bar_count <= 0 || bar_count > CHAMELEON_BAR_MAX) + return -ENODEV; + + c = kzalloc_objs(struct chameleon_bar, bar_count); + if (!c) + return -ENOMEM; + + /* skip reg1 */ + p += sizeof(__le32); + + for (i = 0; i < bar_count; i++) { + c[i].addr = readl(p); + c[i].size = readl(p + 4); + + p += sizeof(struct chameleon_bar); + } + *base += BAR_DESC_SIZE(bar_count); + *cb = 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 = { + .is_bar_iomapped = mcb_is_lpc_bar_iomapped, + .get_bars = 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); - ret = chameleon_parse_cells(priv->bus, priv->base); + ret = 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 251be2428873..f5e86b6e2e4f 100644 --- a/drivers/mcb/mcb-parse.c +++ b/drivers/mcb/mcb-parse.c @@ -6,7 +6,6 @@ #include #include -#include #include "mcb-internal.h" #define for_each_chameleon_cell(dtype, p) \ @@ -31,7 +30,7 @@ static int chameleon_parse_bdd(struct mcb_bus *bus, static int chameleon_parse_gdd(struct mcb_bus *bus, struct chameleon_bar *cb, void __iomem *base, int bar_count, - bool mcb_is_pci_device) + struct chameleon_parse_ops *cham_ops) { struct chameleon_gdd __iomem *gdd = (struct chameleon_gdd __iomem *) base; @@ -76,12 +75,8 @@ static int chameleon_parse_gdd(struct mcb_bus *bus, struct chameleon_bar *cb, ret = 0; goto err; } - if (mcb_is_pci_device) { - if (pci_resource_flags(to_pci_dev(bus->carrier), mdev->bar) & - IORESOURCE_IO) - goto io_unsupported; - } else if (dev_mapbase & 0x01) { -io_unsupported: + + 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 = 0; @@ -111,73 +106,8 @@ static int chameleon_parse_gdd(struct mcb_bus *bus, struct chameleon_bar *cb, return ret; } -static void chameleon_parse_bar(void __iomem *base, - struct chameleon_bar *cb, int bar_count) -{ - char __iomem *p = base; - int i; - - /* skip reg1 */ - p += sizeof(__le32); - - for (i = 0; i < bar_count; i++) { - cb[i].addr = readl(p); - cb[i].size = readl(p + 4); - - p += sizeof(struct chameleon_bar); - } -} - -static int chameleon_get_bar(void __iomem **base, struct chameleon_bar **cb, - struct device *dev, bool *mcb_is_pci_device) -{ - 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 = get_next_dtype(*base); - if (dtype == CHAMELEON_DTYPE_BAR) { - reg = readl(*base); - - bar_count = BAR_CNT(reg); - if (bar_count <= 0 || bar_count > CHAMELEON_BAR_MAX) - return -ENODEV; - - c = kzalloc_objs(struct chameleon_bar, bar_count); - if (!c) - return -ENOMEM; - - chameleon_parse_bar(*base, c, bar_count); - *base += BAR_DESC_SIZE(bar_count); - *mcb_is_pci_device = false; - } else { - pdev = to_pci_dev(dev); - bar_count = PCI_STD_NUM_BARS; - c = kzalloc_objs(struct chameleon_bar, bar_count); - if (!c) - return -ENOMEM; - for (int i = 0; i < bar_count; ++i) { - c[i].addr = pci_resource_start(pdev, i); - c[i].size = pci_resource_len(pdev, i); - } - *mcb_is_pci_device = true; - } - - *cb = 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; @@ -188,7 +118,6 @@ int chameleon_parse_cells(struct mcb_bus *bus, void __iomem *base) int ret; u32 hsize; u32 table_size; - bool mcb_is_pci_device; hsize = sizeof(struct chameleon_fpga_header); @@ -214,8 +143,7 @@ int chameleon_parse_cells(struct mcb_bus *bus, void __iomem *base) memcpy(bus->name, header->filename, CHAMELEON_FILENAME_LEN); bus->name[CHAMELEON_FILENAME_LEN] = '\0'; - bar_count = - chameleon_get_bar(&p, &cb, bus->carrier, &mcb_is_pci_device); + bar_count = cham_bus_ops->get_bars(&p, &cb, bus->carrier); if (bar_count < 0) { ret = bar_count; goto free_header; @@ -225,7 +153,7 @@ int chameleon_parse_cells(struct mcb_bus *bus, void __iomem *base) switch (dtype) { case CHAMELEON_DTYPE_GENERAL: ret = chameleon_parse_gdd(bus, cb, p, bar_count, - mcb_is_pci_device); + cham_bus_ops); if (ret < 0) goto free_bar; p += 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; }; +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 = to_pci_dev(dev); + bar_count = PCI_STD_NUM_BARS; + c = kzalloc_objs(struct chameleon_bar, bar_count); + if (!c) + return -ENOMEM; + for (int i = 0; i < bar_count; ++i) { + c[i].addr = pci_resource_start(pdev, i); + c[i].size = pci_resource_len(pdev, i); + } + + *cb = c; + + return bar_count; +} + +static bool is_pci_bar_iomapped(struct device *dev, struct chameleon_bar *cb, + int bar) +{ + struct pci_dev *pdev; + + pdev = to_pci_dev(dev); + if (pci_resource_flags(pdev, bar) & IORESOURCE_IO) + return true; + return false; +} + +static struct chameleon_parse_ops cham_pci_ops = { + .is_bar_iomapped = is_pci_bar_iomapped, + .get_bars = pci_get_bars, +}; + static int mcb_pci_get_irq(struct mcb_device *mdev) { struct mcb_bus *mbus = mdev->bus; @@ -86,7 +124,7 @@ static int mcb_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) priv->bus->get_irq = mcb_pci_get_irq; - ret = chameleon_parse_cells(priv->bus, priv->base); + ret = chameleon_parse_cells(priv->bus, priv->base, &cham_pci_ops); if (ret < 0) goto out_mcb_bus; -- 2.34.1