cxl: Check if PSL data-cache is available before issue flush request

Message ID 20180213111022.27611-1-vaibhav@linux.vnet.ibm.com
State Superseded
Headers show
Series
  • cxl: Check if PSL data-cache is available before issue flush request
Related show

Commit Message

Vaibhav Jain Feb. 13, 2018, 11:10 a.m.
PSL9D doesn't have a data-cache that needs to be flushed before
resetting the card. However when cxl tries to flush data-cache on such
a card, it times-out as PSL_Control register never indicates flush
operation complete due to missing data-cache. This is usually
indicated in the kernel logs with this message:

"WARNING: cache flush timed out"

To fix this the patch checks PSL_Debug register CDC-Field(BIT:27)
which indicates the absence of a data-cache and sets a flag
'no_data_cache' in 'struct cxl_native' to indicate this. When
cxl_data_cache_flush() is called it checks the flag and if set bails
out early without requesting a data-cache flush operation to the PSL.

Signed-off-by: Vaibhav Jain <vaibhav@linux.vnet.ibm.com>
---
 drivers/misc/cxl/cxl.h    |  4 ++++
 drivers/misc/cxl/native.c | 11 ++++++++++-
 drivers/misc/cxl/pci.c    | 19 +++++++++++++------
 3 files changed, 27 insertions(+), 7 deletions(-)

Comments

