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;
From:   Alistair Francis <Alistair.Francis@wdc.com>
To:     "linux-riscv@lists.infradead.org" <linux-riscv@lists.infradead.org>,
        "robh@kernel.org" <robh@kernel.org>,
        "robin.murphy@arm.com" <robin.murphy@arm.com>
CC:     "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "alistair23@gmail.com" <alistair23@gmail.com>,
        Alistair Francis <Alistair.Francis@wdc.com>
Subject: [PATCH] Revert "of/device: Really only set bus DMA mask when
 appropriate"
Thread-Topic: [PATCH] Revert "of/device: Really only set bus DMA mask when
 appropriate"
Thread-Index: AQHUz7Wk3BuHftC4ukm45CM/91p02w==
Date:   Thu, 28 Feb 2019 22:33:36 +0000
Message-ID: <20190228223257.6189-1-alistair.francis@wdc.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-messagesentrepresentingtype: 1
x-originating-ip: [199.255.45.64]
x-ms-publictraffictype: Email
x-ms-office365-filtering-correlation-id: 4b7e9b99-2d32-4015-e389-08d69dccc732
x-ms-office365-filtering-ht: Tenant
x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(4618075)(2017052603328)(7153060)(7193020);SRVR:MWHPR04MB0240;
x-ms-traffictypediagnostic: MWHPR04MB0240:
wdcipoutbound: EOP-TRUE
x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1;MWHPR04MB0240;23:WHr7pfR2xHwZpYAYID3p9iglvCElOyW4odlRbwo?=
 =?iso-8859-1?Q?4Lv79vjICqm7ZE134SfptRFF8ucw0fTuU7oVfkkcsBzuIFtIXcZAn23IZ/?=
 =?iso-8859-1?Q?lvqz1h+cRvD3pv0u1Z66LcM0IpGtt6xK3/WYGB/2VKEF9/P6NxERw3KkbO?=
 =?iso-8859-1?Q?BKOrZgJKsN3w7waJqDXMzwI8bxXEf8ezm8TOCYTIU9OWvqDmQb2spdpMiE?=
 =?iso-8859-1?Q?ZNvAUeyAW6iUXdDC0WxfpUBT27HZdR8Tg23XOp56YYV3AVHj3/W/Ejn8ZM?=
 =?iso-8859-1?Q?Y9LDmJqhntUN+z7fh1HpUJEO4GnTGGLFlMw+tLLwLdf83lRB5rWKlJIgat?=
 =?iso-8859-1?Q?TzLpT0fvlVsTLEj6J+oabESWqCnDv6fTsYzS2AnoUmUe9odN6szAtvucLF?=
 =?iso-8859-1?Q?/FMdMZs9yTjhTMg/sLvXJexB6HZ3oesKv41MCwb2DsEpf0Crd20Gvl/KlN?=
 =?iso-8859-1?Q?38U84fc0dYWl0HlLO/NH0OJ82iZ5EnJtenSOJSWzbaZwtNTLD0E0LT1fW5?=
 =?iso-8859-1?Q?SwWGlWs88blpk2uEsSu3SiKWIEbVkba4P9Gor+6ONS77/19sTQQUxXVQLX?=
 =?iso-8859-1?Q?7h6TphReU36aJs88X/ctCqFXWMKfNrR7ZEmmE6SBxIdvFy43pFjRGwvnXp?=
 =?iso-8859-1?Q?bW90WzWT//oV/1WbsZDjyI36N7Ybjxqcr6ZLncahKSjc9knMpp7slVWD6V?=
 =?iso-8859-1?Q?eDcdDoMyv6LhKQ9qyrvyJFKHHpnyfTdnM3Lw3Jnu16TZ18X1Tc2fyZ2/c4?=
 =?iso-8859-1?Q?4+qo3ikEQe9tDY/PA0X9TpbrFX46wgRuYFaYbPew9R2+HElMrGaurzj/Lh?=
 =?iso-8859-1?Q?UnIOugg6jWe+3Hhp+Hu9PyofAkwoPC8pwnV5cN4ash/1r5FsAqryS68Jgk?=
 =?iso-8859-1?Q?WBfmAAj9BBBsiMIIsO7ni8wyG1BaF7kBE8+nTfcdJNI2WoN3rXxSAnj6Nw?=
 =?iso-8859-1?Q?TaB+HyNMfz0jzSkCH+sM3+qmNg+3emjsnNYwIzb5QYeewEQSpTSNO30CEn?=
 =?iso-8859-1?Q?Djx43e+HFyfhfBG8o/SexlFbBd8cGNQ5pawFPpxAIPqnC40do8zmikEWN8?=
 =?iso-8859-1?Q?I21RoaCQ0AaZ0oTu8w+AqP//engOtsX0j1uo9yvnSvtBkR29hrT7vD29nQ?=
 =?iso-8859-1?Q?pLrk4jEgQHcJrWHdbAlWpVHsX2xWglbCVl+3Pj7GhPA5QFd7fHTg+QHwtL?=
 =?iso-8859-1?Q?ICFo6czu2pGQ+khIjIMlTpj7ypwGn/wvcgG67bYjwIcf6IKLH5+m7IYl7K?=
 =?iso-8859-1?Q?bpPa9ObImDd8WPP2/uqCeFHRqXrOckbzyOZQly4H9bw8+sUUeWgXCsa2cI?=
 =?iso-8859-1?Q?QxcJKEr4Z8SxfdPQnk9poID?=
