OrgACRN
/
acrn-kernel
mirror of https://github.com/projectacrn/acrn-kernel.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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)
 -----BEGIN PGP SIGNATURE-----
 
 iQI/BAABCgApFiEEgdbnc3r/njty3Iq9D55TZVIEUYMFAmQb0A4LHGhjaEBsc3Qu
 ZGUACgkQD55TZVIEUYNJJhAAuJxVzFqmp5L97GJY1VuiWvgRiJyUNToM3W58IG/G
 PDOMVmsW9hF5wGUUyU5mtXxDel2JjmzMhWZhKd8Bn6JA7QXGq+eD7/6YQmU6aa5G
 nDTeX6c4movsTOwIZOy4aBcRcfggxKaDq60YGDLHTaj3u5WiJbAXWdnj4VUu9Lvt
 CmNQHvINEuyxAcp0xwVDHzHxQbdFISbEE0m9OzMROl+IA9PpoXhHSHG3ZuHgF42s
 QYHHux94b1R+bGVJKPRO1ZZOE6ll8gOCNlXS8GvJJSBp7T58i8NuKH7FlTAmS7FW
 133v5DEZdGVhWQTNzfd0Yv0qlb+xsf6XTYx9QSwpl7Pg5Sqw+kFL3HbdzuhzX+lZ
 t9Jfjii6nq11XKAT9Hku/zF4bGc+6ae6qr0Zu7YMBtxk11D0Lu6RUs9fD1ePsEjU
 UDchZd+Ttx+JHsD3DvYkhukvSeMja914hSW9YWYeP/oLvp/wbqnSUwVX5nMRLeE8
 D1XrnraGAw/8wfAJAOfWT3RrMgS/XH4alDhUyVnlG1aOIMfbrnZPAgllJWXYqCrq
 34WEFpEziqMPctGoxxwWCM48OHMR8ZaW43eBaJDt4nwPnU9sDrKMX0L0dghEzQSy
 GW723BRTZ4QBGUyeiFTl8lDTUvHjC2JFOpGdhQ/BdFEX8Vm9XiBeTIkBBrUssJoE
 jNA=
 =7CdA
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Jens Axboe 2023-03-23 13:02:20 -06:00
parent 9d2789ac9d aa01c67de5
commit f915da0f0d
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/nvme/host/core.c
View File

@ -3063,7 +3063,8 @@ static int nvme_init_non_mdts_limits(struct nvme_ctrl *ctrl)
else else
ctrl->max_zeroes_sectors = 0; 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; return 0;
id = kzalloc(sizeof(*id), GFP_KERNEL); id = kzalloc(sizeof(*id), GFP_KERNEL);

5
include/linux/nvme-tcp.h
View File

@ -115,8 +115,9 @@ struct nvme_tcp_icresp_pdu {
struct nvme_tcp_term_pdu { struct nvme_tcp_term_pdu {
struct nvme_tcp_hdr hdr; struct nvme_tcp_hdr hdr;
__le16 fes; __le16 fes;
__le32 fei; __le16 feil;
__u8 rsvd[8]; __le16 feiu;
__u8 rsvd[10];
}; };
/** /**