From patchwork Tue May 16 19:51:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip Cox X-Patchwork-Id: 1782294 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=KuRNqev4; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QLRhQ2GbVz20dk for ; Wed, 17 May 2023 05:51:49 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1pz0hu-0001f4-Iq; Tue, 16 May 2023 19:51:38 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1pz0hr-0001e4-9W for kernel-team@lists.ubuntu.com; Tue, 16 May 2023 19:51:35 +0000 Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 04A023F1A6 for ; Tue, 16 May 2023 19:51:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1684266695; bh=r55Vi875hlGGdNUBYGlADufS5uwpD2aLJnIMVqvLigY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=KuRNqev4cpFF2TgjPFzKERMGSXzbHebad2cXAyMExA41scRDiUU5oG0mnowZyBIhG N4u4PFhqY2WVeGlc6IeyMnleqDTBdO6zhs/+PMyzN1by5wsPmb9B2sKgCAxm24sf8q Sk+K/grEXQT24aFmaYcJA1Uh/JPCByD4w2RdZCeJyfWrC0uF5D82fYsoTVqJQoqIbq AmbR1Uxri4ujM+SdN5AR45xBKth8NUJC5mh+8c3KdjXalXR3aU69lGTdYP3gTpxuUt 1yqzp6wjsT60WIdulAIadqbqn/1p5/Pr14g8zRGfeZ6IAsTWcarWjR28XrBTtDzMzi HcIuOVrCDaJCw== Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-7578a3358ceso1348149985a.1 for ; Tue, 16 May 2023 12:51:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684266693; x=1686858693; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=r55Vi875hlGGdNUBYGlADufS5uwpD2aLJnIMVqvLigY=; b=Z/kKKgOEsbdQg/X+ehaBT7VENjFQioH0/PxHpYwJl8/1kYYG4fTHGR23kXMOu84hRo HbVP7whSXiDY5K97OJTXSy2vMfui887POVrgaVLEHI63l7/NlY/u/mahMS/ampy5kBW0 KBZzqI+c65Z+8/zOhO1Vr26u3CbIriNw6CSRtBaxRxtKZLpcSHs4o/+5Ryn881SMPsYM CEV9KoNIpKBbHPb0LyuF1VK94lusKpryp+SKijirh1XVqYMSi/soobvwbjc6H/Gdehpy hIYXMbwHs76y0q+7uX0oKRLmNpBE/z1UddWjjWRCMeHqgnHUNyNBPVDMuovMsxYkbZSB Pzwg== X-Gm-Message-State: AC+VfDwc6zlNlTT0g2WT6ZHOxa23OcQWk7d7R339ccMRAERXxGe/0/Vt 5C4K0Z3oGeRbSNJoxLSCsCNFqKSAb2m4pbeqhSikaxSljdifc0/mJB7xLkgKRc04JeGchmWtSM/ lsfTBRgrWKzE4tIRsTZ58j00Vv/ChtjK3UzEe81sEYN8YjHf4uA== X-Received: by 2002:ac8:594f:0:b0:3f1:e57a:de9d with SMTP id 15-20020ac8594f000000b003f1e57ade9dmr63845794qtz.0.1684266692942; Tue, 16 May 2023 12:51:32 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6pg+9WhkT3frOsnuyfiEaBNLyajd7Te8jJp9lme3/9cCUxj6d+LCOQUXFDvLBzwt7Ku1LPIA== X-Received: by 2002:ac8:594f:0:b0:3f1:e57a:de9d with SMTP id 15-20020ac8594f000000b003f1e57ade9dmr63845777qtz.0.1684266692676; Tue, 16 May 2023 12:51:32 -0700 (PDT) Received: from cox.home.arpa ([45.72.211.59]) by smtp.gmail.com with ESMTPSA id y30-20020ac8705e000000b003ef6cfbbe6esm6509738qtm.51.2023.05.16.12.51.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 May 2023 12:51:30 -0700 (PDT) From: Philip Cox To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/2] stmmac: intel: Separate ADL-N and RPL-P device ID from TGL Date: Tue, 16 May 2023 15:51:21 -0400 Message-Id: <20230516195121.10933-3-philip.cox@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230516195121.10933-1-philip.cox@canonical.com> References: <20230516195121.10933-1-philip.cox@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Michael Sit Wei Hong BugLink: https://bugs.launchpad.net/bugs/2019222 Separating the ADL-N and RPL-P device IDs from TGL to handle the differences from TGL. Signed-off-by: Michael Sit Wei Hong (back ported from https://github.com/intel/linux-intel-quilt/tree/mainline-tracking-v5.19-linux-221019T120731Z/patches/0034-stmmac-intel-Separate-ADL-N-and-RPL-P-device-ID-from-T.tsn [changes partially upstream, and in the build already]) Signed-off-by: Philip Cox --- drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c index 312322ba56ab..81cad422d8ca 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c @@ -1502,7 +1502,7 @@ static const struct pci_device_id intel_eth_pci_id_table[] = { { PCI_DEVICE_DATA(INTEL, ADLS_SGMII1G_0, &adls_sgmii1g_phy0_info) }, { PCI_DEVICE_DATA(INTEL, ADLS_SGMII1G_1, &adls_sgmii1g_phy1_info) }, { PCI_DEVICE_DATA(INTEL, ADLN_SGMII1G, &adln_sgmii1g_phy0_info) }, - { PCI_DEVICE_DATA(INTEL, RPLP_SGMII1G, &tgl_sgmii1g_phy0_info) }, + { PCI_DEVICE_DATA(INTEL, RPLP_SGMII1G, &adln_sgmii1g_phy0_info) }, {} }; MODULE_DEVICE_TABLE(pci, intel_eth_pci_id_table);