From patchwork Sun Dec 6 21:21:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1411782 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=windriver.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=windriversystems.onmicrosoft.com header.i=@windriversystems.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-windriversystems-onmicrosoft-com header.b=iDEEv4Px; dkim-atps=neutral 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 (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CpzvZ4kKfz9s0b for ; Mon, 7 Dec 2020 08:23:38 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0CF4E825B5; Sun, 6 Dec 2020 22:23:20 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=windriver.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=windriversystems.onmicrosoft.com header.i=@windriversystems.onmicrosoft.com header.b="iDEEv4Px"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CF537825D8; Sun, 6 Dec 2020 22:23:18 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS, T_FILL_THIS_FORM_SHORT autolearn=no autolearn_force=no version=3.4.2 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on20606.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe59::606]) (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 C8D3B825B5 for ; Sun, 6 Dec 2020 22:23:13 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=Ovidiu.Panait@windriver.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hPHfxAQrSdtNpzqyIwN0T8WIC0g5ciTGIZLuQ77xWEQzZ3iweJhJySqVj4POs+L2kXSANpy9TVRAUBilBSCqWBEIi9bm4GvgWauZ6KkQDzHclKTc3iFbkAraVSyxUULvgqX5gwA+j9jLar90Z6dnWKLwUnI85cUrbBxZylEeiyz3xoOUDEVX1RgE/JtBiYL0oxB/xmw7MYFDTrvV28kUkRUuiEfOC6BILbZ0+RbmvyPCIrg/2YNLshg0GtlgELYfGSYph18ngzy0Jlkj56QyHSw9NqFucnjcMRZUYPG1V7U/ZRNfY0Elg7cy12PDos/GmcP5wdz3FDTN1tpeNI4PVA== 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=3jUFeXTrBKtchnv0bHyFEgGwvPxiarCF3gf3kPxRtaA=; b=A7j0dPF/lGW0+pZKWws6EQbqPyIqlmWjnJs89fMf+GV/8fgNgFf60sEKJ+RUscivatY+y1bPUlbm2q/jf116XT9LV4ykke+A5JfnyvFIaehDveFvDCbsPFe54VHxe2Q98oiScUMu5YzaK8yLtRl8dyMBLXe9o1eOpzyojaws0a2QqhG1V7Nf3dFjxGSSj+tGdpQKKGZYNNO0xQ18K8eBVy9lcV/oeu2Crt3sobfGqtPAVDQrJn0FaRSTJ3MP2dmU9y/886oKYLGjYIeEYIQjlSP5jv2ZU8eqso12/BNVM99mjlOoCRO4B8LShzDSBmD/7TLABqSjrsdyuiZ5xSfL0A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriversystems.onmicrosoft.com; s=selector2-windriversystems-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3jUFeXTrBKtchnv0bHyFEgGwvPxiarCF3gf3kPxRtaA=; b=iDEEv4PxB+luxTm6jnPlI/E/K3FX/FH2BxB8fnVHrNJrQf+CXk69vs4nNBtrt42hFikQiLh7UVGAmJBhYn2vQ4hFnbRlOeWPEy4dt1LcdN331o4RJHQdKw84Wrp62JLlUGFbwyHTmmoX/9wbSaVEQoN4kDNqqT9UZIatNi4+jD0= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=windriver.com; Received: from BL0PR11MB3201.namprd11.prod.outlook.com (2603:10b6:208:6b::21) by MN2PR11MB4333.namprd11.prod.outlook.com (2603:10b6:208:195::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3632.21; Sun, 6 Dec 2020 21:23:12 +0000 Received: from BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::54:a24e:6136:45f2]) by BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::54:a24e:6136:45f2%5]) with mapi id 15.20.3632.023; Sun, 6 Dec 2020 21:23:12 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: Ovidiu Panait , Bin Meng , Etienne Carriere , Jagan Teki , Jean-Jacques Hiblot , Patrick Delaunay , Philippe Reynes , Sean Anderson , Simon Glass , Wolfgang Wallner Subject: [PATCH 2/6] sandbox: test: Add a second SPI slave on sandbox_spi bus Date: Sun, 6 Dec 2020 23:21:24 +0200 Message-Id: <20201206212128.21233-3-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201206212128.21233-1-ovidiu.panait@windriver.com> References: <20201206212128.21233-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VE1PR03CA0003.eurprd03.prod.outlook.com (2603:10a6:802:a0::15) To BL0PR11MB3201.namprd11.prod.outlook.com (2603:10b6:208:6b::21) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from otp-linux01.wrs.com (46.97.150.20) by VE1PR03CA0003.eurprd03.prod.outlook.com (2603:10a6:802:a0::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3632.17 via Frontend Transport; Sun, 6 Dec 2020 21:23:10 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 75c16806-b601-4942-2e36-08d89a2d22f9 X-MS-TrafficTypeDiagnostic: MN2PR11MB4333: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: POANzB5cGGXOvy8QhR++Ywsarx7CHFkNRSctHXTgpVu1T5WmPgJU9ENGSKtIL5KlKCY/tRHBw9fS3aGuMMoqC2cBK1AqmzJIgvp82y7h1Mpayt+pNOGYANV7yZsUmNIzkHdB5nOglWuKF5Uf1fCuaPXZ0dqP0URMJtA4mUJeovZSP/gUhN541T90jfp54Wecm/OXji09Co3R6hzjWbl9uR4+GFoAi/ss5aVl8wlhkMNerN4WxrTSzyXDfq0JL59yzFIZIfLufvDAkQf3EUbeAeQsBIyyNyM9XQSLgGgwxLCS+tlCTu4bdMVP6IN/Dj/mRJwOb7u+eK1eixPwsT+bbw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BL0PR11MB3201.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(396003)(376002)(39830400003)(136003)(346002)(4326008)(8936002)(2616005)(1076003)(86362001)(83380400001)(26005)(44832011)(2906002)(16526019)(956004)(6666004)(478600001)(54906003)(66946007)(36756003)(6506007)(186003)(52116002)(5660300002)(8676002)(316002)(6916009)(66556008)(6512007)(6486002)(7416002)(66476007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: ehyGWqKMIX8LJZOG0u41AD1YW+bgLCMsM3uKAPblmZ64mqHlyOnB4VMh5pGIZVEZPHD7DL/PafDB7ClJYg2+BCSa9ffCXyJsAF7EQd/Z4sKKIZNEeHkdPFHyGQW/a8ahJaAVNJytfqI45abjCLKK7TQPJYnUfayoQAanGzrogrcIlxiTPBGDo/X2HMw3WfNJeXG0+DXjlwrZd3CqG7GLo+FDs/SJUF209rt9sZioFX9jJ7I889AfukRtBPIMyQ9x69oiGNND/dWu3XEekPPzvxoJxERLHA9IQrvvFj8HNnhPJqbgMg46Qo07NPs+rL6hIwzjrMLv9lgsEA7RAAKw+4yjNhbEhHg57L8Ef8tlthcYTnS7pdXN80tNZWYeFC3kznG46mg28JG4kME13gqyTyTpuGVls5UnpVHItKVQShTPzmt7qmFZlOJ7kdNhR6EtLNt31tQwbiAoQjJLqK+0tcomTmRa+Da4Yao+lGGew4Gp1lNjDxEOw8eJQlEEWH8FFu6pqOvqxRNVlYbzDr5/C3DPcEt8u8cULJfYNg7xWAw739y/dHR0OT6iQcMyoq0/RPMiWlOSCG9893ajob29mUiMyMZqCTYNnfe4/D+YTEpfyY962DxK8Q+8o2brqVNXqzwIJLAUUdZao2x8AFv6YvGjr0DEkSxjjqhkz1Ek0kDY4q7zkt4maL50piXPsIXxHxeFsg6Aha6POefjEYndyxIif8KmP+XoJkk5FGI6cyJWxzmzoBUUTg5VYZIJ/FVLSGZeEDJNezod5QEdZ/h8EdzEXe0LrZpy8m0+ZrGp0Rdq0KzH9fKBz+bw+EuaY33idC1orgcAb7fAtT/OBhd9KcYvC1LN8oiF2nyHhjpgTZnU5/3YdfLXES1TpQNGZOsjQNQk+RiX+Rs6Aa+weBnl5UDRO9fy+CiZFmeXQzT7V0BuunXLS6/Q/rTl8A+mXH0bObjDTOlrMU3h7qI9T8csk2bdbG4KXV2lN08lEjgBodo= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Dec 2020 21:23:12.3336 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-Network-Message-Id: 75c16806-b601-4942-2e36-08d89a2d22f9 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: sUZvnfib4TTFvz0U8AEuxbpNhEt/jruEvYR20uj35jRA2DGdENRW3jSUa11Bu1gB7PRjG6jq2iEonxO45QOzuSpnhZyy6yVAStoq42Uz7AA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4333 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.102.3 at phobos.denx.de X-Virus-Status: Clean Place a second spi slave on the sandbox_spi bus, to be used by the spi_claim_bus() testcase we are about to introduce. We need to make sure that jumping between slaves calling spi_claim_bus() sets the bus speed and mode appropriately. Use different max-hz and mode properties for this new slave. Also, update sandbox_spi cs_info call to allow activity on CS0/CS1 and adapt dm_test_spi_find() testcase for this new setup. Signed-off-by: Ovidiu Panait Reviewed-by: Simon Glass --- arch/sandbox/dts/test.dts | 10 +++++++++- drivers/spi/sandbox_spi.c | 4 ++-- test/dm/spi.c | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts index f3b766271d..3eca1a73de 100644 --- a/arch/sandbox/dts/test.dts +++ b/arch/sandbox/dts/test.dts @@ -864,13 +864,21 @@ #size-cells = <0>; reg = <0 1>; compatible = "sandbox,spi"; - cs-gpios = <0>, <&gpio_a 0>; + cs-gpios = <0>, <0>, <&gpio_a 0>; spi.bin@0 { reg = <0>; compatible = "spansion,m25p16", "jedec,spi-nor"; spi-max-frequency = <40000000>; sandbox,filename = "spi.bin"; }; + spi.bin@1 { + reg = <1>; + compatible = "spansion,m25p16", "jedec,spi-nor"; + spi-max-frequency = <50000000>; + sandbox,filename = "spi.bin"; + spi-cpol; + spi-cpha; + }; }; syscon0: syscon@0 { diff --git a/drivers/spi/sandbox_spi.c b/drivers/spi/sandbox_spi.c index 3640ddeeb6..412756aa4b 100644 --- a/drivers/spi/sandbox_spi.c +++ b/drivers/spi/sandbox_spi.c @@ -101,8 +101,8 @@ static int sandbox_spi_set_mode(struct udevice *bus, uint mode) static int sandbox_cs_info(struct udevice *bus, uint cs, struct spi_cs_info *info) { - /* Always allow activity on CS 0 */ - if (cs >= 1) + /* Always allow activity on CS 0, CS 1 */ + if (cs >= 2) return -EINVAL; return 0; diff --git a/test/dm/spi.c b/test/dm/spi.c index fb180aed1f..6db680edd2 100644 --- a/test/dm/spi.c +++ b/test/dm/spi.c @@ -22,7 +22,7 @@ static int dm_test_spi_find(struct unit_test_state *uts) struct sandbox_state *state = state_get_current(); struct spi_slave *slave; struct udevice *bus, *dev; - const int busnum = 0, cs = 0, mode = 0, speed = 1000000, cs_b = 1; + const int busnum = 0, cs = 0, mode = 0, speed = 1000000, cs_b = 2; struct spi_cs_info info; ofnode node;