Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp240272ybi; Wed, 29 May 2019 20:26:40 -0700 (PDT) X-Google-Smtp-Source: APXvYqye3D4xblc2NK9UV5zZm88cBqz3jVIZ/59jT7Lrd32onz9xD8nQ4Tby8Rw+UmwB84IBz6dX X-Received: by 2002:a62:ab0a:: with SMTP id p10mr1462152pff.143.1559186800647; Wed, 29 May 2019 20:26:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559186800; cv=none; d=google.com; s=arc-20160816; b=zxeS2UlkSdl6VgeB9JfvTaljOvCe3BXxdxvaUTf9cuSS7MMTNYUHj9i5E/AFwSkAtP 1HOx1y2I//sohhqmDcuYdJ9pVjsALzZ0VSk6dJmP30iXZnR1jwA1DbdfUw31X9H3NG1z w6n80k3jRmrxlV99n5YngnTnyrpqtHTqbWIAD/N6+fM2nKCTL1sOrlllmupbE3SMOqmX QMolOP0wfVDMRX3cLpeEm5EKmWDr5lcm8HRdlLYiz6tkJpD28W79V6uqrF8GS052nQ6q It2yhiPokF6Skd+xANQnTghgFy2IhPJ+moaRbB8F6TfAWZFBGt0xgHGVLzdjIDjLZAZd 1zfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=wvMODe95MCr/HLYxUQmZYT6cGKBkfKR/hg5BBnqkepw=; b=UvYCEquFhApBDfLbYINo7JFJKKuqClo8b5lA0Qe9VZXMk8uNenGIqTlOfn2f6vlrUD W3apnN1TyV6RWJtyFnaReD6AJobuXPz3dXJZtsgaPMfCjZgq7J+OfeP74ICIkog5/cej hjQlaJz6yGEyWpL94zE+oBze0iMeLsU/M8fDeWPkkmzOVK6ye4nCAqWeXDUEZ5fuUz0F MrFogN+Zp+4PWIjGTAC2B8EBNfTRzkNzZZPbCk4EqVOA7ib9NV062Vvm5R9MNjC2UQui ffkr4DqWkWPw+g5xf8Lq5vqzkIKT7Ga99uMuZhxpdR2UpZdizhXqI33QM81wNqaQvzRn MYwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="jm73/i18"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y4si2377394pfq.10.2019.05.29.20.26.24; Wed, 29 May 2019 20:26:40 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="jm73/i18"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733053AbfE3DXX (ORCPT + 99 others); Wed, 29 May 2019 23:23:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:46606 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730252AbfE3DRY (ORCPT ); Wed, 29 May 2019 23:17:24 -0400 Received: from localhost (ip67-88-213-2.z213-88-67.customer.algx.net [67.88.213.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C3EED24109; Thu, 30 May 2019 03:17:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559186243; bh=J4uwusvLtrICANSHTWdP5KgOtyuG4ox8q63z/IbzCHk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jm73/i180Z8UH6WFGDuDhoWmlJA2mO4FWxiepnAHOIeqFexZCwMkqIPA9cw1z6S0o +JqNbFMFhhd8w32pQmyxeNrUDT0RFhlwg3ADUpxfhKMoReGSg0NsmAALW2Qg6rNbju noVx/jguPNZqdFFcmkjiQNvF+a6p4xDg+YAMJM+o= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Guenter Roeck , Sasha Levin Subject: [PATCH 4.19 157/276] hwmon: (vt1211) Use request_muxed_region for Super-IO accesses Date: Wed, 29 May 2019 20:05:15 -0700 Message-Id: <20190530030535.346718926@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190530030523.133519668@linuxfoundation.org> References: <20190530030523.133519668@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit 14b97ba5c20056102b3dd22696bf17b057e60976 ] Super-IO accesses may fail on a system with no or unmapped LPC bus. Also, other drivers may attempt to access the LPC bus at the same time, resulting in undefined behavior. Use request_muxed_region() to ensure that IO access on the requested address space is supported, and to ensure that access by multiple drivers is synchronized. Fixes: 2219cd81a6cd ("hwmon/vt1211: Add probing of alternate config index port") Signed-off-by: Guenter Roeck Signed-off-by: Sasha Levin --- drivers/hwmon/vt1211.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/hwmon/vt1211.c b/drivers/hwmon/vt1211.c index 3a6bfa51cb94f..95d5e8ec8b7fc 100644 --- a/drivers/hwmon/vt1211.c +++ b/drivers/hwmon/vt1211.c @@ -226,15 +226,21 @@ static inline void superio_select(int sio_cip, int ldn) outb(ldn, sio_cip + 1); } -static inline void superio_enter(int sio_cip) +static inline int superio_enter(int sio_cip) { + if (!request_muxed_region(sio_cip, 2, DRVNAME)) + return -EBUSY; + outb(0x87, sio_cip); outb(0x87, sio_cip); + + return 0; } static inline void superio_exit(int sio_cip) { outb(0xaa, sio_cip); + release_region(sio_cip, 2); } /* --------------------------------------------------------------------- @@ -1282,11 +1288,14 @@ static int __init vt1211_device_add(unsigned short address) static int __init vt1211_find(int sio_cip, unsigned short *address) { - int err = -ENODEV; + int err; int devid; - superio_enter(sio_cip); + err = superio_enter(sio_cip); + if (err) + return err; + err = -ENODEV; devid = force_id ? force_id : superio_inb(sio_cip, SIO_VT1211_DEVID); if (devid != SIO_VT1211_ID) goto EXIT; -- 2.20.1