Commit f915da0f authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge tag 'nvme-6.3-2023-03-23' of git://git.infradead.org/nvme into block-6.3 

Pull NVMe fixes from Christoph:

"nvme fixes for Linux 6.3

 - send Identify with CNS 06h only to I/O controllers (Martin George)
 - fix nvme_tcp_term_pdu to match spec (Caleb Sander)"

* tag 'nvme-6.3-2023-03-23' of git://git.infradead.org/nvme:
  nvme-tcp: fix nvme_tcp_term_pdu to match spec
  nvme: send Identify with CNS 06h only to I/O controllers
parents 9d2789ac aa01c67d

drivers/nvme/host/core.c

+2 −1
Original line number Diff line number Diff line
@@ -3063,7 +3063,8 @@ static int nvme_init_non_mdts_limits(struct nvme_ctrl *ctrl) 
	else

		ctrl->max_zeroes_sectors = 0;



	if (nvme_ctrl_limited_cns(ctrl))

	if (ctrl->subsys->subtype != NVME_NQN_NVME ||

	    nvme_ctrl_limited_cns(ctrl))

		return 0;



	id = kzalloc(sizeof(*id), GFP_KERNEL);

include/linux/nvme-tcp.h

+3 −2
Original line number Diff line number Diff line
@@ -115,8 +115,9 @@ struct nvme_tcp_icresp_pdu { 
struct nvme_tcp_term_pdu {

	struct nvme_tcp_hdr	hdr;

	__le16			fes;

	__le32			fei;

	__u8			rsvd[8];

	__le16			feil;

	__le16			feiu;

	__u8			rsvd[10];

};



/**