Frederic Barrat Feb. 15, 2018, 9:37 a.m. | #1
Le 13/02/2018 à 12:10, Vaibhav Jain a écrit :
> PSL9D doesn't have a data-cache that needs to be flushed before
> resetting the card. However when cxl tries to flush data-cache on such
> a card, it times-out as PSL_Control register never indicates flush
> operation complete due to missing data-cache. This is usually
> indicated in the kernel logs with this message:
> 
> "WARNING: cache flush timed out"
> 
> To fix this the patch checks PSL_Debug register CDC-Field(BIT:27)
> which indicates the absence of a data-cache and sets a flag
> 'no_data_cache' in 'struct cxl_native' to indicate this. When
> cxl_data_cache_flush() is called it checks the flag and if set bails
> out early without requesting a data-cache flush operation to the PSL.
> 
> Signed-off-by: Vaibhav Jain <vaibhav@linux.vnet.ibm.com>
> ---
>   drivers/misc/cxl/cxl.h    |  4 ++++
>   drivers/misc/cxl/native.c | 11 ++++++++++-
>   drivers/misc/cxl/pci.c    | 19 +++++++++++++------
>   3 files changed, 27 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/misc/cxl/cxl.h b/drivers/misc/cxl/cxl.h
> index 4f015da78f28..4949b8d5a748 100644
> --- a/drivers/misc/cxl/cxl.h
> +++ b/drivers/misc/cxl/cxl.h
> @@ -369,6 +369,9 @@ static const cxl_p2n_reg_t CXL_PSL_WED_An     = {0x0A0};
>   #define CXL_PSL_TFC_An_AE (1ull << (63-30)) /* Restart PSL with address error */
>   #define CXL_PSL_TFC_An_R  (1ull << (63-31)) /* Restart PSL transaction */
> 
> +/****** CXL_PSL_DEBUG *****************************************************/
> +#define CXL_PSL_DEBUG_CDC  (1ull << (63-27)) /* Coherent Data cache support */
> +
>   /****** CXL_XSL9_IERAT_ERAT - CAIA 2 **********************************/
>   #define CXL_XSL9_IERAT_MLPID    (1ull << (63-0))  /* Match LPID */
>   #define CXL_XSL9_IERAT_MPID     (1ull << (63-1))  /* Match PID */
> @@ -669,6 +672,7 @@ struct cxl_native {
>   	irq_hw_number_t err_hwirq;
>   	unsigned int err_virq;
>   	u64 ps_off;
> +	bool no_data_cache; /* set if no data cache on the card */
>   	const struct cxl_service_layer_ops *sl_ops;
>   };
> 
> diff --git a/drivers/misc/cxl/native.c b/drivers/misc/cxl/native.c
> index 1b3d7c65ea3f..98f867fcef24 100644
> --- a/drivers/misc/cxl/native.c
> +++ b/drivers/misc/cxl/native.c
> @@ -353,8 +353,17 @@ int cxl_data_cache_flush(struct cxl *adapter)
>   	u64 reg;
>   	unsigned long timeout = jiffies + (HZ * CXL_TIMEOUT);
> 
> -	pr_devel("Flushing data cache\n");
> +	/*
> +	 * Do a datacache flush only if datacache is available.
> +	 * In case of PSL9D datacache absent hence flush operation.
> +	 * would timeout.
> +	 */
> +	if (adapter->native->no_data_cache) {
> +		pr_devel("No PSL data cache. Ignoring cache flush req.\n");
> +		return 0;
> +	}
> 
> +	pr_devel("Flushing data cache\n");
>   	reg = cxl_p1_read(adapter, CXL_PSL_Control);
>   	reg |= CXL_PSL_Control_Fr;
>   	cxl_p1_write(adapter, CXL_PSL_Control, reg);
> diff --git a/drivers/misc/cxl/pci.c b/drivers/misc/cxl/pci.c
> index 758842f65a1b..39ddf89c3c14 100644
> --- a/drivers/misc/cxl/pci.c
> +++ b/drivers/misc/cxl/pci.c
> @@ -456,6 +456,7 @@ static int init_implementation_adapter_regs_psl9(struct cxl *adapter,
>   	u64 chipid;
>   	u32 phb_index;
>   	u64 capp_unit_id;
> +	u64 psl_debug;
>   	int rc;
> 
>   	rc = cxl_calc_capp_routing(dev, &chipid, &phb_index, &capp_unit_id);
> @@ -506,6 +507,16 @@ static int init_implementation_adapter_regs_psl9(struct cxl *adapter,
>   	} else
>   		cxl_p1_write(adapter, CXL_PSL9_DEBUG, 0x4000000000000000ULL);
> 
> +	/* Check if PSL has data-cache. We need to flush adapter datacache
> +	 * when as its about to be removed. But data-cache flush is not
> +	 * supported supported on P9-DD1 and
> +	 */
> +	psl_debug = cxl_p1_read(adapter, CXL_PSL9_DEBUG);
> +	if (cxl_is_power9_dd1() || (psl_debug & CXL_PSL_DEBUG_CDC)) {
> +		dev_info(&dev->dev, "No data-cache present\n");

Doesn't dev_info() always show in the log? If so then it should be tuned 
down to dev_dbg(), as nobody cares.

Also, I wouldn't introduce any new code testing for dd1. It's dead code 
we're going to have to remove soon anyway.

   Fred


> +		adapter->native->no_data_cache = true;
> +	}
> +
>   	return 0;
>   }
> 
> @@ -1449,10 +1460,8 @@ int cxl_pci_reset(struct cxl *adapter)
> 
>   	/*
>   	 * The adapter is about to be reset, so ignore errors.
> -	 * Not supported on P9 DD1
>   	 */
> -	if ((cxl_is_power8()) || (!(cxl_is_power9_dd1())))
> -		cxl_data_cache_flush(adapter);
> +	cxl_data_cache_flush(adapter);
> 
>   	/* pcie_warm_reset requests a fundamental pci reset which includes a
>   	 * PERST assert/deassert.  PERST triggers a loading of the image
> @@ -1936,10 +1945,8 @@ static void cxl_pci_remove_adapter(struct cxl *adapter)
> 
>   	/*
>   	 * Flush adapter datacache as its about to be removed.
> -	 * Not supported on P9 DD1.
>   	 */
> -	if ((cxl_is_power8()) || (!(cxl_is_power9_dd1())))
> -		cxl_data_cache_flush(adapter);
> +	cxl_data_cache_flush(adapter);
> 
>   	cxl_deconfigure_adapter(adapter);
>

Patch

diff --git a/drivers/misc/cxl/cxl.h b/drivers/misc/cxl/cxl.h
index 4f015da78f28..4949b8d5a748 100644
--- a/drivers/misc/cxl/cxl.h
+++ b/drivers/misc/cxl/cxl.h
@@ -369,6 +369,9 @@  static const cxl_p2n_reg_t CXL_PSL_WED_An     = {0x0A0};
 #define CXL_PSL_TFC_An_AE (1ull << (63-30)) /* Restart PSL with address error */
 #define CXL_PSL_TFC_An_R  (1ull << (63-31)) /* Restart PSL transaction */
 
