From patchwork Thu Feb 27 17:28:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1245966 X-Patchwork-Delegate: trini@ti.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=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=gmx.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=SqSXrw8+; 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) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48T04l6xnbz9sNg for ; Fri, 28 Feb 2020 04:28:20 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3B2A780829; Thu, 27 Feb 2020 18:28:13 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=gmx.de 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; secure) header.d=gmx.net header.i=@gmx.net header.b="SqSXrw8+"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 86F8A80911; Thu, 27 Feb 2020 18:28:11 +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=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 74BA480829 for ; Thu, 27 Feb 2020 18:28:08 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=xypron.glpk@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1582824487; bh=R1vcH5EYanbRO5cdftileSjAUYJ3L3AzM7ICBgpUpmw=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=SqSXrw8+gs6cknlsdsY8LX6emDaF4izmR250v9EalTFnLuQrGfaUw6feKOaN4NtKq SSPnqdNRCD610V90jC0M3GR7oYex4ZeBzLP0V1ubIyTcL+xT5+527TAlJ2/mL+1Y8e 4yO++2iAiGN0Gy4vKaEux4XFjETHsylP1QP+rbrU= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from WDEC034349.fritz.box ([84.119.33.160]) by mail.gmx.com (mrgmx005 [212.227.17.184]) with ESMTPSA (Nemesis) id 1MWRRZ-1ivQ4a03MR-00Xtc0; Thu, 27 Feb 2020 18:28:07 +0100 From: Heinrich Schuchardt To: Tom Rini Cc: Simon Glass , u-boot@lists.denx.de, Heinrich Schuchardt Subject: [PATCH 1/2] block: ide: use definitions from include/libata.h Date: Thu, 27 Feb 2020 18:28:00 +0100 Message-Id: <20200227172801.3126-2-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200227172801.3126-1-xypron.glpk@gmx.de> References: <20200227172801.3126-1-xypron.glpk@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:6Pu4Zwbc8ihsbOiy8VtlvFGRpbGw6e1EYJ5BLqbDPqRQ0YYaYy2 0ble1l112euu7jMLESSbWOkE6W3WHThI6QAada7tAwT2JY0J6NoO5jlraAfHoy21p4McZYU gQyuem3xsw9zrNJTWWHfvfWD8+ee0Xr5LojpQ0/92PIkbiQhxhRX/35FXgkA1DW3+iDxxLr gnTvoVgb2dvVs6APF6i/Q== X-UI-Out-Filterresults: notjunk:1; V03:K0:IueVIKNIi7A=:aJECDwTDJBUbEeTUqizg1V 8oegVzSI8TPwF+4r6a4PoqW+ZxSiMnwcS/WffziYI5YYCveMpSGryVkNaj6hg5UCnj5DcoP2t zriyYujonQGeDB85OWKmPZy21H12RoxNrWJrJcHl5IcSCQDkmQ2hPwDr73RRcCz1KcrSM69z7 or+9g52R1D3+5oUtkZWucm0aofHuIhDGkhmSqepBHaTBTSRDu2VkP0l38p7pzYdSI6CGS+LjU CbSIpmWoC7GNWdBWmdZxU9Y1DJxgCNKcF4BZ0bt5C94IZJWxhikb8zuWEbC7ZJpXh9DlJrVpe EOMh1rdeYC/Le1c7IBt+tBzwi153IEi9NImK/5gzSBnDdkK/Nq4XvG4rZ7R378U7BURriBRbx UOGGmgeS4q0bamVU0SMA5S7uqI3zNiupkFX2l0DTJAls2jtddvVTxg0tCblqGrCfR/kzE6tTk HTalR+xf+/xUJRyOyZGCP/riwmbhqK28ymbL12I7B9Q2JRzf+boRGFtkC/9lZCg5tGb2FD7V0 qN000ScBu7xPQH0TFlh5tqwrgT3f5XRwy8KsGDYVSJM2vsWyTGHng9sjyK/mFi/GIriAei2uC d4/XhOADmL8WcEi9dR7lmLmy82CUHOMh7rdNKjY7+LyAZz/ykBVgnMdWm6Oo6r4BW3y9V0tyE epI1PUDzutAlht22/XBr+P2Cf2ld87SMEK9kHFV3aSZyjDb12HfqAHoWrEoox6I0FcTZXa3Ed Y+6nsaoV60s791KgSeIpAu6WS6ABh98O9hFL1IiziP7Bsasm29Rkpy8c8tWEKHdZtqAn+Sopd Fgw4FMGBf0AmTRuJa06h/jKtUA08zDKNrQz9sgD3PVE3DmTVI/GuynKVA2v8Qdq0qnH/eOK6O lf9D66NaUJVhYz234YkKnI8GLqJx9z04RjCiBkjAVWGduFGFhqRCi4UwIq64clB6waW/oSrwc PWw3fRNwb05pOIZkoJn0RbFx56OrMpo9Zj9/VLRHXX5dBhcClm2SaQRM2codK5sGpc396CUEn qPiOMJNIyAlnZRi9P2Y31DCpJeSA/PIkR9bj0Nhh93a+oiifCHpnkVFr3MzIzPbEA3MrRi5Fb +daZ3l1iQNCIoqPm3LP5tf9J5mxVSw8y5eQiVDZq4ttg82EPb9XrjVDB1lA/4tKNJvZC3zYLm liR/s7McDrd2eHo5G3/RK6qFj19zqZy46ERbLNFalnRbLgKroHW/XHajqzyFih0engOVWLCMQ yXGQnDrJGLZFbuN8w X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.2 at phobos.denx.de X-Virus-Status: Clean Currently ATA commands are defined both in include/libata.h and include/ata.h. Use the command definitions from include/libata.h where applicable. Signed-off-by: Heinrich Schuchardt Reviewed-by: Simon Glass --- Resent --- drivers/block/ide.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.25.0 diff --git a/drivers/block/ide.c b/drivers/block/ide.c index 4b8a4eac17..67cc4fbc02 100644 --- a/drivers/block/ide.c +++ b/drivers/block/ide.c @@ -231,7 +231,7 @@ unsigned char atapi_issue(int device, unsigned char *ccb, int ccblen, (unsigned char) ((buflen >> 8) & 0xFF)); ide_outb(device, ATA_DEV_HD, ATA_LBA | ATA_DEVICE(device)); - ide_outb(device, ATA_COMMAND, ATAPI_CMD_PACKET); + ide_outb(device, ATA_COMMAND, ATA_CMD_PACKET); udelay(50); mask = ATA_STAT_DRQ | ATA_STAT_BUSY | ATA_STAT_ERR; @@ -570,7 +570,7 @@ static void ide_ident(struct blk_desc *dev_desc) /* * Start Ident Command */ - ide_outb(device, ATA_COMMAND, ATAPI_CMD_IDENT); + ide_outb(device, ATA_COMMAND, ATA_CMD_ID_ATAPI); /* * Wait for completion - ATAPI devices need more time * to become ready @@ -582,7 +582,7 @@ static void ide_ident(struct blk_desc *dev_desc) /* * Start Ident Command */ - ide_outb(device, ATA_COMMAND, ATA_CMD_IDENT); + ide_outb(device, ATA_COMMAND, ATA_CMD_ID_ATA); /* * Wait for completion @@ -966,7 +966,7 @@ ulong ide_read(struct blk_desc *block_dev, lbaint_t blknr, lbaint_t blkcnt, /* first check if the drive is in Powersaving mode, if yes, * increase the timeout value */ - ide_outb(device, ATA_COMMAND, ATA_CMD_CHK_PWR); + ide_outb(device, ATA_COMMAND, ATA_CMD_CHK_POWER); udelay(50); c = ide_wait(device, IDE_TIME_OUT); /* can't take over 500 ms */ From patchwork Thu Feb 27 17:28:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1245968 X-Patchwork-Delegate: trini@ti.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; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=FsdNLT9S; 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48T0541R5fz9sNg for ; Fri, 28 Feb 2020 04:28:40 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 00BA08101A; Thu, 27 Feb 2020 18:28:23 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=gmx.de 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; secure) header.d=gmx.net header.i=@gmx.net header.b="FsdNLT9S"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B8E5B8100F; Thu, 27 Feb 2020 18:28:14 +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=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.gmx.net (mout.gmx.net [212.227.15.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id AEEC48089D for ; Thu, 27 Feb 2020 18:28:08 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=xypron.glpk@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1582824487; bh=BPpAIeqsbhq3wbMWI2yOpgAdKRZ+TpcKLEq41cAL67o=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=FsdNLT9S1oIAdci9f29Sdlx1QywnLjvTUPOnDDqZhvOl+3n7vVIy4Iv6SxfduN/FM f4aIgS+kgrEknRKm0atFvYr7z6dTIuyWT/kWwKyNSY+oZewOWv1lAJ08sVf9D0l1IU IjCD6VzQZaQ7OVTAF62HtpTvJIK6CKAbk5xaMM0A= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from WDEC034349.fritz.box ([84.119.33.160]) by mail.gmx.com (mrgmx005 [212.227.17.184]) with ESMTPSA (Nemesis) id 1N79yQ-1jUCKJ19iu-017VHT; Thu, 27 Feb 2020 18:28:07 +0100 From: Heinrich Schuchardt To: Tom Rini Cc: Simon Glass , u-boot@lists.denx.de, Heinrich Schuchardt Subject: [PATCH 2/2] ide: remove duplicate defines form include/ata.h Date: Thu, 27 Feb 2020 18:28:01 +0100 Message-Id: <20200227172801.3126-3-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200227172801.3126-1-xypron.glpk@gmx.de> References: <20200227172801.3126-1-xypron.glpk@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:szPS397zjcAIhXajz+5luC6Dv4ip0KLvH1U51GJ2NcCvwY+jlmv NVT16iU02nmj9FJleLdGegxtGSVYvZn2M2cdixcNUBrMnkQbD5hNA2N63l2hvxECHKc+i6t lnWqIJYMwNHZBopJypEHaZ5fMcQm9GKx8KLvZSkIKhmVV5gBeiZl6KO8Hzz17LwsBQ8iA2I FEIrUrLEjGsTS69J+cwhA== X-UI-Out-Filterresults: notjunk:1; V03:K0:CO4NF+Ib3Cw=:sCpD4WxWoFpiroQN5alC3g 4rk2nby3KL6s7BzdRP2Njmx2c+rfstVcSMCzOrPh9KYcNA4iLs0ZJytE74lr7YVaJqW1c62A7 ogJgM+NISA86mUYmepWFjkx0jkBVlzYPUhSeK2jRSrzJLTtAhTCCt9iqTKFjRAdo234auSdqJ +YLkQaSxUOOHBrAIpsxiIjw3TTzVxPPtTqtftguVsE6o9FD/I+Sqzk7tkJVv5UtgIn/Y0aH2x /ihOt5vgmozDZwnL9bJ0JF/tUdh5EJhvQ4pvDGJwscbP2XSw1jLCWGgn5/GsWOvXLa3aY4WjX KoFjIRRjNGRbYz7K07Qcvw6bc+dNtlx0rQ5xo4spKfJLi9enOsbYiYDhP5IbG0y8Of6ATTy9k fvqS0QFDbGXtZEwwSY/d/n99I1WtndsoqTY4WUcL2BUwY/pJEPfSdOAALhDs83D+23J+ym7ws 6/BBlBrCsCmn/YbHwdDaK6UpIaPU3tuRhUahYPmiq71jCwBczgGsdqT0rluJ7JjQEboBDV593 ApGV+H84/HAdRQ5N2xwGoWiLrihoZ0dXMdl+IKmaSjY8h1wJo5epiFWckZ9LNoP9iUMnzS7wP ozO+KmLVvskOZaEQOi3sMcIYRuxtNcm3+BYfr64m1mdTDnCkWY045f+sZx5uzbPsuVu3BcjmH ZJQ7rir2QPdyfV8JQRk9Tsx1KbnDAeS3siS25/SC3EHh57OTZu5MArlaAiyv/dzSQGyW3QsTp 5FhnymBVyX1uo70JxF70/BN6MNYT9uMcNBE71tXmc8/pAJzVEW6B0SFW6ovEAAMvbG2ElnvSn Pc8nciUo9ucqFwilv948cYQur/YsTCSMq2z3+RmjCDTTNcka9YR4Tueh1BBy/T7p3mQ3FiXrL znPf8wtRVsKc6Ox5xz8hGAPVdt+H5krRu6BPIDzt5jh4ajc2pInHxpK3cnTU+afk7V+/bSbze i+Jabt/PWUeE0iXRWbw4oEZl+zRDo3ofZrwq101hvCjQu4AjJmkTb4W1C9K6XlOedWr65FnZx 2hOY/cU5ZKZb8H7YaWa11raQbbHfYjKJfzSDQ+yosZtuboBtNRWOQjV5jN51a5YfWFPqdvx/t 4iGblwz6XhUUQvtFKMNplVWROzRK9Y5i5T4K12yXtYwXUV3aNMyM7gDb6D/8MdaCqXTbp/jzh Fpbxq5XIZ10MQ/tANhgfiXC9Z5IpFSjTX/JRIaCrB8mvAA4xtSr1/5h2jv28N4uo/OiEcT2c1 fo6lFAkGv9p+mPGGP X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.2 at phobos.denx.de X-Virus-Status: Clean ATA commands are already defined in include/libata.h. There is no need to duplicate them in include/ata.h. Signed-off-by: Heinrich Schuchardt Reviewed-by: Simon Glass --- include/ata.h | 34 ---------------------------------- 1 file changed, 34 deletions(-) -- 2.25.0 diff --git a/include/ata.h b/include/ata.h index 3f4e4a0234..e35d91941d 100644 --- a/include/ata.h +++ b/include/ata.h @@ -70,43 +70,9 @@ #endif /* ATA_DEVICE */ #define ATA_LBA 0xE0 -/* - * ATA Commands (only mandatory commands listed here) - */ -#define ATA_CMD_READ 0x20 /* Read Sectors (with retries) */ -#define ATA_CMD_READN 0x21 /* Read Sectors ( no retries) */ -#define ATA_CMD_WRITE 0x30 /* Write Sectores (with retries)*/ -#define ATA_CMD_WRITEN 0x31 /* Write Sectors ( no retries)*/ -#define ATA_CMD_VRFY 0x40 /* Read Verify (with retries) */ -#define ATA_CMD_VRFYN 0x41 /* Read verify ( no retries) */ -#define ATA_CMD_SEEK 0x70 /* Seek */ -#define ATA_CMD_DIAG 0x90 /* Execute Device Diagnostic */ -#define ATA_CMD_INIT 0x91 /* Initialize Device Parameters */ -#define ATA_CMD_RD_MULT 0xC4 /* Read Multiple */ -#define ATA_CMD_WR_MULT 0xC5 /* Write Multiple */ -#define ATA_CMD_SETMULT 0xC6 /* Set Multiple Mode */ -#define ATA_CMD_RD_DMA 0xC8 /* Read DMA (with retries) */ -#define ATA_CMD_RD_DMAN 0xC9 /* Read DMS ( no retries) */ -#define ATA_CMD_WR_DMA 0xCA /* Write DMA (with retries) */ -#define ATA_CMD_WR_DMAN 0xCB /* Write DMA ( no retires) */ -#define ATA_CMD_IDENT 0xEC /* Identify Device */ -#define ATA_CMD_SETF 0xEF /* Set Features */ -#define ATA_CMD_CHK_PWR 0xE5 /* Check Power Mode */ - -#define ATA_CMD_READ_EXT 0x24 /* Read Sectors (with retries) with 48bit addressing */ -#define ATA_CMD_WRITE_EXT 0x34 /* Write Sectores (with retries) with 48bit addressing */ -#define ATA_CMD_VRFY_EXT 0x42 /* Read Verify (with retries) with 48bit addressing */ - -#define ATA_CMD_FLUSH 0xE7 /* Flush drive cache */ -#define ATA_CMD_FLUSH_EXT 0xEA /* Flush drive cache, with 48bit addressing */ - /* * ATAPI Commands */ -#define ATAPI_CMD_IDENT 0xA1 /* Identify AT Atachment Packed Interface Device */ -#define ATAPI_CMD_PACKET 0xA0 /* Packed Command */ - - #define ATAPI_CMD_INQUIRY 0x12 #define ATAPI_CMD_REQ_SENSE 0x03 #define ATAPI_CMD_READ_CAP 0x25