Commit 483e4a1d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'cxl-fixes-for-5.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl 

Pull cxl fixes from Vishal Verma:

 - Update MAINTAINERS for Ben's email

 - Fix cleanup of port devices on failure to probe driver

 - Fix endianness in get/set LSA mailbox command structures

 - Fix memregion_free() fallback definition

 - Fix missing variable payload checks in CXL cmd size validation

* tag 'cxl-fixes-for-5.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl:
  cxl/mbox: Fix missing variable payload checks in cmd size validation
  memregion: Fix memregion_free() fallback definition
  cxl/mbox: Use __le32 in get,set_lsa mailbox structures
  cxl/core: Use is_endpoint_decoder
  cxl: Fix cleanup of port devices on failure to probe driver.
  MAINTAINERS: Update Ben's email address
parents f5645edf e35f5718

.mailmap

+3 −0
Original line number Diff line number Diff line
@@ -64,6 +64,9 @@ Bart Van Assche <bvanassche@acm.org> <bart.vanassche@sandisk.com> 
Bart Van Assche <bvanassche@acm.org> <bart.vanassche@wdc.com>

Ben Gardner <bgardner@wabtec.com>

Ben M Cahill <ben.m.cahill@intel.com>

Ben Widawsky <bwidawsk@kernel.org> <ben@bwidawsk.net>

Ben Widawsky <bwidawsk@kernel.org> <ben.widawsky@intel.com>

Ben Widawsky <bwidawsk@kernel.org> <benjamin.widawsky@intel.com>

Björn Steinbrink <B.Steinbrink@gmx.de>

Björn Töpel <bjorn@kernel.org> <bjorn.topel@gmail.com>

Björn Töpel <bjorn@kernel.org> <bjorn.topel@intel.com>

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -5101,7 +5101,7 @@ COMPUTE EXPRESS LINK (CXL) 
M:	Alison Schofield <alison.schofield@intel.com>

M:	Vishal Verma <vishal.l.verma@intel.com>

M:	Ira Weiny <ira.weiny@intel.com>

M:	Ben Widawsky <ben.widawsky@intel.com>

M:	Ben Widawsky <bwidawsk@kernel.org>

M:	Dan Williams <dan.j.williams@intel.com>

L:	linux-cxl@vger.kernel.org

S:	Maintained

drivers/cxl/core/hdm.c

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ static int init_hdm_decoder(struct cxl_port *port, struct cxl_decoder *cxld, 
	else

		cxld->target_type = CXL_DECODER_ACCELERATOR;



	if (is_cxl_endpoint(to_cxl_port(cxld->dev.parent)))

	if (is_endpoint_decoder(&cxld->dev))

		return 0;



	target_list.value =

drivers/cxl/core/mbox.c

+4 −2
Original line number Diff line number Diff line
@@ -355,11 +355,13 @@ static int cxl_to_mem_cmd(struct cxl_mem_command *mem_cmd, 
		return -EBUSY;



	/* Check the input buffer is the expected size */

	if (info->size_in != send_cmd->in.size)

	if ((info->size_in != CXL_VARIABLE_PAYLOAD) &&

	    (info->size_in != send_cmd->in.size))

		return -ENOMEM;



	/* Check the output buffer is at least large enough */

	if (send_cmd->out.size < info->size_out)

	if ((info->size_out != CXL_VARIABLE_PAYLOAD) &&

	    (send_cmd->out.size < info->size_out))

		return -ENOMEM;



	*mem_cmd = (struct cxl_mem_command) {

drivers/cxl/core/port.c

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ static const struct device_type cxl_decoder_root_type = { 
	.groups = cxl_decoder_root_attribute_groups,

};



static bool is_endpoint_decoder(struct device *dev)

bool is_endpoint_decoder(struct device *dev)

{

	return dev->type == &cxl_decoder_endpoint_type;

}