From patchwork Fri Aug 6 07:42:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damien Le Moal X-Patchwork-Id: 493093 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6D60CC4320E for ; Fri, 6 Aug 2021 07:43:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4939061050 for ; Fri, 6 Aug 2021 07:43:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238601AbhHFHnS (ORCPT ); Fri, 6 Aug 2021 03:43:18 -0400 Received: from esa3.hgst.iphmx.com ([216.71.153.141]:24064 "EHLO esa3.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236860AbhHFHnN (ORCPT ); Fri, 6 Aug 2021 03:43:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1628235777; x=1659771777; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=cNgb2TROU2WsZ1zU8ihpVY71OcdgiBcGbW7LESxTUo0=; b=cCFUR+zNI50BCRwv8Fc1Ed5932PCzQegMa/5T0Ldg1OZlHXZ0e3StRDA 8Wspy3tBkurlyFCueU8QayzSKpRThC0LX1018k0ea8AJMigT1VaB3/XAP 0+iCrZQUYp9GygTAzJx/uhw8PMl4ZjwlXRp+9HPtEeXShNsH5T3+xvjIk A4htuM6WTpC4O5P56G3caTuOiYst9FdQ6TBqUKj4CJDyl/gx5BEjT8qW5 Z4b5PM3R7AHHfNSJbrAWa7/dxP7VN1AfiT7VUMXcLe966ZXFkq6GbJ+ha FQzBBlnw1aY3hNPpbYBS5kUxdIt6dTg2styr1AUJ+mYMCmkOSSCerFW9b w==; X-IronPort-AV: E=Sophos;i="5.84,300,1620662400"; d="scan'208";a="181296847" Received: from h199-255-45-14.hgst.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 06 Aug 2021 15:42:57 +0800 IronPort-SDR: lDVC/xls6cqjf7GOzaxjdZIeoG017ZDyNvZM2IlttAkZJ9tSQ07E3TZGPFdwfFcz4i403+4DDs VN5ZLMWW+GnI6rZOHNY65G43a81LOlTIuCYJa9OZr1m9nyfhdawGJzR1yuOQH21xZyp/kHUg6y GXmmTNQWSon9FqGCdq0x3AvE2evlwk56eCebPLkRL/En0z/7QM5KbvWLh5lduLvXex8cqCqLtm 9OD8bewGe/0V7DRSYZM0zacpM8sZG1e2wHIVCuj77+YXLYlRpkCSgK36PNpGADEsPwzimYWswV woS1bNvAdGhP3wHasdsBzwWU Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Aug 2021 00:20:25 -0700 IronPort-SDR: z/Nhu9Qg97cElW4dG7C3BRIhv/bpEniPzQevntb6xReHLZ1SST8yEdbUtBbtVCHs3pxjO66jmJ yambJo4aPmCyK0QF7rlkWTvpgU/RkguNsjzBL6Bb9ZxmNZq3Mh8uD+UKThziZNCLZKPyA+nSz+ HzPPUqKwcfQUepj92ymcN7Uu3/UDf3IyjtFccEsu+1ocu2Ijvdkt+EH5GZAE2hh4lAuFGk17vq /bK3wmcd/UtouN6TB/U91GTc4+aEHRrFyS5QDYTcvhAg8bEDnWKkFHvKONZvSWW56Nwv5aWS6z ML8= WDCIronportException: Internal Received: from washi.fujisawa.hgst.com ([10.149.53.254]) by uls-op-cesaip02.wdc.com with ESMTP; 06 Aug 2021 00:42:56 -0700 From: Damien Le Moal To: Jens Axboe , linux-block@vger.kernel.org, linux-ide@vger.kernel.org, "Martin K . Petersen" , linux-scsi@vger.kernel.org Cc: Sathya Prakash , Sreekanth Reddy , Suganath Prabu Subramani Subject: [PATCH v2 2/9] libata: fix ata_host_start() Date: Fri, 6 Aug 2021 16:42:45 +0900 Message-Id: <20210806074252.398482-3-damien.lemoal@wdc.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210806074252.398482-1-damien.lemoal@wdc.com> References: <20210806074252.398482-1-damien.lemoal@wdc.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org The loop on entry of ata_host_start() may not initialize host->ops to a non NULL value. The test on the host_stop field of host->ops must then be preceded by a check that host->ops is not NULL. Reported-by: kernel test robot Signed-off-by: Damien Le Moal --- drivers/ata/libata-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index ea8b91297f12..fe49197caf99 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -5573,7 +5573,7 @@ int ata_host_start(struct ata_host *host) have_stop = 1; } - if (host->ops->host_stop) + if (host->ops && host->ops->host_stop) have_stop = 1; if (have_stop) { From patchwork Fri Aug 6 07:42:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damien Le Moal X-Patchwork-Id: 493092 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 04D99C41537 for ; Fri, 6 Aug 2021 07:43:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ED65F61050 for ; Fri, 6 Aug 2021 07:43:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240125AbhHFHnU (ORCPT ); Fri, 6 Aug 2021 03:43:20 -0400 Received: from esa3.hgst.iphmx.com ([216.71.153.141]:24074 "EHLO esa3.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238682AbhHFHnP (ORCPT ); Fri, 6 Aug 2021 03:43:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1628235780; x=1659771780; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=/GKiBcGNCHf0CUSVfrIJTyG1d7bktg9vl+k7UAd6i/o=; b=b9p3MsgbUx4qa2jam2QdN+FGo3KrL5/DpH2bkbGwtkfvei2M3thoyXqf edd2bTPBPv/0/SKiybbUMVhgr311LTqwwgg1AIe13X74JLph+YqZ2APou l7kPCeyrqZdWAaiKSQU/6B2OyK9fRbX/bHnMDU5Nl3uvHRkW5BE9sJ75z PJlxCYRlpAGibkxtpVuJw0DALoAHJzClJs/Te4fygXEp7kV4YmzHPOTL7 L400XV2lH6riqBJ1VWWwzQXkHKWUwBbn15fgXgk9CkORWmXsDAdu6uGCd bhg+WVSP17XRFT94NBq4RfBhpSvRA4NCFaFshore1JpV/dt4mO8aD/nYs g==; X-IronPort-AV: E=Sophos;i="5.84,300,1620662400"; d="scan'208";a="181296849" Received: from h199-255-45-14.hgst.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 06 Aug 2021 15:43:00 +0800 IronPort-SDR: AVYJqk3FCXQsr1CDddDPVcBmq2RMnqBEAbiD2SnpU9GROkTKKg13kBNSpcyjEyernGHLaARlhW tGRbrk9HBz7zZ+02sYqsFNLtDXheahfntZFWRy9dcCx0m07BY4UubLEXhPF3Hpn/bPPNTOoRhp Z0v4fdjvckj0ME/WMOsg/UO7KRdVL7VzOt5rMdursLAJU6OXpUZb0NVS76toNb0aCWsObpS/YW wlATbxAgzrWw05jR1DOj2jPLOXn/sAmm4R43H+m7Bok6kFphJukB0Z4VmcVKXVZQK/v/XezPIu NfOOMjwgzEA3jsRjB/HyAyD1 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Aug 2021 00:20:28 -0700 IronPort-SDR: y5vwB1t9n3hakKfYwHzE8HPyADy7ix4E9S9eVdpqtqKMI6G1Bcs1BSN8AVwSw2Ydl/3eBGX9BL aDf+4TIJiZIWoMK0Q7BIJ0c/8datMmNi//xQTq2exriqycue4z5tL11fBG/lJWGbq//Fo16F8b Vh67iPXYFj4cYVdXiOFJEg2hqINZ1OBg+rvrzhtOsuAOM23CJEUfUfXekTiOcQ3c3bzlJIVvJA B+SVpc/+zx0md5DIou3XAl/6F1rcvwVX/ng3h99sc/3H3r40YXL7VxPlXk3pPmH4BR5ekL+/L/ y10= WDCIronportException: Internal Received: from washi.fujisawa.hgst.com ([10.149.53.254]) by uls-op-cesaip02.wdc.com with ESMTP; 06 Aug 2021 00:42:59 -0700 From: Damien Le Moal To: Jens Axboe , linux-block@vger.kernel.org, linux-ide@vger.kernel.org, "Martin K . Petersen" , linux-scsi@vger.kernel.org Cc: Sathya Prakash , Sreekanth Reddy , Suganath Prabu Subramani Subject: [PATCH v2 4/9] libata: cleanup ata_dev_configure() Date: Fri, 6 Aug 2021 16:42:47 +0900 Message-Id: <20210806074252.398482-5-damien.lemoal@wdc.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210806074252.398482-1-damien.lemoal@wdc.com> References: <20210806074252.398482-1-damien.lemoal@wdc.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Introduce the helper functions ata_dev_config_lba() and ata_dev_config_chs() to configure the addressing capabilities of a device. Each helper takes a string as argument for the addressing information printed after these helpers execution completes. Signed-off-by: Damien Le Moal --- drivers/ata/libata-core.c | 110 ++++++++++++++++++++------------------ 1 file changed, 59 insertions(+), 51 deletions(-) diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index b13194432e5a..2b6054cdd8fc 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -2363,6 +2363,52 @@ static void ata_dev_config_trusted(struct ata_device *dev) dev->flags |= ATA_DFLAG_TRUSTED; } +static int ata_dev_config_lba(struct ata_device *dev, + char *info, size_t infosz) +{ + const u16 *id = dev->id; + int info_ofst; + + dev->flags |= ATA_DFLAG_LBA; + + if (ata_id_has_lba48(id)) { + dev->flags |= ATA_DFLAG_LBA48; + strscpy(info, "LBA48 ", infosz); + + if (dev->n_sectors >= (1UL << 28) && + ata_id_has_flush_ext(id)) + dev->flags |= ATA_DFLAG_FLUSH_EXT; + } else { + strscpy(info, "LBA ", infosz); + } + info_ofst = strlen(info); + + /* config NCQ */ + return ata_dev_config_ncq(dev, info + info_ofst, + infosz - info_ofst); +} + +static void ata_dev_config_chs(struct ata_device *dev, + char *info, size_t infosz) +{ + const u16 *id = dev->id; + + /* Default translation */ + dev->cylinders = id[1]; + dev->heads = id[3]; + dev->sectors = id[6]; + + if (ata_id_current_chs_valid(id)) { + /* Current CHS translation is valid. */ + dev->cylinders = id[54]; + dev->heads = id[55]; + dev->sectors = id[56]; + } + + snprintf(info, infosz, "CHS %u/%u/%u", + dev->cylinders, dev->heads, dev->sectors); +} + static void ata_dev_config_devslp(struct ata_device *dev) { u8 *sata_setting = dev->link->ap->sector_buf; @@ -2418,6 +2464,7 @@ int ata_dev_configure(struct ata_device *dev) char revbuf[7]; /* XYZ-99\0 */ char fwrevbuf[ATA_ID_FW_REV_LEN+1]; char modelbuf[ATA_ID_PROD_LEN+1]; + char lba_info[40]; int rc; if (!ata_dev_enabled(dev) && ata_msg_info(ap)) { @@ -2539,61 +2586,22 @@ int ata_dev_configure(struct ata_device *dev) } if (ata_id_has_lba(id)) { - const char *lba_desc; - char ncq_desc[24]; - - lba_desc = "LBA"; - dev->flags |= ATA_DFLAG_LBA; - if (ata_id_has_lba48(id)) { - dev->flags |= ATA_DFLAG_LBA48; - lba_desc = "LBA48"; - - if (dev->n_sectors >= (1UL << 28) && - ata_id_has_flush_ext(id)) - dev->flags |= ATA_DFLAG_FLUSH_EXT; - } - - /* config NCQ */ - rc = ata_dev_config_ncq(dev, ncq_desc, sizeof(ncq_desc)); + rc = ata_dev_config_lba(dev, lba_info, sizeof(lba_info)); if (rc) return rc; - - /* print device info to dmesg */ - if (ata_msg_drv(ap) && print_info) { - ata_dev_info(dev, "%s: %s, %s, max %s\n", - revbuf, modelbuf, fwrevbuf, - ata_mode_string(xfer_mask)); - ata_dev_info(dev, - "%llu sectors, multi %u: %s %s\n", - (unsigned long long)dev->n_sectors, - dev->multi_count, lba_desc, ncq_desc); - } } else { - /* CHS */ - - /* Default translation */ - dev->cylinders = id[1]; - dev->heads = id[3]; - dev->sectors = id[6]; - - if (ata_id_current_chs_valid(id)) { - /* Current CHS translation is valid. */ - dev->cylinders = id[54]; - dev->heads = id[55]; - dev->sectors = id[56]; - } + ata_dev_config_chs(dev, lba_info, sizeof(lba_info)); + } - /* print device info to dmesg */ - if (ata_msg_drv(ap) && print_info) { - ata_dev_info(dev, "%s: %s, %s, max %s\n", - revbuf, modelbuf, fwrevbuf, - ata_mode_string(xfer_mask)); - ata_dev_info(dev, - "%llu sectors, multi %u, CHS %u/%u/%u\n", - (unsigned long long)dev->n_sectors, - dev->multi_count, dev->cylinders, - dev->heads, dev->sectors); - } + /* print device info to dmesg */ + if (ata_msg_drv(ap) && print_info) { + ata_dev_info(dev, "%s: %s, %s, max %s\n", + revbuf, modelbuf, fwrevbuf, + ata_mode_string(xfer_mask)); + ata_dev_info(dev, + "%llu sectors, multi %u, %s\n", + (unsigned long long)dev->n_sectors, + dev->multi_count, lba_info); } ata_dev_config_devslp(dev); From patchwork Fri Aug 6 07:42:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damien Le Moal X-Patchwork-Id: 493091 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5F69BC4320E for ; Fri, 6 Aug 2021 07:43:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 42F0160F25 for ; Fri, 6 Aug 2021 07:43:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240698AbhHFHnX (ORCPT ); Fri, 6 Aug 2021 03:43:23 -0400 Received: from esa3.hgst.iphmx.com ([216.71.153.141]:24088 "EHLO esa3.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237731AbhHFHnT (ORCPT ); Fri, 6 Aug 2021 03:43:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1628235783; x=1659771783; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=S5Y3bG6NIEAG8gtHiA4fje5arZx2YV3BaonuYZeLlKc=; b=cP+pDK+y97ktUfcY0R/4eGgd/nAWjmMTAhaf8WVrPTsixaVVtykXNaGU j9HRAj0wi2tWDWmhCMkjXM9O4W2dsJKweJ6fJ0kNM827Fei3E56C4T753 Blw3AI8aso9oLPuXA6tKkAuP7i9IXqYVcPmz3p6vUup/p15+2e3KVn9Y4 nyZLy+gnnfdSwwNGnudlPDLzGEkhDbD0jf5zUJ9pAcq0oHU+V44Dsy4XD 8Cfvqn2ZinWgMM9K2ATml4EBoOBLF+KtEjNvPZVjD+XQONsud3Yp3Tqeg EKjqgde622wy+IgrKazZ7C3TB8Fb1tp+rs/lhjFInfAiOupKf0umPUxrq w==; X-IronPort-AV: E=Sophos;i="5.84,300,1620662400"; d="scan'208";a="181296855" Received: from h199-255-45-14.hgst.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 06 Aug 2021 15:43:03 +0800 IronPort-SDR: RF0NwlGhVnpbX1uVwkF8siOAMnXl+0AnhmuITi5+JU5Z1ZwdN4xOxCHaDxOd6Di43PrnHVKbvX DWSrtTh8Nt/bYLmAsW9PDuK5kHSM7FQjYUzWcdS73+062HqAo8aczSkznQ79Y+hXMxatq/Loh4 WIEUoAxAlNCOgQw4DhhuYCmAM67ZkN/rpduncUv5KnoDideh0ePZFly3M3c2cRR/kphxnUF8Za bUNyEah808Tli4wQLzy6JHTtnHx2JclZxKzptdu+x+9DeAOw5zmE37S88RGd+2LLklhe3ua81e SuZ9xcP2HpKZPBpYQd81MRjZ Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Aug 2021 00:20:32 -0700 IronPort-SDR: 8raPk64+yRWv4D+eNI6j5q9KY+7EQ2flHAYIenXvgp5CVUQah4n43oJiSOahwZnUKXH00WWG15 QpCIqTAG5Cp+oXNk9NOsSKnXkaH8EKXKTlVBXVnDxJwobqHuQtBAD0HmtkqD4pkACUKXy/CzSz 4CBxryb5+yGGyBIQ2OCBlaArQAf/fiMYTBrvA+zuPue2+VPPqpWS05sYMa4lq8CkwWNh4wJKPV fdW87ZaSUWDMKuKXJY+i3oLAzgvjhv9B3RlKOh2lal8uAlhzaOlyxv7y/y0hSggxpFQ9Tv2QZ9 XBE= WDCIronportException: Internal Received: from washi.fujisawa.hgst.com ([10.149.53.254]) by uls-op-cesaip02.wdc.com with ESMTP; 06 Aug 2021 00:43:02 -0700 From: Damien Le Moal To: Jens Axboe , linux-block@vger.kernel.org, linux-ide@vger.kernel.org, "Martin K . Petersen" , linux-scsi@vger.kernel.org Cc: Sathya Prakash , Sreekanth Reddy , Suganath Prabu Subramani Subject: [PATCH v2 6/9] libata: fix ata_read_log_page() warning Date: Fri, 6 Aug 2021 16:42:49 +0900 Message-Id: <20210806074252.398482-7-damien.lemoal@wdc.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210806074252.398482-1-damien.lemoal@wdc.com> References: <20210806074252.398482-1-damien.lemoal@wdc.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Support for the READ LOG PAGE DMA EXT command is indicated by words 119 and 120 of a device identify data. This is tested in ata_read_log_page() with ata_id_has_read_log_dma_ext() and the READ LOG PAGE DMA command used if the device reports supports for it. However, some devices lie about this support and using the DMA version of the command fails, generating the warning message "READ LOG DMA EXT failed, trying PIO". Since READ LOG PAGE DMA EXT is an optional command, this warning is not at all important but may be scary for the user. Change ata_read_log_page() to suppres this warning and to print an error message if both DMA and PIO attempts failed. With this change, there is no need to print again an error message when ata_read_log_page() returns an error. So simplify the users of this function. Signed-off-by: Damien Le Moal Reviewed-by: Hannes Reinecke --- drivers/ata/libata-core.c | 47 +++++++++++---------------------------- 1 file changed, 13 insertions(+), 34 deletions(-) diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index b556401cc110..3c213d125e95 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -2021,13 +2021,15 @@ unsigned int ata_read_log_page(struct ata_device *dev, u8 log, err_mask = ata_exec_internal(dev, &tf, NULL, DMA_FROM_DEVICE, buf, sectors * ATA_SECT_SIZE, 0); - if (err_mask && dma) { - dev->horkage |= ATA_HORKAGE_NO_DMA_LOG; - ata_dev_warn(dev, "READ LOG DMA EXT failed, trying PIO\n"); - goto retry; + if (err_mask) { + if (dma) { + dev->horkage |= ATA_HORKAGE_NO_DMA_LOG; + goto retry; + } + ata_dev_err(dev, "Read log page 0x%02x failed, Emask 0x%x\n", + (unsigned int)page, err_mask); } - DPRINTK("EXIT, err_mask=%x\n", err_mask); return err_mask; } @@ -2056,12 +2058,8 @@ static bool ata_identify_page_supported(struct ata_device *dev, u8 page) */ err = ata_read_log_page(dev, ATA_LOG_IDENTIFY_DEVICE, 0, ap->sector_buf, 1); - if (err) { - ata_dev_info(dev, - "failed to get Device Identify Log Emask 0x%x\n", - err); + if (err) return false; - } for (i = 0; i < ap->sector_buf[8]; i++) { if (ap->sector_buf[9 + i] == page) @@ -2125,11 +2123,7 @@ static void ata_dev_config_ncq_send_recv(struct ata_device *dev) } err_mask = ata_read_log_page(dev, ATA_LOG_NCQ_SEND_RECV, 0, ap->sector_buf, 1); - if (err_mask) { - ata_dev_dbg(dev, - "failed to get NCQ Send/Recv Log Emask 0x%x\n", - err_mask); - } else { + if (!err_mask) { u8 *cmds = dev->ncq_send_recv_cmds; dev->flags |= ATA_DFLAG_NCQ_SEND_RECV; @@ -2155,11 +2149,7 @@ static void ata_dev_config_ncq_non_data(struct ata_device *dev) } err_mask = ata_read_log_page(dev, ATA_LOG_NCQ_NON_DATA, 0, ap->sector_buf, 1); - if (err_mask) { - ata_dev_dbg(dev, - "failed to get NCQ Non-Data Log Emask 0x%x\n", - err_mask); - } else { + if (!err_mask) { u8 *cmds = dev->ncq_non_data_cmds; memcpy(cmds, ap->sector_buf, ATA_LOG_NCQ_NON_DATA_SIZE); @@ -2176,12 +2166,8 @@ static void ata_dev_config_ncq_prio(struct ata_device *dev) ATA_LOG_SATA_SETTINGS, ap->sector_buf, 1); - if (err_mask) { - ata_dev_dbg(dev, - "failed to get SATA settings log, Emask 0x%x\n", - err_mask); + if (err_mask) goto not_supported; - } if (!(ap->sector_buf[ATA_LOG_NCQ_PRIO_OFFSET] & BIT(3))) goto not_supported; @@ -2342,11 +2328,8 @@ static void ata_dev_config_trusted(struct ata_device *dev) err = ata_read_log_page(dev, ATA_LOG_IDENTIFY_DEVICE, ATA_LOG_SECURITY, ap->sector_buf, 1); - if (err) { - ata_dev_dbg(dev, - "failed to read Security Log, Emask 0x%x\n", err); + if (err) return; - } trusted_cap = get_unaligned_le64(&ap->sector_buf[40]); if (!(trusted_cap & (1ULL << 63))) { @@ -2422,12 +2405,8 @@ static void ata_dev_config_devslp(struct ata_device *dev) ATA_LOG_IDENTIFY_DEVICE, ATA_LOG_SATA_SETTINGS, sata_setting, 1); - if (err_mask) { - ata_dev_dbg(dev, - "failed to get SATA Settings Log, Emask 0x%x\n", - err_mask); + if (err_mask) return; - } dev->flags |= ATA_DFLAG_DEVSLP; for (i = 0; i < ATA_LOG_DEVSLP_SIZE; i++) { From patchwork Fri Aug 6 07:42:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damien Le Moal X-Patchwork-Id: 493090 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AAF9CC19F39 for ; Fri, 6 Aug 2021 07:43:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9054B60F25 for ; Fri, 6 Aug 2021 07:43:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239081AbhHFHn0 (ORCPT ); Fri, 6 Aug 2021 03:43:26 -0400 Received: from esa3.hgst.iphmx.com ([216.71.153.141]:24093 "EHLO esa3.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240392AbhHFHnW (ORCPT ); Fri, 6 Aug 2021 03:43:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1628235786; x=1659771786; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=dxUqBpMfBGL8QgT/G4aYqB14OK8eppkoSmc37wpGAVA=; b=q1rvwL6GdGYrrEnysLazGCqKlEURyGYX2Lz77GQUNXB2P7L9+Do3QQEn lV888T2mjlYKgYuQz6uxCIK+NcmNhkak/AJGGO4WRVQ2tmwqwtNjhZ+Zl y87no/zTIZGd2ZRy8YTVlH3w+yyWKEa19asIsVTN8EkI91A7UNs8XwK4f 8hO1lch39EpPPvxnAQUcX2Ll2d3wOX0Uoc+NnMbQtM13K/fU2BfLt8P7U 9b0h0eRmOECVar+ZmzJ4DDaE2/3RqIwJBiaILq6MdHEdjeePlVQzoX7yj hR2nunI23FEMd16MgSJn8hPEzqTlO3P/sq+or3PXZrvR5bQyPsIe3RIQr Q==; X-IronPort-AV: E=Sophos;i="5.84,300,1620662400"; d="scan'208";a="181296862" Received: from h199-255-45-14.hgst.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 06 Aug 2021 15:43:06 +0800 IronPort-SDR: OVn+zhAm+ajheG8cfo9i5NIAn0xeJNOuV1Oz1xvNeyELG1BHz4Q4+b4J2mK2Ah6b1TBh2r3dRR 0cz1je3XWKi+YzCrMEH2gEGrjjfrjduzhlVKvCItHc4oPsWRVmW+icIqs4ISYRSu01zP0IewYp 1Q9DEdviSceZG9EXuPX5pS/kV5LrZT+Il24k2p0FFoUwITsxuDwTbfTVV/2YZYjqy7o+4Zeiyf 0K8MeXzo9zmCuqE23h6qV24ES18wF95OQ2nxTTMKTOs1nZGVrGaVMMrqP3dctr7twKiMJHp4C0 ccjMpsYC6PGvGFS8rkFtZTok Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Aug 2021 00:20:35 -0700 IronPort-SDR: dvH2ITMNED8Yc5D9k3khnKoOeYImeai83+ykB4R4PundXhR9Ir30Q70TaKH9VW1relrjf+MnHs askepwacX/RxcBKiKLP/wMxhFWnIunvTwZV6XajQkHIWOWoXv7pm5InqmmUMjZhbzGRo7Jmsk5 n6vFJNgXSlIYZnneO/zRDOwmZUY9SY4yBhk5fJk+FfipVboqtw1TaReNPRTa2KxPAJWnRNo4YB DtFpYBp0kIxSad/RgllC2bsjD9iG+4sD+JbOj7DXSALmJduFCurk33OQJ1y7tzSIpQQXGxPF2U 70c= WDCIronportException: Internal Received: from washi.fujisawa.hgst.com ([10.149.53.254]) by uls-op-cesaip02.wdc.com with ESMTP; 06 Aug 2021 00:43:05 -0700 From: Damien Le Moal To: Jens Axboe , linux-block@vger.kernel.org, linux-ide@vger.kernel.org, "Martin K . Petersen" , linux-scsi@vger.kernel.org Cc: Sathya Prakash , Sreekanth Reddy , Suganath Prabu Subramani Subject: [PATCH v2 8/9] libahci: Introduce ncq_prio_supported sysfs sttribute Date: Fri, 6 Aug 2021 16:42:51 +0900 Message-Id: <20210806074252.398482-9-damien.lemoal@wdc.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210806074252.398482-1-damien.lemoal@wdc.com> References: <20210806074252.398482-1-damien.lemoal@wdc.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Currently, the only way a user can determine if a SATA device supports NCQ priority is to try to enable the use of this feature using the ncq_prio_enable sysfs device attribute. If enabling the feature fails, it is because the device does not support NCQ priority. Otherwise, the feature is enabled and indicates that the device supports NCQ priority. Improve this odd interface by introducing the read-only ncq_prio_supported sysfs device attribute to indicate if a SATA device supports NCQ priority. The value of this attribute reflects if the device flag ATA_DFLAG_NCQ_PRIO is set or cleared. Signed-off-by: Damien Le Moal --- drivers/ata/libahci.c | 1 + drivers/ata/libata-sata.c | 24 ++++++++++++++++++++++++ include/linux/libata.h | 1 + 3 files changed, 26 insertions(+) diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c index fec2e9754aed..5b3fa2cbe722 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c @@ -125,6 +125,7 @@ EXPORT_SYMBOL_GPL(ahci_shost_attrs); struct device_attribute *ahci_sdev_attrs[] = { &dev_attr_sw_activity, &dev_attr_unload_heads, + &dev_attr_ncq_prio_supported, &dev_attr_ncq_prio_enable, NULL }; diff --git a/drivers/ata/libata-sata.c b/drivers/ata/libata-sata.c index dc397ebda089..5566fd4bb38f 100644 --- a/drivers/ata/libata-sata.c +++ b/drivers/ata/libata-sata.c @@ -834,6 +834,30 @@ DEVICE_ATTR(link_power_management_policy, S_IRUGO | S_IWUSR, ata_scsi_lpm_show, ata_scsi_lpm_store); EXPORT_SYMBOL_GPL(dev_attr_link_power_management_policy); +static ssize_t ata_ncq_prio_supported_show(struct device *device, + struct device_attribute *attr, + char *buf) +{ + struct scsi_device *sdev = to_scsi_device(device); + struct ata_port *ap = ata_shost_to_port(sdev->host); + struct ata_device *dev; + bool ncq_prio_supported; + int rc = 0; + + spin_lock_irq(ap->lock); + dev = ata_scsi_find_dev(ap, sdev); + if (!dev) + rc = -ENODEV; + else + ncq_prio_supported = dev->flags & ATA_DFLAG_NCQ_PRIO; + spin_unlock_irq(ap->lock); + + return rc ? rc : sysfs_emit(buf, "%u\n", ncq_prio_supported); +} + +DEVICE_ATTR(ncq_prio_supported, S_IRUGO, ata_ncq_prio_supported_show, NULL); +EXPORT_SYMBOL_GPL(dev_attr_ncq_prio_supported); + static ssize_t ata_ncq_prio_enable_show(struct device *device, struct device_attribute *attr, char *buf) diff --git a/include/linux/libata.h b/include/linux/libata.h index b23f28cfc8e0..a2d1bae7900b 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -539,6 +539,7 @@ typedef void (*ata_postreset_fn_t)(struct ata_link *link, unsigned int *classes) extern struct device_attribute dev_attr_unload_heads; #ifdef CONFIG_SATA_HOST extern struct device_attribute dev_attr_link_power_management_policy; +extern struct device_attribute dev_attr_ncq_prio_supported; extern struct device_attribute dev_attr_ncq_prio_enable; extern struct device_attribute dev_attr_em_message_type; extern struct device_attribute dev_attr_em_message;