Received: by 2002:ac0:946b:0:0:0:0:0 with SMTP id j40csp1150319imj; Thu, 14 Feb 2019 02:01:26 -0800 (PST) X-Google-Smtp-Source: AHgI3IZsjV1p0MwfprWN/XKGbR8bpxT+jQmhW1+dLBaNOCxMs41F3pS8k1AgofuIcVbH29poah9A X-Received: by 2002:a62:46db:: with SMTP id o88mr3162020pfi.248.1550138486160; Thu, 14 Feb 2019 02:01:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550138486; cv=none; d=google.com; s=arc-20160816; b=Rg6LyJMArMAcKUsVSarIvewN8KwmuPMCiJfL05rsdLY5PGtCegL2f87qLay0dSeRli s/0lGFwCnWSxvnNK40fvsYRFir3x/XnYsR80BT7dLIdeH8SAfRdCszNchWmpyNBdq3pZ P7Y4KDlfXKphCfxjyPT8z16JObxOSii2VkeXs1DKwiiHWMhxHRp40VK7XcEza0I6oEm1 KDVGAWZQlw0vF755snAPsUPT+rMfnfZ6p/wPOfp1bzd0jCq6/vH/Hytlojx/KWr4Uhi8 sASIloLSPE0luMy21dVX+EOZM2RE9kckZe31ktpcYx9ONF0YGd/StlKc7cYIRIF2JDYG cbfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-filter:dkim-signature; bh=dpiqLyAophuh2bVRHti5Jn/xzPgbDMv/fyh/bRvlGU8=; b=zoaV5Gj0uOJo5PPILenHHX4Uiyv8WnvUu/PSlq4zcPbg/oe1FxiHglGn2SkN4wliae ekMr2TcOIFHNlA7H1m4IFnY+t1IBpTMC5X0V4Z78bq3/erdeUMTA9RODGkEW6U4Bo3Zq AuNiO48DRoBV/wRGqZJBwnt1JQrLhW81nqL5dr6glnoH89lhS1yWz/orEIHIOqphWeO0 UWEEhhoGPHYobrqpMpHvxApFxruW+jBVGsfk6848SOc19bjl6a+3r6RMlvZK2uH8rkoP vAXfV3+TfEg4rts9DJDhYY1NU9XUpqN9PqNd8VWRinEYcJ+trhyFU7RDbpGau8ANYoe1 d8XA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fjfi.cvut.cz header.s=20151024 header.b=pPTBW83+; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f13si1869533pgq.355.2019.02.14.02.01.08; Thu, 14 Feb 2019 02:01:26 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@fjfi.cvut.cz header.s=20151024 header.b=pPTBW83+; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404843AbfBNARX (ORCPT + 99 others); Wed, 13 Feb 2019 19:17:23 -0500 Received: from mailgw1.fjfi.cvut.cz ([147.32.9.3]:47730 "EHLO mailgw1.fjfi.cvut.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2393553AbfBNART (ORCPT ); Wed, 13 Feb 2019 19:17:19 -0500 Received: from localhost (localhost [127.0.0.1]) by mailgw1.fjfi.cvut.cz (Postfix) with ESMTP id 5CB63AA296; Thu, 14 Feb 2019 01:17:15 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fjfi.cvut.cz; s=20151024; t=1550103435; i=@fjfi.cvut.cz; bh=dpiqLyAophuh2bVRHti5Jn/xzPgbDMv/fyh/bRvlGU8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=pPTBW83+cIhwiGzYMEFhkm+vG8HnQJeV1GvqAY8tK+cte7LkwNSO1dbOHUlufnSx0 whm4L4eSgHCTnGFC4OCHiLCiDCVD0ff9fiT9nf0IWl0yGH5hfayk4EAKK2T7/XVtFU 3rkHECrwSQ0PptPOAPWyD+/68W4vLhfeBvCKMbP4= X-CTU-FNSPE-Virus-Scanned: amavisd-new at fjfi.cvut.cz Received: from mailgw1.fjfi.cvut.cz ([127.0.0.1]) by localhost (mailgw1.fjfi.cvut.cz [127.0.0.1]) (amavisd-new, port 10022) with ESMTP id O83iY_czLD6G; Thu, 14 Feb 2019 01:17:06 +0100 (CET) Received: from linux.fjfi.cvut.cz (linux.fjfi.cvut.cz [147.32.5.111]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mailgw1.fjfi.cvut.cz (Postfix) with ESMTPS id 00CF8AA291; Thu, 14 Feb 2019 01:17:04 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 mailgw1.fjfi.cvut.cz 00CF8AA291 Received: by linux.fjfi.cvut.cz (Postfix, from userid 1001) id C6D156004F; Thu, 14 Feb 2019 01:17:03 +0100 (CET) From: David Kozub To: Jens Axboe , Jonathan Derrick , Scott Bauer , linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jonas Rabenstein , David Kozub Subject: [PATCH 13/16] block: sed-opal: use named Opal tokens instead of integer literals Date: Thu, 14 Feb 2019 01:16:05 +0100 Message-Id: <1550103368-4605-14-git-send-email-zub@linux.fjfi.cvut.cz> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1550103368-4605-1-git-send-email-zub@linux.fjfi.cvut.cz> References: <1550103368-4605-1-git-send-email-zub@linux.fjfi.cvut.cz> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Replace integer literals by Opal tokens defined in opal_proto.h where possible. Signed-off-by: David Kozub --- block/sed-opal.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/block/sed-opal.c b/block/sed-opal.c index 5395ab1c5248..be0d633783c8 100644 --- a/block/sed-opal.c +++ b/block/sed-opal.c @@ -1180,12 +1180,12 @@ static int generic_lr_enable_disable(struct opal_dev *dev, add_token_u8(&err, dev, OPAL_STARTLIST); add_token_u8(&err, dev, OPAL_STARTNAME); - add_token_u8(&err, dev, 5); /* ReadLockEnabled */ + add_token_u8(&err, dev, OPAL_READLOCKENABLED); add_token_u8(&err, dev, rle); add_token_u8(&err, dev, OPAL_ENDNAME); add_token_u8(&err, dev, OPAL_STARTNAME); - add_token_u8(&err, dev, 6); /* WriteLockEnabled */ + add_token_u8(&err, dev, OPAL_WRITELOCKENABLED); add_token_u8(&err, dev, wle); add_token_u8(&err, dev, OPAL_ENDNAME); @@ -1238,22 +1238,22 @@ static int setup_locking_range(struct opal_dev *dev, void *data) add_token_u8(&err, dev, OPAL_STARTLIST); add_token_u8(&err, dev, OPAL_STARTNAME); - add_token_u8(&err, dev, 3); /* Ranges Start */ + add_token_u8(&err, dev, OPAL_RANGESTART); add_token_u64(&err, dev, setup->range_start); add_token_u8(&err, dev, OPAL_ENDNAME); add_token_u8(&err, dev, OPAL_STARTNAME); - add_token_u8(&err, dev, 4); /* Ranges length */ + add_token_u8(&err, dev, OPAL_RANGELENGTH); add_token_u64(&err, dev, setup->range_length); add_token_u8(&err, dev, OPAL_ENDNAME); add_token_u8(&err, dev, OPAL_STARTNAME); - add_token_u8(&err, dev, 5); /*ReadLockEnabled */ + add_token_u8(&err, dev, OPAL_READLOCKENABLED); add_token_u64(&err, dev, !!setup->RLE); add_token_u8(&err, dev, OPAL_ENDNAME); add_token_u8(&err, dev, OPAL_STARTNAME); - add_token_u8(&err, dev, 6); /*WriteLockEnabled*/ + add_token_u8(&err, dev, OPAL_WRITELOCKENABLED); add_token_u64(&err, dev, !!setup->WLE); add_token_u8(&err, dev, OPAL_ENDNAME); @@ -1472,7 +1472,7 @@ static int set_mbr_done(struct opal_dev *dev, void *data) add_token_u8(&err, dev, OPAL_VALUES); add_token_u8(&err, dev, OPAL_STARTLIST); add_token_u8(&err, dev, OPAL_STARTNAME); - add_token_u8(&err, dev, 2); /* Done */ + add_token_u8(&err, dev, OPAL_MBRDONE); add_token_u8(&err, dev, *mbr_done_tf); /* Done T or F */ add_token_u8(&err, dev, OPAL_ENDNAME); add_token_u8(&err, dev, OPAL_ENDLIST); @@ -1498,7 +1498,7 @@ static int set_mbr_enable_disable(struct opal_dev *dev, void *data) add_token_u8(&err, dev, OPAL_VALUES); add_token_u8(&err, dev, OPAL_STARTLIST); add_token_u8(&err, dev, OPAL_STARTNAME); - add_token_u8(&err, dev, 1); + add_token_u8(&err, dev, OPAL_MBRENABLE); add_token_u8(&err, dev, *mbr_en_dis); add_token_u8(&err, dev, OPAL_ENDNAME); add_token_u8(&err, dev, OPAL_ENDLIST); @@ -1523,7 +1523,7 @@ static int generic_pw_cmd(u8 *key, size_t key_len, u8 *cpin_uid, add_token_u8(&err, dev, OPAL_VALUES); add_token_u8(&err, dev, OPAL_STARTLIST); add_token_u8(&err, dev, OPAL_STARTNAME); - add_token_u8(&err, dev, 3); /* PIN */ + add_token_u8(&err, dev, OPAL_PIN); add_token_bytestring(&err, dev, key, key_len); add_token_u8(&err, dev, OPAL_ENDNAME); add_token_u8(&err, dev, OPAL_ENDLIST); -- 2.20.1