From nobody Sat Feb 7 10:09:35 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 877BDEB64DC for ; Fri, 21 Jul 2023 11:46:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230053AbjGULqh (ORCPT ); Fri, 21 Jul 2023 07:46:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45644 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229593AbjGULqe (ORCPT ); Fri, 21 Jul 2023 07:46:34 -0400 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2087.outbound.protection.outlook.com [40.107.237.87]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A76722D4D for ; Fri, 21 Jul 2023 04:46:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Luojjug3zSu7IQ/KOHHQ0IJXTPP36iubmL3Og8g7/TDvXU7dQhWEHaOQM8SttC/HKBKM13qclEYUNpqdIhb0RY6WPmB1VDyKJArScC6M8zhE+6NQZIp4VAqHNjwCy9Q/Wq/HS+XySUpvIYGp9ISOHhzfyF9Xzs1qjz4Q6iwEA1/at4Mx828b4yB/Sgm/cLSALF1kuSM9q7tVezp3F4jD2PUb6nPctgzgUUC6oxshXsJnZsnA6vh4zRhIW1ovgtYvqPQt0JjsuFzi1JyjjeNzIVS3wPoZ//DMi63Tf1zEOLZAfVdfP4fZcDtm9fhDGQL2Zar+4TnzHZOVUyGKkr6+EA== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=d38WId5sevhv8YKBOVa+j/ui7I+ydvJVizLr9GOr+nc=; b=NeiIcnGOeOb9MyWGLlTSx8El8TMbyljb8oPePD4vaJAqxvi+LakW+Ykxx0CteuqM/lP5N/XWdcO9rS9ge4hzETeNuCApi9fdIgEKudoC4SyM/8ia6LL74bFY/JxenC0ayS+dyZTaI6Gre/GsJfngBr1g+4FjTYne7Jwh6Taj4svv15ZAjIJ6V1iXpu3x6xe8RP7JshB0HBbl2Y/EISZdFuK3fgadzZRg8Jk90R8lWuNNBiZV1Nox3CtY04kE/8+rqCYu95ztHA9IdgfEjfywEwK0Z+iM/ylTeiM2t6kYqX/16XBKgMqasBfj8zvDKYv/lktlA1BUH3JH4XmLrAenmQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=linuxfoundation.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=d38WId5sevhv8YKBOVa+j/ui7I+ydvJVizLr9GOr+nc=; b=0G9Xg0YU6PCbuv759+mvflA26KFcQ7y9E0m889L6mvxbR3ExghCS7s0Rqvc6U4zkap0sP9NPR8hXCEC8d6pUaa5Mh+1qSxIm9WKUKUaH324SIAA/0oIWU8pTN+srlp5S0qaLWecLTINM84zYEGM1uPwYDqCr97k8t05MJdv3bq8= Received: from MW4PR03CA0278.namprd03.prod.outlook.com (2603:10b6:303:b5::13) by DS0PR12MB7925.namprd12.prod.outlook.com (2603:10b6:8:14b::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6609.25; Fri, 21 Jul 2023 11:46:28 +0000 Received: from CO1NAM11FT104.eop-nam11.prod.protection.outlook.com (2603:10b6:303:b5:cafe::59) by MW4PR03CA0278.outlook.office365.com (2603:10b6:303:b5::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6609.28 via Frontend Transport; Fri, 21 Jul 2023 11:46:27 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;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; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1NAM11FT104.mail.protection.outlook.com (10.13.174.220) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6609.28 via Frontend Transport; Fri, 21 Jul 2023 11:46:27 +0000 Received: from SATLEXMB08.amd.com (10.181.40.132) 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.2507.23; Fri, 21 Jul 2023 06:46:27 -0500 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB08.amd.com (10.181.40.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Fri, 21 Jul 2023 04:46:26 -0700 Received: from xhdipdslab41.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.23 via Frontend Transport; Fri, 21 Jul 2023 06:46:24 -0500 From: Nipun Gupta To: , CC: , , , , , Nipun Gupta Subject: [PATCH v2] cdx: add support for bus mastering Date: Fri, 21 Jul 2023 17:16:22 +0530 Message-ID: <20230721114622.24313-1-nipun.gupta@amd.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT104:EE_|DS0PR12MB7925:EE_ X-MS-Office365-Filtering-Correlation-Id: b4c854e1-72cf-4091-5bb5-08db89e01e6d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7KWvFxx9KbSI9Ot9LJDm7QuuZDpwTh+oNMxuefFNbPOahi97vbSz3nbpsQ9fl4iXlqSD3vLUPOe3gGKRbv56U134lFKA42Wz2rJrOo67RkplVyXCq4Nd/2RsdiXedrn0g2b9Acx9+KfK4wUQc0kNGcWd2Q0nEKIE5i+kd7LjVB2HlwICxJmQivx2YLYxepPIL5bnaJ4+a1wVHh5RiRjUAMZr1EA66qMIf2BsVo/D9OzME2T+2FAHz2ccAwgYOIC6eoc6Z93czF3Bp2HLia3XIseF98wytmIu35c5y0dyot90nBPsMXuI1peZQlZUswkc2dESQETkudYUhi5waIj5YfwRISEqrQqWPBwicYI+Sxp1jhxwUrWA9EgsNSgH1WtmPV8p+SjLuVqYhv60GS8epq/O8mg2ZME+H12kZ2vIAvENzM7CCJFw8WcbhLw+6W9rH7wSlIj+qDQT15kLCe9Bqz2BcnYeGylckj6h4ChFGjfF8AUESXbn2RlmiK5i1ItbWE0Alks8PdNf2JTrfbutBJ65ZdZqPEv+u81xKwKfz5RRxH0Ipr8O8uzKW0P7nQl0Is4U7uxoSG84uBCwozVo8QIubim4m6hx6btrub8eU9+R20mv2NEehyJ4CedTJxotTMVWAkkHgL6DK7RxXFV96C02RqJxaRz5LEuu2ELZxWdM9BF/vaj5sCz3tKbuP2LNT5uWI+aC4kzEgFoC+FxBVvIGkEvYOWRpQyeaQM5/cEZ38ZPQHk3S7hNFWWAujJjI1J+DivG7DY8pXAKysEzZZw== 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:(13230028)(4636009)(136003)(39860400002)(396003)(346002)(376002)(82310400008)(451199021)(40470700004)(36840700001)(46966006)(41300700001)(1076003)(336012)(186003)(26005)(478600001)(110136005)(316002)(4326008)(40480700001)(70206006)(70586007)(8936002)(8676002)(44832011)(5660300002)(54906003)(2616005)(356005)(47076005)(426003)(83380400001)(40460700003)(36860700001)(2906002)(81166007)(82740400003)(36756003)(86362001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jul 2023 11:46:27.7657 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b4c854e1-72cf-4091-5bb5-08db89e01e6d 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: CO1NAM11FT104.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB7925 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Introduce cdx_set_master() and cdx_clear_master() APIs to support enable and disable of bus mastering. Drivers need to use these APIs to enable/disable DMAs from the CDX devices. Signed-off-by: Nipun Gupta Reviewed-by: Pieter Jansen van Vuuren --- Changes v1->v2: - Replace bme with bus_master_enable - Added check for dev_configure API callback - remove un-necessary error prints - changed conditional to if-else - updated commit message to use 72 columns drivers/cdx/cdx.c | 29 +++++++++++++ drivers/cdx/controller/cdx_controller.c | 4 ++ drivers/cdx/controller/mcdi_functions.c | 58 +++++++++++++++++++++++++ drivers/cdx/controller/mcdi_functions.h | 13 ++++++ include/linux/cdx/cdx_bus.h | 16 +++++++ 5 files changed, 120 insertions(+) diff --git a/drivers/cdx/cdx.c b/drivers/cdx/cdx.c index d2cad4c670a0..71ddb56a5d08 100644 --- a/drivers/cdx/cdx.c +++ b/drivers/cdx/cdx.c @@ -182,6 +182,35 @@ cdx_match_id(const struct cdx_device_id *ids, struct c= dx_device *dev) return NULL; } =20 +int cdx_set_master(struct cdx_device *cdx_dev) +{ + struct cdx_controller *cdx =3D cdx_dev->cdx; + struct cdx_device_config dev_config; + int ret =3D EOPNOTSUPP; + + dev_config.type =3D CDX_DEV_BUS_MASTER_CONF; + dev_config.bus_master_enable =3D true; + if (cdx->ops->dev_configure) + ret =3D cdx->ops->dev_configure(cdx, cdx_dev->bus_num, + cdx_dev->dev_num, &dev_config); + + return ret; +} +EXPORT_SYMBOL_GPL(cdx_set_master); + +void cdx_clear_master(struct cdx_device *cdx_dev) +{ + struct cdx_controller *cdx =3D cdx_dev->cdx; + struct cdx_device_config dev_config; + + dev_config.type =3D CDX_DEV_BUS_MASTER_CONF; + dev_config.bus_master_enable =3D false; + if (cdx->ops->dev_configure) + cdx->ops->dev_configure(cdx, cdx_dev->bus_num, + cdx_dev->dev_num, &dev_config); +} +EXPORT_SYMBOL_GPL(cdx_clear_master); + /** * cdx_bus_match - device to driver matching callback * @dev: the cdx device to match against diff --git a/drivers/cdx/controller/cdx_controller.c b/drivers/cdx/controll= er/cdx_controller.c index dc52f95f8978..39aa569d8e07 100644 --- a/drivers/cdx/controller/cdx_controller.c +++ b/drivers/cdx/controller/cdx_controller.c @@ -55,6 +55,10 @@ static int cdx_configure_device(struct cdx_controller *c= dx, case CDX_DEV_RESET_CONF: ret =3D cdx_mcdi_reset_device(cdx->priv, bus_num, dev_num); break; + case CDX_DEV_BUS_MASTER_CONF: + ret =3D cdx_mcdi_bus_master_enable(cdx->priv, bus_num, dev_num, + dev_config->bus_master_enable); + break; default: ret =3D -EINVAL; } diff --git a/drivers/cdx/controller/mcdi_functions.c b/drivers/cdx/controll= er/mcdi_functions.c index 0158f26533dd..6acd8fea4586 100644 --- a/drivers/cdx/controller/mcdi_functions.c +++ b/drivers/cdx/controller/mcdi_functions.c @@ -137,3 +137,61 @@ int cdx_mcdi_reset_device(struct cdx_mcdi *cdx, u8 bus= _num, u8 dev_num) =20 return ret; } + +static int cdx_mcdi_ctrl_flag_get(struct cdx_mcdi *cdx, u8 bus_num, + u8 dev_num, u32 *flags) +{ + MCDI_DECLARE_BUF(inbuf, MC_CMD_CDX_DEVICE_CONTROL_GET_IN_LEN); + MCDI_DECLARE_BUF(outbuf, MC_CMD_CDX_DEVICE_CONTROL_GET_OUT_LEN); + size_t outlen; + int ret; + + MCDI_SET_DWORD(inbuf, CDX_DEVICE_CONTROL_GET_IN_BUS, bus_num); + MCDI_SET_DWORD(inbuf, CDX_DEVICE_CONTROL_GET_IN_DEVICE, dev_num); + ret =3D cdx_mcdi_rpc(cdx, MC_CMD_CDX_DEVICE_CONTROL_GET, inbuf, + sizeof(inbuf), outbuf, sizeof(outbuf), &outlen); + if (ret) + return ret; + + if (outlen !=3D MC_CMD_CDX_DEVICE_CONTROL_GET_OUT_LEN) + return -EIO; + + *flags =3D MCDI_DWORD(outbuf, CDX_DEVICE_CONTROL_GET_OUT_FLAGS); + + return 0; +} + +static int cdx_mcdi_ctrl_flag_set(struct cdx_mcdi *cdx, u8 bus_num, + u8 dev_num, bool enable, int lbn) +{ + MCDI_DECLARE_BUF(inbuf, MC_CMD_CDX_DEVICE_CONTROL_SET_IN_LEN); + u32 flags; + int ret; + + /* + * Get flags and then set/reset BUS_MASTER_BIT according to + * the input params. + */ + ret =3D cdx_mcdi_ctrl_flag_get(cdx, bus_num, dev_num, &flags); + if (ret) + return ret; + + flags =3D flags & (u32)(~(BIT(lbn))); + if (enable) + flags |=3D (1 << lbn); + + MCDI_SET_DWORD(inbuf, CDX_DEVICE_CONTROL_SET_IN_BUS, bus_num); + MCDI_SET_DWORD(inbuf, CDX_DEVICE_CONTROL_SET_IN_DEVICE, dev_num); + MCDI_SET_DWORD(inbuf, CDX_DEVICE_CONTROL_SET_IN_FLAGS, flags); + ret =3D cdx_mcdi_rpc(cdx, MC_CMD_CDX_DEVICE_CONTROL_SET, inbuf, + sizeof(inbuf), NULL, 0, NULL); + + return ret; +} + +int cdx_mcdi_bus_master_enable(struct cdx_mcdi *cdx, u8 bus_num, + u8 dev_num, bool enable) +{ + return cdx_mcdi_ctrl_flag_set(cdx, bus_num, dev_num, enable, + MC_CMD_CDX_DEVICE_CONTROL_SET_IN_BUS_MASTER_ENABLE_LBN); +} diff --git a/drivers/cdx/controller/mcdi_functions.h b/drivers/cdx/controll= er/mcdi_functions.h index 7440ace5539a..a448d6581eb4 100644 --- a/drivers/cdx/controller/mcdi_functions.h +++ b/drivers/cdx/controller/mcdi_functions.h @@ -58,4 +58,17 @@ int cdx_mcdi_get_dev_config(struct cdx_mcdi *cdx, int cdx_mcdi_reset_device(struct cdx_mcdi *cdx, u8 bus_num, u8 dev_num); =20 +/** + * cdx_mcdi_bus_master_enable - Set/Reset bus mastering for cdx device + * represented by bus_num:dev_num + * @cdx: pointer to MCDI interface. + * @bus_num: Bus number. + * @dev_num: Device number. + * @enable: Enable bus mastering if set, disable otherwise. + * + * Return: 0 on success, <0 on failure + */ +int cdx_mcdi_bus_master_enable(struct cdx_mcdi *cdx, u8 bus_num, + u8 dev_num, bool enable); + #endif /* CDX_MCDI_FUNCTIONS_H */ diff --git a/include/linux/cdx/cdx_bus.h b/include/linux/cdx/cdx_bus.h index bead71b7bc73..1816c279879e 100644 --- a/include/linux/cdx/cdx_bus.h +++ b/include/linux/cdx/cdx_bus.h @@ -21,11 +21,13 @@ struct cdx_controller; =20 enum { + CDX_DEV_BUS_MASTER_CONF, CDX_DEV_RESET_CONF, }; =20 struct cdx_device_config { u8 type; + bool bus_master_enable; }; =20 typedef int (*cdx_scan_cb)(struct cdx_controller *cdx); @@ -170,4 +172,18 @@ extern struct bus_type cdx_bus_type; */ int cdx_dev_reset(struct device *dev); =20 +/** + * cdx_set_master - enables bus-mastering for CDX device + * @cdx_dev: the CDX device to enable + * + * Return: 0 for success, -errno on failure + */ +int cdx_set_master(struct cdx_device *cdx_dev); + +/** + * cdx_clear_master - disables bus-mastering for CDX device + * @cdx_dev: the CDX device to disable + */ +void cdx_clear_master(struct cdx_device *cdx_dev); + #endif /* _CDX_BUS_H_ */ --=20 2.17.1