From patchwork Mon Jun 20 16:36:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1645597 X-Patchwork-Delegate: monstr@monstr.eu Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.a=rsa-sha256 header.s=selector1-weidmueller-onmicrosoft-com header.b=FG3n18zH; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LRb1h3rd1z9sFx for ; Tue, 21 Jun 2022 02:38:32 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B5437839FE; Mon, 20 Jun 2022 18:37:30 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=weidmueller.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.b="FG3n18zH"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1DE5F82104; Mon, 20 Jun 2022 18:37:21 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on061c.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe1e::61c]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id BB3BE82068 for ; Mon, 20 Jun 2022 18:37:17 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=weidmueller.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=stefan.herbrechtsmeier-oss@weidmueller.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MajAfoZXMZ3Tpp3FWNhlOWoXB700ze3aJnFequ44wZYtDt0eLYI+bZdUfgucKb0FOFqgwh5bAMwcJ72ITCZjQnsA5IRIJlMiIWdJEyYJ01KsLNkzAbOs6PUexF/ZzS/Q5qAYUBXIp+3HrxGJeibdvkZ7BQC1O3pMZSMn7yQJtQcmNFFIDvADCvwVlNeeYDIvcHB3DDq1roqTQiS35HtEGoD4wxGccoZUlbk9d8VAv1zlp/PBIN0glzvfWX7eADZJEvtCQziwdpMYYKzpYApbkIXCr/iAv5PHGb+oBu1nRH0v9wkCYP8WA/bKmAimUVi+fj+yfOX5RfDo6M3JuU5TLA== 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=7xgctPFnTs7+cuAMyo7tQU2UGrPgcc3z+nnrVKQgIGI=; b=Ojp02iADD7spoANFswpiUDaZGGjeb3YY8EtkWBOhI9luwl1Mozje9yoRlYFRtxt4VqjZUv6kKGG3cn69z2a7FW1fQBWIE2zccfXe8RmpugreK9ls8gMr0Ug/pmbNF0jGEF6wEudSjpfER48zYGW29uM1ufoyZihUVI4ZLGvsAQ2+Fpd1p4+DoddtdsEagOB0E2NBzyKB8Npp6FCOJ/rP8UnjI0N/GHIeXoVKPLduEmCfQiMtuxAZN5hzXdnN41/a1C2bhjBbn6Br15FGIeEzJC1niXIpk0D/vnP3hJldJE+4T+DkxXqAG0q4JiZ63BwrW4aFu+S/UEGjnxAGE0yeFg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.onmicrosoft.com; s=selector1-weidmueller-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7xgctPFnTs7+cuAMyo7tQU2UGrPgcc3z+nnrVKQgIGI=; b=FG3n18zHXkeh7j0icIvEusUOIrCsMy7s7QETKcr0+CHKdy5oYMmHfUdu5OV7KNlPyKPU0W/M+qpuSHc1dfd4ZOaNfnhpgOFbz9yUMbdu6gworKVy6IuEdL33LpHHYtWUa30QHRegb9Z7xu/yftFR/SSsWDbGAyXSl57H6gcOlpo= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) by AM6PR08MB3928.eurprd08.prod.outlook.com (2603:10a6:20b:a9::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.18; Mon, 20 Jun 2022 16:37:16 +0000 Received: from PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::49a6:e5ff:7f94:8787]) by PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::49a6:e5ff:7f94:8787%7]) with mapi id 15.20.5353.022; Mon, 20 Jun 2022 16:37:16 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de, Michal Simek Cc: Stefan Herbrechtsmeier Subject: [PATCH v2 06/15] xilinx: zynqmp: Merge device lists Date: Mon, 20 Jun 2022 18:36:41 +0200 Message-Id: <20220620163650.18756-6-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220620163650.18756-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20220620163650.18756-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: AS9PR06CA0560.eurprd06.prod.outlook.com (2603:10a6:20b:485::10) To PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 879b4557-cafb-464b-b274-08da52db22d4 X-MS-TrafficTypeDiagnostic: AM6PR08MB3928:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: O3wwHHXvEFBrlAuUrXOigLYuv2Tny+tvznWRs7hKTRQomzjjPT2cztSE8DeXzs0sKvRVsHWWvAI8/1xH8vIpJoyXp8GJZF+p8iHLSmG22esKV1idtO2wJ7rMs3uKhQwAFnsfB/GSvhs1YQWERbjrybRgCTXU+55oEmrVxegsRDBZoMDhu5DYBSeQbOH67T8urCtvr0EA+hJZ1i7UF7b1K/FOyyI+JXaHwqa3YLK77PD6Mcp/PkPk6aU1/F7twxF/V9Naqf/GsUcqYAB2hi2RKPE2Uw9iYnG4RwGVs5osDrI9H7206cNvcnpe2qhqjoEH6cGUNLhuEoRnkT2Uxx7y/NldWeDNk5wBSvR+9qRGce7u+mQCkk8AIkVb6MgMAvssYSc/OiKW1Ko7vk2FxuH3TpELsczZTcv2bZR8fb/0q4hCiKi8k6ulXNHp4gfuO8PtWRn3vCVRboFnk7hro3H5SxCODUfdRwKr8S68lYGshJLcQuI2yo9LHULaEjeYrA6/TiSsRnrjyVFzqvD8vXx35ZEgmvbFDL7K43/b3ivvKeFQnR63tx7KESnNeg1ugympihyQPLNGhFeGDNW6HOkJNpFuEdMhDyRIi7Fx+dNiCXWX7Z8LnFtQ+JUv87K4KDGTWNC28/I8X9qcu+c4PIJgXtuAGdOhJEdmjULjXRC8NRvxTSQKUQGLMsOjrKIvPd9Qohq4OD2W0j6sash4mlYiGw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PAXPR08MB6969.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(4636009)(346002)(136003)(376002)(366004)(396003)(39860400002)(66476007)(6506007)(66556008)(8936002)(4326008)(6486002)(1076003)(6916009)(478600001)(8676002)(316002)(66946007)(2616005)(5660300002)(186003)(38350700002)(41300700001)(107886003)(6666004)(36756003)(2906002)(83380400001)(38100700002)(6512007)(26005)(52116002)(86362001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Ysz2pqn/qqNQRYpp21ENVUK3RXrvshJHwXHPVP34y5PAWcems1CqxacDKU/SesY9t54MwvL6zDn4TsVARLF7j5re4fMYIRM3zEs9gjsS+ckqpMd4+/7kICUiCzrTKqX4SlgR6o6O5ORMuyOdJ/i8ks4CHmoHp30dNlfVcnfgE2G436jGxq5lz1INHf5we+Smnf8VjpT6qvAvwcDUf9V2bOpdcajVE5c9lD4/g589OSGShSK6IKW+lA/WWJYQluBEaf6Dpdy2odNKgOMbq4DRzXE9NcYFQzEJogzyr6Ff3lUk2/bL2ko/VuKkVIWn/Gsnz09/hitS3qCc2BBcr99Ye+aeV3XIOSvWWa8c2Q1YNJ5HZPmiWNLPH7Zpte+AbrUy9lf/5JK/iiEGAnn8DWAFmjV4eNDlqHHai9OLkUiKg0mtdFMWAp+xBZ/lcr0aEjGXbXF1o5jke99ywXaKPA/tj0J99/+r39stPXq9lC4OvkO3t2S/CgIauG4wNEzx/2GsC1Y8xGJ2roYyhto43pumbB3pFutUKKCm3HaGRXWTv5p5hoa56an+ilo+vb99c2TkLjXI1QC0T0i3YpmWasBhId9IHdXk9a3ZYHDe9Sq3Lv49H+Jgtrz0iy6jqqC7C716TllwuGtuv8ZY6XFAHPbejuj2zhshOTeraKEU7yAQvXNXP2BIuDKe2Ur9oupC0nRPgH2yxgX3YQTX9LorfXWCSuubHxLWUrHUDjAeRa/WRDtjtgc8mAIR4Ge6GgAYWzSoiHbXmKVDy0BuPisv5VIHJ2tGlgiM4J2EDRqZTaGMvgLcmkb5YjQoknWL1Z7nGenelaw6shmcB2EEqsapsjIzMrTKThjElvbTa2q/3Dvkzk+QRSxMWqkQ9oGBnBJhAsjxPwekjI1HLHfYKirQZs9vSuujEdZXhBz91LEo1Tq5wCKTwhC+TCuHsnInPWm/DxgUIzslBFTjQPvFO8gvW140Y8C6bgmJW8yeu8F2vK/c0NQ/qdsq6W6jwsqWGnviRlAnHq3vSEsIGdlicGVGU/7PkynK1ZI7YR00G4XA1VWlN23lPyJ4n3i5MdeDnijVX/LIxUvJsujVCGAHpij5xQ1Az+mmyFxRQEv0zJVAPjZImCL8xfJh2GN8IUhuz+L1RL/dFSTC6VwrBKe1dRF6XHZ/z5CoP6p+lvrbyNZHjgAUSIfTDGOy8CS8zFj5dI2u1Pe+YppVzQtmVL0TCrCLDM+1+fSWKWgTb68vz44fRBrmhRy67954GepaWi5R4y5JJJ5SLC8KypfOTIb/kwunE0XRB8bTl7pc1USwt9CCWGYojUMW8ffrM2pfzgcYdXWM/V8hTUkAvhJzLIz9gZ8+A8RXBlG8y/VGZPL3OOZJLKr/95lvK57SokabTu9XuD1OFLjweZZI0f5QeakG2Tce3dMFU3yjJigRVE0H6sWj3EeVwnAOWRB3c/mTC79qiQRDScJRSki6zpQ2MqRjrqTdnZG2gEtqbLnu7wUS4E58qQ/aBZW+rnXsfIKsKps6WOs76wdxiA9fo/+ibDiG83uzL+9p6JLKYEPPAtA/k0fP1c4WnXpYDkN2UYCYlMZMfUbnfhjESSsbQhf/qIFZe8VU7IYOHk1ynm28NZzLHv2iTOw7kOyfkbALExapZgPLTRNevbllB6gIdhrZNIdDHoGRhh9mA9IcyHF0KJjLy7F9v519aEJymhJl1hpOrqtIzZED2o1hw8J8fuyA7+G7Yxm2xeULyxwYG5ZsY5IYY9occA5Xki4= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 879b4557-cafb-464b-b274-08da52db22d4 X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jun 2022 16:37:16.3445 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: u8/+BdIGRYPCKwTLwq7nrZirpu2Aanw/ZLOROyh+krqR43eJyjQlTSbCItZgK853ZHcI8tO3lVia8WB+FbX6QQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3928 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean From: Stefan Herbrechtsmeier Merge the svd / xck devices into to the common zynqmp device list. Signed-off-by: Stefan Herbrechtsmeier --- Changes in v2: - New commit board/xilinx/zynqmp/zynqmp.c | 54 ++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 30 deletions(-) diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index 56bb01335d..1f18fb3473 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -65,11 +65,13 @@ enum { ZYNQMP_VARIANT_DR = BIT(3U), }; -static const struct { +struct zynqmp_device { u32 id; u8 device; u8 variants; -} zynqmp_devices[] = { +}; + +static const struct zynqmp_device zynqmp_devices[] = { { .id = 0x04688093, .device = 1, @@ -198,37 +200,33 @@ static const struct { .device = 67, .variants = ZYNQMP_VARIANT_DR, }, -}; - -static const struct { - u32 id; - char *name; -} zynqmp_svd_devices[] = { { .id = 0x04714093, - .name = "xck24" + .device = 24, + .variants = 0, }, { .id = 0x04724093, - .name = "xck26", + .device = 26, + .variants = 0, }, }; -static char *zynqmp_detect_svd_name(u32 idcode) +static const struct zynqmp_device *zynqmp_get_device(u32 idcode) { - u32 i; + idcode &= IDCODE_DEV_TYPE_MASK; - for (i = 0; i < ARRAY_SIZE(zynqmp_svd_devices); i++) { - if (zynqmp_svd_devices[i].id == (idcode & IDCODE_DEV_TYPE_MASK)) - return zynqmp_svd_devices[i].name; + for (int i = 0; i < ARRAY_SIZE(zynqmp_devices); i++) { + if (zynqmp_devices[i].id == idcode) + return &zynqmp_devices[i]; } - return "unknown"; + return NULL; } static char *zynqmp_get_silicon_idcode_name(void) { - u32 i; + const struct zynqmp_device *device; u32 idcode, idcode2; char name[ZYNQMP_VERSION_SIZE]; u32 ret_payload[PAYLOAD_ARG_CNT]; @@ -254,21 +252,17 @@ static char *zynqmp_get_silicon_idcode_name(void) debug("%s, IDCODE: 0x%0x, IDCODE2: 0x%0x\r\n", __func__, idcode, idcode2); - for (i = 0; i < ARRAY_SIZE(zynqmp_devices); i++) { - if (zynqmp_devices[i].id == (idcode & IDCODE_DEV_TYPE_MASK)) - break; - } - - if (i >= ARRAY_SIZE(zynqmp_devices)) - return zynqmp_detect_svd_name(idcode); + device = zynqmp_get_device(idcode); + if (!device) + return "unknown"; /* Add device prefix to the name */ - ret = snprintf(name, ZYNQMP_VERSION_SIZE, "zu%d", - zynqmp_devices[i].device); + ret = snprintf(name, ZYNQMP_VERSION_SIZE, "%s%d", + device->variants ? "zu" : "xck", device->device); if (ret < 0) return "unknown"; - if (zynqmp_devices[i].variants & ZYNQMP_VARIANT_EV) { + if (device->variants & ZYNQMP_VARIANT_EV) { /* Devices with EV variant might be EG/CG/EV family */ if (idcode2 & IDCODE2_PL_INIT_MASK) { u32 family = ((idcode2 & EFUSE_VCU_DIS_MASK) >> @@ -304,13 +298,13 @@ static char *zynqmp_get_silicon_idcode_name(void) strlcat(name, (idcode2 & EFUSE_GPU_DIS_MASK) ? "cg" : "e", sizeof(name)); } - } else if (zynqmp_devices[i].variants & ZYNQMP_VARIANT_CG) { + } else if (device->variants & ZYNQMP_VARIANT_CG) { /* Devices with CG variant might be EG or CG family */ strlcat(name, (idcode2 & EFUSE_GPU_DIS_MASK) ? "cg" : "eg", sizeof(name)); - } else if (zynqmp_devices[i].variants & ZYNQMP_VARIANT_EG) { + } else if (device->variants & ZYNQMP_VARIANT_EG) { strlcat(name, "eg", sizeof(name)); - } else if (zynqmp_devices[i].variants & ZYNQMP_VARIANT_DR) { + } else if (device->variants & ZYNQMP_VARIANT_DR) { strlcat(name, "dr", sizeof(name)); } else { debug("Variant not identified\n");