From patchwork Mon Jul 6 05:47:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gavin Shan X-Patchwork-Id: 11644863 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8C4BF13B4 for ; Mon, 6 Jul 2020 05:49:56 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6605620739 for ; Mon, 6 Jul 2020 05:49:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="KKOJCXwz"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="CB6K6nhN" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6605620739 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=ygyR8iw5J2y1JXSAqZqf2GtEnzb4oCVQj2BFMVFOW5o=; b=KKOJCXwznMlmLaXXG64N1zzRH y+M9IPEnPQaqIWmUUwKbuXF5J8o6L8K0p5WZaDx/vRaIMjGoktkxhFhxnNBon987ztLH2aoF5OwRa mSsYc9Vnv5WwL0qe1QG02Ak4Zf6mpOodZU2vNdEH0Pa+yx0dZPFC8PT9pJADtWStH87dQE1sevDoc Arp/QwQ4JcDqMtmlTG6AleL7JGS1J+6ywqIjaIcsDliiHG7jOZjSlP/sjJcgZS+3yK2VKfZ+u/6jj IzOJxfFXYC/tM5Gr+/8Ji5CbhErBok6niMAchuoHr1rHkk1Gkyi0wQjcSXLBQ6acL4cnK/bxaHOKn 5fNp0tzeA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jsJzB-0003aB-A4; Mon, 06 Jul 2020 05:48:13 +0000 Received: from us-smtp-2.mimecast.com ([205.139.110.61] helo=us-smtp-delivery-1.mimecast.com) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jsJz3-0003Ya-VT for linux-arm-kernel@lists.infradead.org; Mon, 06 Jul 2020 05:48:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594014485; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4vmNEyqmrubgoSVYBU+M5O6KwKr6W8TujiPFTF3c5Mg=; b=CB6K6nhNB6qIPg41/Z0I0LdAIOqMYC6GbY7CI6zmnQwlh1+e0D2Et4TDxsJprUoyvyp0wt DgbdQ0qCHFrrJJotgpMO4mG66qAeuCVVgMqHLOrFf+5Q5bGoT7ttq+pHQzcrqy9rNX3282 iXomFaE9gs0v7v0gjJaFSjqh0NGSpnc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-64-NfxUnEkHPwya9ZRZsoPcfw-1; Mon, 06 Jul 2020 01:48:03 -0400 X-MC-Unique: NfxUnEkHPwya9ZRZsoPcfw-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1F1A5A0BD7; Mon, 6 Jul 2020 05:48:02 +0000 (UTC) Received: from localhost.localdomain.com (vpn2-54-159.bne.redhat.com [10.64.54.159]) by smtp.corp.redhat.com (Postfix) with ESMTP id CF937C0DBA; Mon, 6 Jul 2020 05:47:59 +0000 (UTC) From: Gavin Shan To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 05/14] drivers/firmware/sdei: Remove sdei_get_conduit() Date: Mon, 6 Jul 2020 15:47:23 +1000 Message-Id: <20200706054732.99387-6-gshan@redhat.com> In-Reply-To: <20200706054732.99387-1-gshan@redhat.com> References: <20200706054732.99387-1-gshan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=gshan@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200706_014806_117887_780B7A5C X-CRM114-Status: GOOD ( 13.07 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [205.139.110.61 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [205.139.110.61 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders -0.0 DKIMWL_WL_HIGH DKIMwl.org - Whitelisted High sender X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, will@kernel.org, james.morse@arm.com, shan.gavin@gmail.com, catalin.marinas@arm.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org There are some logics in sdei_get_conduit() can be safely dropped: * There are no associated device node with the platform device, so it's pointless to check on it. * ACPI functionality has been verified when the platform device is added in sdei_init(). So it's unnecessary to recheck. With above logics dropped, sdei_get_conduit() is quite simple and it's not worthy to maintain a separate function. The logic is merged to sdei_probe() as it's the only caller. Signed-off-by: Gavin Shan --- drivers/firmware/arm_sdei.c | 40 +++---------------------------------- 1 file changed, 3 insertions(+), 37 deletions(-) diff --git a/drivers/firmware/arm_sdei.c b/drivers/firmware/arm_sdei.c index 7e7b26b1f91b..ca0e3f5eb907 100644 --- a/drivers/firmware/arm_sdei.c +++ b/drivers/firmware/arm_sdei.c @@ -933,49 +933,15 @@ int sdei_unregister_ghes(struct ghes *ghes) return err; } -static int sdei_get_conduit(struct platform_device *pdev) -{ - const char *method; - struct device_node *np = pdev->dev.of_node; - - sdei_firmware_call = NULL; - if (np) { - if (of_property_read_string(np, "method", &method)) { - pr_warn("missing \"method\" property\n"); - return SMCCC_CONDUIT_NONE; - } - - if (!strcmp("hvc", method)) { - sdei_firmware_call = &sdei_smccc_hvc; - return SMCCC_CONDUIT_HVC; - } else if (!strcmp("smc", method)) { - sdei_firmware_call = &sdei_smccc_smc; - return SMCCC_CONDUIT_SMC; - } - - pr_warn("invalid \"method\" property: %s\n", method); - } else if (IS_ENABLED(CONFIG_ACPI) && !acpi_disabled) { - if (acpi_psci_use_hvc()) { - sdei_firmware_call = &sdei_smccc_hvc; - return SMCCC_CONDUIT_HVC; - } else { - sdei_firmware_call = &sdei_smccc_smc; - return SMCCC_CONDUIT_SMC; - } - } - - return SMCCC_CONDUIT_NONE; -} - static int sdei_probe(struct platform_device *pdev) { int err; u64 ver = 0; int conduit; - conduit = sdei_get_conduit(pdev); - if (!sdei_firmware_call) - return 0; + conduit = acpi_psci_use_hvc() ? SMCCC_CONDUIT_HVC : SMCCC_CONDUIT_SMC; + sdei_firmware_call = acpi_psci_use_hvc() ? + &sdei_smccc_hvc : &sdei_smccc_smc; err = sdei_api_get_version(&ver); if (err == -EOPNOTSUPP)