From patchwork Tue Oct 20 09:39:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 1384763 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=m2DgTxwO; 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=nEM4NEAx; 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=dmWd7ju+; 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 4CFpff2Blwz9sRR for ; Tue, 20 Oct 2020 20:46:18 +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=s9tiTXq6WnlIjz7NRnvFCHUtX9TbnUAZp5YbSB2iuZA=; b=m2DgTxwO2QW2FqnjaS2PuL7Oo l10YKFjCDGbR1e8GDzrrR6zhcdAFnKG9/8ru8lGispU21AcxigdyxNd6YwxXEjHgTp51EHFsSmk+d 8udUrgipM2HsomlD0nLKq/kj077XoptLYg8tC6UGDWQusHEvYJm0qfhE7Ad57wgBagRLEU5ICY1jw p0QPgPVy7JhiMXX7ppeIIzIt0EcGEedlntzTV0u1cG5ym/dgq+g45pn3Itzay5pBGdWQJ2s8Z3bUp lt4A1fgCxab3tq6CA+c9JRoF81XbUu47INLTJNKuExhcP0CNEXWc7kV2KsDDjV/bxNjmQH2/lGXSm 8c091U9uw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kUoDd-00030K-8R; Tue, 20 Oct 2020 09:46:13 +0000 Received: from esa6.hgst.iphmx.com ([216.71.154.45]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kUoDY-0002we-7f for opensbi@lists.infradead.org; Tue, 20 Oct 2020 09:46:11 +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=1603187169; x=1634723169; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=TaVZytoMYVkEuuEbohi2kA4ftvdYVZyesNhvshC7NRc=; b=nEM4NEAxKWy7sB6oTmE3eKjhfTLd/oVpURqNF5k7YmLDTr5dTDhMWVyN ZV4ZksjU5mrmSLyK2EI7PgW/552xAF+BBIJvHdf6IN3VUpJ00zN3Nk+Ng GmPUbCVqpLHTd9U/4vPNqAgbdoSRCThMduSghIyU6cD0Dc4vy25b/ScOb nLahP43ieWkHB8j9qav75GNJQFXpfdN8VugRDYWFG5eHdLoaxeGXbzaIF 9ZvbeH7eGW6oiuhvANJc1rZvdG7uDdCBmw9kCMYs3NJlupbKT7lAdtuer 2mAS55VqeWPrkL1+Zt61f1Px2bnrCys5ui1fetVcYdPk3R1c3uhKkD95U w==; IronPort-SDR: wqV4lsTz8Z1RZyDWFdrorgQMwJHDj7ecEu+mZ8eaiG5pDzfZp0V/YbqkW7ENX0UKrhrE/MWQzJ BPDGIxClmITiNiwMiHoP3FnHNWkaz1AjExTBzBw25cPr2HNoQzQOfDigDA3Mt/LAiZBs9cq7Vb T+etziK6xrGi9UJ+J03wuCYu9t2oh+15rtoAdAEKCAhuT9KEU2/4hlFOxglg3xk05JFw3B7dnK 5mVbE9n+Nh0P4IN2cgEB6Ih03x11IVhq8PLeUGfp+sJwsKY/8kqMH1+wlYNb7qDcEkjb8+32nc vbk= X-IronPort-AV: E=Sophos;i="5.77,396,1596470400"; d="scan'208";a="151634516" Received: from mail-mw2nam10lp2108.outbound.protection.outlook.com (HELO NAM10-MW2-obe.outbound.protection.outlook.com) ([104.47.55.108]) by ob1.hgst.iphmx.com with ESMTP; 20 Oct 2020 17:46:07 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VKx35WktC4q18/SffIsaWDPGGo7ZGmBtmSFvkabW18KKuRSiNGUvQqhyYDjm9aopPUkRkdy0Fl9JuTjiDBrCHwIQLBSdBCI9yI9y3oQz+aVFKpZKNTkpgy5KMjdW7FGuJfIyd5KNJ0PRmBvPB3xaf5scNGVibfyZihyIlDYmiJAp77kSXXli8IFR02ZwllU1mGK0T7/9NCjtNd+I6A0+G8lSzMXEqHr4o0ZaxrVFC9UFN96g653doFoaaDdXcniRVT0Wl4oQW9R5jQB6a6Vs/wXl5+NO8G9iNNcJgDFT8h83qjLuxVnivbxb0HVkVRR/kNACD0m7gk7Lm1Rs8F8bEQ== 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=gindXPU/K7H2wP84aVGfgjndkajjNRbzix45/qm5Aa4=; b=HxOLln7GGL93PVVoFd5Z9WCat4pjuo6Yz98Lu4ZHESddYm/9S+k/OSodiT63KawmKnx9JE8f8DEDLw0tMJUp5Rmsr9zK6BqzPwUoJPsNfW7JMxQgaFy82pTY4g+K0BeUBTnz3zWWodP+3V8nST6Us2wx80j7wCNeCd7Ijw292wdz9yCIJL4UzXGX0zNFUX3PdgHAbS+k4+saTRgfNTg3Fyl+pcFqXBsUuSaoYx6RJAavhjufNbECXrOLQt+2rNRchu3e6O+aNe9uNmtDiFwc3inWXDYVOXlCeh6nCTCUwwoQsUd0qbfYpfCKuY1jdqBh5det/VK6yub1RoqbA6dVhw== 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=gindXPU/K7H2wP84aVGfgjndkajjNRbzix45/qm5Aa4=; b=dmWd7ju+ZMhA0HA6v5Jo9RdF0h2UMjXy7C7EktiLOYJenxPWe9ixG/gQ0HjssDBrUz1LNsApVJ1E2AQvwvBW1ZJR9nf7+L8L5AcjoqQNmcNCyUTaO3MWf+yf55nNsZhdyD9Pv8FXMLbnFRki42+rZplgwSWJS4+slGn8kNGPL7I= 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 DM6PR04MB5833.namprd04.prod.outlook.com (2603:10b6:5:16d::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.20; Tue, 20 Oct 2020 09:46:05 +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.028; Tue, 20 Oct 2020 09:46:05 +0000 From: Anup Patel To: Atish Patra , Alistair Francis Subject: [PATCH v4 12/16] lib: utils: Update fdt_cpu_fixup() to use current domain Date: Tue, 20 Oct 2020 15:09:26 +0530 Message-Id: <20201020093930.2551352-13-anup.patel@wdc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201020093930.2551352-1-anup.patel@wdc.com> References: <20201020093930.2551352-1-anup.patel@wdc.com> X-Originating-IP: [122.172.254.103] X-ClientProxiedBy: MAXPR0101CA0031.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:d::17) 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.172.254.103) by MAXPR0101CA0031.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:d::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.21 via Frontend Transport; Tue, 20 Oct 2020 09:46:03 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 2fb09ddc-73c4-4893-78b5-08d874dcf6df X-MS-TrafficTypeDiagnostic: DM6PR04MB5833: 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: VwbuEjCxUJl50CjbLWRSGMOTjqSAmPz0Lt8CjsSYI3zd8Fi0nY4yhmaaFwzvM9UKQ6rgbBLQ9kUb2FsoiVnEAItkWbuENxqPWJOJn1Px7adCIw8iO4LbXqwCxAYaeWXaw1Mdarok15l/AdCeenRWKUHdUNl5fzrCTqT+N9WxHyMgGTrE3PC2ZN62KJtHfCBO1FXPPH2ju58EaR9Qs2EohE2GlUdZUByEkZj+n1koNn2M9not5FOx1r7Eqm7pEJwnFVh6FNIYUBKhroG7rL8+mfKvtjcbqnMLZPlmKC81coSYB0qk+W1JEVwqsK3WZeG0W+5fSq9DQHAJ0Wuc+uOyDg== 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)(376002)(396003)(346002)(39860400002)(136003)(366004)(6666004)(2616005)(2906002)(956004)(1076003)(55016002)(8886007)(478600001)(44832011)(66476007)(66556008)(5660300002)(66946007)(8676002)(54906003)(316002)(83380400001)(16526019)(186003)(110136005)(15650500001)(26005)(6636002)(55236004)(8936002)(52116002)(4326008)(7696005)(86362001)(36756003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: mnLwDL916qZsR9OxNF0FxFmquSOagKfMCZHttZY22FTWsPVlv//KY6+2ZhPg45JGz9ood7JRC4f7Ndle69zaDICW73kWnr8AFAdSF8GEnJvzfz1QzoczRXkVYK6BwUQCfL6cqEfOUvn0B8766/k6G2zakQMwWsZYcwVEu8DN2ay5jbCduMz19dDLbawy/pjCIRawLWaTGElDvyCKx4o5Z/TO6PxRi2Gs0kxA6JifF4B+vB9IZx9ZdjeyPpXQaNiXyv3rB35UQqx8CUiUeSTKVpVaNRmFGTS6JlV3xMSXqt+HZ2PJg4TQZAD5A3aBJ0hgwGnMaCfy3oGKpLI/bLH/b2uCITBmjsfqqOvQuaNmGB+oQABHSERZENegHPmRf7FvKWEEKZFp//e5SeJeoGqSzpznteQDIQi49qTGPev/aJMKUy7/rfDx8TE979xIRmkm2LwH9iXF15PTqszS6+iSqx6RQtqLJ6ckKieRhcI00itmlVsmVWryQxRcXQ22S4KIz6vm1UWUd69pj0RkazMKBFWqdZ5G2noiTWG/Cv7TcJHwzQ76QGBpJZz2s3g3u1Bvuiyz7sODY+9TtCgt1V2D1OFNGKxhczSDFTUgSFTFZ5XCPWh+wyX1LB5GPSPPOe3eV9esjRnMg0X7Y4y2yfd1EQ== X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2fb09ddc-73c4-4893-78b5-08d874dcf6df X-MS-Exchange-CrossTenant-AuthSource: DM6PR04MB6201.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2020 09:46:05.8401 (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: J11H5WyY1YRZ631d20sZzjMeh3kZ4qvHwHLRsAKEk4k3o10alaFWLeFADVanj3HIPdsWIYlqe0RIs6e5qk/0kA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR04MB5833 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201020_054608_447405_3C3A94A4 X-CRM114-Status: GOOD ( 18.26 ) 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.154.45 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_VALID Message has at least one valid DKIM or DK signature 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.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");