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>,
        <stable@vger.kernel.org>
Subject: [PATCH] usb: cdnsp: changes PCI Device ID to fix conflict with CNDS3 driver
Date:   Thu, 9 Mar 2023 01:30:48 -0500
Message-ID: <20230309063048.299378-1-pawell@cadence.com>
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: BN8NAM12FT042:EE_|MN2PR07MB6174:EE_
X-MS-Office365-Filtering-Correlation-Id: 9458b12f-f28f-45f2-0184-08db2067dcbe
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: ZNmjS84gXlYEQdYI9q1OcGpPNZSzYYNUs6PB4aORZ+/+pbG66JEK+SAH1PXtXKU5Y0oB0NVbRFaNlZmPvC8gEPsHHI0n3FSwno2moCroLqO9M8kf/uPiO9PDtt/GQsP+YOs6RTa00+fwv562XpoICEmpIGpkxcrRu5Y3P/+d7Q7V2dba2uHMGuBcHfTBHEayRYUQu4UrDS8S953c5SNLBASavhVRFbUDXF1ETcEPgdQM6MU8VcY3LHlbx9DuaQLFP/nrLdmiLzYhpfay1VVoWxaXy1gMkJApmL75mQFERQF4WbiaDKWT2Zielpvt/Ju25x+af9+VpUeGoBHMPLItzLbsq7KKLq7ZMVgoHgA8isajGnMjw06MGKpgbaLeEkgtSxFZ6TY2Rhuhg4P821FLrTdrnmCXaUN3eX86IzlowXO0zj4USE0TI8HLoMcclTdrho8WASooNXBq/wLcqRYfmbO6wTGIwBvmAL6eQpZj+eTrcakW+u8mXmQiJNVyJTIXjPjV17P8zluWaeHv+1JBqW3xmuBHBCzzUNvnJAHc/6aEXL3VVDOA4+8haDQA62kJUuZboo63VFUgm34gZ4ZLAhtlcsC+sMoyM8qXDyvsS62Qcuihses466A1ZsM2p+1isUGtsxT3aDIo2uY3S3NcOz8vS1ilr/XQ8gdF1HgVrF3QYaPWnpWBbhNstYxFxpED2tnUAAmRPDwp6bvwegolPs8eMJLvCXNRShsUqxUU4Mlp5PU5x76A2LtdCHA7LtNF
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:(13230025)(4636009)(346002)(39860400002)(396003)(376002)(136003)(36092001)(451199018)(40470700004)(46966006)(36840700001)(8676002)(82310400005)(4326008)(70586007)(6916009)(6666004)(70206006)(356005)(2906002)(26005)(1076003)(186003)(8936002)(336012)(40480700001)(36756003)(426003)(2616005)(47076005)(81166007)(41300700001)(5660300002)(83380400001)(36860700001)(82740400003)(54906003)(478600001)(86362001)(40460700003)(316002)(42186006)(36900700001);DIR:OUT;SFP:1101;
X-OriginatorOrg: cadence.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Mar 2023 06:31:05.8654
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 9458b12f-f28f-45f2-0184-08db2067dcbe
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: BN8NAM12FT042.eop-nam12.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR07MB6174
X-Proofpoint-GUID: XuawggpevoVkw0Y9BN1L2YkP8fw1s0Ku
X-Proofpoint-ORIG-GUID: XuawggpevoVkw0Y9BN1L2YkP8fw1s0Ku
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22
 definitions=2023-03-09_03,2023-03-08_03,2023-02-09_01
X-Proofpoint-Spam-Details: rule=outbound_check_notspam policy=outbound_check score=0 bulkscore=0
 mlxscore=0 lowpriorityscore=0 suspectscore=0 impostorscore=0
 malwarescore=0 adultscore=0 mlxlogscore=886 clxscore=1015 phishscore=0
 priorityscore=1501 spamscore=0 classifier=spam adjust=0 reason=mlx
 scancount=1 engine=8.12.0-2212070000 definitions=main-2303090050
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Patch changes CDNS_DEVICE_ID in USBSSP PCI Glue driver to remove
the conflict with Cadence USBSS driver.

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/cdnsp-pci.c | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/drivers/usb/cdns3/cdnsp-pci.c b/drivers/usb/cdns3/cdnsp-pci.c
index efd54ed918b9..7b151f5af3cc 100644
--- a/drivers/usb/cdns3/cdnsp-pci.c
+++ b/drivers/usb/cdns3/cdnsp-pci.c
@@ -29,30 +29,23 @@
 #define PLAT_DRIVER_NAME	"cdns-usbssp"
 
 #define CDNS_VENDOR_ID		0x17cd
-#define CDNS_DEVICE_ID		0x0100
+#define CDNS_DEVICE_ID		0x0200
+#define CDNS_DRD_ID		0x0100
 #define CDNS_DRD_IF		(PCI_CLASS_SERIAL_USB << 8 | 0x80)
 
 static struct pci_dev *cdnsp_get_second_fun(struct pci_dev *pdev)
 {
-	struct pci_dev *func;
-
 	/*
 	 * Gets the second function.
-	 * It's little tricky, but this platform has two function.
-	 * The fist keeps resources for Host/Device while the second
-	 * keeps resources for DRD/OTG.
+	 * Platform has two function. The fist keeps resources for
+	 * Host/Device while the secon keeps resources for DRD/OTG.
 	 */
-	func = pci_get_device(pdev->vendor, pdev->device, NULL);
-	if (!func)
-		return NULL;
+	if (pdev->device == CDNS_DEVICE_ID)
+		return  pci_get_device(pdev->vendor, CDNS_DRD_ID, NULL);
+	else if (pdev->device == CDNS_DRD_ID)
+		return pci_get_device(pdev->vendor, CDNS_DEVICE_ID, NULL);
 
-	if (func->devfn == pdev->devfn) {
-		func = pci_get_device(pdev->vendor, pdev->device, func);
-		if (!func)
-			return NULL;
-	}
-
-	return func;
+	return NULL;
 }
 
 static int cdnsp_pci_probe(struct pci_dev *pdev,
@@ -230,6 +223,8 @@ static const struct pci_device_id cdnsp_pci_ids[] = {
 	  PCI_CLASS_SERIAL_USB_DEVICE, PCI_ANY_ID },
 	{ PCI_VENDOR_ID_CDNS, CDNS_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,
 	  CDNS_DRD_IF, PCI_ANY_ID },
+	{ PCI_VENDOR_ID_CDNS, CDNS_DRD_ID, PCI_ANY_ID, PCI_ANY_ID,
+	  CDNS_DRD_IF, PCI_ANY_ID },
 	{ 0, }
 };
 
-- 
2.25.1