The next volatile and next persistent values are unused and are
cluttering the cxl_memdev_state.
Remove these values.
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
---
drivers/cxl/core/mbox.c | 4 ----
drivers/cxl/cxlmem.h | 4 ----
2 files changed, 8 deletions(-)
diff --git a/drivers/cxl/core/mbox.c b/drivers/cxl/core/mbox.c
index 62bb3653362f5325cfdab7812633328eac50ab30..998e1df36db673c47c4e87b957df9c29bf3f291a 100644
--- a/drivers/cxl/core/mbox.c
+++ b/drivers/cxl/core/mbox.c
@@ -1097,10 +1097,6 @@ static int cxl_mem_get_partition_info(struct cxl_memdev_state *mds)
le64_to_cpu(pi.active_volatile_cap) * CXL_CAPACITY_MULTIPLIER;
mds->active_persistent_bytes =
le64_to_cpu(pi.active_persistent_cap) * CXL_CAPACITY_MULTIPLIER;
- mds->next_volatile_bytes =
- le64_to_cpu(pi.next_volatile_cap) * CXL_CAPACITY_MULTIPLIER;
- mds->next_persistent_bytes =
- le64_to_cpu(pi.next_volatile_cap) * CXL_CAPACITY_MULTIPLIER;
return 0;
}
diff --git a/drivers/cxl/cxlmem.h b/drivers/cxl/cxlmem.h
index f218d43dec9fd89f950af667ff033d0802084345..29817f533e5e408243d361c46ddbf0c295b4fda4 100644
--- a/drivers/cxl/cxlmem.h
+++ b/drivers/cxl/cxlmem.h
@@ -548,8 +548,6 @@ static inline struct cxl_dev_state *mbox_to_cxlds(struct cxl_mailbox *cxl_mbox)
* @partition_align_bytes: alignment size for partition-able capacity
* @active_volatile_bytes: sum of hard + soft volatile
* @active_persistent_bytes: sum of hard + soft persistent
- * @next_volatile_bytes: volatile capacity change pending device reset
- * @next_persistent_bytes: persistent capacity change pending device reset
* @event: event log driver state
* @poison: poison driver state info
* @security: security driver state info
@@ -570,8 +568,6 @@ struct cxl_memdev_state {
u64 partition_align_bytes;
u64 active_volatile_bytes;
u64 active_persistent_bytes;
- u64 next_volatile_bytes;
- u64 next_persistent_bytes;
struct cxl_event_state event;
struct cxl_poison_state poison;
--
2.48.1
On Tue, Jan 28, 2025 at 12:51:07PM -0600, Ira Weiny wrote:
> The next volatile and next persistent values are unused and are
> cluttering the cxl_memdev_state.
>
> Remove these values.
>
> Signed-off-by: Ira Weiny <ira.weiny@intel.com>
> ---
Reviewed-by: Fan Ni <fan.ni@samsung.com>
> drivers/cxl/core/mbox.c | 4 ----
> drivers/cxl/cxlmem.h | 4 ----
> 2 files changed, 8 deletions(-)
>
> diff --git a/drivers/cxl/core/mbox.c b/drivers/cxl/core/mbox.c
> index 62bb3653362f5325cfdab7812633328eac50ab30..998e1df36db673c47c4e87b957df9c29bf3f291a 100644
> --- a/drivers/cxl/core/mbox.c
> +++ b/drivers/cxl/core/mbox.c
> @@ -1097,10 +1097,6 @@ static int cxl_mem_get_partition_info(struct cxl_memdev_state *mds)
> le64_to_cpu(pi.active_volatile_cap) * CXL_CAPACITY_MULTIPLIER;
> mds->active_persistent_bytes =
> le64_to_cpu(pi.active_persistent_cap) * CXL_CAPACITY_MULTIPLIER;
> - mds->next_volatile_bytes =
> - le64_to_cpu(pi.next_volatile_cap) * CXL_CAPACITY_MULTIPLIER;
> - mds->next_persistent_bytes =
> - le64_to_cpu(pi.next_volatile_cap) * CXL_CAPACITY_MULTIPLIER;
>
> return 0;
> }
> diff --git a/drivers/cxl/cxlmem.h b/drivers/cxl/cxlmem.h
> index f218d43dec9fd89f950af667ff033d0802084345..29817f533e5e408243d361c46ddbf0c295b4fda4 100644
> --- a/drivers/cxl/cxlmem.h
> +++ b/drivers/cxl/cxlmem.h
> @@ -548,8 +548,6 @@ static inline struct cxl_dev_state *mbox_to_cxlds(struct cxl_mailbox *cxl_mbox)
> * @partition_align_bytes: alignment size for partition-able capacity
> * @active_volatile_bytes: sum of hard + soft volatile
> * @active_persistent_bytes: sum of hard + soft persistent
> - * @next_volatile_bytes: volatile capacity change pending device reset
> - * @next_persistent_bytes: persistent capacity change pending device reset
> * @event: event log driver state
> * @poison: poison driver state info
> * @security: security driver state info
> @@ -570,8 +568,6 @@ struct cxl_memdev_state {
> u64 partition_align_bytes;
> u64 active_volatile_bytes;
> u64 active_persistent_bytes;
> - u64 next_volatile_bytes;
> - u64 next_persistent_bytes;
>
> struct cxl_event_state event;
> struct cxl_poison_state poison;
>
> --
> 2.48.1
>
--
Fan Ni
Ira Weiny wrote: > The next volatile and next persistent values are unused and are > cluttering the cxl_memdev_state. > > Remove these values. > > Signed-off-by: Ira Weiny <ira.weiny@intel.com> Ah, good catch. Even if we supported live partition changes these still would be awkward to track persistently. Reviewed-by: Dan Williams <dan.j.williams@intel.com>
On Tue, 28 Jan 2025 12:51:07 -0600 Ira Weiny <ira.weiny@intel.com> wrote: > The next volatile and next persistent values are unused and are > cluttering the cxl_memdev_state. > > Remove these values. > > Signed-off-by: Ira Weiny <ira.weiny@intel.com> Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
On 1/28/25 11:51 AM, Ira Weiny wrote:
> The next volatile and next persistent values are unused and are
> cluttering the cxl_memdev_state.
>
> Remove these values.
>
> Signed-off-by: Ira Weiny <ira.weiny@intel.com>
Reviewed-by: Dave Jiang <dave.jiang@intel.com>
> ---
> drivers/cxl/core/mbox.c | 4 ----
> drivers/cxl/cxlmem.h | 4 ----
> 2 files changed, 8 deletions(-)
>
> diff --git a/drivers/cxl/core/mbox.c b/drivers/cxl/core/mbox.c
> index 62bb3653362f5325cfdab7812633328eac50ab30..998e1df36db673c47c4e87b957df9c29bf3f291a 100644
> --- a/drivers/cxl/core/mbox.c
> +++ b/drivers/cxl/core/mbox.c
> @@ -1097,10 +1097,6 @@ static int cxl_mem_get_partition_info(struct cxl_memdev_state *mds)
> le64_to_cpu(pi.active_volatile_cap) * CXL_CAPACITY_MULTIPLIER;
> mds->active_persistent_bytes =
> le64_to_cpu(pi.active_persistent_cap) * CXL_CAPACITY_MULTIPLIER;
> - mds->next_volatile_bytes =
> - le64_to_cpu(pi.next_volatile_cap) * CXL_CAPACITY_MULTIPLIER;
> - mds->next_persistent_bytes =
> - le64_to_cpu(pi.next_volatile_cap) * CXL_CAPACITY_MULTIPLIER;
>
> return 0;
> }
> diff --git a/drivers/cxl/cxlmem.h b/drivers/cxl/cxlmem.h
> index f218d43dec9fd89f950af667ff033d0802084345..29817f533e5e408243d361c46ddbf0c295b4fda4 100644
> --- a/drivers/cxl/cxlmem.h
> +++ b/drivers/cxl/cxlmem.h
> @@ -548,8 +548,6 @@ static inline struct cxl_dev_state *mbox_to_cxlds(struct cxl_mailbox *cxl_mbox)
> * @partition_align_bytes: alignment size for partition-able capacity
> * @active_volatile_bytes: sum of hard + soft volatile
> * @active_persistent_bytes: sum of hard + soft persistent
> - * @next_volatile_bytes: volatile capacity change pending device reset
> - * @next_persistent_bytes: persistent capacity change pending device reset
> * @event: event log driver state
> * @poison: poison driver state info
> * @security: security driver state info
> @@ -570,8 +568,6 @@ struct cxl_memdev_state {
> u64 partition_align_bytes;
> u64 active_volatile_bytes;
> u64 active_persistent_bytes;
> - u64 next_volatile_bytes;
> - u64 next_persistent_bytes;
>
> struct cxl_event_state event;
> struct cxl_poison_state poison;
>
On Tue, 28 Jan 2025, Ira Weiny wrote: >The next volatile and next persistent values are unused and are >cluttering the cxl_memdev_state. > >Remove these values. > >Signed-off-by: Ira Weiny <ira.weiny@intel.com> Reviewed-by: Davidlohr Bueso <dave@stgolabs.net>
Reviewed-by: Alejandro Lucero <alucerop@amnd.com>
On 1/28/25 18:51, Ira Weiny wrote:
> The next volatile and next persistent values are unused and are
> cluttering the cxl_memdev_state.
>
> Remove these values.
>
> Signed-off-by: Ira Weiny <ira.weiny@intel.com>
> ---
> drivers/cxl/core/mbox.c | 4 ----
> drivers/cxl/cxlmem.h | 4 ----
> 2 files changed, 8 deletions(-)
>
> diff --git a/drivers/cxl/core/mbox.c b/drivers/cxl/core/mbox.c
> index 62bb3653362f5325cfdab7812633328eac50ab30..998e1df36db673c47c4e87b957df9c29bf3f291a 100644
> --- a/drivers/cxl/core/mbox.c
> +++ b/drivers/cxl/core/mbox.c
> @@ -1097,10 +1097,6 @@ static int cxl_mem_get_partition_info(struct cxl_memdev_state *mds)
> le64_to_cpu(pi.active_volatile_cap) * CXL_CAPACITY_MULTIPLIER;
> mds->active_persistent_bytes =
> le64_to_cpu(pi.active_persistent_cap) * CXL_CAPACITY_MULTIPLIER;
> - mds->next_volatile_bytes =
> - le64_to_cpu(pi.next_volatile_cap) * CXL_CAPACITY_MULTIPLIER;
> - mds->next_persistent_bytes =
> - le64_to_cpu(pi.next_volatile_cap) * CXL_CAPACITY_MULTIPLIER;
>
> return 0;
> }
> diff --git a/drivers/cxl/cxlmem.h b/drivers/cxl/cxlmem.h
> index f218d43dec9fd89f950af667ff033d0802084345..29817f533e5e408243d361c46ddbf0c295b4fda4 100644
> --- a/drivers/cxl/cxlmem.h
> +++ b/drivers/cxl/cxlmem.h
> @@ -548,8 +548,6 @@ static inline struct cxl_dev_state *mbox_to_cxlds(struct cxl_mailbox *cxl_mbox)
> * @partition_align_bytes: alignment size for partition-able capacity
> * @active_volatile_bytes: sum of hard + soft volatile
> * @active_persistent_bytes: sum of hard + soft persistent
> - * @next_volatile_bytes: volatile capacity change pending device reset
> - * @next_persistent_bytes: persistent capacity change pending device reset
> * @event: event log driver state
> * @poison: poison driver state info
> * @security: security driver state info
> @@ -570,8 +568,6 @@ struct cxl_memdev_state {
> u64 partition_align_bytes;
> u64 active_volatile_bytes;
> u64 active_persistent_bytes;
> - u64 next_volatile_bytes;
> - u64 next_persistent_bytes;
>
> struct cxl_event_state event;
> struct cxl_poison_state poison;
>
© 2016 - 2026 Red Hat, Inc.