From patchwork Tue Jul 11 16:04:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naresh Solanki X-Patchwork-Id: 118634 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp598057vqm; Tue, 11 Jul 2023 09:20:05 -0700 (PDT) X-Google-Smtp-Source: APBJJlE78pDWI3FapbM5PVoNfRs+rzcIwZIBZn7N+BZiMXKYp/WMPRrSnGbJGCoAlBa+w/JL4NxT X-Received: by 2002:a17:90a:f2d5:b0:263:34a:cb6f with SMTP id gt21-20020a17090af2d500b00263034acb6fmr15988245pjb.8.1689092405593; Tue, 11 Jul 2023 09:20:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689092405; cv=none; d=google.com; s=arc-20160816; b=zod1jRUWiJpndMUdFcvErYkBqRqOuM7kdQw1ZgYZ/Y4Jj6x2biNLYLHsT3bPbIaTjK w0nZeAI1TUOQ1W0sgfJQsIxa1FHpw9ftsp7mgMMV0ft2SwRJ023YumSMy90V183J+dAC vnLGhQtc8gUe7PwUqXwNROphewCVAVM7SG4KXBCi0AyMgnJ2ebLmN/sb5tFgtkfUlZ86 BEMFsQI+OJSdAFHcZWITP1nYtv8+DdhzviH405lwKhdWENpUy0lyRECO1XAh0ICHZk3f RJ8LTt/+buDBukigsg4Kkt+yRRTmt1tNBqm2n5bsBsRc8sARpB/kbLiri+/xTUgl1tSX E1PA== 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=YGMbrwgBLKOnv+M8jwXMoAH8jG/gfbhQBZp4iiCWWRg=; fh=H3d5A4U/WPATQBds/warCCnrSRWaYgb20+HY9jmC4hQ=; b=jla3ja4B96I/EL6ICK+Jn+jcYO8Gcg+P4jydB4/NisiARxTPuWkrmnOtZUSSRNWp9T YcBOl2r8BIIzS4Fkk0q0MriSIiIb2cVRG5lF2oTYKm3J7Du0SLJyrqRaa5bcEHI7wnns XUkNJ8h/9xPX396e24mQyjhfhxA136GfUdkxUAEjw1EXnOIhDHnNn9+M3HA9LBU69N+x xbo0XCp1fi6t4ryUGasbqaE+nh9wFdHKq2ZamPQSDDsl+pLFYDMDBqLGLQ8xGufT+TAM mXMQz4P5aqYji2Q5kVzHZyl09zcdU/Qs8vZSRwa1wAuFxanWM2kxcYQWROW1VN53HXfa lRyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@9elements.com header.s=google header.b=X1599FXg; 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 u24-20020a63b558000000b0054fef6280d1si1530392pgo.745.2023.07.11.09.19.51; Tue, 11 Jul 2023 09:20:05 -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=X1599FXg; 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 S231395AbjGKQFS (ORCPT + 99 others); Tue, 11 Jul 2023 12:05:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40478 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231445AbjGKQFQ (ORCPT ); Tue, 11 Jul 2023 12:05:16 -0400 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B22C0E6F for ; Tue, 11 Jul 2023 09:05:14 -0700 (PDT) Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-3094910b150so6439106f8f.0 for ; Tue, 11 Jul 2023 09:05:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; t=1689091513; x=1691683513; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=YGMbrwgBLKOnv+M8jwXMoAH8jG/gfbhQBZp4iiCWWRg=; b=X1599FXgOL00p8CKDohLXF9Zr3cMKIazjOaQ+wr9ok+tpfYrW3HSzeLD+mMpSJ0TaX mMnlzicef3CocM5gYd0StuU7RNfloN3Zl4ZqLrExv+rUuDepUtcTazZDAEgL8hd9ggbM VAorHcH+daZIPqCqK7nkF/upz8zdjMz1hOsUErmsnMGZfhv6CEp2rJuYo4aC9ftjwsPd Oo+YJl9PUJVZ8r2POSjKBvS8gc7kGaXAk6vCCUiDug0M7e2EBDE+EQpPpBFJnbQ4CO41 qtV5jPobJP8hL7/CeIhm9jBl5tMCbfFUoHVkY6/pPvYgKPMafArs3B7iaqDo8WMzOw3c jZEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689091513; x=1691683513; 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=YGMbrwgBLKOnv+M8jwXMoAH8jG/gfbhQBZp4iiCWWRg=; b=XSs3cEqFpEbrlClcN4FHfFA9JXRlwUeHy2dSZwH20tt3zRX7T8gliqHIH8fxGiCdvb W+tln8sAo7osFMAjoSMcoszfo+/OKYbJ0sRcBidaGO9uu54IczbXASCHttGxACIE6hEQ D7xaTAnMy3B6HOh3zVmVXpG3Y6voWEAJKxzR8zXeKZSge5EHGtwp4PMCU+Q1k8CzP0ug fc+djHMIDrSsDIvf03MW8QoCridvpw58SR+NzX8yuP/l+k0Q47OTkGMlXEj1NwVDILEv lnO0MEFNdfOfI2fNj0F8+1QOHgeYfh8xxYUJ3i3cYBTOlBZ6ppbWQCj2o352ffcVSC/E xy6A== X-Gm-Message-State: ABy/qLaBEwuj45ZonLYhnDnJ/+3ToTFaf98UoccDToNNxXpLjTlZMpCR nLz1KWkCDQEkU6zCuv/WKKFMGe/NSKLH264uNP//vw== X-Received: by 2002:adf:de90:0:b0:313:fbd0:9813 with SMTP id w16-20020adfde90000000b00313fbd09813mr14916631wrl.28.1689091512709; Tue, 11 Jul 2023 09:05:12 -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 f10-20020adff98a000000b003159d2dabbasm2590377wrr.94.2023.07.11.09.05.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jul 2023 09:05:12 -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 1/3] peci: Add Intel Sapphire Rapids support Date: Tue, 11 Jul 2023 18:04:49 +0200 Message-ID: <20230711160452.818914-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_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: 1771141758237926811 X-GMAIL-MSGID: 1771141758237926811 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". Signed-off-by: Patrick Rudolph Signed-off-by: Naresh Solanki --- 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..3668a908d259 100644 --- a/drivers/peci/cpu.c +++ b/drivers/peci/cpu.c @@ -318,6 +318,11 @@ static const struct peci_device_id peci_cpu_device_ids[] = { .model = INTEL_FAM6_ICELAKE_X, .data = "icx", }, + { /* Sapphire Rapids Xeon */ + .family = 6, + .model = INTEL_FAM6_SAPPHIRERAPIDS_X, + .data = "spr", + }, { /* Icelake Xeon D */ .family = 6, .model = INTEL_FAM6_ICELAKE_D, From patchwork Tue Jul 11 16:04:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naresh Solanki X-Patchwork-Id: 118632 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp597011vqm; Tue, 11 Jul 2023 09:18:43 -0700 (PDT) X-Google-Smtp-Source: APBJJlECWbQvhtLMRJ+Y75XZWkcaFQDQkVB6XUSKzjt4JS0PDQhKnzL67sokSqKcl0E88S6h+H4a X-Received: by 2002:a17:90a:638e:b0:263:f5a5:fb88 with SMTP id f14-20020a17090a638e00b00263f5a5fb88mr16894978pjj.1.1689092322554; Tue, 11 Jul 2023 09:18:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689092322; cv=none; d=google.com; s=arc-20160816; b=sfVZ4Ldp4qV6ZEuI/69wyIcp9cZNOvBBPyXzyIubRd424dMn2+18RhDlMuCILADREB Htu4qLYMoMI4ZDwtRvtvB9rTEo1BoavzI/Sm9viS1+/wbcNENiHIQYWcDTou85Nbr2OK /kpcujuCFu9uYCRD1EfOWXGf6JygcET1SLulDkBl61X1QCklfCQVOi+9tcgSbpOpw0Qf 3QYX5EZzk53irqsePykWh+6asSsjieJpeodfH+YUFHYEowPNgovkRBHnBhTKWEQf73sR Z5ZeQvVDBsudrx/3cd7U4SiWWRikyM9PYs7P/WMETwPLqdk/Vymm2t3Kfr1kGIwx+X0r FNGw== 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=HJ6zIJuacID5DOSHqnnoP33bErwpH8EdehQ+RhKIoRY=; fh=MLQQtRrlW0ahXf5yCU5A3ioMqYfGocoGUOJyz5/qOek=; b=TQo65X/Rb90hVX+IpyHOTIvp8c03b7vCz5ZmP1XsSbwDLQLk+1HKQw7SXYIG753c5H 3Gwu4pUai9yL3FWmyogd3kdB5i6BtGJ73Pl2/9mXMKIkKWOR6osQ9oTA5RNuCvuz4MOr ERBDSG/wl2Wi3xiVjcdggfLqixeuZUpROn7p1QAA3cG7wiE6GSIpmgBO42iixh7IRDdv aDXIXEZBdp/EWo1WbajdXGkLgKswSG6u79t7u4eyxVliP9TCJ6WAXn5It+at1c9NhynK IgyL7382qB1RzMf52fMPhh03kb2lx8loG4zIfIX32BqygDJOhs/xFbzc1hh/32CoAWLj RYUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@9elements.com header.s=google header.b=cqjF8kmN; 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 h3-20020a17090a648300b002634a8e3220si8879513pjj.65.2023.07.11.09.18.29; Tue, 11 Jul 2023 09:18:42 -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=cqjF8kmN; 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 S231797AbjGKQFV (ORCPT + 99 others); Tue, 11 Jul 2023 12:05:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40514 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231319AbjGKQFR (ORCPT ); Tue, 11 Jul 2023 12:05:17 -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 8EE34E60 for ; Tue, 11 Jul 2023 09:05:15 -0700 (PDT) Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-314417861b9so5947888f8f.0 for ; Tue, 11 Jul 2023 09:05:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; t=1689091514; x=1691683514; 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=HJ6zIJuacID5DOSHqnnoP33bErwpH8EdehQ+RhKIoRY=; b=cqjF8kmNdfLVDPdvvG0sxY2ov+69drHqon+x5ZIHqNYWu2KVbRJ2ZOezhBVyUdUP7O 1S7rGwrbbM3zMg4RrJCNLPTb4HLyAZUehEJ1byJE+MTryZPOFsKn81ZXDGyoPgn71IPx dZrzv/Ky7QoyympNY6vi1vEL0GBc6Nkh9L3fKN5TuwlRmFfmeaQTKSIAt/QPb5jItfjm CzeYstqAhC7uow8E7tB1MRWWrfeg4AtsYmkKwaB6EsxzrsbtoiiNB7pg3CNbF159CuU9 F1/QJJGQMM88ap0e9rzz2bzim2XhajupwwwB1su6u8GY4+sM39VByq2VOIFrFpAhhDPb ZnaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689091514; x=1691683514; 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=HJ6zIJuacID5DOSHqnnoP33bErwpH8EdehQ+RhKIoRY=; b=IqN5vP1G8FkigrmgKLRPLU0pwk0xj9hxrp5j+hXmv3nNSIYWmVCWHmPjj2/BA3aS2q hHAoHT+fR7V65EInM6yezhdHr/xgQvjEhJkugH+ade4uptgsMC3v7ZbZuHtxMUp5J5GL A3E85FPJ6xpFmynL4UDMWa07u0S8qgJlJmyFvEOgmlcV/TR6fP/GV1cmvgdfSORYJElK Ic7lFmmaCqwXUeYDmAQmd8V4Hunqh59mU/pWQ43I+N1+EUGvMd1foiRCLi/i2nuHNB3e piabA0HIWZ7uPb95jmkwt+CQy4ZOw0pFcw3cFgi1Cpl9wqB1ApmE/cAE+4O4FCg9RrIr OGhg== X-Gm-Message-State: ABy/qLb2CraWE/nw5m76NCtyB0mii1ZVH0AxM9NmRyJ0o+AKanhxE3bZ CiJH6Tccry3gJwJjZETAAaEibA6/PQfHwfINmuofUg== X-Received: by 2002:a5d:58cf:0:b0:313:f399:6cea with SMTP id o15-20020a5d58cf000000b00313f3996ceamr16513594wrf.4.1689091513872; Tue, 11 Jul 2023 09:05:13 -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 f10-20020adff98a000000b003159d2dabbasm2590377wrr.94.2023.07.11.09.05.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jul 2023 09:05:13 -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 Subject: [PATCH 2/3] hwmon: (peci/cputemp) Add Intel Sapphire Rapids support Date: Tue, 11 Jul 2023 18:04:50 +0200 Message-ID: <20230711160452.818914-2-Naresh.Solanki@9elements.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230711160452.818914-1-Naresh.Solanki@9elements.com> References: <20230711160452.818914-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: 1771141670997959261 X-GMAIL-MSGID: 1771141670997959261 From: Patrick Rudolph Add support to read DTS for reading Intel Sapphire Rapids platform. Signed-off-by: Patrick Rudolph --- 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 11 16:04: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: 118640 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp600812vqm; Tue, 11 Jul 2023 09:24:12 -0700 (PDT) X-Google-Smtp-Source: APBJJlEKhVjlgrufJiw71oIhkxr/lkQ4ipc1crJuHRFIZRaAYU5TbBE+P9X6pMVCguFsc95Uhezk X-Received: by 2002:a05:6a00:10c5:b0:682:5634:3df1 with SMTP id d5-20020a056a0010c500b0068256343df1mr18204809pfu.10.1689092652349; Tue, 11 Jul 2023 09:24:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689092652; cv=none; d=google.com; s=arc-20160816; b=PvpUMeawtmDjC4mx+gL6H/uoUKZiA3gVVqwyit+tr7reW5M37QHm5E3BAvzt5F5oEv LFjBZ3HdUTiqS91I9hS7XlqgnNVMGlINKkBf2viLYbuXZbPOt2fNeFNBgXW09pbWp6ts 4iMc27eKEVoTzhW2CHCHeqoYwTEWIXEPlL68KVkAZPZ4J8xU2qlDkcPtkiWX6Y6iysDh nEg0jkBX0EYfHDvkASnWxjwOUO9MSfpdgKejMN3j1hbqzM55O9w486mtVJEvDNYHifbp 93mMu7gW0PYCMaZsGu9+eIkRw/2Ptr8Z0SKE9MvUwOt9U9/QTsGuCXqCzaKGRGWIe+T9 k0Tw== 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=4VNB55+Kj0EnFZI/6YA+WsjU8eHtTcvYjmA+69rBlFU=; fh=MLQQtRrlW0ahXf5yCU5A3ioMqYfGocoGUOJyz5/qOek=; b=YLxNersZ4XmZPfLKkvh4MmhDYXx5SMkvfeVf3o4ztZmLJw93R0o4KDoXdhxl/2gNrv T0M3xvnZBDwEX8BZXQgOEFSN6PZ6MCEhBhF2VbWheeo5CeNwYg4I9cT5qZH9UsEMPsnA Gkrk31v7YlvmY2wfa1F6ej7sfFzwQC7LLSDFsDy7WC4xzKrSQCZLTRogZf3GEidNOris fQZm/l9kYLEj1XEMZbEQKiECJ6vH9mFsNozdHQQjKffeW4ayw5Mm5CW51HM+tZcYojf5 OgOHRYQJPjTEr32TcScoLknsb6aER7j+zU2Z2b8b7lxlQ6OyO0La6z0X6FUHVVpo+iae zDgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@9elements.com header.s=google header.b=V0CL4Kpp; 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 v135-20020a63618d000000b005347d133470si1616162pgb.385.2023.07.11.09.23.59; Tue, 11 Jul 2023 09:24:12 -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=V0CL4Kpp; 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 S231908AbjGKQFY (ORCPT + 99 others); Tue, 11 Jul 2023 12:05:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40470 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231494AbjGKQFS (ORCPT ); Tue, 11 Jul 2023 12:05:18 -0400 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E0E8B133 for ; Tue, 11 Jul 2023 09:05:16 -0700 (PDT) Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-314172bb818so6368065f8f.1 for ; Tue, 11 Jul 2023 09:05:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; t=1689091515; x=1691683515; 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=4VNB55+Kj0EnFZI/6YA+WsjU8eHtTcvYjmA+69rBlFU=; b=V0CL4KppxA7FXEGPQn5AbE9Edqfb6QVfaGTeFJsRyl8EZbGVgDnQzmuUl4+YIE1+98 bzrrNWKjYbZXYHxau15yEYhtx5dK1vVKgt5Vg7gVjtoqTi3w0/nwVpoMf/He50w1pVhM BtWqlGKXO2nEyElPGsSTRb99Kr5ws5yT5Z/+oEKVDFxscTJY5ffZCF/r9rjIhQZDN5DS MzlWZVejVnDzX3TmXQrnl1kS35ImQ7V8IvUE+Xdr5A7FHq8o81OYNPEZ4VjfS22yEssT f4Nl26KoNxPDRqfxsJmoy3fBkcubmuwmQNToFHbJbjBx5yNXqsZH+Q3k2DQQQYAc6ZCR XcwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689091515; x=1691683515; 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=4VNB55+Kj0EnFZI/6YA+WsjU8eHtTcvYjmA+69rBlFU=; b=DlacvX1QgFVZQboAYQikWfQI/xJHDKErxkD9iOMZQWIABmBP3tAOdHDuvSuHkwjGtk CUU4ov6nZL7cCXpGWeN6NdpEaOKxhoY+EvE4jw4XZLHL+juwhBgTHSSw8BU01qvPeYsr mMgcnw+TrpLZUrGiFqBq5Em8QYR80LPF4iwSZrXENEHzetv4n7wqtEULi+SbzI8kQg0h dOB3BG13WZWRN/bJ+DEv821aQGkF0VICG7EfLqfa+AvMp55/Qd3Hnwgea1HDXmHXzyOP KHeQEZhNlF55BDgqgT8WvgcWK72sK4DQbhYOgw0JbI8APgftDh9mWwXI2CtQN/xWVc7Q FRGg== X-Gm-Message-State: ABy/qLYcwhMstrn2GDld9CSBrDGXp0xaFFBwVDVUfniSvh1RPzA98vbU o9qbBX1BGIXIFlRR9pdV06NNIKm3ISdoaFPNrkitvg== X-Received: by 2002:adf:ce01:0:b0:314:36c5:e4c0 with SMTP id p1-20020adfce01000000b0031436c5e4c0mr16432328wrn.11.1689091515075; Tue, 11 Jul 2023 09:05:15 -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 f10-20020adff98a000000b003159d2dabbasm2590377wrr.94.2023.07.11.09.05.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jul 2023 09:05:14 -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 Subject: [PATCH 3/3] hwmon: (dimmtemp) Add Sapphire Rapids support Date: Tue, 11 Jul 2023 18:04:51 +0200 Message-ID: <20230711160452.818914-3-Naresh.Solanki@9elements.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230711160452.818914-1-Naresh.Solanki@9elements.com> References: <20230711160452.818914-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: 1771142017207098734 X-GMAIL-MSGID: 1771142017207098734 From: Patrick Rudolph This patch extends the functionality of the hwmon (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 --- 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);