[PATCH 1/2] scsi: mpt3sas: Add details to EEDPTagMode error message

[PATCH 1/2] scsi: mpt3sas: Add details to EEDPTagMode error message

[Paul Menzel]

Linux 5.15 logs the error below

    mpt3sas_cm0: overriding NVDATA EEDPTagMode setting

on a Dell PowerEdge T440 with the card below.

    5e:00.0 Serial Attached SCSI controller [0107]: Broadcom / LSI SAS3008 PCI-Express Fusion-MPT SAS-3 [1000:0097] (rev 02)

It’s not clear to a user what this error is about. As a first step to
improve this, add the values to the error message.

Signed-off-by: Paul Menzel <pmenzel@molgen.mpg.de>
---
 drivers/scsi/mpt3sas/mpt3sas_base.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c
index ed5046593fda..87fcafce947c 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_base.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.c
@@ -5627,7 +5627,7 @@ _base_static_config_pages(struct MPT3SAS_ADAPTER *ioc)
 	if (rc)
 		return rc;
 	if (!ioc->is_gen35_ioc && ioc->manu_pg11.EEDPTagMode == 0) {
-		pr_err("%s: overriding NVDATA EEDPTagMode setting\n",
+		pr_err("%s: overriding NVDATA EEDPTagMode setting from 0 to 1.\n",
 		    ioc->name);
 		ioc->manu_pg11.EEDPTagMode &= ~0x3;
 		ioc->manu_pg11.EEDPTagMode |= 0x1;
-- 
2.45.2

[PATCH 2/2] scsi: mpt3sas: Set ioc->manu_pg11.EEDPTagMode directly to 1

[Paul Menzel]

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 <sreekanth.reddy@broadcom.com>
Fixes: f92363d12359 ("[SCSI] mpt3sas: add new driver supporting 12GB SAS")
Signed-off-by: Paul Menzel <pmenzel@molgen.mpg.de>
---
 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 87fcafce947c..2cd0bb606d88 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 from 0 to 1.\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.45.2

Re: [PATCH 2/2] scsi: mpt3sas: Set ioc->manu_pg11.EEDPTagMode directly to 1

[Paul Menzel]

[Remove non-working @lsi.com addresses]

Am 12.12.24 um 23:18 schrieb Paul Menzel:
> 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 <sreekanth.reddy@broadcom.com>
> Fixes: f92363d12359 ("[SCSI] mpt3sas: add new driver supporting 12GB SAS")
> Signed-off-by: Paul Menzel <pmenzel@molgen.mpg.de>
> ---
>   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 87fcafce947c..2cd0bb606d88 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 from 0 to 1.\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);
>   	}

Re: [PATCH 1/2] scsi: mpt3sas: Add details to EEDPTagMode error message

[Martin K. Petersen]

Paul,

> Linux 5.15 logs the error below
>
>     mpt3sas_cm0: overriding NVDATA EEDPTagMode setting
>
> on a Dell PowerEdge T440 with the card below.
>
>     5e:00.0 Serial Attached SCSI controller [0107]: Broadcom / LSI SAS3008 PCI-Express Fusion-MPT SAS-3 [1000:0097] (rev 02)

Applied to 6.14/scsi-staging, thanks!

-- 
Martin K. Petersen	Oracle Linux Engineering

Re: [PATCH 2/2] scsi: mpt3sas: Set ioc->manu_pg11.EEDPTagMode directly to 1

[Martin K. Petersen]

Paul,

> Zeroing bits 0 and 1 of a variable that is 0 is not necessary. So
> directly set the variable to 1.

Applied to 6.14/scsi-staging, thanks!

-- 
Martin K. Petersen	Oracle Linux Engineering

Re: [PATCH 1/2] scsi: mpt3sas: Add details to EEDPTagMode error message

[Martin K. Petersen]

On Thu, 12 Dec 2024 23:18:11 +0100, Paul Menzel wrote:

> Linux 5.15 logs the error below
> 
>     mpt3sas_cm0: overriding NVDATA EEDPTagMode setting
> 
> on a Dell PowerEdge T440 with the card below.
> 
>     5e:00.0 Serial Attached SCSI controller [0107]: Broadcom / LSI SAS3008 PCI-Express Fusion-MPT SAS-3 [1000:0097] (rev 02)
> 
> [...]

Applied to 6.14/scsi-queue, thanks!

[1/2] scsi: mpt3sas: Add details to EEDPTagMode error message
      https://git.kernel.org/mkp/scsi/c/09ecc187ebde
[2/2] scsi: mpt3sas: Set ioc->manu_pg11.EEDPTagMode directly to 1
      https://git.kernel.org/mkp/scsi/c/ad7c3c0cb8f6

-- 
Martin K. Petersen	Oracle Linux Engineering