Attachment 193511 Details for Bug 287741 – Backported patch from upstream to RHEL4 2.6.9-59.el

[patch] Backported patch from upstream to RHEL4 2.6.9-59.el

rhel4_sub_bridge-redone.patch (text/plain), 2.27 KB, created by Flavio Leitner on 2007-09-12 15:19:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Flavio Leitner

Created: 2007-09-12 15:19:01 UTC

Size: 2.27 KB

patch

obsolete

>Index: linux-2.6.9/drivers/pci/hotplug/acpiphp_glue.c
>===================================================================
>--- linux-2.6.9.orig/drivers/pci/hotplug/acpiphp_glue.c
>+++ linux-2.6.9/drivers/pci/hotplug/acpiphp_glue.c
>@@ -1019,6 +1019,37 @@ static int acpiphp_check_bridge(struct a
>  * ACPI event handlers
>  */
> 
>+static acpi_status
>+count_sub_bridges(acpi_handle handle, u32 lvl, void *context, void **rv)
>+{
>+	int *count = (int *)context;
>+	struct acpiphp_bridge *bridge;
>+
>+	bridge = acpiphp_handle_to_bridge(handle);
>+	if (bridge)
>+		(*count)++;
>+	return AE_OK ;
>+}
>+
>+static acpi_status
>+check_sub_bridges(acpi_handle handle, u32 lvl, void *context, void **rv)
>+{
>+	struct acpiphp_bridge *bridge;
>+	char objname[64];
>+	struct acpi_buffer buffer = { .length = sizeof(objname),
>+				      .pointer = objname };
>+
>+	bridge = acpiphp_handle_to_bridge(handle);
>+	if (bridge) {
>+		acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);
>+		dbg("%s: re-enumerating slots under %s\n",
>+			__FUNCTION__, objname);
>+		acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);
>+		acpiphp_check_bridge(bridge);
>+	}
>+	return AE_OK ;
>+}
>+
> /**
>  * handle_hotplug_event_bridge - handle ACPI event on bridges
>  *
>@@ -1035,8 +1066,18 @@ static void handle_hotplug_event_bridge(
> 	char objname[64];
> 	struct acpi_buffer buffer = { .length = sizeof(objname),
> 				      .pointer = objname };
>+	int num_sub_bridges = 0;
> 
>-	bridge = (struct acpiphp_bridge *)context;
>+	bridge = acpiphp_handle_to_bridge(handle);
>+	if (type == ACPI_NOTIFY_BUS_CHECK) {
>+		acpi_walk_namespace(ACPI_TYPE_DEVICE, handle, ACPI_UINT32_MAX,
>+			count_sub_bridges, &num_sub_bridges, NULL);
>+	}
>+
>+	if (!bridge && !num_sub_bridges) {
>+		err("cannot get bridge info\n");
>+		return;
>+	}
> 
> 	acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);
> 
>@@ -1044,7 +1085,14 @@ static void handle_hotplug_event_bridge(
> 	case ACPI_NOTIFY_BUS_CHECK:
> 		/* bus re-enumerate */
> 		dbg("%s: Bus check notify on %s\n", __FUNCTION__, objname);
>-		acpiphp_check_bridge(bridge);
>+		if (bridge) {
>+			dbg("%s: re-enumerating slots under %s\n",
>+				__FUNCTION__, objname);
>+			acpiphp_check_bridge(bridge);
>+		}
>+		if (num_sub_bridges)
>+			acpi_walk_namespace(ACPI_TYPE_DEVICE, handle,
>+				ACPI_UINT32_MAX, check_sub_bridges, NULL, NULL);
> 		break;
> 
> 	case ACPI_NOTIFY_DEVICE_CHECK:

Actions: View | Diff

Attachments on bug 287741: 193511