From patchwork Tue Dec 18 04:23:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 10734785 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B2C266C5 for ; Tue, 18 Dec 2018 04:36:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A2DA42A77F for ; Tue, 18 Dec 2018 04:36:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9737A2A784; Tue, 18 Dec 2018 04:36:12 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 316DB2A77F for ; Tue, 18 Dec 2018 04:36:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 064638E0004; Mon, 17 Dec 2018 23:36:11 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 013138E0001; Mon, 17 Dec 2018 23:36:10 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E99B18E0004; Mon, 17 Dec 2018 23:36:10 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by kanga.kvack.org (Postfix) with ESMTP id A96D58E0001 for ; Mon, 17 Dec 2018 23:36:10 -0500 (EST) Received: by mail-pf1-f200.google.com with SMTP id 68so14025034pfr.6 for ; Mon, 17 Dec 2018 20:36:10 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:subject:from :to:cc:date:message-id:in-reply-to:references:user-agent :mime-version:content-transfer-encoding; bh=BxleHWxGAny2vwiQobBNCIcz5w7bsmwYXoWxG9f9QeE=; b=Wrn5hR+4W4Z/TJQwtxBoXeqnExlWIbm67aJ6pIKeKIUqGM3xfVX1VcFaET2KHgmWp2 ka4RwCuqOnDC40uA4g9TSe53Vu2xA0fzFyDyXbAssuwJn6KA/kixIA5k1bGAJ2//dRyL s2qM23KE8txUdOOvf2VhimDyohobkQcaCnoTPnochjnQlTktrSHiJc4XvKDfJL5nLY/6 VIC+OcdeoA/fGxQxpA8N6pyH+c2DXHCsRH/X4UFygQlrLiRJYQAC8/xajdcP9Z5nTdQN FyVJ+wACcdz0KFMNZ6mfST6KxLbPAIaTYbM8BFOiaPeupsqH3E9dJXwIgGSfanu751r7 Gonw== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of dan.j.williams@intel.com designates 192.55.52.120 as permitted sender) smtp.mailfrom=dan.j.williams@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Gm-Message-State: AA+aEWZzkFU66y6/jeSHvL+iCe+8xKeVbQBB2G3E1YoSvZ8bsk1lpzfx AzpyEXi3nq4QzB96F2CCkiOfgcFFY7ybC5wYdsDkQ88v5RNuANyMZDwPD44jf2sxuQc+IbNTgQk NRm2714xZTThvhE4BlBK4dPwa5MyHoTUMS2NFelKXRFOFoEcj+6U8UZ/DVPSWJ6Z3CQ== X-Received: by 2002:a63:3d49:: with SMTP id k70mr14103058pga.191.1545107770299; Mon, 17 Dec 2018 20:36:10 -0800 (PST) X-Google-Smtp-Source: AFSGD/VKofB5JBRpbbOsobTyiUnfPBaoWN8PT2a9mi63FPPnjX4YU4TRaZbLJYD2cEUttl252USR X-Received: by 2002:a63:3d49:: with SMTP id k70mr14103035pga.191.1545107769580; Mon, 17 Dec 2018 20:36:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545107769; cv=none; d=google.com; s=arc-20160816; b=nM5Aq5fUIojjiUMpUdijTztLHEflt/XhsR5KWqk2hl4Jd47RYgfwWAftT71JfPvmp7 p4lJpJaAZChp8+LqUfLwREhAsx4z2CbLkpdatNyH4tMi3Vsv0dd3NbHwpvAcYlNUzpRg EOiuaBqDhXDOWR7Wn+VzhF3GLyrionasbUTKnpWWGFRcH/Y9sj0C1BT5J1xovi40jQSm iwJfgI09csNx98nRK9V+8CTbUTUo9lbS0bUtqCgXhqQokTYUKjjgupB0byi/WSEZfxOU uxMMNmeIGNrwKhcAqpZPMI8fpiacv33+JNKgu3n/Ieft9ji/ssjB+x5va4h08Ln5qXcz IKkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:message-id:date:cc:to:from:subject; bh=BxleHWxGAny2vwiQobBNCIcz5w7bsmwYXoWxG9f9QeE=; b=WAc3NnFc/G73C3kmRk0zrgE9QIz8NSlWFmV/HWe1We5NwdVLq6SeSUasI+zWBNUkdm WcECEzipO+B7w7Vh8POvcEtAm4u81ssqDDf2Poo2MZmCEP2RSYpsKKdyVzFF8gEG2wNc Ogaawr8/XhqbLQWwS9wie6P3DkWjkIIrWVT/4IY9/HRtcjZmfCd+u1lTZwdoYLa4+44y sBkQw7zwso8x5c9LKUPblo+HUecW4soxqXD/cSRzz61AL6YKySz+Dn21GdH2rpGYCGdH VBHmJq58ky7NtKYVouqLlBX61pzSq/xpBXQLo21tKqh/bNg8Fp920bKVKs2jwFGuIjId BJbg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of dan.j.williams@intel.com designates 192.55.52.120 as permitted sender) smtp.mailfrom=dan.j.williams@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga04.intel.com (mga04.intel.com. [192.55.52.120]) by mx.google.com with ESMTPS id 97si12335161plm.312.2018.12.17.20.36.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Dec 2018 20:36:09 -0800 (PST) Received-SPF: pass (google.com: domain of dan.j.williams@intel.com designates 192.55.52.120 as permitted sender) client-ip=192.55.52.120; Authentication-Results: mx.google.com; spf=pass (google.com: domain of dan.j.williams@intel.com designates 192.55.52.120 as permitted sender) smtp.mailfrom=dan.j.williams@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Dec 2018 20:36:09 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,367,1539673200"; d="scan'208";a="284353351" Received: from dwillia2-desk3.jf.intel.com (HELO dwillia2-desk3.amr.corp.intel.com) ([10.54.39.16]) by orsmga005.jf.intel.com with ESMTP; 17 Dec 2018 20:36:08 -0800 Subject: [PATCH v6 2/6] acpi: Add HMAT to generic parsing tables From: Dan Williams To: akpm@linux-foundation.org Cc: Keith Busch , peterz@infradead.org, dave.hansen@linux.intel.com, linux-mm@kvack.org, x86@kernel.org, linux-kernel@vger.kernel.org, mgorman@suse.de Date: Mon, 17 Dec 2018 20:23:33 -0800 Message-ID: <154510701343.1941238.7745758103869136625.stgit@dwillia2-desk3.amr.corp.intel.com> In-Reply-To: <154510700291.1941238.817190985966612531.stgit@dwillia2-desk3.amr.corp.intel.com> References: <154510700291.1941238.817190985966612531.stgit@dwillia2-desk3.amr.corp.intel.com> User-Agent: StGit/0.18-2-gc94f MIME-Version: 1.0 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: Keith Busch The HMAT table header has different field lengths than the existing parsing uses. Add the HMAT type to the parsing rules so it may be generically parsed. Signed-off-by: Keith Busch Signed-off-by: Dan Williams --- drivers/acpi/tables.c | 9 +++++++++ include/linux/acpi.h | 1 + 2 files changed, 10 insertions(+) diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c index e9643b4267c7..bc1addf715dc 100644 --- a/drivers/acpi/tables.c +++ b/drivers/acpi/tables.c @@ -51,6 +51,7 @@ static int acpi_apic_instance __initdata; enum acpi_subtable_type { ACPI_SUBTABLE_COMMON, + ACPI_SUBTABLE_HMAT, }; struct acpi_subtable_entry { @@ -232,6 +233,8 @@ acpi_get_entry_type(struct acpi_subtable_entry *entry) switch (entry->type) { case ACPI_SUBTABLE_COMMON: return entry->hdr->common.type; + case ACPI_SUBTABLE_HMAT: + return entry->hdr->hmat.type; } return 0; } @@ -242,6 +245,8 @@ acpi_get_entry_length(struct acpi_subtable_entry *entry) switch (entry->type) { case ACPI_SUBTABLE_COMMON: return entry->hdr->common.length; + case ACPI_SUBTABLE_HMAT: + return entry->hdr->hmat.length; } return 0; } @@ -252,6 +257,8 @@ acpi_get_subtable_header_length(struct acpi_subtable_entry *entry) switch (entry->type) { case ACPI_SUBTABLE_COMMON: return sizeof(entry->hdr->common); + case ACPI_SUBTABLE_HMAT: + return sizeof(entry->hdr->hmat); } return 0; } @@ -259,6 +266,8 @@ acpi_get_subtable_header_length(struct acpi_subtable_entry *entry) static enum acpi_subtable_type __init acpi_get_subtable_type(char *id) { + if (strncmp(id, ACPI_SIG_HMAT, 4) == 0) + return ACPI_SUBTABLE_HMAT; return ACPI_SUBTABLE_COMMON; } diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 18805a967c70..4373f5ba0f95 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -143,6 +143,7 @@ enum acpi_address_range_id { /* Table Handlers */ union acpi_subtable_headers { struct acpi_subtable_header common; + struct acpi_hmat_structure hmat; }; typedef int (*acpi_tbl_table_handler)(struct acpi_table_header *table);