From patchwork Thu Oct 15 13:26:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 1382677 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=YcKI1YWI; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.a=rsa-sha256 header.s=dkim.wdc.com header.b=EuVB3NsW; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-sharedspace-onmicrosoft-com header.b=a2uEBIzK; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CBqpz0CHsz9sRk for ; Fri, 16 Oct 2020 00:28:11 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=0rqWxFqIzce4HXUo7m+9R5AQDbYXZKTFlHbv1b011SA=; b=YcKI1YWICUU04z3JBRimp7y27 kCRb9cRhE5qDwuM6oiNKx2YVV3vf44SaJh7g6RZLRQAOgekNwD768V88Lup0kbl1jOj5ovmBjl91C iEGQBjWWS3d5aWMqMFArSvj0jOoGyshoz9/ojeixM3TWr+H9KEU7KC1c68QKT+xqlEWjtmLcRDd6y I5FXHY/tkFxwIS/bguFOv74PchTDJhQPHqALdH4diJ/zHgPv77cM+bI0qeW74jWpGmB+oP9Fs2bP+ /uJJc39RXPYakXwf5W7J4cDFIEzEFi3yQegdhUDJwM0kblgKuolQiJHwqEv+qMkTN1yeO4KWMBFHW bR2jLMBCA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kT3Ia-0004Un-Ky; Thu, 15 Oct 2020 13:28:04 +0000 Received: from esa3.hgst.iphmx.com ([216.71.153.141]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kT3IY-0004PA-7g for opensbi@lists.infradead.org; Thu, 15 Oct 2020 13:28:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1602768482; x=1634304482; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=jMzCekbcGFfheJbYdnjzYicJYzuPfEgoRqtX8DBysyk=; b=EuVB3NsWtOJp+oPJbYlt9r8SFcrtsguph7ohzXPfWqez8CQmY2zylS63 oSTNBD2naDW+iyY8ZhBdtWO7B7KXRZywRxbPRIWu97Q78gnqdJlodCGrM /epykPYJBH5OV2eTmrdJCMusVNdzx00dBk7VOvBOzuaSESBIiyVyOh+iA OrrFHJ9pLuNB3Msm4kNsJ8FDnCPtKRUC8jsrA6gRySh74El7dSAZ2wSd4 PF2HXmU4zz5ptURzEC+IoqezY168VfdR2myzLhbWaD/nmAXEQsLv9K+oj 2RdP7VnfL9Rtb5nakV5ld5VXDdoXbgcTzXWiG1i64/r0u2BwUzMKPSfSx w==; IronPort-SDR: umsn/KE1cSgHQ+5fLjOuhKvp79qiBILoRmCJhkNGT5SV4dlO3q0lD53HSpwwIFzb9mlouTJvI6 G7JgIW7uAK03+U+UiNAm/OJKkeZyxnWPViPIgWqyBDtJzDXvAb3Qt1tm1OqHddhQbjX3m7xZO7 tdKyoeOXCwQ8hxxoqvHUtOIouYjTY6T+uImOcR9EYrjnYSA5OysPFJS3y7XTY4i90qadz8Xq6H HmvMvqbG2T1g6bDCs7OHw0DZVM1r8CHCnHJFDGyJNrvlGEg0YAI/gUcE5jkscKHCE0/Et3RUE+ 7ic= X-IronPort-AV: E=Sophos;i="5.77,379,1596470400"; d="scan'208";a="154457510" Received: from mail-bn8nam08lp2049.outbound.protection.outlook.com (HELO NAM04-BN8-obe.outbound.protection.outlook.com) ([104.47.74.49]) by ob1.hgst.iphmx.com with ESMTP; 15 Oct 2020 21:28:01 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YzIjCcR0XY/izAOp7UW3dq3P2jNqlQVdZLeb8hfySYBClXXcZJYoyMSl21m941sjjYGcBWF5UQRPH1yar5zPmmp3Rhgf7oXqPuB/R/p/GzXwVrIwCZNBLMhH5Eh2t8agAWYH1NNS4KfPHuEy0DBKNZFLTegaF+2/B2VR4P8fGTxIY2n6DiylhNOHXzQor5Nnl9ICVo3hx+ryZfO0kxDKC/WezZ2y929htoOo/R11/RMpF/7kboSo0eupP/AKwDmw2fyQjs6d/VZAVL/7tG4DKlVgyMC/BTyTXZtjt4WYyQ4DzMaaDJkNBa3lPUlAoW4fyl1HCvxxfDVpa9v2kPf1XA== 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-SenderADCheck; bh=aXJ4wO1cObE/Dzv41FleZY7YMbmDKqtSyD7pzrb9ivI=; b=iMnsIzmmgOXgS8lun9hhwgtZT+SeKPB43A7kCLcwrhASMlHavylIeJSCDWDx5jllqjURZQ2UExXTZvbbWE7+pVhtie3VQ9KfOy8ImOhooKfIvTR113i6GGvsgKPDx73nuoRwI8L3IqLJCeLFgDn7IWsgvjUuaViqYK/LA7EsewpzGRY8QNYW5qMfoP1nKveuEJfuyZWjmO2RxMBx8T5p4Dk3rwQD+/5QqioNsYnyX5oF5eIR117EPu0q23IsgcLRGXVUScEc7B2sKoE4tVYZmKQ00QryGVX2EhWxT8imW4z6++1bWDG6DHSNasSUZ0dNIjBMbLnmYzr0aJGPDvystQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wdc.com; dmarc=pass action=none header.from=wdc.com; dkim=pass header.d=wdc.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector2-sharedspace-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=aXJ4wO1cObE/Dzv41FleZY7YMbmDKqtSyD7pzrb9ivI=; b=a2uEBIzKk2vtIIfzOMzjvK/TRvJB47hJxrGaa2UAAlBgYB4fG+prKRQbt2vO80c4ogJktWStyUDKpXckTgjIXvMAFb/w5bBYoOaHnil7T/2lxS8E1kfcHQ033bj5FGHD1E3ilWnkGM43vUtFDF8XQpu5Qy4OGy5oaxfsngerMJo= Authentication-Results: wdc.com; dkim=none (message not signed) header.d=none;wdc.com; dmarc=none action=none header.from=wdc.com; Received: from DM6PR04MB6201.namprd04.prod.outlook.com (2603:10b6:5:127::32) by DM6PR04MB6624.namprd04.prod.outlook.com (2603:10b6:5:1b6::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.21; Thu, 15 Oct 2020 13:28:00 +0000 Received: from DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::d035:e2c6:c11:51dd]) by DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::d035:e2c6:c11:51dd%6]) with mapi id 15.20.3477.021; Thu, 15 Oct 2020 13:28:00 +0000 From: Anup Patel To: Atish Patra , Alistair Francis Subject: [PATCH v2 12/16] lib: utils: Update fdt_cpu_fixup() to use current domain Date: Thu, 15 Oct 2020 18:56:56 +0530 Message-Id: <20201015132700.2232820-13-anup.patel@wdc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201015132700.2232820-1-anup.patel@wdc.com> References: <20201015132700.2232820-1-anup.patel@wdc.com> X-Originating-IP: [122.167.44.151] X-ClientProxiedBy: MAXPR0101CA0065.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:e::27) To DM6PR04MB6201.namprd04.prod.outlook.com (2603:10b6:5:127::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from wdc.com (122.167.44.151) by MAXPR0101CA0065.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:e::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.22 via Frontend Transport; Thu, 15 Oct 2020 13:27:58 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 55fa4431-e277-44b3-a191-08d8710e2325 X-MS-TrafficTypeDiagnostic: DM6PR04MB6624: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: WDCIPOUTBOUND: EOP-TRUE X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BHT9f+2YvfTQBn5255xPiHlpBzzX3MkHZpDU4Ri9L+lh2x5POJ2VH7ssAJDO/KkJ54DZ+SYC+35GQwz5SJabL3VlVzuXK/UDHn4w+RlwwdgCfJM9frEkdSz9fmdNyFHRjGlgzFqVTKsmpOtzndl6kkcpiTyBNu1tJo/Rkne54oHwWqVRg6Jb9DAtH86vKKtvixs1/JIR9ZzGdPej89oCs+l3DK0BUFs1122Blobig2cHgeqwCO3B7WktPysAbQRs1atFbspz1ZuhR0OpeqMW/cXL8hfq0dHFlfjbnXIFHIsU4PMBMJYkZPNJj24j4k4tOOxV2tMAEqg2mMxlqpj+Mhn3xOcVqn5k6EViZOJIQ5RIhkQequ/2/ZnyWrzBISbl X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM6PR04MB6201.namprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(396003)(376002)(39860400002)(136003)(366004)(346002)(2906002)(66946007)(110136005)(66556008)(5660300002)(44832011)(66476007)(36756003)(316002)(54906003)(15650500001)(8886007)(8676002)(8936002)(86362001)(34490700002)(1076003)(52116002)(26005)(16526019)(186003)(55016002)(83380400001)(478600001)(956004)(2616005)(6636002)(4326008)(7696005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: lFsclswymIn1sJBFg5ma9fnQ8q9zRN2ALmutgB98bCuPkJv/89h71RMPP6Zb9VUFdiISnJ7pelGSPRVeMn1BF4xbx7/8AzaUtMRW+2PpiDoRNY/D14X5tR9N58ostvsdaLwfBh1YbKQ9Tg4vB2Ir3omNnMvyAJQdBCGf0ip5MKN0I3u0Y8yO7fA7UrZ2Bjdn1kN4iwwfqmRoPCFQmAC8sbLfJY7b/I/3kR8aT6utbbZsGdUv6r55TQiADp2GQCQs9KwriPKnXGz3j/8hOwAdR00NqWc6CqJgdHnFRiwQDuxlpeQPQ7WjlV/6AZagkjVNckCVFLk2OA7bvFe+25uT73cx+QCGEq2+mEk7m1c2vdyRsKxq4Qt4k6FQPkZI9LOucuYYuGI3DFSEJHsLJNMmQhkKzH8EF1hkl0lTMHWc7bUdzagPsi1YxNX04Bwzumrk15KiHhp8X7ucWH4xwS5XCAt6CcPSvGV+HlXx8AY7yeLu/oyj22JeMozpcby1WHSXwfY6YlEWajusU1haWQ+KT5ghHyXydYF5Wf8wQP2GQGA7m2At20KntZb2TYDOuSb6sQ9fov6E8Qro8gdaptzxlyIDZbRntwrUI0wPLtus72nCiGUBsAGuI23PF/7vyyOOqjYw+RgLilLbK18sRNA8+w== X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 55fa4431-e277-44b3-a191-08d8710e2325 X-MS-Exchange-CrossTenant-AuthSource: DM6PR04MB6201.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Oct 2020 13:28:00.8763 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: spL2O8vfWXjVZbreahndHGJZG/bg1mqXpAMvIi6RdXjiciKi3qahw37xPSeUmDosdhyGWRM6cvDTnHgd5KP7sw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR04MB6624 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201015_092802_513129_9A69C1E1 X-CRM114-Status: GOOD ( 17.55 ) X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [216.71.153.141 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.0 MSGID_FROM_MTA_HEADER Message-Id was added by a relay X-BeenThere: opensbi@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Anup Patel , Anup Patel , opensbi@lists.infradead.org Sender: "opensbi" Errors-To: opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org The fdt_cpu_fixup() should disable a HART in DT if the HART is not assigned to the current HART domain. This patch updates fdt_cpu_fixup() accordingly. Signed-off-by: Anup Patel Reviewed-by: Atish Patra --- lib/utils/fdt/fdt_fixup.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/utils/fdt/fdt_fixup.c b/lib/utils/fdt/fdt_fixup.c index e9e1dff..eea450d 100644 --- a/lib/utils/fdt/fdt_fixup.c +++ b/lib/utils/fdt/fdt_fixup.c @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include @@ -20,8 +19,7 @@ void fdt_cpu_fixup(void *fdt) { - struct sbi_scratch *scratch = sbi_scratch_thishart_ptr(); - const struct sbi_platform *plat = sbi_platform_ptr(scratch); + struct sbi_domain *dom = sbi_domain_thishart_ptr(); int err, cpu_offset, cpus_offset, len; const char *mmu_type; u32 hartid; @@ -41,12 +39,12 @@ void fdt_cpu_fixup(void *fdt) /* * Disable a HART DT node if one of the following is true: - * 1. The HART is marked invalid by platform support + * 1. The HART is not assigned to the current domain * 2. MMU is not available for the HART */ mmu_type = fdt_getprop(fdt, cpu_offset, "mmu-type", &len); - if (sbi_platform_hart_invalid(plat, hartid) || + if (!sbi_domain_is_assigned_hart(dom, hartid) || !mmu_type || !len) fdt_setprop_string(fdt, cpu_offset, "status", "disabled");