From patchwork Tue Jul 25 10:43:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naresh Solanki X-Patchwork-Id: 125524 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp2383589vqg; Tue, 25 Jul 2023 03:55:55 -0700 (PDT) X-Google-Smtp-Source: APBJJlHCSEQPL5P4NJZbB/geAy/p5JuFWb5Bual1w2ob1j54O2u0/sIxSbhz6pwB8os1VEV5zA+1 X-Received: by 2002:a05:6358:2786:b0:135:62de:ff7d with SMTP id l6-20020a056358278600b0013562deff7dmr9427613rwb.8.1690282555446; Tue, 25 Jul 2023 03:55:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690282555; cv=none; d=google.com; s=arc-20160816; b=kKYn0Lpm7h03FphpFqeK7tPVQbl8jUBmCrmlWq5CayY5G4Z1f3iopmX7T37QNF+gz+ 5257K8v13kLpxVJ15ZjNyLneTUDbUcOpsah2TA0rsg+kS7F7H0wlvyr6oTFdOBmbawaj VH54PVtKCT+jKHgIa/kYKeyl0sZxSotNixaduHcM0FtIxd7+zrJ69XcFVZALPWo9AaZT 6/Hlj/QglpwcvKN07o48wX6tO6Ojhb4bWBoVCwCk461pvsMlDIeU0n1+u7XMOe4D6wy6 teGD6GqtlXzalZyWXAV6a7PDCAe2bAiWPR+SfOEu3YVNvfg3mEOl76wlbltIz2q9Wk8k 28iQ== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=Y2+LOkmbRzocNLGHFc65c1vCZRpwTkaqodGNOPSIAJU=; fh=H3d5A4U/WPATQBds/warCCnrSRWaYgb20+HY9jmC4hQ=; b=rzkduT/Csa+VbJHRJJhX/9+SV277G/N2wCqOwEEk37TlOmi35llOM1vlCvpeLxFJgI tQeReveDAS7nspD057lEj04zz7USu697eUMTUc5Vvw8uZ9TPZOw/C67Lz3DmQv5g5vLV bhc/D/0MOW/qH2+4Uo9eBat+VttgkwWOszr2KTjelfr9UpuDIQsC+mgQHeMmyQJesLfn kjwJ0YwTjXvRW4/zlqFXyyQCouj6gFDEd26/2aWNnU3tYJlgYIjBXjnN+sWFsa4842fq 2Crt6jRR11rGDXJX775mEpbnf9dIxtiESrCLhWp3h7thse6MdfqZbyJliS9r0lb+gHt8 fRcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@9elements.com header.s=google header.b="QRAUr/fN"; 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=9elements.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l63-20020a639142000000b0055c875d784dsi11554897pge.374.2023.07.25.03.55.42; Tue, 25 Jul 2023 03:55:55 -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=@9elements.com header.s=google header.b="QRAUr/fN"; 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=9elements.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233256AbjGYKoC (ORCPT + 99 others); Tue, 25 Jul 2023 06:44:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55588 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231308AbjGYKoA (ORCPT ); Tue, 25 Jul 2023 06:44:00 -0400 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 76F4610D4 for ; Tue, 25 Jul 2023 03:43:59 -0700 (PDT) Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-3fbc5d5742eso52618255e9.3 for ; Tue, 25 Jul 2023 03:43:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; t=1690281837; x=1690886637; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Y2+LOkmbRzocNLGHFc65c1vCZRpwTkaqodGNOPSIAJU=; b=QRAUr/fNWYjB0sOxrI8MMRk87D1j2LMRs7ByIWGHV02Y+iFcHv5AnkKaJ4jo/3WkQQ gTIpW4yMlpTKWW00bLhLpD9HCS08121iceRfhHIFqs4FQoAxpigzlblcApJfliU0DLu1 Fww/vuWbs/HhGvYYWb0vhdVa2Ygo7nbMcT200KrrjHVYquOhuDxB6vu0knKLJaamkmLp ToUTTPiG5CFN1T18MkEQofHAuNUr9aUIqLf7fmmDz8GMJKr0Rfb3QZvr8yZDcaRveY3u mIaZBorI1JvKm28Eb+aGIMu9mZCvSisgna8BS0deWIhMMwlk4OuZgBewSalsTvHtKZ8n Qt+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690281837; x=1690886637; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Y2+LOkmbRzocNLGHFc65c1vCZRpwTkaqodGNOPSIAJU=; b=PG+YOAZh4sdUZN/kRnZmUPzrEs+aoPFfGnNBtjlSJcqoh70oaF9D1FOcd8T0SaFUYi C9mlkDSETumdsbOtoh4c9iktMmGyejpMgkKGFy7nKRy81eg7Uore2FQXwNRbf8F3KKH1 VJ5ofVL4HiwqcH+rUtRVfBbbSw0RzPK13soPjRXYNnrVbPw3/ZuDXp5Y6d7pB1mdhHP8 bW2oRwTOVg26/VYU9VbO5n5s3g3neYbdP5q+jCVTxtwMzy6rJtZHzOrfukHhtfXZQnAC LuwerbMje4l4pq6jcwyxW1ZynEIdme+YlfTqClJsxzhN/cLvcHFhTQIkQLi2DTQ9c9ST sYtw== X-Gm-Message-State: ABy/qLaE9IqKsETX1mTV0i+qgS5NTGvAP4heNSDkyzOZTUtmpkCLc1MY KLZwG90lmLjN2e+he5aHq/CbGnI+Tpj4jXFTR+H17w== X-Received: by 2002:a05:600c:2a54:b0:3fb:a917:b769 with SMTP id x20-20020a05600c2a5400b003fba917b769mr9567467wme.21.1690281837646; Tue, 25 Jul 2023 03:43:57 -0700 (PDT) Received: from stroh80.sec.9e.network (ip-078-094-000-051.um19.pools.vodafone-ip.de. [78.94.0.51]) by smtp.gmail.com with ESMTPSA id n12-20020a5d6b8c000000b003143c6e09ccsm15793723wrx.16.2023.07.25.03.43.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jul 2023 03:43:57 -0700 (PDT) From: Naresh Solanki X-Google-Original-From: Naresh Solanki To: linux-kernel@vger.kernel.org, linux-hwmon@vger.kernel.org, iwona.winiarska@intel.com, linux@roeck-us.net, jdelvare@suse.com Cc: Naresh Solanki , Patrick Rudolph , openbmc@lists.ozlabs.org Subject: [PATCH v4 1/3] peci: cpu: Add Intel Sapphire Rapids support Date: Tue, 25 Jul 2023 12:43:51 +0200 Message-ID: <20230725104354.33920-1-Naresh.Solanki@9elements.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable 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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772389721120610358 X-GMAIL-MSGID: 1772389721120610358 Add support for detection of Intel Sapphire Rapids processor based on CPU family & model. Sapphire Rapids Xeon processors with the family set to 6 and the model set to INTEL_FAM6_SAPPHIRERAPIDS_X. The data field for this entry is "spr". Tested the patch series with AST2600 BMC with 4S Intel Sapphire Rapids processors & verified by reading cpu & dimm temperature. Signed-off-by: Patrick Rudolph Signed-off-by: Naresh Solanki Reviewed-by: Iwona Winiarska --- Changes in V3: - Move spr entry at end of struct peci_cpu_device_ids - Mention test with the patch. Changes in V2: - Refactored from previous patchset as seperate patch based on subsystem. --- drivers/peci/cpu.c | 5 +++++ 1 file changed, 5 insertions(+) base-commit: 55612007f16b5d7b1fb83a7b0f5bb686829db7c7 diff --git a/drivers/peci/cpu.c b/drivers/peci/cpu.c index de4a7b3e5966..bd990acd92b8 100644 --- a/drivers/peci/cpu.c +++ b/drivers/peci/cpu.c @@ -323,6 +323,11 @@ static const struct peci_device_id peci_cpu_device_ids[] = { .model = INTEL_FAM6_ICELAKE_D, .data = "icxd", }, + { /* Sapphire Rapids Xeon */ + .family = 6, + .model = INTEL_FAM6_SAPPHIRERAPIDS_X, + .data = "spr", + }, { } }; MODULE_DEVICE_TABLE(peci, peci_cpu_device_ids); From patchwork Tue Jul 25 10:43:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naresh Solanki X-Patchwork-Id: 125597 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp2438736vqg; Tue, 25 Jul 2023 05:39:55 -0700 (PDT) X-Google-Smtp-Source: APBJJlEU3HobPLALKrH4biH+6fVuZ01R3Dh0xeMMxtCn8nvOJX9DKN0GFg7WvnczlfgjYOqqsNwQ X-Received: by 2002:a17:907:b13:b0:991:b292:695 with SMTP id h19-20020a1709070b1300b00991b2920695mr13129040ejl.55.1690288794783; Tue, 25 Jul 2023 05:39:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690288794; cv=none; d=google.com; s=arc-20160816; b=eEplEfUIhJDs0DW2qjK5UrUZghPtz5YMRja1QDAsZcCMEgNeLEyx31JrmdplR+xKov wE8ffwwD/o7/jFXxNfXgpzqrhT22H4tNvF37sbNkUDFW0fjLsTiDdPU/ogn0iOyVdLXM jHK644pmj/EXs8niuvdKlWPz+KH2VxiA4jo/DgELpoanJ+Xv5uM+9sRvuFTCHVypx1+F ml2vigPvdbcoKWHgOK4o1WOYe9EcLOxoJnuTEeaSDGx6slcq8qbEYK7aYerqxdirWnM/ nVi5Ept8Xfod+EdNT91+LKhV99BFBzJc8hly5KqMRH48GmYncfNcXsxmtnQc8LICaHbM 7AzA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=wQL70qcpHVJtjXXrjcL8pHbenCmiHSNwdzBLMHcDPF0=; fh=7Czjx7uvNNZ9AID2K8svJQhTcEBkP/LdcXnjC3BIFk4=; b=FtHZ4zAtZ5arco/irMyeeTfxIfDeXLYjt2sZxjCJR8OulK7BGIuEhqvsC37vgTvy08 f7/hqx8gpsKhwSM53gBvJKPQZJWbmK3dbI6xom62u13GnjooLdV1ems4Fpr9pG1MB3T5 1AfcAXe4/b/nDxmPbBcu2/7jFW9wO8gHflSgsfmy6BIX0ScUDuJPR9/wjb8fht64jrlw QvzWzEN5EXpJLK2qy2Jt+0ABBQDxIj6Crwuxdv42e4/rd0qhfA6XlvtT9WwTKadZbKmr ClsofPsDqQuAcSQ+4I9/2BMBGV81HiNI7M/1l7CDoYzdxhrRHMXUZe+Iw3dxOkiQiv4D Fzbw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@9elements.com header.s=google header.b=PHuasKoT; 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=9elements.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r16-20020a170906a21000b0099b49483268si8226506ejy.301.2023.07.25.05.39.30; Tue, 25 Jul 2023 05:39:54 -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=@9elements.com header.s=google header.b=PHuasKoT; 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=9elements.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233736AbjGYKoK (ORCPT + 99 others); Tue, 25 Jul 2023 06:44:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55598 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232904AbjGYKoB (ORCPT ); Tue, 25 Jul 2023 06:44:01 -0400 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CE5C810F9 for ; Tue, 25 Jul 2023 03:44:00 -0700 (PDT) Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-3159d75606dso3987749f8f.1 for ; Tue, 25 Jul 2023 03:44:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; t=1690281839; x=1690886639; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wQL70qcpHVJtjXXrjcL8pHbenCmiHSNwdzBLMHcDPF0=; b=PHuasKoTSBC0QMQvXfABeSOEYeM8DDzDnBcVpK7+caqAeBQjHNpkL0tvdC+mm+3RG8 Q5y43essKVx39/Ph5CLC8EcH6jg4PZBifCltmg1gBP3Bk3CgXiMCG4aWoqiwa4FL0k8b yA6cLh8qJOIECYj49SWXVjaFLDW7d1hlnu7UtN62cOrqU8rZSybZ1DDi3btNvM33ZsBI VEDluzb+45ZPixohocX/0fBjgVusO9PsqDD2nuKaRBatCNh8PurponKdcb9EKmT1BxP9 k9NnuICa8rffTW+ipnef/aAMqpQI50ClehaNks1hYJ32fDBUn9ieoUbOfwvua5CZP6h6 XSbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690281839; x=1690886639; 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=wQL70qcpHVJtjXXrjcL8pHbenCmiHSNwdzBLMHcDPF0=; b=RGmoGR1seGUHdg0Ln4+MFyUtCTY+horWCl2UM19dyibAPht5sO2HIwqLXsd/qiUT5B wryT5ZLdK1ExjRSkBhsm0oAjkyAjBHejm58hFFBljxvolfeq/4i5nqcIpSK9AksopDE5 3he9pDN30N8EmWjL1B/r9HsVZcRGHS8Cc2kDiaJQxu6MbUIRE1G5jPKqpRWGbZy8f0gM uLqa+KuxtvIHXKBZq5MyPdD/2Ecl4s2IWwQC1DLYz/7lmhpOMY+NrrJlDMWSDygwzWKl 9Igqzvga1WlsZhelamddEIp+c5kDsRzT6fvjIn8nU3TQykzi7hEQ+sv4al6FFf+yEfLs k24g== X-Gm-Message-State: ABy/qLa+Q8WYicfAEotYlji56J8TElfh9bzRtV8IfFUoIGuPx/VN8WXq LPzHzakgMv5CnshNYzMUGCssWEDAo5i4Bvq8W8v0MFHi X-Received: by 2002:a5d:53d0:0:b0:313:f33c:24c4 with SMTP id a16-20020a5d53d0000000b00313f33c24c4mr7669482wrw.39.1690281838826; Tue, 25 Jul 2023 03:43:58 -0700 (PDT) Received: from stroh80.sec.9e.network (ip-078-094-000-051.um19.pools.vodafone-ip.de. [78.94.0.51]) by smtp.gmail.com with ESMTPSA id n12-20020a5d6b8c000000b003143c6e09ccsm15793723wrx.16.2023.07.25.03.43.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jul 2023 03:43:58 -0700 (PDT) From: Naresh Solanki X-Google-Original-From: Naresh Solanki To: linux-kernel@vger.kernel.org, linux-hwmon@vger.kernel.org, iwona.winiarska@intel.com, linux@roeck-us.net, jdelvare@suse.com Cc: Patrick Rudolph , Naresh Solanki Subject: [PATCH v4 2/3] hwmon: (peci/cputemp) Add Intel Sapphire Rapids support Date: Tue, 25 Jul 2023 12:43:52 +0200 Message-ID: <20230725104354.33920-2-Naresh.Solanki@9elements.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230725104354.33920-1-Naresh.Solanki@9elements.com> References: <20230725104354.33920-1-Naresh.Solanki@9elements.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable 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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772396262933287697 X-GMAIL-MSGID: 1772396262933287697 From: Patrick Rudolph Add support to read DTS for reading Intel Sapphire Rapids platform. Signed-off-by: Patrick Rudolph Signed-off-by: Naresh Solanki Acked-by: Guenter Roeck Reviewed-by: Iwona Winiarska --- Chagnes in V3: - Update Acked-by in commit message. Changes in V2: - Refactored from previous patchset as seperate patch based on subsystem. --- drivers/hwmon/peci/cputemp.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/drivers/hwmon/peci/cputemp.c b/drivers/hwmon/peci/cputemp.c index e5b65a382772..a812c15948d9 100644 --- a/drivers/hwmon/peci/cputemp.c +++ b/drivers/hwmon/peci/cputemp.c @@ -363,6 +363,7 @@ static int init_core_mask(struct peci_cputemp *priv) switch (peci_dev->info.model) { case INTEL_FAM6_ICELAKE_X: case INTEL_FAM6_ICELAKE_D: + case INTEL_FAM6_SAPPHIRERAPIDS_X: ret = peci_ep_pci_local_read(peci_dev, 0, reg->bus, reg->dev, reg->func, reg->offset + 4, &data); if (ret) @@ -531,6 +532,13 @@ static struct resolved_cores_reg resolved_cores_reg_icx = { .offset = 0xd0, }; +static struct resolved_cores_reg resolved_cores_reg_spr = { + .bus = 31, + .dev = 30, + .func = 6, + .offset = 0x80, +}; + static const struct cpu_info cpu_hsx = { .reg = &resolved_cores_reg_hsx, .min_peci_revision = 0x33, @@ -549,6 +557,12 @@ static const struct cpu_info cpu_icx = { .thermal_margin_to_millidegree = &dts_ten_dot_six_to_millidegree, }; +static const struct cpu_info cpu_spr = { + .reg = &resolved_cores_reg_spr, + .min_peci_revision = 0x40, + .thermal_margin_to_millidegree = &dts_ten_dot_six_to_millidegree, +}; + static const struct auxiliary_device_id peci_cputemp_ids[] = { { .name = "peci_cpu.cputemp.hsx", @@ -574,6 +588,10 @@ static const struct auxiliary_device_id peci_cputemp_ids[] = { .name = "peci_cpu.cputemp.icxd", .driver_data = (kernel_ulong_t)&cpu_icx, }, + { + .name = "peci_cpu.cputemp.spr", + .driver_data = (kernel_ulong_t)&cpu_spr, + }, { } }; MODULE_DEVICE_TABLE(auxiliary, peci_cputemp_ids); From patchwork Tue Jul 25 10:43:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naresh Solanki X-Patchwork-Id: 125525 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp2383604vqg; Tue, 25 Jul 2023 03:55:57 -0700 (PDT) X-Google-Smtp-Source: APBJJlG6DI7TnGsomnuMa7RgooBEQ+1Fh444z4ccNRbgXZ9yHWMa7u9de5rMyiA/Wix4wi523318 X-Received: by 2002:a17:90a:6fa5:b0:268:3624:3f1d with SMTP id e34-20020a17090a6fa500b0026836243f1dmr1308834pjk.24.1690282557268; Tue, 25 Jul 2023 03:55:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690282557; cv=none; d=google.com; s=arc-20160816; b=uME1Bj1xMzr8jKePZtD69+xbDtgChsAl2qPSEIGkgGeZPXB7Q+jSZ4nGfLOm9E2LVl R7k1t3iiuonRm84TlXFcPlPrSP2Nb947NHJBwLc7TNdpRfODPUzWp0Nlut+5AWKb0ghF SfBrkDsRZpSh2pmiewUKJPeL6y6YmFgYufdtl6NAKxhWEo+dCFVrPlGSs0nTLe9JdLIt 3XerAwk5q6LetxvprOhvbbAqDD90xHFeEDY/hMUCQeOnwpUlr+Jg2KLsa9sM775E1B5C 6QMJhtQaxYbs9D3CmjuFssJPEwHfdG2i7g9Z/AeifmMYmLT+i0IRF2ROhiL0R4PYn5+x OzVg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=eT1M70QmPWlyzzTGWLB186I5SL8oEeXWy/zvh7U5jHs=; fh=7Czjx7uvNNZ9AID2K8svJQhTcEBkP/LdcXnjC3BIFk4=; b=FdJ8l6TvWhFN1JUTbf7/EuAAwjy8QWHARCpmTvg76RXyJzdlYbSJ8PU3W7BPVS9Xxu /cUdYu/b2ZcvWlsYSIK9qDJmlc2GTiew8TiOrjL3+LCPBng5alZMAVOMHdkBrPkHOQhT 6mT86KyVGINWs+aHX+TsDgmMYxu6cyZ5buhDN4Ech/WcXC64uC0OqFjLOFbVrKX6LTrn KSlCQjDtE3wBSQgpQH679xtHMf6WB90Sd3GU4svrVHlw+7c4zhrv2/u2y42bBaIXnCrT Msd4eWblymCUZRej2MFuU3RZ/8bQtekavGjbPh1ncu+jHWD/ff0Os5ETDGhjlOgXKfVs oYng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@9elements.com header.s=google header.b=L87nMl2y; 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=9elements.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c16-20020a17090a8d1000b00263355e8183si851504pjo.114.2023.07.25.03.55.44; Tue, 25 Jul 2023 03:55:57 -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=@9elements.com header.s=google header.b=L87nMl2y; 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=9elements.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233741AbjGYKoM (ORCPT + 99 others); Tue, 25 Jul 2023 06:44:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55610 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232663AbjGYKoD (ORCPT ); Tue, 25 Jul 2023 06:44:03 -0400 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CFAFC10D4 for ; Tue, 25 Jul 2023 03:44:01 -0700 (PDT) Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-31297125334so3449474f8f.0 for ; Tue, 25 Jul 2023 03:44:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; t=1690281840; x=1690886640; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=eT1M70QmPWlyzzTGWLB186I5SL8oEeXWy/zvh7U5jHs=; b=L87nMl2y4zHHvKG2Q/04w0rgX8wiQVuIlX1wAVjnD/6D7rHkMbT3w1U1NhRm5guLUa BQuKqSr1f0PicazKlUci5tzrYQ7sPCFfkFqLnN8WYgNsXvS3HX3z7hqCC1EbLpux3n8C SuhXu1hSpzKVP91FpSg7VMB14+my8uIISA9x6jrB4rX3+/7NJDp9+vVVIjPVgAi0Pbvb RNARHoLnAoc6Y5n1Y6aeAcjqKwunWAcduAvrFsOYc9APD3Kdm5/kypIUBRdJovFo3RBi 89cM0f2k+yJisuaiAu/tw4s/d0oLwqHACUh/E/cZgCgXlJbp9qK42EoueWccBZiS5FIh FpMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690281840; x=1690886640; 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=eT1M70QmPWlyzzTGWLB186I5SL8oEeXWy/zvh7U5jHs=; b=IjUYM3xXISqp6EKiJQPzQmPAgD2BFbFMCW+mfSaGufcXT3bmCKsh2o8pEXzyMHrf17 IjLCaAUsiqyV2JtdcIxc/SztFO+MU/zMRgtlKNaBDzBGRDIB3DeNcR8+YmtkPcZ9YvcO PG31bmBU6Iic/y7tURD6mVUfkYHTH8krVDYHAJFNLkJJzXWkKrPcNsCIhnLIx/Ybtc11 9A1ttjM0K7/Xd9LWa+w2705zg8XnXPbirvg5tspktMVPnYO0TJ6YIznXyPIpSXvgj7mR ZRy2m+7enL2bUabG+9Bqz26bXzSK1QNd9h9uU5vhL1vd7VKBqdwZ1XwlQXtPcPMHWoNu 7dHw== X-Gm-Message-State: ABy/qLaFkBrFDBTaXK5bV+GCwt18dhpxkDYu6kVuxw7Wpu/KTAD3JNMC DvjxFCN/jZebhfA0tup840oglJWxFIs7ns2nrjLgNBFh X-Received: by 2002:a5d:660d:0:b0:317:6734:c2ae with SMTP id n13-20020a5d660d000000b003176734c2aemr1704572wru.11.1690281840081; Tue, 25 Jul 2023 03:44:00 -0700 (PDT) Received: from stroh80.sec.9e.network (ip-078-094-000-051.um19.pools.vodafone-ip.de. [78.94.0.51]) by smtp.gmail.com with ESMTPSA id n12-20020a5d6b8c000000b003143c6e09ccsm15793723wrx.16.2023.07.25.03.43.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jul 2023 03:43:59 -0700 (PDT) From: Naresh Solanki X-Google-Original-From: Naresh Solanki To: linux-kernel@vger.kernel.org, linux-hwmon@vger.kernel.org, iwona.winiarska@intel.com, linux@roeck-us.net, jdelvare@suse.com Cc: Patrick Rudolph , Naresh Solanki Subject: [PATCH v4 3/3] hwmon: (peci/dimmtemp) Add Sapphire Rapids support Date: Tue, 25 Jul 2023 12:43:53 +0200 Message-ID: <20230725104354.33920-3-Naresh.Solanki@9elements.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230725104354.33920-1-Naresh.Solanki@9elements.com> References: <20230725104354.33920-1-Naresh.Solanki@9elements.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable 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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772389722693622950 X-GMAIL-MSGID: 1772389722693622950 From: Patrick Rudolph Extend the functionality of hwmon (peci/dimmtemp) for Sapphire Rapids platform. Add the corresponding Sapphire Rapids ID and threshold code. The patch has been tested on a 4S system with 64 DIMMs installed. Verified read of DIMM temperature thresholds & temperature. Signed-off-by: Patrick Rudolph Signed-off-by: Naresh Solanki Acked-by: Guenter Roeck Reviewed-by: Iwona Winiarska --- Changes in V4: - Instead of using hard coded dimm temperature threshold, read from mmio offset. - Change CHAN_RANK_MAX_ON_SPR to 8 - Restore #define CHAN_RANK_MAX to previous assignment. - Update commit message. Changes in V3: - Update Acked-by in commit message. Changes in V2: - Update subject. --- drivers/hwmon/peci/dimmtemp.c | 50 +++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/drivers/hwmon/peci/dimmtemp.c b/drivers/hwmon/peci/dimmtemp.c index ce89da3937a0..5ca4d04e4b14 100644 --- a/drivers/hwmon/peci/dimmtemp.c +++ b/drivers/hwmon/peci/dimmtemp.c @@ -30,6 +30,8 @@ #define DIMM_IDX_MAX_ON_ICX 2 #define CHAN_RANK_MAX_ON_ICXD 4 #define DIMM_IDX_MAX_ON_ICXD 2 +#define CHAN_RANK_MAX_ON_SPR 8 +#define DIMM_IDX_MAX_ON_SPR 2 #define CHAN_RANK_MAX CHAN_RANK_MAX_ON_HSX #define DIMM_IDX_MAX DIMM_IDX_MAX_ON_HSX @@ -534,6 +536,43 @@ read_thresholds_icx(struct peci_dimmtemp *priv, int dimm_order, int chan_rank, u return 0; } +static int +read_thresholds_spr(struct peci_dimmtemp *priv, int dimm_order, int chan_rank, u32 *data) +{ + u32 reg_val; + u64 offset; + int ret; + u8 dev; + + ret = peci_ep_pci_local_read(priv->peci_dev, 0, 30, 0, 2, 0xd4, ®_val); + if (ret || !(reg_val & BIT(31))) + return -ENODATA; /* Use default or previous value */ + + ret = peci_ep_pci_local_read(priv->peci_dev, 0, 30, 0, 2, 0xd0, ®_val); + if (ret) + return -ENODATA; /* Use default or previous value */ + + /* + * Device 26, Offset 219a8: IMC 0 channel 0 -> rank 0 + * Device 26, Offset 299a8: IMC 0 channel 1 -> rank 1 + * Device 27, Offset 219a8: IMC 1 channel 0 -> rank 2 + * Device 27, Offset 299a8: IMC 1 channel 1 -> rank 3 + * Device 28, Offset 219a8: IMC 2 channel 0 -> rank 4 + * Device 28, Offset 299a8: IMC 2 channel 1 -> rank 5 + * Device 29, Offset 219a8: IMC 3 channel 0 -> rank 6 + * Device 29, Offset 299a8: IMC 3 channel 1 -> rank 7 + */ + dev = 26 + chan_rank / 2; + offset = 0x219a8 + dimm_order * 4 + (chan_rank % 2) * 0x8000; + + ret = peci_mmio_read(priv->peci_dev, 0, GET_CPU_SEG(reg_val), GET_CPU_BUS(reg_val), + dev, 0, offset, data); + if (ret) + return ret; + + return 0; +} + static const struct dimm_info dimm_hsx = { .chan_rank_max = CHAN_RANK_MAX_ON_HSX, .dimm_idx_max = DIMM_IDX_MAX_ON_HSX, @@ -576,6 +615,13 @@ static const struct dimm_info dimm_icxd = { .read_thresholds = &read_thresholds_icx, }; +static const struct dimm_info dimm_spr = { + .chan_rank_max = CHAN_RANK_MAX_ON_SPR, + .dimm_idx_max = DIMM_IDX_MAX_ON_SPR, + .min_peci_revision = 0x40, + .read_thresholds = &read_thresholds_spr, +}; + static const struct auxiliary_device_id peci_dimmtemp_ids[] = { { .name = "peci_cpu.dimmtemp.hsx", @@ -601,6 +647,10 @@ static const struct auxiliary_device_id peci_dimmtemp_ids[] = { .name = "peci_cpu.dimmtemp.icxd", .driver_data = (kernel_ulong_t)&dimm_icxd, }, + { + .name = "peci_cpu.dimmtemp.spr", + .driver_data = (kernel_ulong_t)&dimm_spr, + }, { } }; MODULE_DEVICE_TABLE(auxiliary, peci_dimmtemp_ids);