From patchwork Thu Jul 24 13:00:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 34214 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5C6CD20C7F for ; Thu, 24 Jul 2014 13:03:45 +0000 (UTC) Received: by mail-wi0-f197.google.com with SMTP id bs8sf2693716wib.8 for ; Thu, 24 Jul 2014 06:03:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=FoyVusj90p8+MCbu25vz9scKj1sCmVFZG/v3ruu0awU=; b=DkHPoXoQWQTIAV0pTgOfA7YJiS/AhpXnspGw9N3poeplle8GCUqeZ7vDpM6qAzlR2S luLidXd6Q6Ksrdvu4/dhgRN9DY7E7o7yNKBp5m0A6LjiOmtmF2PEVzsncZaRa4kdiJ9X a3Fs9cFCokVokikJq/BLHwy0hIOhi/Slhxv6z1bHpXPydgR+pSDO1Zecn2c1PJsBB/bZ CaJHff85ALOlLmbatYfGjVCyTMOPge4X4H9ivUt5IBmfBWEOxMxyMzXUxRQy0xic3Nv7 3ZX/x/XaMmrduZRcO/hPQwQ+i++q4ds302v9E/jRnpfxvzlxCCUBTRP0WxNZJGWRIctG ESgg== X-Gm-Message-State: ALoCoQnsy/H0QGd6pXlbeJ/6o3JXSxS9wvhqxS18b+9ROXsNTF724GWoAcBbBFXSApY/3AsTkis1 X-Received: by 10.152.7.71 with SMTP id h7mr887295laa.2.1406207021993; Thu, 24 Jul 2014 06:03:41 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.20.41 with SMTP id k9ls145405lae.0.gmail; Thu, 24 Jul 2014 06:03:41 -0700 (PDT) X-Received: by 10.152.27.66 with SMTP id r2mr9304447lag.53.1406207021680; Thu, 24 Jul 2014 06:03:41 -0700 (PDT) Received: from mail-vc0-f182.google.com (mail-vc0-f182.google.com [209.85.220.182]) by mx.google.com with ESMTPS id xt7si4840187veb.104.2014.07.24.06.03.41 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 24 Jul 2014 06:03:41 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.182 as permitted sender) client-ip=209.85.220.182; Received: by mail-vc0-f182.google.com with SMTP id hy4so4949551vcb.27 for ; Thu, 24 Jul 2014 06:03:41 -0700 (PDT) X-Received: by 10.52.120.38 with SMTP id kz6mr10006602vdb.86.1406207019735; Thu, 24 Jul 2014 06:03:39 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp363021vcb; Thu, 24 Jul 2014 06:03:39 -0700 (PDT) X-Received: by 10.66.122.36 with SMTP id lp4mr10181673pab.82.1406207018812; Thu, 24 Jul 2014 06:03:38 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id wt2si5940461pbc.82.2014.07.24.06.03.35 for ; Thu, 24 Jul 2014 06:03:36 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759334AbaGXNDW (ORCPT + 13 others); Thu, 24 Jul 2014 09:03:22 -0400 Received: from mail-pd0-f181.google.com ([209.85.192.181]:56896 "EHLO mail-pd0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758645AbaGXNDT (ORCPT ); Thu, 24 Jul 2014 09:03:19 -0400 Received: by mail-pd0-f181.google.com with SMTP id g10so3646858pdj.12 for ; Thu, 24 Jul 2014 06:03:18 -0700 (PDT) X-Received: by 10.66.66.42 with SMTP id c10mr9955619pat.111.1406206998785; Thu, 24 Jul 2014 06:03:18 -0700 (PDT) Received: from localhost ([183.247.163.231]) by mx.google.com with ESMTPSA id j6sm7385554pdr.9.2014.07.24.06.03.12 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 24 Jul 2014 06:03:18 -0700 (PDT) From: Hanjun Guo To: Catalin Marinas , "Rafael J. Wysocki" , Mark Rutland Cc: Graeme Gregory , Arnd Bergmann , Grant Likely , Sudeep Holla , Will Deacon , Jason Cooper , Marc Zyngier , Bjorn Helgaas , Daniel Lezcano , Mark Brown , Robert Richter , Lv Zheng , Robert Moore , Lorenzo Pieralisi , Liviu Dudau , Randy Dunlap , Charles.Garcia-Tobin@arm.com, linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linaro-acpi-private@linaro.org, Ashwin Chaugule , Hanjun Guo Subject: [PATCH 13/19] ACPI / table: Add new function to get table entries Date: Thu, 24 Jul 2014 21:00:19 +0800 Message-Id: <1406206825-15590-14-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1406206825-15590-1-git-send-email-hanjun.guo@linaro.org> References: <1406206825-15590-1-git-send-email-hanjun.guo@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: hanjun.guo@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.182 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Ashwin Chaugule The acpi_table_parse() function has a callback that passes a pointer to a table_header. Add a new function which takes this pointer and parses its entries. This eliminates the need to re-traverse all the tables for each call. e.g. as in acpi_table_parse_madt() which is normally called after acpi_table_parse(). Signed-off-by: Ashwin Chaugule Signed-off-by: Hanjun Guo --- drivers/acpi/tables.c | 70 +++++++++++++++++++++++++++++++++++-------------- include/linux/acpi.h | 4 +++ 2 files changed, 54 insertions(+), 20 deletions(-) diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c index 8bb8159..e6455c9 100644 --- a/drivers/acpi/tables.c +++ b/drivers/acpi/tables.c @@ -229,17 +229,14 @@ void acpi_table_print_madt_entry(struct acpi_subtable_header *header) } int __init -acpi_table_parse_entries(char *id, - unsigned long table_size, - int entry_id, - acpi_tbl_entry_handler handler, - unsigned int max_entries) +acpi_parse_entries(unsigned long table_size, + acpi_tbl_entry_handler handler, + struct acpi_table_header *table_header, + int entry_id, unsigned int max_entries) { - struct acpi_table_header *table_header = NULL; struct acpi_subtable_header *entry; - unsigned int count = 0; + int count = 0; unsigned long table_end; - acpi_size tbl_size; if (acpi_disabled) return -ENODEV; @@ -247,13 +244,11 @@ acpi_table_parse_entries(char *id, if (!handler) return -EINVAL; - if (strncmp(id, ACPI_SIG_MADT, 4) == 0) - acpi_get_table_with_size(id, acpi_apic_instance, &table_header, &tbl_size); - else - acpi_get_table_with_size(id, 0, &table_header, &tbl_size); + if (!table_size) + return -EINVAL; if (!table_header) { - pr_warn("%4.4s not present\n", id); + pr_warn("Table header not present\n"); return -ENODEV; } @@ -268,31 +263,66 @@ acpi_table_parse_entries(char *id, table_end) { if (entry->type == entry_id && (!max_entries || count++ < max_entries)) - if (handler(entry, table_end)) + if (handler(entry, table_end)) { + count = -EINVAL; goto err; + } /* * If entry->length is 0, break from this loop to avoid * infinite loop. */ if (entry->length == 0) { - pr_err("[%4.4s:0x%02x] Invalid zero length\n", id, entry_id); + pr_err("[0x%02x] Invalid zero length\n", entry_id); + count = -EINVAL; goto err; } entry = (struct acpi_subtable_header *) ((unsigned long)entry + entry->length); } + if (max_entries && count > max_entries) { - pr_warn("[%4.4s:0x%02x] ignored %i entries of %i found\n", - id, entry_id, count - max_entries, count); + pr_warn("[0x%02x] ignored %i entries of %i found\n", + entry_id, count - max_entries, count); } - early_acpi_os_unmap_memory((char *)table_header, tbl_size); - return count; err: + return count; +} + +int __init +acpi_table_parse_entries(char *id, + unsigned long table_size, + int entry_id, + acpi_tbl_entry_handler handler, + unsigned int max_entries) +{ + struct acpi_table_header *table_header = NULL; + acpi_size tbl_size; + int count; + + if (acpi_disabled) + return -ENODEV; + + if (!handler) + return -EINVAL; + + if (strncmp(id, ACPI_SIG_MADT, 4) == 0) + acpi_get_table_with_size(id, acpi_apic_instance, &table_header, &tbl_size); + else + acpi_get_table_with_size(id, 0, &table_header, &tbl_size); + + if (!table_header) { + pr_warn("%4.4s not present\n", id); + return -ENODEV; + } + + count = acpi_parse_entries(table_size, handler, table_header, + entry_id, max_entries); + early_acpi_os_unmap_memory((char *)table_header, tbl_size); - return -EINVAL; + return count; } int __init diff --git a/include/linux/acpi.h b/include/linux/acpi.h index ad6c30f..95540e7 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -124,6 +124,10 @@ int acpi_numa_init (void); int acpi_table_init (void); int acpi_table_parse(char *id, acpi_tbl_table_handler handler); +int __init acpi_parse_entries(unsigned long table_size, + acpi_tbl_entry_handler handler, + struct acpi_table_header *table_header, + int entry_id, unsigned int max_entries); int __init acpi_table_parse_entries(char *id, unsigned long table_size, int entry_id, acpi_tbl_entry_handler handler,