From patchwork Wed Jun 30 12:04:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nehal-bakulchandra Shah X-Patchwork-Id: 12351863 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,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 542DAC11F68 for ; Wed, 30 Jun 2021 12:04:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3E96D6198E for ; Wed, 30 Jun 2021 12:04:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234387AbhF3MHT (ORCPT ); Wed, 30 Jun 2021 08:07:19 -0400 Received: from mail-sn1anam02on2086.outbound.protection.outlook.com ([40.107.96.86]:51070 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S234489AbhF3MHS (ORCPT ); Wed, 30 Jun 2021 08:07:18 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EIjNtsbTh4E91pdNhCElVcfsyUt0rbfU8ANBXvAQeoLAlyUZFt17WRBM/iFbWF7vIcPRvEpNZ76s4Jh7YOvP6nr+JcCGxx/gPGnKPyEhWFbHPxiQuHZd0zdPNxHTqDJAesp2ADabHzJIO+6xHcJXl4dAQn7PzaPHl/fKDxBxfx0mKfZwb27nRX/7tdLjSshMMveWPKOddkpWxXx5f0o6kmhUvebpEw+1wtB1cuNR0LrQKYKDqSKyJIyhTEONKyardnaKHimd341pwtXsvVTnIhNLxsjnw7fp6qDyCwu4yB0UNB+Y0uET5roNu1+PkV1sLtIDI6Qj3nmKVVJC3riCTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=77000i/WMOcjtKjRx1yCnFBMvAxexx1LbfoLXOBOfUA=; b=i5J/JVEeY2G5SshN+j40pxOJvupwihRopy9Vpu76ZObhiBR0Rgyhj0A1nCPzdhxzhdsfzdGgwe/XzpjhPkgOCdY8jaXHnrk5HWdNoX70xjlpHew5dN10moKIVgk5jitXiSe4QakTK9USpnBu8xAyDIUMmBH354scdsIl20+KZBtjpv0gMJi9Xx9LNItFtI/eKgs01c9lVbCx+3ETgg6oDu4i8LTuMVr7iKtMUvMpoeL3MqCQ3e7ZJfGzM9Y1p+wdCTRuVpp+JM+hYspV6r4Hu5tOC2EKCPJZ5qiKp/im/1vLnTgWO1Jv/mOxcVOy49+sVoDavT4M+5HJlZx/Nu5kuA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=77000i/WMOcjtKjRx1yCnFBMvAxexx1LbfoLXOBOfUA=; b=fqQIvUPOh2MBsuwlTn/Z/upEP5JiLbH/mmgMbQs2T49PeZbo3F2nyvEhwBRX0V1wrAhn8L6y/Q7Q2lnBW/L880Jlgzd+aXK2LQEo+wmLy0Qh/payLoFE+sYgSMKtWmOTzJ+a1jvH8xxBAKprpf1VnwaePMkhewIpWOeVl8J4Kns= Received: from MWHPR04CA0055.namprd04.prod.outlook.com (2603:10b6:300:6c::17) by MN2PR12MB4208.namprd12.prod.outlook.com (2603:10b6:208:1d0::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.19; Wed, 30 Jun 2021 12:04:45 +0000 Received: from CO1NAM11FT007.eop-nam11.prod.protection.outlook.com (2603:10b6:300:6c:cafe::ef) by MWHPR04CA0055.outlook.office365.com (2603:10b6:300:6c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.22 via Frontend Transport; Wed, 30 Jun 2021 12:04:44 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; kernel.org; dkim=none (message not signed) header.d=none;kernel.org; dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1NAM11FT007.mail.protection.outlook.com (10.13.174.131) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4287.22 via Frontend Transport; Wed, 30 Jun 2021 12:04:44 +0000 Received: from jatayu.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.4; Wed, 30 Jun 2021 07:04:41 -0500 From: Nehal Bakulchandra Shah To: CC: , , "Nehal Bakulchandra Shah" , Shyam Sundar S K , Liang Liang Subject: [PATCH v3 1/3] spi:amd: Add support for latest platform Date: Wed, 30 Jun 2021 17:34:23 +0530 Message-ID: <20210630120425.606957-2-Nehal-Bakulchandra.shah@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210630120425.606957-1-Nehal-Bakulchandra.shah@amd.com> References: <20210630120425.606957-1-Nehal-Bakulchandra.shah@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 91f73ba6-d1a0-4a88-4f4e-08d93bbf3fee X-MS-TrafficTypeDiagnostic: MN2PR12MB4208: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: S1QLgorwbVEYfS9JjzKxJ44UMz9Do0HiTInwi8zbboOiEi1wTjLOveVT7JScxCSqh8KpWLuS2J7Tqi1whJtCrWYrxrsQ9rGzgrgTJlK1ELxJDCrdQM8pRMh8LPe1H134EXZhDxas6PSfQvS32SkobiVljIC7XFsAdqU5nCF4w7heDF7Fv53xoCK9Kq7kqYudKNu3yemgJN1/dQH2KTNY3Kofu3wFahw3OqmKgo9+y4jdcm2Vp2g0manXK7MsrQ2eoMV1a/Ogrhr+Ut9r1JRpmHkqAkf2mqqwZUdFBHc37jEewV0ZeU0n3MzBI4VOIzeJd/ta5EYCglSwxxukdIXebhyoBAas/4GLSqMXRfFm731gYkMQD6LKhrSFnettHvsTTL7XLoirnNs/mLXCpl9wQkksuipxjInqzJ6g8En3mcjV1TVYI2GjnoSTbRRZfpAg8ZpjK8NU8YUW5ehLgIL8Ah8ANAPBT+7rQhnbKG4ubKxehAm8a84OJQZrKbMUBj9v7PoqJ12LG+JvPEgwFmXyUVIO+6WgG9e28NNtS60uX5EbRA/WzxYR6YduRY8VlvNgkxLYprUefxJOX7c+acDDTMLof2h5VRxhjTxvUU08m8PcHNJFmimSPlBVu7NSRlJaAC20SZlgLO8g48k3SsN/NcOagxZV7MzsATV7XHdxHZ/BZoRqv7nH4DGeUVk9FrGkYwGd8xP49C/zXmEB0sWNbm5+Y1UIns5KEaBh1SPAIvA= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(136003)(39860400002)(346002)(396003)(376002)(46966006)(36840700001)(316002)(6916009)(336012)(426003)(8936002)(82740400003)(54906003)(70206006)(26005)(4326008)(86362001)(2906002)(36756003)(478600001)(70586007)(83380400001)(8676002)(1076003)(186003)(356005)(81166007)(16526019)(2616005)(36860700001)(7696005)(82310400003)(5660300002)(47076005)(6666004)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2021 12:04:44.5271 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 91f73ba6-d1a0-4a88-4f4e-08d93bbf3fee X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT007.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4208 Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org -Add device ID for new generation of platform. -Modify spi_busy and opcode commands based on controller version. Reviewed-by: Shyam Sundar S K Reviewed-by: Liang Liang Signed-off-by: Nehal Bakulchandra Shah --- drivers/spi/spi-amd.c | 72 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 63 insertions(+), 9 deletions(-) diff --git a/drivers/spi/spi-amd.c b/drivers/spi/spi-amd.c index 3cf76096a76d..2150f54512d9 100644 --- a/drivers/spi/spi-amd.c +++ b/drivers/spi/spi-amd.c @@ -14,10 +14,12 @@ #include #define AMD_SPI_CTRL0_REG 0x00 +#define AMD_SPI_OPCODE_REG 0x45 +#define AMD_SPI_CMD_TRIGGER_REG 0x47 #define AMD_SPI_EXEC_CMD BIT(16) #define AMD_SPI_FIFO_CLEAR BIT(20) #define AMD_SPI_BUSY BIT(31) - +#define AMD_SPI_TRIGGER_CMD BIT(7) #define AMD_SPI_OPCODE_MASK 0xFF #define AMD_SPI_ALT_CS_REG 0x1D @@ -34,11 +36,31 @@ #define AMD_SPI_XFER_TX 1 #define AMD_SPI_XFER_RX 2 +#ifdef CONFIG_ACPI +struct amd_spi_devtype_data { + u32 spi_status; + u8 version; +}; + +static const struct amd_spi_devtype_data spi_v1 = { + .spi_status = AMD_SPI_CTRL0_REG, + .version = 0, +}; + +static const struct amd_spi_devtype_data spi_v2 = { + .spi_status = AMD_SPI_STATUS_REG, + .version = 1, +}; +#endif + struct amd_spi { void __iomem *io_remap_addr; unsigned long io_base_addr; u32 rom_addr; u8 chip_select; + const struct amd_spi_devtype_data *devtype_data; + struct spi_device *spi_dev; + struct spi_master *master; }; static inline u8 amd_spi_readreg8(struct spi_master *master, int idx) @@ -98,6 +120,14 @@ static void amd_spi_select_chip(struct spi_master *master) AMD_SPI_ALT_CS_MASK); } +static void amd_spi_clear_chip(struct spi_master *master) +{ + struct amd_spi *amd_spi = spi_master_get_devdata(master); + u8 chip_select = amd_spi->chip_select; + + amd_spi_writereg8(master, AMD_SPI_ALT_CS_REG, chip_select & 0XFC); +} + static void amd_spi_clear_fifo_ptr(struct spi_master *master) { amd_spi_setclear_reg32(master, AMD_SPI_CTRL0_REG, AMD_SPI_FIFO_CLEAR, @@ -106,8 +136,13 @@ static void amd_spi_clear_fifo_ptr(struct spi_master *master) static void amd_spi_set_opcode(struct spi_master *master, u8 cmd_opcode) { - amd_spi_setclear_reg32(master, AMD_SPI_CTRL0_REG, cmd_opcode, - AMD_SPI_OPCODE_MASK); + struct amd_spi *amd_spi = spi_master_get_devdata(master); + + if (!amd_spi->devtype_data->version) + amd_spi_setclear_reg32(master, AMD_SPI_CTRL0_REG, cmd_opcode, + AMD_SPI_OPCODE_MASK); + else + amd_spi_writereg8(master, AMD_SPI_OPCODE_REG, cmd_opcode); } static inline void amd_spi_set_rx_count(struct spi_master *master, @@ -126,17 +161,20 @@ static inline int amd_spi_busy_wait(struct amd_spi *amd_spi) { bool spi_busy; int timeout = 100000; + u32 status_reg = amd_spi->devtype_data->spi_status; /* poll for SPI bus to become idle */ spi_busy = (ioread32((u8 __iomem *)amd_spi->io_remap_addr + - AMD_SPI_CTRL0_REG) & AMD_SPI_BUSY) == AMD_SPI_BUSY; + status_reg) & AMD_SPI_BUSY) == AMD_SPI_BUSY; + while (spi_busy) { usleep_range(10, 20); if (timeout-- < 0) return -ETIMEDOUT; + /* poll for SPI bus to become idle */ spi_busy = (ioread32((u8 __iomem *)amd_spi->io_remap_addr + - AMD_SPI_CTRL0_REG) & AMD_SPI_BUSY) == AMD_SPI_BUSY; + status_reg) & AMD_SPI_BUSY) == AMD_SPI_BUSY; } return 0; @@ -146,9 +184,16 @@ static void amd_spi_execute_opcode(struct spi_master *master) { struct amd_spi *amd_spi = spi_master_get_devdata(master); + /*Check for busy wait*/ + amd_spi_busy_wait(amd_spi); + /* Set ExecuteOpCode bit in the CTRL0 register */ - amd_spi_setclear_reg32(master, AMD_SPI_CTRL0_REG, AMD_SPI_EXEC_CMD, - AMD_SPI_EXEC_CMD); + if (!amd_spi->devtype_data->version) + amd_spi_setclear_reg32(master, AMD_SPI_CTRL0_REG, AMD_SPI_EXEC_CMD, + AMD_SPI_EXEC_CMD); + else + amd_spi_setclear_reg8(master, AMD_SPI_CMD_TRIGGER_REG, AMD_SPI_TRIGGER_CMD, + AMD_SPI_TRIGGER_CMD); amd_spi_busy_wait(amd_spi); } @@ -241,7 +286,8 @@ static int amd_spi_master_transfer(struct spi_master *master, * program the controller. */ amd_spi_fifo_xfer(amd_spi, master, msg); - + if (amd_spi->devtype_data->version) + amd_spi_clear_chip(master); return 0; } @@ -266,6 +312,11 @@ static int amd_spi_probe(struct platform_device *pdev) dev_err(dev, "error %d ioremap of SPI registers failed\n", err); goto err_free_master; } + amd_spi->devtype_data = device_get_match_data(dev); + if (!amd_spi->devtype_data) { + err = -ENODEV; + goto err_free_master; + } dev_dbg(dev, "io_remap_address: %p\n", amd_spi->io_remap_addr); /* Initialize the spi_master fields */ @@ -293,7 +344,10 @@ static int amd_spi_probe(struct platform_device *pdev) #ifdef CONFIG_ACPI static const struct acpi_device_id spi_acpi_match[] = { - { "AMDI0061", 0 }, + { "AMDI0061", + .driver_data = (kernel_ulong_t)&spi_v1 }, + { "AMDI0062", + .driver_data = (kernel_ulong_t)&spi_v2 }, {}, }; MODULE_DEVICE_TABLE(acpi, spi_acpi_match); From patchwork Wed Jun 30 12:04:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nehal-bakulchandra Shah X-Patchwork-Id: 12351861 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,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 D08F9C11F65 for ; Wed, 30 Jun 2021 12:04:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BCFB261919 for ; Wed, 30 Jun 2021 12:04:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234483AbhF3MHR (ORCPT ); Wed, 30 Jun 2021 08:07:17 -0400 Received: from mail-bn8nam12on2068.outbound.protection.outlook.com ([40.107.237.68]:58689 "EHLO NAM12-BN8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S234387AbhF3MHR (ORCPT ); Wed, 30 Jun 2021 08:07:17 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OTVknQVRuMqUvVLisMghGSnIDGET7SXZEIMHQtTl7IwI7m5/YqmQ8NE94jkQhFgvmMuy8mraLl2D0NsKvnvYriip/nRlLaQA6wW1+M5iAolrRVcL6bqwD9XZxep0u9qJev0xae1+YR0edae7KVLcuGFvZKwGarTA2gKuDsgXKw4CkNrDlQeypGJDDPPro3AS6TzH6gYFECyi/xgP8Bakvh9s9h93JRC56ur6rDYmUh73x0ulGto+KqsDh1xUtY7LLo2BDLYZlIhrfKpZ/6RvprIPes3znBo3mVsYrq5d87TisVJwyD9sLchDtWpf//yasDltqJWsuxiCPHbw6MKuEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=y+32KAULdQkLlVkBqCNZD1H7u4OXbAizOZJxl149RKc=; b=c5cfRxUTUt+CaT11BDgRUTq+vZcl2BuRGJJKpStC8x2nK1c7KgHLvnTPYNYlk8y6TM9bS2o7DOgDgOY6uWy1E5gUL9ZE6VBIeHoaPpKAdfAD+Pqhfese6WnODdYpNLVeFRufpqI0D7pG8cNYYywRcIX8BUTSNGjnPjwv1vPfCMXd56JT8jBUwV31f5P6K0Paav6dqHAkF6rKtoc3Twxi2QjZi2/ZKJCtPx9pNXZ0cthLzlurXwjZs16eCFP6azfGvSZsGT4C4iOXoytDjKP3uAEhCjs22uPQXzsUZ75hnpxY9kQvxMvI2p+Spz/fFjsZdsHC4pw7Tks3RuBSkWygvA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=y+32KAULdQkLlVkBqCNZD1H7u4OXbAizOZJxl149RKc=; b=lGbeeYvrDN5mlMJCK6+UGrqDnMhNV6yYnq9d6LUFFxdEKVXcAXuY01O+9FsXFJPv6t3l5X+DKWqvs7fdF/zlUjF2mOZfQSbTeKhWvz95LN5R/Zhicq9rxmfR8J/L+1d63cBLHxgKGE0XpmaOhZbsRnKNICd5IUeXw0LV2QmwjIg= Received: from MWHPR04CA0072.namprd04.prod.outlook.com (2603:10b6:300:6c::34) by DM6PR12MB4420.namprd12.prod.outlook.com (2603:10b6:5:2a7::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.22; Wed, 30 Jun 2021 12:04:46 +0000 Received: from CO1NAM11FT007.eop-nam11.prod.protection.outlook.com (2603:10b6:300:6c:cafe::3f) by MWHPR04CA0072.outlook.office365.com (2603:10b6:300:6c::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.22 via Frontend Transport; Wed, 30 Jun 2021 12:04:46 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; kernel.org; dkim=none (message not signed) header.d=none;kernel.org; dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1NAM11FT007.mail.protection.outlook.com (10.13.174.131) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4287.22 via Frontend Transport; Wed, 30 Jun 2021 12:04:46 +0000 Received: from jatayu.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.4; Wed, 30 Jun 2021 07:04:43 -0500 From: Nehal Bakulchandra Shah To: CC: , , "Nehal Bakulchandra Shah" , Shyam Sundar S K , Liang Liang Subject: [PATCH v3 2/3] spi:amd: Fix for transfer large size of data Date: Wed, 30 Jun 2021 17:34:24 +0530 Message-ID: <20210630120425.606957-3-Nehal-Bakulchandra.shah@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210630120425.606957-1-Nehal-Bakulchandra.shah@amd.com> References: <20210630120425.606957-1-Nehal-Bakulchandra.shah@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f102e42f-1aca-45a2-63e3-08d93bbf40f3 X-MS-TrafficTypeDiagnostic: DM6PR12MB4420: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3968; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eSRLYiakIyuVjz7VdgSXcpKV9UNigF49hHHmwYjtq6/N6m9ePjVsq+H0r90OEXmBVW4fIlDYdv46ro33wvBdeKIiLfEgIMYdU4y/A/psOmhNpZN2DhAowWWHMMWmj9Bue1ajQx/1jr6CNXj9bS6HFySgVL9cVDomlbGrwv4YxO8rggh2l9P6PIJW1oQdslcbYYo11FEVzO+OIj0xkVN29/rDIPyXj9WokeGZPDvjLjIPebW2lBXIbZJ5auNQSSwFISqIEDQNfb5fdhhMp0bWuG4Vs0LrWpNOPUwOb5xoFTRu8yf8gj4FUB4wgGDVQ3QAUqUzEx9MbulfPFDzF8dZnT3mIdpUB5dk4e/iThjtsmckwENn3SeeiH0R88q8yfG0hZHDGTdI7L+4gd3cuBIrnkZ+1fLXlWD8b3xAwHchEHN7dFoQsR00ckgxPC7fzBc+Rgo33SUzE08wuRLamN4eNEaeNDxJF4Tes3BJOUYM/37mYEdM8a68OnJZ4iZxJSscvzbDhUmXP6DHAPS6wHsTKQ66zWr9gqE+sYPSz19IAUCU+JDWGx3qZ2oY/PD74Yj8ax+qCgir1EwMKlMBQfAvRlmblQUfoW+1zR2cQW49+ONGvu1vMWKdOHuwpwYu65CQjM2pxcD4MwW19uDHy+aCRlgk88ArDUZvI3GpY6l2xudiC0P1qI4D9PL2Jk1e3ovBhYNN6lMGRpOolXnAvs3vTdwlrSOjWMq6S0mAxuQ844Y= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(396003)(376002)(346002)(136003)(39860400002)(46966006)(36840700001)(8936002)(2906002)(4326008)(1076003)(6916009)(86362001)(36860700001)(5660300002)(36756003)(54906003)(70586007)(70206006)(47076005)(6666004)(26005)(82310400003)(336012)(16526019)(8676002)(7696005)(82740400003)(426003)(81166007)(478600001)(2616005)(356005)(186003)(83380400001)(316002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2021 12:04:46.2381 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f102e42f-1aca-45a2-63e3-08d93bbf40f3 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT007.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4420 Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org Hardware has 72 bytes of FIFO.This patch addresses the same by means of software workaround. Reviewed-by: Shyam Sundar S K Reviewed-by: Liang Liang Signed-off-by: Nehal Bakulchandra Shah --- drivers/spi/spi-amd.c | 77 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 62 insertions(+), 15 deletions(-) diff --git a/drivers/spi/spi-amd.c b/drivers/spi/spi-amd.c index 2150f54512d9..2849f901a075 100644 --- a/drivers/spi/spi-amd.c +++ b/drivers/spi/spi-amd.c @@ -2,9 +2,10 @@ // // AMD SPI controller driver // -// Copyright (c) 2020, Advanced Micro Devices, Inc. +// Copyright (c) 2020-2021, Advanced Micro Devices, Inc. // -// Author: Sanjay R Mehta +// Authors: Sanjay R Mehta +// Nehal Bakulchandra Shah #include #include @@ -29,7 +30,7 @@ #define AMD_SPI_TX_COUNT_REG 0x48 #define AMD_SPI_RX_COUNT_REG 0x4B #define AMD_SPI_STATUS_REG 0x4C - +#define AMD_SPI_FIFO_SIZE 72 #define AMD_SPI_MEM_SIZE 200 /* M_CMD OP codes for SPI */ @@ -215,8 +216,8 @@ static inline int amd_spi_fifo_xfer(struct amd_spi *amd_spi, u8 cmd_opcode; u8 *buf = NULL; u32 m_cmd = 0; - u32 i = 0; - u32 tx_len = 0, rx_len = 0; + u32 i = 0, it = 0, tx_index = 0, rx_index = 0; + u32 tx_len = 0, rx_len = 0, iters = 0, remaining = 0; list_for_each_entry(xfer, &message->transfers, transfer_list) { @@ -230,17 +231,40 @@ static inline int amd_spi_fifo_xfer(struct amd_spi *amd_spi, tx_len = xfer->len - 1; cmd_opcode = *(u8 *)xfer->tx_buf; buf++; + + tx_index = 0; + iters = tx_len / AMD_SPI_FIFO_SIZE; + remaining = tx_len % AMD_SPI_FIFO_SIZE; + + for (it = 0; it < iters; it++) { + amd_spi_clear_fifo_ptr(master); + amd_spi_set_opcode(master, cmd_opcode); + + amd_spi_set_tx_count(master, AMD_SPI_FIFO_SIZE); + /* Write data into the FIFO. */ + for (i = 0; i < AMD_SPI_FIFO_SIZE; i++) { + iowrite8(buf[tx_index], + ((u8 __iomem *)amd_spi->io_remap_addr + + AMD_SPI_FIFO_BASE + i)); + tx_index++; + } + + /* Execute command */ + amd_spi_execute_opcode(master); + } + + amd_spi_clear_fifo_ptr(master); amd_spi_set_opcode(master, cmd_opcode); + amd_spi_set_tx_count(master, remaining); /* Write data into the FIFO. */ - for (i = 0; i < tx_len; i++) { - iowrite8(buf[i], + for (i = 0; i < remaining; i++) { + iowrite8(buf[tx_index], ((u8 __iomem *)amd_spi->io_remap_addr + - AMD_SPI_FIFO_BASE + i)); + AMD_SPI_FIFO_BASE + i)); + tx_index++; } - amd_spi_set_tx_count(master, tx_len); - amd_spi_clear_fifo_ptr(master); /* Execute command */ amd_spi_execute_opcode(master); } @@ -250,16 +274,38 @@ static inline int amd_spi_fifo_xfer(struct amd_spi *amd_spi, * FIFO */ rx_len = xfer->len; + rx_index = 0; + iters = rx_len / AMD_SPI_FIFO_SIZE; + remaining = rx_len % AMD_SPI_FIFO_SIZE; buf = (u8 *)xfer->rx_buf; - amd_spi_set_rx_count(master, rx_len); + + for (it = 0 ; it < iters; it++) { + amd_spi_clear_fifo_ptr(master); + + amd_spi_set_rx_count(master, AMD_SPI_FIFO_SIZE); + + /* Execute command */ + amd_spi_execute_opcode(master); + /* Read data from FIFO to receive buffer */ + for (i = 0; i < AMD_SPI_FIFO_SIZE; i++) { + buf[rx_index] = amd_spi_readreg8(master, AMD_SPI_FIFO_BASE + + tx_len + i); + rx_index++; + } + } + amd_spi_clear_fifo_ptr(master); + + amd_spi_set_rx_count(master, remaining); + /* Execute command */ amd_spi_execute_opcode(master); /* Read data from FIFO to receive buffer */ - for (i = 0; i < rx_len; i++) - buf[i] = amd_spi_readreg8(master, - AMD_SPI_FIFO_BASE + - tx_len + i); + for (i = 0; i < remaining; i++) { + buf[rx_index] = amd_spi_readreg8(master, AMD_SPI_FIFO_BASE + + tx_len + i); + rx_index++; + } } } @@ -365,4 +411,5 @@ module_platform_driver(amd_spi_driver); MODULE_LICENSE("Dual BSD/GPL"); MODULE_AUTHOR("Sanjay Mehta "); +MODULE_AUTHOR("Nehal Bakulchandra Shah "); MODULE_DESCRIPTION("AMD SPI Master Controller Driver"); From patchwork Wed Jun 30 12:04:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nehal-bakulchandra Shah X-Patchwork-Id: 12351865 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,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 9C6C1C11F69 for ; Wed, 30 Jun 2021 12:04:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 838F161920 for ; Wed, 30 Jun 2021 12:04:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234506AbhF3MHV (ORCPT ); Wed, 30 Jun 2021 08:07:21 -0400 Received: from mail-dm6nam10on2055.outbound.protection.outlook.com ([40.107.93.55]:17337 "EHLO NAM10-DM6-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S234498AbhF3MHT (ORCPT ); Wed, 30 Jun 2021 08:07:19 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dduNLiLuzh7zeEN89x/uG5T9Lyio0y1s4T/DN15CxSdv+StRUKK9ErYQixWAivHTE6aRxnGxVFFigH+1XBCJGas5J4wSykdfM7pn+7emhhrV3VdHr3RcPsih6A3AWweOrgKRA9hM3VYdmGrXRdh7BUkusZd8y1oAnlJ1k4ItgXDrlVMkZOH5Qtor3uGPuz61atzJM94oeDjV4Nj+NvKIcDV+l+e0vujgBwupwD94BCAK4gjRzN4f1tpwjuhNw4jBySuVV7850IitBFEQ2UFAPbNRM42jLFwyASs//gGinUJhVpUl1ebb7VWPPRv7q5HunVlZzg8D+fOdtAcKEaQrEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=GR/ArOBgut+NAPXxXwppebwgI2N4y+/+c0hbpjqcmO0=; b=FwQ/ayRUjgXKBlcRIUIdj42ttTXUE6wjofr1R/JxWcwBn15E51I0iNZiTJ60z2mCeqZPmVn+WhdveQZ/CLVskYrR8MBRsm50xCwpLwY3x+c5Dckw7ZI+PKkaJA359+bQT6OQq20ytmPcxpsUqddozZZ2mZBtiOGGtYZ4tg3fWcXJxvv9v53CMf25wFgZngWUN4rkCG03bLsTelLrnSWNmu7FtxQRFMipYD3xKS4GivuTE6bj8D+UNQtbGzeVa96RtzdQp+cJg64m8CENfSTxLvCA9RApQWJoBz0LY80xT+P3kJdj2p+Yyv6cLS+sHUQFzwpILwZKzzUOus4vNw/jqA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=GR/ArOBgut+NAPXxXwppebwgI2N4y+/+c0hbpjqcmO0=; b=CSL804gryk5YilrJbBNVlHi/yIgkEpF98ZxeOVYIb1iocHKBwM3Cc7a5aWoxY+DqGROL5JrIGISJD18/tCGlrhXipGCu0Xq32HIOcSYV9vObUb4KY/1zfIBAsxrWxZfTjxw5S3rtR51ptz+tb6q/FKKhvRotmwTfS/NyeBZI5pg= Received: from MW4P223CA0028.NAMP223.PROD.OUTLOOK.COM (2603:10b6:303:80::33) by CH2PR12MB3816.namprd12.prod.outlook.com (2603:10b6:610:2f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.18; Wed, 30 Jun 2021 12:04:49 +0000 Received: from CO1NAM11FT005.eop-nam11.prod.protection.outlook.com (2603:10b6:303:80:cafe::9e) by MW4P223CA0028.outlook.office365.com (2603:10b6:303:80::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.20 via Frontend Transport; Wed, 30 Jun 2021 12:04:49 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; kernel.org; dkim=none (message not signed) header.d=none;kernel.org; dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1NAM11FT005.mail.protection.outlook.com (10.13.174.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4264.18 via Frontend Transport; Wed, 30 Jun 2021 12:04:49 +0000 Received: from jatayu.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.4; Wed, 30 Jun 2021 07:04:46 -0500 From: Nehal Bakulchandra Shah To: CC: , , "Nehal Bakulchandra Shah" , kernel test robot , Shyam Sundar S K , Liang Liang Subject: [PATCH v3 3/3] spi:amd:Fix for compilation error for non X86 platforms. Date: Wed, 30 Jun 2021 17:34:25 +0530 Message-ID: <20210630120425.606957-4-Nehal-Bakulchandra.shah@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210630120425.606957-1-Nehal-Bakulchandra.shah@amd.com> References: <20210630120425.606957-1-Nehal-Bakulchandra.shah@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cd2d4ead-7623-4d97-a9f6-08d93bbf429b X-MS-TrafficTypeDiagnostic: CH2PR12MB3816: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4125; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VPELlNzL5OUZ3UxE7IcmViRKGUUZiniCt52CI+AueAir+G+KYn3DcvI2HuPtcDlenG3TQAAzNyjDDs+K4/k6N/il/j2wJvvNX40NJVz6SbH9WqcSN/oyXUWvMg7NnH1GRXSQR9CKG3hfG5w7MrAFT6qsrDpByAeKixr5mKUFURsKyYAwI3kRsB31I7Sk35Y2KtJUwjVQmK5EHTtV+CZ30o5rWgomr1mxXLziXa+ndKLjIBAkaESnUi8TEXpTaFsMn7JpZjiI0w/aTdzadLIZnC4OJQPy0i7fakox+0YegL/EWNJ2KVHdZ01Aj/rBWhi3PJiOk6a6XLdF+ZDmbAMlsor1AWXlE3AXJUcKro5L9K87Y2NQuJGmQcg+p1Moqsh86hgmvJeGzq7idnUfLtrLikA2LNQEeXms7Ocm/jmvfFQG1IWQSqTaV1Eei8GlVyTnsJ+my3smAOBJo0eV0HIUxXkM2drGrUvyckhFMkK0bF3cpGBfIbQx4YSoaWGv2rH6HTEiRnf7vqhemOt4btD1Ymhm8z6NF6JqRTlyzqrIJsUSXFrwo6WgTv/20XtOPQLwj99zp8d4MImAolO0S+dH+YqrnSiRLyFcCeiXS5ps/lDfvvvJuLi/lRa6h/2WDSkPCtDmY4QnglyG648n/CpM6pqfEIKWSfAHgtUIpk5GkwbuwdZK0JeP2oY/XPPjrYPn6YUUTXD9H7YFzbj2lSA0H1n9qcW2tH5xiQkDnJqvtLc= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(346002)(136003)(376002)(396003)(39860400002)(36840700001)(46966006)(5660300002)(83380400001)(82310400003)(478600001)(54906003)(2906002)(4326008)(8936002)(7696005)(81166007)(16526019)(186003)(70586007)(8676002)(6916009)(70206006)(82740400003)(356005)(26005)(36756003)(6666004)(36860700001)(47076005)(4744005)(426003)(86362001)(336012)(316002)(1076003)(2616005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2021 12:04:49.0266 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cd2d4ead-7623-4d97-a9f6-08d93bbf429b X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT005.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB3816 Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org Update the KConfig with dependency for ACPI as driver is only supported for x86 platform. This fixes the compilation error reported by kernel test robot. Reported-by: kernel test robot Reviewed-by: Shyam Sundar S K Reviewed-by: Liang Liang (Leo) Signed-off-by: Nehal Bakulchandra Shah --- drivers/spi/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index e71a4c514f7b..532387929085 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -978,7 +978,7 @@ config SPI_ZYNQMP_GQSPI config SPI_AMD tristate "AMD SPI controller" - depends on SPI_MASTER || COMPILE_TEST + depends on (SPI_MASTER && ACPI) || COMPILE_TEST help Enables SPI controller driver for AMD SoC.