From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8ED76C433EF for ; Sun, 10 Oct 2021 20:53:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 77F7560E9B for ; Sun, 10 Oct 2021 20:53:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232965AbhJJUzf (ORCPT ); Sun, 10 Oct 2021 16:55:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33274 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231936AbhJJUze (ORCPT ); Sun, 10 Oct 2021 16:55:34 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0C025C061570 for ; Sun, 10 Oct 2021 13:53:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: Content-Type:In-Reply-To:MIME-Version:Date:Message-ID:From:References:Cc:To: Subject:Sender:Reply-To:Content-ID:Content-Description; bh=dY+e0+GivX+BFolWbrBQUWXwzOA/TgaPNehM3ikoutE=; b=Hv8ff7DNG/OdsjKQdgUibJUTRd VM1Ad+5Wctr9hbkanBq9fCw+PyMdPWflX8K9+Tj9ds3A2QhnSitDOnPYJY9QrkQkiYmA/NMbVFVHt Rbj3UcYV+BH5KeRBktPHxanptklkSXx3kWdeXX2KP835PsgSwuug7EhMQ03WPV6GYZh4n3e4gY2Gp LUul+ceQ0Ce5BrTvqzo0lxVYwz8oVUnrJb6kivjGjS1/fPmIXytCmh2vQSXZoa+oQ928EBHaubf8U qcTBFU2cmI9kVXFCUtXnvMb8BVWJCA+x6Z03FYFecs1sFEjKRekEfF50vEH/Cnc8hwXwy/ciz4bHo FQBbMCLg==; Received: from [2601:1c0:6280:3f0::aa0b] by bombadil.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1mZfoz-007MZk-Jb; Sun, 10 Oct 2021 20:53:25 +0000 Subject: Re: [PATCH v2] drm/r128: fix build for UML To: Sam Ravnborg Cc: linux-kernel@vger.kernel.org, David Airlie , Daniel Vetter , dri-devel@lists.freedesktop.org, Jeff Dike , Richard Weinberger , Anton Ivanov , linux-um@lists.infradead.org References: <20211010172955.30088-1-rdunlap@infradead.org> From: Randy Dunlap Message-ID: <30fa4926-6054-40ab-74c5-2a1f641966be@infradead.org> Date: Sun, 10 Oct 2021 13:53:24 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 10/10/21 12:49 PM, Sam Ravnborg wrote: > Hi Randy, > > On Sun, Oct 10, 2021 at 10:29:55AM -0700, Randy Dunlap wrote: >> Fix a build error on CONFIG_UML, which does not support (provide) >> wbinvd(). UML can use the generic mb() instead. >> >> ../drivers/gpu/drm/r128/ati_pcigart.c: In function ‘drm_ati_pcigart_init’: >> ../drivers/gpu/drm/r128/ati_pcigart.c:218:2: error: implicit declaration of function ‘wbinvd’ [-Werror=implicit-function-declaration] >> wbinvd(); >> ^~~~~~ >> >> Fixes: 68f5d3f3b654 ("um: add PCI over virtio emulation driver") >> Signed-off-by: Randy Dunlap >> Cc: David Airlie >> Cc: Daniel Vetter >> Cc: dri-devel@lists.freedesktop.org >> Cc: Jeff Dike >> Cc: Richard Weinberger >> Cc: Anton Ivanov >> Cc: linux-um@lists.infradead.org >> --- >> v2: update Fixes: tag (thanks, Johannes) >> >> drivers/gpu/drm/r128/ati_pcigart.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> --- linux-next-20211007.orig/drivers/gpu/drm/r128/ati_pcigart.c >> +++ linux-next-20211007/drivers/gpu/drm/r128/ati_pcigart.c >> @@ -215,7 +215,7 @@ int drm_ati_pcigart_init(struct drm_devi >> } >> ret = 0; >> >> -#if defined(__i386__) || defined(__x86_64__) >> +#if (defined(__i386__) || defined(__x86_64__)) && !defined(CONFIG_UML) >> wbinvd(); >> #else >> mb(); > > If we look at drivers/video/fbdev/i810/i810_main.h > then it looks like we can replace the above with a simple: > #ifdef CONFIG_X86 > wbinvd(); > #else > mb(); > #endif > > If you think this would work could you try it out. > It would be nicer with the simpler variant. Hi Sam, Good idea, thanks. OK, I tested it, it works fine. Will resend the patch later... > Note: I have no clue what wbinvd() does - seems like some x86 assembler > specific thingy. -- ~Randy From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Subject: Re: [PATCH v2] drm/r128: fix build for UML References: <20211010172955.30088-1-rdunlap@infradead.org> From: Randy Dunlap Message-ID: <30fa4926-6054-40ab-74c5-2a1f641966be@infradead.org> Date: Sun, 10 Oct 2021 13:53:24 -0700 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: base64 Content-Type: text/plain; charset="utf-8"; Format="flowed" Sender: "linux-um" Errors-To: linux-um-bounces+geert=linux-m68k.org@lists.infradead.org To: Sam Ravnborg Cc: linux-kernel@vger.kernel.org, David Airlie , Daniel Vetter , dri-devel@lists.freedesktop.org, Jeff Dike , Richard Weinberger , Anton Ivanov , linux-um@lists.infradead.org T24gMTAvMTAvMjEgMTI6NDkgUE0sIFNhbSBSYXZuYm9yZyB3cm90ZToKPiBIaSBSYW5keSwKPiAK PiBPbiBTdW4sIE9jdCAxMCwgMjAyMSBhdCAxMDoyOTo1NUFNIC0wNzAwLCBSYW5keSBEdW5sYXAg d3JvdGU6Cj4+IEZpeCBhIGJ1aWxkIGVycm9yIG9uIENPTkZJR19VTUwsIHdoaWNoIGRvZXMgbm90 IHN1cHBvcnQgKHByb3ZpZGUpCj4+IHdiaW52ZCgpLiBVTUwgY2FuIHVzZSB0aGUgZ2VuZXJpYyBt YigpIGluc3RlYWQuCj4+Cj4+IC4uL2RyaXZlcnMvZ3B1L2RybS9yMTI4L2F0aV9wY2lnYXJ0LmM6 IEluIGZ1bmN0aW9uIOKAmGRybV9hdGlfcGNpZ2FydF9pbml04oCZOgo+PiAuLi9kcml2ZXJzL2dw dS9kcm0vcjEyOC9hdGlfcGNpZ2FydC5jOjIxODoyOiBlcnJvcjogaW1wbGljaXQgZGVjbGFyYXRp b24gb2YgZnVuY3Rpb24g4oCYd2JpbnZk4oCZIFstV2Vycm9yPWltcGxpY2l0LWZ1bmN0aW9uLWRl Y2xhcmF0aW9uXQo+PiAgICB3YmludmQoKTsKPj4gICAgXn5+fn5+Cj4+Cj4+IEZpeGVzOiA2OGY1 ZDNmM2I2NTQgKCJ1bTogYWRkIFBDSSBvdmVyIHZpcnRpbyBlbXVsYXRpb24gZHJpdmVyIikKPj4g U2lnbmVkLW9mZi1ieTogUmFuZHkgRHVubGFwIDxyZHVubGFwQGluZnJhZGVhZC5vcmc+Cj4+IENj OiBEYXZpZCBBaXJsaWUgPGFpcmxpZWRAbGludXguaWU+Cj4+IENjOiBEYW5pZWwgVmV0dGVyIDxk YW5pZWxAZmZ3bGwuY2g+Cj4+IENjOiBkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCj4+ IENjOiBKZWZmIERpa2UgPGpkaWtlQGFkZHRvaXQuY29tPgo+PiBDYzogUmljaGFyZCBXZWluYmVy Z2VyIDxyaWNoYXJkQG5vZC5hdD4KPj4gQ2M6IEFudG9uIEl2YW5vdiA8YW50b24uaXZhbm92QGNh bWJyaWRnZWdyZXlzLmNvbT4KPj4gQ2M6IGxpbnV4LXVtQGxpc3RzLmluZnJhZGVhZC5vcmcKPj4g LS0tCj4+IHYyOiB1cGRhdGUgRml4ZXM6IHRhZyAodGhhbmtzLCBKb2hhbm5lcykKPj4KPj4gICBk cml2ZXJzL2dwdS9kcm0vcjEyOC9hdGlfcGNpZ2FydC5jIHwgICAgMiArLQo+PiAgIDEgZmlsZSBj aGFuZ2VkLCAxIGluc2VydGlvbigrKSwgMSBkZWxldGlvbigtKQo+Pgo+PiAtLS0gbGludXgtbmV4 dC0yMDIxMTAwNy5vcmlnL2RyaXZlcnMvZ3B1L2RybS9yMTI4L2F0aV9wY2lnYXJ0LmMKPj4gKysr IGxpbnV4LW5leHQtMjAyMTEwMDcvZHJpdmVycy9ncHUvZHJtL3IxMjgvYXRpX3BjaWdhcnQuYwo+ PiBAQCAtMjE1LDcgKzIxNSw3IEBAIGludCBkcm1fYXRpX3BjaWdhcnRfaW5pdChzdHJ1Y3QgZHJt X2RldmkKPj4gICAJfQo+PiAgIAlyZXQgPSAwOwo+PiAgIAo+PiAtI2lmIGRlZmluZWQoX19pMzg2 X18pIHx8IGRlZmluZWQoX194ODZfNjRfXykKPj4gKyNpZiAoZGVmaW5lZChfX2kzODZfXykgfHwg ZGVmaW5lZChfX3g4Nl82NF9fKSkgJiYgIWRlZmluZWQoQ09ORklHX1VNTCkKPj4gICAJd2JpbnZk KCk7Cj4+ICAgI2Vsc2UKPj4gICAJbWIoKTsKPiAKPiBJZiB3ZSBsb29rIGF0IGRyaXZlcnMvdmlk ZW8vZmJkZXYvaTgxMC9pODEwX21haW4uaAo+IHRoZW4gaXQgbG9va3MgbGlrZSB3ZSBjYW4gcmVw bGFjZSB0aGUgYWJvdmUgd2l0aCBhIHNpbXBsZToKPiAjaWZkZWYgQ09ORklHX1g4Ngo+IAl3Ymlu dmQoKTsKPiAjZWxzZQo+IAltYigpOwo+ICNlbmRpZgo+IAo+IElmIHlvdSB0aGluayB0aGlzIHdv dWxkIHdvcmsgY291bGQgeW91IHRyeSBpdCBvdXQuCj4gSXQgd291bGQgYmUgbmljZXIgd2l0aCB0 aGUgc2ltcGxlciB2YXJpYW50LgoKSGkgU2FtLApHb29kIGlkZWEsIHRoYW5rcy4KCk9LLCBJIHRl c3RlZCBpdCwgaXQgd29ya3MgZmluZS4KCldpbGwgcmVzZW5kIHRoZSBwYXRjaCBsYXRlci4uLgoK PiBOb3RlOiBJIGhhdmUgbm8gY2x1ZSB3aGF0IHdiaW52ZCgpIGRvZXMgLSBzZWVtcyBsaWtlIHNv bWUgeDg2IGFzc2VtYmxlcgo+IHNwZWNpZmljIHRoaW5neS4KCgotLSAKflJhbmR5CgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpsaW51eC11bSBtYWlsaW5n IGxpc3QKbGludXgtdW1AbGlzdHMuaW5mcmFkZWFkLm9yZwpodHRwOi8vbGlzdHMuaW5mcmFkZWFk Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4LXVtCg==