Received: by 2002:a05:6359:c8b:b0:c7:702f:21d4 with SMTP id go11csp2519076rwb; Mon, 3 Oct 2022 01:49:28 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4QEvr55Sl77vIMv+SqzoJhmDw6NBoVHmW/2R0LmMWvElB37CVUMti0xoQps9mIGuPTKIog X-Received: by 2002:a63:d843:0:b0:43c:8ce9:2aab with SMTP id k3-20020a63d843000000b0043c8ce92aabmr17947122pgj.556.1664786968063; Mon, 03 Oct 2022 01:49:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664786968; cv=none; d=google.com; s=arc-20160816; b=DT3Qfbtbh1j8cqrE5AOLoireFiKJ3LmW8nTyebFz+j6gII+dp6aboRoSmITau1ISvZ XJcdVL+nZg2ONgQHV4nJwyQ3EyBOy6Liy4QQEWfCuZc7fZbAcq0w03pdsNm5MJHwpLYR rgMyogZxIRmXxK4k6ASOk9CdQCiflh6vijTq20uiG1DDBCgOO0l17ne7vLSnBA20MzDl pJOQkzwUd9BVIPVMQvcC8KqiXAJbEBJkPowViM9xzNPsHXALq6LfmxxHpTgIZGlvXHXv Wswjt5xfMpQkJmfWCvtZ9vs0ysVh+mO/7gkqYWYNwvHtUTcYLumFfavhdFAIcHu5HCyB EJ4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=jag04VeYOhHiDuBIIne99dwcGAqUSqOdbmODPJmlflE=; b=dG+k485PBNX9PWmfnjYi+ipyrLuabS9OR0RP7xc3NR/w0CVExGUbzdzFfF02XTKVW8 95c7FhJKMcxT0AB5Ik0bnc1frvyFRE4C07m/LfQ2ilhFZEJqYxtNyHmX8gw+tqaYxEoM rh+7rQN5QI96aGiO8GtfcCtSax4LH2rGK5ujjEtaDgps4zxez7I4tQOET0AzCMuEODhF mYdWxDZZzWoFtFrkusnC5rvs+v1wioMX1scOeodBAGsdIg+CpOmAK1yJ36ytea3XheaE mbD/yWrPK8VHmkbfwrmSqlthdUyeqHYlgna9lwP6kV15iIqq2tRgJ1jecZvF7yygpcG2 YUdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=SbPhipzm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z10-20020a170902834a00b00176bccea71esi9180626pln.57.2022.10.03.01.49.17; Mon, 03 Oct 2022 01:49:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=SbPhipzm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231473AbiJCHdU (ORCPT + 99 others); Mon, 3 Oct 2022 03:33:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55090 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230413AbiJCHcp (ORCPT ); Mon, 3 Oct 2022 03:32:45 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B59DB43E78; Mon, 3 Oct 2022 00:21:08 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 203EFB80E84; Mon, 3 Oct 2022 07:21:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 74232C433C1; Mon, 3 Oct 2022 07:21:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1664781666; bh=tZT+eP/ywUMU4rcggwidpzTZYcl4r+/On1w7V/PcJY8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SbPhipzmHdCePY2tyz8pC2CxrWRyAyAYJIDETXKa0ZB9fqoSNgs2MUeY9XXH2peoN AWzm0GlZJeO6802sU6lcAtneeM4UZg3THqa2/z8eYE9whvI91ILXwpIGAlOBwMf08b mhaYpEO4MZ6qvN/79v5cDeG6yHdYb98huJ4xtsTg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Gil Fine , Mika Westerberg , Sasha Levin Subject: [PATCH 5.10 02/52] thunderbolt: Add support for Intel Maple Ridge single port controller Date: Mon, 3 Oct 2022 09:11:09 +0200 Message-Id: <20221003070718.769623847@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221003070718.687440096@linuxfoundation.org> References: <20221003070718.687440096@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Gil Fine [ Upstream commit 14c7d905283744809e6b82efae2f490660a11cda ] Add support for Maple Ridge discrete USB4 host controller from Intel which has a single USB4 port (versus the already supported dual port Maple Ridge USB4 host controller). Cc: stable@vger.kernel.org Signed-off-by: Gil Fine Signed-off-by: Mika Westerberg Signed-off-by: Sasha Levin --- drivers/thunderbolt/icm.c | 1 + drivers/thunderbolt/nhi.h | 1 + 2 files changed, 2 insertions(+) diff --git a/drivers/thunderbolt/icm.c b/drivers/thunderbolt/icm.c index fa24ea8cae75..b2fb3397310e 100644 --- a/drivers/thunderbolt/icm.c +++ b/drivers/thunderbolt/icm.c @@ -2301,6 +2301,7 @@ struct tb *icm_probe(struct tb_nhi *nhi) tb->cm_ops = &icm_icl_ops; break; + case PCI_DEVICE_ID_INTEL_MAPLE_RIDGE_2C_NHI: case PCI_DEVICE_ID_INTEL_MAPLE_RIDGE_4C_NHI: icm->is_supported = icm_tgl_is_supported; icm->get_mode = icm_ar_get_mode; diff --git a/drivers/thunderbolt/nhi.h b/drivers/thunderbolt/nhi.h index 69770beca792..7ad6d3f0583b 100644 --- a/drivers/thunderbolt/nhi.h +++ b/drivers/thunderbolt/nhi.h @@ -55,6 +55,7 @@ extern const struct tb_nhi_ops icl_nhi_ops; * need for the PCI quirk anymore as we will use ICM also on Apple * hardware. */ +#define PCI_DEVICE_ID_INTEL_MAPLE_RIDGE_2C_NHI 0x1134 #define PCI_DEVICE_ID_INTEL_MAPLE_RIDGE_4C_NHI 0x1137 #define PCI_DEVICE_ID_INTEL_WIN_RIDGE_2C_NHI 0x157d #define PCI_DEVICE_ID_INTEL_WIN_RIDGE_2C_BRIDGE 0x157e -- 2.35.1