From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1oRXK2-0006li-OL for mharc-grub-devel@gnu.org; Fri, 26 Aug 2022 07:16:22 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34910) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oRXK1-0006iF-5w for grub-devel@gnu.org; Fri, 26 Aug 2022 07:16:21 -0400 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]:50488) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oRXJy-00067D-Tb for grub-devel@gnu.org; Fri, 26 Aug 2022 07:16:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Type:MIME-Version:References: Subject:Cc:From:Date:Message-ID:Sender:Reply-To:To:Content-Transfer-Encoding: Content-ID:Content-Description:In-Reply-To; bh=n6/A2fRMhnQNaOCIndX7cz46jxxUobBWZy3sCuWIzWA=; b=qHciAVx45p+JfNYCu1pe7z7mXB XV1nqNSj2K+BX3PqSxf9tciVPPzo1LifIvV5ry9ih/i5l6Jv+fG8fCr8cqTZHFICqr2zHfi53VShm 0q+W0KzTZCW9+S6J0AOL9VdyVi0lcVdLV9DPfg615Kdpmdt5cUo8VL1PhXzCzBtgvDwcQPr5g3+w5 jiYMNMV+e8zzZ3zFhD1UXB7jHiLgznvKg1Vcok3X3EXfxWTYa0io3UHGNLHnkBPwnLCwpmV96yl2U BmL0NxZqceMDBX9dJQN4HWud1fH+obzHfw9dCxQomPpECmeaK0NoBF0/pKAWgKDZ4vWnBEWS01eub 03b2zx2A==; Received: from j130084.upc-j.chello.nl ([24.132.130.84] helo=noisy.programming.kicks-ass.net) by casper.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1oRXJv-000UZD-Jn; Fri, 26 Aug 2022 11:16:15 +0000 Received: from hirez.programming.kicks-ass.net (hirez.programming.kicks-ass.net [192.168.1.225]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) by noisy.programming.kicks-ass.net (Postfix) with ESMTPS id 4809030076D; Fri, 26 Aug 2022 13:16:13 +0200 (CEST) Received: by hirez.programming.kicks-ass.net (Postfix, from userid 0) id 2808D2017E88E; Fri, 26 Aug 2022 13:16:13 +0200 (CEST) Message-ID: <20220826111358.371003497@alderlake.programming.kicks-ass.net> User-Agent: quilt/0.66 Date: Fri, 26 Aug 2022 13:01:45 +0200 From: peterz@infradead.org Cc: grub-devel@gnu.org, development@efficientek.com, dkiper@net-space.pl, peterz@infradead.org Subject: [PATCH v2 3/3] pci: Rename GRUB_PCI_CLASS_* References: <20220826110142.966628595@alderlake.programming.kicks-ass.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Received-SPF: none client-ip=2001:8b0:10b:1236::1; envelope-from=peterz@infradead.org; helo=casper.infradead.org X-Spam_score_int: -33 X-Spam_score: -3.4 X-Spam_bar: --- X-Spam_report: (-3.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MISSING_HEADERS=1.021, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Aug 2022 11:16:21 -0000 Glenn suggested to rename the existing PCI_CLASS defines to have explicit class and subclass names. Suggested-by: Glenn Washburn Signed-off-by: Peter Zijlstra (Intel) --- Index: grub/grub-core/kern/i386/qemu/init.c =================================================================== --- grub.orig/grub-core/kern/i386/qemu/init.c +++ grub/grub-core/kern/i386/qemu/init.c @@ -168,11 +168,11 @@ enable_cards (grub_pci_device_t dev, class = (grub_pci_read (addr) >> 16) & 0xffff; - if (class == GRUB_PCI_CLASS_SUBCLASS_VGA) + if (class == GRUB_PCI_CLASS_DISPLAY_VGA) cmd |= GRUB_PCI_COMMAND_IO_ENABLED | GRUB_PCI_COMMAND_MEM_ENABLED; - if (class == GRUB_PCI_CLASS_SUBCLASS_USB) + if (class == GRUB_PCI_CLASS_SERIAL_USB) return 0; addr = grub_pci_make_address (dev, GRUB_PCI_REG_COMMAND); Index: grub/grub-core/video/efi_uga.c =================================================================== --- grub.orig/grub-core/video/efi_uga.c +++ grub/grub-core/video/efi_uga.c @@ -100,7 +100,7 @@ find_card (grub_pci_device_t dev, grub_p addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS); subclass = (grub_pci_read (addr) >> 16) & 0xffff; - if (subclass != GRUB_PCI_CLASS_SUBCLASS_VGA) + if (subclass != GRUB_PCI_CLASS_DISPLAY_VGA) return 0; /* Enable MEM address spaces */ Index: grub/grub-core/video/radeon_fuloong2e.c =================================================================== --- grub.orig/grub-core/video/radeon_fuloong2e.c +++ grub/grub-core/video/radeon_fuloong2e.c @@ -72,7 +72,7 @@ find_card (grub_pci_device_t dev, grub_p addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS); class = grub_pci_read (addr); - if (((class >> 16) & 0xffff) != GRUB_PCI_CLASS_SUBCLASS_VGA + if (((class >> 16) & 0xffff) != GRUB_PCI_CLASS_DISPLAY_VGA || pciid != 0x515a1002) return 0; Index: grub/grub-core/video/radeon_yeeloong3a.c =================================================================== --- grub.orig/grub-core/video/radeon_yeeloong3a.c +++ grub/grub-core/video/radeon_yeeloong3a.c @@ -71,7 +71,7 @@ find_card (grub_pci_device_t dev, grub_p addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS); class = grub_pci_read (addr); - if (((class >> 16) & 0xffff) != GRUB_PCI_CLASS_SUBCLASS_VGA + if (((class >> 16) & 0xffff) != GRUB_PCI_CLASS_DISPLAY_VGA || pciid != 0x96151002) return 0; Index: grub/grub-core/video/sis315pro.c =================================================================== --- grub.orig/grub-core/video/sis315pro.c +++ grub/grub-core/video/sis315pro.c @@ -100,7 +100,7 @@ find_card (grub_pci_device_t dev, grub_p addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS); class = grub_pci_read (addr); - if (((class >> 16) & 0xffff) != GRUB_PCI_CLASS_SUBCLASS_VGA + if (((class >> 16) & 0xffff) != GRUB_PCI_CLASS_DISPLAY_VGA || pciid != GRUB_SIS315PRO_PCIID) return 0; Index: grub/grub-core/video/sm712.c =================================================================== --- grub.orig/grub-core/video/sm712.c +++ grub/grub-core/video/sm712.c @@ -372,7 +372,7 @@ find_card (grub_pci_device_t dev, grub_p addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS); class = grub_pci_read (addr); - if (((class >> 16) & 0xffff) != GRUB_PCI_CLASS_SUBCLASS_VGA + if (((class >> 16) & 0xffff) != GRUB_PCI_CLASS_DISPLAY_VGA || pciid != GRUB_SM712_PCIID) return 0; Index: grub/include/grub/pci.h =================================================================== --- grub.orig/include/grub/pci.h +++ grub/include/grub/pci.h @@ -81,8 +81,8 @@ #define GRUB_PCI_STATUS_DEVSEL_TIMING_SHIFT 9 #define GRUB_PCI_STATUS_DEVSEL_TIMING_MASK 0x0600 -#define GRUB_PCI_CLASS_SUBCLASS_VGA 0x0300 -#define GRUB_PCI_CLASS_SUBCLASS_USB 0x0c03 +#define GRUB_PCI_CLASS_DISPLAY_VGA 0x0300 +#define GRUB_PCI_CLASS_SERIAL_USB 0x0c03 #define GRUB_PCI_CLASS_COMMUNICATION_SERIAL 0x0700 #define GRUB_PCI_CLASS_COMMUNICATION_MODEM 0x0703