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=-12.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, NICE_REPLY_A,SIGNED_OFF_BY,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 F25D5C433DF for ; Thu, 15 Oct 2020 13:33:32 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4D08422254 for ; Thu, 15 Oct 2020 13:33:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="SLa84P2b" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4D08422254 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:51402 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kT3Nr-0005tQ-9v for qemu-devel@archiver.kernel.org; Thu, 15 Oct 2020 09:33:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49958) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kT3MV-00058g-Vc for qemu-devel@nongnu.org; Thu, 15 Oct 2020 09:32:08 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:25892) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kT3MT-0007nv-V6 for qemu-devel@nongnu.org; Thu, 15 Oct 2020 09:32:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602768725; h=from:from:reply-to:subject:subject: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=zlH9AbW2nMap1YXCmxMKaftOvfQfspTNqbpp84Phbfw=; b=SLa84P2bYvFlC9f1OoAnak+e8It9NEkQolRA1/w99ne5EQ676ZV/cEGnU0a4u4V4ezCzLz 3o6B1zOt01GMWtpeJ7dZXyOamZCBofNquuO92LW34RGNkNBiRwuRDlUi0xGqeo75FPPaLn mxlRAQRjklhi5fJr8EN/lVluYuH89+4= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-545-_1ZDziPWNmSfM_-6YcO_BA-1; Thu, 15 Oct 2020 09:32:03 -0400 X-MC-Unique: _1ZDziPWNmSfM_-6YcO_BA-1 Received: by mail-wm1-f72.google.com with SMTP id c204so1869918wmd.5 for ; Thu, 15 Oct 2020 06:32:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=zlH9AbW2nMap1YXCmxMKaftOvfQfspTNqbpp84Phbfw=; b=ft8paauPhMfih93oc3x56ipScsYlRv/pSezc5xM9fWVRE1F1Plz915E32GTYBSksPd MLtyNu1FaoFwQnnEUVpieD1aiDSsO4iDyyk8CQfIiWTddd/Amb/pLJ7KsG+j/rVM+PBP 3u88pYRxEU56FKY2FHY/wgLNDJH8qMYvBdo2nROQdlRdbqlRfVa7IQdyUY4u/kXSxhKY sJGZ8E2AlET4Y94jtk0SGsDWjzFLW3tuMeQAT2NXxHUQie3xLe+M7fdMxrDfD6j1nbmg hqvkdjVk+DgLTw00hh+2c5yhTg5Wy5+tr8KMQXlYBYOpLc3bbu/4DJM75zfsfWeB03xT BdbA== X-Gm-Message-State: AOAM530lMNtZ6zigxAnfjdZkyxo31tb56IbswNtUDakcM5xBhbdK3Lbu E3b2WpSmIGDw7LPfwdDReusiRb8IHi6zISMh5jNXzfh/nuG1MYzm+pZJk/pjNVfSvMGaji5fjOR pd9dsTHJr3zYhoDM= X-Received: by 2002:a5d:6904:: with SMTP id t4mr4628378wru.410.1602768722053; Thu, 15 Oct 2020 06:32:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxTZYYChqWyrRtOcLv4h09fxYTROWZb+yzJmRF5Oi6ePDUFH7JdVc8pmyvz6i1Wh7kTZpmlGA== X-Received: by 2002:a5d:6904:: with SMTP id t4mr4628355wru.410.1602768721850; Thu, 15 Oct 2020 06:32:01 -0700 (PDT) Received: from [192.168.1.36] (106.red-83-59-162.dynamicip.rima-tde.net. [83.59.162.106]) by smtp.gmail.com with ESMTPSA id v4sm4405771wmg.35.2020.10.15.06.32.00 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 15 Oct 2020 06:32:01 -0700 (PDT) Subject: Re: [RFC 1/5] block/nvme: use some NVME_CAP_* macros From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= To: Eric Auger , eric.auger.pro@gmail.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org, stefanha@redhat.com, fam@euphon.net, alex.williamson@redhat.com References: <20201015115252.15582-1-eric.auger@redhat.com> <20201015115252.15582-2-eric.auger@redhat.com> Message-ID: Date: Thu, 15 Oct 2020 15:32:00 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.3.1 MIME-Version: 1.0 In-Reply-To: Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/15 02:38:26 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-1.019, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, mreitz@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 10/15/20 3:29 PM, Philippe Mathieu-Daudé wrote: > On 10/15/20 1:52 PM, Eric Auger wrote: >> let's use NVME_CAP_DSTRD, NVME_CAP_MPSMIN and NVME_CAP_TO macros >> >> Signed-off-by: Eric Auger >> --- >>   block/nvme.c | 6 +++--- >>   1 file changed, 3 insertions(+), 3 deletions(-) >> >> diff --git a/block/nvme.c b/block/nvme.c >> index f4f27b6da7..e3d96f20d0 100644 >> --- a/block/nvme.c >> +++ b/block/nvme.c >> @@ -728,10 +728,10 @@ static int nvme_init(BlockDriverState *bs, const >> char *device, int namespace, >>           goto out; >>       } >> -    s->page_size = MAX(4096, 1 << (12 + ((cap >> 48) & 0xF))); >> -    s->doorbell_scale = (4 << (((cap >> 32) & 0xF))) / sizeof(uint32_t); >> +    s->page_size = MAX(4096, 1 << (12 + NVME_CAP_MPSMIN(cap))); > > Are you suggesting commit fad1eb68862 ("block/nvme: Use register > definitions from 'block/nvme.h'") is buggy? Buh I wonder how we missed that :/ > >> +    s->doorbell_scale = (4 << ((NVME_CAP_DSTRD(cap)))) / >> sizeof(uint32_t); >>       bs->bl.opt_mem_alignment = s->page_size; >> -    timeout_ms = MIN(500 * ((cap >> 24) & 0xFF), 30000); >> +    timeout_ms = MIN(500 * NVME_CAP_TO(cap), 30000); >>       /* Reset device to get a clean state. */ >>       s->regs->ctrl.cc = cpu_to_le32(le32_to_cpu(s->regs->ctrl.cc) & >> 0xFE); >> >