From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 85E981FC7CE; Wed, 5 Feb 2025 14:54:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738767292; cv=none; b=sQgKjLyIpaflUKQQjae7k8VEN9Dr6Tv5QlzttlHCaQrCwiJoGAGu+iW65t4FJsgRtn2LzBUSE6W4g9qhBrQgKS2OlbHc5Uuyo2KSvM+F/SLYg9s1FYNgE7dnEx4ufdFsk0ceC3ZzXFHsUxIwt83qtwphur4ZZaeqrBS7VAqCrdQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738767292; c=relaxed/simple; bh=AbUrYR9/VOpwVQAb5r5HL36Dx5UeAcvprIpzyashOo4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kIcDxVeixu1luf2FHjdinXtheD4aGlDdBb+6vCKeoUU8efdsV8qYlL0acGHJswAOqk/aqdEHujvUbsCztCf7Hd6n73VIK1VzosLQLbJEvFo96orohM1QBGq/mt8N+xi1NrZzKCYP0Z4mT4MFB/ojRwUY7aWVztGk3bA8Yq2syqU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=VHuSkSiB; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="VHuSkSiB" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E5478C4CED1; Wed, 5 Feb 2025 14:54:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1738767292; bh=AbUrYR9/VOpwVQAb5r5HL36Dx5UeAcvprIpzyashOo4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VHuSkSiB4zsZWvFxKkt+sz/8IOsJhH/Y3RsDs2Li2Fassz6jV9xjN2pgDNr3JX0r6 fnqjvInEXMPly2sS+fi0yE4GS0L+c21HKKZOpMi1aFBTp+sACSA2kMKvzD0fIBl3QK n2qIEnOMxzzBl5JZHEWYWeJ8WJd3MeTBunmXWNDQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Sreekanth Reddy , Paul Menzel , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 6.12 435/590] scsi: mpt3sas: Set ioc->manu_pg11.EEDPTagMode directly to 1 Date: Wed, 5 Feb 2025 14:43:10 +0100 Message-ID: <20250205134511.910099708@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250205134455.220373560@linuxfoundation.org> References: <20250205134455.220373560@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Paul Menzel [ Upstream commit ad7c3c0cb8f61d6d5a48b83e62ca4a9fd2f26153 ] Currently, the code does: if (x == 0) { x &= ~0x3; x |= 0x1; } Zeroing bits 0 and 1 of a variable that is 0 is not necessary. So directly set the variable to 1. Cc: Sreekanth Reddy Fixes: f92363d12359 ("[SCSI] mpt3sas: add new driver supporting 12GB SAS") Signed-off-by: Paul Menzel Link: https://lore.kernel.org/r/20241212221817.78940-2-pmenzel@molgen.mpg.de Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/mpt3sas/mpt3sas_base.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c index 16ac2267c71e1..c1d8f2c91a5e5 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_base.c +++ b/drivers/scsi/mpt3sas/mpt3sas_base.c @@ -5629,8 +5629,7 @@ _base_static_config_pages(struct MPT3SAS_ADAPTER *ioc) if (!ioc->is_gen35_ioc && ioc->manu_pg11.EEDPTagMode == 0) { pr_err("%s: overriding NVDATA EEDPTagMode setting\n", ioc->name); - ioc->manu_pg11.EEDPTagMode &= ~0x3; - ioc->manu_pg11.EEDPTagMode |= 0x1; + ioc->manu_pg11.EEDPTagMode = 0x1; mpt3sas_config_set_manufacturing_pg11(ioc, &mpi_reply, &ioc->manu_pg11); } -- 2.39.5