AGP support for powermac G5
Subsystems (2)
PATCH 1/1 AGP support for powermac G5
This patch adds AGP support for the U3 northbridge used in Apple G5 machines to drivers/char/agp/uninorth-agp.c. This patch is based on earlier work by Jerome Glisse. With this patch, the driver works in both ppc32 and ppc64 kernels.
drivers/char/agp/Kconfig +3 -3
@@ -1,6 +1,6 @@ config AGP tristate "/dev/agpgart (AGP Support)" if !GART_IOMMU - depends on ALPHA || IA64 || PPC32 || X86 + depends on ALPHA || IA64 || PPC || X86 default y if GART_IOMMU ---help--- AGP (Accelerated Graphics Port) is a bus system mainly used to
@@ -146,11 +146,11 @@ default AGP config AGP_UNINORTH - tristate "Apple UniNorth AGP support" + tristate "Apple UniNorth & U3 AGP support" depends on AGP && PPC_PMAC help This option gives you AGP support for Apple machines with a - UniNorth bridge. + UniNorth or U3 (Apple G5) bridge. config AGP_EFFICEON tristate "Transmeta Efficeon support"
drivers/char/agp/uninorth-agp.c +233 -42
412 lines not on this page · raw message
include/asm-ppc/uninorth.h +6 -1
@@ -27,13 +27,18 @@#define UNI_N_CFG_AGP_BASE 0x90#define UNI_N_CFG_GART_CTRL 0x94#define UNI_N_CFG_INTERNAL_STATUS 0x98 +#define UNI_N_CFG_GART_DUMMY_PAGE 0xa4/* UNI_N_CFG_GART_CTRL bits definitions */ -/* Not U3 */ #define UNI_N_CFG_GART_INVAL 0x00000001#define UNI_N_CFG_GART_ENABLE 0x00000100#define UNI_N_CFG_GART_2xRESET 0x00010000#define UNI_N_CFG_GART_DISSBADET 0x00020000 +/* The following seems to only be used only on U3 <[email protected]> */ +#define U3_N_CFG_GART_SYNCMODE 0x00040000 +#define U3_N_CFG_GART_PERFRD 0x00080000 +#define U3_N_CFG_GART_B2BGNT 0x00200000 +#define U3_N_CFG_GART_FASTDDR 0x00400000/* My understanding of UniNorth AGP as of UniNorth rev 1.0x, * revision 1.5 (x4 AGP) may need further changes.
include/asm-ppc64/agp.h new file +13 -0
@@ -0,0 +1,13 @@ +#ifndef AGP_H +#define AGP_H 1 + +#include <asm/io.h> + +/* nothing much needed here */ + +#define map_page_into_agp (page) +#define unmap_page_from_agp (page) +#define flush_agp_mappings () +#define flush_agp_cache () mb() + +#endif
include/linux/pci_ids.h +3 -0
@@ -876,10 +876,13 @@#define PCI_DEVICE_ID_APPLE_IPID_ATA100 0x003b#define PCI_DEVICE_ID_APPLE_KEYLARGO_I 0x003e#define PCI_DEVICE_ID_APPLE_K2_ATA100 0x0043 +#define PCI_DEVICE_ID_APPLE_U3_AGP 0x004b#define PCI_DEVICE_ID_APPLE_K2_GMAC 0x004c#define PCI_DEVICE_ID_APPLE_SH_ATA 0x0050#define PCI_DEVICE_ID_APPLE_SH_SUNGEM 0x0051#define PCI_DEVICE_ID_APPLE_SH_FW 0x0052 +#define PCI_DEVICE_ID_APPLE_U3L_AGP 0x0058 +#define PCI_DEVICE_ID_APPLE_U3H_AGP 0x0059#define PCI_DEVICE_ID_APPLE_TIGON3 0x1645#define PCI_VENDOR_ID_YAMAHA 0x1073
Hi.
Quoted 15 lines · Paul Mackerras
drivers/char/agp/uninorth-agp.c +15
-0+struct agp_bridge_driver u3_agp_driver = { + .owner =THIS_MODULE , + .aperture_sizes = (void *)u3_sizes, + .size_type =U32_APER_SIZE , + .num_aperture_sizes =8 , + .configure = uninorth_configure, + .fetch_size = uninorth_fetch_size, + .cleanup = uninorth_cleanup, + .tlb_flush = uninorth_tlbflush, + .mask_memory = agp_generic_mask_memory, + .masks =NULL , + .cache_flush = null_cache_flush, + .agp_enable = uninorth_agp_enable, + .create_gatt_table = uninorth_create_gatt_table, + .free_gatt_table = uninorth_free_gatt_table,
drivers/char/agp/uninorth-agp.c line 501
Quoted 10 lines
drivers/char/agp/uninorth-agp.c +10
-0+ .insert_memory = u3_insert_memory, + .remove_memory = u3_remove_memory, + .alloc_by_type = agp_generic_alloc_by_type, + .free_by_type = agp_generic_free_by_type, + .agp_alloc_page = agp_generic_alloc_page, + .agp_destroy_page = agp_generic_destroy_page, + .cant_use_aperture = 1, + .needs_scratch_page = 1, +}; +
No power management support? :>
Regards,
Nigel
Signature · 6 lines
Nigel Cunningham Software Engineer, Canberra, Australia http://www.cyclades.com Bus: +61 (2) 6291 9554; Hme: +61 (2) 6292 8028; Mob: +61 (417) 100 574 Maintainer of Suspend2 Kernel Patches http://suspend2.net
Quoted 1 line · Nigel Cunningham
No power management support? :>
The suspend/resume methods are in the pci_driver struct, not the agp_bridge_driver struct. Not that we have suspend/resume on the G5 yet.
Paul.
Hi.
Quoted 7 lines · Paul Mackerras
Quoted 1 line · Nigel Cunningham
No power management support? :>
The suspend/resume methods are in the
pci_driverstruct, not theagp_bridge_driverstruct. Not that we have suspend/resume on the G5 yet.
Ah. Thought I'd seen some in others.
Humble apologies.
Nigel
Signature · 6 lines
Nigel Cunningham Software Engineer, Canberra, Australia http://www.cyclades.com Bus: +61 (2) 6291 9554; Hme: +61 (2) 6292 8028; Mob: +61 (417) 100 574 Maintainer of Suspend2 Kernel Patches http://suspend2.net
Quoted 3 lines
No power management support? :>
Heh, not yet :) We can't really put a G5 to sleep yet. I haven't figured out the magic incantations for the PMU chip on those.
Ben.