From patchwork Fri Dec 30 15:21:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 89384 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp6489873qgi; Fri, 30 Dec 2016 07:33:16 -0800 (PST) X-Received: by 10.200.49.148 with SMTP id h20mr42269512qte.204.1483111996383; Fri, 30 Dec 2016 07:33:16 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id t1si25008426qkf.231.2016.12.30.07.33.16 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 30 Dec 2016 07:33:16 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org Received: from localhost ([::1]:40351 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cMzBD-0002ef-TY for patch@linaro.org; Fri, 30 Dec 2016 10:33:15 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43316) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cMz0R-0002JJ-UQ for qemu-devel@nongnu.org; Fri, 30 Dec 2016 10:22:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cMz0R-0000Fe-1F for qemu-devel@nongnu.org; Fri, 30 Dec 2016 10:22:07 -0500 Received: from mail-pg0-x241.google.com ([2607:f8b0:400e:c05::241]:33291) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cMz0Q-0000F3-RM for qemu-devel@nongnu.org; Fri, 30 Dec 2016 10:22:06 -0500 Received: by mail-pg0-x241.google.com with SMTP id g1so22376668pgn.0 for ; Fri, 30 Dec 2016 07:22:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=idHSFLJG0yC1sGbTF375qAff0vVoKq9vvrFvomjPa3A=; b=n7iBTfQqo1eUIydLhUraTNWWq+HY4PpMHWy1mtM6M4Yh4RFiuEeSNS26JndxIQq3gD lYEl8VAVPrI6AlhDf+RFAN0WLyEf1r6AIxyE0FoRtVOWeVYpFetGz0nuMdB6QtTZGi4A 0pPditmPBTxi2yFJgI5QtGpA2LGtpaT8Qcrk4qOYq9KF5cHdum56ILu81IsHv78dL8o5 uy1bQeeugt2EHW2hLTQD2amOjcS6Jt401MWekqAQguopEyTad3bsTazcEw0FB1uQ02Dr gwGZMQTxm6+vCDttXkh99msfLmQKmz+btxZeqH7Z4dAzjMitmdLCjuAZHspWt6Rg9zAF JSfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=idHSFLJG0yC1sGbTF375qAff0vVoKq9vvrFvomjPa3A=; b=SRevJsq7qyc5zzxRJecLkxAHS/DWeP5ijRPawcPDXPRDQ6kTUT2CpA+kTwEORXcjf2 r7ZGwcydDBtouEWp5gWrV05jgdMltLq9Q0XereiQIPtZtrdaynFwXMag3r5/PbB1Wkwq MbFrDYYoW+XJGUtGnUXyqNy9mYXkwrK5Z1NQXSj4LTiU594Q0JBC49lNL+lxqDrxJcZR kYEF4Yy97Yr4qyhNcy3sUuv4jG/vVJxZnuoNBbSv/ZoD+Z4umkptvhz6+ubpPB1BCncy FpFFpKEyz9RB5jfkkNE6khrmfHHs/8mTXzf7pdGZuPOF6ovBULMJAOOBHk7MlZ3oqoSQ 3ocw== X-Gm-Message-State: AIkVDXJDBXqgYvIDAS4x+UJOqcO97To69VP1Jmr5xE9DhL3ZA2xPizOHGlnoLfct/bzJHg== X-Received: by 10.84.208.102 with SMTP id f35mr99762199plh.137.1483111326108; Fri, 30 Dec 2016 07:22:06 -0800 (PST) Received: from serve.minyard.net ([47.184.183.230]) by smtp.gmail.com with ESMTPSA id w5sm113552714pfl.31.2016.12.30.07.22.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Dec 2016 07:22:01 -0800 (PST) Received: from t430.minyard.net (unknown [IPv6:2001:470:b8f6:1b:3850:e313:ed7:8ae4]) by serve.minyard.net (Postfix) with ESMTPA id F27E3A11A; Fri, 30 Dec 2016 09:21:56 -0600 (CST) Received: by t430.minyard.net (Postfix, from userid 1000) id BF837300095; Fri, 30 Dec 2016 09:21:53 -0600 (CST) From: minyard@acm.org To: qemu-devel@nongnu.org Date: Fri, 30 Dec 2016 09:21:43 -0600 Message-Id: <1483111310-24808-13-git-send-email-minyard@acm.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1483111310-24808-1-git-send-email-minyard@acm.org> References: <1483111310-24808-1-git-send-email-minyard@acm.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c05::241 Subject: [Qemu-devel] [PATCH 12/19] ipmi: Fix SSIF ACPI handling to use the right CRS X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Corey Minyard , minyard@acm.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Corey Minyard Signed-off-by: Corey Minyard --- hw/acpi/ipmi.c | 13 +++++++------ hw/i386/acpi-build.c | 2 +- include/hw/acpi/ipmi.h | 2 +- stubs/ipmi.c | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) -- 2.7.4 diff --git a/hw/acpi/ipmi.c b/hw/acpi/ipmi.c index 651e2e9..96e48eb 100644 --- a/hw/acpi/ipmi.c +++ b/hw/acpi/ipmi.c @@ -13,7 +13,7 @@ #include "hw/acpi/acpi.h" #include "hw/acpi/ipmi.h" -static Aml *aml_ipmi_crs(IPMIFwInfo *info) +static Aml *aml_ipmi_crs(IPMIFwInfo *info, const char *resource) { Aml *crs = aml_resource_template(); @@ -48,7 +48,8 @@ static Aml *aml_ipmi_crs(IPMIFwInfo *info) info->register_spacing, info->register_length)); break; case IPMI_MEMSPACE_SMBUS: - aml_append(crs, aml_return(aml_int(info->base_address))); + aml_append(crs, aml_i2c_serial_bus_device(info->base_address, + resource)); break; default: abort(); @@ -61,7 +62,7 @@ static Aml *aml_ipmi_crs(IPMIFwInfo *info) return crs; } -static Aml *aml_ipmi_device(IPMIFwInfo *info) +static Aml *aml_ipmi_device(IPMIFwInfo *info, const char *resource) { Aml *dev; uint16_t version = ((info->ipmi_spec_major_revision << 8) @@ -74,14 +75,14 @@ static Aml *aml_ipmi_device(IPMIFwInfo *info) aml_append(dev, aml_name_decl("_STR", aml_string("ipmi_%s", info->interface_name))); aml_append(dev, aml_name_decl("_UID", aml_int(info->uuid))); - aml_append(dev, aml_name_decl("_CRS", aml_ipmi_crs(info))); + aml_append(dev, aml_name_decl("_CRS", aml_ipmi_crs(info, resource))); aml_append(dev, aml_name_decl("_IFT", aml_int(info->interface_type))); aml_append(dev, aml_name_decl("_SRV", aml_int(version))); return dev; } -void build_acpi_ipmi_devices(Aml *scope, BusState *bus) +void build_acpi_ipmi_devices(Aml *scope, BusState *bus, const char *resource) { BusChild *kid; @@ -101,6 +102,6 @@ void build_acpi_ipmi_devices(Aml *scope, BusState *bus) iic = IPMI_INTERFACE_GET_CLASS(obj); memset(&info, 0, sizeof(info)); iic->get_fwinfo(ii, &info); - aml_append(scope, aml_ipmi_device(&info)); + aml_append(scope, aml_ipmi_device(&info, resource)); } } diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 42ecf61..b8a16cf 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1455,7 +1455,7 @@ static void build_isa_devices_aml(Aml *table) } else if (!obj) { error_report("No ISA bus, unable to define IPMI ACPI data"); } else { - build_acpi_ipmi_devices(scope, BUS(obj)); + build_acpi_ipmi_devices(scope, BUS(obj), "\\_SB.PCI0.ISA"); } aml_append(table, scope); diff --git a/include/hw/acpi/ipmi.h b/include/hw/acpi/ipmi.h index ab2bb29..d68bc85 100644 --- a/include/hw/acpi/ipmi.h +++ b/include/hw/acpi/ipmi.h @@ -17,6 +17,6 @@ * bus matches the given bus. The resource is the ACPI resource that * contains the IPMI device, this is required for the I2C CRS. */ -void build_acpi_ipmi_devices(Aml *table, BusState *bus); +void build_acpi_ipmi_devices(Aml *table, BusState *bus, const char *resource); #endif /* HW_ACPI_IPMI_H */ diff --git a/stubs/ipmi.c b/stubs/ipmi.c index 98b6dce..6c71d6c 100644 --- a/stubs/ipmi.c +++ b/stubs/ipmi.c @@ -9,6 +9,6 @@ #include "hw/acpi/ipmi.h" -void build_acpi_ipmi_devices(Aml *table, BusState *bus) +void build_acpi_ipmi_devices(Aml *table, BusState *bus, const char *resource) { }