From patchwork Thu Jan 21 19:16:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Moritz Fischer X-Patchwork-Id: 12037433 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 51C1EC433DB for ; Thu, 21 Jan 2021 19:17:58 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DEE7323136 for ; Thu, 21 Jan 2021 19:17:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DEE7323136 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=MWJZQqc0tOoOEHYKUp51LFlDuUeKKHH6l930bXD6ioo=; b=VdtJgrUbZGdO7JULa/dCXH+/ro a5kKYPvwtOZKxEg91cD+TL1+3qewIH/BUPL+ghZVPdrAjPIPUF+P/ingy0mU0lgFugu3qlzzwNkQy sxKe4/CImSMUpohZrt+FUCJH9sQ8wPD/U+02Rx4SRmpicBkXD0WlSQ3IilWjlie9kWWJ3d8IaWado A6zh/gFQqYjmXJD/ZuStQMNYz0lD6teATTSfeUynM4g2K4YUxPZ400tEbjJ3eRO3tNl6x7mj+zBx1 hXf6I8BS01WcTdR+/sz+JdLjxOERYWi2s9kLM5wjV6hV3Pn73TV1mRLJLP/Yorxu2zIXnWqpfsiGt 0oBfIMZw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l2fRP-0006jW-3R; Thu, 21 Jan 2021 19:16:23 +0000 Received: from mail-pl1-f170.google.com ([209.85.214.170]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l2fRL-0006j3-KL for linux-arm-kernel@lists.infradead.org; Thu, 21 Jan 2021 19:16:20 +0000 Received: by mail-pl1-f170.google.com with SMTP id 31so1813928plb.10 for ; Thu, 21 Jan 2021 11:16:17 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=woffDF3uhRUDrdb3LU2Pk/FCA9mpI3Ytb8KoYeIYJeA=; b=Zq8ARtkYmU0odYVRUJmCCbh+gsmohy9HhstKK0JJQxT50Mlm5MqHFMUrLGUoj682pe nmw6SnNjoOn63hB3K+VgTIlJ+LePwDQf7N2IBVGEW8ZgCmOXSVX1fNfVqBEWwUlOxKBH JJ72UmiJE5GkCmX8e67K82qNTUp1W9zAQrdvecqQvnr4R4K78jsP1J/O2OhXq93AoQ60 qYiQVGyHv/yjCbVlb2FUv+Ts88I1Y5JqyHC9PVirgLzoX1Xhqhx+yUvOjzQjktzkz1KW AY0pUiwl77u/uBy+9zpRaMBZaDQzuNwZttFjoTX6vCEAcI1xe6EmZ8YYLh8DaOJfZU9g 3PKQ== X-Gm-Message-State: AOAM532G8t33kMvI7J+dm16fZBSflzxg8PLn2f0xTTvetGhwXwPMbJT8 BxIlhakoZC80QdwRtNdPPA8= X-Google-Smtp-Source: ABdhPJzI8AJqE+iWCmW+gyRA1cuwSUSwg+34G/hZ8dWOKvbeMCOrdJpb6lBYekcwpzJj0GgfI7rBMw== X-Received: by 2002:a17:902:6b0a:b029:dc:31af:8dc3 with SMTP id o10-20020a1709026b0ab02900dc31af8dc3mr1144525plk.41.1611256576405; Thu, 21 Jan 2021 11:16:16 -0800 (PST) Received: from localhost ([2601:647:5b00:1162:1ac0:17a6:4cc6:d1ef]) by smtp.gmail.com with ESMTPSA id w7sm6270590pfb.62.2021.01.21.11.16.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Jan 2021 11:16:15 -0800 (PST) From: Moritz Fischer To: lorenzo.pieralisi@arm.com Subject: [PATCH] ACPI/IORT: Do not blindly trust DMA masks from firmware Date: Thu, 21 Jan 2021 11:16:12 -0800 Message-Id: <20210121191612.90387-1-mdf@kernel.org> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210121_141619_675988_127A32F8 X-CRM114-Status: GOOD ( 16.33 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: guohanjun@huawei.com, rjw@rjwysocki.net, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, Moritz Fischer , moritzf@google.com, sudeep.holla@arm.com, will@kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Address issue observed on real world system with suboptimal IORT table where DMA masks of PCI devices would get set to 0 as result. iort_dma_setup() would query the root complex' IORT entry for a DMA mask, and use that over the one the device has been configured with earlier. Ideally we want to use the minimum mask of what the IORT contains for the root complex and what the device was configured with, but never 0. Fixes: 5ac65e8c8941 ("ACPI/IORT: Support address size limit for root complexes") Signed-off-by: Moritz Fischer --- Hi all, not sure I'm doing this right, but I think the current behavior (while a corner case) seems to also fail for 32 bit devices if the IORT specifies 64 bit. It works on my test system now with a 32 bit device. Open to suggestions for better solutions (and maybe the nc_dma_get_range() should have the same sanity check?) Thanks, Moritz --- drivers/acpi/arm64/iort.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c index d4eac6d7e9fb..c48eabf8c121 100644 --- a/drivers/acpi/arm64/iort.c +++ b/drivers/acpi/arm64/iort.c @@ -1126,6 +1126,11 @@ static int rc_dma_get_range(struct device *dev, u64 *size) rc = (struct acpi_iort_root_complex *)node->node_data; + if (!rc->memory_address_limit) { + dev_warn(dev, "Root complex has broken memory_address_limit\n"); + return -EINVAL; + } + *size = rc->memory_address_limit >= 64 ? U64_MAX : 1ULL<memory_address_limit; @@ -1172,9 +1177,9 @@ void iort_dma_setup(struct device *dev, u64 *dma_addr, u64 *dma_size) */ end = dmaaddr + size - 1; mask = DMA_BIT_MASK(ilog2(end) + 1); - dev->bus_dma_limit = end; - dev->coherent_dma_mask = mask; - *dev->dma_mask = mask; + dev->bus_dma_limit = min_not_zero(dev->bus_dma_limit, end); + dev->coherent_dma_mask = min_not_zero(dev->coherent_dma_mask, mask); + *dev->dma_mask = min_not_zero(*dev->dma_mask, mask); } *dma_addr = dmaaddr;