From patchwork Thu Jun 15 16:50:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lizhi Hou X-Patchwork-Id: 108655 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp789436vqr; Thu, 15 Jun 2023 10:12:33 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7VLxhU8DnpuAnMKX0kZQHEkbG3yGWldZT/O/rnd7Y6XUKEXsu9RH7MblhgN0SqB0nGs0hf X-Received: by 2002:a17:903:124d:b0:1b0:471c:4c3 with SMTP id u13-20020a170903124d00b001b0471c04c3mr16774389plh.40.1686849153008; Thu, 15 Jun 2023 10:12:33 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1686849152; cv=pass; d=google.com; s=arc-20160816; b=KTvLXZ/EMmkQD1hZ3j0mB6NiyrmTX6sn3y3DDCstBlWDrvISjFYN9zqnuTEZGfwVLb CT6gKdF47MVutcI1CTPN6ovySwZ/vcyop3XXQBreyzFo/HaHgBpdNv8JIZHAhUQ81ilm a8q2E2oPHdDEvNERjDvDTizA+5bjSSKlMrs4PZ7gVmZE3XKhfRUZh3dgsP8iALu3AJzC 77nppam83zTIq+gctMSYK6xXji8I0m5lNSGtU45+mGouhFXGsjCms1icLgFAHwtLarjX IMYQ5Drt5//mNEPIU3Se9J0bfgFCKV1prZ30zqfrqwGrbMBwRpo5b8nA8wHMsaSQ5fe7 ijeg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=sCeQOJjkj5YimJPVzX6eRl9p/6j1ICZvwuY+Ma4V4P0=; b=mjMci4vPOApD/r5+v5WFZajBQPH0nG3Jw0pE2m+J2JG3ErEaJZCJt1+mI/+LbnYo8i DlTxTSUGI6pxKuvLXo2tphksxS5UaioA+HC4I5ZY/M2F83VFDgQoFjphsCtpfD/gvr9j I9AaOFXFhtoMUkkodOSoeRxD4PIp0s5G/MPbnDH3zBsS6QxfcDK5XqEzFRv1eGL5ovOe HFYniYjmigAWnRM604uRRNevN6MU3Tba3gdzp/ESlCOWb66mWatTk5VSllT0b157piHF lq1D+Jl3Mwns4/Ym9TfXmXPvhdQPsR8CLe8/oNXplZedoZ58vq6rBuTdRZEH/M8iV0Gx BdVA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=MGfjs8N0; 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 c18-20020a170902b69200b001aff514a8f0si9813464pls.534.2023.06.15.10.12.19; Thu, 15 Jun 2023 10:12:32 -0700 (PDT) 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=MGfjs8N0; 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 S232905AbjFOQwp (ORCPT + 99 others); Thu, 15 Jun 2023 12:52:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49110 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231626AbjFOQvW (ORCPT ); Thu, 15 Jun 2023 12:51:22 -0400 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2069.outbound.protection.outlook.com [40.107.93.69]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE7C8A7; Thu, 15 Jun 2023 09:51:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RtIG5a73ozr8qIV/GqqfBggi27NjfqE0pgp0vGqgTefGvlrdxkRw6fpli6DroMLH0TVslQAGvg/u/sMDhSlRNVXAbUXcKiAgbKwkEwkFblO90dRHm97JY0E62z+L+vkZS55g3MSi2w+1/gDj6lGSm+IxHepcKDJv3S06Pl5+2ermUlCIp/LxrXdL2vSda9RVeiwRBxlD8mvMv+KYbk67DpUhytdj2gJCiESG/uI8WA1VWRH42g5yG+ZEl72yzHM0U+fClf+2qpQAM2onRsrxANN1njC2yGRwfiaOZ4CW2ym4UGuL+UPM3iRJ02L4fZJvpv/5ZeW/Kpn8wynweqU8mg== 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=sCeQOJjkj5YimJPVzX6eRl9p/6j1ICZvwuY+Ma4V4P0=; b=fmefLh1mPbtPzw0v2g7MnIVxyp9zn/M7RiB3cDsPmpT9A4A25KmKlH82fc/sFy4PtCIFYQCfSjfX8u8V6VBtfYk6wRMwmP1XXnTeasIZ5EoN1LQrraIkDNJZlKOmf9stDdq3HfB0AhRRHPAvxQGP5BiooR6zyQMcLRthM6H78IJjZOqirFaRz4x1t5fnWzxE7xAuEiZ6qqqKAklh/Z/e4c4afgnJA9btSWejAep/u61Rat7ZhPZAj7W3G48GXSTO+9sJDIxKKcvn9l2MJ5zGtC1NsWUGtU1AI3NPu+XroPIwPmVbj3wVYjGvH7ZflOjddvaufTA8Lb7Q9QbaiMoBnA== 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=sCeQOJjkj5YimJPVzX6eRl9p/6j1ICZvwuY+Ma4V4P0=; b=MGfjs8N0vDInZyl8HXTjH8cSZaiyvbyFr+ufK38deJ7gEyrM5QBnA8hZAxKoDvnWzZ5WeAcwFeuGEX8fWkfMuaSPFszX44/G3ACFu3FCDzNKJOpofo1Z23MFYNocuv8/gno9g+Q4UYxRBMQxrTlKXCPtvJc40QmeRB1JWWmWNJ4= Received: from SJ0PR03CA0232.namprd03.prod.outlook.com (2603:10b6:a03:39f::27) by CY8PR12MB7339.namprd12.prod.outlook.com (2603:10b6:930:51::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.28; Thu, 15 Jun 2023 16:51:15 +0000 Received: from SN1PEPF000252A0.namprd05.prod.outlook.com (2603:10b6:a03:39f:cafe::f1) by SJ0PR03CA0232.outlook.office365.com (2603:10b6:a03:39f::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6477.37 via Frontend Transport; Thu, 15 Jun 2023 16:51:15 +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 SN1PEPF000252A0.mail.protection.outlook.com (10.167.242.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6500.27 via Frontend Transport; Thu, 15 Jun 2023 16:51:14 +0000 Received: from SATLEXMB07.amd.com (10.181.41.45) 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.2507.23; Thu, 15 Jun 2023 11:51:14 -0500 Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB07.amd.com (10.181.41.45) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.6; Thu, 15 Jun 2023 09:51:13 -0700 Received: from xsjlizhih40.xilinx.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.23 via Frontend Transport; Thu, 15 Jun 2023 11:51:13 -0500 From: Lizhi Hou To: , , , CC: Lizhi Hou , , , , =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= Subject: [PATCH V9 1/6] of: dynamic: Add interfaces for creating device node dynamically Date: Thu, 15 Jun 2023 09:50:37 -0700 Message-ID: <1686847842-33780-2-git-send-email-lizhi.hou@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1686847842-33780-1-git-send-email-lizhi.hou@amd.com> References: <1686847842-33780-1-git-send-email-lizhi.hou@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF000252A0:EE_|CY8PR12MB7339:EE_ X-MS-Office365-Filtering-Correlation-Id: 3d9d334d-e15a-4637-4637-08db6dc0bb7f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oY80HXwA2TR2erkJ8gFC8UQ4ldrsNHHcFiMvgrxHDaLKxLB8ME9HF5ir8Mzz0l/cJ9/2lEGBer3m5XtI4m3ny8zXM1MeEXFujjka+4q8rvb/KkB0BD6I51IbIjtNK34dQ1i3xEJoIvJroWh/LGWpjua5NGfMZeEKkVKcuthLkNpxtsrDpjy+O5yKSNXiEHTZ/yXNmDFpfCWAYPxhX6FCAqYsPB7GlhRiO2KYRSiTl13gesspM/JPwcNZmGu7rtLYwXZ/DdYLAak088J1ljdFWjF2/DQzKumGUpz4LQXCJsomSEUUG3Xjow59Zuin5Y/cZkHjlyVyKqMvi+Alo7sPGrasT+OXrQID98JQdmMk+KpjO1QcJkfRw6zYUlaqvKB0/XxWrfZupXDTuuea6ztwopjMH+SZoXuL5j/WEV02ODg0u8R66JHwA6k6yNPD0C61c7+Jw0rBU6AW7dY2oBziTquOqQ4uqQchf8BvTvjhrTnyQoARox0MBdYFUlKTWy8eiTrFtrO9xGiWNEszu5wk9l9eSgd2pm00ZFJzCYKgrJYg9wm3VEOKnQerbXXIY6IqOeOsld5rqMglWFuBCY/+sojLImjJc3j85DEEbQKmMT3M2NfUnsixmHFlR3iNtM6HjFjiUGrmShyYzRywRrDfN2HqyH+eCdl7IqR0UUrMtYkUcAxZQrQLj8goYxh7+4M7FpZP5eSzKe4zinVfv5C6Vdm0F6tPP/jfcsoruZkegwDSvh2JLnKBTms/82VYfhTj1RZqZwGmTgRRD/TJAQqNnw== 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:(13230028)(4636009)(136003)(346002)(396003)(39860400002)(376002)(451199021)(36840700001)(46966006)(40470700004)(110136005)(2616005)(6666004)(54906003)(26005)(478600001)(86362001)(186003)(316002)(4326008)(82740400003)(336012)(83380400001)(426003)(47076005)(66574015)(70206006)(81166007)(70586007)(36860700001)(356005)(5660300002)(8936002)(8676002)(44832011)(2906002)(40460700003)(41300700001)(40480700001)(36756003)(82310400005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2023 16:51:14.9104 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3d9d334d-e15a-4637-4637-08db6dc0bb7f 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: SN1PEPF000252A0.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB7339 X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=no 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?1768789537186098071?= X-GMAIL-MSGID: =?utf-8?q?1768789537186098071?= of_changeset_create_node() creates device node dynamically and attaches the newly created node to a changeset. 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: Clément Léger Signed-off-by: Lizhi Hou --- drivers/of/dynamic.c | 164 ++++++++++++++++++++++++++++++++++++++++++ drivers/of/unittest.c | 19 ++++- include/linux/of.h | 23 ++++++ 3 files changed, 205 insertions(+), 1 deletion(-) diff --git a/drivers/of/dynamic.c b/drivers/of/dynamic.c index e311d406b170..9259cebda4d6 100644 --- a/drivers/of/dynamic.c +++ b/drivers/of/dynamic.c @@ -487,6 +487,38 @@ struct device_node *__of_node_dup(const struct device_node *np, return NULL; } +/** + * of_changeset_create_node - Dynamically create a device node and attach to + * a given changeset. + * + * @parent: Pointer to parent device node + * @full_name: Node full name + * @cset: Pointer to changeset + * + * Return: Pointer to the created device node or NULL in case of an error. + */ +struct device_node *of_changeset_create_node(struct device_node *parent, + const char *full_name, + struct of_changeset *cset) +{ + struct device_node *np; + int ret; + + np = __of_node_dup(NULL, full_name); + if (!np) + return NULL; + np->parent = parent; + + ret = of_changeset_attach_node(cset, np); + if (ret) { + of_node_put(np); + return NULL; + } + + return np; +} +EXPORT_SYMBOL(of_changeset_create_node); + static void __of_changeset_entry_destroy(struct of_changeset_entry *ce) { if (ce->action == OF_RECONFIG_ATTACH_NODE && @@ -960,3 +992,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/drivers/of/unittest.c b/drivers/of/unittest.c index 2191c0136531..1193a574fa36 100644 --- a/drivers/of/unittest.c +++ b/drivers/of/unittest.c @@ -802,7 +802,9 @@ static void __init of_unittest_changeset(void) struct property *ppname_n21, pname_n21 = { .name = "name", .length = 3, .value = "n21" }; struct property *ppupdate, pupdate = { .name = "prop-update", .length = 5, .value = "abcd" }; struct property *ppremove; - struct device_node *n1, *n2, *n21, *nchangeset, *nremove, *parent, *np; + struct device_node *n1, *n2, *n21, *n22, *nchangeset, *nremove, *parent, *np; + static const char * const str_array[] = { "str1", "str2", "str3" }; + const u32 u32_array[] = { 1, 2, 3 }; struct of_changeset chgset; n1 = __of_node_dup(NULL, "n1"); @@ -857,6 +859,17 @@ static void __init of_unittest_changeset(void) unittest(!of_changeset_add_property(&chgset, parent, ppadd), "fail add prop prop-add\n"); unittest(!of_changeset_update_property(&chgset, parent, ppupdate), "fail update prop\n"); unittest(!of_changeset_remove_property(&chgset, parent, ppremove), "fail remove prop\n"); + n22 = of_changeset_create_node(n2, "n22", &chgset); + unittest(n22, "fail create n22\n"); + unittest(!of_changeset_add_prop_string(&chgset, n22, "prop-str", "abcd"), + "fail add prop prop-str"); + unittest(!of_changeset_add_prop_string_array(&chgset, n22, "prop-str-array", + (const char **)str_array, + ARRAY_SIZE(str_array)), + "fail add prop prop-str-array"); + unittest(!of_changeset_add_prop_u32_array(&chgset, n22, "prop-u32-array", + u32_array, ARRAY_SIZE(u32_array)), + "fail add prop prop-u32-array"); unittest(!of_changeset_apply(&chgset), "apply failed\n"); @@ -866,6 +879,9 @@ static void __init of_unittest_changeset(void) unittest((np = of_find_node_by_path("/testcase-data/changeset/n2/n21")), "'%pOF' not added\n", n21); of_node_put(np); + unittest((np = of_find_node_by_path("/testcase-data/changeset/n2/n22")), + "'%pOF' not added\n", n22); + of_node_put(np); unittest(!of_changeset_revert(&chgset), "revert failed\n"); @@ -874,6 +890,7 @@ static void __init of_unittest_changeset(void) of_node_put(n1); of_node_put(n2); of_node_put(n21); + of_node_put(n22); #endif } diff --git a/include/linux/of.h b/include/linux/of.h index 6ecde0515677..82d0a476ec75 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -1580,6 +1580,29 @@ 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_changeset_create_node(struct device_node *parent, + const char *full_name, + struct of_changeset *cset); +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 Thu Jun 15 16:50:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lizhi Hou X-Patchwork-Id: 108661 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp798476vqr; Thu, 15 Jun 2023 10:27:43 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4HX0wSbAZAcsfomoQqezzchv9SAWtbv01P+uxQmqPj7MhZjFYUOOPacG14OukgN5FPe+79 X-Received: by 2002:a17:902:8a97:b0:1b2:5ee9:aa73 with SMTP id p23-20020a1709028a9700b001b25ee9aa73mr14040340plo.62.1686850063312; Thu, 15 Jun 2023 10:27:43 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1686850063; cv=pass; d=google.com; s=arc-20160816; b=LrK1Onfu0qhJP7Mtxph6SLW1to+U8qdr+qVAaIqt7vuesV42ZbTxQOWg4AWPLJ1+9N Zmj0A/zIGD+Ouq6twhb1xQ+Vvb0rC28MCUQ/AA7YjdAcV3j3M8vYiyc1f1f/QW40dzus +KACO7jiYpX3kKafbFlaO8JdhOumqs2eFkjYx+keJe6uuLMu0cnN8s/UfVe/30PzsyXd MQnAp0Dg4edYHJBVG3vk4YNZGTU1LAKv1IgWWMBm7f9W//mYCTMQ4Oht7ouxQhf9JO/D t6b3leIs6YAL78kVwS9O4dULgosYmJVROle1MR7nUx9e5yNXUxsxxv5TBr3fId6VRG83 B8jg== 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=U9Ml6QllioUuSg0OlDBw+zw4sxqSM/3ZBX0guX5mnqE=; b=P+Ua1G9wVLkcR8+46S1l7ex/cpGWffSPpZFvWmyXLOfY1S5LTT9slLb8lffqE1SXK6 o5k56dChn2ZI/XrdTMfjW62fMclKJv34hdbiCXvuLFHwK/fv8ygGL5jbaX7AE6woU5GF juSP3nGjMFPy+BRi6TSQtD13kfCypW3zF9d8wrs2qCKLKKGNthZ65EB9seIR4dYmPsnt hPHXNPOMKgc8Hd2qVyyQ13oRLfQKNHX6Tucj4dxl4bRJ4M1J7xKg96lgq0HtAfi2Hi+8 uvWfSZ4hQ25ZPNX4uc9NQ4j5kJjdjRxhnmmp5SoRIME713TPnk4GheAWHVcI+7/k5uy1 8IUQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=ftZcMuaM; 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 n12-20020a170903110c00b001ab1279d418si10014921plh.474.2023.06.15.10.27.30; Thu, 15 Jun 2023 10:27:43 -0700 (PDT) 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=ftZcMuaM; 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 S237910AbjFOQxC (ORCPT + 99 others); Thu, 15 Jun 2023 12:53:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49716 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237760AbjFOQv3 (ORCPT ); Thu, 15 Jun 2023 12:51:29 -0400 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2084.outbound.protection.outlook.com [40.107.93.84]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7C6802D6B; Thu, 15 Jun 2023 09:51:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dHAEr3BgrOdrU4FYaUxFLXAaryFAqW+RqC3aaZGVRR0WB2HICtVkx7lqr/tVMQ2iEb+1S8h4HGS8FOFFwvcdsi33qYeht3TKah3kolMn29cScKIQDYyjRsskkOXHMeNwE2fiLNEfok4ixKYknuFJZZRf+czpBT1wM60VRVHFvBelIjPX/K9vnuCRh0ygvliW8djQ6SN9qEnP7zJcYtxbDMDfPiQjTIxfcgMW4YhWEW/uBlgdbCAkJUtqMzEa+++2qboy4lNTascMSckV2BII0VrFJiYY8ahKKsrGS4UgDto5dXX39fKkSvEcRipSGYO4OpyIUssAwfgpwKXvLpjv0A== 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=U9Ml6QllioUuSg0OlDBw+zw4sxqSM/3ZBX0guX5mnqE=; b=C/hNQMXSGlLCAuBlvn2f8Kp9qg/x7xnlTti7l5/20GnroEmi0R6TcuGmCBac8yOpaZ/zxNZ41m0YiYhhOjuHXMq0zqOsla8b2mTgE4/q8WZjUM41Z8dl98Tx01J5SXVQW3WZ24oE1NpahkPHiW+TPOyqPku4XOrydrnC9mPHL8VxwZStvsx+Qmh3prj8An2/exCSB6pViWTMzKeASVP1FM4ETiCiCqwmS8d/GFFiZzUP8hmFzs8KpD+OK2ub7KIXUmsCDooQtpmbtUiDx0vfsFm338EnvTUBa+iM77Z33SKWLObQ1ETWDnhe8yiijUKpV5iw8DuR0xoAFtTscmMRjA== 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=U9Ml6QllioUuSg0OlDBw+zw4sxqSM/3ZBX0guX5mnqE=; b=ftZcMuaMceys1TujnUt73YXaSdecDAogZkxr+TE1rIs6d+Vyf+LA6uc9GcQlDgJOLGMIvzrqg5jNSio9lqh8UGprFe/b18adhY4VUGCEra9dTYnRVymC7uOIO2oGglyFSY5rR1PR+Bjm/LfTZzYrG2r6mvjcjOGTZOX9re7uujo= Received: from SJ0PR05CA0159.namprd05.prod.outlook.com (2603:10b6:a03:339::14) by CH3PR12MB9026.namprd12.prod.outlook.com (2603:10b6:610:125::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6477.29; Thu, 15 Jun 2023 16:51:16 +0000 Received: from MWH0EPF000971E4.namprd02.prod.outlook.com (2603:10b6:a03:339:cafe::11) by SJ0PR05CA0159.outlook.office365.com (2603:10b6:a03:339::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.9 via Frontend Transport; Thu, 15 Jun 2023 16:51:15 +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 MWH0EPF000971E4.mail.protection.outlook.com (10.167.243.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6500.27 via Frontend Transport; Thu, 15 Jun 2023 16:51:15 +0000 Received: from SATLEXMB08.amd.com (10.181.40.132) 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.2507.23; Thu, 15 Jun 2023 11:51:15 -0500 Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB08.amd.com (10.181.40.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Thu, 15 Jun 2023 09:51:14 -0700 Received: from xsjlizhih40.xilinx.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.23 via Frontend Transport; Thu, 15 Jun 2023 11:51:14 -0500 From: Lizhi Hou To: , , , CC: Lizhi Hou , , , Subject: [PATCH V9 2/6] PCI: Create device tree node for selected devices Date: Thu, 15 Jun 2023 09:50:38 -0700 Message-ID: <1686847842-33780-3-git-send-email-lizhi.hou@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1686847842-33780-1-git-send-email-lizhi.hou@amd.com> References: <1686847842-33780-1-git-send-email-lizhi.hou@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWH0EPF000971E4:EE_|CH3PR12MB9026:EE_ X-MS-Office365-Filtering-Correlation-Id: 3bf5bc2c-97f6-42d5-c14d-08db6dc0bbd8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hPMo489tvJfeCrdNd54d10OuVo8xpZPFs4FF7j2J+3kcNFclu8bXgEeGkPqZ/M7/BJiqGoOcd4TefaKgB0sGtJc/KsW0UtvzYjvZFMVYGSDXaRJOwIG2eVWAeZr4nhHHnWpIPNkeFJA24sVhhgvPXqE75Hv7kNi3wGZzb2WuoPigel68Ybg361pllBkOOUO/6tPXkZJ0Kkcgz+TcXWcWMQLb1F5yCcg48afF45DaCzdImFikmF5CwIppQN9uuh1AyML3D/hW9N63rDj22/ixPn4Q1yzTyvIZmHpDEajIMTA8ZmPt9epssNOG84vRZf1JS2lVJ6G1we42ye/Jw/QcRBlnNKqHB6PwE5M6DKP6ib8oZuUqgz05lowlJSKp13TpRF+9fZ9YIqWtoYgg0LliQkE8pzzG1rWvOM3RQtCwNpZYUqGWX7b5vh7rYJ7GXRoagkSCpXw61dyP2rT/zHlSj3UBgKxl+eZAKQ2zPU3qWofLSnpkL+y0MznRe9hAGBlRVv0aTcq5pt2R3l40uSFzRS76sZQ0cSkFEu2Wzr+O2lCE953GlUcw4WD2AXtGGi2GoNRb1rLrVAauVWreheQlQ6iOECWBvvrtT5xbsjjAmUdGV9buyLwbPNSoCiZwP866KQGgubrhfXrd1MBn+6XIeLGT7jcoTrTvpdiZX6OwPwZRo8jlIoiiYKvcGHDfUIUMlkuyx2iVtOdCw6UYHdP+teOtTe41omiiRG6jlaPFpYBm+ArwiYe+cAlYVyiNBtah7goz5jC/7FgJx2ImKkKjXg== 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:(13230028)(4636009)(39860400002)(346002)(396003)(376002)(136003)(451199021)(36840700001)(46966006)(40470700004)(70206006)(70586007)(54906003)(110136005)(478600001)(8936002)(36756003)(5660300002)(6666004)(8676002)(4326008)(336012)(426003)(40460700003)(41300700001)(316002)(81166007)(82740400003)(356005)(86362001)(26005)(47076005)(44832011)(40480700001)(186003)(36860700001)(2906002)(30864003)(2616005)(83380400001)(82310400005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2023 16:51:15.4187 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3bf5bc2c-97f6-42d5-c14d-08db6dc0bbd8 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: MWH0EPF000971E4.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB9026 X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=no 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?1768790492025674757?= X-GMAIL-MSGID: =?utf-8?q?1768790492025674757?= 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 --- drivers/pci/Kconfig | 12 +++ drivers/pci/Makefile | 1 + drivers/pci/bus.c | 2 + drivers/pci/of.c | 81 ++++++++++++++++- drivers/pci/of_property.c | 179 ++++++++++++++++++++++++++++++++++++++ drivers/pci/pci.h | 19 ++++ drivers/pci/remove.c | 1 + 7 files changed, 294 insertions(+), 1 deletion(-) create mode 100644 drivers/pci/of_property.c diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig index 9309f2469b41..24c3107c68cc 100644 --- a/drivers/pci/Kconfig +++ b/drivers/pci/Kconfig @@ -193,6 +193,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 5bc81cc0a2de..ab7d06cd0099 100644 --- a/drivers/pci/bus.c +++ b/drivers/pci/bus.c @@ -340,6 +340,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/of.c b/drivers/pci/of.c index 2c25f4fa0225..01818b27a8da 100644 --- a/drivers/pci/of.c +++ b/drivers/pci/of.c @@ -501,8 +501,10 @@ static int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args * * to rely on this function (you ship a firmware that doesn't * create device nodes for all PCI devices). */ - if (ppnode) + if (ppnode && of_property_present(ppnode, "interrupt-map")) break; + else + ppnode = NULL; /* * We can only get here if we hit a P2P bridge with no node; @@ -617,6 +619,83 @@ 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_changeset_revert(np->data); + of_changeset_destroy(np->data); + of_node_put(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) + return; + + cset = kmalloc(sizeof(*cset), GFP_KERNEL); + if (!cset) + goto failed; + of_changeset_init(cset); + + np = of_changeset_create_node(ppnode, name, cset); + if (!np) + goto failed; + np->data = cset; + + 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_node_put(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..bdd756c8d7de --- /dev/null +++ b/drivers/pci/of_property.c @@ -0,0 +1,179 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2022, Advanced Micro Devices, Inc. + */ + +#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_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) + +enum of_pci_prop_compatible { + PROP_COMPAT_PCI_VVVV_DDDD, + PROP_COMPAT_PCICLASS_CCSSPP, + PROP_COMPAT_PCICLASS_CCSS, + PROP_COMPAT_NUM, +}; + +static void of_pci_set_address(struct pci_dev *pdev, u32 *prop, u64 addr, + u32 reg_num, u32 flags, bool reloc) +{ + prop[0] = 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)); + prop[0] |= flags | reg_num; + if (!reloc) { + prop[0] |= OF_PCI_ADDR_FIELD_NONRELOC; + prop[1] = upper_32_bits(addr); + prop[2] = lower_32_bits(addr); + } +} + +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 = 0; + if (res->flags & IORESOURCE_PREFETCH) + *flags |= OF_PCI_ADDR_FIELD_PREFETCH; + + *flags |= FIELD_PREP(OF_PCI_ADDR_FIELD_SS, 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; + struct resource *res; + int i = 0, j, ret; + u64 val64; + u32 flags; + + rp = kcalloc(PCI_BRIDGE_RESOURCE_NUM, sizeof(*rp), GFP_KERNEL); + if (!rp) + return -ENOMEM; + + res = &pdev->resource[PCI_BRIDGE_RESOURCES]; + for (j = 0; j < PCI_BRIDGE_RESOURCE_NUM; j++) { + if (!resource_size(&res[j])) + continue; + + if (of_pci_get_addr_flags(&res[j], &flags)) + continue; + + val64 = res[j].start; + of_pci_set_address(pdev, rp[i].parent_addr, val64, 0, flags, + false); + memcpy(rp[i].child_addr, rp[i].parent_addr, + sizeof(rp[i].child_addr)); + + val64 = resource_size(&res[j]); + rp[i].size[0] = upper_32_bits(val64); + rp[i].size[1] = lower_32_bits(val64); + + i++; + } + + ret = of_changeset_add_prop_u32_array(ocs, np, "ranges", (u32 *)rp, + i * sizeof(*rp) / sizeof(u32)); + kfree(rp); + + 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; + + /* configuration space */ + of_pci_set_address(pdev, reg.phys_addr, 0, 0, 0, true); + + return of_changeset_add_prop_u32_array(ocs, np, "reg", (u32 *)®, + sizeof(reg) / sizeof(u32)); +} + +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_changeset_add_prop_string(ocs, np, "device_type", + "pci"); + ret |= of_changeset_add_prop_u32(ocs, np, "#address-cells", + OF_PCI_ADDRESS_CELLS); + ret |= of_changeset_add_prop_u32(ocs, np, "#size-cells", + OF_PCI_SIZE_CELLS); + 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.h b/drivers/pci/pci.h index 2475098f6518..82cc2b35ff6d 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 d68aee29386b..d749ea8250d6 100644 --- a/drivers/pci/remove.c +++ b/drivers/pci/remove.c @@ -22,6 +22,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 Thu Jun 15 16:50:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lizhi Hou X-Patchwork-Id: 108666 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp801363vqr; Thu, 15 Jun 2023 10:32:15 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5x2HbmecBc/qO16WWx6tdHNJhC2FmxeRPSUmJczN4JrRyv69/tXoIZRrBVvP37NQPBbIT2 X-Received: by 2002:a92:b12:0:b0:33e:7244:3c91 with SMTP id b18-20020a920b12000000b0033e72443c91mr25553ilf.29.1686850334827; Thu, 15 Jun 2023 10:32:14 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1686850334; cv=pass; d=google.com; s=arc-20160816; b=LDpAgU1e+DDFv8/QRVBLnTRxXNPGgvUZ4kiGtwkWzCXgF++NV7tngL4QCh3ngHI+TX hrBto+O7vLuDK+13YvvFQZRuAI5ZZAAzwtWLfmMPha3o3LmbpNkJx4n0QOQC6aFEDj5R 2SoWQOABxepDnnjxoDngvWrp0aeZsuTc/spv7LJ88+AmOfRk0dnFgNtAQSahQV14PBly JsmXzjd/YjMOxGH3sMhcPMrhLEYyAmRcrYC8pHcmIzvdS26LnRudXdkvuAmrKLG98DIH 1tAhMS2kmzU0wF9GFLvCVdoku9uCs2LLjUA+mmd9xfORsmxoiKk3Rdk4jKkbXYJVwcS7 WWRQ== 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=CGbfjJaeCFsHY4yrDPsgA0/1fC10vw15xK0xAuVzttU=; b=NplgEzYFm6W/4SwmA5s/LmksMzNAh+MaNQP/+HChPOYRNDWWz0wIgYtkdcWxVBZfUy cY/5sPyT0eYn3KK2eEMkxSCEQ0bgG7FOsa2b6Lw9G+Bp06ton5jcOGiH1rve/qyxW4vz CDu3HxxNO7tGFCFVnABH67wqDxX8id5Fjxfu244muEkPwKYDI82YXcTLxrUvvj9BcjYV fqceB/rlo8ZlZE9g1KsvDaGsolPzPSgc+cquv1+rZTGr/FLTaKb8GoLJGEPH0krR1bf8 2iAaACrwfNREaaILnpggJXEDwDXVYBXYXR/OLr6jOFodDy4x6VLciD/zH5gRk1Vyt/Ox DTyQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=iqAQwg4C; 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 l8-20020a637008000000b0054ff42dff19si1876074pgc.121.2023.06.15.10.31.50; Thu, 15 Jun 2023 10:32:14 -0700 (PDT) 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=iqAQwg4C; 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 S237161AbjFOQwz (ORCPT + 99 others); Thu, 15 Jun 2023 12:52:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50142 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237750AbjFOQv3 (ORCPT ); Thu, 15 Jun 2023 12:51:29 -0400 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2070.outbound.protection.outlook.com [40.107.244.70]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2817A2955; Thu, 15 Jun 2023 09:51:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YD5UPCpjBo6fyfkYm8NzREbXXMzEJfPahjFKsQXkgUWw+1bIy/GG33IqcSq0rNlm/tfjCVxK7KeOqd0AX4bvC9h1LITLhXpO9PH6DHBdueYX+Y8gbcRslb0vMV4J9eGLZLBk75sSvJ8Q6HffwYo2eEn9I/2PaFc/QyOw9VK4G5LXJCkyeX+0vW8CDb6qAX/xQfIVWPHsqchORitoDmbmLYYmVsXXA4WEy7KyVvxtqUkMsUQJrqSYZpAfk4XrAjihhgWR6sxON9P8j6Ds11A0I7Se6P5RK5FKhdF3iM3b8+nAx0BImxnMB8V/4YujSpfVvzDNaSwWf2cO1V3cg6Vj1w== 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=CGbfjJaeCFsHY4yrDPsgA0/1fC10vw15xK0xAuVzttU=; b=guYIHkUe2cflZU3qR2WvZgVxjHTbF3qcmZaB2uY0wdUk9aIp7SS+laDe9RtyA7x/bxVJCZWS5p/klwUY3rPrtJU2wmLwVo7SRypEBs+yRb8IdNDB9xGqD9S1/B+4Smo/RZqt5ECvgpS8z+Mx1PV9PiThN4b7xeOBFQG+ZRed2RtMFjipLw1z2pJ+gOSinT/503kHDE2/blvs9TE09Hjxzhg0zpeGc6QbM+nFyzQSe4NAn0N5JUGBA3IsIu7D4cSs5TO5GarT6jZ4wDf5QfzAxSGu87UKYbuGd09hcRZj1hZZcQzIgvZ3scW10ejkhtnnRCRmkiouenB4FrWt/BUSyw== 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=CGbfjJaeCFsHY4yrDPsgA0/1fC10vw15xK0xAuVzttU=; b=iqAQwg4CbA0k+0JIpoGROyU26J9ouh45OUrit6M3eaS9tYoPXeCbj8t9RqqIlLIvhmd0390tE6tN1SJDa1zBAaagMAMyxDsPzNE4TtDzutaOeFNAAnKxvUaPfz+3FBuju+e3ZGQo5dh82CJcjBHt8YIg1drs2YksilqPuLfHCgA= Received: from SJ0PR03CA0212.namprd03.prod.outlook.com (2603:10b6:a03:39f::7) by IA1PR12MB6409.namprd12.prod.outlook.com (2603:10b6:208:38b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6477.37; Thu, 15 Jun 2023 16:51:19 +0000 Received: from SN1PEPF000252A0.namprd05.prod.outlook.com (2603:10b6:a03:39f:cafe::4) by SJ0PR03CA0212.outlook.office365.com (2603:10b6:a03:39f::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.27 via Frontend Transport; Thu, 15 Jun 2023 16:51:16 +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 SN1PEPF000252A0.mail.protection.outlook.com (10.167.242.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6500.27 via Frontend Transport; Thu, 15 Jun 2023 16:51:16 +0000 Received: from SATLEXMB08.amd.com (10.181.40.132) 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.2507.23; Thu, 15 Jun 2023 11:51:15 -0500 Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB08.amd.com (10.181.40.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Thu, 15 Jun 2023 09:51:15 -0700 Received: from xsjlizhih40.xilinx.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.23 via Frontend Transport; Thu, 15 Jun 2023 11:51:14 -0500 From: Lizhi Hou To: , , , CC: Lizhi Hou , , , Subject: [PATCH V9 3/6] PCI: Add PCI quirks to generate device tree node for Xilinx Alveo U50 Date: Thu, 15 Jun 2023 09:50:39 -0700 Message-ID: <1686847842-33780-4-git-send-email-lizhi.hou@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1686847842-33780-1-git-send-email-lizhi.hou@amd.com> References: <1686847842-33780-1-git-send-email-lizhi.hou@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF000252A0:EE_|IA1PR12MB6409:EE_ X-MS-Office365-Filtering-Correlation-Id: b1534be7-3ebf-43b0-c406-08db6dc0bc80 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: c7zPC0zg91jlpc6RF3qFZDnkFLlo9nJwxZ4yb/E2hYS7k33GqSKFFB6QYViZIGuRgKzIPFq0j+S1SKH6tK95UZzN9PTy8tUoKxmh39vmt9dOHrepbYZ3+pFnYzpq7n91rbsnybAzTym8DtiAbcNdjjT2RjL/a0kAl0aY2kVA6XVa0RmejwZ3+fDNOVwfOllt1ZbV4Scp8hTLL6TvF4jARC+JSVs8beM2C3JfD//g2S3nUzvYi+IA6dmNVVB8gTHitsc4Nrm7oJbFchj8uVv4df2ghpXWecbFKvRTslui27POBwxWdZ8WikjDfEn7VXZm+g7xFM+V8RBs7jDLhowatZg61crbWZTE+kfRpGJc8HF4t/x489SIUwbV7ItqOzUsKXQtcW5+E7bD314zMvXMGjtvNZu0zH/RS9tY5XQAlwTSVAANTouE7X2Y8xF/gJQcAYvEFigWk+KDEBADWT9/U8wT2JwiR1HUqUkSHoQasqK+7B8Xn1KaJLNfTyFbRKecY6O/3Qe50xFjpmihcRUaou97a5K03VAKpPs7in3l3IvNyYCFlekdr5/D259uO3F7ElD990nTQthHrAhn8jisU9KdTbc32HwNhh9T21oxiU5XZfWDyk26HTWYd9VJOvodS4Ess/Y/48C2U8K90M0IutNE2WALYl0/7rQn9tnDFaa7GWiN6dy0FsJ8LSnGskve74Xfry9lsm8tqwMMXzNuusTG3m5upi8smyyr197Cs7VTTtXToXKbV0bGiW7Fs8azcAH++NQIeI20Xf9E95B7jA== 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:(13230028)(4636009)(346002)(136003)(376002)(396003)(39860400002)(451199021)(40470700004)(46966006)(36840700001)(5660300002)(426003)(336012)(186003)(40480700001)(44832011)(2906002)(47076005)(2616005)(36860700001)(41300700001)(8936002)(26005)(40460700003)(8676002)(110136005)(54906003)(316002)(6666004)(36756003)(478600001)(81166007)(356005)(82310400005)(82740400003)(4326008)(86362001)(70206006)(70586007)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2023 16:51:16.5979 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b1534be7-3ebf-43b0-c406-08db6dc0bc80 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: SN1PEPF000252A0.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6409 X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=no 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?1768790777088965732?= X-GMAIL-MSGID: =?utf-8?q?1768790777088965732?= 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 --- drivers/pci/quirks.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index c525867760bf..c8f3acea752d 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -6041,3 +6041,14 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9a2d, dpc_log_size); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9a2f, dpc_log_size); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9a31, dpc_log_size); #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); From patchwork Thu Jun 15 16:50:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lizhi Hou X-Patchwork-Id: 108663 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp798871vqr; Thu, 15 Jun 2023 10:28:25 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ54ivhxKm950FESnPhUUTvuZiwlqI5EVXCL8gEv2KzXzQVsEgFu6bftU0ztW4oQKSp2yqTQ X-Received: by 2002:a05:6a20:1047:b0:117:1c52:ba7c with SMTP id gt7-20020a056a20104700b001171c52ba7cmr142336pzc.6.1686850104716; Thu, 15 Jun 2023 10:28:24 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1686850104; cv=pass; d=google.com; s=arc-20160816; b=gEQGjGKU73+aWQTM9UfbS/YGrdG2PVSqAtI1Mi7HPvfsLCwHZOutOCyeNB/hNF3XUh oqzRyRAHQGGAZk8axEdI7FZ/UOS9CIAZ136gV5AeyANetYpu0R9EucVsXX2Akr1PQajW YtUOjd6oYTaw4oTVpYDdegVXUf6O3++7f3QmMlCn6lv8Ry+H1qFI66AHjKax+PeUGCMq 48lTtlHUc6k6uncCkdLqzPcceJxMTqHW7+zXWm5kpDIgfbfZdqDi7RCAM2AfSG3c5ime gajcTJX0sazjmzHaKOmugTw6D2kYQ7KUouN5+c2wyHko5asX8jBGN1s4S/6h79qg+MLO jZ0A== 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=ZZ1kgSZw47xXhcNbhwHHN5lf0GqcJcShG1NB5mlUfWg=; b=MqOmHiwjoEPjMhdxWqUMC941Hefq6Nmvo7T87GTXyHs0A9CswPAPPGBLMZlxVQ/9Rs CPUFX8gYr8QrCeOI2YYSmXE5gDNKLwiUZmyfKbgtURg57abkI/Yo9JPBiKZzXXITYRPh BODXskUV03gZCN0euQb6UNNt1hkiAohpj+mveHM2wA5LV2Smw8y8G8oH90cSkPqUCW3G ah/xPO7kfwelpohvRkXL/mIw3MbXF6dUouD4vyKoClSfSV1ES2mYjQ+PTIgjTI8v06IX RiU+HzIycCXyK0duumu2Gse7eBu6HiJmX3KJI5+rrUI73SQfTsFBO9ELGk2AILcP3mLM kZ8w== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=Qqn9r+lY; 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 e16-20020a170902ef5000b001aaf91ae3acsi13413969plx.485.2023.06.15.10.28.11; Thu, 15 Jun 2023 10:28:24 -0700 (PDT) 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=Qqn9r+lY; 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 S238709AbjFOQxH (ORCPT + 99 others); Thu, 15 Jun 2023 12:53:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237768AbjFOQv3 (ORCPT ); Thu, 15 Jun 2023 12:51:29 -0400 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on20615.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe5b::615]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 972C02D76; Thu, 15 Jun 2023 09:51:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ODYCqBeJkOquGtoWnrhCcOp8EyJ0g6JewrJ0GK3osSn5oCM7CxzFcLTNZ/vGqGRbOOHmiTMW4WyvS5cLQpgu44nLxxB5PCS9BlHvyu40ZhkmEv/A+MroYC65nQ41jHcJdeB3l/4sxFmtUxolPR4HgGgcbkJdPG9fyCCfEY/KHwTejcTRgNHLUpxXiPpL/feLkNZvRJZjSpuenoE/eaiDjl46pUZoQkk3IxFHOFGT4rmsevy5unZR8MFj6HTzGfxOUN51Y7ZdSwOCCxh3P24P7zUnHKwXH5Cy2eAaLse7TeypuzX0uZKy7BaHMevQKrEOy+XqPQQQenpsuip+5BHpkw== 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=ZZ1kgSZw47xXhcNbhwHHN5lf0GqcJcShG1NB5mlUfWg=; b=WhfX9TmC7fLVF7IaRATXj1wMnX9aq6h8Mvk1fzYWlr3oEoqsPHyxoxPSe5MLzwilSm0k8K0Jwp2hw3U1Qb1pCjOvd6JXuuoycGBiRjJ6qnfRxMIx7LlK/DsN2Ja2onXMuNck+rlql+uyTU07iBDLmUwjvYKcn9ztdilurijLlS40X9p96kadM5eVRkmgumhA3JnyV88jPpWK/m9JHERtFqBQSMdc8APOut2Y7BYSA0Ioj0umsVeLDYtdghlIXdVVRJw6tNa8bd3RG+tn3bkKpwq992JbcsZvudTjpL28a7FUlveDZnr7pPIJbOd9P2br7iaRHpmA3Ltx8WFpV3F3mA== 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=ZZ1kgSZw47xXhcNbhwHHN5lf0GqcJcShG1NB5mlUfWg=; b=Qqn9r+lYXH2QcgOYsKZIUlEfQ1g6j4bvmy5gEBLO3xn6PVTG5d+fcNtaHP9A1QKFEWGpfGObgSfsmNfTrD2ykLCNIG8xd8wkbBpOUJ7PiCU4ijLefpK+Ac/36USRG4DrfGkcU4gDIgZmw0ZdxgBsYq2KG74T+0p5qZdb3h7LvVo= Received: from SJ0PR03CA0235.namprd03.prod.outlook.com (2603:10b6:a03:39f::30) by PH8PR12MB6841.namprd12.prod.outlook.com (2603:10b6:510:1c8::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6477.29; Thu, 15 Jun 2023 16:51:21 +0000 Received: from SN1PEPF000252A0.namprd05.prod.outlook.com (2603:10b6:a03:39f:cafe::8e) by SJ0PR03CA0235.outlook.office365.com (2603:10b6:a03:39f::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6477.37 via Frontend Transport; Thu, 15 Jun 2023 16:51:20 +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 SN1PEPF000252A0.mail.protection.outlook.com (10.167.242.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6500.27 via Frontend Transport; Thu, 15 Jun 2023 16:51:19 +0000 Received: from SATLEXMB03.amd.com (10.181.40.144) 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.2507.23; Thu, 15 Jun 2023 11:51:16 -0500 Received: from xsjlizhih40.xilinx.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.23 via Frontend Transport; Thu, 15 Jun 2023 11:51:15 -0500 From: Lizhi Hou To: , , , CC: Lizhi Hou , , , Subject: [PATCH V9 4/6] PCI: Add ranges property for pci endpoint Date: Thu, 15 Jun 2023 09:50:40 -0700 Message-ID: <1686847842-33780-5-git-send-email-lizhi.hou@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1686847842-33780-1-git-send-email-lizhi.hou@amd.com> References: <1686847842-33780-1-git-send-email-lizhi.hou@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF000252A0:EE_|PH8PR12MB6841:EE_ X-MS-Office365-Filtering-Correlation-Id: 1a2b8885-35e0-438b-363a-08db6dc0be7a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YN9pV2CKCKlNfUayfLyJt82lwo7VEyfkqNna8vfNrVDegKIitMe0krkL5MYXrfzsNJYFHMAub2h5RInLXHtMMECIxq8LLzDbq41fsYMckguslAgweU1s6IbptK57OKzQUBpvQPjAgJlzLFEMqIC/UVwTZz6Hm0FL/iXjrRItcOewXT8m0N1dlxZ6QNASboeOM48zbwMCrKGVdm31oZ+zUo8SsYFcGvkmdPKtEZZ+04nNj6BIyNpUH8glipGH1gO2MyBROyR2Oe2oDeY10irrI4QeGTYmRZOfQzaPO3bB4VXRiLC0CvSkVTYMzWjQ/YgY3rRfq9ky7yEEW3yXuhP5rviaa8Hc+X3wfCeFJDNM2eeWA2ibyj3THnredG+/pVeQ4wQ5Jt4S6x6LaQqkFPZskCBhF5ToBDuGDmK3A9SKGfYhkLBZ0PGopszPMVSvuX+CP/gVF7Mv3FqoWfh9tuikhoMROhUX4BoAKbCB8PRQwu+e4VXgom2vKVoNAlj0oMcjkDvqcYarwvXeUMj5dDgpfvTjUhVifZGNHUTnCH+7fucEemZWsLr+hmGYWEUcGRrUjQJ5kuv9S9CZaJmToByeNqoRJxDeRvQb2Os1K6QMuoJu67UYwqo+dxqqhANEWXz3LMUQYJ+HkK/B5CiNVg/qDcFvHhqh/WoCTnSbasxrHLBUsB43Batdth5gMBTQEfOzefcSddWUD4pG3s6CFmSf4Wpv6e9XTrbSqw1gyUlk6jUEJrP5cys1vAnz2M2OVNBkunuLdzdBDSvhP0uruPaL6A== 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:(13230028)(4636009)(39860400002)(136003)(376002)(346002)(396003)(451199021)(46966006)(40470700004)(36840700001)(47076005)(186003)(26005)(40460700003)(82310400005)(86362001)(44832011)(82740400003)(81166007)(2616005)(36860700001)(40480700001)(83380400001)(336012)(426003)(356005)(2906002)(36756003)(41300700001)(6666004)(316002)(110136005)(54906003)(8936002)(8676002)(70586007)(478600001)(70206006)(4326008)(5660300002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2023 16:51:19.9104 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1a2b8885-35e0-438b-363a-08db6dc0be7a 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: SN1PEPF000252A0.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB6841 X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,SPF_HELO_PASS, SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=no 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?1768790535026920666?= X-GMAIL-MSGID: =?utf-8?q?1768790535026920666?= For PCI endpoint defined quirks to generate device tree node, it requires 'ranges' property to translate iomem addresses for its downstream devices. Signed-off-by: Lizhi Hou --- drivers/pci/of_property.c | 33 ++++++++++++++++++++++----------- drivers/pci/quirks.c | 1 + 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/drivers/pci/of_property.c b/drivers/pci/of_property.c index bdd756c8d7de..08654740f314 100644 --- a/drivers/pci/of_property.c +++ b/drivers/pci/of_property.c @@ -84,15 +84,22 @@ static int of_pci_prop_ranges(struct pci_dev *pdev, struct of_changeset *ocs, struct of_pci_range *rp; struct resource *res; int i = 0, j, ret; + u32 flags, num; u64 val64; - u32 flags; - rp = kcalloc(PCI_BRIDGE_RESOURCE_NUM, sizeof(*rp), GFP_KERNEL); + if (pci_is_bridge(pdev)) { + num = PCI_BRIDGE_RESOURCE_NUM; + res = &pdev->resource[PCI_BRIDGE_RESOURCES]; + } else { + num = PCI_STD_NUM_BARS; + res = &pdev->resource[PCI_STD_RESOURCES]; + } + + rp = kcalloc(num, sizeof(*rp), GFP_KERNEL); if (!rp) return -ENOMEM; - res = &pdev->resource[PCI_BRIDGE_RESOURCES]; - for (j = 0; j < PCI_BRIDGE_RESOURCE_NUM; j++) { + for (j = 0; j < num; j++) { if (!resource_size(&res[j])) continue; @@ -102,8 +109,12 @@ static int of_pci_prop_ranges(struct pci_dev *pdev, struct of_changeset *ocs, val64 = res[j].start; of_pci_set_address(pdev, rp[i].parent_addr, val64, 0, flags, false); - memcpy(rp[i].child_addr, rp[i].parent_addr, - sizeof(rp[i].child_addr)); + if (pci_is_bridge(pdev)) { + memcpy(rp[i].child_addr, rp[i].parent_addr, + sizeof(rp[i].child_addr)); + } else { + rp[i].child_addr[0] = j; + } val64 = resource_size(&res[j]); rp[i].size[0] = upper_32_bits(val64); @@ -161,13 +172,13 @@ int of_pci_add_properties(struct pci_dev *pdev, struct of_changeset *ocs, if (pci_is_bridge(pdev)) { ret |= of_changeset_add_prop_string(ocs, np, "device_type", "pci"); - ret |= of_changeset_add_prop_u32(ocs, np, "#address-cells", - OF_PCI_ADDRESS_CELLS); - ret |= of_changeset_add_prop_u32(ocs, np, "#size-cells", - OF_PCI_SIZE_CELLS); - ret |= of_pci_prop_ranges(pdev, ocs, np); } + ret |= of_pci_prop_ranges(pdev, ocs, np); + ret |= of_changeset_add_prop_u32(ocs, np, "#address-cells", + OF_PCI_ADDRESS_CELLS); + ret |= of_changeset_add_prop_u32(ocs, np, "#size-cells", + OF_PCI_SIZE_CELLS); ret |= of_pci_prop_reg(pdev, ocs, np); ret |= of_pci_prop_compatible(pdev, ocs, np); diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index c8f3acea752d..51945b631628 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -6052,3 +6052,4 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9a31, dpc_log_size); */ 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); +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_REDHAT, 0x0005, of_pci_make_dev_node); From patchwork Thu Jun 15 16:50:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lizhi Hou X-Patchwork-Id: 108648 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp780725vqr; Thu, 15 Jun 2023 10:02:00 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4W6RmVYZhFcLN4ZoVQzj3GbmYGdOEdBmp2pS/jjGmhUshE4T3YDsH6jFErc14lYg7JTH5i X-Received: by 2002:a17:902:ce8a:b0:1b1:a0bb:4c75 with SMTP id f10-20020a170902ce8a00b001b1a0bb4c75mr19421886plg.53.1686848520280; Thu, 15 Jun 2023 10:02:00 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1686848520; cv=pass; d=google.com; s=arc-20160816; b=rTESXzM05QmbkNhrjASShxXKT28Y0g4fxtdV5+LePNrGkpFr0NS+hL0sh6dcn3KTuc hQPMrFduHdgsZW03GLZXvvhEwJrZfMVCI4IkxG+qcQsyNuoLsYq+S4MD0uHpE4rR6zP1 2ht5fHGIckKfEM6dfpzRaZ74NaaNK7UbUIb+n4sNuTmytBWB8p8cg5SQxhTJiM7mG5hJ 4DHEivXbMtZZ8hlOJuRJYVxqyWsTC3q6gorsaKWmdpt7yH3E9oE3md/3Q3KBnkXQjfYo hdphAuQNgheUFbk+LMMb06J/RKyj0IY1ni1rLZamV4tF8BI4Oe+XpMZi5cJKAcyxQVwt YJ7A== 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=MADuss227WzePRnbWXwwjohHHj2nTjBiOHJxq1H/10o=; b=F8RrBNC1RAFy+EF3gOVkis6oMy1QjpixSmyAl/LLkA1MMf2SWGQp8HkiAjyu9zGnS4 23cJrDxPc6MwiMccptTdBASauv7BiyA3RJ4CR7qzRKWMIQUsU+OmtloCDGAyMEeLgEBC 4BR4yndwFt+Kwy7tWlpDBJIpwGg7oSMYzdcgaqTS8IdTXhWR5sgx8AZQxLTNJ7Beswhi uvWtfd3zTDkTDDNTBkvtYm2sDdfbGGhALDigQSKXN5dc2cQUTBYYzvl5Y7LgyOpvH2hv SZcDLmazUNxH8oeQHM0U6U39gb8LePnW5KYneaHTm+2WRl9/Sszlhksib7hISeUSUafe sEUQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=xk0c2kk7; 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 y18-20020a17090322d200b001ae3e5b31b5si8183426plg.193.2023.06.15.10.01.46; Thu, 15 Jun 2023 10:02:00 -0700 (PDT) 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=xk0c2kk7; 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 S237236AbjFOQxR (ORCPT + 99 others); Thu, 15 Jun 2023 12:53:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50504 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237963AbjFOQvo (ORCPT ); Thu, 15 Jun 2023 12:51:44 -0400 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2078.outbound.protection.outlook.com [40.107.92.78]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 187062D7F; Thu, 15 Jun 2023 09:51:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PQVxnOSFUKEqbQ6cRA+ns2IbEAs86PgKIPQQh/GcSOXPErI9lOf/VZScQW6neoMNXAlCNTLwdjRcSLM4TXjUma/gM4IG3b2otzqJBy65pvlqqkUt9J7PY9TPzr2Tj2l5pSL9VeqMyn7tpDoVvRv0jh2RdtPyngLoZ8D9Srcv17etkb5NTbZjBJtLdEUGE85Zldrx42UdMQsvG7Wb2MYei8jzXpDMPtbMJcWryRWsAgFylqcWt8Vst0U4acnFtEbSLhA8wu1qnca713FfmO5IqlBDgG510Qb44ZDZ34hde9P/0MactGYIraQqsfbLhyG1BqwtDJdnY4gY8rIq5k3Ixw== 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=MADuss227WzePRnbWXwwjohHHj2nTjBiOHJxq1H/10o=; b=byQsHvrnCvLTmndqrzk+upLJxX1TU2Stgqr6dr7cVhpem8CW9rFgTdjiOWLUIktuGsbGpjR8s2+lf/pGe/Z1YIWQn37CiFQIAxNQSIRgmHggLi1P9Eq1xjjfRi5x9KPsgNbsyS5da7JYRxp6bxOY3XfNd3hlF5ccH4J5TKEMlslyrT4CJKgYQFENgGOk4sVp7T/cqjlevdu2TRwerUn1OU/W3loo6RPv+xbs6bXQPpp6vXfLt7SwXN35MqdlGjzL2DzaHsJijKuD0TY78t5EwjsBqE7vD3fwP4dnfpeoiph/gPCzDzYLA4tPCnqdgF1PHATTH7mOx/qSpRZ4ejB0Ng== 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=MADuss227WzePRnbWXwwjohHHj2nTjBiOHJxq1H/10o=; b=xk0c2kk7SQ2zxbgxV8lWrRYd/t1FbNVgucuP+WTzowOrB0dj2wWYzxebhESgnxoDtrv2ZTvwDv1ixUSVhFdR2o/KXz4ZWa+BIviNkBQ05XcOpaUJbQrUAL4IEFboPp0HPpG3tnYi2pJaFdV9Dw474lZwoU8dXCjpxmNv4oaNjmo= Received: from SJ0PR03CA0222.namprd03.prod.outlook.com (2603:10b6:a03:39f::17) by DS7PR12MB8249.namprd12.prod.outlook.com (2603:10b6:8:ea::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.25; Thu, 15 Jun 2023 16:51:23 +0000 Received: from SN1PEPF000252A0.namprd05.prod.outlook.com (2603:10b6:a03:39f:cafe::ec) by SJ0PR03CA0222.outlook.office365.com (2603:10b6:a03:39f::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.27 via Frontend Transport; Thu, 15 Jun 2023 16:51:22 +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 SN1PEPF000252A0.mail.protection.outlook.com (10.167.242.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6500.27 via Frontend Transport; Thu, 15 Jun 2023 16:51:22 +0000 Received: from SATLEXMB03.amd.com (10.181.40.144) 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.2507.23; Thu, 15 Jun 2023 11:51:17 -0500 Received: from xsjlizhih40.xilinx.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.23 via Frontend Transport; Thu, 15 Jun 2023 11:51:16 -0500 From: Lizhi Hou To: , , , CC: Lizhi Hou , , , Subject: [PATCH V9 5/6] of: overlay: Extend of_overlay_fdt_apply() to specify the target node Date: Thu, 15 Jun 2023 09:50:41 -0700 Message-ID: <1686847842-33780-6-git-send-email-lizhi.hou@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1686847842-33780-1-git-send-email-lizhi.hou@amd.com> References: <1686847842-33780-1-git-send-email-lizhi.hou@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF000252A0:EE_|DS7PR12MB8249:EE_ X-MS-Office365-Filtering-Correlation-Id: 30b1aed9-5c1c-4ecd-e9af-08db6dc0bff2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lIw8qZCC1jZHuSne8CluEy02R2tDI6j2OzHIHaXfUDhRV0Nld2ZDzdBbnFQsppmLpZ83UgCQ+BTOf8qPPYb8+Q9OyRdZt4xj2GMgm0i7sNsOxEZhd1+hUcafmiAOqhQGmc4D4hStETEjuSfniOmpk28nQzyp1ImfH2umiasfacjH9mUxVOmhJ737ewqJC/6BG6vYRW1awCAv1js5tKlgExF0ZJyCsC9nOsQagkEebL5Zs+/g0XgoJT/Ju41YfaSgYdPlFRqEhRIy8V1FLA3BbBb1z7+nDBRtPNwBDtwAMqy53A02Iq91+QoXdFt1pYmK9/yWZ3cdbuG2I59n7gu1TT2iq1QS1pj7IEnlQtCljMJ8XL0nfYbEwtsNpOGMCNwiTwCgmxPHBLLFTeMM+3tBBC+rrNpY9Lqga4w0hmRKyb53WBzyw/HRYspHSa9E68fxlClYiREIFM8s8XFIvi6kWPxG0zIYkHAwripH0rSPOtgVJJR4Cyr86DLEI/qTaXFWHcYrlaROhENqPvHt/dVd08k3CSJuUcWYwAvvUEek58mKGJ2dLnjUxFpxv5NOgXk2745kl/HlPObg7iwSdIKSE18+pibSToIG+nWrzW6u1WeKHRjFMmFkBJmFs4QPH4t3AvqS4VTA+ByqCpLftimGdos6Pq0ZKF4WMLtMh3lZMWJ1CuClX4UjHc6dCncSZ8rKrtCFbvhabD14CTFCSfoCTzzop/rV5pgbjylZ9t6ZGxoGo93S5bONSnfemdlhDTh7yvww6g3/iO+HBp1wz3PDkQ== 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:(13230028)(4636009)(346002)(39860400002)(396003)(376002)(136003)(451199021)(40470700004)(46966006)(36840700001)(54906003)(110136005)(82310400005)(8676002)(41300700001)(86362001)(8936002)(70206006)(316002)(6666004)(36756003)(4326008)(70586007)(40460700003)(478600001)(36860700001)(26005)(47076005)(44832011)(40480700001)(82740400003)(5660300002)(83380400001)(186003)(2906002)(426003)(81166007)(356005)(336012)(2616005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2023 16:51:22.3792 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 30b1aed9-5c1c-4ecd-e9af-08db6dc0bff2 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: SN1PEPF000252A0.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB8249 X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=no 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?1768788873997609796?= X-GMAIL-MSGID: =?utf-8?q?1768788873997609796?= Currently, in an overlay fdt fragment, it needs to specify the exact location in base DT. In another word, when the fdt fragment is generated, the base DT location for the fragment is already known. There is new use case that the base DT location is unknown when fdt fragment is generated. For example, the add-on device provide a fdt overlay with its firmware to describe its downstream devices. Because it is add-on device which can be plugged to different systems, its firmware will not be able to know the overlay location in base DT. Instead, the device driver will load the overlay fdt and apply it to base DT at runtime. In this case, of_overlay_fdt_apply() needs to be extended to specify the target node for device driver to apply overlay fdt. int overlay_fdt_apply(..., struct device_node *base); Signed-off-by: Lizhi Hou --- drivers/of/overlay.c | 42 +++++++++++++++++++++++++++++++----------- drivers/of/unittest.c | 3 ++- include/linux/of.h | 2 +- 3 files changed, 34 insertions(+), 13 deletions(-) diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c index 7feb643f1370..6f3ae30c878d 100644 --- a/drivers/of/overlay.c +++ b/drivers/of/overlay.c @@ -682,9 +682,11 @@ static int build_changeset(struct overlay_changeset *ovcs) * 1) "target" property containing the phandle of the target * 2) "target-path" property containing the path of the target */ -static struct device_node *find_target(struct device_node *info_node) +static struct device_node *find_target(struct device_node *info_node, + struct device_node *target_base) { struct device_node *node; + char *target_path; const char *path; u32 val; int ret; @@ -700,10 +702,23 @@ static struct device_node *find_target(struct device_node *info_node) ret = of_property_read_string(info_node, "target-path", &path); if (!ret) { - node = of_find_node_by_path(path); - if (!node) - pr_err("find target, node: %pOF, path '%s' not found\n", - info_node, path); + if (target_base) { + target_path = kasprintf(GFP_KERNEL, "%pOF%s", target_base, path); + if (!target_path) + return NULL; + node = of_find_node_by_path(target_path); + if (!node) { + pr_err("find target, node: %pOF, path '%s' not found\n", + info_node, target_path); + } + kfree(target_path); + } else { + node = of_find_node_by_path(path); + if (!node) { + pr_err("find target, node: %pOF, path '%s' not found\n", + info_node, path); + } + } return node; } @@ -715,6 +730,7 @@ static struct device_node *find_target(struct device_node *info_node) /** * init_overlay_changeset() - initialize overlay changeset from overlay tree * @ovcs: Overlay changeset to build + * @target_base: Point to the target node to apply overlay * * Initialize @ovcs. Populate @ovcs->fragments with node information from * the top level of @overlay_root. The relevant top level nodes are the @@ -725,7 +741,8 @@ static struct device_node *find_target(struct device_node *info_node) * detected in @overlay_root. On error return, the caller of * init_overlay_changeset() must call free_overlay_changeset(). */ -static int init_overlay_changeset(struct overlay_changeset *ovcs) +static int init_overlay_changeset(struct overlay_changeset *ovcs, + struct device_node *target_base) { struct device_node *node, *overlay_node; struct fragment *fragment; @@ -786,7 +803,7 @@ static int init_overlay_changeset(struct overlay_changeset *ovcs) fragment = &fragments[cnt]; fragment->overlay = overlay_node; - fragment->target = find_target(node); + fragment->target = find_target(node, target_base); if (!fragment->target) { of_node_put(fragment->overlay); ret = -EINVAL; @@ -877,6 +894,7 @@ static void free_overlay_changeset(struct overlay_changeset *ovcs) * * of_overlay_apply() - Create and apply an overlay changeset * @ovcs: overlay changeset + * @base: point to the target node to apply overlay * * Creates and applies an overlay changeset. * @@ -900,7 +918,8 @@ static void free_overlay_changeset(struct overlay_changeset *ovcs) * the caller of of_overlay_apply() must call free_overlay_changeset(). */ -static int of_overlay_apply(struct overlay_changeset *ovcs) +static int of_overlay_apply(struct overlay_changeset *ovcs, + struct device_node *base) { int ret = 0, ret_revert, ret_tmp; @@ -908,7 +927,7 @@ static int of_overlay_apply(struct overlay_changeset *ovcs) if (ret) goto out; - ret = init_overlay_changeset(ovcs); + ret = init_overlay_changeset(ovcs, base); if (ret) goto out; @@ -952,6 +971,7 @@ static int of_overlay_apply(struct overlay_changeset *ovcs) * @overlay_fdt: pointer to overlay FDT * @overlay_fdt_size: number of bytes in @overlay_fdt * @ret_ovcs_id: pointer for returning created changeset id + * @base: pointer for the target node to apply overlay * * Creates and applies an overlay changeset. * @@ -967,7 +987,7 @@ static int of_overlay_apply(struct overlay_changeset *ovcs) */ int of_overlay_fdt_apply(const void *overlay_fdt, u32 overlay_fdt_size, - int *ret_ovcs_id) + int *ret_ovcs_id, struct device_node *base) { void *new_fdt; void *new_fdt_align; @@ -1037,7 +1057,7 @@ int of_overlay_fdt_apply(const void *overlay_fdt, u32 overlay_fdt_size, } ovcs->overlay_mem = overlay_mem; - ret = of_overlay_apply(ovcs); + ret = of_overlay_apply(ovcs, base); /* * If of_overlay_apply() error, calling free_overlay_changeset() may * result in a memory leak if the apply partly succeeded, so do NOT diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c index 1193a574fa36..4a0774954b93 100644 --- a/drivers/of/unittest.c +++ b/drivers/of/unittest.c @@ -3506,7 +3506,8 @@ static int __init overlay_data_apply(const char *overlay_name, int *ovcs_id) if (!size) pr_err("no overlay data for %s\n", overlay_name); - ret = of_overlay_fdt_apply(info->dtbo_begin, size, &info->ovcs_id); + ret = of_overlay_fdt_apply(info->dtbo_begin, size, &info->ovcs_id, + NULL); if (ovcs_id) *ovcs_id = info->ovcs_id; if (ret < 0) diff --git a/include/linux/of.h b/include/linux/of.h index 82d0a476ec75..5fe5257a7ab7 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -1668,7 +1668,7 @@ struct of_overlay_notify_data { #ifdef CONFIG_OF_OVERLAY int of_overlay_fdt_apply(const void *overlay_fdt, u32 overlay_fdt_size, - int *ovcs_id); + int *ovcs_id, struct device_node *target_base); int of_overlay_remove(int *ovcs_id); int of_overlay_remove_all(void); From patchwork Thu Jun 15 16:50:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lizhi Hou X-Patchwork-Id: 108656 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp790055vqr; Thu, 15 Jun 2023 10:13:23 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7pmzbc8oqqzqh6xjHAV33JEZE37LcCulmUMpufy6J16YKYKc7GzOA+/sT8SbIFP9cPfvUr X-Received: by 2002:a17:90b:3648:b0:25e:7ea8:766 with SMTP id nh8-20020a17090b364800b0025e7ea80766mr2394541pjb.15.1686849203524; Thu, 15 Jun 2023 10:13:23 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1686849203; cv=pass; d=google.com; s=arc-20160816; b=AQ7RD7fe9wVribd9WKccdbCQY6dVNXJ4Z46uFMccOlqan/x6UBm0enuOuvceqDBHhC fnTh+BMJb91ifWw9WhC2iZqIpn1/k6MJGdE7v/5YKhC7EE7Xbi7mu+bFOwL9RO3KtXho Kn9+QwOBGKjVEhzCWPHeOl6oydckOsgMu/Y5ebbO5gbyT8qHFJy+G5kKlephMbsJYuPv OWihgZqkjTG66Jp4Hk0ByhhH9VI8eAF3PKFQUSlyY6kL9s2TkOxh50YjPfPZxci7HWEM IRGGIWln13T2sgD5niF3F5Ru4/ag1JvBnoZF8PJGQFm14vvyYu8eXWrsjJSlxOH0XhqY 6wFA== 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=8jTSUgrEOJPzz+JBGJltnntUGq0K5ay6Dtgklu6/zIc=; b=uFBd17jGS2mJlHaOmT1ZGxFdj6/iZ3I+Bi+DIfgY4obZ4GKESmTI52vph1Ke7myptE WzBc3g+Sjr0ClBcJ8Z7e0E5AT/jGKg9XyD1JSL3zKC8cn9Tf61OrK+OEcg2NRp5UlEal 9Ni1SwI8dxGrzv1IdOTGmWtGc9eq5+ij5haQct219K4uq8OsTdj4+fBRN0mttJ06j35g x8NJLctbLAzRjiFUoUYJfG7ppawEGJsCTJ5QKykj8BHzqShwTykKW+6FLjhIWPbCEt88 hTY6YQqObyPTquhf/+SE27jSfvwqN+w3jKNfcseQnF9m+6W/HZY7/MjBAp+c/AkGUMWg AeIg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=HWoOz1Y7; 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 i6-20020a17090ad34600b002563db5c4b0si14541814pjx.184.2023.06.15.10.13.09; Thu, 15 Jun 2023 10:13:23 -0700 (PDT) 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=HWoOz1Y7; 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 S238201AbjFOQxM (ORCPT + 99 others); Thu, 15 Jun 2023 12:53:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50152 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237788AbjFOQv3 (ORCPT ); Thu, 15 Jun 2023 12:51:29 -0400 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2061a.outbound.protection.outlook.com [IPv6:2a01:111:f400:7eaa::61a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 448142D73; Thu, 15 Jun 2023 09:51:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=l+h2V+eylJinqMMUqEfv+D3yu4iVF19nH5c3N6doHPhDIL+i5Fm5XcNl46U9no/fkeVc4/V4eBENsxQERRxIhBXfC8UMUttdUYg+yWW9i6leyedWkeGYlLDhenZucvuXojQKJm/xSTmlGO59R6XK5TpgxzZT3ymbHe+/MTtmSFhNr2Cr+9XOovvyCl0tYCUD4BRhxP0pc+msTGbbLquiwxwH3DZt8t/zGJsqKnzPbNbUx4GRl/F3iUcPYaMc9ydrIzwqpYz84IyxROWnMcwU2eaajwlyR8N2BOf5v7QnLmlkCku6gJ1PykMqoW21NE6TEtY24a1w6Z66M5Vj7MCa9A== 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=8jTSUgrEOJPzz+JBGJltnntUGq0K5ay6Dtgklu6/zIc=; b=OVlrSSA0jxeTYjdGQbPLRhCvRXdxk9rRKVdFkXW/tfOcUg0E5jlh4cu0WTkV1244cL3f1ylttjO7XtE8fIhsU0+QMfVqaHvcZdOxQCXLpKfE3Iii+GJ16RWdxtFwRhPYY+aR4HUwNpnq6oiX/AK9t6gKizZ4U8ALFA88MTjWUjNZwIKqWq6FVpfQ33KZHKN0AZ8YTi9OUeiIa8ju29lvq9oqljziOVAJ/uR80emLxIIiQ5K3wzpSQfYrzWuKwlN/cwFcvdi0Ox9HV4FeWA3BuaShUXekX08dvtv8du+AzutlpES5r1JVoQTkgrbCWsMtCf2snqNqhUPqwyugZ27hLA== 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=8jTSUgrEOJPzz+JBGJltnntUGq0K5ay6Dtgklu6/zIc=; b=HWoOz1Y720KS/q/Wxw1mvLowrcibjanADg6OvvGpD4ayN7o2QqZf5EKzpXci/tSy5rJZCwtqSNdflYDJmnCvpihipgYJCLpOk2SudjrjPm2a3lMIwiSWkaPPGSt21Jow9LAp+z3Rsv/dx9B/RdqH84wRvc6zidca6UTjwmGnlPI= Received: from BYAPR07CA0073.namprd07.prod.outlook.com (2603:10b6:a03:12b::14) by SN7PR12MB8129.namprd12.prod.outlook.com (2603:10b6:806:323::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6477.37; Thu, 15 Jun 2023 16:51:20 +0000 Received: from MWH0EPF000971E9.namprd02.prod.outlook.com (2603:10b6:a03:12b:cafe::6d) by BYAPR07CA0073.outlook.office365.com (2603:10b6:a03:12b::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.25 via Frontend Transport; Thu, 15 Jun 2023 16:51:19 +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 MWH0EPF000971E9.mail.protection.outlook.com (10.167.243.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6500.27 via Frontend Transport; Thu, 15 Jun 2023 16:51:19 +0000 Received: from SATLEXMB07.amd.com (10.181.41.45) 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.2507.23; Thu, 15 Jun 2023 11:51:18 -0500 Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB07.amd.com (10.181.41.45) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.6; Thu, 15 Jun 2023 09:51:18 -0700 Received: from xsjlizhih40.xilinx.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.23 via Frontend Transport; Thu, 15 Jun 2023 11:51:17 -0500 From: Lizhi Hou To: , , , CC: Lizhi Hou , , , Subject: [PATCH V9 6/6] of: unittest: Add pci_dt_testdrv pci driver Date: Thu, 15 Jun 2023 09:50:42 -0700 Message-ID: <1686847842-33780-7-git-send-email-lizhi.hou@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1686847842-33780-1-git-send-email-lizhi.hou@amd.com> References: <1686847842-33780-1-git-send-email-lizhi.hou@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWH0EPF000971E9:EE_|SN7PR12MB8129:EE_ X-MS-Office365-Filtering-Correlation-Id: caaa430e-f37b-4d88-927f-08db6dc0be09 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NARltVF1U18P5Hg6A0hXFSx9gya8NwG93i/FtAfp3xONR1wBr1aYgrXzh9qSopgryBbWMvxk1lAjnVApC3aTI25P98kn7dgab9WEAKulVsNHcQQ9Mcn5AFvLhZa1uYx7X/nYz0IYzlGz/u9M9f1PBJjbloG5Sv6ORVNwRteO6do1x0z0oqcYBsD0eAKCz54Fn9tGsiU7bnHRw73/NsWFlw4l5CbJdU3EHCeosOJk52tR42rRdrkmEyQL5n0n43Pw2W45EwDVz8e8Qi0M4bNj+QpSvBMdU379SZl6cadcCiJYYYPoIuNsRawI+muIGgoHxk9gmhyFnbY4UXHBqdlROBUvMjsj7tAYJT0Fgh9kDwXkMiSQoWLK1fPpf6yXp0lqWG4BekqjBkxBvkHBXD1IPIJ30QItWc1wyV/Y1CJahj2axtAbhtybzA/Z7dqPFZALs10JT1f+KKTj/m+gHOpAI304kf2YqQiAI2DmiER4OCJcSW95XHCEQxPS5lIpfjehO2MHkl/8FIUypSd/6P6o3pFdeHc84yIhR1Qo2OKEalcb6ed9sRaZi2zDhvi8bCaabhDIFt/ucjvDUUvhDv6XokhvJ7L8Gku/YqkMMG339gzf7LmpTE3gJuwq5b6KBsAVV0u4gMbUh/tTKlJebhcDFabUeSLKn1Hi0PLSRNkRW+GwLZKLJdf3RKXeKfOT9Bu5NsbZusskm777popAWfQ9obMjLDiciHpowyCkQLTH/rUX06/2ftzj8shMi1iT7r9OxkkDUJldT5BJw2NcFvl7Qw== 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:(13230028)(4636009)(39860400002)(346002)(376002)(396003)(136003)(451199021)(40470700004)(46966006)(36840700001)(44832011)(40480700001)(70586007)(70206006)(36756003)(4326008)(316002)(2906002)(5660300002)(40460700003)(8936002)(8676002)(41300700001)(110136005)(47076005)(54906003)(86362001)(82310400005)(478600001)(6666004)(26005)(36860700001)(186003)(82740400003)(81166007)(356005)(336012)(83380400001)(426003)(2616005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2023 16:51:19.0941 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: caaa430e-f37b-4d88-927f-08db6dc0be09 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: MWH0EPF000971E9.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB8129 X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,SPF_HELO_PASS, SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=no 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?1768789590353805750?= X-GMAIL-MSGID: =?utf-8?q?1768789590353805750?= pci_dt_testdrv is bound to QEMU PCI Test Device. It reads overlay_pci_node fdt fragment and apply it to Test Device. Then it calls of_platform_default_populate() to populate the platform devices. Signed-off-by: Lizhi Hou --- drivers/of/unittest-data/Makefile | 3 +- .../of/unittest-data/overlay_pci_node.dtso | 22 ++ drivers/of/unittest.c | 188 ++++++++++++++++++ 3 files changed, 212 insertions(+), 1 deletion(-) create mode 100644 drivers/of/unittest-data/overlay_pci_node.dtso diff --git a/drivers/of/unittest-data/Makefile b/drivers/of/unittest-data/Makefile index ea5f4da68e23..1aa875088159 100644 --- a/drivers/of/unittest-data/Makefile +++ b/drivers/of/unittest-data/Makefile @@ -32,7 +32,8 @@ obj-$(CONFIG_OF_OVERLAY) += overlay.dtbo.o \ overlay_gpio_02b.dtbo.o \ overlay_gpio_03.dtbo.o \ overlay_gpio_04a.dtbo.o \ - overlay_gpio_04b.dtbo.o + overlay_gpio_04b.dtbo.o \ + overlay_pci_node.dtbo.o # enable creation of __symbols__ node DTC_FLAGS_overlay += -@ diff --git a/drivers/of/unittest-data/overlay_pci_node.dtso b/drivers/of/unittest-data/overlay_pci_node.dtso new file mode 100644 index 000000000000..c05e52e9e44a --- /dev/null +++ b/drivers/of/unittest-data/overlay_pci_node.dtso @@ -0,0 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0 +/dts-v1/; +/ { + fragment@0 { + target-path=""; + __overlay__ { + #address-cells = <3>; + #size-cells = <2>; + pci-ep-bus@0 { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x0 0x0 0x0 0x1000>; + reg = <0 0 0 0 0>; + unittest-pci@100 { + compatible = "unittest-pci"; + reg = <0x100 0x200>; + }; + }; + }; + }; +}; diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c index 4a0774954b93..e21f0bdc1b85 100644 --- a/drivers/of/unittest.c +++ b/drivers/of/unittest.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -3352,6 +3353,7 @@ OVERLAY_INFO_EXTERN(overlay_gpio_02b); OVERLAY_INFO_EXTERN(overlay_gpio_03); OVERLAY_INFO_EXTERN(overlay_gpio_04a); OVERLAY_INFO_EXTERN(overlay_gpio_04b); +OVERLAY_INFO_EXTERN(overlay_pci_node); OVERLAY_INFO_EXTERN(overlay_bad_add_dup_node); OVERLAY_INFO_EXTERN(overlay_bad_add_dup_prop); OVERLAY_INFO_EXTERN(overlay_bad_phandle); @@ -3387,6 +3389,7 @@ static struct overlay_info overlays[] = { OVERLAY_INFO(overlay_gpio_03, 0), OVERLAY_INFO(overlay_gpio_04a, 0), OVERLAY_INFO(overlay_gpio_04b, 0), + OVERLAY_INFO(overlay_pci_node, 0), OVERLAY_INFO(overlay_bad_add_dup_node, -EINVAL), OVERLAY_INFO(overlay_bad_add_dup_prop, -EINVAL), OVERLAY_INFO(overlay_bad_phandle, -EINVAL), @@ -3757,6 +3760,190 @@ static inline __init void of_unittest_overlay_high_level(void) {} #endif +#ifdef CONFIG_PCI_DYNAMIC_OF_NODES + +int of_unittest_pci_dev_num; +int of_unittest_pci_child_num; + +/* + * PCI device tree node test driver + */ +static const struct pci_device_id testdrv_pci_ids[] = { + { PCI_DEVICE(PCI_VENDOR_ID_REDHAT, 0x5), }, /* PCI_VENDOR_ID_REDHAT */ + { 0, } +}; + +static int testdrv_probe(struct pci_dev *pdev, const struct pci_device_id *id) +{ + struct overlay_info *info; + struct device_node *dn; + int ret, ovcs_id; + u32 size; + + dn = pdev->dev.of_node; + if (!dn) { + dev_err(&pdev->dev, "does not find bus endpoint"); + return -EINVAL; + } + + for (info = overlays; info && info->name; info++) { + if (!strcmp(info->name, "overlay_pci_node")) + break; + } + if (!info || !info->name) { + dev_err(&pdev->dev, "no overlay data for overlay_pci_node"); + return -ENODEV; + } + + size = info->dtbo_end - info->dtbo_begin; + ret = of_overlay_fdt_apply(info->dtbo_begin, size, &ovcs_id, dn); + of_node_put(dn); + if (ret) + return ret; + + of_platform_default_populate(dn, NULL, &pdev->dev); + pci_set_drvdata(pdev, (void *)(uintptr_t)ovcs_id); + + return 0; +} + +static void testdrv_remove(struct pci_dev *pdev) +{ + int ovcs_id = (int)(uintptr_t)pci_get_drvdata(pdev); + + of_platform_depopulate(&pdev->dev); + of_overlay_remove(&ovcs_id); +} + +static struct pci_driver testdrv_driver = { + .name = "pci_dt_testdrv", + .id_table = testdrv_pci_ids, + .probe = testdrv_probe, + .remove = testdrv_remove, +}; + +static int unittest_pci_probe(struct platform_device *pdev) +{ + struct resource *res; + struct device *dev; + u64 exp_addr; + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!res) + return -ENODEV; + + dev = &pdev->dev; + while (dev && !dev_is_pci(dev)) + dev = dev->parent; + if (!dev) { + pr_err("unable to find parent device\n"); + return -ENODEV; + } + + exp_addr = pci_resource_start(to_pci_dev(dev), 0) + 0x100; + unittest(res->start == exp_addr, "Incorrect translated address %llx, expected %llx\n", + res->start, exp_addr); + + of_unittest_pci_child_num++; + + return 0; +} + +static const struct of_device_id unittest_pci_of_match[] = { + { .compatible = "unittest-pci" }, + { } +}; + +static struct platform_driver unittest_pci_driver = { + .probe = unittest_pci_probe, + .driver = { + .name = "unittest-pci", + .of_match_table = unittest_pci_of_match, + }, +}; + +static int of_unittest_pci_node_verify(struct pci_dev *pdev, bool add) +{ + struct device_node *pnp, *np = NULL; + struct device *child_dev; + char *path = NULL; + const __be32 *reg; + int rc = 0; + + pnp = pdev->dev.of_node; + unittest(pnp, "Failed creating PCI dt node\n"); + if (!pnp) + return -ENODEV; + + if (add) { + path = kasprintf(GFP_KERNEL, "%pOF/pci-ep-bus@0/unittest-pci@100", pnp); + np = of_find_node_by_path(path); + unittest(np, "Failed to get unittest-pci node under PCI node\n"); + if (!np) { + rc = -ENODEV; + goto failed; + } + + reg = of_get_property(np, "reg", NULL); + unittest(reg, "Failed to get reg property\n"); + if (!reg) + rc = -ENODEV; + } else { + path = kasprintf(GFP_KERNEL, "%pOF/pci-ep-bus@0", pnp); + np = of_find_node_by_path(path); + unittest(!np, "Child device tree node is not removed\n"); + child_dev = device_find_any_child(&pdev->dev); + unittest(!child_dev, "Child device is not removed\n"); + } + +failed: + kfree(path); + if (np) + of_node_put(np); + + return rc; +} + +static void __init of_unittest_pci_node(void) +{ + struct pci_dev *pdev = NULL; + int rc; + + rc = pci_register_driver(&testdrv_driver); + unittest(!rc, "Failed to register pci test driver; rc = %d\n", rc); + if (rc) + return; + + rc = platform_driver_register(&unittest_pci_driver); + if (unittest(!rc, "Failed to register unittest pci driver\n")) { + pci_unregister_driver(&testdrv_driver); + return; + } + + while ((pdev = pci_get_device(PCI_VENDOR_ID_REDHAT, 0x5, pdev)) != NULL) { + of_unittest_pci_node_verify(pdev, true); + of_unittest_pci_dev_num++; + } + if (pdev) + pci_dev_put(pdev); + + unittest(of_unittest_pci_dev_num, "No test PCI device been found\n"); + unittest(of_unittest_pci_dev_num == of_unittest_pci_child_num, + "Child device number %d is not expected %d", of_unittest_pci_child_num, + of_unittest_pci_dev_num); + + platform_driver_unregister(&unittest_pci_driver); + pci_unregister_driver(&testdrv_driver); + + while ((pdev = pci_get_device(PCI_VENDOR_ID_REDHAT, 0x5, pdev)) != NULL) + of_unittest_pci_node_verify(pdev, false); + if (pdev) + pci_dev_put(pdev); +} +#else +static void __init of_unittest_pci_node(void) { } +#endif + static int __init of_unittest(void) { struct device_node *np; @@ -3807,6 +3994,7 @@ static int __init of_unittest(void) of_unittest_platform_populate(); of_unittest_overlay(); of_unittest_lifecycle(); + of_unittest_pci_node(); /* Double check linkage after removing testcase data */ of_unittest_check_tree_linkage();