Re: [PATCH v2] hw/nvme/ctrl: fix csi field for cns 0x00 and 0x11

[Klaus Jensen]

On Apr 27 12:00, Gollu Appalanaidu wrote:
> As per the TP 4056d Namespace types CNS 0x00 and CNS 0x11
> CSI field shouldn't use but it is being used for these two
> Identify command CNS values, fix that.
>
> Remove 'nvme_csi_has_nvm_support()' helper as suggested by
> Klaus we can safely assume NVM command set support for all
> namespaces.
>
> Suggested-by: Klaus Jensen <its@irrelevant.dk>
> Signed-off-by: Gollu Appalanaidu <anaidu.gollu@samsung.com>
> ---
> -v2: add sugggestions from Klaus
> We can Remove 'nvme_csi_has_nvm_support()' helper, we can
> assume NVM command set support for all namespaces.
>
> hw/nvme/ctrl.c | 14 ++------------
> 1 file changed, 2 insertions(+), 12 deletions(-)
>
> diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c
> index 2e7498a73e..7fcd699235 100644
> --- a/hw/nvme/ctrl.c
> +++ b/hw/nvme/ctrl.c
> @@ -4178,16 +4178,6 @@ static uint16_t nvme_rpt_empty_id_struct(NvmeCtrl *n, 
> NvmeRequest *req)
>     return nvme_c2h(n, id, sizeof(id), req);
> }
>
> -static inline bool nvme_csi_has_nvm_support(NvmeNamespace *ns)
> -{
> -    switch (ns->csi) {
> -    case NVME_CSI_NVM:
> -    case NVME_CSI_ZONED:
> -        return true;
> -    }
> -    return false;
> -}
> -
> static uint16_t nvme_identify_ctrl(NvmeCtrl *n, NvmeRequest *req)
> {
>     trace_pci_nvme_identify_ctrl();
> @@ -4244,7 +4234,7 @@ static uint16_t nvme_identify_ns(NvmeCtrl *n, NvmeRequest 
> *req, bool active)
>         }
>     }
>
> -    if (c->csi == NVME_CSI_NVM && nvme_csi_has_nvm_support(ns)) {
> +    if (active || ns->csi == NVME_CSI_NVM) {
>         return nvme_c2h(n, (uint8_t *)&ns->id_ns, sizeof(NvmeIdNs), req);
>     }
>
> @@ -4315,7 +4305,7 @@ static uint16_t nvme_identify_ns_csi(NvmeCtrl *n, 
> NvmeRequest *req,
>         }
>     }
>
> -    if (c->csi == NVME_CSI_NVM && nvme_csi_has_nvm_support(ns)) {
> +    if (c->csi == NVME_CSI_NVM) {
>         return nvme_rpt_empty_id_struct(n, req);
>     } else if (c->csi == NVME_CSI_ZONED && ns->csi == NVME_CSI_ZONED) {
>         return nvme_c2h(n, (uint8_t *)ns->id_ns_zoned, sizeof(NvmeIdNsZoned),
> --
> 2.17.1

Applied to nvme-next. Thanks!

signature.asc
Description: PGP signature