From patchwork Fri Jun 18 08:48:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jakub Frackowiak X-Patchwork-Id: 1494316 X-Patchwork-Delegate: jagannadh.teki@gmail.com 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=mikronika.com.pl header.i=@mikronika.com.pl header.a=rsa-sha256 header.s=selector2 header.b=uUsKrvNP; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (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 4G627f63gtz9sT6 for ; Sat, 19 Jun 2021 00:56:46 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D244882BB3; Fri, 18 Jun 2021 16:56:40 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=mikronika.com.pl Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=mikronika.com.pl header.i=@mikronika.com.pl header.b="uUsKrvNP"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2246482A29; Fri, 18 Jun 2021 10:48:30 +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.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER, SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on061e.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::61e]) (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 00D958031F for ; Fri, 18 Jun 2021 10:48:27 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=mikronika.com.pl Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jakub.frackowiak@mikronika.com.pl ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nXJ3Gi7R4Bj1qOYtqKyUJICzlbcCsepCcTuKMFwR8weLQkpp66TbRY7uLn/9lNLKsXWW/avtkeCN8Oq1gJe2oCZMNHaocMGmsDYd5+GMM7YtW5Wwmkg1DMNO2RaYxvnddpVQ0Ury4NEud2UCclUQug9Yp9FlMMN7d3FMXeOe9VrCbdGnKIpyRMhtO51Cnd+FzoEF5NUGpQd50IkSV8D4dOj3dTwlud8pMJ+XFxMvAV2APY/TOG+jNcfa84BGVhJlLY79uZTts+/sqTZOTVoPWk2LcLdY0aOhTfp3sYNzSy/nmUks6iqzOZzB447OzO6kKCwPV6x7y/jPvWLtFJX9Iw== 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=Q27f1QM5rl8xAmon4qWhNaExR+OPH+LnY1hkr8n9fuI=; b=WFn+3AvTBL0MDIR3LnpDwdNVunu7A0GwwibhNdMp2yUXjL0gj91Vt06RgMjsO5eAlyWOPEtdwklc+6eXvHUXMfCKjdblBbX+CfgmWyk/R/XB7l63wCXf0sxvDsoZZdTkhmZjk0MKxQqSfO9r0Q2ZdzBqPuA2LAMCwUa7/IL7u6VMFrK2/+qrNh0ksIuP52gk2f3cF24yE2Ewnwtj8LljrhyxzhYOvNpbIzPijV9wzaJNtESBRqB3NpUs9XMp6QPnhy7zhpzu/NSfRTwAYcqaDCux6HIB8JwNOvEJzGDTPHfUATWNwjXpOo/A9PzIzjf7xyZy839o8FHAtu7B+ynpJQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mikronika.com.pl; dmarc=pass action=none header.from=mikronika.com.pl; dkim=pass header.d=mikronika.com.pl; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mikronika.com.pl; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Q27f1QM5rl8xAmon4qWhNaExR+OPH+LnY1hkr8n9fuI=; b=uUsKrvNPuz2sJ23rTQjescnyab9ddHpNfPkMnWPjbFV3zYMrLOqyFfdZpPF0+cxfrvmQseF1fH+WCBVW/RZ5JF649GJHzy6+H2+JkI/OREahDr61fylZ2aMNeomTvY+a8oHfyRRiaT2hEQA9bEdrwtm/4F+I0oRWUTsAKEcb6zu8jK/Y/bPNhBCRXbkePZVKfsgUHDbOmhws04ROLS0h2ICfP1IzihT1VAgBl1kzd37Fe7GWQDrCR1DcanSvZ8rnE7jFaiUv4fGaBAsdSKdsxYfO28xa9czny7Ua7UbjzXtB7i9EN3vhJRSMJOOutRpLBQaT0eVT0K3BUkYvRlj2LQ== Authentication-Results: mikronika.com.pl; dkim=none (message not signed) header.d=none;mikronika.com.pl; dmarc=none action=none header.from=mikronika.com.pl; Received: from AM9PR09MB4772.eurprd09.prod.outlook.com (2603:10a6:20b:287::21) by AM0PR09MB3860.eurprd09.prod.outlook.com (2603:10a6:208:19c::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.15; Fri, 18 Jun 2021 08:48:25 +0000 Received: from AM9PR09MB4772.eurprd09.prod.outlook.com ([fe80::e4f6:b9c0:4ec8:c752]) by AM9PR09MB4772.eurprd09.prod.outlook.com ([fe80::e4f6:b9c0:4ec8:c752%8]) with mapi id 15.20.4242.021; Fri, 18 Jun 2021 08:48:25 +0000 To: u-boot@lists.denx.de From: Jakub Frackowiak Subject: [PATCH] Avoid adding the same dataflash for the second time Message-ID: <35932af6-66b2-3c31-6592-904cce8f30c7@mikronika.com.pl> Date: Fri, 18 Jun 2021 10:48:19 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 Content-Language: pl-PL X-Originating-IP: [91.230.117.218] X-ClientProxiedBy: AM5PR0601CA0047.eurprd06.prod.outlook.com (2603:10a6:203:68::33) To AM9PR09MB4772.eurprd09.prod.outlook.com (2603:10a6:20b:287::21) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from [192.168.1.117] (91.230.117.218) by AM5PR0601CA0047.eurprd06.prod.outlook.com (2603:10a6:203:68::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.16 via Frontend Transport; Fri, 18 Jun 2021 08:48:25 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 71ce43f7-5266-44ca-1049-08d93235d614 X-MS-TrafficTypeDiagnostic: AM0PR09MB3860: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: F+Uan+L0LtNCBrKAaj5/z61oSvXNSdoeIiVH6WQNsatyNPKGASX4+RGPvhBSMJoxaJZ0uWfF9dwaSohaRu/kNL9deKO2UHALsN0hq+H74jxbgm8SjJpSdjJD06U1xY2T1iAaneDMyiOBp8+pSZ4jZNQpIiSJTF7Eq2w69psQd2i1qJfQs4LSxIs6XSJqkUGFgqY/hV+HtqTDrMFylBMDiTZkhH0Uyxi04wG349yluJODoC5JGYnrdkVInr9vSM/iLMpBrFOoykivFFe29psG5gsaiw8Quppu4YyZQTgMXoyWGzzkwv2XG7It0n32gCCij7NAOuY2m4qCaprVDXd/XuVu7dKQnruXu0yAxS3BvTlsMalDhaUd7838dBLpgJ4zHk3qJlmlj+UoweXqT2orqYvN1Z1OogSKihhEiERHfDp4BUj+eWX0V4iaGnRx3Oxs7gQXkhzskZ58ucJXROeHg+v3vsrsh5Pw1fCBYJ0raQ3QvDde82ktBnj4LNwdpd413IMxRzv+jIRZ8U9iVG3Yb8QFZPbeRE2RDlBRAsyNaLVyakTvTqU5L7kNAhnYZANqyVWUdBACNOeGBxIdkDD3JHRy1UL9758/0DPTyapWkGwC1q3c3DO3RAtIVAYUJS+v4506fS52aJLrBXQ68WthDbKIL4YTYNfw8uodvR6JofFNa4JFmn5/6XNI5a6s9ZMgQZkHgOSqZY5GbvZvx4hA7A== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM9PR09MB4772.eurprd09.prod.outlook.com; PTR:; CAT:NONE; SFS:(376002)(346002)(396003)(136003)(366004)(39840400004)(83380400001)(6666004)(38350700002)(31686004)(8676002)(478600001)(2616005)(26005)(16576012)(186003)(316002)(38100700002)(16526019)(5660300002)(6916009)(8936002)(52116002)(66476007)(66556008)(66946007)(36756003)(6486002)(31696002)(2906002)(956004)(43740500002)(45980500001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?dBoRtmsFc4TA9KpJzsDyEg95Dxty?= =?utf-8?q?/rPzEMwTZ/c9QqjNO+X8XBpnJd7PVB7qLwy/iRUq5VxF3PwKepICOMU/eBgD4/Nbq?= =?utf-8?q?wQe9HZ+oCpMOOILYfDTCXZD1A5Rx2zIbZlu2shjrGA5ZFGEE1doeD15tnyw13eFYq?= =?utf-8?q?7YIkq1c/xSPJTeisfPMIEesQ8FXSFUiA1VsyqWDIAsPSanXvHL2nQJnTx2DJaxclg?= =?utf-8?q?tBZTiOYlJZAMLWxwWkUd054akYt2LeV8SEWVZ1PjZaYKNdP/y7XMjuf85kWBSSxhP?= =?utf-8?q?I+AqXYWjx/8/1cHPNW55EI9Q/mLuYr7zyTX0oaNF4vLQLJT4E5Th8L7q5Am7ddfj6?= =?utf-8?q?4eWBTTKDmEM2/vxlDrFOaZ7Gru1tqgEZ+jFYK3lPoIUkbf30ItBBRgbY1/31UYvix?= =?utf-8?q?0+X2GeGj9Ff5iRrq9AGDx44A+q3hS4KR37vgAfchuuOUoHAryinV2rsA2dWBEKU5b?= =?utf-8?q?UJH2vEkcLYTlP7j8dvlqTrJC4N2j8l5Sn0BZC5+ZIaW71vn0PjhcX2iHYTTICxA3V?= =?utf-8?q?KTile5Hh8upHrIlMIRQoh+lwg7QWKdz05ggAa/gO/MR2GmLgbrdssJY93RWzXWECs?= =?utf-8?q?XsCFohg2bSjJKVSJaKWi2/VTbhcalFgnPxWHGaX/wYPbrIlBv3TmgmvwGD1TMn4sK?= =?utf-8?q?vM+VTorRhMCjNgOKO2sM5PMiBxMXczrvXx0d1+S8Pv7nIBPnuurm2iMfVbJKQlFK9?= =?utf-8?q?5bu74XfmXtzqyH09rEB4+p0KpAm/fr6HDumqy/+j88qZ95XNdZ1Govpge5Gb8ym98?= =?utf-8?q?sBMljAVIdsFQErL454PP7OJ58G+Ra916tWA7JzNnbYWnEZ9Jp22rdL6dkfUPmGOzA?= =?utf-8?q?yOEbvOd6Rn6CZYhafEIGKQr46BeEt0ZA0xEW94HcwQLU7dFSJfdaWe9SQ5yDNleuI?= =?utf-8?q?751OYp3q+x37Uunrqacx9uROVpoRDtxTp/p6aSzC3T5phw91ekfhSdhdHI61LW0bj?= =?utf-8?q?KiGNWRGqfb4nivCZsgQfYWeLqmyQ8UaQTX58JSg11sx9kpIY1cpRZL9KZGAa7RBND?= =?utf-8?q?Cn+NKqHSOEyyeEsybgUvMB4IDib0xZu43R82gMlWKNFab+3w3C+gmOcf7bt69Jk7s?= =?utf-8?q?MT4x9k9T/w2RAJYhC723P5/m2zT5vmaHxU3qjoIDBIt8ktWeVdkyxGzd3IK83BJKI?= =?utf-8?q?KaNP0Un6PP9qSE+Ae9MN22GfoL8Vrxcp7vPBEOoUyyX5smlOr29bcd0J5iylPUO9S?= =?utf-8?q?82lpIHVEGEfT8xJudGWqxrr1m+lJVlwgQMhdJd6GqY8LlPh1fPjYbEoETX6ZzVrG+?= =?utf-8?q?qJ7OTrjvcYoG+YCx?= X-OriginatorOrg: mikronika.com.pl X-MS-Exchange-CrossTenant-Network-Message-Id: 71ce43f7-5266-44ca-1049-08d93235d614 X-MS-Exchange-CrossTenant-AuthSource: AM9PR09MB4772.eurprd09.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jun 2021 08:48:25.7224 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 9f9fdcdf-9765-4fa7-833f-1ea87227a25d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: VHCFmiOYdOlxryZ1PovKKVHpJDJk0p31CenmIxygeUfmHwizORnfovd5cxJbJuASXSGhD2G3Doj4mqDxMi2Jxw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR09MB3860 X-Mailman-Approved-At: Fri, 18 Jun 2021 16:56:40 +0200 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.103.2 at phobos.denx.de X-Virus-Status: Clean The spi_dataflash_probe function should return after jedec_probe if it finds any serial flash. This functions adds the same SPI device two times without this path. Serial output when reading environment: Loading Environment from SPIFlash... SPI DataFlash: Detected at45db321d with page size 512 Bytes, erase size 512 Bytes, total 4 MiB, revision d SPI DataFlash: Detected AT45DB321x with page size 528 Bytes, erase size 528 Bytes, total 4.1 MiB, revision *** Warning - bad CRC, using default environment When this patch is applied: Loading Environment from SPIFlash... SPI DataFlash: Detected at45db321d with page size 512 Bytes, erase size 512 Bytes, total 4 MiB, revision d OK ---  drivers/mtd/spi/sf_dataflash.c | 3 +++  1 file changed, 3 insertions(+) diff --git a/drivers/mtd/spi/sf_dataflash.c b/drivers/mtd/spi/sf_dataflash.c index b59edd152c..7040f21eb2 100644 --- a/drivers/mtd/spi/sf_dataflash.c +++ b/drivers/mtd/spi/sf_dataflash.c @@ -630,6 +630,9 @@ static int spi_dataflash_probe(struct udevice *dev)          if (status == 0 || status == 0xff)              status = -ENODEV;          goto err_jedec_probe; + +        if (!status) +            return 0;      }         /*