Commit c4272905 authored by Davidlohr Bueso's avatar Davidlohr Bueso Committed by Dave Jiang
Browse files

cxl/acpi: Rename CFMW coherency restrictions 

ACPICA commit 710745713ad3a2543dbfb70e84764f31f0e46bdc

This has been renamed in more recent CXL specs, as
type3 (memory expanders) can also use HDM-DB for
device coherent memory.

Link: https://github.com/acpica/acpica/commit/710745713ad3a2543dbfb70e84764f31f0e46bdc


Acked-by: default avatarRafael J. Wysocki (Intel) <rafael@kernel.org>
Signed-off-by: default avatarDavidlohr Bueso <dave@stgolabs.net>
Reviewed-by: default avatarJonathan Cameron <jonathan.cameron@huawei.com>
Reviewed-by: default avatarGregory Price <gourry@gourry.net>
Reviewed-by: default avatarDave Jiang <dave.jiang@intel.com>
Link: https://patch.msgid.link/20250908160034.86471-1-dave@stgolabs.net


Signed-off-by: default avatarDave Jiang <dave.jiang@intel.com>
parent 4dfa6418

drivers/cxl/acpi.c

+2 −2
Original line number Diff line number Diff line
@@ -116,9 +116,9 @@ static unsigned long cfmws_to_decoder_flags(int restrictions) 
{

	unsigned long flags = CXL_DECODER_F_ENABLE;



	if (restrictions & ACPI_CEDT_CFMWS_RESTRICT_TYPE2)

	if (restrictions & ACPI_CEDT_CFMWS_RESTRICT_DEVMEM)

		flags |= CXL_DECODER_F_TYPE2;

	if (restrictions & ACPI_CEDT_CFMWS_RESTRICT_TYPE3)

	if (restrictions & ACPI_CEDT_CFMWS_RESTRICT_HOSTONLYMEM)

		flags |= CXL_DECODER_F_TYPE3;

	if (restrictions & ACPI_CEDT_CFMWS_RESTRICT_VOLATILE)

		flags |= CXL_DECODER_F_RAM;

include/acpi/actbl1.h

+2 −2
Original line number Diff line number Diff line
@@ -560,8 +560,8 @@ struct acpi_cedt_cfmws_target_element { 


/* Values for Restrictions field above */



#define ACPI_CEDT_CFMWS_RESTRICT_TYPE2      (1)

#define ACPI_CEDT_CFMWS_RESTRICT_TYPE3      (1<<1)

#define ACPI_CEDT_CFMWS_RESTRICT_DEVMEM      (1)

#define ACPI_CEDT_CFMWS_RESTRICT_HOSTONLYMEM (1<<1)

#define ACPI_CEDT_CFMWS_RESTRICT_VOLATILE   (1<<2)

#define ACPI_CEDT_CFMWS_RESTRICT_PMEM       (1<<3)

#define ACPI_CEDT_CFMWS_RESTRICT_FIXED      (1<<4)

tools/testing/cxl/test/cxl.c

+9 −9
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ static struct { 
			},

			.interleave_ways = 0,

			.granularity = 4,

			.restrictions = ACPI_CEDT_CFMWS_RESTRICT_TYPE3 |

			.restrictions = ACPI_CEDT_CFMWS_RESTRICT_HOSTONLYMEM |

					ACPI_CEDT_CFMWS_RESTRICT_VOLATILE,

			.qtg_id = FAKE_QTG_ID,

			.window_size = SZ_256M * 4UL,
@@ -225,7 +225,7 @@ static struct { 
			},

			.interleave_ways = 1,

			.granularity = 4,

			.restrictions = ACPI_CEDT_CFMWS_RESTRICT_TYPE3 |

			.restrictions = ACPI_CEDT_CFMWS_RESTRICT_HOSTONLYMEM |

					ACPI_CEDT_CFMWS_RESTRICT_VOLATILE,

			.qtg_id = FAKE_QTG_ID,

			.window_size = SZ_256M * 8UL,
@@ -240,7 +240,7 @@ static struct { 
			},

			.interleave_ways = 0,

			.granularity = 4,

			.restrictions = ACPI_CEDT_CFMWS_RESTRICT_TYPE3 |

			.restrictions = ACPI_CEDT_CFMWS_RESTRICT_HOSTONLYMEM |

					ACPI_CEDT_CFMWS_RESTRICT_PMEM,

			.qtg_id = FAKE_QTG_ID,

			.window_size = SZ_256M * 4UL,
@@ -255,7 +255,7 @@ static struct { 
			},

			.interleave_ways = 1,

			.granularity = 4,

			.restrictions = ACPI_CEDT_CFMWS_RESTRICT_TYPE3 |

			.restrictions = ACPI_CEDT_CFMWS_RESTRICT_HOSTONLYMEM |

					ACPI_CEDT_CFMWS_RESTRICT_PMEM,

			.qtg_id = FAKE_QTG_ID,

			.window_size = SZ_256M * 8UL,
@@ -270,7 +270,7 @@ static struct { 
			},

			.interleave_ways = 0,

			.granularity = 4,

			.restrictions = ACPI_CEDT_CFMWS_RESTRICT_TYPE3 |

			.restrictions = ACPI_CEDT_CFMWS_RESTRICT_HOSTONLYMEM |

					ACPI_CEDT_CFMWS_RESTRICT_PMEM,

			.qtg_id = FAKE_QTG_ID,

			.window_size = SZ_256M * 4UL,
@@ -285,7 +285,7 @@ static struct { 
			},

			.interleave_ways = 0,

			.granularity = 4,

			.restrictions = ACPI_CEDT_CFMWS_RESTRICT_TYPE3 |

			.restrictions = ACPI_CEDT_CFMWS_RESTRICT_HOSTONLYMEM |

					ACPI_CEDT_CFMWS_RESTRICT_VOLATILE,

			.qtg_id = FAKE_QTG_ID,

			.window_size = SZ_256M,
@@ -302,7 +302,7 @@ static struct { 
			.interleave_arithmetic = ACPI_CEDT_CFMWS_ARITHMETIC_XOR,

			.interleave_ways = 0,

			.granularity = 4,

			.restrictions = ACPI_CEDT_CFMWS_RESTRICT_TYPE3 |

			.restrictions = ACPI_CEDT_CFMWS_RESTRICT_HOSTONLYMEM |

					ACPI_CEDT_CFMWS_RESTRICT_PMEM,

			.qtg_id = FAKE_QTG_ID,

			.window_size = SZ_256M * 8UL,
@@ -318,7 +318,7 @@ static struct { 
			.interleave_arithmetic = ACPI_CEDT_CFMWS_ARITHMETIC_XOR,

			.interleave_ways = 1,

			.granularity = 0,

			.restrictions = ACPI_CEDT_CFMWS_RESTRICT_TYPE3 |

			.restrictions = ACPI_CEDT_CFMWS_RESTRICT_HOSTONLYMEM |

					ACPI_CEDT_CFMWS_RESTRICT_PMEM,

			.qtg_id = FAKE_QTG_ID,

			.window_size = SZ_256M * 8UL,
@@ -334,7 +334,7 @@ static struct { 
			.interleave_arithmetic = ACPI_CEDT_CFMWS_ARITHMETIC_XOR,

			.interleave_ways = 8,

			.granularity = 1,

			.restrictions = ACPI_CEDT_CFMWS_RESTRICT_TYPE3 |

			.restrictions = ACPI_CEDT_CFMWS_RESTRICT_HOSTONLYMEM |

					ACPI_CEDT_CFMWS_RESTRICT_PMEM,

			.qtg_id = FAKE_QTG_ID,

			.window_size = SZ_512M * 6UL,