Received: by 2002:a05:6359:c8b:b0:c7:702f:21d4 with SMTP id go11csp872269rwb; Mon, 26 Sep 2022 07:00:01 -0700 (PDT) X-Google-Smtp-Source: AMsMyM67J+UqxACH+UE7SbHgeVRh6TGrpsK+jHWRxUAoQGRm+nNY6gYyonjW67XBgv7gdDySybxr X-Received: by 2002:a63:24d:0:b0:439:3804:d0ff with SMTP id 74-20020a63024d000000b004393804d0ffmr20135537pgc.414.1664200798302; Mon, 26 Sep 2022 06:59:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664200798; cv=none; d=google.com; s=arc-20160816; b=HSiABeVe4+nrhusk7HSUvSHDz/PNdqvDbNeK1jdd+06fyPM6YIcWXw1nKgMei/GVzd Mw7B3AA9Sl6/IjJ34e6IyWzPmihFf2nZB0r2algR5SVcd3l7XwVS16jQxf8pzQIBXz8W HhVQFQKR6EXWQhf+t9QM4jmruzVv11i7SLC/KjXYlZc/VbCYNONrCcMzU9UPNQasLgOa UvUEJxy1CMWRDFrhssWArh5r1XLa2teMDVajVDAhSlKFK7f99Zl+8p2wwbtEcJDYvZu3 3bFZEkTbDJrS8CMNGU7apUG8vcbNXN08XwHOFjoFXPhi/MhclZidQHz7yjjmzWaskYUP +ang== 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=VF/fhU8E3LGh7tNMvYFt+N/DdUjCSdgxKRztCvzQSL4=; b=C5wMg+YL6xEX1nVPjgnA6XTIbnKWLS9khc9tZBHjUVpjErCiimBRekQ+YgTR16gtPK nPeNp71NNRLp08Uikt/dEXIw2dxyJ5zIJYYjED4Pqxt+Y2gFOm798P/JATr67AyCiEFw AwhTQD19uUQtvUtPoAu4XPkUdy1oIGOtop9Tr1DgasnUst7ZQpve1Dds/h7KndPiMx6m G4mk/Um6Yfuko8HOm01+J1dkaiUEDabrGl1LgofTWCSkv+5oL21OXN4B4Dxpp2OHI/5s DEtikF93xnKz2CsDy5Tp4zfTt3G5/57LQMKGfaMtveXshA1YsbNwQwa1NIVkVYtI5hg2 jV9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=p9M8xF9n; 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 n9-20020a170902f60900b00171e397f820si12204772plg.309.2022.09.26.06.59.46; Mon, 26 Sep 2022 06:59:58 -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=p9M8xF9n; 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 S237612AbiIZLM4 (ORCPT + 99 others); Mon, 26 Sep 2022 07:12:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55026 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237409AbiIZLLq (ORCPT ); Mon, 26 Sep 2022 07:11:46 -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 D4E856069E; Mon, 26 Sep 2022 03:35:39 -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 8C8AEB80185; Mon, 26 Sep 2022 10:35:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D37C3C433D6; Mon, 26 Sep 2022 10:35:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1664188534; bh=5NmGOfUTTn06COPfaEs9Q4YlM8A7i/TB4E1UkRaA2LU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=p9M8xF9nhj6C6AekuCgjymIAwNdZW414tc0qhDC1wf9He3HQ61u8a9iC0wfu0pji0 N8JkW7379tH4J1nc43fVWBIuaNKjOgZ75+4ycIHPdY7aUTiJTKCYHi4dHZ7I+UibIW pLUl8E2RgSYrF1MXdLYAVqvfCgI6u3J8Lma3eRDw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Gil Fine , Mika Westerberg Subject: [PATCH 5.15 039/148] thunderbolt: Add support for Intel Maple Ridge single port controller Date: Mon, 26 Sep 2022 12:11:13 +0200 Message-Id: <20220926100757.488646125@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220926100756.074519146@linuxfoundation.org> References: <20220926100756.074519146@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.2 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 commit 14c7d905283744809e6b82efae2f490660a11cda upstream. 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: Greg Kroah-Hartman --- drivers/thunderbolt/icm.c | 1 + drivers/thunderbolt/nhi.h | 1 + 2 files changed, 2 insertions(+) --- a/drivers/thunderbolt/icm.c +++ b/drivers/thunderbolt/icm.c @@ -2522,6 +2522,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; --- a/drivers/thunderbolt/nhi.h +++ b/drivers/thunderbolt/nhi.h @@ -55,6 +55,7 @@ extern const struct tb_nhi_ops icl_nhi_o * 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