From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752248AbcAZU5r (ORCPT ); Tue, 26 Jan 2016 15:57:47 -0500 Received: from mail.skyhub.de ([78.46.96.112]:41553 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751694AbcAZU5j (ORCPT ); Tue, 26 Jan 2016 15:57:39 -0500 From: Borislav Petkov To: Ingo Molnar Cc: LKML , Andrew Morton , Dan Williams , Ingo Molnar , Jakub Sitnicki , Jiang Liu , Linus Torvalds , linux-arch@vger.kernel.org, linux-mm , "Rafael J. Wysocki" , Vinod Koul Subject: [PATCH 02/17] resource: Handle resource flags properly Date: Tue, 26 Jan 2016 21:57:18 +0100 Message-Id: <1453841853-11383-3-git-send-email-bp@alien8.de> X-Mailer: git-send-email 2.3.5 In-Reply-To: <1453841853-11383-1-git-send-email-bp@alien8.de> References: <1453841853-11383-1-git-send-email-bp@alien8.de> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Toshi Kani I/O resource flags consist of I/O resource types and modifier bits. Therefore, checking an I/O resource type in 'flags' must be performed with a bitwise operation. Fix find_next_iomem_res() and region_intersects() that simply compare 'flags' against a given value. Also change __request_region() to set 'res->flags' from resource_type() and resource_ext_type() of the parent, so that children nodes will inherit the extended I/O resource type. Signed-off-by: Toshi Kani Cc: Andrew Morton Cc: Dan Williams Cc: Ingo Molnar Cc: Jakub Sitnicki Cc: Jiang Liu Cc: Linus Torvalds Cc: linux-arch@vger.kernel.org Cc: linux-mm Cc: "Rafael J. Wysocki" Cc: Vinod Koul Link: http://lkml.kernel.org/r/1452020081-26534-2-git-send-email-toshi.kani@hpe.com Signed-off-by: Borislav Petkov --- kernel/resource.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/kernel/resource.c b/kernel/resource.c index 09c0597840b0..96afc8027487 100644 --- a/kernel/resource.c +++ b/kernel/resource.c @@ -358,7 +358,7 @@ static int find_next_iomem_res(struct resource *res, char *name, read_lock(&resource_lock); for (p = iomem_resource.child; p; p = next_resource(p, sibling_only)) { - if (p->flags != res->flags) + if ((p->flags & res->flags) != res->flags) continue; if (name && strcmp(p->name, name)) continue; @@ -519,7 +519,8 @@ int region_intersects(resource_size_t start, size_t size, const char *name) read_lock(&resource_lock); for (p = iomem_resource.child; p ; p = p->sibling) { - bool is_type = strcmp(p->name, name) == 0 && p->flags == flags; + bool is_type = strcmp(p->name, name) == 0 && + ((p->flags & flags) == flags); if (start >= p->start && start <= p->end) is_type ? type++ : other++; @@ -1071,7 +1072,7 @@ struct resource * __request_region(struct resource *parent, res->name = name; res->start = start; res->end = start + n - 1; - res->flags = resource_type(parent); + res->flags = resource_type(parent) | resource_ext_type(parent); res->flags |= IORESOURCE_BUSY | flags; write_lock(&resource_lock); -- 2.3.5