From nobody Tue Jan 11 13:42:22 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id DB3501939EDE; Tue, 11 Jan 2022 13:42:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JYBhG43L2z4W3c; Tue, 11 Jan 2022 13:42:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6CA2D1A1A7; Tue, 11 Jan 2022 13:42:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20BDgMOP038039; Tue, 11 Jan 2022 13:42:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20BDgMuP038038; Tue, 11 Jan 2022 13:42:22 GMT (envelope-from git) Date: Tue, 11 Jan 2022 13:42:22 GMT Message-Id: <202201111342.20BDgMuP038038@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andriy Gapon Subject: git: 75bc7150f4b8 - main - add and use defintions for ATA power modes List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: avg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 75bc7150f4b87e14da13e2e96da9cdf59a5723cf Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641908542; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QExjpmNPKSOmoLJdGICBeREHwtiftfuZFi/uZnDLszs=; b=fbAkZ5/Ele84F0OJzM11TqU1rfUIVqTcRVQFHMBTQ5Y8jbEAG8HJspCY/1VXPaLx+GcIji eYIV8/VTqPGWYm+fcIUY/UaEAIv7JuVeVivC1fVOkpY/zPEE8ocMImhSTXdTxsQugc1Cqy TRQweI/L+WMq15p6IKMuemkt8pMyj505ykWpgMQp8fs8GfZTddh2dpqnPam4sXYdfoCXG3 QKPavnJXP8/tPNYp863ZHKF1QsSnLL7h3Pcxqpb9ChhrKXO8JQJCRAprLkJwZPrmJ2Xx2x XHygNq20ZxSSwJkmEoaQQcGolXRBT7MsC7Dy6KYzJHSSdurbWfGabbBO632LAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641908542; a=rsa-sha256; cv=none; b=wXr96OF9qSC3igedlCQ5sPDKYUrMdKvfz+AUoMH0gyj6pb3kZCKI2wXZyAe686uCXc49G3 rZ3TeKc4o1Ectb0NW2u1koBVy3L/gia/cr+/3UcroG3qBhnKXcnCFG/nwGclUIwkwPznky ueFWYlMuFQisxOFuJs1ALyMOqgKtp9YkqZgenEopLMZdhZAQiF31mt7s5Ln4TLXcZyLvCV ySlpjbFWELEsOsSb6NVvqetFDa2WdqCPCITDds0zczMRtpZAwQ4D/MJ1Sa/YUO5Fv0XW64 yx3G4NTPM2Rb5D6hkWXuIqBQsAJfy468av9IdbireJAGY1+nTOHWnj9aZaLLBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=75bc7150f4b87e14da13e2e96da9cdf59a5723cf commit 75bc7150f4b87e14da13e2e96da9cdf59a5723cf Author: Andriy Gapon AuthorDate: 2022-01-11 13:41:38 +0000 Commit: Andriy Gapon CommitDate: 2022-01-11 13:41:38 +0000 add and use defintions for ATA power modes Those can be returned by CHECK POWER MODE command (0xe5). Note that some of the definitions duplicate definitions for Extended Power Conditions. MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D33646 --- sbin/camcontrol/camcontrol.c | 18 +++++++++--------- sbin/camcontrol/epc.c | 8 ++++---- sys/cam/ata/ata_da.c | 4 ++-- sys/sys/ata.h | 7 +++++++ 4 files changed, 22 insertions(+), 15 deletions(-) diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c index facabbe2ecdc..489c3026537a 100644 --- a/sbin/camcontrol/camcontrol.c +++ b/sbin/camcontrol/camcontrol.c @@ -9203,31 +9203,31 @@ atapm_proc_resp(struct cam_device *device, union ccb *ccb) printf("%s%d: ", device->device_name, device->dev_unit_num); switch (count) { - case 0x00: + case ATA_PM_STANDBY: printf("Standby mode\n"); break; - case 0x01: + case ATA_PM_STANDBY_Y: printf("Standby_y mode\n"); break; - case 0x40: + case 0x40: /* obsolete since ACS-3 */ printf("NV Cache Power Mode and the spindle is spun down or spinning down\n"); break; - case 0x41: + case 0x41: /* obsolete since ACS-3 */ printf("NV Cache Power Mode and the spindle is spun up or spinning up\n"); break; - case 0x80: + case ATA_PM_IDLE: printf("Idle mode\n"); break; - case 0x81: + case ATA_PM_IDLE_A: printf("Idle_a mode\n"); break; - case 0x82: + case ATA_PM_IDLE_B: printf("Idle_b mode\n"); break; - case 0x83: + case ATA_PM_IDLE_C: printf("Idle_c mode\n"); break; - case 0xff: + case ATA_PM_ACTIVE_IDLE: printf("Active or Idle mode\n"); break; default: diff --git a/sbin/camcontrol/epc.c b/sbin/camcontrol/epc.c index f96ca6e68ba9..aac94ccaa4e5 100644 --- a/sbin/camcontrol/epc.c +++ b/sbin/camcontrol/epc.c @@ -475,18 +475,18 @@ check_power_mode: || (ident->enabled2 & ATA_ENABLED_EPC)) { if (mode_name != NULL) printf("%s", mode_name); - else if (count == 0xff) { + else if (count == ATA_PM_ACTIVE_IDLE) { printf("PM0:Active or PM1:Idle"); } } else { switch (count) { - case 0x00: + case ATA_PM_STANDBY: printf("PM2:Standby"); break; - case 0x80: + case ATA_PM_IDLE: printf("PM1:Idle"); break; - case 0xff: + case ATA_PM_ACTIVE_IDLE: printf("PM0:Active or PM1:Idle"); break; } diff --git a/sys/cam/ata/ata_da.c b/sys/cam/ata/ata_da.c index 26d0d96d026f..41561c25f363 100644 --- a/sys/cam/ata/ata_da.c +++ b/sys/cam/ata/ata_da.c @@ -3660,8 +3660,8 @@ adaspindown(uint8_t cmd, int flags) } #endif switch (mode) { - case 0x00: - case 0x01: + case ATA_PM_STANDBY: + case ATA_PM_STANDBY_Y: if (bootverbose) { xpt_print(periph->path, "already spun down\n"); diff --git a/sys/sys/ata.h b/sys/sys/ata.h index 7f89d96790fe..2cebba0e4864 100644 --- a/sys/sys/ata.h +++ b/sys/sys/ata.h @@ -477,6 +477,13 @@ struct ata_params { #define ATA_READ_BUFFER 0xe4 /* read buffer */ #define ATA_READ_PM 0xe4 /* read portmultiplier */ #define ATA_CHECK_POWER_MODE 0xe5 /* device power mode */ +#define ATA_PM_STANDBY 0x00 /* standby, also ATA_EPC_STANDBY_Z */ +#define ATA_PM_STANDBY_Y 0x01 /* standby, also ATA_EPC_STANDBY_Y */ +#define ATA_PM_IDLE 0x80 /* idle */ +#define ATA_PM_IDLE_A 0x81 /* idle, also ATA_EPC_IDLE_A */ +#define ATA_PM_IDLE_B 0x82 /* idle, also ATA_EPC_IDLE_B */ +#define ATA_PM_IDLE_C 0x83 /* idle, also ATA_EPC_IDLE_C */ +#define ATA_PM_ACTIVE_IDLE 0xff /* active or idle */ #define ATA_SLEEP 0xe6 /* sleep */ #define ATA_FLUSHCACHE 0xe7 /* flush cache to disk */ #define ATA_WRITE_BUFFER 0xe8 /* write buffer */