Skip to content

Commit fdc9be9

Browse files
MingLi-4davejiang
authored andcommitted
cxl/edac: Fix the min_scrub_cycle of a region miscalculation
When trying to update the scrub_cycle value of a cxl region, which means updating the scrub_cycle value of each memdev under a cxl region. cxl driver needs to guarantee the new scrub_cycle value is greater than the min_scrub_cycle value of a memdev, otherwise the updating operation will fail(Per Table 8-223 in CXL r3.2 section 8.2.10.9.11.1). Current implementation logic of getting the min_scrub_cycle value of a cxl region is that getting the min_scrub_cycle value of each memdevs under the cxl region, then using the minimum min_scrub_cycle value as the region's min_scrub_cycle. Checking if the new scrub_cycle value is greater than this value. If yes, updating the new scrub_cycle value to each memdevs. The issue is that the new scrub_cycle value is possibly greater than the minimum min_scrub_cycle value of all memdevs but less than the maximum min_scrub_cycle value of all memdevs if memdevs have a different min_scrub_cycle value. The updating operation will always fail on these memdevs which have a greater min_scrub_cycle than the new scrub_cycle. The correct implementation logic is to get the maximum value of these memdevs' min_scrub_cycle, check if the new scrub_cycle value is greater than the value. If yes, the new scrub_cycle value is fit for the region. The change also impacts the result of cxl_patrol_scrub_get_min_scrub_cycle(), the interface returned the minimum min_scrub_cycle value among all memdevs under the region before the change. The interface will return the maximum min_scrub_cycle value among all memdevs under the region with the change. Signed-off-by: Li Ming <[email protected]> Reviewed-by: Jonathan Cameron <[email protected]> Reviewed-by: Dave Jiang <[email protected]> Reviewed-by: Shiju Jose <[email protected]> Reviewed-by: Davidlohr Bueso <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Dave Jiang <[email protected]>
1 parent 87b42c1 commit fdc9be9

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

drivers/cxl/core/edac.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,10 @@ static int cxl_scrub_get_attrbs(struct cxl_patrol_scrub_context *cxl_ps_ctx,
103103
u8 *cap, u16 *cycle, u8 *flags, u8 *min_cycle)
104104
{
105105
struct cxl_mailbox *cxl_mbox;
106-
u8 min_scrub_cycle = U8_MAX;
107106
struct cxl_region_params *p;
108107
struct cxl_memdev *cxlmd;
109108
struct cxl_region *cxlr;
109+
u8 min_scrub_cycle = 0;
110110
int i, ret;
111111

112112
if (!cxl_ps_ctx->cxlr) {
@@ -133,8 +133,12 @@ static int cxl_scrub_get_attrbs(struct cxl_patrol_scrub_context *cxl_ps_ctx,
133133
if (ret)
134134
return ret;
135135

136+
/*
137+
* The min_scrub_cycle of a region is the max of minimum scrub
138+
* cycles supported by memdevs that back the region.
139+
*/
136140
if (min_cycle)
137-
min_scrub_cycle = min(*min_cycle, min_scrub_cycle);
141+
min_scrub_cycle = max(*min_cycle, min_scrub_cycle);
138142
}
139143

140144
if (min_cycle)

0 commit comments

Comments
 (0)