From patchwork Wed Aug 16 12:51:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?SsO8cmdlbiBHcm/Dnw==?= X-Patchwork-Id: 9903681 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 26263603B5 for ; Wed, 16 Aug 2017 12:55:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 18429289CD for ; Wed, 16 Aug 2017 12:55:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0D3D0289E5; Wed, 16 Aug 2017 12:55:02 +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 lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5CE46289CD for ; Wed, 16 Aug 2017 12:55:01 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dhxoJ-00006Z-By; Wed, 16 Aug 2017 12:52:35 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dhxoH-0008RD-MF for xen-devel@lists.xenproject.org; Wed, 16 Aug 2017 12:52:33 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 09/F6-18997-01044995; Wed, 16 Aug 2017 12:52:32 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrILMWRWlGSWpSXmKPExsVyuP0Ov66Aw5R Ig6VX+C2+b5nM5MDocfjDFZYAxijWzLyk/IoE1ozJr1+yFWwWqVi/7j1zA+MW/i5GTg4JASOJ txP/MXUxcnEICSxklNj3eSozSIJNQFViw/VTrCC2iICSxL1Vk5lAbGaBaIm3v38A2RwcwgJlE qsa0kHCLEDlz1rPg5XwCpgAlW9khpgvL9FxYDILiM0JFJ+84RiYLSRgLLG9p5F9AiP3AkaGVY waxalFZalFuoYmeklFmekZJbmJmTm6hgamermpxcWJ6ak5iUnFesn5uZsYgd5lAIIdjGdPex5 ilORgUhLlDdKaEinEl5SfUpmRWJwRX1Sak1p8iFGGg0NJglfMDignWJSanlqRlpkDDDOYtAQH j5IIb5otUJq3uCAxtzgzHSJ1ilGX49WE/9+YhFjy8vNSpcR5b4HMEAApyijNgxsBC/lLjLJSw ryMQEcJ8RSkFuVmlqDKv2IU52BUEua9CjKFJzOvBG7TK6AjmICOuNI+CeSIkkSElFQDo29Pf6 nfKutrvf1fC6a9cw0UEOrqzDseFbkuYUvRi0yLJ2pdXmpK8ztW7Dz06nnUxXCH566ZganNupe VT8YWzu3b+1nyjVV/175Dxt7XZiy8qiIybekFa8ZtX4y63xzNLXQX1b0j/DHu4tzYU0viFiwr /ZF04HHNhG+fV+dZ2rLu0Cj6HHwvR4mlOCPRUIu5qDgRAA+DoM90AgAA X-Env-Sender: jgross@suse.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1502887952!104635093!1 X-Originating-IP: [195.135.220.15] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10134 invoked from network); 16 Aug 2017 12:52:32 -0000 Received: from mx2.suse.de (HELO mx1.suse.de) (195.135.220.15) by server-7.tower-206.messagelabs.com with DHE-RSA-CAMELLIA256-SHA encrypted SMTP; 16 Aug 2017 12:52:32 -0000 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id E5371AE9A; Wed, 16 Aug 2017 12:52:31 +0000 (UTC) From: Juergen Gross To: xen-devel@lists.xenproject.org Date: Wed, 16 Aug 2017 14:51:59 +0200 Message-Id: <20170816125219.5255-33-jgross@suse.com> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20170816125219.5255-1-jgross@suse.com> References: <20170816125219.5255-1-jgross@suse.com> Cc: Juergen Gross , Suravee Suthikulpanit Subject: [Xen-devel] [PATCH v3 32/52] xen/drivers/passthrough/amd/iommu_acpi.c: let custom parameter parsing routines return errno X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Modify the custom parameter parsing routines in: xen/drivers/passthrough/amd/iommu_acpi.c to indicate whether the parameter value was parsed successfully. Cc: Suravee Suthikulpanit Signed-off-by: Juergen Gross Acked-by: Wei Liu --- xen/drivers/passthrough/amd/iommu_acpi.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthrough/amd/iommu_acpi.c index f4c7206c2a..64d10481d7 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -632,21 +632,23 @@ static u16 __init parse_ivhd_device_extended_range( return dev_length; } -static void __init parse_ivrs_ioapic(char *str) +static int __init parse_ivrs_ioapic(const char *str) { const char *s = str; unsigned long id; unsigned int seg, bus, dev, func; unsigned int idx; - ASSERT(*s == '['); + if ( *s != '[' ) + return -EINVAL; + id = simple_strtoul(s + 1, &s, 0); if ( *s != ']' || *++s != '=' ) - return; + return -EINVAL; s = parse_pci(s + 1, &seg, &bus, &dev, &func); if ( !s || *s ) - return; + return -EINVAL; idx = ioapic_id_to_index(id); if ( idx == MAX_IO_APICS ) @@ -655,7 +657,7 @@ static void __init parse_ivrs_ioapic(char *str) if ( idx == MAX_IO_APICS ) { printk(XENLOG_ERR "Error: %s: Too many IO APICs.\n", __func__); - return; + return -EINVAL; } } @@ -663,28 +665,34 @@ static void __init parse_ivrs_ioapic(char *str) ioapic_sbdf[idx].seg = seg; ioapic_sbdf[idx].id = id; ioapic_sbdf[idx].cmdline = true; + + return 0; } custom_param("ivrs_ioapic[", parse_ivrs_ioapic); -static void __init parse_ivrs_hpet(char *str) +static int __init parse_ivrs_hpet(const char *str) { const char *s = str; unsigned long id; unsigned int seg, bus, dev, func; - ASSERT(*s == '['); + if ( *s != '[' ) + return -EINVAL; + id = simple_strtoul(s + 1, &s, 0); if ( id != (typeof(hpet_sbdf.id))id || *s != ']' || *++s != '=' ) - return; + return -EINVAL; s = parse_pci(s + 1, &seg, &bus, &dev, &func); if ( !s || *s ) - return; + return -EINVAL; hpet_sbdf.id = id; hpet_sbdf.bdf = PCI_BDF(bus, dev, func); hpet_sbdf.seg = seg; hpet_sbdf.init = HPET_CMDL; + + return 0; } custom_param("ivrs_hpet[", parse_ivrs_hpet);