Received: by 2002:a05:6500:1b8f:b0:1fa:5c73:8e2d with SMTP id df15csp920969lqb; Wed, 29 May 2024 15:01:24 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCVCRfKwFkktCGHCnxCdDMbftvRPojtR2T79HXtJTKtX+9wcMN3w+C8ZfNjk6Lw5hqmErYfqBK+b+876FGHArh0gcwJ5mjG/FB4uWAq8EQ== X-Google-Smtp-Source: AGHT+IEsatANtRX6ekcaqbdXci3IupecQTL2NQRjhWHq62HKi3guYLCJLEuRShfA/q/9yuOPo7BJ X-Received: by 2002:a05:6214:5682:b0:6ad:748d:5103 with SMTP id 6a1803df08f44-6ae0cb7c1a6mr5564836d6.10.1717020084189; Wed, 29 May 2024 15:01:24 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1717020084; cv=pass; d=google.com; s=arc-20160816; b=o8WP3U76knFO1VMlNv/SKYCPxeZI9oVG4S8NtFnQC/j/Yoy66FRYfQnnVZELg7khrV zFduwQR6+GuQI9qPMfAniv5vAsh6I4Wd+XV9vd4wGOzqhu1oZ2SmpdLhwcIGQI/G0vgE zNI0yoIdZYBS0nJea7yA0tMg3LVKEerimj9F7EUX0ISuQtKLAI22vgBL2jU/+PHLVfHy zoJZFpU9RhOlV+N99jOt7hGYpBeTAvhR9IOhfomjPhUSfYAxBESkrCfHp0sY5irw6HSc JbMFPX4/yFkYSoqW2sOSM1YgXuo3B5Mmp/3O8Re+oO0hqrgAV49kOEzfGTzvgnVpiO4c W12A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=fgH83euhZTdgq1rzO4qTn9D4rhJ4mmAajTpfLa+6Efk=; fh=Cm6lFp8vWPK3gZx9xq+IEexzRkiTyiQmTND/tbYUzP4=; b=Zi1bJd/X8qB+ZUUJpBzOLg+uoXWoA9PxOs0eSMx8eVv0RJQC7tlDX54ay/AZoP1gTJ 7UQjiACeyPzgaY/FNxKBJ48eRNB6yyl6I9erGGb+ernAcHciUS+teNf2rypNam2zT4z5 gcI724dnpWuHje1R8EOm9K5VbPfXYjO2zHyy5blZLfuyWkdE3F3NY196CBdFdButTWeF DStobzce4BU9RoWk3LTQ5Op5KmGzPO3tFbzpU4EJqsaGebjVQIp6UnyyZOMF2gIMb/Vt WxCluJ8/I5nPzv3xCTm9FzIusYVUkuy3I26JLcfCv94P6VJ92vden7t/4wuYwXi8UBO6 EndA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@marvell.com header.s=pfpt0220 header.b=Gcw1BRh3; arc=pass (i=1 spf=pass spfdomain=marvell.com dkim=pass dkdomain=marvell.com dmarc=pass fromdomain=marvell.com); spf=pass (google.com: domain of linux-kernel+bounces-194722-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-194722-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=REJECT dis=NONE) header.from=marvell.com Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id 6a1803df08f44-6ad79ee691csi12895636d6.576.2024.05.29.15.01.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 May 2024 15:01:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-194722-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@marvell.com header.s=pfpt0220 header.b=Gcw1BRh3; arc=pass (i=1 spf=pass spfdomain=marvell.com dkim=pass dkdomain=marvell.com dmarc=pass fromdomain=marvell.com); spf=pass (google.com: domain of linux-kernel+bounces-194722-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-194722-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=REJECT dis=NONE) header.from=marvell.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id D626F1C21BBD for ; Wed, 29 May 2024 22:01:23 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 056E320010B; Wed, 29 May 2024 22:00:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=marvell.com header.i=@marvell.com header.b="Gcw1BRh3" Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6A3A91C9EA7; Wed, 29 May 2024 22:00:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=67.231.156.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717020040; cv=none; b=IW+Cx/BM5Ui0xFtV2eKu1I1d95XylNEbAgBfP2qgCUX90ADTJ4nxDbEv4D96X9SYtnBA/5BtMOhfRkTpm9e8D2yB3TTagLKq8vEUfsv/kf3ayjMCVWkK0aaOn30psbFkILDVv8TwlF7pooTh0xewIjyBU+K6VmZNb08JtsGxwtk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717020040; c=relaxed/simple; bh=HbIp7Chg0oOZQK8L8xEVNu32PwM4GgbgFp4b4hgYKOs=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=SIkNvCrpqG9+Kq12z8BzLDChBpVeP6Iylles3mxQ2W4EYAUdGuOiHQEi70A629Zo/BeoTouJ/J2zwLGAsxDhF7NtW+RuEDzdQ1rxXTI2suQLFz/lyYTkGBQjdG3T4Cmr6IIrU6HITaMr4nJPPj9xBxp0MQXSTx+pHjDcWkKQ2MY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=marvell.com; spf=pass smtp.mailfrom=marvell.com; dkim=pass (2048-bit key) header.d=marvell.com header.i=@marvell.com header.b=Gcw1BRh3; arc=none smtp.client-ip=67.231.156.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=marvell.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=marvell.com Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 44TIdMZ9015558; Wed, 29 May 2024 15:00:33 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=pfpt0220; bh=f gH83euhZTdgq1rzO4qTn9D4rhJ4mmAajTpfLa+6Efk=; b=Gcw1BRh3OyikY38Dt 4U9SI0DnbqgtzOGklk9blukDBOAaNho275Bk1txlDCpfoxXR1wA7vBCpVWmUOPXs LZ8Kxo6q9y1xbSii/uBt94E6v/Bhl/NhQdGrWkAiGW2/S0taPGB3GtLR1W2ykJwx 5YtyJbbd8bCSf6SRp2FLNELrCNv2RQB56UNnl3GWrFU9taBcN/BoaWZv7s/3A/ga RBsCrMK7+Nlxlnn7P04xewb8yEbE0UgxLGsXrNJvpaZO9QZ5YS5cYvT/jhuc97IQ sIJ5J+OGuIhRp7iXzoCQhMea3j13eBFRX2t+gKmHz3/tatb+lr8wMohFgMDBBr+L jnf0w== Received: from dc5-exch05.marvell.com ([199.233.59.128]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3ye1r12k8j-5 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 29 May 2024 15:00:33 -0700 (PDT) Received: from DC5-EXCH05.marvell.com (10.69.176.209) by DC5-EXCH05.marvell.com (10.69.176.209) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Wed, 29 May 2024 15:00:30 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH05.marvell.com (10.69.176.209) with Microsoft SMTP Server id 15.2.1544.4 via Frontend Transport; Wed, 29 May 2024 15:00:30 -0700 Received: from Dell2s-9.sclab.marvell.com (unknown [10.110.150.250]) by maili.marvell.com (Postfix) with ESMTP id 95FCF5B694A; Wed, 29 May 2024 15:00:30 -0700 (PDT) From: Witold Sadowski To: , , CC: , , , , , Piyush Malgujar , "Witold Sadowski" Subject: [PATCH v7 3/4] spi: cadence: Allow to read basic xSPI configuration from ACPI Date: Wed, 29 May 2024 15:00:25 -0700 Message-ID: <20240529220026.1644986-4-wsadowski@marvell.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240529220026.1644986-1-wsadowski@marvell.com> References: <20240529220026.1644986-1-wsadowski@marvell.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Proofpoint-ORIG-GUID: 6yBuDet20-yylg_1vlciT3ltf3MSDMbt X-Proofpoint-GUID: 6yBuDet20-yylg_1vlciT3ltf3MSDMbt X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.650,FMLib:17.12.28.16 definitions=2024-05-29_16,2024-05-28_01,2024-05-17_01 From: Piyush Malgujar These changes enable reading the configurations from ACPI tables as required for successful probing in an ACPI UEFI environment. In the case of an ACPI-disabled or DTS-based environment, it will continue to read configurations from DTS as before. Signed-off-by: Piyush Malgujar Signed-off-by: Witold Sadowski --- drivers/spi/spi-cadence-xspi.c | 88 +++++++++++++++++++++++++++++++--- 1 file changed, 82 insertions(+), 6 deletions(-) diff --git a/drivers/spi/spi-cadence-xspi.c b/drivers/spi/spi-cadence-xspi.c index 9280800ffec2..490bba7a0fc8 100644 --- a/drivers/spi/spi-cadence-xspi.c +++ b/drivers/spi/spi-cadence-xspi.c @@ -2,6 +2,7 @@ // Cadence XSPI flash controller driver // Copyright (C) 2020-21 Cadence +#include #include #include #include @@ -14,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -647,6 +649,67 @@ static int cdns_xspi_mem_op(struct cdns_xspi_dev *cdns_xspi, (dir != SPI_MEM_NO_DATA)); } +#ifdef CONFIG_ACPI +static bool cdns_xspi_supports_op(struct spi_mem *mem, + const struct spi_mem_op *op) +{ + struct spi_device *spi = mem->spi; + const union acpi_object *obj; + struct acpi_device *adev; + + adev = ACPI_COMPANION(&spi->dev); + + if (!acpi_dev_get_property(adev, "spi-tx-bus-width", ACPI_TYPE_INTEGER, + &obj)) { + switch (obj->integer.value) { + case 1: + break; + case 2: + spi->mode |= SPI_TX_DUAL; + break; + case 4: + spi->mode |= SPI_TX_QUAD; + break; + case 8: + spi->mode |= SPI_TX_OCTAL; + break; + default: + dev_warn(&spi->dev, + "spi-tx-bus-width %lld not supported\n", + obj->integer.value); + break; + } + } + + if (!acpi_dev_get_property(adev, "spi-rx-bus-width", ACPI_TYPE_INTEGER, + &obj)) { + switch (obj->integer.value) { + case 1: + break; + case 2: + spi->mode |= SPI_RX_DUAL; + break; + case 4: + spi->mode |= SPI_RX_QUAD; + break; + case 8: + spi->mode |= SPI_RX_OCTAL; + break; + default: + dev_warn(&spi->dev, + "spi-rx-bus-width %lld not supported\n", + obj->integer.value); + break; + } + } + + if (!spi_mem_default_supports_op(mem, op)) + return false; + + return true; +} +#endif + static int cdns_xspi_mem_op_execute(struct spi_mem *mem, const struct spi_mem_op *op) { @@ -670,6 +733,9 @@ static int cdns_xspi_adjust_mem_op_size(struct spi_mem *mem, struct spi_mem_op * } static const struct spi_controller_mem_ops cadence_xspi_mem_ops = { +#ifdef CONFIG_ACPI + .supports_op = cdns_xspi_supports_op, +#endif .exec_op = cdns_xspi_mem_op_execute, .adjust_op_size = cdns_xspi_adjust_mem_op_size, }; @@ -721,15 +787,20 @@ static irqreturn_t cdns_xspi_irq_handler(int this_irq, void *dev) static int cdns_xspi_of_get_plat_data(struct platform_device *pdev) { - struct device_node *node_prop = pdev->dev.of_node; + struct fwnode_handle *fwnode_child; unsigned int cs; - for_each_available_child_of_node_scoped(node_prop, node_child) { - if (of_property_read_u32(node_child, "reg", &cs)) { + device_for_each_child_node(&pdev->dev, fwnode_child) { + if (!fwnode_device_is_available(fwnode_child)) + continue; + + if (fwnode_property_read_u32(fwnode_child, "reg", &cs)) { dev_err(&pdev->dev, "Couldn't get memory chip select\n"); + fwnode_handle_put(fwnode_child); return -ENXIO; } else if (cs >= CDNS_XSPI_MAX_BANKS) { dev_err(&pdev->dev, "reg (cs) parameter value too large\n"); + fwnode_handle_put(fwnode_child); return -ENXIO; } } @@ -783,6 +854,11 @@ static int cdns_xspi_probe(struct platform_device *pdev) SPI_MODE_0 | SPI_MODE_3; drv_data = of_device_get_match_data(dev); + if (!drv_data) { + drv_data = acpi_device_get_match_data(dev); + if (!drv_data) + return -ENODEV; + } host->mem_ops = &cadence_xspi_mem_ops; host->dev.of_node = pdev->dev.of_node; @@ -809,19 +885,19 @@ static int cdns_xspi_probe(struct platform_device *pdev) if (ret) return -ENODEV; - cdns_xspi->iobase = devm_platform_ioremap_resource_byname(pdev, "io"); + cdns_xspi->iobase = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(cdns_xspi->iobase)) { dev_err(dev, "Failed to remap controller base address\n"); return PTR_ERR(cdns_xspi->iobase); } - res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "sdma"); + res = platform_get_resource(pdev, IORESOURCE_MEM, 1); cdns_xspi->sdmabase = devm_ioremap_resource(dev, res); if (IS_ERR(cdns_xspi->sdmabase)) return PTR_ERR(cdns_xspi->sdmabase); cdns_xspi->sdmasize = resource_size(res); - cdns_xspi->auxbase = devm_platform_ioremap_resource_byname(pdev, "aux"); + cdns_xspi->auxbase = devm_platform_ioremap_resource(pdev, 2); if (IS_ERR(cdns_xspi->auxbase)) { dev_err(dev, "Failed to remap AUX address\n"); return PTR_ERR(cdns_xspi->auxbase); -- 2.43.0