From patchwork Fri Dec 9 19:38:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lizhi Hou X-Patchwork-Id: 31915 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp957152wrr; Fri, 9 Dec 2022 11:41:04 -0800 (PST) X-Google-Smtp-Source: AA0mqf6Bne/kMIAX1axqIV3J5tzSgQpEPO/XEnGRE0eitqF8Wg83TTM4iSdC27GISaZiuswYDPqE X-Received: by 2002:a17:907:1627:b0:7c1:413d:5b0 with SMTP id hb39-20020a170907162700b007c1413d05b0mr4283472ejc.47.1670614864533; Fri, 09 Dec 2022 11:41:04 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1670614864; cv=pass; d=google.com; s=arc-20160816; b=B3DXdJz91NmUXoXxMBFmqs+h+xaui8EDCANV0soi3o7W9K7SG5P82tHL2ppXtESfd3 EhSZoDYGO4vXmBF6BlZVQmSnTyGYeuoO/iSdx7XnVELo3j3wRiKrMyLdFB//ly/OVPvI jgSaqCS75gyavCqtjmsYtpJNKrEeQAsedKb89Fvn+v5SFb2wy6dwmaD/XIHdcUF9D88e t/yeYs/bVF0mqVCvfwLx/IWSK61UX8H2Eg38ndWYmtZ49GM/tc4z4TCcKvkAq2kOYMFf aTQzkwD3KKT338FJT0Rmru9uweI5FegsbCQEg/QJ63dCo8bPDXu2qmOSZRgigrIgPyi5 8Ydg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=2FHs1RkMPqhdQDUgL2TxIAKlxvNwycGWFN1h3CQRhwM=; b=DhXtww3F2n8nb5oW3Z1o5RufTyaHwK4Y/QKSRvLWxuuCo8VwzUePj/rLxM+e4KNVTG r14HVtkuoVKDZLrYNCX0wLZ+ZZr/viL9UVTtZIC0QiRA/NIlOMgs5ZtHkhlKRuLbX9z4 RtrehUZ8I+0bmHGTPftzMKMnrwOLZH3nATYqW2CWch0jnFVUwsp2gnaXDjtHS0Ggp1Yb L08xD+dfOQOoBV3rLFogRX/btUCjjcOT7VFwqLm7YOLnYpNmhqpbQbxbgQLLYABjcFZT 17ahlNaKQIAxtJjZQ6WWtPmX9C6ipnVDFpnvg+sHyxlC46Ibiu966PXQlnpFEQCBDt9W Qt8g== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=MQLPUnbM; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g11-20020a1709065d0b00b00780e022dfb8si548395ejt.494.2022.12.09.11.40.41; Fri, 09 Dec 2022 11:41:04 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=MQLPUnbM; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229821AbiLITiz (ORCPT + 99 others); Fri, 9 Dec 2022 14:38:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34052 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229554AbiLITis (ORCPT ); Fri, 9 Dec 2022 14:38:48 -0500 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2066.outbound.protection.outlook.com [40.107.237.66]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B50B7D0AE; Fri, 9 Dec 2022 11:38:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=abAP4Z8Oixdphd5TXN2e4JfLylOo9bZlnzquVKPjq3hWnFT+qP8Ima5UXuNiZK40PIgsqMdq0hYF8/wnYLEtqB7X5kB26x74vrH9VhhfnOJDbtOwG47ELIDneXMeI+GttLPrWJAcdfM4FaW0cNqAkxWrJjOFr4iYVD0o9Y39kYasEAZkGU0FoVUaZrY1vmoKufKJlSQ+gVga869pQeFHePiXJkmaZJP26HL/QFhQfmQ5l6eRsM5/fBnjpj/VkKT+XtayEc15bsSv5sD7qsYgibLsrUjAY+a0cSTEkLzhDPzGNx4DND61c/0QkTKrlWKapnPy5jr1M/lKpFGOH9vEdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=2FHs1RkMPqhdQDUgL2TxIAKlxvNwycGWFN1h3CQRhwM=; b=QzAhGSFi6tTwA0A1I/lrU2398Dkv0/8ztsXoULSdRysaTQz7Yd7sVjTKC5vRGjvw97gKNj6bTU0XOR/x3QHDKNOBZ9R94ehMFN4jOSEyeUw2XgY1yzF6cD6zmiORtnGL3Vq7ijsF1iIqrEfzqKqp/5iOTS5v20f+UbNM31pnUgVwB4BbVih2F9iC0FffXvnXfTtb6zeqWQrd3qorPs5wbuOUK/sNKX6lVJ5MZJb2fNuNuviDJJD2wSAPXl8ZUvZMb8Lj1fkdiUAq2qMFK99anZ/Zivw6/MDop3w5Im8rj0CMDmat92hL1cWU+3/FbvME0tyP3KS6ou6sZPomNKmjyA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2FHs1RkMPqhdQDUgL2TxIAKlxvNwycGWFN1h3CQRhwM=; b=MQLPUnbMYDaYmj67kCWlz82pa9hgbCxiMGb77gVq29Tt8EtB+RMEcTQwVdgu0fo3aLw0glfqUcz1y5SLAySASXBeLZ8IgjrhOZN7HTzp9nHvsBj160uTU6YVpPs94/n8LhOgdv8iyTVxZnTe4wAQZiqtUPIJ1msL3ZIGSikpN78= Received: from BN6PR17CA0038.namprd17.prod.outlook.com (2603:10b6:405:75::27) by DM6PR12MB4960.namprd12.prod.outlook.com (2603:10b6:5:1bc::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.14; Fri, 9 Dec 2022 19:38:44 +0000 Received: from BN8NAM11FT009.eop-nam11.prod.protection.outlook.com (2603:10b6:405:75:cafe::11) by BN6PR17CA0038.outlook.office365.com (2603:10b6:405:75::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.10 via Frontend Transport; Fri, 9 Dec 2022 19:38:44 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB03.amd.com; pr=C Received: from SATLEXMB03.amd.com (165.204.84.17) by BN8NAM11FT009.mail.protection.outlook.com (10.13.176.65) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5901.17 via Frontend Transport; Fri, 9 Dec 2022 19:38:44 +0000 Received: from SATLEXMB05.amd.com (10.181.40.146) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Fri, 9 Dec 2022 13:38:43 -0600 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB05.amd.com (10.181.40.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Fri, 9 Dec 2022 13:38:43 -0600 Received: from xsjlizhih40.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2375.34 via Frontend Transport; Fri, 9 Dec 2022 13:38:42 -0600 From: Lizhi Hou To: , , , , , CC: Lizhi Hou , , , , , , , Subject: [PATCH V5 1/3] of: dynamic: Add interfaces for creating device node dynamically Date: Fri, 9 Dec 2022 11:38:12 -0800 Message-ID: <1670614694-68049-2-git-send-email-lizhi.hou@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1670614694-68049-1-git-send-email-lizhi.hou@amd.com> References: <1670614694-68049-1-git-send-email-lizhi.hou@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT009:EE_|DM6PR12MB4960:EE_ X-MS-Office365-Filtering-Correlation-Id: 65c94931-1926-490f-aec1-08dada1cfbb5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SMqO1pFYn0uNImBxvFvwvd2xoqTYxLjegbFoxRiTl7d8EfCr0S40lpw2l0fotYguDxzCvr5Cruomz1CjjHJGQV9vzUisqiP4T+ufQVmq/JxoRpzy/3kmB6MXzeUEGUEK2HL9cgfNikd+qeMab/5oHZBPCp+fEn8RopCHFOyHYFmfI0Y6IGJTcnIr9Hr86h4oLHvMsq7DX04GP62UVj2KfQA7BlGms3H7gKGKF86Lk9f58y1UzBxhumBsVZQhGfMeQcvU6OWnliI20uPFqrRJj7VAy4iFy5kIKPFOmVATovHYyASHkNb03bqCqB/CQSS/+2+5reAWcKNfbMWgyHWZKvJPln6fVzsme0xslNFpYGo9y9HGe2IZ3cIzvnRmIKMabdCN75tuVwaqLNuNA6YyvDj3trZT3SvJm9nF444E6vfde0D0uo5ul4YQaemyhxfp7q9PBig6H7DocLaYB0YrXplEVk5gLx5/aBjyHBf7jq+ml3fgvp7GWss8jeMlfW7kqRotkUsD2eEMo7PkFO+m65GOnqPTQFaCDGfEKE+fkuyvsBqNJJbMJjMu5A4fUBuFswXY9xBv50H1QtiISberR7VBhrqTq7dgLmrPAnPduSAhhwltee7SizF8C8cp4boZ8NO5iOUei3ZD8c4Lnaf21HeEN7XyEIWQf02V1RX+KJB8tBqnhuLlDrpeHpuqIxignRN3ijOhyuOKCT/BcDNY5i7wFA5xoCHBABA75ZG7OyQ= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB03.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230022)(4636009)(136003)(396003)(376002)(346002)(39860400002)(451199015)(46966006)(36840700001)(40470700004)(186003)(336012)(2616005)(316002)(36860700001)(83380400001)(26005)(6666004)(4326008)(40460700003)(44832011)(2906002)(8676002)(81166007)(478600001)(110136005)(41300700001)(82740400003)(82310400005)(36756003)(47076005)(70206006)(356005)(70586007)(54906003)(5660300002)(426003)(8936002)(40480700001)(86362001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Dec 2022 19:38:44.2805 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 65c94931-1926-490f-aec1-08dada1cfbb5 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT009.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4960 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751766652551259900?= X-GMAIL-MSGID: =?utf-8?q?1751766652551259900?= of_create_node() creates device node dynamically. The parent device node and full name are required for creating the node. It optionally creates an OF changeset and attaches the newly created node to the changeset. The device node pointer and the changeset pointer can be used to add properties to the device node and apply the node to the base tree. of_destroy_node() frees the device node created by of_create_node(). If an OF changeset was also created for this node, it will destroy the changeset before freeing the device node. Expand of_changeset APIs to handle specific types of properties. of_changeset_add_prop_string() of_changeset_add_prop_string_array() of_changeset_add_prop_u32_array() Signed-off-by: Lizhi Hou Signed-off-by: Sonal Santan Signed-off-by: Max Zhen Reviewed-by: Brian Xu --- drivers/of/dynamic.c | 197 +++++++++++++++++++++++++++++++++++++++++++ include/linux/of.h | 24 ++++++ 2 files changed, 221 insertions(+) diff --git a/drivers/of/dynamic.c b/drivers/of/dynamic.c index cd3821a6444f..067d996a9f79 100644 --- a/drivers/of/dynamic.c +++ b/drivers/of/dynamic.c @@ -461,6 +461,71 @@ struct device_node *__of_node_dup(const struct device_node *np, return NULL; } +/** + * of_create_node - Dynamically create a device node + * + * @parent: Pointer to parent device node + * @full_name: Node full name + * @cset: Pointer to returning changeset + * + * Return: Pointer to the created device node or NULL in case of an error. + */ +struct device_node *of_create_node(struct device_node *parent, + const char *full_name, + struct of_changeset **cset) +{ + struct of_changeset *ocs; + struct device_node *np; + int ret; + + np = __of_node_dup(NULL, full_name); + if (!np) + return NULL; + np->parent = parent; + + if (!cset) + return np; + + ocs = kmalloc(sizeof(*cset), GFP_KERNEL); + if (!ocs) { + of_node_put(np); + return NULL; + } + + of_changeset_init(ocs); + ret = of_changeset_attach_node(ocs, np); + if (ret) { + of_changeset_destroy(ocs); + of_node_put(np); + kfree(ocs); + return NULL; + } + + np->data = ocs; + *cset = ocs; + + return np; +} +EXPORT_SYMBOL(of_create_node); + +/** + * of_destroy_node - Destroy a dynamically created device node + * + * @np: Pointer to dynamically created device node + * + */ +void of_destroy_node(struct device_node *np) +{ + struct of_changeset *ocs; + + if (np->data) { + ocs = (struct of_changeset *)np->data; + of_changeset_destroy(ocs); + } + of_node_put(np); +} +EXPORT_SYMBOL(of_destroy_node); + static void __of_changeset_entry_destroy(struct of_changeset_entry *ce) { if (ce->action == OF_RECONFIG_ATTACH_NODE && @@ -934,3 +999,135 @@ int of_changeset_action(struct of_changeset *ocs, unsigned long action, return 0; } EXPORT_SYMBOL_GPL(of_changeset_action); + +static int of_changeset_add_prop_helper(struct of_changeset *ocs, + struct device_node *np, + const struct property *pp) +{ + struct property *new_pp; + int ret; + + new_pp = __of_prop_dup(pp, GFP_KERNEL); + if (!new_pp) + return -ENOMEM; + + ret = of_changeset_add_property(ocs, np, new_pp); + if (ret) { + kfree(new_pp->name); + kfree(new_pp->value); + kfree(new_pp); + } + + return ret; +} + +/** + * of_changeset_add_prop_string - Add a string property to a changeset + * + * @ocs: changeset pointer + * @np: device node pointer + * @prop_name: name of the property to be added + * @str: pointer to null terminated string + * + * Create a string property and add it to a changeset. + * + * Return: 0 on success, a negative error value in case of an error. + */ +int of_changeset_add_prop_string(struct of_changeset *ocs, + struct device_node *np, + const char *prop_name, const char *str) +{ + struct property prop; + + prop.name = (char *)prop_name; + prop.length = strlen(str) + 1; + prop.value = (void *)str; + + return of_changeset_add_prop_helper(ocs, np, &prop); +} +EXPORT_SYMBOL_GPL(of_changeset_add_prop_string); + +/** + * of_changeset_add_prop_string_array - Add a string list property to + * a changeset + * + * @ocs: changeset pointer + * @np: device node pointer + * @prop_name: name of the property to be added + * @str_array: pointer to an array of null terminated strings + * @sz: number of string array elements + * + * Create a string list property and add it to a changeset. + * + * Return: 0 on success, a negative error value in case of an error. + */ +int of_changeset_add_prop_string_array(struct of_changeset *ocs, + struct device_node *np, + const char *prop_name, + const char **str_array, size_t sz) +{ + struct property prop; + int i, ret; + char *vp; + + prop.name = (char *)prop_name; + + prop.length = 0; + for (i = 0; i < sz; i++) + prop.length += strlen(str_array[i]) + 1; + + prop.value = kmalloc(prop.length, GFP_KERNEL); + if (!prop.value) + return -ENOMEM; + + vp = prop.value; + for (i = 0; i < sz; i++) { + vp += snprintf(vp, (char *)prop.value + prop.length - vp, "%s", + str_array[i]) + 1; + } + ret = of_changeset_add_prop_helper(ocs, np, &prop); + kfree(prop.value); + + return ret; +} +EXPORT_SYMBOL_GPL(of_changeset_add_prop_string_array); + +/** + * of_changeset_add_prop_u32_array - Add a property of 32 bit integers + * property to a changeset + * + * @ocs: changeset pointer + * @np: device node pointer + * @prop_name: name of the property to be added + * @array: pointer to an array of 32 bit integers + * @sz: number of array elements + * + * Create a property of 32 bit integers and add it to a changeset. + * + * Return: 0 on success, a negative error value in case of an error. + */ +int of_changeset_add_prop_u32_array(struct of_changeset *ocs, + struct device_node *np, + const char *prop_name, + const u32 *array, size_t sz) +{ + struct property prop; + __be32 *val; + int i, ret; + + val = kcalloc(sz, sizeof(__be32), GFP_KERNEL); + if (!val) + return -ENOMEM; + + for (i = 0; i < sz; i++) + val[i] = cpu_to_be32(array[i]); + prop.name = (char *)prop_name; + prop.length = sizeof(u32) * sz; + prop.value = (void *)val; + + ret = of_changeset_add_prop_helper(ocs, np, &prop); + kfree(val); + + return ret; +} +EXPORT_SYMBOL_GPL(of_changeset_add_prop_u32_array); diff --git a/include/linux/of.h b/include/linux/of.h index 766d002bddb9..ba31036f0876 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -1505,6 +1505,30 @@ static inline int of_changeset_update_property(struct of_changeset *ocs, { return of_changeset_action(ocs, OF_RECONFIG_UPDATE_PROPERTY, np, prop); } + +struct device_node *of_create_node(struct device_node *parent, + const char *full_name, + struct of_changeset **cset); +void of_destroy_node(struct device_node *np); +int of_changeset_add_prop_string(struct of_changeset *ocs, + struct device_node *np, + const char *prop_name, const char *str); +int of_changeset_add_prop_string_array(struct of_changeset *ocs, + struct device_node *np, + const char *prop_name, + const char **str_array, size_t sz); +int of_changeset_add_prop_u32_array(struct of_changeset *ocs, + struct device_node *np, + const char *prop_name, + const u32 *array, size_t sz); +static inline int of_changeset_add_prop_u32(struct of_changeset *ocs, + struct device_node *np, + const char *prop_name, + const u32 val) +{ + return of_changeset_add_prop_u32_array(ocs, np, prop_name, &val, 1); +} + #else /* CONFIG_OF_DYNAMIC */ static inline int of_reconfig_notifier_register(struct notifier_block *nb) { From patchwork Fri Dec 9 19:38:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lizhi Hou X-Patchwork-Id: 31916 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp957245wrr; Fri, 9 Dec 2022 11:41:19 -0800 (PST) X-Google-Smtp-Source: AA0mqf74F64AICzvV0Zs4HaS9tlZ4g//vrTryjLk/WWazCZG7gUnZ4fn6n3/dIOs3Mn66AFVte4Y X-Received: by 2002:a17:906:1594:b0:7b2:757a:1411 with SMTP id k20-20020a170906159400b007b2757a1411mr6172656ejd.9.1670614878870; Fri, 09 Dec 2022 11:41:18 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1670614878; cv=pass; d=google.com; s=arc-20160816; b=PwZWZQu3Xs5xOSjXWSItAlTcsYGfGdd0Bn8FsejEveGq9GppyGIgLg80nYOR2iDHW7 0MluzKST+po2XcaP4a5xpGTalQ07KAJpqf47mtS6dlFtJCtesrgWA66bcamTm43T0XM2 AXxpXVA+K3i8aFMvDjUnL8uvYlCsCviIeQWTjbMvEq9LBJnmIv9XTxstAvn6B3vKEJd+ oCPU0UD2/C5ZPFSXnMdrXpY8AkJzuBl1Q6wDaM+Bu7KIApVWQ2PMPI2K3WQWf8UxC4OU UCZY9ZzVfnRujhxUGKUHL0RI/PFPpaRkkPp4kWVV9+JbtxKZWXNItXQXM52B1PRAQwAD o7TA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=3BfFr4ECObbtiGrZk5eKmbJwiOVFcd4yrbH5hadZvo4=; b=ImGs/yXth3yzYyJyxvlVohLVBaodubYl4f3PGZMTi5E6oz35f9DIBuONIGLJ3CGwTh AywfvdRcQ79HZtMKmLPsHvqZRX/CGYvndsTeo+O2cQGn3SBriOqc8lDJhs/75EzzAo29 60hAxy9um3vbyGiiVL9pv7wcpsdukIV6Dh5kbcJYdgR8io12QgynkKg20j4TwA0SXPv0 QmQ9Uh/aTdXK3yGDUf0nr62Kw8Buk6MFmbNWzU4ZdwMrzas0uECVO7bLbkhxxPO8Itux J2LsOWQ/9u3jHZyUzS/LF3Xd24VIXEUCn+s3xxejEabccBgmyeTjZ4b+OdPR1S86qgzI ip6w== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=Rv2eDmYo; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hw19-20020a170907a0d300b0078df1c345e4si402566ejc.518.2022.12.09.11.40.54; Fri, 09 Dec 2022 11:41:18 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=Rv2eDmYo; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229521AbiLITjA (ORCPT + 99 others); Fri, 9 Dec 2022 14:39:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34060 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229828AbiLITiu (ORCPT ); Fri, 9 Dec 2022 14:38:50 -0500 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2062.outbound.protection.outlook.com [40.107.243.62]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2A792A506B; Fri, 9 Dec 2022 11:38:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BNxz44ish7PRBHgux9UgyldugpGH71pG5DnHnEqqN5xUyfp0dxGmqTmdX1bsP6aCnEf1iNGL+B76sFVaYlsIsLeW2RR3Qi3FcGs0zeh5dpD7FCmUAdbSLlpp6/ozAzJ9yQmsvpnP5ZXtOKIbUCXxbc+vkwSabpxyUGzfg7q6jHiCkiJP/D/GA4KuoZCexipw3Dpx8n18ZViBiAwRf26hi7kKkchVMpN0lthyolVYLbj/PMKkIW/YrQRFVNIfQIG/gKmJC9zp1HKq0N9s/D+BDGxxyYsDJmk46ujXJloBVemDazw13N33WD57WdZN1XXMc1tRHy9QvET35WQu9Npd2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=3BfFr4ECObbtiGrZk5eKmbJwiOVFcd4yrbH5hadZvo4=; b=TqdZ/vrgjaMC1q6YN3l2LpB1O5VYlIbpOmYj0obkZTr2bpyptTuwVB8ZtWg+lyJp88y+4mvk7nCTKF18zks99QHj677bsj5F3RmssSYcIv7hApo66dPs9GROzhEsTOwV4+T0PQjiTs+QBiip6L9YyF02LWL7YiDf1RddfUY/DiFnHBtIMWLv00efNtBOH0x6UZ0sywjge4a8+LWDsw0GWM+5TTaEhg+CDEwKykedZVrGbAWZawxLuZdHCprMkeJL87M7jMB8HVVhELdqZCf6egc9msxgo3LwVln5+gCX66m5/I3N0juuL/qPICuXK9ayfErZvF0lRJeYNtSCmCqLlA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3BfFr4ECObbtiGrZk5eKmbJwiOVFcd4yrbH5hadZvo4=; b=Rv2eDmYo8B3a6O8GE5TBmk7v+j2fOvlQnyo2ZUDNKFf1x6nsZDQkehiHUj+hTUANKTsYulD74t8rrv9jXJv90z4o/bGI2OBIKV5CROpP8CQyZBDM9tXG1xrzdWx2pncvgw+N+iBv4xwkrGf0peH1ylnZk3DbhbG+VVprrcXXIQo= Received: from BLAPR03CA0052.namprd03.prod.outlook.com (2603:10b6:208:32d::27) by MN2PR12MB4343.namprd12.prod.outlook.com (2603:10b6:208:26f::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.18; Fri, 9 Dec 2022 19:38:45 +0000 Received: from BL02EPF0000EE3C.namprd05.prod.outlook.com (2603:10b6:208:32d:cafe::43) by BLAPR03CA0052.outlook.office365.com (2603:10b6:208:32d::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.18 via Frontend Transport; Fri, 9 Dec 2022 19:38:45 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BL02EPF0000EE3C.mail.protection.outlook.com (10.167.241.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5880.8 via Frontend Transport; Fri, 9 Dec 2022 19:38:45 +0000 Received: from SATLEXMB05.amd.com (10.181.40.146) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Fri, 9 Dec 2022 13:38:45 -0600 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB05.amd.com (10.181.40.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Fri, 9 Dec 2022 13:38:44 -0600 Received: from xsjlizhih40.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2375.34 via Frontend Transport; Fri, 9 Dec 2022 13:38:43 -0600 From: Lizhi Hou To: , , , , , CC: Lizhi Hou , , , , , , , Subject: [PATCH V5 2/3] PCI: Create device tree node for selected devices Date: Fri, 9 Dec 2022 11:38:13 -0800 Message-ID: <1670614694-68049-3-git-send-email-lizhi.hou@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1670614694-68049-1-git-send-email-lizhi.hou@amd.com> References: <1670614694-68049-1-git-send-email-lizhi.hou@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF0000EE3C:EE_|MN2PR12MB4343:EE_ X-MS-Office365-Filtering-Correlation-Id: eaebe48f-1d93-4838-3b36-08dada1cfc78 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +kjgRdKA4s+tmOYH4ioAcIPVv9wx9Y5YTvYM4a48O0MUuMRw0en9KReaKNdMdgs5rR56qjlrLbmLGkjUaoGwTAkob6gFa/415mo7Cr/akZ4jj2tHB2Rl4zr+FYgO2iTCWq54x8NcmLWe7pu9mD1KBif6HqRAHLsUu8hexbN5lX2gX4QVzILb1URlyjviZ47p2sy6ShzPcaAjk5AKuziP43wASZxyBR09eUprZE9HJd/tjG0M19s/IWoOmFfOkv9UFZzn69aKxlxzUFeoRyMVcUMJpmzr1NDqy3OSDGdpM880r2TN5w0dlKbmzFvbtXaFX2W44vJo5cWNqHQUFHOyt0zVmsbPpRPIM6Vj+UeqRwJHEZW1VAKfOIIv/rkwdll+Pma+sxXqz/zahVVsSmQo4+UcTVkxl8BQDjT8+JiYdAUp8jaQ9A8jxERNnRZRy4mXo61b+qBMlhm5s9UO85DzIMYaWf/AQRy0N/3qJEtzVv+hqesNLk/nLEFOIwscxqlSZXl2TTElWr1Bg3MnjvaSgO4tPiZRHQL15fP3FO0iTo92wQSMnX5BacgZHgqII8jstcILfaSgBTaMKg5wEy8Ro0keAZkhxLf2bAJ8hJYDnKgMQBFy6dK/sHFcB/AUYr9OXm+F+nDPYkKkwz78dArvWKOqpYvRRRO7uJ3aAge+Qfa4IlqUo3+H4ic5ncKndzGmIUrb1nqTyPBOYX49bVJrc2dGfJ/jXOIq1pP72+XFGDU= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230022)(4636009)(136003)(396003)(346002)(376002)(39860400002)(451199015)(40470700004)(36840700001)(46966006)(47076005)(426003)(8676002)(8936002)(70206006)(4326008)(70586007)(82310400005)(36756003)(41300700001)(83380400001)(478600001)(26005)(186003)(356005)(6666004)(81166007)(82740400003)(40480700001)(336012)(2616005)(40460700003)(316002)(86362001)(110136005)(54906003)(36860700001)(44832011)(2906002)(5660300002)(30864003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Dec 2022 19:38:45.5555 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: eaebe48f-1d93-4838-3b36-08dada1cfc78 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF0000EE3C.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4343 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751766667216288160?= X-GMAIL-MSGID: =?utf-8?q?1751766667216288160?= The PCI endpoint device such as Xilinx Alveo PCI card maps the register spaces from multiple hardware peripherals to its PCI BAR. Normally, the PCI core discovers devices and BARs using the PCI enumeration process. There is no infrastructure to discover the hardware peripherals that are present in a PCI device, and which can be accessed through the PCI BARs. For Alveo PCI card, the card firmware provides a flattened device tree to describe the hardware peripherals on its BARs. The Alveo card driver can load this flattened device tree and leverage device tree framework to generate platform devices for the hardware peripherals eventually. Apparently, the device tree framework requires a device tree node for the PCI device. Thus, it can generate the device tree nodes for hardware peripherals underneath. Because PCI is self discoverable bus, there might not be a device tree node created for PCI devices. This patch is to add support to generate device tree node for PCI devices. Added a kernel option. When the option is turned on, the kernel will generate device tree nodes for PCI bridges unconditionally. Initially, the basic properties are added for the dynamically generated device tree nodes. Signed-off-by: Lizhi Hou Signed-off-by: Sonal Santan Signed-off-by: Max Zhen Reviewed-by: Brian Xu --- drivers/pci/Kconfig | 12 ++ drivers/pci/Makefile | 1 + drivers/pci/bus.c | 2 + drivers/pci/msi/irqdomain.c | 6 +- drivers/pci/of.c | 71 ++++++++++++ drivers/pci/of_property.c | 222 ++++++++++++++++++++++++++++++++++++ drivers/pci/pci-driver.c | 3 +- drivers/pci/pci.h | 19 +++ drivers/pci/remove.c | 1 + 9 files changed, 334 insertions(+), 3 deletions(-) create mode 100644 drivers/pci/of_property.c diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig index 55c028af4bd9..1b2347aa1e5b 100644 --- a/drivers/pci/Kconfig +++ b/drivers/pci/Kconfig @@ -198,6 +198,18 @@ config PCI_HYPERV The PCI device frontend driver allows the kernel to import arbitrary PCI devices from a PCI backend to support PCI driver domains. +config PCI_DYNAMIC_OF_NODES + bool "Create Devicetree nodes for PCI devices" + depends on OF + select OF_DYNAMIC + help + This option enables support for generating device tree nodes for some + PCI devices. Thus, the driver of this kind can load and overlay + flattened device tree for its downstream devices. + + Once this option is selected, the device tree nodes will be generated + for all PCI bridges. + choice prompt "PCI Express hierarchy optimization setting" default PCIE_BUS_DEFAULT diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile index 2680e4c92f0a..cc8b4e01e29d 100644 --- a/drivers/pci/Makefile +++ b/drivers/pci/Makefile @@ -32,6 +32,7 @@ obj-$(CONFIG_PCI_P2PDMA) += p2pdma.o obj-$(CONFIG_XEN_PCIDEV_FRONTEND) += xen-pcifront.o obj-$(CONFIG_VGA_ARB) += vgaarb.o obj-$(CONFIG_PCI_DOE) += doe.o +obj-$(CONFIG_PCI_DYNAMIC_OF_NODES) += of_property.o # Endpoint library must be initialized before its users obj-$(CONFIG_PCI_ENDPOINT) += endpoint/ diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c index 3cef835b375f..8507cc32b61d 100644 --- a/drivers/pci/bus.c +++ b/drivers/pci/bus.c @@ -316,6 +316,8 @@ void pci_bus_add_device(struct pci_dev *dev) */ pcibios_bus_add_device(dev); pci_fixup_device(pci_fixup_final, dev); + if (pci_is_bridge(dev)) + of_pci_make_dev_node(dev); pci_create_sysfs_dev_files(dev); pci_proc_attach_device(dev); pci_bridge_d3_update(dev); diff --git a/drivers/pci/msi/irqdomain.c b/drivers/pci/msi/irqdomain.c index e9cf318e6670..eeaf44169bfd 100644 --- a/drivers/pci/msi/irqdomain.c +++ b/drivers/pci/msi/irqdomain.c @@ -230,8 +230,10 @@ u32 pci_msi_domain_get_msi_rid(struct irq_domain *domain, struct pci_dev *pdev) pci_for_each_dma_alias(pdev, get_msi_id_cb, &rid); of_node = irq_domain_get_of_node(domain); - rid = of_node ? of_msi_map_id(&pdev->dev, of_node, rid) : - iort_msi_map_id(&pdev->dev, rid); + if (of_node && !of_node_check_flag(of_node, OF_DYNAMIC)) + rid = of_msi_map_id(&pdev->dev, of_node, rid); + else + rid = iort_msi_map_id(&pdev->dev, rid); return rid; } diff --git a/drivers/pci/of.c b/drivers/pci/of.c index 196834ed44fe..cb34a73ac8a3 100644 --- a/drivers/pci/of.c +++ b/drivers/pci/of.c @@ -469,6 +469,8 @@ static int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args * } else { /* We found a P2P bridge, check if it has a node */ ppnode = pci_device_to_OF_node(ppdev); + if (ppnode && of_node_check_flag(ppnode, OF_DYNAMIC)) + ppnode = NULL; } /* @@ -599,6 +601,75 @@ int devm_of_pci_bridge_init(struct device *dev, struct pci_host_bridge *bridge) return pci_parse_request_of_pci_ranges(dev, bridge); } +#if IS_ENABLED(CONFIG_PCI_DYNAMIC_OF_NODES) + +void of_pci_remove_node(struct pci_dev *pdev) +{ + struct device_node *np; + + np = pci_device_to_OF_node(pdev); + if (!np || !of_node_check_flag(np, OF_DYNAMIC)) + return; + pdev->dev.of_node = NULL; + + of_destroy_node(np); +} + +void of_pci_make_dev_node(struct pci_dev *pdev) +{ + struct device_node *ppnode, *np = NULL; + const char *pci_type = "dev"; + struct of_changeset *cset; + const char *name; + int ret; + + /* + * If there is already a device tree node linked to this device, + * return immediately. + */ + if (pci_device_to_OF_node(pdev)) + return; + + /* Check if there is device tree node for parent device */ + if (!pdev->bus->self) + ppnode = pdev->bus->dev.of_node; + else + ppnode = pdev->bus->self->dev.of_node; + if (!ppnode) + return; + + if (pci_is_bridge(pdev)) + pci_type = "pci"; + + name = kasprintf(GFP_KERNEL, "%s@%x,%x", pci_type, + PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn)); + if (!name) + goto failed; + + np = of_create_node(ppnode, name, &cset); + if (!np) + goto failed; + + ret = of_pci_add_properties(pdev, cset, np); + if (ret) + goto failed; + + ret = of_changeset_apply(cset); + if (ret) + goto failed; + + pdev->dev.of_node = np; + kfree(name); + + return; + +failed: + if (np) + of_destroy_node(np); + kfree(name); +} +#endif + #endif /* CONFIG_PCI */ /** diff --git a/drivers/pci/of_property.c b/drivers/pci/of_property.c new file mode 100644 index 000000000000..05c8ca05a71b --- /dev/null +++ b/drivers/pci/of_property.c @@ -0,0 +1,222 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2022, Advanced Micro Devices, Inc. + */ + +#include +#include +#include +#include +#include +#include "pci.h" + +#define OF_PCI_ADDRESS_CELLS 3 +#define OF_PCI_SIZE_CELLS 2 + +struct of_pci_addr_pair { + u32 phys_addr[OF_PCI_ADDRESS_CELLS]; + u32 size[OF_PCI_SIZE_CELLS]; +}; + +struct of_pci_range { + u32 child_addr[OF_PCI_ADDRESS_CELLS]; + u32 parent_addr[OF_PCI_ADDRESS_CELLS]; + u32 size[OF_PCI_SIZE_CELLS]; +}; + +#define OF_PCI_ADDR_SPACE_CONFIG 0x0 +#define OF_PCI_ADDR_SPACE_IO 0x1 +#define OF_PCI_ADDR_SPACE_MEM32 0x2 +#define OF_PCI_ADDR_SPACE_MEM64 0x3 + +#define OF_PCI_ADDR_FIELD_NONRELOC BIT(31) +#define OF_PCI_ADDR_FIELD_SS GENMASK(25, 24) +#define OF_PCI_ADDR_FIELD_PREFETCH BIT(30) +#define OF_PCI_ADDR_FIELD_BUS GENMASK(23, 16) +#define OF_PCI_ADDR_FIELD_DEV GENMASK(15, 11) +#define OF_PCI_ADDR_FIELD_FUNC GENMASK(10, 8) +#define OF_PCI_ADDR_FIELD_REG GENMASK(7, 0) + +#define OF_PCI_ADDR_HI GENMASK_ULL(63, 32) +#define OF_PCI_ADDR_LO GENMASK_ULL(31, 0) +#define OF_PCI_SIZE_HI GENMASK_ULL(63, 32) +#define OF_PCI_SIZE_LO GENMASK_ULL(31, 0) + +enum of_pci_prop_compatible { + PROP_COMPAT_PCI_VVVV_DDDD, + PROP_COMPAT_PCICLASS_CCSSPP, + PROP_COMPAT_PCICLASS_CCSS, + PROP_COMPAT_NUM, +}; + +static int of_pci_prop_device_type(struct pci_dev *pdev, + struct of_changeset *ocs, + struct device_node *np) +{ + return of_changeset_add_prop_string(ocs, np, "device_type", "pci"); +} + +static int of_pci_prop_address_cells(struct pci_dev *pdev, + struct of_changeset *ocs, + struct device_node *np) +{ + return of_changeset_add_prop_u32(ocs, np, "#address_cells", + OF_PCI_ADDRESS_CELLS); +} + +static int of_pci_prop_size_cells(struct pci_dev *pdev, + struct of_changeset *ocs, + struct device_node *np) +{ + return of_changeset_add_prop_u32(ocs, np, "#size_cells", + OF_PCI_SIZE_CELLS); +} + +static void of_pci_set_address(u32 *prop, u64 addr, u32 flags) +{ + prop[0] = flags; + put_unaligned(addr, &prop[1]); +} + +static int of_pci_get_addr_flags(struct resource *res, u32 *flags) +{ + u32 ss; + + if (res->flags & IORESOURCE_IO) + ss = OF_PCI_ADDR_SPACE_IO; + else if (res->flags & IORESOURCE_MEM_64) + ss = OF_PCI_ADDR_SPACE_MEM64; + else if (res->flags & IORESOURCE_MEM) + ss = OF_PCI_ADDR_SPACE_MEM32; + else + return -EINVAL; + + *flags &= ~(OF_PCI_ADDR_FIELD_SS | OF_PCI_ADDR_FIELD_PREFETCH); + if (res->flags & IORESOURCE_PREFETCH) + *flags |= OF_PCI_ADDR_FIELD_PREFETCH; + + *flags |= ss; + + return 0; +} + +static int of_pci_prop_ranges(struct pci_dev *pdev, struct of_changeset *ocs, + struct device_node *np) +{ + struct of_pci_range rp[PCI_BRIDGE_RESOURCE_NUM]; + struct resource *res; + int i = 0, j, ret; + u64 val64; + u32 flags; + + res = &pdev->resource[PCI_BRIDGE_RESOURCES]; + for (j = 0; j < PCI_BRIDGE_RESOURCE_NUM; j++) { + if (!resource_size(&res[j])) + continue; + + flags = OF_PCI_ADDR_FIELD_NONRELOC; + if (of_pci_get_addr_flags(&res[j], &flags)) + continue; + + val64 = res[j].start; + of_pci_set_address(rp[i].parent_addr, val64, flags); + of_pci_set_address(rp[i].child_addr, val64, flags); + + val64 = resource_size(&res[j]); + put_unaligned(val64, rp[i].size); + + i++; + } + + ret = of_changeset_add_prop_u32_array(ocs, np, "ranges", (u32 *)rp, + i * sizeof(*rp) / sizeof(u32)); + + return ret; +} + +static int of_pci_prop_reg(struct pci_dev *pdev, struct of_changeset *ocs, + struct device_node *np) +{ + struct of_pci_addr_pair *reg; + int i = 1, resno, ret = 0; + u32 reg_val, base_addr; + resource_size_t sz; + + reg = kzalloc(sizeof(*reg) * (PCI_STD_NUM_BARS + 1), GFP_KERNEL); + if (!reg) + return -ENOMEM; + + reg_val = FIELD_PREP(OF_PCI_ADDR_FIELD_SS, OF_PCI_ADDR_SPACE_CONFIG) | + FIELD_PREP(OF_PCI_ADDR_FIELD_BUS, pdev->bus->number) | + FIELD_PREP(OF_PCI_ADDR_FIELD_DEV, PCI_SLOT(pdev->devfn)) | + FIELD_PREP(OF_PCI_ADDR_FIELD_FUNC, PCI_FUNC(pdev->devfn)); + of_pci_set_address(reg[0].phys_addr, 0, reg_val); + + base_addr = PCI_BASE_ADDRESS_0; + for (resno = PCI_STD_RESOURCES; resno <= PCI_STD_RESOURCE_END; + resno++, base_addr += 4) { + sz = pci_resource_len(pdev, resno); + if (!sz) + continue; + + ret = of_pci_get_addr_flags(&pdev->resource[resno], ®_val); + if (!ret) + continue; + + reg_val &= ~OF_PCI_ADDR_FIELD_REG; + reg_val |= FIELD_PREP(OF_PCI_ADDR_FIELD_REG, base_addr); + of_pci_set_address(reg[i].phys_addr, 0, reg_val); + put_unaligned((u64)sz, reg[i].size); + i++; + } + + ret = of_changeset_add_prop_u32_array(ocs, np, "reg", (u32 *)reg, + i * sizeof(*reg) / sizeof(u32)); + kfree(reg); + + return ret; +} + +static int of_pci_prop_compatible(struct pci_dev *pdev, + struct of_changeset *ocs, + struct device_node *np) +{ + const char *compat_strs[PROP_COMPAT_NUM] = { 0 }; + int i, ret; + + compat_strs[PROP_COMPAT_PCI_VVVV_DDDD] = + kasprintf(GFP_KERNEL, "pci%x,%x", pdev->vendor, pdev->device); + compat_strs[PROP_COMPAT_PCICLASS_CCSSPP] = + kasprintf(GFP_KERNEL, "pciclass,%06x", pdev->class); + compat_strs[PROP_COMPAT_PCICLASS_CCSS] = + kasprintf(GFP_KERNEL, "pciclass,%04x", pdev->class >> 8); + + ret = of_changeset_add_prop_string_array(ocs, np, "compatible", + compat_strs, PROP_COMPAT_NUM); + for (i = 0; i < PROP_COMPAT_NUM; i++) + kfree(compat_strs[i]); + + return ret; +} + +int of_pci_add_properties(struct pci_dev *pdev, struct of_changeset *ocs, + struct device_node *np) +{ + int ret = 0; + + if (pci_is_bridge(pdev)) { + ret |= of_pci_prop_device_type(pdev, ocs, np); + ret |= of_pci_prop_address_cells(pdev, ocs, np); + ret |= of_pci_prop_size_cells(pdev, ocs, np); + ret |= of_pci_prop_ranges(pdev, ocs, np); + } + + ret |= of_pci_prop_reg(pdev, ocs, np); + ret |= of_pci_prop_compatible(pdev, ocs, np); + + /* + * The added properties will be released when the + * changeset is destroyed. + */ + return ret; +} diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 49238ddd39ee..1540c4c9a770 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -1628,7 +1628,8 @@ static int pci_dma_configure(struct device *dev) bridge = pci_get_host_bridge_device(to_pci_dev(dev)); if (IS_ENABLED(CONFIG_OF) && bridge->parent && - bridge->parent->of_node) { + bridge->parent->of_node && + !of_node_check_flag(bridge->parent->of_node, OF_DYNAMIC)) { ret = of_dma_configure(dev, bridge->parent->of_node, true); } else if (has_acpi_companion(bridge)) { struct acpi_device *adev = to_acpi_device_node(bridge->fwnode); diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 785f31086313..bd81dc4ca04f 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -678,6 +678,25 @@ static inline int devm_of_pci_bridge_init(struct device *dev, struct pci_host_br #endif /* CONFIG_OF */ +struct of_changeset; + +#ifdef CONFIG_PCI_DYNAMIC_OF_NODES +void of_pci_make_dev_node(struct pci_dev *pdev); +void of_pci_remove_node(struct pci_dev *pdev); +int of_pci_add_properties(struct pci_dev *pdev, struct of_changeset *ocs, + struct device_node *np); +#else +static inline void +of_pci_make_dev_node(struct pci_dev *pdev) +{ +} + +static inline void +of_pci_remove_node(struct pci_dev *pdev) +{ +} +#endif /* CONFIG_PCI_DYNAMIC_OF_NODES */ + #ifdef CONFIG_PCIEAER void pci_no_aer(void); void pci_aer_init(struct pci_dev *dev); diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c index 4c54c75050dc..0eaa9d9a3609 100644 --- a/drivers/pci/remove.c +++ b/drivers/pci/remove.c @@ -23,6 +23,7 @@ static void pci_stop_dev(struct pci_dev *dev) device_release_driver(&dev->dev); pci_proc_detach_device(dev); pci_remove_sysfs_dev_files(dev); + of_pci_remove_node(dev); pci_dev_assign_added(dev, false); } From patchwork Fri Dec 9 19:38:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lizhi Hou X-Patchwork-Id: 31917 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp957370wrr; Fri, 9 Dec 2022 11:41:45 -0800 (PST) X-Google-Smtp-Source: AA0mqf7BcOxU19knMPATo1kmO6zKKsmIApxHuZYns7CEWGZ0P4ml8qTyG89DD6WEnlvbhkt2+lkZ X-Received: by 2002:a17:906:5250:b0:7ae:825c:92d with SMTP id y16-20020a170906525000b007ae825c092dmr6592269ejm.46.1670614904842; Fri, 09 Dec 2022 11:41:44 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1670614904; cv=pass; d=google.com; s=arc-20160816; b=XCWWOX+opj7G361wwIdFBwlMkjsZFkEF/LNPicl+NAwrcU1FMgG2UQBhbUqz/2TzG1 +v76Yvdd+BF35B9yMHp2z19a7e6ezjzoqJxrPexLmpd2B0Yl5R7HFIPeS/LyytpVvVSg 8gvdwE/C7/11SvnmzUL/f3sKd8j0cF+wmPXp7hwkVPgd28Pg4OiZpD1nefoVR2PgWOkP pHZD3KqjQb4lAP8dQbSDaKIUQxAdJ77iF9ZjI3gM2UyV4mafv1tnjzM2Bk8DM9f6hESe zO2dPDaDknz+eAryiGSeHs5C7DWXpwgMjIMrJGSF9xAqu3DxC0OVQ/ody5sdpQphZL6s Ywhg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=4kE3EEoROF8TRC85LHQNVGLLOGk4/ncwzq/kMy+zm2w=; b=ol9g4Lyhdg+IgaJ+fFq28QAIEzZa/LBYsXh8czciiPiY5Cput04gpzWtDJHb7HnwJv nsTcL98mHsuihk87fvznfkxHVIEIXlL2messKycrlqaKegtfxXHQCnfxM78sEebsfRIC i+jratH6UOaGSHQlys/jFnMAU4sPLLHXsLAa9cbHI3xNii3kabO+uZj6+/tSeh0R1cuz O+yHeGqkdGEqFN01f9fa37YztVul6uusLaG5lyFEDOpjqL27W5/OZtarlM5jl+1v0sY5 uTzIaNh0vl+PxSAj/EBpkib9VKeYyTk933EDzqz3LxcLX6qIeOnhrgbC+PvglooYG+I0 chiQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=2E6BCnUu; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id nd18-20020a170907629200b0078d85777c4fsi454493ejc.700.2022.12.09.11.41.21; Fri, 09 Dec 2022 11:41:44 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=2E6BCnUu; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229932AbiLITjQ (ORCPT + 99 others); Fri, 9 Dec 2022 14:39:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34054 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229793AbiLITiy (ORCPT ); Fri, 9 Dec 2022 14:38:54 -0500 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2070.outbound.protection.outlook.com [40.107.237.70]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9C9F8A8492; Fri, 9 Dec 2022 11:38:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dVHzGuWLmYnrkIOSbu9bS13iB38e9tW0g766z+KuGhtlcF3DjKnNv8YdpL0PN9N/1TGKInzqRs8CuqpRfuxGF+2x3NPVdMfYABou+QArMLA+NWhN0mkxLW4thEosuleSt7tiKzqcUGpzzy2xYkqENXjRbW7GQj2RoJ+M/UJD7fQYjvlKKn+QmKIxNmBppvPK0lkyOC9Up6rGInzlVTiF0OvmNAKvhr15jCmJOc0uKAn0Wn8TN5iDRRoAsgaK5cMX/zYY2ZQOgs7tx6XP+Gm9SI/79V4ty/n1vIccVr5sxcd6ZoOf10Gykp0CCopDFEHN/mn547o0kfLG+mEj1s5jyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=4kE3EEoROF8TRC85LHQNVGLLOGk4/ncwzq/kMy+zm2w=; b=Bm5V4c09ISNLFPeJy49MZ89lkMilwbxLKEDbpRqTRT4gwmXkEkE4aoUYv9bMUif94WhTo/0X5/f++I/tryYTkYSIIPTAAWxneXYDWJFjCYVnk/Spon4UtwtRxF2rT6iHGsqs9ecxouKJWuhUYAZol7lDHIC8QdO6IzI9HTBSz7ti+9Jw+j37DcluT+TZhp2rj9X1bxcY0G3KjBvrXfVsaRm7RyIWp1DBe4KNJhn0jI/fxI6h5LaawkDKfbUWQQQexwlQz6FKRczW1MaZE7iwsZzuQTzoNAhp5fEjtleuSFxz+N9B7vo0SGvGgeiF32stGPgT8EHRdqZ2ZhGQYAscyQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4kE3EEoROF8TRC85LHQNVGLLOGk4/ncwzq/kMy+zm2w=; b=2E6BCnUuz4ClOnlrHXvIRmrAAv5R3jUt0gNcJctNrQpfOCPYqxjbp0Hz7G9PCQPw19vc8i0LjshnJJeOKwunBIxLg16xFaf1uP3hiTQB7sG8uQEfGabtKBgAzBhvg0LN0HvoNp4Op1jJHKkKrluNsezRb5pV/W7LJvCdWRwnzE0= Received: from BN9PR03CA0977.namprd03.prod.outlook.com (2603:10b6:408:109::22) by BL1PR12MB5287.namprd12.prod.outlook.com (2603:10b6:208:317::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.16; Fri, 9 Dec 2022 19:38:46 +0000 Received: from BN8NAM11FT004.eop-nam11.prod.protection.outlook.com (2603:10b6:408:109:cafe::54) by BN9PR03CA0977.outlook.office365.com (2603:10b6:408:109::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.18 via Frontend Transport; Fri, 9 Dec 2022 19:38:46 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB03.amd.com; pr=C Received: from SATLEXMB03.amd.com (165.204.84.17) by BN8NAM11FT004.mail.protection.outlook.com (10.13.176.164) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5901.17 via Frontend Transport; Fri, 9 Dec 2022 19:38:46 +0000 Received: from SATLEXMB05.amd.com (10.181.40.146) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Fri, 9 Dec 2022 13:38:46 -0600 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB05.amd.com (10.181.40.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Fri, 9 Dec 2022 13:38:46 -0600 Received: from xsjlizhih40.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2375.34 via Frontend Transport; Fri, 9 Dec 2022 13:38:45 -0600 From: Lizhi Hou To: , , , , , CC: Lizhi Hou , , , , , , , Subject: [PATCH V5 3/3] PCI: Add PCI quirks to generate device tree node for Xilinx Alveo U50 Date: Fri, 9 Dec 2022 11:38:14 -0800 Message-ID: <1670614694-68049-4-git-send-email-lizhi.hou@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1670614694-68049-1-git-send-email-lizhi.hou@amd.com> References: <1670614694-68049-1-git-send-email-lizhi.hou@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT004:EE_|BL1PR12MB5287:EE_ X-MS-Office365-Filtering-Correlation-Id: 340440f2-887f-4ed7-5138-08dada1cfd32 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OwHkSkc+MnM9dV/eJ+m0gsN3wUA1F/TUie8X5XiZVxW4DK9h6VtFuDkiUFXUBKcOU9Uaa+mgxeZ7X3xsH8L6p2LuAp6P0nNYu7IdZHL5MwcgMRzvvhmRyVoXp/aTJyOOjbWCg9BHnXvZNvUMPMZUbmsAu3eZK86B9Oz8+Trka9F0mMg6v79QNtgE6fnUdFOtsz6sx0f2OGTAsiV4yu/H60Ns7+gQCcYveFKympOWr/Yhz14Ksucimh0UQxV1UzgCR6C3EWP5T/Yp7yL4ZZOUu0FM6q4aB4FkVP9R4l96aFngjkhkZR0xb2REfTTdv2WLExjmVKpUXgpejXCIjOE2u5ELa1IFB8WJA0pycNlwy7K8BA8S8uMcQC+EDAY7mkw0cbPTW00oOQX4U33kPb1SLKJ/gCmCfuAZ2Cdg1HyKiJnK3FEwp1Xj2WnpNe+mhueL645PlYKmUgmJwlZM1X7TB4DL1A47egFhn7qjW2T/dUBmvVPKT9j4AjY3WJe3qjiUXgDT3svzjAFffNkanADYLwkBk+htpscntvpM1urfe7IkgqO/bQeB1O9s2td/HzXzeHtwL1VGq8eXh+jCOAegJHvTd1+GGRbETcZebidvahvd52rXg4neNq0gQv1GapSR6FHLc05rNl2ARX2eFGW9Leub+ZoscrOolB7tDtQ8wnJ00AfgUCPioMMwwfRjy+JYO2V1J8tqndsB8W19IjTb7i7bgInC9rw2Xotkt+p9Okc= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB03.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230022)(4636009)(136003)(376002)(39860400002)(396003)(346002)(451199015)(40470700004)(36840700001)(46966006)(4326008)(44832011)(36756003)(70586007)(54906003)(110136005)(316002)(5660300002)(70206006)(41300700001)(8676002)(478600001)(2906002)(26005)(82740400003)(426003)(47076005)(2616005)(186003)(336012)(82310400005)(40460700003)(8936002)(36860700001)(40480700001)(6666004)(86362001)(81166007)(356005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Dec 2022 19:38:46.7750 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 340440f2-887f-4ed7-5138-08dada1cfd32 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT004.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5287 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751766694086392455?= X-GMAIL-MSGID: =?utf-8?q?1751766694086392455?= The Xilinx Alveo U50 PCI card exposes multiple hardware peripherals on its PCI BAR. The card firmware provides a flattened device tree to describe the hardware peripherals on its BARs. This allows U50 driver to load the flattened device tree and generate the device tree node for hardware peripherals underneath. To generate device tree node for U50 card, added PCI quirks to call of_pci_make_dev_node() for U50. Signed-off-by: Lizhi Hou Signed-off-by: Sonal Santan Signed-off-by: Max Zhen Reviewed-by: Brian Xu --- drivers/pci/quirks.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 4944798e75b5..5d76932f59ec 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -5956,3 +5956,14 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x56b1, aspm_l1_acceptable_latency DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x56c0, aspm_l1_acceptable_latency); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x56c1, aspm_l1_acceptable_latency); #endif + +/* + * For PCI device which have multiple downstream devices, its driver may use + * a flattened device tree to describe the downstream devices. + * To overlay the flattened device tree, the PCI device and all its ancestor + * devices need to have device tree nodes on system base device tree. Thus, + * before driver probing, it might need to add a device tree node as the final + * fixup. + */ +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_XILINX, 0x5020, of_pci_make_dev_node); +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_XILINX, 0x5021, of_pci_make_dev_node);