From mboxrd@z Thu Jan 1 00:00:00 1970 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=-19.9 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham 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 D8A8FC4338F for ; Fri, 6 Aug 2021 09:07:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AEC2061050 for ; Fri, 6 Aug 2021 09:07:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243976AbhHFJHh (ORCPT ); Fri, 6 Aug 2021 05:07:37 -0400 Received: from smtp-out1.suse.de ([195.135.220.28]:58578 "EHLO smtp-out1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231559AbhHFJHg (ORCPT ); Fri, 6 Aug 2021 05:07:36 -0400 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 7148A222F7; Fri, 6 Aug 2021 09:07:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1628240840; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MK1mx3PXm9jac4Pc11IDI7YKbsQKh9mILvxSQnkb6GE=; b=FIRxgWaejJ6ZzbO2ZvJhcJw8PAfMEoGiK50jMc471bRF40mIyBVmx590EBdHRgI/otdy3K bJFw77tKH7Dt9pNzsf9tCmMiJ4m9BbqIgplDSXpRn/UPcBSp+mP9j9jTRkfRjCMfaYaMm9 Cd0GjkCb/xkDV182G9WlTos+1MMvKEM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1628240840; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MK1mx3PXm9jac4Pc11IDI7YKbsQKh9mILvxSQnkb6GE=; b=YrdaeqRKhHuO7AQ7KD2/MOapK/zsnvKQiC881JlLmy0abdpZMB5hG22wF5m8osfcecBEQ6 gj1+AlPxGEtmDeAg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 5D36D13A62; Fri, 6 Aug 2021 09:07:20 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id Lv2BFcj7DGG2agAAMHmgww (envelope-from ); Fri, 06 Aug 2021 09:07:20 +0000 Subject: Re: [PATCH v2 4/9] libata: cleanup ata_dev_configure() To: Damien Le Moal , 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 References: <20210806074252.398482-1-damien.lemoal@wdc.com> <20210806074252.398482-5-damien.lemoal@wdc.com> From: Hannes Reinecke Message-ID: Date: Fri, 6 Aug 2021 11:07:19 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <20210806074252.398482-5-damien.lemoal@wdc.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org On 8/6/21 9:42 AM, Damien Le Moal wrote: > 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); > Hmm. Can't say I like it. Can't you move the second 'ata_dev_info()' call into the respective functions, and kill the temporary buffer? Cheers, Hannes -- Dr. Hannes Reinecke Kernel Storage Architect hare@suse.de +49 911 74053 688 SUSE Software Solutions Germany GmbH, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), GF: Felix Imendörffer