From patchwork Thu Jan 19 19:11:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 45937 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp502537wrn; Thu, 19 Jan 2023 11:20:47 -0800 (PST) X-Google-Smtp-Source: AMrXdXu8m26Tf7PMC/SttZ/ZBWyhvC7ITIg6hWK0foppGsZgqEg7ROzLdSxS6iQdolyr05lQAS7F X-Received: by 2002:a17:90b:4b92:b0:229:f4e1:d4b1 with SMTP id lr18-20020a17090b4b9200b00229f4e1d4b1mr1903816pjb.22.1674156047084; Thu, 19 Jan 2023 11:20:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674156047; cv=none; d=google.com; s=arc-20160816; b=NzB8ljfbU0UxeGRS4V6LPHum7R5Qw/dG1z6XvV9IQMIPdDVkA58IeuIFpCdbkNUKYX wLAIKsFfSOjp9tMakEVXfBLKLfor2aoDy19oK1dfDYe5CFmuw9lPbL84D6SdtW16t5iZ ZP0jD93eJ1jou4Tvv/AwTB7RKCIgfWoLdsFDKao152XfnptDuK+aXGLeDDpQxddmGl6P adQNRHP276DKODZ3BW2l9rHARtVokyGw3P3/mrIHqRkaY/9vCIkXRR47Yi6GvswLUSLQ GRHmCv6A9QUIRdMktu4xxBpAB6OaCcL7/uIW6ddbmYa+MsXiaCLc5sRLmTnRqQBao6C+ 2P5Q== 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=hS73Czr7ytD+hVvMmTmgpf7aoGBEBNb4V/q3jN8kHBQ=; b=iLXy/TP1ZG5GksIwWw7tjSp0etm8WKGef7Un5hHeQMDLxwraZEL63FQN9yWKrovIXk XSYh2qizXpzspqxPF0GatDM08rowjlkzwve6fpw9rdrChotIz0kRPeff931CBnm8hoXR 8paC9+5Mo5Meufb7Mmc7lYsJVNmmU6295juHgN4KqtTA7V8oMHo4hZLffnHXPd4GqhwV tEx50kinKuN2toClKLbfyJHONJp8fKdyE4iwzMUAQtp4bBNtbTqJtBs3XJVSKOri354N POIQhcVnHQ0uSypOxFWnSbrl0ugviD2mgTtq6FBjTxVuJjA7vBI2MyNi15Z8O+60u7N6 Q/SA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ZV6t7T8M; 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 q34-20020a17090a752500b002268aa2b8b0si1938pjk.88.2023.01.19.11.20.34; Thu, 19 Jan 2023 11:20:47 -0800 (PST) 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=ZV6t7T8M; 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 S231346AbjASTQr (ORCPT + 99 others); Thu, 19 Jan 2023 14:16:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53848 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231329AbjASTQ1 (ORCPT ); Thu, 19 Jan 2023 14:16:27 -0500 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 040E1966D9; Thu, 19 Jan 2023 11:15:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674155719; x=1705691719; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=1HuuDaAUhECpauFK3xburRU6vWUT+DOtnKE7jETeHAQ=; b=ZV6t7T8MlkwDjgteF7KLqFnNXOAgWnwoWKr0Axhu1OerFC3VSkljc2Q8 pfYs0DrZdrlTLN+mCu6i4bVNkiVm5QFZ9jqiL6Wd2JaQLyEYowgs1Sp1j IZKfKmjiOVDidExiCB18WfN4aRcp1BtAFEKIz9JwfyZANzxmDzCS+4HFc jeaUS2BPxsEfoADWUPmZxKY/AUKZ08uUBx+osnzqBcamVrHcuq5j8qC95 i4/AF0YQreQRl/uY9FipU+Yqqu1M5QpOKV3pSAXJnTQ7qbd7o2seiXrBb 4XBmNt1YQ2nF/tEWm7fCQUaPSTPmlcc/t6vWdSTVUL1RwURIsMDhK9eId Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10595"; a="324078044" X-IronPort-AV: E=Sophos;i="5.97,229,1669104000"; d="scan'208";a="324078044" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2023 11:10:32 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10595"; a="802752086" X-IronPort-AV: E=Sophos;i="5.97,229,1669104000"; d="scan'208";a="802752086" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 19 Jan 2023 11:10:28 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 49936368; Thu, 19 Jan 2023 21:11:03 +0200 (EET) From: Andy Shevchenko To: Tony Nguyen , Andy Shevchenko , "Rafael J. Wysocki" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org Cc: Yisen Zhuang , Salil Mehta , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , "Rafael J. Wysocki" , Len Brown , kernel test robot Subject: [PATCH net-next v2 1/2] ACPI: utils: Add acpi_evaluate_dsm_typed() and acpi_check_dsm() stubs Date: Thu, 19 Jan 2023 21:11:00 +0200 Message-Id: <20230119191101.80131-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, 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?1755479850995759873?= X-GMAIL-MSGID: =?utf-8?q?1755479850995759873?= When the ACPI part of a driver is optional the methods used in it are expected to be available even if CONFIG_ACPI=n. This is not the case for _DSM related methods. Add stubs for acpi_evaluate_dsm_typed() and acpi_check_dsm() methods. Reported-by: kernel test robot Signed-off-by: Andy Shevchenko --- v2: new patch to prevent compilation failures (LKP) include/linux/acpi.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 5e6a876e17ba..4b12dad5a8a4 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -950,6 +950,12 @@ static inline bool acpi_driver_match_device(struct device *dev, return false; } +static inline bool acpi_check_dsm(acpi_handle handle, const guid_t *guid, + u64 rev, u64 funcs) +{ + return false; +} + static inline union acpi_object *acpi_evaluate_dsm(acpi_handle handle, const guid_t *guid, u64 rev, u64 func, @@ -958,6 +964,15 @@ static inline union acpi_object *acpi_evaluate_dsm(acpi_handle handle, return NULL; } +static inline union acpi_object *acpi_evaluate_dsm_typed(acpi_handle handle, + const guid_t *guid, + u64 rev, u64 func, + union acpi_object *argv4, + acpi_object_type type) +{ + return NULL; +} + static inline int acpi_device_uevent_modalias(struct device *dev, struct kobj_uevent_env *env) { From patchwork Thu Jan 19 19:11:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 46140 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp18261wrn; Thu, 19 Jan 2023 21:08:20 -0800 (PST) X-Google-Smtp-Source: AMrXdXsBR0wnP4MSKcrp2aWb3nYgr5jAU3a1mfrX+IH2vmDq2WwDG2SGS+77enQSJraos5Idbmrl X-Received: by 2002:a05:6402:5507:b0:49d:efdc:4f77 with SMTP id fi7-20020a056402550700b0049defdc4f77mr21867308edb.38.1674191300726; Thu, 19 Jan 2023 21:08:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674191300; cv=none; d=google.com; s=arc-20160816; b=CW2+PoTfa11+nNNmMGrc9BFITui1q4/vtynqO+gduKxFEaWCkE9kZnV8LRWl3k4dkB oti3FyopEdVXe2Pv97RFFkcaX2nUM1Adifq7ipGrtoGIUJq3qSOhxMm+Z+ZAP5ayfRUQ oXfZUZVsFOHCQ7kbN8xGO465xCgqje8C8b5O/sK8eY0IbUifuVvH0uOfE/ax9kPT+JpS lBhSTomb9H7/CiIKiTsBUIimMc0mRl1TfpfBYlPTX4KOQKDzntevH1RWrG9+k4qJvqFc HO70GdrL6n1LRXi/YDSTysUCeJfOm0huy8oJE2VKnVe1UmrciXFGbPt9lXSjnqsx778U YALg== 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=TfBGs9urnl0Uo/zlzAq/LDpwDCvWA9jscBY4K3DMM+w=; b=aiov71qqy1dpD//1XfMKRX/R04Ko6m/6tUxhTBBErdJRNfVDOMP6kBMKURazBzAKTe xkODIqUCdkXQEefIMB/oKZSIfb2QEkyksdyVfaKlALLdMmTZ2gwAHszAkdDrwi8slQT7 ZViu1EfxljeXImLn0Zl6CU+2fV+3PY6ty060DlUQY78RXYKedYFKG/AmiM/tZOrTR5OO nVwROBhK4qSVuI7cuLwJz9sRKrDeA2TkeTlwCIwlSKZcgWCoSemIFg1AIBdFQ4PuSFtd gtgUi7hpIdhHQCbUaGFYQ2yS3XswSEHtY6n088L6UO3R6uE2obR61/lopKzHJazg9/JY dANA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=jjyFhL55; 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 c10-20020a05640227ca00b0048cb4ab0e23si22721829ede.295.2023.01.19.21.07.56; Thu, 19 Jan 2023 21:08:20 -0800 (PST) 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=jjyFhL55; 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 S231263AbjATE7v (ORCPT + 99 others); Thu, 19 Jan 2023 23:59:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53082 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230156AbjATE7g (ORCPT ); Thu, 19 Jan 2023 23:59:36 -0500 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B53BED05EE; Thu, 19 Jan 2023 20:47:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674190079; x=1705726079; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=E98QGbc8dlCtreJMfmIlTfn2lZ42kDRmuNfuyIyYYMg=; b=jjyFhL55I2x8bWRNfQ3IImS98aao5Khj9QMvYOuVf3SLe57yyCJRhoYI +rRilMz0XGGkdCjMKVEwI4O/FNZhyAcoh2D9JIx/ZSGOkyotHrb1TJXmH gEUZAfP5kudBd66ye6pOTdSrt/hdOtJHbZnVhjf+sA7cHFLN4celEEGWx rHoSOR0du3kcz27xKqI1E8SWqGmmgv6QsFe5W5j6EGEXIOWt02nO8IuAK 8Y0WHq7X07Zlb1w4L63VwBZvPjoK8CzzBOuXUMKbx8saBEvF8R4kEo+J4 9bSRxGUDFuabAHOSc9Th1omcoGeMPJ4VvAA9ADdB8W9RXHRo698Bu2NeZ A==; X-IronPort-AV: E=McAfee;i="6500,9779,10595"; a="308970218" X-IronPort-AV: E=Sophos;i="5.97,229,1669104000"; d="scan'208";a="308970218" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2023 11:10:32 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10595"; a="728816425" X-IronPort-AV: E=Sophos;i="5.97,229,1669104000"; d="scan'208";a="728816425" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga004.fm.intel.com with ESMTP; 19 Jan 2023 11:10:28 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 529D292; Thu, 19 Jan 2023 21:11:03 +0200 (EET) From: Andy Shevchenko To: Tony Nguyen , Andy Shevchenko , "Rafael J. Wysocki" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org Cc: Yisen Zhuang , Salil Mehta , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , "Rafael J. Wysocki" , Len Brown Subject: [PATCH net-next v2 2/2] net: hns: Switch to use acpi_evaluate_dsm_typed() Date: Thu, 19 Jan 2023 21:11:01 +0200 Message-Id: <20230119191101.80131-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230119191101.80131-1-andriy.shevchenko@linux.intel.com> References: <20230119191101.80131-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,SPF_HELO_NONE,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?1755516817582968111?= X-GMAIL-MSGID: =?utf-8?q?1755516817582968111?= The acpi_evaluate_dsm_typed() provides a way to check the type of the object evaluated by _DSM call. Use it instead of open coded variant. Signed-off-by: Andy Shevchenko Reviewed-by: Tony Nguyen --- v2: added tag (Tony), fixed compilation errors (LKP) .../ethernet/hisilicon/hns/hns_dsaf_misc.c | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c index 740850b64aff..5df19c604d09 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c @@ -554,11 +554,11 @@ static phy_interface_t hns_mac_get_phy_if_acpi(struct hns_mac_cb *mac_cb) argv4.package.count = 1; argv4.package.elements = &obj_args; - obj = acpi_evaluate_dsm(ACPI_HANDLE(mac_cb->dev), - &hns_dsaf_acpi_dsm_guid, 0, - HNS_OP_GET_PORT_TYPE_FUNC, &argv4); - - if (!obj || obj->type != ACPI_TYPE_INTEGER) + obj = acpi_evaluate_dsm_typed(ACPI_HANDLE(mac_cb->dev), + &hns_dsaf_acpi_dsm_guid, 0, + HNS_OP_GET_PORT_TYPE_FUNC, &argv4, + ACPI_TYPE_INTEGER); + if (!obj) return phy_if; phy_if = obj->integer.value ? @@ -601,11 +601,11 @@ static int hns_mac_get_sfp_prsnt_acpi(struct hns_mac_cb *mac_cb, int *sfp_prsnt) argv4.package.count = 1; argv4.package.elements = &obj_args; - obj = acpi_evaluate_dsm(ACPI_HANDLE(mac_cb->dev), - &hns_dsaf_acpi_dsm_guid, 0, - HNS_OP_GET_SFP_STAT_FUNC, &argv4); - - if (!obj || obj->type != ACPI_TYPE_INTEGER) + obj = acpi_evaluate_dsm_typed(ACPI_HANDLE(mac_cb->dev), + &hns_dsaf_acpi_dsm_guid, 0, + HNS_OP_GET_SFP_STAT_FUNC, &argv4, + ACPI_TYPE_INTEGER); + if (!obj) return -ENODEV; *sfp_prsnt = obj->integer.value;