x-microsoft-antispam-prvs: <MWHPR04MB0240F1D2B107D4FCFC269B4590750@MWHPR04MB0240.namprd04.prod.outlook.com>
x-forefront-prvs: 0962D394D2
x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(346002)(136003)(376002)(396003)(366004)(39860400002)(189003)(199004)(26005)(97736004)(2906002)(2501003)(71190400001)(71200400001)(53936002)(6512007)(36756003)(14454004)(3846002)(6116002)(86362001)(2201001)(14444005)(256004)(5024004)(4326008)(66066001)(305945005)(7736002)(102836004)(52116002)(486006)(2616005)(81166006)(81156014)(6506007)(8936002)(68736007)(8676002)(105586002)(106356001)(99286004)(1076003)(50226002)(186003)(6436002)(386003)(476003)(316002)(478600001)(54906003)(5660300002)(72206003)(6486002)(44832011)(25786009)(110136005);DIR:OUT;SFP:1102;SCL:1;SRVR:MWHPR04MB0240;H:MWHPR04MB0401.namprd04.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1;
x-ms-exchange-senderadcheck: 1
x-microsoft-antispam-message-info: yOHWkxqf9+/XEcuTGSSfZH7d59NfqL8itD4MFAk6nru5gLdnBiSODnWd0zqjCvhLRbjgVmgdOx2espTbBu0JvUjAUT/h/M5h+e7sX9hzZkBKh1vH8+eCDYVGh6pCecnbMtDzVQKzUC3KRn5y4iPTCM3e798hYmNW6CDi0i2fYBEiRR7KCSJecIodXf7Sws4cBuSokuNOw7sf0QuLVtFe4jk1GgSfKQ+BQ4fDY1vznt87AusRCABA0UqCGvjyveMlNdDyzUp7XqYvnds8rGfOhSAmOJHaFznny1bX4B/Ib7kTrpwA3dbvH2dYY+6D8uKEcOdf2C6kPbzDq7KnBfy5tNWqVoco8a3uK0pN+BX2GkvzmqVq+SRT7AZZ2W4T1PzUhyQJOUZciaiCDZjWguTwPakFIR1xPCbJurA4hekQzfE=
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: wdc.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 4b7e9b99-2d32-4015-e389-08d69dccc732
X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Feb 2019 22:33:35.5810
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR04MB0240
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

This reverts commit 6778be4e520959659b27a441c06a84c9cb009085.

Reverting the commit fixes these error messages and an non-functioning
USB bus when attaching a USB to PCIe card to a RISC-V board:
    xhci_hcd 0000:03:00.0: Host took too long to start, waited 16000 micros=
econds.
    xhci_hcd 0000:03:00.0: startup error -19
    xhci_hcd 0000:03:00.0: USB bus 2 deregistered
    xhci_hcd 0000:03:00.0: WARNING: Host System Error
    xhci_hcd 0000:03:00.0: remove, state 1

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
---
I'm not sure if this is the correct fix, it's possible something else is
wrong, but I wanted to get some feedback.

drivers/of/device.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/of/device.c b/drivers/of/device.c
index 3717f2a20d0d..8299f8055da7 100644
--- a/drivers/of/device.c
+++ b/drivers/of/device.c
@@ -149,11 +149,9 @@ int of_dma_configure(struct device *dev, struct device=
_node *np, bool force_dma)
 	 * set by the driver.
 	 */
 	mask =3D DMA_BIT_MASK(ilog2(dma_addr + size - 1) + 1);
+	dev->bus_dma_mask =3D mask;
 	dev->coherent_dma_mask &=3D mask;
 	*dev->dma_mask &=3D mask;
-	/* ...but only set bus mask if we found valid dma-ranges earlier */
-	if (!ret)
-		dev->bus_dma_mask =3D mask;
=20
 	coherent =3D of_dma_is_coherent(np);
 	dev_dbg(dev, "device is%sdma coherent\n",
--=20
2.20.1