From patchwork Wed Jul 19 18:41: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: 122775 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2659999vqt; Wed, 19 Jul 2023 12:35:48 -0700 (PDT) X-Google-Smtp-Source: APBJJlFm7BLt+QG6CN7h9QKe9U/F/4Kna5iBPS85yQGqN9FTGEv0Ly7/bv39OVywQKEbrdihyLK8 X-Received: by 2002:a19:5049:0:b0:4f8:5940:5c6a with SMTP id z9-20020a195049000000b004f859405c6amr620123lfj.31.1689795348154; Wed, 19 Jul 2023 12:35:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689795348; cv=none; d=google.com; s=arc-20160816; b=y0cMlOzMmeKO2cH93x86GsfRPXFqMhxbU8JIxsnq8KMDK5xRQWzUmLMCqQ4J1pKRk3 fmaT/gkkD929E93vY5pnXjS+9l6mBRF8jINzr6jgBCmHGWYydi6bvL679Km5XqDINEtq ZOwdWIXhsMVNpC5DfQoH2uHtotU9aC/u69q//ah4rfWDpkFSN8c3LXfPYTyOXhv5g6Vq +cnmb84bXE1JIDJoc7mq7HosgrL8fd29wTwFZPfl+mKGQw4Y88RJUA3FJsZE0mG0BfLc Z3CVmisyQ9WOAG9yqWl+Vm48O4a32OAq0g6AuaoA7mmM8WVM3+h9rzBgJNUF0WJL0k5u /hpw== 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=HrjkymWQEytm3ZEsWHkhp23Z4KQxMO3ORXG0AjMGsDw=; fh=H3d5A4U/WPATQBds/warCCnrSRWaYgb20+HY9jmC4hQ=; b=PzJFqANtT5hmWQ/gnL08Dpv/1v1aM7l07t4HK0reTx40p1kj2rSjCIFsefsFlwvDkf hbOWxTU21/NAU30IntnGm1a7ILICPkJP/TVC0jDpNu46sc4o3N4v/uxApbUaI4pHvgdN r3IbX22Y/s16qEOWAOWznfkrX2o1kSYNcvxldL8xnlM1ATBwQ1RjOUBjxtLVClTVV7rn snmp/2WVcUvX+0uSscd3gFu2GsVZVS5NImnydyGReZffOqniCEQsqiIETZ7QySTjR2vG zD2IkAUEdKPBd71FsYEK3geM+MTBHYjijtoM/VEs2HUHEjsKxSflExVtloxbt7BTT+9P hnHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@9elements.com header.s=google header.b=TckggQyz; 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 k21-20020a05640212d500b0051e05151467si3210006edx.224.2023.07.19.12.35.23; Wed, 19 Jul 2023 12:35:48 -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=TckggQyz; 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 S230224AbjGSSmJ (ORCPT + 99 others); Wed, 19 Jul 2023 14:42:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60848 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229731AbjGSSmH (ORCPT ); Wed, 19 Jul 2023 14:42:07 -0400 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB427F0 for ; Wed, 19 Jul 2023 11:42:06 -0700 (PDT) Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-3143ccb0f75so6941414f8f.0 for ; Wed, 19 Jul 2023 11:42:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; t=1689792125; x=1692384125; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=HrjkymWQEytm3ZEsWHkhp23Z4KQxMO3ORXG0AjMGsDw=; b=TckggQyziPAn3xmiAQXv2PciXO8X0PSzmy1GiTSSOloJ7PmzNRhVBvXIi+OhxGxCOt V1WYDpZ63YvfAhahRBeXrP/iloLgg+25SIJTIhmNG2J8MvnsroBwF+jgYI9wtWAzwfaQ BM4ZD6Ti9JGApvDzpH9eRgomPW6sjk0GEvRQRsSh8tCPs+symP4f95Fseaqp1vFEAGgT jEEeMuH+Hm4ORkGTHZ1C0n2ESPtJRIZsm1sPTInc2Ej+mN1VcxuOAbaCM9VaDoQnvP5A ATVIwPoHgYMF/aYMu27RntJ17ZmOaqkccb5GfY8l+0P7Ve7MMHydJg8sjrpmc59lCHOc PvDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689792125; x=1692384125; 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=HrjkymWQEytm3ZEsWHkhp23Z4KQxMO3ORXG0AjMGsDw=; b=P6GLXlEMnZvM/F3qhPyd8UkCoIGKbr9sNCTcuXdDTQqNwe3BoWQUydxSnDl1k6uLvS 6o/84479tXddopm8WlPwGNIebNQGaMdj+dCGcrw9ouxFn0wGhsINqH5YIic1gP1FOoAp +0t1cK2htGauLmV0L/2FQrs1HVato8z/DUOlOc+56DMd44fWZRMjjtCVBchFVx2eUrZN qVRbNZXB63ArX/2lYmCwstClP7UnyBlglG+n2vkBgPjtlOQtMnueyaM1Ddh5871+3WCK dVLlIQ7QCDT2Gc9e+75c4IYoY0Af/mubhKp4YCY0MSVmIxzu8AzzzYLx7dFT1jmueBB5 /sPw== X-Gm-Message-State: ABy/qLYVJBifnZR46joUvnXeIKP5Itg/ByV4ssml3LnZga3zoSM3QhNt /bz81qKp9JZxGVNlde7sHY87ygOTikGoKhPjdugMQg== X-Received: by 2002:a5d:4561:0:b0:316:e325:fd92 with SMTP id a1-20020a5d4561000000b00316e325fd92mr531092wrc.55.1689792124801; Wed, 19 Jul 2023 11:42:04 -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 n18-20020adffe12000000b003143be36d99sm5948877wrr.58.2023.07.19.11.42.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jul 2023 11:42:04 -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 v3 1/3] peci: cpu: Add Intel Sapphire Rapids support Date: Wed, 19 Jul 2023 20:41:52 +0200 Message-ID: <20230719184155.59375-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: 1771206807429221615 X-GMAIL-MSGID: 1771878847011023114 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: 4dbbaf8fbdbd13adc80731b2452257857e4c2d8b 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 Wed Jul 19 18:41: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: 122766 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2643447vqt; Wed, 19 Jul 2023 12:03:52 -0700 (PDT) X-Google-Smtp-Source: APBJJlH6MXygYm29y3cjppyZX36JfrFtbdhe0IIjd6QtmRoiLYnLUTBa4nEPTyXzI5fE2JyI+lk8 X-Received: by 2002:a19:5051:0:b0:4fd:d213:dfe9 with SMTP id z17-20020a195051000000b004fdd213dfe9mr577578lfj.5.1689793432611; Wed, 19 Jul 2023 12:03:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689793432; cv=none; d=google.com; s=arc-20160816; b=HIcgyXFeo2lDiEjkz4ynGr/mH1QiW8srVIo+QD/BVaNZR7eSEDtp9sEP6fXggap4fj KA5hbbTrg7DjzmLRyedjs5V/cpRVECvfuwpRw5/wNbJ6hBfoObCYIjhfBRmBDIMaund5 ToX/aTujZDJfTXI6bixxgxNEwFZmKm4qQuMuul+zZP8rWLyqN6GiOA7ecA28P0/pyAsT W+40M7yi4wJpc9tRQrTQkIbTWrL8jG4HLviZpE4nqj6a81LA6Mo3FA3NM7MWNKFVb3+G 8hXQJpi2WvcoRiPQhUc94FgzuuKd+anO3eTSv8JEV9a0K5mp0IgWROoeZur+n3MDkAPe 1RFA== 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=YESQXc4adgNO1cttL/AjWO2pAQBf3ZzNJHpCW2KolRA=; fh=7Czjx7uvNNZ9AID2K8svJQhTcEBkP/LdcXnjC3BIFk4=; b=F0XBsZDMEH4TQ1N63IJ/zERgo3nLKnyXPzrYc2SEMPELn6n16g1uAwa3KBsxHpEfzs ZNS4Kmvj7OEQf8F8p8umaKBmyv9TmAtwYtoxletJvnV1fsYq6vhr4cvnbBI0rRFkf5cJ VM45BQG66CJFgfZOWQGzFVT0LoBzKgyyQ4160SSRJMuAcDboGn/fsC7rpvzqObMh2Qe6 QTZGoj0LABIEzFa7wvIIqFkePQPkUqGGxK55yGD+NxFZ7s7zuRdFBZJ4WCFzEelQjgWL V35BeD8kwRxFIDpTQ0UDnlmg0r15gGt2dLR83XTlbu3cJqcR1e4ExVjTPHX80HPtpgli /MLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@9elements.com header.s=google header.b=Rl2FdoCH; 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 dy10-20020a05640231ea00b00521d2cf5f3asi239292edb.129.2023.07.19.12.03.28; Wed, 19 Jul 2023 12:03:52 -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=Rl2FdoCH; 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 S230368AbjGSSmM (ORCPT + 99 others); Wed, 19 Jul 2023 14:42:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60888 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229934AbjGSSmJ (ORCPT ); Wed, 19 Jul 2023 14:42:09 -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 1ADAFF0 for ; Wed, 19 Jul 2023 11:42:08 -0700 (PDT) Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-316f9abf204so4454459f8f.1 for ; Wed, 19 Jul 2023 11:42:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; t=1689792126; x=1692384126; 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=YESQXc4adgNO1cttL/AjWO2pAQBf3ZzNJHpCW2KolRA=; b=Rl2FdoCHApcz0dp+QfaobCU5dzqdds622mfr89E8twyKZy2v9t3M0sU9RsQPp3H95g 51dmNSpBuyADlNZsigin4hS0NYHneF+U/5btckuLioux1u9HHHJXDKH0/opiwcHnmnDv mwTTSVcemDFnaDparfLhxAQa3JySi0NjKyURTXke5TQW14rpLCiMqLwQUrKQOh9psPQW reGw8ZJNgssFogGaBQRGAoe7lRsPzUWHNoD4xzd9TO8UV1k3v+WDM6LHD0aBc+mCJDPU o2F8IpDesxnxLYFdeKEiXLvK1WY3kKROfdBPsn9BLD7AuU5NtJST3mi/eHGEEweopO/1 3amQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689792126; x=1692384126; 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=YESQXc4adgNO1cttL/AjWO2pAQBf3ZzNJHpCW2KolRA=; b=jKH8fna3h8VWPsY5v/Dx0pmhlVTEXviYmANYwfX2ykdEQWf17170tnRjq19bUGVgh+ dSM2tsxCq8gIFEYpXdSkj4Sa28snRaHEczo5W8TpqkaKDDnMcJQ+rnlf+alyLXQdUgPq pUTn57MN2SzOLwrFWs704YBxIlq0F8j0YwyLQJ88Vz/S1OaemxkbV66lP45bjIlfjp30 7mHHPeZjD97NVGbbhWGYfZEJXsGLtTuhd4c8SUnyn/+hFEFVyCvjwO7/fnM/vnHSisGA opTuLvmNZsLlnxPa0gJdsHZGWqzDDTefCCEpEsMpBEiZkNshF37GwetPilZwyV1CaUci S9vQ== X-Gm-Message-State: ABy/qLYJzgO+ApMQQwWvq8wHlMatezlhAb/Oqaxfa2o24lwghUtBQL6W TUn28VpV1vF52+GiUqT2mhhHEzqesNAL4lIP+zBsDw== X-Received: by 2002:a5d:4ec5:0:b0:314:111a:e121 with SMTP id s5-20020a5d4ec5000000b00314111ae121mr551469wrv.30.1689792125989; Wed, 19 Jul 2023 11:42:05 -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 n18-20020adffe12000000b003143be36d99sm5948877wrr.58.2023.07.19.11.42.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jul 2023 11:42:05 -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 v3 2/3] hwmon: (peci/cputemp) Add Intel Sapphire Rapids support Date: Wed, 19 Jul 2023 20:41:53 +0200 Message-ID: <20230719184155.59375-2-Naresh.Solanki@9elements.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230719184155.59375-1-Naresh.Solanki@9elements.com> References: <20230719184155.59375-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: 1771876838817689191 X-GMAIL-MSGID: 1771876838817689191 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 Wed Jul 19 18:41:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naresh Solanki X-Patchwork-Id: 122793 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2676928vqt; Wed, 19 Jul 2023 13:05:55 -0700 (PDT) X-Google-Smtp-Source: APBJJlEZYVC3PlU4+nuypsrkxGmTgzi0aFJuqDZwmZ4MX+KBQCeS++jks9noH6foN4YVf70LJZvZ X-Received: by 2002:aa7:cd06:0:b0:514:9ab4:3524 with SMTP id b6-20020aa7cd06000000b005149ab43524mr2993397edw.7.1689797155506; Wed, 19 Jul 2023 13:05:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689797155; cv=none; d=google.com; s=arc-20160816; b=ZOulFm+7AN1Lsy2uShVk6qIQil7PnJN4Ulw7jivEcwfnkskPImaRNsJ7eQDHZOcJv/ ODLHtgLHyFn4wC/IXjLEm3U2PJJ3SFaaj5IOZPhFyqYB/KLjg/m9DzxThTWJMkJvvMET nYwjIn+xyaj8cWBH3NnkzqQlWmJnJhCfSyQrtBuAUp3f2Nmwcds1C4eA8G2uwQehjK1j DbGBtUqF2Z8jxC1pvIzDJfDWJiFlGl/5E/ZYn9JX7Bn3yEW0AF3hXe4VfwYx0TTRDRXD LPuwQj+NkVh6SSwJ5naijg8VThRJG+56FvyYpyIMkEMyqXFTrn+eEGIh/gj11HiTXCwb +7cQ== 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=BKnRhR7SITJIXe1vnVFks13dyzhvxpmyGiR6BjT9xJM=; fh=7Czjx7uvNNZ9AID2K8svJQhTcEBkP/LdcXnjC3BIFk4=; b=MMHlWQzvdJ0/pGNbZwPW323Qs1roS/4nOouc72QVZmm8XiFRJtWTwaVM1tCXMSyD95 FClvYkg7QEbJ1VkQN6v5UgkeLInK+xczYdsUf3MK33oLHmW9640CpZ1Ik4Nhbo8NQxVb cc2LZ9OvDomNYBZw3NdP1cJwm0YGzl+XWLAHJuKVfITlxPGM2qcDiW2q3HRAM4PhqgZd KmZouXaf6Fsk/fqum/LD6e7uQn4/12xWwWxjsec4mpnmx5FXa4XqO0KACxXM8+p/5tRo h8y7qtuR3VjT/kMnPol2vLfpTo4fcsFkFqDi15cU6rcakh6jundWmeY8wGtTAwfmfID5 50HA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@9elements.com header.s=google header.b=NmNkf+DR; 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 c7-20020aa7d607000000b0051e26b4eeb6si3589239edr.41.2023.07.19.13.05.24; Wed, 19 Jul 2023 13:05: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=NmNkf+DR; 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 S230402AbjGSSmP (ORCPT + 99 others); Wed, 19 Jul 2023 14:42:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60900 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230360AbjGSSmK (ORCPT ); Wed, 19 Jul 2023 14:42:10 -0400 Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC4021FC8 for ; Wed, 19 Jul 2023 11:42:08 -0700 (PDT) Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-3fbc5d5742bso72678485e9.2 for ; Wed, 19 Jul 2023 11:42:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; t=1689792127; x=1692384127; 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=BKnRhR7SITJIXe1vnVFks13dyzhvxpmyGiR6BjT9xJM=; b=NmNkf+DRDYzm5b1OTfm96Wl1eiAht1ady4xiYxiNSgU8CB9ZR+xngnXbhZqVatugDU 8I0BWNcR8fyfxW+Z2izS/RO1kXH/RkhTSjO0NH9jUXMTVrMF3voUFAUNoGra/unRKffF PUOtHxztCR4WiWOo3nCp+sVGwXxvaUFIcrFXPkpY3u2xQd05pOxK0UWUsEumCkIvx/uE sRhK0lWG0NdyfzRuEgcrKQpoXzLCC8Zfsw+zwKUPdZCUdwZ/sWlFQUX7YelWfMpTnEdQ f56lnd3mGoreGO3ENq0bWUN2yKcoGwSJSwMR3jX0HWayZ/Ib09DXK93mjRiZsXXDyYQW WoGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689792127; x=1692384127; 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=BKnRhR7SITJIXe1vnVFks13dyzhvxpmyGiR6BjT9xJM=; b=G77E0RzuNwQDVbUhrwQzSHvpi52twiR5DAOYZu8UeihdqL7Rza0NryNRiwYGTKTkrS PylqjagFX9syE7C89ecujRvvuYxpInLRZITx8Jp7sGCT3pw5I50UegrND9HWB8nT0Myu /fUAs+gyFJ6br3zb7t8LAKJ10vKLWLoukL12QEOFOVmYVxIb+uWxCTDjzcWwqBap2wmG msSXf3beuXv1+D7TnWvsX/yeYudk26IwT7T0cbqfFjO+6Zxt5yUP/N1i0cMd8Oa/R0W8 vnDHgxg11zf/fNouzv4ZpGzYaam8njSxUsLx5jBTrfkkFU+OD4h2lig77F/FfYd/wG3n TwSQ== X-Gm-Message-State: ABy/qLZAyTUp4N5dwWQm9Bh79x5kaRo9OEHHH1J2b+Xjeh/gTYut3Rfl XxmsuoHdOLlfMZu5zwvsTR/nzzpuu3VTqFU2S2sDeQnI X-Received: by 2002:a05:6000:10d2:b0:314:350a:6912 with SMTP id b18-20020a05600010d200b00314350a6912mr547850wrx.36.1689792127211; Wed, 19 Jul 2023 11:42:07 -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 n18-20020adffe12000000b003143be36d99sm5948877wrr.58.2023.07.19.11.42.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jul 2023 11:42:06 -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 v3 3/3] hwmon: (peci/dimmtemp) Add Sapphire Rapids support Date: Wed, 19 Jul 2023 20:41:54 +0200 Message-ID: <20230719184155.59375-3-Naresh.Solanki@9elements.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230719184155.59375-1-Naresh.Solanki@9elements.com> References: <20230719184155.59375-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: 1771880742389420611 X-GMAIL-MSGID: 1771880742389420611 From: Patrick Rudolph This patch extends the functionality of the hwmon (peci/dimmtemp) to include support for Sapphire Rapids platform. Sapphire Rapids can accommodate up to 8 CPUs, each with 16 DIMMs. To accommodate this configuration, the maximum supported DIMM count is increased, and the corresponding Sapphire Rapids ID and threshold code are added. The patch has been tested on a 4S system with 64 DIMMs installed. Default thresholds are utilized for Sapphire Rapids, as accessing the threshold requires accessing the UBOX device on Uncore bus 0, which can only be achieved using MSR access. The non-PCI-compliant MMIO BARs are not available for this purpose. Signed-off-by: Patrick Rudolph Signed-off-by: Naresh Solanki Acked-by: Guenter Roeck --- Changes in V3: - Update Acked-by in commit message. Changes in V2: - Update subject. --- drivers/hwmon/peci/dimmtemp.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/drivers/hwmon/peci/dimmtemp.c b/drivers/hwmon/peci/dimmtemp.c index ed968401f93c..edafbfd66fef 100644 --- a/drivers/hwmon/peci/dimmtemp.c +++ b/drivers/hwmon/peci/dimmtemp.c @@ -30,8 +30,10 @@ #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 128 +#define DIMM_IDX_MAX_ON_SPR 2 -#define CHAN_RANK_MAX CHAN_RANK_MAX_ON_HSX +#define CHAN_RANK_MAX CHAN_RANK_MAX_ON_SPR #define DIMM_IDX_MAX DIMM_IDX_MAX_ON_HSX #define DIMM_NUMS_MAX (CHAN_RANK_MAX * DIMM_IDX_MAX) @@ -530,6 +532,15 @@ 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) +{ + /* Use defaults */ + *data = (95 << 16) | (90 << 8); + + 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, @@ -572,6 +583,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", @@ -597,6 +615,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);