From patchwork Sun Jun 4 12:42:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 770894 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3wgczl36r5z9s3w for ; Sun, 4 Jun 2017 22:42:43 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=infradead.org header.i=@infradead.org header.b="sgz98Xlx"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751213AbdFDMmm (ORCPT ); Sun, 4 Jun 2017 08:42:42 -0400 Received: from bombadil.infradead.org ([65.50.211.133]:37195 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751201AbdFDMmj (ORCPT ); Sun, 4 Jun 2017 08:42:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=YYg/RR8CbNPPWRqzv1qKA70nor1Td9Pj/Aqp9AogGoQ=; b=sgz98XlxNiICpk8Z3/lLV6yz/ /xtmlpePwJG9AyQQeumJ3imVPse42Qqa4yRZ5jW87m3O5aNgT3dFdC2Ba92ZNeSqQhcgKTk+acZnC vuFRaEYuCc96vtbkCmEqCbDxHEWpYyJ57P8eNtBRHxm/k75GGTpgh3baACWHrr2vNvXI0unSyeAs6 ieE8XjRCknwC0zgQ8/2lpziCJs7Qvmct2yNdb+Cb69ZR6WlbkEs7BIXsvkkUi1RTDMloALPt7GFLj 3DGGJ8MmUNmSEpShIlgRsQ8AeImSk1I5ZjNYRYelzZ3oqdmgVYzTAjm+kip+9x1gaawm0/uE0jiBF oeuNeud9A==; Received: from p4ff2ee7d.dip0.t-ipconnect.de ([79.242.238.125] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.87 #1 (Red Hat Linux)) id 1dHUrd-00088A-Ft; Sun, 04 Jun 2017 12:42:37 +0000 From: Christoph Hellwig To: Tejun Heo Cc: Scott Bauer , Jonathan Derrick , Rafael Antognolli , Robert Elliott , linux-ide@vger.kernel.org, linux-block@vger.kernel.org, linux-scsi@vger.kernel.org Subject: [PATCH 3/6] libata: clarify log page naming / grouping Date: Sun, 4 Jun 2017 14:42:22 +0200 Message-Id: <20170604124225.27032-4-hch@lst.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170604124225.27032-1-hch@lst.de> References: <20170604124225.27032-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org Signed-off-by: Christoph Hellwig Reviewed-by: Hannes Reinecke --- drivers/ata/libata-core.c | 10 +++++----- include/linux/ata.h | 10 +++++++--- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 0672733997bb..445e7050637b 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -2226,7 +2226,7 @@ static void ata_dev_config_ncq_prio(struct ata_device *dev) } err_mask = ata_read_log_page(dev, - ATA_LOG_SATA_ID_DEV_DATA, + ATA_LOG_IDENTIFY_DEVICE, ATA_LOG_SATA_SETTINGS, ap->sector_buf, 1); @@ -2346,7 +2346,7 @@ static void ata_dev_config_zac(struct ata_device *dev) if (!(dev->flags & ATA_DFLAG_ZAC)) return; - if (!ata_log_supported(dev, ATA_LOG_SATA_ID_DEV_DATA)) { + if (!ata_log_supported(dev, ATA_LOG_IDENTIFY_DEVICE)) { ata_dev_warn(dev, "ATA Identify Device Log not supported\n"); return; } @@ -2355,7 +2355,7 @@ static void ata_dev_config_zac(struct ata_device *dev) * Read IDENTIFY DEVICE data log, page 0, to figure out * if page 9 is supported. */ - err_mask = ata_read_log_page(dev, ATA_LOG_SATA_ID_DEV_DATA, 0, + err_mask = ata_read_log_page(dev, ATA_LOG_IDENTIFY_DEVICE, 0, identify_buf, 1); if (err_mask) { ata_dev_info(dev, @@ -2379,7 +2379,7 @@ static void ata_dev_config_zac(struct ata_device *dev) /* * Read IDENTIFY DEVICE data log, page 9 (Zoned-device information) */ - err_mask = ata_read_log_page(dev, ATA_LOG_SATA_ID_DEV_DATA, + err_mask = ata_read_log_page(dev, ATA_LOG_IDENTIFY_DEVICE, ATA_LOG_ZONED_INFORMATION, identify_buf, 1); if (!err_mask) { @@ -2608,7 +2608,7 @@ int ata_dev_configure(struct ata_device *dev) dev->flags |= ATA_DFLAG_DEVSLP; err_mask = ata_read_log_page(dev, - ATA_LOG_SATA_ID_DEV_DATA, + ATA_LOG_IDENTIFY_DEVICE, ATA_LOG_SATA_SETTINGS, sata_setting, 1); diff --git a/include/linux/ata.h b/include/linux/ata.h index ad7d9ee89ff0..44de34c954d8 100644 --- a/include/linux/ata.h +++ b/include/linux/ata.h @@ -336,11 +336,15 @@ enum { /* READ_LOG_EXT pages */ ATA_LOG_DIRECTORY = 0x0, ATA_LOG_SATA_NCQ = 0x10, - ATA_LOG_NCQ_NON_DATA = 0x12, - ATA_LOG_NCQ_SEND_RECV = 0x13, - ATA_LOG_SATA_ID_DEV_DATA = 0x30, + ATA_LOG_NCQ_NON_DATA = 0x12, + ATA_LOG_NCQ_SEND_RECV = 0x13, + ATA_LOG_IDENTIFY_DEVICE = 0x30, + + /* Identify device log pages: */ ATA_LOG_SATA_SETTINGS = 0x08, ATA_LOG_ZONED_INFORMATION = 0x09, + + /* Identify device SATA settings log:*/ ATA_LOG_DEVSLP_OFFSET = 0x30, ATA_LOG_DEVSLP_SIZE = 0x08, ATA_LOG_DEVSLP_MDAT = 0x00,