From patchwork Tue Sep 28 04:45:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 514768 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp4779980jao; Mon, 27 Sep 2021 21:45:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwt2KGA71U9/f7RWAqF8Eyb3y0dLDorCOC3Y/Ctf4DJdA1OKBPn5Qg/g8JN4HdbC+yXis8k X-Received: by 2002:a17:90b:950:: with SMTP id dw16mr3182479pjb.25.1632804319666; Mon, 27 Sep 2021 21:45:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632804319; cv=none; d=google.com; s=arc-20160816; b=mXn2kyEt1yNp2hX7/PVC95vS4nl1HE/U0BBKnDbXdGLUocKYTxF8H/QRLoqPw9EAVu GlmnpCADBxBNEXCdN3MKtdjleXCwjQIwR4WZhNlxWvXbYrK+exTBXvXtm9ptj+m1kGnA tHcVFJTv3S0afXtPcqJ96VxJsxU7ZsL9nhz+IXKGzXZKplc6yroyeDK86CvmIpCOWXPg WHlWeLRpOl1HNRCTm8Gvo8qqOJsby3WOPgZ6fdKzaOglWKI3Lr9XI6QdubEU3ijzkQWG 7G3j2sc4oQIU2bfv6UCg8WzBtB4wpHm2I2N6Q6go9jXs8BtEJzOtrpZQ/ceoxMZwFxAu w0/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=vRzGhEMXchIY55D13bcq5jzx75HCS4FbYSUPBwMzgvM=; b=WVEnVellRQAuU7ZHhaIh3sbRU+Ktg/hZ0/l/k2HHZ1aoF9GMfYSc0WyEdZDtIQ2fzg r5RN6S9qXmkKJsDhVO61tgg/0D0tD+frLCX7Mzb7u/LHcp8ZACTi10cIjWP5ZremEvwR 8hWQ1uzWdcQeWneGXtDK2CK2EvsBgZRW3JRh7rWHM1jXIFRTv76xByDs5Na7Yr8wH49J SjUCWlgCvlOkCfsvQR6md+Am/IG7tvgjLAGw7RNI6eixfyubcEFZCcVQC6Ydi+xDxkmk 5B/tvqozfXFALbI5nbTjNPjuNn0Y/EgUTmEs2K987CZX1G6g6wB9f4jgHs5Jov7H5WBB iSLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QrJ++pvD; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q10si1231220pjj.109.2021.09.27.21.45.19; Mon, 27 Sep 2021 21:45:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QrJ++pvD; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238913AbhI1Eq4 (ORCPT + 17 others); Tue, 28 Sep 2021 00:46:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57014 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235159AbhI1Eqy (ORCPT ); Tue, 28 Sep 2021 00:46:54 -0400 Received: from mail-oo1-xc35.google.com (mail-oo1-xc35.google.com [IPv6:2607:f8b0:4864:20::c35]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CAB6DC061575 for ; Mon, 27 Sep 2021 21:45:15 -0700 (PDT) Received: by mail-oo1-xc35.google.com with SMTP id e16-20020a4ad250000000b002b5e1f1bc78so251058oos.11 for ; Mon, 27 Sep 2021 21:45:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vRzGhEMXchIY55D13bcq5jzx75HCS4FbYSUPBwMzgvM=; b=QrJ++pvDZOLabP7PuFL2zHxkYIasTvmcBxrj3qji7l1em1YvOFnDkmWWuB4w1epuK1 n6+V0/DN9brplMD1Lpmr45unx491w5gaJv0j7SxaFmUD2xd8N8F7lm7XcRyb8VCffYAy F+4WkQldcGmQokS05/O97mgBVXgmfqrws2708UvAjtn4ygTJEf2U9oxajxjutCraPU/+ 4kJqF0vuMchIY40xiiJjb6nKo0OPN8fSVTg0eykIEJxymvARljxX67n4zEvtVBwC1MNO HLGghTiiiXSdGw9tA3PPxXDV85hTQ7nFXw0CjThJfwOujkP0umIzFWUM4aS3kfgQjYfn Gc/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vRzGhEMXchIY55D13bcq5jzx75HCS4FbYSUPBwMzgvM=; b=aOitJvv83QOYiWCldpB2yhpGpNvXG47U33UCr/682USqUo6DfbwZiDa7A/yj5gbtUE GDdHY7nqqfH6PMa3j6fPbkG9E8oZbuoZ1F6ekQ6ivuLvGcaoXC9AkyIECVc0nFFwTqY2 XhIQznrZ/Fx0FkdSUmiJBXROM/1Z4m5D4J9QsDPyEnjOZEh0mWBmsEefRJj4rRi/i82o 0MO8f9AxOuSG5qMNbkd+Ig8PmDBbGP2FzV1QzE6+2obQya4wX8d0u+XlJzTD8LJCJEEx JPnm1bziZiU0h30cSPtI/hixTxfP94baLq49fLTmWMckrg7Oy2Z4CsQa6uzGtwVrE4Aq GE6Q== X-Gm-Message-State: AOAM531brEDjMBzyBpu7HT3g/7z2Il4p4EpRKWY3nk8ZIhq8GVzZL0m4 bQYqg5qPilKk1b8Nhes+yChdMw== X-Received: by 2002:a4a:3ecd:: with SMTP id t196mr3209527oot.69.1632804315151; Mon, 27 Sep 2021 21:45:15 -0700 (PDT) Received: from localhost.localdomain (104-57-184-186.lightspeed.austtx.sbcglobal.net. [104.57.184.186]) by smtp.gmail.com with ESMTPSA id x29sm2553341oox.18.2021.09.27.21.45.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Sep 2021 21:45:14 -0700 (PDT) From: Bjorn Andersson To: Andy Gross , Bjorn Andersson , Rob Herring , Frank Rowand Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] soc: qcom: smem: Support reserved-memory description Date: Mon, 27 Sep 2021 21:45:45 -0700 Message-Id: <20210928044546.4111223-2-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210928044546.4111223-1-bjorn.andersson@linaro.org> References: <20210928044546.4111223-1-bjorn.andersson@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Practically all modern Qualcomm platforms has a single reserved-memory region for SMEM. So rather than having to describe SMEM in the form of a node with a reference to a reserved-memory node, allow the SMEM device to be instantiated directly from the reserved-memory node. The current means of falling back to dereferencing the "memory-region" is kept as a fallback, if it's determined that the SMEM node is a reserved-memory node. The "qcom,smem" compatible is added to the reserved_mem_matches list, to allow the reserved-memory device to be probed. In order to retain the readability of the code, the resolution of resources is split from the actual ioremapping. Signed-off-by: Bjorn Andersson --- drivers/of/platform.c | 1 + drivers/soc/qcom/smem.c | 57 ++++++++++++++++++++++++++++------------- 2 files changed, 40 insertions(+), 18 deletions(-) -- 2.29.2 diff --git a/drivers/of/platform.c b/drivers/of/platform.c index 32d5ff8df747..07813fb1ef37 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -505,6 +505,7 @@ EXPORT_SYMBOL_GPL(of_platform_default_populate); static const struct of_device_id reserved_mem_matches[] = { { .compatible = "qcom,rmtfs-mem" }, { .compatible = "qcom,cmd-db" }, + { .compatible = "qcom,smem" }, { .compatible = "ramoops" }, { .compatible = "nvmem-rmem" }, {} diff --git a/drivers/soc/qcom/smem.c b/drivers/soc/qcom/smem.c index 4fb5aeeb0843..c7e519bfdc8a 100644 --- a/drivers/soc/qcom/smem.c +++ b/drivers/soc/qcom/smem.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -240,7 +241,7 @@ static const u8 SMEM_INFO_MAGIC[] = { 0x53, 0x49, 0x49, 0x49 }; /* SIII */ * @size: size of the memory region */ struct smem_region { - u32 aux_base; + phys_addr_t aux_base; void __iomem *virt_base; size_t size; }; @@ -499,7 +500,7 @@ static void *qcom_smem_get_global(struct qcom_smem *smem, for (i = 0; i < smem->num_regions; i++) { region = &smem->regions[i]; - if (region->aux_base == aux_base || !aux_base) { + if ((u32)region->aux_base == aux_base || !aux_base) { if (size != NULL) *size = le32_to_cpu(entry->size); return region->virt_base + le32_to_cpu(entry->offset); @@ -664,7 +665,7 @@ phys_addr_t qcom_smem_virt_to_phys(void *p) if (p < region->virt_base + region->size) { u64 offset = p - region->virt_base; - return (phys_addr_t)region->aux_base + offset; + return region->aux_base + offset; } } @@ -863,12 +864,12 @@ qcom_smem_enumerate_partitions(struct qcom_smem *smem, u16 local_host) return 0; } -static int qcom_smem_map_memory(struct qcom_smem *smem, struct device *dev, - const char *name, int i) +static int qcom_smem_resolve_mem(struct qcom_smem *smem, const char *name, + struct smem_region *region) { + struct device *dev = smem->dev; struct device_node *np; struct resource r; - resource_size_t size; int ret; np = of_parse_phandle(dev->of_node, name, 0); @@ -881,13 +882,9 @@ static int qcom_smem_map_memory(struct qcom_smem *smem, struct device *dev, of_node_put(np); if (ret) return ret; - size = resource_size(&r); - smem->regions[i].virt_base = devm_ioremap_wc(dev, r.start, size); - if (!smem->regions[i].virt_base) - return -ENOMEM; - smem->regions[i].aux_base = (u32)r.start; - smem->regions[i].size = size; + region->aux_base = r.start; + region->size = resource_size(&r); return 0; } @@ -895,12 +892,14 @@ static int qcom_smem_map_memory(struct qcom_smem *smem, struct device *dev, static int qcom_smem_probe(struct platform_device *pdev) { struct smem_header *header; + struct reserved_mem *rmem; struct qcom_smem *smem; size_t array_size; int num_regions; int hwlock_id; u32 version; int ret; + int i; num_regions = 1; if (of_find_property(pdev->dev.of_node, "qcom,rpm-msg-ram", NULL)) @@ -914,13 +913,35 @@ static int qcom_smem_probe(struct platform_device *pdev) smem->dev = &pdev->dev; smem->num_regions = num_regions; - ret = qcom_smem_map_memory(smem, &pdev->dev, "memory-region", 0); - if (ret) - return ret; + rmem = of_reserved_mem_lookup(pdev->dev.of_node); + if (rmem) { + smem->regions[0].aux_base = rmem->base; + smem->regions[0].size = rmem->size; + } else { + /* + * Fall back to the memory-region reference, if we're not a + * reserved-memory node. + */ + ret = qcom_smem_resolve_mem(smem, "memory-region", &smem->regions[0]); + if (ret) + return ret; + } - if (num_regions > 1 && (ret = qcom_smem_map_memory(smem, &pdev->dev, - "qcom,rpm-msg-ram", 1))) - return ret; + if (num_regions > 1) { + ret = qcom_smem_resolve_mem(smem, "qcom,rpm-msg-ram", &smem->regions[1]); + if (ret) + return ret; + } + + for (i = 0; i < num_regions; i++) { + smem->regions[i].virt_base = devm_ioremap_wc(&pdev->dev, + smem->regions[i].aux_base, + smem->regions[i].size); + if (!smem->regions[i].virt_base) { + dev_err(&pdev->dev, "failed to remap %pa\n", &smem->regions[i].aux_base); + return -ENOMEM; + } + } header = smem->regions[0].virt_base; if (le32_to_cpu(header->initialized) != 1 ||