From patchwork Wed May 11 02:47:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jian Hui Lee X-Patchwork-Id: 1629412 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=JGLZpbOK; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KyfTT3tFQz9sG2 for ; Wed, 11 May 2022 12:47:41 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1nocNz-0008Sj-Ou; Wed, 11 May 2022 02:47:35 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nocNy-0008Rx-CQ for kernel-team@lists.ubuntu.com; Wed, 11 May 2022 02:47:34 +0000 Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 29B343F197 for ; Wed, 11 May 2022 02:47:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1652237254; bh=ztgDK8w/ObD7B8foxcFu4rU7Qm7RQfZSk9EEi0XSBsA=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=JGLZpbOKvzJiyBC2GUbDoP2FOlHzVgONrQWEixIQck7wrnvRjdrYxSzPvnUM5xC2L ZlJa+KnzHePU0dvrsILufNNa4sP+iVcy4gUxlNGr30WKqpRnUlOFudrfu/hDSvc+RJ zfsAds6K70in7mpMuDTmwO2x2S7Uj8aJ6wyswyHS7+A32dOl2dABUAbDzaUgHVramm dFE/QhmgCwiTMyQy8SS501ksPbaOFA11rx7zkGczS3Sh3J+ak4//2bACkC4Ue95A58 nlFrpYjFzP20RX4lYP4lqxJQE6+Ov+j/XoUmdhW1qTpBBGTkzc1L6RHu4HhVA5VwYs vqjyWZL+IdWmw== Received: by mail-pj1-f71.google.com with SMTP id t15-20020a17090ae50f00b001d925488489so399959pjy.3 for ; Tue, 10 May 2022 19:47:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ztgDK8w/ObD7B8foxcFu4rU7Qm7RQfZSk9EEi0XSBsA=; b=WK+93L2Xu5rvqis9RQ4HWF7wlceYB6qr7A7pYnedTn3lINFMp4pC/ZAkryh3KAN3j1 nHyv8LSto11MGFojNpSVpcWPg+mhmWusZDcQxUPPanBKiE+ChP8lZPebExKTt7CmVFUE 9EX1kEu3b8NhwP+GLikuZSOOJ26n0woyv8NyUk0017PmRzC+1hODPd+Wr9ylXoIH/FSm BfBsTYBDbEd2njXymtmQnUyFIH2t8gi9WXA/03KXTfFNdqYjfm0JxNrmLx4ODdPRuh1O PUOvsD1aBg/v0xCVxDVTIK1gw+6eCn0lA0qU8qYhFdpFewJ7TWz70WgzIPxb5t8Hymhx V9CQ== X-Gm-Message-State: AOAM5325Zqs1FW89UljFdJhhea7LUxV3zv1B5Ga5ieb9fWaBycEDYs7z k2FHMXiDYwPUehpOKqQrb85AFp8/WtA4seP7ye9fxEqTsUZ71/AZwMisDhbo1D+dnE0LvUpkesb EmbNZbr7P+6fPAZBUfDuMmAMz0e9hvvIRMlyMDoQblg== X-Received: by 2002:a63:5d10:0:b0:3c5:e836:ffd2 with SMTP id r16-20020a635d10000000b003c5e836ffd2mr19288779pgb.32.1652237252698; Tue, 10 May 2022 19:47:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxb2dKCrLS55PkO7odOHv3DbA95zTe/jtDfUY0t9npaHszuY9fGi/YKGMkh7WjbyGzhTjl2uw== X-Received: by 2002:a63:5d10:0:b0:3c5:e836:ffd2 with SMTP id r16-20020a635d10000000b003c5e836ffd2mr19288773pgb.32.1652237252470; Tue, 10 May 2022 19:47:32 -0700 (PDT) Received: from localhost.localdomain (36-230-93-232.dynamic-ip.hinet.net. [36.230.93.232]) by smtp.gmail.com with ESMTPSA id mu7-20020a17090b388700b001d26c7d5aacsm410340pjb.13.2022.05.10.19.47.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 May 2022 19:47:31 -0700 (PDT) From: Jian Hui Lee To: kernel-team@lists.ubuntu.com Subject: [SRU][Jammy:linux-intel-iotg][PATCH v2 1/2] mei: backport fix from 5.12 Date: Wed, 11 May 2022 10:47:24 +0800 Message-Id: <20220511024725.186910-2-jianhui.lee@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220511024725.186910-1-jianhui.lee@canonical.com> References: <20220511024725.186910-1-jianhui.lee@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Zhou Furong BugLink: https://bugs.launchpad.net/bugs/1945464 virtio_config_disable/virtio_config_enable removed. Signed-off-by: Anthony Wong Signed-off-by: Wen-chien Jesse Sung (cherry picked from commit 1a705379b14fe6f8bd8101347553044fafc30752 linux-intel-5.13) Signed-off-by: Jian Hui Lee --- drivers/misc/mei/dal/dal_class.c | 6 ++---- drivers/misc/mei/hw-virtio.c | 4 ---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/misc/mei/dal/dal_class.c b/drivers/misc/mei/dal/dal_class.c index 27f6ffb9153d..478d6b45f947 100644 --- a/drivers/misc/mei/dal/dal_class.c +++ b/drivers/misc/mei/dal/dal_class.c @@ -652,7 +652,7 @@ struct device *dal_find_dev(enum dal_dev_type device_id) * * Return: 0 */ -static int dal_remove(struct mei_cl_device *cldev) +static void dal_remove(struct mei_cl_device *cldev) { struct dal_device *ddev = mei_cldev_get_drvdata(cldev); struct dal_client *dc; @@ -660,7 +660,7 @@ static int dal_remove(struct mei_cl_device *cldev) unsigned int i; if (!ddev) - return 0; + return; dal_dev_del(ddev); @@ -682,8 +682,6 @@ static int dal_remove(struct mei_cl_device *cldev) device_unregister(&ddev->dev); mei_cldev_disable(cldev); - - return 0; } /** diff --git a/drivers/misc/mei/hw-virtio.c b/drivers/misc/mei/hw-virtio.c index 899dc1c5e7ca..a38ac6ff4f7f 100644 --- a/drivers/misc/mei/hw-virtio.c +++ b/drivers/misc/mei/hw-virtio.c @@ -175,8 +175,6 @@ static void mei_virtio_intr_enable(struct mei_device *dev) struct mei_virtio_hw *hw = to_virtio_hw(dev); struct virtio_device *vdev = dev_to_virtio(dev->dev); - virtio_config_enable(vdev); - virtqueue_enable_cb(hw->in); virtqueue_enable_cb(hw->out); } @@ -191,8 +189,6 @@ static void mei_virtio_intr_disable(struct mei_device *dev) struct mei_virtio_hw *hw = to_virtio_hw(dev); struct virtio_device *vdev = dev_to_virtio(dev->dev); - virtio_config_disable(vdev); - virtqueue_disable_cb(hw->in); virtqueue_disable_cb(hw->out); } From patchwork Wed May 11 02:47:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jian Hui Lee X-Patchwork-Id: 1629413 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=c004lugr; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KyfTV1fSlz9sG5 for ; Wed, 11 May 2022 12:47:42 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1nocO0-0008Tz-Vt; Wed, 11 May 2022 02:47:36 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nocNy-0008SN-To for kernel-team@lists.ubuntu.com; Wed, 11 May 2022 02:47:34 +0000 Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id A8BB73F044 for ; Wed, 11 May 2022 02:47:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1652237254; bh=iM4r8BIcf+Qw/gIV5MsPwQMKYz31vIMEjVJuoE0uPzc=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=c004lugrS59cY0byvVVx3YD7/AQ1oxa7tvM5dyhiz7pkfKXuX7FmZzDdOXnB7RR4z tbVnpvc0+Avytv75mLgnko3kPyr1x0MkQIKCw0jjGYxiwEzTw4C9bx1k0kWrSAaltF p4defbDY2wwuoSGYRhCdt0IlgjOpByfT/RbxyZ7qPyIZjlGM8RKi7PguOmC3OPYz7A 5MPz1EWWYcutafPfZWhFzOAmOf3dEe1AqHu4Bt++Ny+7OOX6s83voFFUHevtce/ykz KFPAeg5KQRZq+/WeufAiTTaq4EENHdbSRZBJIdixTy6OfBHs7mLkaBM4QHZyf9sPj9 BHx4hDjQv26iw== Received: by mail-pl1-f197.google.com with SMTP id f6-20020a170902ab8600b0015f186a69e7so377430plr.2 for ; Tue, 10 May 2022 19:47:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iM4r8BIcf+Qw/gIV5MsPwQMKYz31vIMEjVJuoE0uPzc=; b=SSlX0L8Ge1dE6uG33WG5VuP+WfXJ1/VkQCd+C72Slgh9yRYjbCHY3SmZQzVRIt2sg8 mNGDQ3JLVDONTzW7NbhmtZyBr4ZaEpYayQvRdgIEmo7MMvqXLTNt/nt4ET64VKRfJxIk /N4ct2sXkbUd+iZ13ui042aDUUhcKxwBiOALSWzZWEwSj1CaQYK0peuNiM0zfzM1hs3e 5cB+BIdkVAP3v0AQXiQv+M3QPl/oDq1IVJAzP1V3lPfve53qjQwVj4N8VV0lnOs6tqJQ Pz5tsNxDU6kxiIxX2FhSKae4NBoryhQYJHyGbksdoF+IzLCnu/DG3INB6sijfQ1S50ni jL5g== X-Gm-Message-State: AOAM532aX5RwAScf9bW+yHDlypwLizGoBNAh4kHxu7iQVK29vmiY7Eza 5zmUt8WuE4MTI8isVDhYR+BTGE/cRXIkJ9AtHt8vp9HTaj9lmU1xlEIRYk8L7CJStvUi8rYVVmv 9yGQnyM0oXlorCzYyvDS7XnAfejGmRNBVi1t4njelKw== X-Received: by 2002:a17:902:cecf:b0:15e:b10a:9f3a with SMTP id d15-20020a170902cecf00b0015eb10a9f3amr24006379plg.118.1652237254258; Tue, 10 May 2022 19:47:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyGnn0Ae3PMNEGMrFr1DAcHOQGlMJRDSoHgWDT+NLdjFl955JDHD+0ixxpoPBgNV2QcXBhXXQ== X-Received: by 2002:a17:902:cecf:b0:15e:b10a:9f3a with SMTP id d15-20020a170902cecf00b0015eb10a9f3amr24006369plg.118.1652237253962; Tue, 10 May 2022 19:47:33 -0700 (PDT) Received: from localhost.localdomain (36-230-93-232.dynamic-ip.hinet.net. [36.230.93.232]) by smtp.gmail.com with ESMTPSA id mu7-20020a17090b388700b001d26c7d5aacsm410340pjb.13.2022.05.10.19.47.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 May 2022 19:47:33 -0700 (PDT) From: Jian Hui Lee To: kernel-team@lists.ubuntu.com Subject: [SRU][Jammy:linux-intel-iotg][PATCH v2 2/2] UBUNTU: [Config] Enable CONFIG_INTEL_MEI_DAL and CONFIG_INTEL_MEI_VIRTIO Date: Wed, 11 May 2022 10:47:25 +0800 Message-Id: <20220511024725.186910-3-jianhui.lee@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220511024725.186910-1-jianhui.lee@canonical.com> References: <20220511024725.186910-1-jianhui.lee@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Wen-chien Jesse Sung BugLink: https://bugs.launchpad.net/bugs/1945464 Signed-off-by: Wen-chien Jesse Sung (cherry picked from commit 5ce01c64f2844ab58cdf34b3cb3ecceccb51504b linux-intel-5.13) Signed-off-by: Jian Hui Lee Acked-By: Philip Cox --- debian.intel-iotg/config/config.common.ubuntu | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian.intel-iotg/config/config.common.ubuntu b/debian.intel-iotg/config/config.common.ubuntu index 20b88924ab62..7e289924beb1 100644 --- a/debian.intel-iotg/config/config.common.ubuntu +++ b/debian.intel-iotg/config/config.common.ubuntu @@ -3543,11 +3543,11 @@ CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER=m CONFIG_INTEL_ISH_HID=m CONFIG_INTEL_LDMA=y CONFIG_INTEL_MEI=m -# CONFIG_INTEL_MEI_DAL is not set +CONFIG_INTEL_MEI_DAL=m CONFIG_INTEL_MEI_HDCP=m CONFIG_INTEL_MEI_ME=m CONFIG_INTEL_MEI_TXE=m -# CONFIG_INTEL_MEI_VIRTIO is not set +CONFIG_INTEL_MEI_VIRTIO=m CONFIG_INTEL_MEI_WDT=m CONFIG_INTEL_MENLOW=m CONFIG_INTEL_MRFLD_ADC=m