From patchwork Mon Mar 27 19:06:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1761913 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=nPI3Vc3D; 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 ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Plj6t703kz1yXq for ; Tue, 28 Mar 2023 06:09:42 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2FA848611A; Mon, 27 Mar 2023 21:09:26 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="nPI3Vc3D"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 388AC860FE; Mon, 27 Mar 2023 21:08:58 +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=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pj1-x102d.google.com (mail-pj1-x102d.google.com [IPv6:2607:f8b0:4864:20::102d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 9808085B31 for ; Mon, 27 Mar 2023 21:08:54 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-pj1-x102d.google.com with SMTP id fy10-20020a17090b020a00b0023b4bcf0727so10040503pjb.0 for ; Mon, 27 Mar 2023 12:08:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1679944133; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Pnwf+MqN3X+FxACkfXxr/QZFV4E9e+syViCop3sy6FM=; b=nPI3Vc3D1NTFSvDUb22OM5ueyUbFlRfnOtZbE3t+z5eo+N/CjxDlobpFqP1q95bOwX iC0pulCIBF8w8L6rrSS4NHki+dvoNaEVdOQ9s0V61K/k2wFVHndhkYxvSjP5PlvNTI8W T83lU3Ff7gZ2J9moO+mkYF/yABmRnLSCsxYJs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679944133; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Pnwf+MqN3X+FxACkfXxr/QZFV4E9e+syViCop3sy6FM=; b=VpvPn8FB5bpIno5cV2ObtY5qknZwshUcT9z3LzIQ3Dt6WnylYlOeMzlSTEI/vLjaSG OR6t+3N14SDA9HqJsYBr6PfjrSEyJSu6mgbPLNlR/2pYADz8ppFHJAXZeAhHSmZOiwV1 rxwm/enjIGU3HfBpdG7ZsX5e2l2rpQah8nF3IAFQXzTCFVrPSPcv0c12JJCLwZEg9PBE jZWqC0l1h1hTso854Tl77+LiaMvj0uIOe6baKPN49OGmMJaJ263FnY4lV2ql3b8A8ZuF MoyWcKYV16wi8T+Xey1e2T/lH6qz6kwj1n20nnDsDVCo5WYMsQPihOwOYOmCDy+hb3de MPXw== X-Gm-Message-State: AO0yUKXaeXeZi4FYOVIB+8hj9IcV5yiUhyUyneO2BukoYR1IpYv+j9mA jI/V1CdmmufAN9WGmiT0Zd98LOKcy9stEAefqUE= X-Google-Smtp-Source: AK7set9Hb3I2sCMwK9IUFa66zMTalqDlSKSpWn+XoOrcWymWXNi5Vy8hMrNaDtMsBoXvacpVpAuJcA== X-Received: by 2002:a05:6a20:389e:b0:dc:4369:16a4 with SMTP id n30-20020a056a20389e00b000dc436916a4mr10306845pzf.19.1679944132844; Mon, 27 Mar 2023 12:08:52 -0700 (PDT) Received: from localhost.localdomain ([27.110.126.54]) by smtp.gmail.com with ESMTPSA id d9-20020aa78e49000000b005cd81a74821sm15653334pfr.152.2023.03.27.12.08.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Mar 2023 12:08:52 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Bin Meng , Simon Glass Subject: [PATCH 02/30] ide: Use mdelay() for long delays Date: Tue, 28 Mar 2023 08:06:49 +1300 Message-Id: <20230328080702.2.I8ff6ead2bbb4cab773ce06d54045810aab0a56bb@changeid> X-Mailer: git-send-email 2.40.0.348.gf938b09366-goog In-Reply-To: <20230327190717.1796230-1-sjg@chromium.org> References: <20230327190717.1796230-1-sjg@chromium.org> MIME-Version: 1.0 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.8 at phobos.denx.de X-Virus-Status: Clean Rather than using very large numbers with udelay(), use mdelay(), which is easier to follow. Signed-off-by: Simon Glass --- drivers/block/ide.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/drivers/block/ide.c b/drivers/block/ide.c index f36bec8b3a8a..6f601bcf8646 100644 --- a/drivers/block/ide.c +++ b/drivers/block/ide.c @@ -71,9 +71,7 @@ static void ide_reset(void) /* de-assert RESET signal */ ide_set_reset(0); - /* wait 250 ms */ - for (i = 0; i < 250; ++i) - udelay(1000); + mdelay(250); } #else #define ide_reset() /* dummy */ @@ -237,7 +235,7 @@ unsigned char atapi_issue(int device, unsigned char *ccb, int ccblen, ide_output_data_shorts(device, (unsigned short *)ccb, ccblen / 2); /* ATAPI Command written wait for completition */ - udelay(5000); /* device must set bsy */ + mdelay(5); /* device must set bsy */ mask = ATA_STAT_DRQ | ATA_STAT_BUSY | ATA_STAT_ERR; /* @@ -293,7 +291,7 @@ unsigned char atapi_issue(int device, unsigned char *ccb, int ccblen, n); } } - udelay(5000); /* seems that some CD ROMs need this... */ + mdelay(5); /* seems that some CD ROMs need this... */ mask = ATA_STAT_BUSY | ATA_STAT_ERR; res = 0; c = atapi_wait_mask(device, ATAPI_TIME_OUT, mask, res); @@ -357,7 +355,7 @@ retry: if ((key == 6) || (asc == 0x29) || (asc == 0x28)) { /* Unit Attention */ if (unitattn-- > 0) { - udelay(200 * 1000); + mdelay(200); goto retry; } printf("Unit Attention, tried %d\n", ATAPI_UNIT_ATTN); @@ -366,7 +364,7 @@ retry: if ((asc == 0x4) && (ascq == 0x1)) { /* not ready, but will be ready soon */ if (notready-- > 0) { - udelay(200 * 1000); + mdelay(200); goto retry; } printf("Drive not ready, tried %d times\n", @@ -586,9 +584,9 @@ static void ide_ident(struct blk_desc *dev_desc) debug("Retrying...\n"); ide_outb(device, ATA_DEV_HD, ATA_LBA | ATA_DEVICE(device)); - udelay(100000); + mdelay(100); ide_outb(device, ATA_COMMAND, 0x08); - udelay(500000); /* 500 ms */ + mdelay(500); } /* * Select device @@ -715,14 +713,13 @@ void ide_init(void) ide_bus_ok[bus] = 0; - /* Select device - */ - udelay(100000); /* 100 ms */ + /* Select device */ + mdelay(100); ide_outb(dev, ATA_DEV_HD, ATA_LBA | ATA_DEVICE(dev)); - udelay(100000); /* 100 ms */ + mdelay(100); i = 0; do { - udelay(10000); /* 10 ms */ + mdelay(10); c = ide_inb(dev, ATA_STATUS); i++;