From patchwork Wed Jun 7 06:25:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 9770595 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B4C7660393 for ; Wed, 7 Jun 2017 06:25:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A0BA320408 for ; Wed, 7 Jun 2017 06:25:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 957D12679B; Wed, 7 Jun 2017 06:25:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1694B208C2 for ; Wed, 7 Jun 2017 06:25:52 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8D3B66E1D6; Wed, 7 Jun 2017 06:25:50 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id B12206E1D6 for ; Wed, 7 Jun 2017 06:25:48 +0000 (UTC) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga105.fm.intel.com with ESMTP; 06 Jun 2017 23:25:48 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.39,310,1493708400"; d="scan'208"; a="1157513608" Received: from orsmsx104.amr.corp.intel.com ([10.22.225.131]) by fmsmga001.fm.intel.com with ESMTP; 06 Jun 2017 23:25:47 -0700 Received: from orsmsx154.amr.corp.intel.com (10.22.226.12) by ORSMSX104.amr.corp.intel.com (10.22.225.131) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 6 Jun 2017 23:25:47 -0700 Received: from orsmsx107.amr.corp.intel.com ([169.254.1.201]) by ORSMSX154.amr.corp.intel.com ([169.254.11.119]) with mapi id 14.03.0319.002; Tue, 6 Jun 2017 23:25:47 -0700 From: "Williams, Dan J" To: "hch@lst.de" , "andriy.shevchenko@linux.intel.com" Thread-Topic: [PATCH v3 1/5] acpi, nfit: Switch to use new generic UUID API Thread-Index: AQHS3h6pWL9h3uSJiUqLV8h+0MapBKIXPOAAgAIqBAA= Date: Wed, 7 Jun 2017 06:25:46 +0000 Message-ID: <1496816744.6978.6.camel@intel.com> References: <20170605164046.82676-1-andriy.shevchenko@linux.intel.com> <20170605164046.82676-2-andriy.shevchenko@linux.intel.com> <1496682642.22624.23.camel@linux.intel.com> <20170605212250.GA3772@lst.de> In-Reply-To: <20170605212250.GA3772@lst.de> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.254.177.86] Content-ID: MIME-Version: 1.0 Cc: "intel-gfx@lists.freedesktop.org" , "rjw@rjwysocki.net" , "linux-kernel@vger.kernel.org" , "linux-acpi@vger.kernel.org" , "bp@suse.de" , "mika.westerberg@linux.intel.com" Subject: Re: [Intel-gfx] [PATCH v3 1/5] acpi, nfit: Switch to use new generic UUID API X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP On Mon, 2017-06-05 at 23:22 +0200, Christoph Hellwig wrote: > On Mon, Jun 05, 2017 at 08:10:42PM +0300, Andy Shevchenko wrote: > > > > I hope Christoph can replace old version of this series with new > > one in > > his uuid branch. URL in cover letter, repeating for your > > convenience: > > > > [1]: git://git.infradead.org/users/hch/uuid.git > > Yeah, but I had to drop it again after noticing the guid_equals bits, > and after not fixing up the GUID -> GUID_INIT rename. > > for-next in the above repo should have the proper base now, and acpi > has the ACPI bits for Dan to test. With one compile fix below the 'acpi' branch works for me. Please feel free to add: Tested-by: Dan Williams ...to the changes that touch drivers/acpi/nfit/, drivers/nvdimm/, and tools/testing/nvdimm, but I'm ok if you omit it if the branch is about to go immutable. Speaking of which, let me know when it does go immutable because the new libnvdimm enabling for ACPI 6.2 and EFI 2.7 needs some new guid handling code. Please apply the following or fold it into commit c793ed7ccf42 "ACPI: Switch to use generic guid_t in acpi_evaluate_dsm()" ----->8----- From 18b82755ea839bdc94127aebf0e2f788c19224f3 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 6 Jun 2017 22:41:40 -0700 Subject: [PATCH] tools/testing/nvdimm: guid_t compile fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix up the declaration of the nfit_test_evaluate_dsm_fn type, to avoid compile errors of the form: tools/testing/nvdimm/test/iomap.c: In function ‘__wrap_acpi_evaluate_dsm’: tools/testing/nvdimm/test/iomap.c:382:35: error: passing argument 2 of ‘ops->evaluate_dsm’ from incompatible pointer type obj = ops->evaluate_dsm(handle, guid, rev, func, argv4); ^~~~ Signed-off-by: Dan Williams --- tools/testing/nvdimm/test/nfit_test.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/testing/nvdimm/test/nfit_test.h b/tools/testing/nvdimm/test/nfit_test.h index f54c0032c6ff..c4e80104165a 100644 --- a/tools/testing/nvdimm/test/nfit_test.h +++ b/tools/testing/nvdimm/test/nfit_test.h @@ -13,6 +13,7 @@ #ifndef __NFIT_TEST_H__ #define __NFIT_TEST_H__ #include +#include #include #include @@ -36,7 +37,7 @@ typedef void *acpi_handle; typedef struct nfit_test_resource *(*nfit_test_lookup_fn)(resource_size_t); typedef union acpi_object *(*nfit_test_evaluate_dsm_fn)(acpi_handle handle, - const u8 *uuid, u64 rev, u64 func, union acpi_object *argv4); + const guid_t *guid, u64 rev, u64 func, union acpi_object *argv4); void __iomem *__wrap_ioremap_nocache(resource_size_t offset, unsigned long size); void __wrap_iounmap(volatile void __iomem *addr);