+/****** CXL_PSL_DEBUG *****************************************************/
+#define CXL_PSL_DEBUG_CDC  (1ull << (63-27)) /* Coherent Data cache support */
+
 /****** CXL_XSL9_IERAT_ERAT - CAIA 2 **********************************/
 #define CXL_XSL9_IERAT_MLPID    (1ull << (63-0))  /* Match LPID */
 #define CXL_XSL9_IERAT_MPID     (1ull << (63-1))  /* Match PID */
@@ -669,6 +672,7 @@  struct cxl_native {
 	irq_hw_number_t err_hwirq;
 	unsigned int err_virq;
 	u64 ps_off;
+	bool no_data_cache; /* set if no data cache on the card */
 	const struct cxl_service_layer_ops *sl_ops;
 };
 
diff --git a/drivers/misc/cxl/native.c b/drivers/misc/cxl/native.c
index 1b3d7c65ea3f..98f867fcef24 100644
--- a/drivers/misc/cxl/native.c
+++ b/drivers/misc/cxl/native.c
@@ -353,8 +353,17 @@  int cxl_data_cache_flush(struct cxl *adapter)
 	u64 reg;
 	unsigned long timeout = jiffies + (HZ * CXL_TIMEOUT);
 
-	pr_devel("Flushing data cache\n");
+	/*
+	 * Do a datacache flush only if datacache is available.
+	 * In case of PSL9D datacache absent hence flush operation.
+	 * would timeout.
+	 */
+	if (adapter->native->no_data_cache) {
+		pr_devel("No PSL data cache. Ignoring cache flush req.\n");
+		return 0;
+	}
 
+	pr_devel("Flushing data cache\n");
 	reg = cxl_p1_read(adapter, CXL_PSL_Control);
 	reg |= CXL_PSL_Control_Fr;
 	cxl_p1_write(adapter, CXL_PSL_Control, reg);
diff --git a/drivers/misc/cxl/pci.c b/drivers/misc/cxl/pci.c
index 758842f65a1b..39ddf89c3c14 100644
--- a/drivers/misc/cxl/pci.c
+++ b/drivers/misc/cxl/pci.c
@@ -456,6 +456,7 @@  static int init_implementation_adapter_regs_psl9(struct cxl *adapter,
 	u64 chipid;
 	u32 phb_index;
 	u64 capp_unit_id;
+	u64 psl_debug;
 	int rc;
 
 	rc = cxl_calc_capp_routing(dev, &chipid, &phb_index, &capp_unit_id);
@@ -506,6 +507,16 @@  static int init_implementation_adapter_regs_psl9(struct cxl *adapter,
 	} else
 		cxl_p1_write(adapter, CXL_PSL9_DEBUG, 0x4000000000000000ULL);
 
+	/* Check if PSL has data-cache. We need to flush adapter datacache
+	 * when as its about to be removed. But data-cache flush is not
+	 * supported supported on P9-DD1 and
+	 */
+	psl_debug = cxl_p1_read(adapter, CXL_PSL9_DEBUG);
+	if (cxl_is_power9_dd1() || (psl_debug & CXL_PSL_DEBUG_CDC)) {
+		dev_info(&dev->dev, "No data-cache present\n");
+		adapter->native->no_data_cache = true;
+	}
+
 	return 0;
 }
 
@@ -1449,10 +1460,8 @@  int cxl_pci_reset(struct cxl *adapter)
 
 	/*
 	 * The adapter is about to be reset, so ignore errors.
-	 * Not supported on P9 DD1
 	 */
-	if ((cxl_is_power8()) || (!(cxl_is_power9_dd1())))
-		cxl_data_cache_flush(adapter);
+	cxl_data_cache_flush(adapter);
 
 	/* pcie_warm_reset requests a fundamental pci reset which includes a
 	 * PERST assert/deassert.  PERST triggers a loading of the image
@@ -1936,10 +1945,8 @@  static void cxl_pci_remove_adapter(struct cxl *adapter)
 
 	/*
 	 * Flush adapter datacache as its about to be removed.
-	 * Not supported on P9 DD1.
 	 */
-	if ((cxl_is_power8()) || (!(cxl_is_power9_dd1())))
-		cxl_data_cache_flush(adapter);
+	cxl_data_cache_flush(adapter);
 
 	cxl_deconfigure_adapter(adapter);