[PATCH] 2/3 ACPI resource handling

[PATCH] 2/3 ACPI resource handling

[Bjorn Helgaas]

Note that this contains a couple structure copies; don't know your
philosophy on those.

Bjorn


diff -ur acpi-2/drivers/acpi/resources/rsxface.c acpi-3/drivers/acpi/resources/rsxface.c
--- acpi-2/drivers/acpi/resources/rsxface.c	2003-02-09 22:13:47.000000000 -0700
+++ acpi-3/drivers/acpi/resources/rsxface.c	2003-02-09 22:13:52.000000000 -0700
@@ -316,3 +316,65 @@
 	status = acpi_rs_set_srs_method_data (device_handle, in_buffer);
 	return_ACPI_STATUS (status);
 }
+
+
+#define copy_field(out, in, field)	out->field = in->field
+#define copy_address(out, in)					\
+	copy_field(out, in, resource_type);			\
+	copy_field(out, in, producer_consumer);			\
+	copy_field(out, in, decode);				\
+	copy_field(out, in, min_address_fixed);			\
+	copy_field(out, in, max_address_fixed);			\
+	copy_field(out, in, attribute);				\
+	copy_field(out, in, granularity);			\
+	copy_field(out, in, min_address_range);			\
+	copy_field(out, in, max_address_range);			\
+	copy_field(out, in, address_translation_offset);	\
+	copy_field(out, in, address_length);			\
+	copy_field(out, in, resource_source);
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_resource_to_address64
+ *
+ * PARAMETERS:  resource                - Pointer to a resource
+ *              out                     - Pointer to the users's return 
+ *                                        buffer (a struct
+ *                                        acpi_resource_address64)
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: If the resource is an address16, address32, or address64,
+ *              copy it to the address64 return buffer.  This saves the
+ *              caller from having to duplicate code for different-sized
+ *              addresses.
+ *
+ ******************************************************************************/
+
+acpi_status
+acpi_resource_to_address64 (
+	struct acpi_resource            *resource,
+	struct acpi_resource_address64  *out)
+{
+	struct acpi_resource_address16  *address16;
+	struct acpi_resource_address32  *address32;
+	struct acpi_resource_address64  *address64;
+
+	switch (resource->id) {
+		case ACPI_RSTYPE_ADDRESS16:
+			address16 = (struct acpi_resource_address16 *) &resource->data;
+			copy_address(out, address16);
+			break;
+		case ACPI_RSTYPE_ADDRESS32:
+			address32 = (struct acpi_resource_address32 *) &resource->data;
+			copy_address(out, address32);
+			break;
+		case ACPI_RSTYPE_ADDRESS64:
+			address64 = (struct acpi_resource_address64 *) &resource->data;
+			copy_address(out, address64);
+			break;
+		default:
+			return (AE_BAD_PARAMETER);
+	}
+	return (AE_OK);
+}
diff -ur acpi-2/include/acpi/acpixf.h acpi-3/include/acpi/acpixf.h
--- acpi-2/include/acpi/acpixf.h	2003-02-09 22:13:47.000000000 -0700
+++ acpi-3/include/acpi/acpixf.h	2003-02-09 22:13:52.000000000 -0700
@@ -352,6 +352,11 @@
 	acpi_handle                     bus_device_handle,
 	struct acpi_buffer              *ret_buffer);
 
+acpi_status
+acpi_resource_to_address64 (
+	struct acpi_resource            *resource,
+	struct acpi_resource_address64  *out);
+
 
 /*
  * Hardware (ACPI device) interfaces

Re: [PATCH] 2/3 ACPI resource handling

[Stephen Hemminger]

On Tue, 2003-02-11 at 13:59, Bjorn Helgaas wrote:
> Note that this contains a couple structure copies; don't know your
> philosophy on those.
> 
> Bjorn
> 
> 
> diff -ur acpi-2/drivers/acpi/resources/rsxface.c acpi-3/drivers/acpi/resources/rsxface.c
> --- acpi-2/drivers/acpi/resources/rsxface.c	2003-02-09 22:13:47.000000000 -0700
> +++ acpi-3/drivers/acpi/resources/rsxface.c	2003-02-09 22:13:52.000000000 -0700
> @@ -316,3 +316,65 @@
>  	status = acpi_rs_set_srs_method_data (device_handle, in_buffer);
>  	return_ACPI_STATUS (status);
>  }
> +
> +
> +#define copy_field(out, in, field)	out->field = in->field
> +#define copy_address(out, in)					\
> +	copy_field(out, in, resource_type);			\
> +	copy_field(out, in, producer_consumer);			\
> +	copy_field(out, in, decode);				\
> +	copy_field(out, in, min_address_fixed);			\
> +	copy_field(out, in, max_address_fixed);			\
> +	copy_field(out, in, attribute);				\
> +	copy_field(out, in, granularity);			\
> +	copy_field(out, in, min_address_range);			\
> +	copy_field(out, in, max_address_range);			\
> +	copy_field(out, in, address_translation_offset);	\
> +	copy_field(out, in, address_length);			\
> +	copy_field(out, in, resource_source);

If ACPI just used normal (ie short) variable names, then ugly macros
like this would not be necessary.

Re: [PATCH] 2/3 ACPI resource handling

[Bjorn Helgaas]

> > +#define copy_field(out, in, field)	out->field = in->field
> > +#define copy_address(out, in)					\
> > +	copy_field(out, in, resource_type);			\
> > +	copy_field(out, in, producer_consumer);			\
> > +	copy_field(out, in, decode);				\
> > +	copy_field(out, in, min_address_fixed);			\
> > +	copy_field(out, in, max_address_fixed);			\
> > +	copy_field(out, in, attribute);				\
> > +	copy_field(out, in, granularity);			\
> > +	copy_field(out, in, min_address_range);			\
> > +	copy_field(out, in, max_address_range);			\
> > +	copy_field(out, in, address_translation_offset);	\
> > +	copy_field(out, in, address_length);			\
> > +	copy_field(out, in, resource_source);
> 
> If ACPI just used normal (ie short) variable names, then ugly macros
> like this would not be necessary.

Well, the length of variable names is really irrelevant to this patch.
I just didn't want to write

	switch (resource->id) {
	case ACPI_RSTYPE_ADDRESS16:
		address16 = (struct acpi_resource_address16 *) &resource->data;
		out->resource_type = address16->resource_type;
		out->producer_consumer = address16->producer_consumer;
		...
	case ACPI_RSTYPE_ADDRESS32:
		address32 = (struct acpi_resource_address32 *) &resource->data;
		out->resource_type = address32->resource_type;
		out->producer_consumer = address32->producer_consumer;
		...
	case ACPI_RSTYPE_ADDRESS64:
		address64 = (struct acpi_resource_address64 *) &resource->data;
		out->resource_type = address64->resource_type;
		out->producer_consumer = address64->producer_consumer;
		...

where all the cases are identical except for the 16/32/64 (and the
occasional cut-and-paste error).

If the macros are considered too ugly, I'd be glad to rewrite the
function as above.  The main thing is to put the 16/32/64 switch
ONE place, rather than duplicating it in every place that consumes
address resources.

Bjorn