Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp2508305imm; Mon, 24 Sep 2018 05:39:19 -0700 (PDT) X-Google-Smtp-Source: ACcGV63Dk9gqZHGiBfOZNlSfraHFp5rj/pJfwyXalf+zEWcLpjMGQSqph3jrB2osZUCWQNIuTQv0 X-Received: by 2002:a63:3152:: with SMTP id x79-v6mr9567852pgx.323.1537792759411; Mon, 24 Sep 2018 05:39:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537792759; cv=none; d=google.com; s=arc-20160816; b=DF/hT2JWKaA65z2C/ERnkP3hvN1NdKGF9PwtfErF50a3utIyeSpDhJiS+faN0Z1zHm GbIMBXiaQ4gPxK6X3A5ahdwEKOksfNjOZdgIV/aO0JAcgcZ+yBQWb7VQ/n2aXOVGx/ch JHenZeCLPKID4pKLKsRmIQMFdLkS1dXU/wXSRiRJAfxAtmsBlp+ar0/MTwgCWKA0Rhy8 rgdpyr86sI1jtlyJ7/UsY3qg8x3jmRCd0DPb5OZ6lqgpkThNZuRPBuVTAHKkQ/+erHoX 1pUv6gVGIVQuQbe2fF+XaODshJ6jVBVvyThUGVJf1wAACHsC6fKD7eFYf2v12aeQolNJ ddEg== 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; bh=vFUjzK0hcgvx0XurWxk4CLDX1G+FYdULMR6kbEKAR5w=; b=VKEWJao+5Qtb7ynAUX9O48UY9fOSKAFMmCxGILbm4ltnL77Y7MjDdBG1uxJJDyS6/Z NSr8WQyg6/XyA1jo6clLwt+Zk0IwfYEaaYpCZ7brwDkI1WF91MPEy7VKpjCED5cRKkwU DOJo3peW/OiszA0yRYLJUHlc/yRXnLgyCec/zAB/WctSsL9jHML3YwkN5qmxkWZ3oWhr Wwn9vbmxLM/Es3zWUtLeNbPTz6qwCtA5lliO8UcuhDUkk/Gh0AuuXnmpRUoPCnBnhX3t dV862bR/FthpCZPVunw77nmru86I4TKk78F1SLbV/MCTptRDAI624AEdlik84MfQBlUS AcMg== ARC-Authentication-Results: i=1; mx.google.com; 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 d35-v6si33520082pla.116.2018.09.24.05.39.04; Mon, 24 Sep 2018 05:39:19 -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; 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 S2387907AbeIXSjv (ORCPT + 99 others); Mon, 24 Sep 2018 14:39:51 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:58630 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728937AbeIXSju (ORCPT ); Mon, 24 Sep 2018 14:39:50 -0400 Received: from localhost (ip-213-127-77-73.ip.prioritytelecom.net [213.127.77.73]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 55369107F; Mon, 24 Sep 2018 12:37:53 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jae Hyun Yoo , Brendan Higgins , Wolfram Sang , Sasha Levin Subject: [PATCH 4.18 087/235] i2c: aspeed: Fix initial values of master and slave state Date: Mon, 24 Sep 2018 13:51:13 +0200 Message-Id: <20180924113113.770574724@linuxfoundation.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20180924113103.999624566@linuxfoundation.org> References: <20180924113103.999624566@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review 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 4.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jae Hyun Yoo [ Upstream commit 517fde0eb5a8f46c54ba6e2c36e32563b23cb14f ] This patch changes the order of enum aspeed_i2c_master_state and enum aspeed_i2c_slave_state defines to make their initial value to ASPEED_I2C_MASTER_INACTIVE and ASPEED_I2C_SLAVE_STOP respectively. In case of multi-master use, if a slave data comes ahead of the first master xfer, master_state starts from an invalid state so this change fixes the issue. Signed-off-by: Jae Hyun Yoo Reviewed-by: Brendan Higgins Signed-off-by: Wolfram Sang Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/i2c/busses/i2c-aspeed.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/i2c/busses/i2c-aspeed.c +++ b/drivers/i2c/busses/i2c-aspeed.c @@ -111,22 +111,22 @@ #define ASPEED_I2CD_DEV_ADDR_MASK GENMASK(6, 0) enum aspeed_i2c_master_state { + ASPEED_I2C_MASTER_INACTIVE, ASPEED_I2C_MASTER_START, ASPEED_I2C_MASTER_TX_FIRST, ASPEED_I2C_MASTER_TX, ASPEED_I2C_MASTER_RX_FIRST, ASPEED_I2C_MASTER_RX, ASPEED_I2C_MASTER_STOP, - ASPEED_I2C_MASTER_INACTIVE, }; enum aspeed_i2c_slave_state { + ASPEED_I2C_SLAVE_STOP, ASPEED_I2C_SLAVE_START, ASPEED_I2C_SLAVE_READ_REQUESTED, ASPEED_I2C_SLAVE_READ_PROCESSED, ASPEED_I2C_SLAVE_WRITE_REQUESTED, ASPEED_I2C_SLAVE_WRITE_RECEIVED, - ASPEED_I2C_SLAVE_STOP, }; struct aspeed_i2c_bus {