Received: by 2002:a05:6602:2086:0:0:0:0 with SMTP id a6csp4426853ioa; Wed, 27 Apr 2022 03:44:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy2WUe98s4vaDomkJFLP9HXCIoKLEEPOC/nHdizGxxZOD0P3SVypoydrg8V6/y7Wtv7g229 X-Received: by 2002:a63:1e23:0:b0:39f:ea07:305b with SMTP id e35-20020a631e23000000b0039fea07305bmr22831826pge.246.1651056252012; Wed, 27 Apr 2022 03:44:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651056252; cv=none; d=google.com; s=arc-20160816; b=y0C5mODlE7LNYHjwGntSFE7azvfCy3XsbWQqX8Ew5iOsoWZLVlZLxOj4pVqiQhTUnZ DeSygbMkJM1x5W+Yp4cHN3RB3Rqz9XPoBH8RytiR0zW/+RN5QP0FUpq1JniviwFl7Wdt TCeA5rhUKhoGpgQuuw2LFHhUrm0xaw4mHdjcdS4OiiHccd52iXOFvJqLP2gRQ0WZqVLG ZqfdTGt6zV6DZOnDegyv4MihQ+t6JSTiYZiA2hzq2+vj+rIyfbmRgmA6gSAi1bQf5pQI WIzqpcN5eMRr4F9n8H4ORH653q8voeb9BGHB6dQxaQU5VdnrO+OmQLOmJDVMNRTOeRse q+5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=/inNXWklxNaaj740t5tXVlFWcIZlKBmVCFCdDCcSk3A=; b=HnQld+DnwZux5WdzNh0dxAD8oMnl4gjZKMTGu+y9wV5LDEnsps8AK3gZNmivZ9iObS U1S3PwNUCVOqsVURPMoLU2LEvkZAjQrMpwamKI8zqmS5bMG73dEetUNNT2RfCsUc9hkW UkUR+6gcmYyTbB+SI//n10KFbK1gV0cgdJR6iuV63zxc/e2LyNI2oa+5o3iXnxOeif3W 53ZvKcPCnDZYkwu4r8vheeVryEtdWtdjzoGTna24YHu1UroiSfwyPEvdd5LIxJIsi1XH 0VlDFXj04fZ3mI5zfGTtMYMtTupaQ0gHJXcUYHvYkbi1vAQoTXuMKZOW77jon5VJAztI EePA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=RgNX0khZ; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id c12-20020a63d14c000000b003aa6987721esi1049916pgj.380.2022.04.27.03.44.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Apr 2022 03:44:11 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=RgNX0khZ; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id E57FC2A4CAC; Wed, 27 Apr 2022 02:53:10 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1354093AbiDZTLJ (ORCPT + 99 others); Tue, 26 Apr 2022 15:11:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41850 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353916AbiDZTGY (ORCPT ); Tue, 26 Apr 2022 15:06:24 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1600419A48F; Tue, 26 Apr 2022 12:03:07 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 84F9D61A04; Tue, 26 Apr 2022 19:03:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D6CF0C385B2; Tue, 26 Apr 2022 19:03:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1650999786; bh=mptsVlstBe9PgiegdjZZsGPgQatHpBsJM0+b0sy31Is=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RgNX0khZqqBfR/mbD9tASrHelk4oeNR5hjundNRBkVC0aSQojftOPVFWbUKDWpcpQ bsTsCkkYUuCp1zLsxX2wBOW7xm/httwsET1uMz0GtjlVZMBkXZERF0vXGFZuayLEDu LDwXUfgYfsybu04j/RuNAZKlLAWXU4Dij8P2eGhmHxn7k+Z4Lnwe9aQT3HPS2KZbvf VE1bNz77BCRKuLWRwMHLZkOmEYv8Ap8NpgboyoYFhRSX3f7ZaDtftpXogGSsV8Adn/ bRoVQdLaBvr/7WfT5QeV5/98XTfrX7Ehqbh6QnIXvG4PAKB1Iw+mQsV0hfi8mRYBPa LW8mSkuY81now== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Zheyu Ma , Damien Le Moal , Sasha Levin , linux-ide@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 3/3] ata: pata_marvell: Check the 'bmdma_addr' beforing reading Date: Tue, 26 Apr 2022 15:03:03 -0400 Message-Id: <20220426190304.2351976-3-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220426190304.2351976-1-sashal@kernel.org> References: <20220426190304.2351976-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RDNS_NONE,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Zheyu Ma [ Upstream commit aafa9f958342db36c17ac2a7f1b841032c96feb4 ] Before detecting the cable type on the dma bar, the driver should check whether the 'bmdma_addr' is zero, which means the adapter does not support DMA, otherwise we will get the following error: [ 5.146634] Bad IO access at port 0x1 (return inb(port)) [ 5.147206] WARNING: CPU: 2 PID: 303 at lib/iomap.c:44 ioread8+0x4a/0x60 [ 5.150856] RIP: 0010:ioread8+0x4a/0x60 [ 5.160238] Call Trace: [ 5.160470] [ 5.160674] marvell_cable_detect+0x6e/0xc0 [pata_marvell] [ 5.161728] ata_eh_recover+0x3520/0x6cc0 [ 5.168075] ata_do_eh+0x49/0x3c0 Signed-off-by: Zheyu Ma Signed-off-by: Damien Le Moal Signed-off-by: Sasha Levin --- drivers/ata/pata_marvell.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c index ff468a6fd8dd..677f582cf3d6 100644 --- a/drivers/ata/pata_marvell.c +++ b/drivers/ata/pata_marvell.c @@ -82,6 +82,8 @@ static int marvell_cable_detect(struct ata_port *ap) switch(ap->port_no) { case 0: + if (!ap->ioaddr.bmdma_addr) + return ATA_CBL_PATA_UNK; if (ioread8(ap->ioaddr.bmdma_addr + 1) & 1) return ATA_CBL_PATA40; return ATA_CBL_PATA80; -- 2.35.1