From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AB8JxZp9hXoDOCvNDhSthX3ZLhqr96BHHJJf/tTD7yAWE1N6Ev4FC45PRhEoCrjY+jaqM0eiCUiL ARC-Seal: i=1; a=rsa-sha256; t=1526937749; cv=none; d=google.com; s=arc-20160816; b=atwYjqDGegvEoWzA/xPKPeJsqmh+danxVMZcMTBlNXBdfC3KapRvCarolZqvDOJFk0 fLmyoUUS4XQTsRB6rZFiRe7jkovOGKOXEW+sit5wdRPBep2V3pj14w3Xhw9NfGsHsNsT mxZZQCgjV/nodDLipGjBn7rqJQ1vLC5UO+pjEfz3HzxKpnS5JTtfB5VLaOD8qeOcmh+f EK0QkGCBcwepwg4BBLoxWUPY9NE2ua/gylg0CZpVb7r9fLC3CkY+YN9CLlmYuVUn/JI9 FbAxqnvPmWZr0OPLUSaiqC9ZZSfHZoGZDp9pP1p/THpGwk+VHHEm6viPRjz3wFyT6ECD IwLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=UxkGFBCtVAfJ6ERlcZHtRVMomhazm4oLyo+enk2pbXQ=; b=Q6F+/Z2av908Jikncxgs2jy49WUgDJM1Q9seJF03GaDgu8We6RkIT0WhWDGtdW7KGH XyNKrafuxdRWzP/aqwtqnwcZ8lHSvun/G/s1o9KX1IjSV3Ep0A+vXc6YJoe0bdy2XSuO IHeDpoHUpLOWPCCV2xUI8k5pq7TtxrrGI2PylVOLTHJs+xyF2LR8CGx1OzXn5mXLJ+Bp +RYT//r4Qp0+qOE3y+sY5MGf0Nd9h02bnlViCdn3uNIMEFkctLrCTJCqCYx3+VJFiJHN St0hxL5MwOMWUB7HgHOzLcMec05b+FfzHHBTsffJwyoOMLQMdug098R2M8ZLCLh608Rf ROsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=HPyRQL6P; spf=pass (google.com: domain of srs0=nia/=ii=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=SRS0=nia/=II=linuxfoundation.org=gregkh@kernel.org Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=HPyRQL6P; spf=pass (google.com: domain of srs0=nia/=ii=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=SRS0=nia/=II=linuxfoundation.org=gregkh@kernel.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kamal Dasu , Mark Brown Subject: [PATCH 4.16 012/110] spi: bcm-qspi: Avoid setting MSPI_CDRAM_PCS for spi-nor master Date: Mon, 21 May 2018 23:11:09 +0200 Message-Id: <20180521210505.045230642@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180521210503.823249477@linuxfoundation.org> References: <20180521210503.823249477@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1601109744177472829?= X-GMAIL-MSGID: =?utf-8?q?1601110278137641533?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.16-stable review patch. If anyone has any objections, please let me know. ------------------ From: Kamal Dasu commit 5eb9a07a4ae1008b67d8bcd47bddb3dae97456b7 upstream. Added fix for probing of spi-nor device non-zero chip selects. Set MSPI_CDRAM_PCS (peripheral chip select) with spi master for MSPI controller and not for MSPI/BSPI spi-nor master controller. Ensure setting of cs bit in chip select register on chip select change. Fixes: fa236a7ef24048 ("spi: bcm-qspi: Add Broadcom MSPI driver") Signed-off-by: Kamal Dasu Signed-off-by: Mark Brown Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/spi/spi-bcm-qspi.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) --- a/drivers/spi/spi-bcm-qspi.c +++ b/drivers/spi/spi-bcm-qspi.c @@ -519,16 +519,19 @@ static void bcm_qspi_disable_bspi(struct static void bcm_qspi_chip_select(struct bcm_qspi *qspi, int cs) { - u32 data = 0; + u32 rd = 0; + u32 wr = 0; - if (qspi->curr_cs == cs) - return; if (qspi->base[CHIP_SELECT]) { - data = bcm_qspi_read(qspi, CHIP_SELECT, 0); - data = (data & ~0xff) | (1 << cs); - bcm_qspi_write(qspi, CHIP_SELECT, 0, data); + rd = bcm_qspi_read(qspi, CHIP_SELECT, 0); + wr = (rd & ~0xff) | (1 << cs); + if (rd == wr) + return; + bcm_qspi_write(qspi, CHIP_SELECT, 0, wr); usleep_range(10, 20); } + + dev_dbg(&qspi->pdev->dev, "using cs:%d\n", cs); qspi->curr_cs = cs; } @@ -755,8 +758,13 @@ static int write_to_hw(struct bcm_qspi * dev_dbg(&qspi->pdev->dev, "WR %04x\n", val); } mspi_cdram = MSPI_CDRAM_CONT_BIT; - mspi_cdram |= (~(1 << spi->chip_select) & - MSPI_CDRAM_PCS); + + if (has_bspi(qspi)) + mspi_cdram &= ~1; + else + mspi_cdram |= (~(1 << spi->chip_select) & + MSPI_CDRAM_PCS); + mspi_cdram |= ((tp.trans->bits_per_word <= 8) ? 0 : MSPI_CDRAM_BITSE_BIT);