Commit e7a11b44 authored by Dan Williams's avatar Dan Williams
Browse files

nfit: cleanup acpi_nfit_init calling convention 



Pass the nfit buffer as a parameter rather than hanging it off of
acpi_desc.

Reviewed-by: default avatar"Lee, Chun-Yi" <jlee@suse.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 31932041

drivers/acpi/nfit.c

+17 −31
Original line number Diff line number Diff line
@@ -2291,12 +2291,11 @@ static int acpi_nfit_check_deletions(struct acpi_nfit_desc *acpi_desc, 
	return 0;

}



int acpi_nfit_init(struct acpi_nfit_desc *acpi_desc, acpi_size sz)

int acpi_nfit_init(struct acpi_nfit_desc *acpi_desc, void *data, acpi_size sz)

{

	struct device *dev = acpi_desc->dev;

	struct nfit_table_prev prev;

	const void *end;

	u8 *data;

	int rc;



	mutex_lock(&acpi_desc->init_mutex);
@@ -2321,7 +2320,6 @@ int acpi_nfit_init(struct acpi_nfit_desc *acpi_desc, acpi_size sz) 
	list_cut_position(&prev.flushes, &acpi_desc->flushes,

				acpi_desc->flushes.prev);



	data = (u8 *) acpi_desc->nfit;

	end = data + sz;

	while (!IS_ERR_OR_NULL(data))

		data = add_table(acpi_desc, &prev, data, end);
@@ -2461,41 +2459,31 @@ static int acpi_nfit_add(struct acpi_device *adev) 
	if (!acpi_desc->nvdimm_bus)

		return -ENOMEM;



	/*

	 * Save the acpi header for later and then skip it,

	 * making nfit point to the first nfit table header.

	 */

	/* Save the acpi header for exporting the revision via sysfs */

	acpi_desc->acpi_header = *tbl;

	acpi_desc->nfit = (void *) tbl + sizeof(struct acpi_table_nfit);

	sz -= sizeof(struct acpi_table_nfit);



	/* Evaluate _FIT and override with that if present */

	status = acpi_evaluate_object(adev->handle, "_FIT", NULL, &buf);

	if (ACPI_SUCCESS(status) && buf.length > 0) {

		union acpi_object *obj;

		/*

		 * Adjust for the acpi_object header of the _FIT

		 */

		obj = buf.pointer;

		if (obj->type == ACPI_TYPE_BUFFER) {

			acpi_desc->nfit =

				(struct acpi_nfit_header *)obj->buffer.pointer;

			sz = obj->buffer.length;

			rc = acpi_nfit_init(acpi_desc, sz);

		} else

		union acpi_object *obj = buf.pointer;



		if (obj->type == ACPI_TYPE_BUFFER)

			rc = acpi_nfit_init(acpi_desc, obj->buffer.pointer,

					obj->buffer.length);

		else

			dev_dbg(dev, "%s invalid type %d, ignoring _FIT\n",

				 __func__, (int) obj->type);

		acpi_desc->nfit = NULL;

		kfree(buf.pointer);

	} else

		rc = acpi_nfit_init(acpi_desc, sz);

		/* skip over the lead-in header table */

		rc = acpi_nfit_init(acpi_desc, (void *) tbl

				+ sizeof(struct acpi_table_nfit),

				sz - sizeof(struct acpi_table_nfit));



	if (rc) {

	if (rc)

		nvdimm_bus_unregister(acpi_desc->nvdimm_bus);

	return rc;

}

	return 0;

}



static int acpi_nfit_remove(struct acpi_device *adev)

{
@@ -2511,8 +2499,8 @@ static void acpi_nfit_notify(struct acpi_device *adev, u32 event) 
{

	struct acpi_nfit_desc *acpi_desc = dev_get_drvdata(&adev->dev);

	struct acpi_buffer buf = { ACPI_ALLOCATE_BUFFER, NULL };

	union acpi_object *obj;

	struct device *dev = &adev->dev;

	union acpi_object *obj;

	acpi_status status;

	int ret;
@@ -2550,14 +2538,12 @@ static void acpi_nfit_notify(struct acpi_device *adev, u32 event) 


	obj = buf.pointer;

	if (obj->type == ACPI_TYPE_BUFFER) {

		acpi_desc->nfit =

			(struct acpi_nfit_header *)obj->buffer.pointer;

		ret = acpi_nfit_init(acpi_desc, obj->buffer.length);

		ret = acpi_nfit_init(acpi_desc, obj->buffer.pointer,

				obj->buffer.length);

		if (ret)

			dev_err(dev, "failed to merge updated NFIT\n");

	} else

		dev_err(dev, "Invalid _FIT\n");

	acpi_desc->nfit = NULL;

	kfree(buf.pointer);



 out_unlock:

drivers/acpi/nfit.h

+1 −2
Original line number Diff line number Diff line
@@ -135,7 +135,6 @@ struct nfit_mem { 
struct acpi_nfit_desc {

	struct nvdimm_bus_descriptor nd_desc;

	struct acpi_table_header acpi_header;

	struct acpi_nfit_header *nfit;

	struct mutex init_mutex;

	struct list_head memdevs;

	struct list_head flushes;
@@ -201,6 +200,6 @@ static inline struct acpi_nfit_desc *to_acpi_desc( 
}



const u8 *to_nfit_uuid(enum nfit_uuids id);

int acpi_nfit_init(struct acpi_nfit_desc *nfit, acpi_size sz);

int acpi_nfit_init(struct acpi_nfit_desc *acpi_desc, void *nfit, acpi_size sz);

void acpi_nfit_desc_init(struct acpi_nfit_desc *acpi_desc, struct device *dev);

#endif /* __NFIT_H__ */

tools/testing/nvdimm/test/nfit.c

+4 −3
Original line number Diff line number Diff line
@@ -1460,7 +1460,6 @@ static int nfit_test_probe(struct platform_device *pdev) 
	nfit_test->setup(nfit_test);

	acpi_desc = &nfit_test->acpi_desc;

	acpi_nfit_desc_init(acpi_desc, &pdev->dev);

	acpi_desc->nfit = nfit_test->nfit_buf;

	acpi_desc->blk_do_io = nfit_test_blk_do_io;

	nd_desc = &acpi_desc->nd_desc;

	nd_desc->provider_name = NULL;
@@ -1469,7 +1468,8 @@ static int nfit_test_probe(struct platform_device *pdev) 
	if (!acpi_desc->nvdimm_bus)

		return -ENXIO;



	rc = acpi_nfit_init(acpi_desc, nfit_test->nfit_size);

	rc = acpi_nfit_init(acpi_desc, nfit_test->nfit_buf,

			nfit_test->nfit_size);

	if (rc) {

		nvdimm_bus_unregister(acpi_desc->nvdimm_bus);

		return rc;
@@ -1481,7 +1481,8 @@ static int nfit_test_probe(struct platform_device *pdev) 
	nfit_test->setup_hotplug = 1;

	nfit_test->setup(nfit_test);



	rc = acpi_nfit_init(acpi_desc, nfit_test->nfit_size);

	rc = acpi_nfit_init(acpi_desc, nfit_test->nfit_buf,

			nfit_test->nfit_size);

	if (rc) {

		nvdimm_bus_unregister(acpi_desc->nvdimm_bus);

		return rc;