[PATCH 0/2] cxlflash: Regression patch and updating Maintainers list

[PATCH 0/2] cxlflash: Regression patch and updating Maintainers list

[Uma Krishnan]

First patch in this set fixes a regression that was casued by the
Commit 704c4b0ddc03 ("cxlflash: Shutdown notify support for CXL
Flash cards"), which is currently staged for 4.8 in next/master.
Second patch updates the Maintainers list for cxlflash driver.

This series is intended for 4.8 and is bisectable. These patches
are cut against next/master that contains the original commit.

Uma Krishnan (2):
  cxlflash: Verify problem state area is mapped before notifying
    shutdown
  MAINTAINERS: Update cxlflash maintainers

 MAINTAINERS                  |  1 +
 drivers/scsi/cxlflash/main.c | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

-- 
2.1.0

[PATCH 1/2] cxlflash: Verify problem state area is mapped before notifying shutdown

[Uma Krishnan]

If an EEH or some other hard error occurs while the
adapter instance was being initialized, on the subsequent
shutdown of the device, the system could crash with:

[c000000f1da03b60] c0000000005eccfc pci_device_shutdown+0x6c/0x100
[c000000f1da03ba0] c0000000006d67d4 device_shutdown+0x1b4/0x2c0
[c000000f1da03c40] c0000000000ea30c kernel_restart_prepare+0x5c/0x80
[c000000f1da03c70] c0000000000ea48c kernel_restart+0x2c/0xc0
[c000000f1da03ce0] c0000000000ea970 SyS_reboot+0x1c0/0x2d0
[c000000f1da03e30] c000000000009204 system_call+0x38/0xb4

This crash is due to the AFU not being mapped when the shutdown
notification routine is called and is a regression that was inserted
recently with Commit 704c4b0ddc03 ("cxlflash: Shutdown notify support
for CXL Flash cards").

As a fix, shutdown notification should only occur when the AFU is mapped.

Fixes: 704c4b0ddc03 ("cxlflash: Shutdown notify support for CXL Flash cards")
Signed-off-by: Uma Krishnan <ukrishn@linux.vnet.ibm.com>
---
 drivers/scsi/cxlflash/main.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/drivers/scsi/cxlflash/main.c b/drivers/scsi/cxlflash/main.c
index 860008d..661bb94 100644
--- a/drivers/scsi/cxlflash/main.c
+++ b/drivers/scsi/cxlflash/main.c
@@ -778,7 +778,7 @@ static void notify_shutdown(struct cxlflash_cfg *cfg, bool wait)
 {
 	struct afu *afu = cfg->afu;
 	struct device *dev = &cfg->dev->dev;
-	struct sisl_global_map __iomem *global = &afu->afu_map->global;
+	struct sisl_global_map __iomem *global;
 	struct dev_dependent_vals *ddv;
 	u64 reg, status;
 	int i, retry_cnt = 0;
@@ -787,6 +787,14 @@ static void notify_shutdown(struct cxlflash_cfg *cfg, bool wait)
 	if (!(ddv->flags & CXLFLASH_NOTIFY_SHUTDOWN))
 		return;
 
+	if (!afu || !afu->afu_map) {
+		dev_dbg(dev, "%s: The problem state area is not mapped\n",
+			__func__);
+		return;
+	}
+
+	global = &afu->afu_map->global;
+
 	/* Notify AFU */
 	for (i = 0; i < NUM_FC_PORTS; i++) {
 		reg = readq_be(&global->fc_regs[i][FC_CONFIG2 / 8]);
-- 
2.1.0

Re: [PATCH 1/2] cxlflash: Verify problem state area is mapped before notifying shutdown

[Andrew Donnellan]

On 22/07/16 06:44, Uma Krishnan wrote:
> If an EEH or some other hard error occurs while the
> adapter instance was being initialized, on the subsequent
> shutdown of the device, the system could crash with:
>
> [c000000f1da03b60] c0000000005eccfc pci_device_shutdown+0x6c/0x100
> [c000000f1da03ba0] c0000000006d67d4 device_shutdown+0x1b4/0x2c0
> [c000000f1da03c40] c0000000000ea30c kernel_restart_prepare+0x5c/0x80
> [c000000f1da03c70] c0000000000ea48c kernel_restart+0x2c/0xc0
> [c000000f1da03ce0] c0000000000ea970 SyS_reboot+0x1c0/0x2d0
> [c000000f1da03e30] c000000000009204 system_call+0x38/0xb4
>
> This crash is due to the AFU not being mapped when the shutdown
> notification routine is called and is a regression that was inserted
> recently with Commit 704c4b0ddc03 ("cxlflash: Shutdown notify support
> for CXL Flash cards").
>
> As a fix, shutdown notification should only occur when the AFU is mapped.
>
> Fixes: 704c4b0ddc03 ("cxlflash: Shutdown notify support for CXL Flash cards")
> Signed-off-by: Uma Krishnan <ukrishn@linux.vnet.ibm.com>

Reviewed-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com>

-- 
Andrew Donnellan              OzLabs, ADL Canberra
andrew.donnellan@au1.ibm.com  IBM Australia Limited

Re: [PATCH 1/2] cxlflash: Verify problem state area is mapped before notifying shutdown

[Matthew R. Ochs]

> On Jul 21, 2016, at 3:44 PM, Uma Krishnan <ukrishn@linux.vnet.ibm.com> =
wrote:
>=20
> If an EEH or some other hard error occurs while the
> adapter instance was being initialized, on the subsequent
> shutdown of the device, the system could crash with:
>=20
> [c000000f1da03b60] c0000000005eccfc pci_device_shutdown+0x6c/0x100
> [c000000f1da03ba0] c0000000006d67d4 device_shutdown+0x1b4/0x2c0
> [c000000f1da03c40] c0000000000ea30c kernel_restart_prepare+0x5c/0x80
> [c000000f1da03c70] c0000000000ea48c kernel_restart+0x2c/0xc0
> [c000000f1da03ce0] c0000000000ea970 SyS_reboot+0x1c0/0x2d0
> [c000000f1da03e30] c000000000009204 system_call+0x38/0xb4
>=20
> This crash is due to the AFU not being mapped when the shutdown
> notification routine is called and is a regression that was inserted
> recently with Commit 704c4b0ddc03 ("cxlflash: Shutdown notify support
> for CXL Flash cards").
>=20
> As a fix, shutdown notification should only occur when the AFU is =
mapped.
>=20
> Fixes: 704c4b0ddc03 ("cxlflash: Shutdown notify support for CXL Flash =
cards")
> Signed-off-by: Uma Krishnan <ukrishn@linux.vnet.ibm.com>

Acked-by: Matthew R. Ochs <mrochs@linux.vnet.ibm.com>

[PATCH 2/2] MAINTAINERS: Update cxlflash maintainers

[Uma Krishnan]

Adding myself as a cxlflash maintainer.

Signed-off-by: Uma Krishnan <ukrishn@linux.vnet.ibm.com>
---
 MAINTAINERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index 2dbc028..e5f5882 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3487,6 +3487,7 @@ F:	Documentation/ABI/testing/sysfs-class-cxl
 CXLFLASH (IBM Coherent Accelerator Processor Interface CAPI Flash) SCSI DRIVER
 M:	Manoj N. Kumar <manoj@linux.vnet.ibm.com>
 M:	Matthew R. Ochs <mrochs@linux.vnet.ibm.com>
+M:	Uma Krishnan <ukrishn@linux.vnet.ibm.com>
 L:	linux-scsi@vger.kernel.org
 S:	Supported
 F:	drivers/scsi/cxlflash/
-- 
2.1.0

Re: [PATCH 2/2] MAINTAINERS: Update cxlflash maintainers

[Matthew R. Ochs]

> On Jul 21, 2016, at 3:44 PM, Uma Krishnan <ukrishn@linux.vnet.ibm.com> =
wrote:
>=20
> Adding myself as a cxlflash maintainer.
>=20
> Signed-off-by: Uma Krishnan <ukrishn@linux.vnet.ibm.com>

Acked-by: Matthew R. Ochs <mrochs@linux.vnet.ibm.com>

Re: [PATCH 0/2] cxlflash: Regression patch and updating Maintainers list

[Martin K. Petersen]

>>>>> "Uma" == Uma Krishnan <ukrishn@linux.vnet.ibm.com> writes:

Uma> First patch in this set fixes a regression that was casued by the
Uma> Commit 704c4b0ddc03 ("cxlflash: Shutdown notify support for CXL
Uma> Flash cards"), which is currently staged for 4.8 in next/master.
Uma> Second patch updates the Maintainers list for cxlflash driver.

Uma> This series is intended for 4.8 and is bisectable. These patches
Uma> are cut against next/master that contains the original commit.

Applied to 4.8/scsi-queue.

-- 
Martin K. Petersen	Oracle Linux Engineering