Received-SPF: pass (google.com: domain of linux-kernel+bounces-54743-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Received-SPF: Pass (protection.outlook.com: domain of cadence.com designates
 64.207.220.244 as permitted sender) receiver=protection.outlook.com;
 client-ip=64.207.220.244; helo=wcmailrelayl01.cadence.com; pr=C
From: Pawel Laszczak <pawell@cadence.com>
To: <peter.chen@kernel.org>
CC: <gregkh@linuxfoundation.org>, <linux-usb@vger.kernel.org>,
        <linux-kernel@vger.kernel.org>, <pawell@cadence.com>,
        <peter.chen@cixtech.com>, <stable@vger.kernel.org>
Subject: [PATCH] usb: cdnsp: blocked some cdns3 specific code
Date: Tue, 6 Feb 2024 11:40:18 +0100
Message-ID: <20240206104018.48272-1-pawell@cadence.com>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
X-CrossPremisesHeadersFilteredBySendConnector: maileu5.global.cadence.com
X-OrganizationHeadersPreserved: maileu5.global.cadence.com
X-EOPAttributedMessage: 0
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: MW2NAM12FT106:EE_|CH2PR07MB8188:EE_
X-MS-Office365-Filtering-Correlation-Id: d05344e2-15bc-47f3-93c7-08dc2700081a
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: 
	JQ+tF3vTqX6RIBmPx7dDNbvLUzzgmdXqCRilXyXeRFvEW7agRBqPxWczbuZrpNCKpYoQ/yPWEEB5Tsg4/0sOdioHw5jo0ebGSFujhnPObJ25UHB4LbENwO8g8Ptc+q6HKfdZvlOiZmq3cicsD/2o87ZX6W3FYGxLur39GTwulBbydQWlzbWSvthMFaKls40SCn7LCWYDncYHzgx80pCFPu1A5K+H3e65YKci7u3JYk3up44gGfrvCd+t4NRAj8PjMyyShZvoWokp07Wtht9KHdnQSKyQHYKywFGAHocY7xSmcswEiAr0zwHpv7rKOeF9dzJRSVQY+9Fr+RJ7M/opHeb3+q+uDVTo9/DuDPQ0c9Em3Pf1th1sn57HOtUMFOqNV71JZgsQdW+Nf7reT1spFZ4QdCSEX/2iBwZHYz5oJPCZjjUJR63mDH5SKcHbVrPJr1eRNIt4CknHpzUoi/N6ZaAiOct2yxRYgc0rwdVXjo94S/bTxYeN0/euW2FgZxl9VlnKPMZ7g/zb0Tx+HbYiHdFITOjJY1ymwoZ5m6Z4SGIECSJARV8UrkzUEft7nsVYt2AtEjhE9Jqgo2Oyq4GtXpXYvooeGrdSb9B/OYMEea2V5HKBaTdkNKZVL/5EuQlFj/9mSQ+oAW9fYXmTaorIcqquKMEGLswVMjrT3qbg0ADo7vXv3fZhemkfnk8HF7qatfr9PDoTHkpxLiQzj82iuXMcJ2tcjS3LuvB0tGQJA7K7oJiHo7pOnGNJ/a0fHvM0WYoJLmKajULg+cC6YvQ1LQ==
X-Forefront-Antispam-Report: 
	CIP:64.207.220.244;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:wcmailrelayl01.cadence.com;PTR:ErrorRetry;CAT:NONE;SFS:(13230031)(4636009)(136003)(376002)(39860400002)(346002)(396003)(230922051799003)(451199024)(1800799012)(64100799003)(82310400011)(186009)(46966006)(40470700004)(36840700001)(47076005)(41300700001)(86362001)(8936002)(8676002)(4326008)(336012)(426003)(478600001)(36756003)(5660300002)(2616005)(6666004)(1076003)(26005)(70586007)(316002)(6916009)(42186006)(70206006)(54906003)(2906002)(83380400001)(40480700001)(40460700003)(36860700001)(81166007)(356005)(82740400003)(36900700001);DIR:OUT;SFP:1102;
X-OriginatorOrg: cadence.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Feb 2024 10:40:26.8585
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: d05344e2-15bc-47f3-93c7-08dc2700081a
X-MS-Exchange-CrossTenant-Id: d36035c5-6ce6-4662-a3dc-e762e61ae4c9
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=d36035c5-6ce6-4662-a3dc-e762e61ae4c9;Ip=[64.207.220.244];Helo=[wcmailrelayl01.cadence.com]
X-MS-Exchange-CrossTenant-AuthSource: 
	MW2NAM12FT106.eop-nam12.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR07MB8188
X-Proofpoint-ORIG-GUID: kbH1Tq2PjrhUDvFO606fTouTE0atqc1Y
X-Proofpoint-GUID: kbH1Tq2PjrhUDvFO606fTouTE0atqc1Y
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26
 definitions=2024-02-06_04,2024-01-31_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=outbound_check_notspam policy=outbound_check score=0 mlxscore=0
 lowpriorityscore=0 clxscore=1011 impostorscore=0 malwarescore=0
 bulkscore=0 adultscore=0 priorityscore=1501 suspectscore=0 spamscore=0
 mlxlogscore=902 phishscore=0 classifier=spam adjust=0 reason=mlx
 scancount=1 engine=8.19.0-2401310000 definitions=main-2402060075

host.c file has some parts of code that were introduced for CDNS3 driver
and should not be used with CDNSP driver.
This patch blocks using these parts of codes by CDNSP driver.
These elements include:
- xhci_plat_cdns3_xhci object
- cdns3 specific XECP_PORT_CAP_REG register
- cdns3 specific XECP_AUX_CTRL_REG1 register

cc: <stable@vger.kernel.org>
Fixes: 3d82904559f4 ("usb: cdnsp: cdns3 Add main part of Cadence USBSSP DRD Driver")
Signed-off-by: Pawel Laszczak <pawell@cadence.com>
---
 drivers/usb/cdns3/host.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/cdns3/host.c b/drivers/usb/cdns3/host.c
index 6164fc4c96a4..ceca4d839dfd 100644
--- a/drivers/usb/cdns3/host.c
+++ b/drivers/usb/cdns3/host.c
@@ -18,6 +18,11 @@
 #include "../host/xhci.h"
 #include "../host/xhci-plat.h"
 
+/*
+ * The XECP_PORT_CAP_REG and XECP_AUX_CTRL_REG1 exist only
+ * in Cadence USB3 dual-role controller, so it can't be used
+ * with Cadence CDNSP dual-role controller.
+ */
 #define XECP_PORT_CAP_REG	0x8000
 #define XECP_AUX_CTRL_REG1	0x8120
 
@@ -57,6 +62,8 @@ static const struct xhci_plat_priv xhci_plat_cdns3_xhci = {
 	.resume_quirk = xhci_cdns3_resume_quirk,
 };
 
+static const struct xhci_plat_priv xhci_plat_cdnsp_xhci;
+
 static int __cdns_host_init(struct cdns *cdns)
 {
 	struct platform_device *xhci;
@@ -81,8 +88,13 @@ static int __cdns_host_init(struct cdns *cdns)
 		goto err1;
 	}
 
-	cdns->xhci_plat_data = kmemdup(&xhci_plat_cdns3_xhci,
-			sizeof(struct xhci_plat_priv), GFP_KERNEL);
+	if (cdns->version < CDNSP_CONTROLLER_V2)
+		cdns->xhci_plat_data = kmemdup(&xhci_plat_cdns3_xhci,
+				sizeof(struct xhci_plat_priv), GFP_KERNEL);
+	else
+		cdns->xhci_plat_data = kmemdup(&xhci_plat_cdnsp_xhci,
+				sizeof(struct xhci_plat_priv), GFP_KERNEL);
+
 	if (!cdns->xhci_plat_data) {
 		ret = -ENOMEM;
 		goto err1;
-- 
2.37.2