From patchwork Fri Nov 4 15:49:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 15649 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp488871wru; Fri, 4 Nov 2022 08:56:12 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6vygStUwG1OLLa8G50hSj42OpJkgBq7OFghJ4TaHf9UdKhGAgdJNfhHZR8B+Vb2H4eJImD X-Received: by 2002:a05:6402:35cf:b0:462:67bf:94a9 with SMTP id z15-20020a05640235cf00b0046267bf94a9mr35900800edc.1.1667577372295; Fri, 04 Nov 2022 08:56:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667577372; cv=none; d=google.com; s=arc-20160816; b=I9nByxzUhyde+r8gWOciYxpjZdE7qes5szUbYu+1ZEwN43F6UqW6NiHosV1CgkEqya gYrdKoI7VCgyjeDO0N63fCVK6HeJlyMsVCNpAB9zNp/JdzSuTcLrswE3CNXTaMieeN/6 YrOwfcDNRAa9v2QX76sfr/jfBlZ5ix+ihgd7KMZHWEYCaYGJTswa7XWoKMLlbEdxRqL3 s4TPqKocLNSina8KhP3XWCbj+I7k7fVEErWnOKV09+FX4KZmFoylGN03281WHODKqBL3 p1GfEEoN8sa1Or8RtEKwRDjR3oMvJEiR6pYS46fUgiqsgDvlpRFgBT8NFMXaUZv7cUkb T1DA== 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=ka4iYSwPvR9I8tM4apjBzdJjYOM6SLrLJa8dBf4nuQg=; b=JZ1cOfXiHnxwIrgZsBssM2Qgv0aayALJIjiRSSOCxbYDiBHFpR4LKvRziJwZLDDimf Kp6w0CtKoVLr94XD3ransXBaz/KQvClfZhzrkMTnSp3JJ+iPs+4x/CTALlwJ4UoEbdgA Su1jQbW2sCHF3ie13UV4+rFfph1HsYNUTFUHjRQ80t0AdWU9vocp54juGrIoeF/yNm50 2/jUXDH2ngibDywwa/I90b1RQBMwvvnv+yA5iqdpEg5fxZHLOq5Ph4ZMH79d612nqhNM +/JstG+RevZSL9Zg68DSf8BAmKoIYCmbeF7Q79VFdCYct2AHSomNDwdgdi5/rQAr/+op t+hg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Lqqdn+91; 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=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id dr12-20020a170907720c00b0078315844537si6057587ejc.378.2022.11.04.08.55.47; Fri, 04 Nov 2022 08:56: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=@intel.com header.s=Intel header.b=Lqqdn+91; 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=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231642AbiKDPtY (ORCPT + 99 others); Fri, 4 Nov 2022 11:49:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55318 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231881AbiKDPtC (ORCPT ); Fri, 4 Nov 2022 11:49:02 -0400 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 622D932B94; Fri, 4 Nov 2022 08:48:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1667576939; x=1699112939; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=/AB2CHEBXiegxBIF8aHHp24X7v0gPew71riyKr6BBow=; b=Lqqdn+91EyWDR5E0nXLCahK5xnUvLFVzr/44jqZYUbenDs4J6OMP7oEw bM8GF9ydEBvfskJ9PY7zs8Lmzsye+d/xUkgSoTvxzABpuWVCiVmla49uZ +1PqCDNHctF72Zmyh6mRfJORurYMJhBlvsyUNFC/WgP8Xqy2oLyyoAvBh bsU9p5P88PGwimQYuV0n9HLLd4eZTJIrwCm2WhxP/vX1HkO+Jbp8y6QN3 hu3O35rP4yamKyILVDFIRNqtgZJOWXiOMmetFLpQHRfhd5U6oUFg13e/w PdkwC1MITW7BgjNenwj/yqBssYF7228sVCBTode9rNCiTHUeKpZVuuGK3 Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10521"; a="289714974" X-IronPort-AV: E=Sophos;i="5.96,137,1665471600"; d="scan'208";a="289714974" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Nov 2022 08:48:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10521"; a="724394278" X-IronPort-AV: E=Sophos;i="5.96,137,1665471600"; d="scan'208";a="724394278" Received: from black.fi.intel.com ([10.237.72.28]) by FMSMGA003.fm.intel.com with ESMTP; 04 Nov 2022 08:48:57 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id EB251F7; Fri, 4 Nov 2022 17:49:20 +0200 (EET) From: Andy Shevchenko To: Hans de Goede , Andy Shevchenko , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Mark Gross , Jarkko Nikula Subject: [PATCH v1 1/1] platform/x86: p2sb: Don't fail if unknown CPU is found Date: Fri, 4 Nov 2022 17:49:16 +0200 Message-Id: <20221104154916.35231-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-Spam-Status: No, score=-5.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_PASS, SPF_NONE 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748581611015909852?= X-GMAIL-MSGID: =?utf-8?q?1748581611015909852?= We have accessing P2SB from a very few places for quite known hardware. When a new SoC appears in intel-family.h it's not obvious that it needs to be added to p2sb.c as well. Instead, provide default BDF and refactor p2sb_get_devfn() to always succeed. If in the future we would need to exclude something, we may add a list of unsupported IDs. Without this change the iTCO on Intel Commet Lake SoCs became unavailable: i801_smbus 0000:00:1f.4: failed to create iTCO device Fixes: 5c7b9167ddf8 ("i2c: i801: convert to use common P2SB accessor") Reported-by: Jarkko Nikula Signed-off-by: Andy Shevchenko Tested-by: Jarkko Nikula --- drivers/platform/x86/p2sb.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/drivers/platform/x86/p2sb.c b/drivers/platform/x86/p2sb.c index 384d0962ae93..1cf2471d54dd 100644 --- a/drivers/platform/x86/p2sb.c +++ b/drivers/platform/x86/p2sb.c @@ -19,26 +19,23 @@ #define P2SBC 0xe0 #define P2SBC_HIDE BIT(8) +#define P2SB_DEVFN_DEFAULT PCI_DEVFN(31, 1) + static const struct x86_cpu_id p2sb_cpu_ids[] = { X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT, PCI_DEVFN(13, 0)), - X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT_D, PCI_DEVFN(31, 1)), - X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT_D, PCI_DEVFN(31, 1)), - X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE, PCI_DEVFN(31, 1)), - X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE_L, PCI_DEVFN(31, 1)), - X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE, PCI_DEVFN(31, 1)), - X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_L, PCI_DEVFN(31, 1)), {} }; static int p2sb_get_devfn(unsigned int *devfn) { + unsigned int fn = P2SB_DEVFN_DEFAULT; const struct x86_cpu_id *id; id = x86_match_cpu(p2sb_cpu_ids); - if (!id) - return -ENODEV; + if (id) + fn = (unsigned int)id->driver_data; - *devfn = (unsigned int)id->driver_data; + *devfn = fn; return 0; }